Merge branch 'master' into 2.4

CONTRIBUTING.md

@@ -9,7 +9,7 @@ pagination_prev: null
 ---
 END_METADATA -->
 
-# Contributing to Checkout with Vipps for Magento
+# Contributing to Vipps/MobilePay Payment Module for Adobe Commerce
 
 If you want to contribute: Great! No issue or pull request is too small!
 
@@ -44,4 +44,4 @@ Creating an issue in GitHub is easy, and whatever issue you're having, you're li
 
 The LICENSE file defines the license for the project. An open source project's license informs users what they can and can't do (e.g., use, modify, redistribute), and contributors, what they are allowing others to do.
 
-The Vipps Payment Module for Magento 2 is licensed under the MIT license: https://choosealicense.com/licenses/mit/
+The *Vipps/MobilePay Payment Module for Adobe Commerce* is licensed under the MIT license: https://choosealicense.com/licenses/mit/

Model/TokenProvider.php

@@ -196,7 +196,7 @@ private function readJwt($scopeId)
             }
         } catch (\Exception $e) {    //@codingStandardsIgnoreLine
             $this->logger->critical($e->getMessage());
-            throw new AuthenticationException(__('Can\'t retrieve access token from %1.', $this->config->getTitle()), $e);
+            throw new AuthenticationException((string)__('Can\'t retrieve access token from %1.', $this->config->getTitle()), $e);
         } finally {
             $adapter ? $adapter->close() : null;
         }

README.md

@@ -1,43 +1,44 @@
 <!-- START_METADATA
 ---
-title: Vipps Payment Module for Magento 2
+title: Vipps/MobilePay Payment Module for Adobe Commerce / Magento
 sidebar_label: Introduction
 sidebar_position: 1
 hide_table_of_contents: true
+description: Provide Vipps and MobilePay payment options for your Adobe Commerce website.
 pagination_next: null
 pagination_prev: null
 ---
 END_METADATA -->
 
-# Vipps Payment Module for Magento 2
+# Payment module for Adobe Commerce / Magento
 
 ![Support and development by Vaimo ](./docs/images/vaimo.svg#gh-light-mode-only)![Support and development by Vaimo](./docs/images/vaimo_dark.svg#gh-dark-mode-only)
 
-![Vipps](./docs/images/vipps.png) *Available for Vipps.*
-
-![MobilePay](./docs/images/mp.png) *Available for MobilePay in Finland and Denmark in Q1 2024.*
+![Vipps](./docs/images/vipps.png) ![MobilePay](./docs/images/mp.png) *Available for Vipps and MobilePay.*
 
 *This plugin is built and maintained by [Vaimo](https://www.vaimo.com/) and is hosted on [GitHub](https://github.com/vippsas/vipps-magento).*
 
 <!-- START_COMMENT -->
 💥 Please use the plugin pages on [https://developer.vippsmobilepay.com](https://developer.vippsmobilepay.com/docs/plugins-ext/magento/). 💥
 <!-- END_COMMENT -->
 
-Vipps offers a familiar and convenient buying experience that can help your customers spend more time shopping and less time checking out.
+Vipps MobilePay offers a familiar and convenient buying experience that can help your customers spend more time shopping and less time checking out.
+
+Vipps and MobilePay are used by large and small companies. From years of shopping safely with Vipps/MobilePay, customers trust their personal information will remain secure. Businesses have the reassurance of our advanced fraud protection and payment protection policy.
 
-Vipps is used by large and small companies. From years of shopping safely with Vipps, customers trust their personal information will remain secure. Businesses have the reassurance of our advanced fraud protection and payment protection policy.
+About [Adobe Commerce](https://experienceleague.adobe.com/en/browse/commerce).
 
-Information about ordering the plugin is available at [Vipps for Magento](https://vipps.no/produkter-og-tjenester/bedrift/ta-betalt-paa-nett/ta-betalt-paa-nett/magento/).
+This plugin is available for download at
+[https://github.com/vippsas/vipps-magento/releases](https://github.com/vippsas/vipps-magento/releases).
 
-The *Vipps Payment Module for Magento 2* plugin is available for download at <https://github.com/vippsas/vipps-magento/releases>.
 
 ## Documentation
 
-The [Vipps Payment Module for Magento 2: User Guide](./docs/documentation.md) contains:
+The [user guide](./docs/documentation.md) contains:
 
 * [Installation](./docs/documentation.md#installation)
 * [Configuration](./docs/documentation.md#configuration)
 * [Debugging](./docs/documentation.md#enable-debug-mode--requests-profiling)
 * [Customization](./docs/documentation.md#customization)
 
-See also the [Frequently asked questions](./docs/FAQ.md) page.
+See also [Frequently asked questions](./docs/FAQ.md).

docs/FAQ.md

@@ -1,6 +1,6 @@
 <!-- START_METADATA
 ---
-title: Vipps Payment Module for Magento 2 FAQ
+title: Vipps/MobilePay Payment Module for Adobe Commerce FAQ
 sidebar_label: FAQ
 sidebar_position: 50
 pagination_next: null
@@ -12,8 +12,8 @@ END_METADATA -->
 
 ## How do I capture an order?
 
-When *Payment Action* is set to *Authorize* and *Capture*, the invoice is created automatically in Magento. In such a case, the *Invoice* button does not appear, and the order is ready to ship.
-For more details about capturing orders, refer to [Creating an Invoice documentation](https://docs.magento.com/user-guide/sales/invoice-create.html).
+When *Payment Action* is set to *Authorize* and *Capture*, the invoice is created automatically in Adobe Commerce. In such a case, the *Invoice* button does not appear, and the order is ready to ship.
+For more details about capturing orders, refer to [Adobe Commerce: Creating an Invoice](https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/order-management/invoices#create-an-invoice).
 
 ## How do I partially capture an order?
 
@@ -22,74 +22,74 @@ Then, click *Update Qty’s* and submit *Invoice*.
 
 ## How do I cancel an order?
 
-In Magento, an order can be canceled in the case where all invoices and shipments have been returned and the Vipps Payment transaction has not been captured.
-Otherwise, the refund should be finished first. The Vipps Payment module supports offline partial cancellation. It is used to cancel separate order items.
+In Adobe Commerce, an order can be cancelled in the case where all invoices and shipments have been returned, and the Vipps MobilePay payment transaction has not been captured.
+Otherwise, the refund should be finished first. This Vipps/MobilePay Payment module supports offline partial cancellation. It is used to cancel separate order items.
 
 ## How do I refund an order?
 
-For orders refunding Magento propose [Credit Memo](https://docs.magento.com/user-guide/sales/credit-memos.html) functionality.
+For orders refunding Adobe Commerce propose [Adobe Commerce: Credit Memo](https://experienceleague.adobe.com/en/docs/commerce-admin/stores-sales/order-management/credit-memos/credit-memos) functionality.
 Credit Memo allows you to make a refund for captured transaction.
 
 ## How do I partially refund an order?
 
 You can partially refund an order by specifying *Items to Refund* on the *Credit Memo* page and updating the *Qty to Refund* field.
 
-## How can I get help with Vipps for Magento?
+## How can I get help with the Vipps/MobilePay Payment module?
 
-Vipps for Magento is developed by [Vaimo](https://www.vaimo.com), and the same developers who made
-the plugin also help with improvements, maintenance and developer assistance.
+*Vipps/MobilePay Payment Module for Adobe Commerce* is developed by [Vaimo](https://www.vaimo.com), and the same developers who made
+the Vipps/MobilePay Payment module also help with improvements, maintenance and developer assistance.
 
 If you are having a problem, please make sure that you are using the latest version:
-<https://github.com/vippsas/vipps-magento/releases>
+[https://github.com/vippsas/vipps-magento/releases](https://github.com/vippsas/vipps-magento/releases)
 
 The best way to report a problem (or ask a question) is to use GitHub's built-in "issue" functionality:
 [Issues](https://github.com/vippsas/vipps-magento/issues).
 
-### How can I get help with Vipps (unrelated to Magento)?
+### How can I get help with Vipps or MobilePay (unrelated to Adobe Commerce)?
 
-See: [How to contact Vipps](https://developer.vippsmobilepay.com/docs/contact/).
+See: [How to contact Vipps MobilePay](https://developer.vippsmobilepay.com/docs/contact/).
 
-## Why does it take so long after purchase before orders are created in Magento?
+## Why does it take so long after purchase before orders are created in Adobe Commerce?
 
-Vipps depends on a proper cron job configuration for background processing of orders.
-Failure to set it up properly means Vipps will not function as expected.
+Vipps/MobilePay depends on a proper cron job configuration for background processing of orders.
+Failure to set it up properly means it will not function as expected.
 
-## Why are some orders missing in Magento?
+## Why are some orders missing in Adobe Commerce?
 
 This scenario is possible for express payment flow. Unlike of regular payment, order is not created before redirecting to
 Vipps Landing page. If the transaction was successfully initiated by client, a new record
 with a quote ID and reserved order ID will be created in DB table `vipps_quote`. This can be helpful to find a status of a transaction.
 
 ## How do I enable Vipps Payment for Klarna Checkout
 
-To enable Vipps Payment method for Klarna Checkout, it should be chosen in the list of external payment methods in the appropriate Klarna Checkout settings section.
+Select Vipps from the list of external payment methods in the appropriate Klarna checkout settings section.
 
-![Screenshot of Klarna Checkout settings](images/klarna_checkout.png)
+![Screenshot of Klarna checkout settings](images/klarna_checkout.png)
 
-### Why am I seeing a strange page with url printed?
+### Why am I seeing a strange page with URL printed?
 
 Right after pressing *Place Order*, the client may see the page with message
 `{"url":"https:\/\/apitest.vipps.no\/dwo-api-application\/v1\/****"}`
 
-**Solution:** Update your Vipps module to the latest version.
+**Solution:** Update your Vipps/MobilePay Payment module to the latest version.
 
 ## How to enable debug mode / requests profiling
 
-If you have experienced any issue with Vipps try to enable *Request Profiling* and *Debug* features under the Vipps payment configuration area:
+If you have experienced any issue with Vipps MobilePay, try to enable *Request Profiling* and *Debug* features under the payment configuration area:
 
-*Stores -> Configuration -> Sales -> Payment Methods -> Vipps*
+*Stores -> Configuration -> Sales -> Payment Methods -> Vipps MobilePay*
 
-![Screenshot of Vipps Configuration Area](images/vipps_basic_v2.png)
+![Screenshot of Configuration Area](images/vipps_basic_v2.png)
 
-After that, all information related to Vipps payment module will be stored into two files `{project_root}/var/log/vipps_exception.log` or `{project_root}/var/log/vipps_debug.log`.
+After that, all information related to the Vipps/MobilePay payment module will be stored into two files `{project_root}/var/log/vipps_exception.log` or `{project_root}/var/log/vipps_debug.log`.
 
-Requests Profiling is a page in Magento admin panel that helps you to track a communication between Vipps and Magento.
-You can find the page under `System -> Vipps`
+*Requests Profiling* is a page in the Adobe Commerce admin panel that helps you to track a communication between Vipps MobilePay and Adobe Commerce.
+You can find the page under `System -> Vipps Payment -> Requests Profiling`
 
 ![Screenshot of Request Profiling Grid](images/request_profiling.png)
 
-On the page, you can see the list of all requests for all orders that Magento sends to Vipps.
-By clicking *Show* in an *Action* column of grid you can find appropriate response from Vipps.
+On the page, you can see the list of all requests for all orders that Adobe Commerce sends to Vipps MobilePay.
+By clicking *Show* in an *Action* column of grid, you can find appropriate response from Vipps MobilePay.
 
-Using built-in Magento grid filter you could find all requests per order that you are interested in.
+Using the built-in Adobe Commerce grid filter, you can find all the requests for an order you're interested in.