Merge pull request #1216 from BearGroup/release/5.16.1

Release/5.16.1

Block/Adminhtml/System/Config/AutoKeyExchangeAdmin.php

@@ -78,7 +78,7 @@ public function getCurrency()
      */
     public function canUpgrade()
     {
-        return $this->keyUpgrade->getMwsKeyForScope();
+        return $this->keyUpgrade->getMwsKeyForScope() && !$this->keyUpgrade->getExistingPublicKeyId();
     }
 
     /**

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 5.16.1
+* Remove platform/module version information from button payloads
+* Fixed admin display bug regarding upgrading legacy keys when a CV2 public key ID already exists
+* Fixed invoice comment noise with Automatic Authorization Mode
+
 ## 5.16.0
 * Added support for subscriptions, requires the ParadoxLabs Adaptive Subscription module
 * Added platformid for APB payload

Model/Adapter/AmazonPayAdapter.php

@@ -196,8 +196,7 @@ public function updateCheckoutSession($quote, $checkoutSessionId, $paymentIntent
                 'chargeAmount' => $this->createPrice($quote->getGrandTotal(), $quote->getQuoteCurrencyCode()),
             ],
             'merchantMetadata' => [
-                'merchantStoreName' => $this->amazonConfig->getStoreName(),
-                'customInformation' => $this->getMerchantCustomInformation(),
+                'merchantStoreName' => $this->amazonConfig->getStoreName()
             ],
             'platformId' => $this->amazonConfig->getPlatformId(),
         ];
@@ -335,7 +334,8 @@ public function updateChargePermission(int $storeId, string $chargePermissionId,
     {
         $payload = [
             'merchantMetadata' => [
-                'merchantReferenceId' => $data['merchantReferenceId']
+                'merchantReferenceId' => $data['merchantReferenceId'],
+                'customInformation' => $this->getMerchantCustomInformation()
             ]
         ];
 
@@ -623,8 +623,7 @@ public function generatePayNowButtonPayload(Quote $quote, $paymentIntent = Payme
                 'presentmentCurrency' => $currencyCode,
             ],
             'merchantMetadata' => [
-                'merchantStoreName' => $this->amazonConfig->getStoreName(),
-                'customInformation' => $this->getMerchantCustomInformation()
+                'merchantStoreName' => $this->amazonConfig->getStoreName()
             ],
             'platformId' => $this->amazonConfig->getPlatformId(),
         ];

Model/CheckoutSessionManagement.php

@@ -825,7 +825,9 @@ public function completeCheckoutSession($amazonSessionId, $cartId = null)
                     $quote->getQuoteCurrencyCode()
                 );
                 // capture and invoice on the Magento side
-                $this->asyncCharge->capture($order, $chargeId, $quote->getGrandTotal());
+                if ($this->amazonConfig->getAuthorizationMode() == AuthorizationMode::SYNC) {
+                    $this->asyncCharge->capture($order, $chargeId, $quote->getGrandTotal());
+                }
             }
             $amazonCharge = $this->amazonAdapter->getCharge($quote->getStoreId(), $chargeId);
 

README.md

@@ -48,7 +48,7 @@ The following table provides an overview on which Git branch is compatible to wh
 Magento Version | Github Branch | Latest release
 ---|---|---
 2.2.6 - 2.2.11 (EOL) | [V2checkout-1.2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout-1.2.x)  | 1.20.0 (EOL)
-2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.16.0
+2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.16.1
 
 ## Release Notes
 See [CHANGELOG.md](/CHANGELOG.md) 

composer.json

@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-magento-2-module",
   "description": "Official Magento2 Plugin to integrate with Amazon Pay",
   "type": "magento2-module",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "license": [
     "Apache-2.0"
   ],