Psapc take over6.3

.gitignore

@@ -8,4 +8,5 @@
 /tests/Codeception/_output/*
 !tests/Codeception/_output/.gitkeep
 /tests/reports/*
-!tests/reports/.gitkeep
+!tests/reports/.gitkeep
+/tests/privatekey.pem

CHANGELOG.md

@@ -4,11 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.1.6] - 2024-??-??
+## [3.1.6] - 2025-??-??
 
 - [0007654](https://bugs.oxid-esales.com/view.php?id=7654): Fix Capture type is incorrectly evaluated
 - [0007636](https://bugs.oxid-esales.com/view.php?id=7636): Fix Refund value can only be entered with a point, semicolon is not possible
 - [0007685](https://bugs.oxid-esales.com/view.php?id=7685): Smarty-Template Improvements
+- Prevent the shop from breaking on misconfiguration or if the amazon service is down. Thanks to https://github.com/GM-Alex
 
 ## [3.1.5] - 2024-03-22
 

metadata.php

@@ -60,7 +60,7 @@
         'en' => 'Use of the online payment service from amazon.com'
     ],
     'thumbnail' => 'img/amazon-pay-logo.png',
-    'version' => '3.1.6-rc.1',
+    'version' => '3.1.6-rc.2',
     'author' => 'OXID eSales AG',
     'url' => 'https://www.oxid-esales.com',
     'email' => '[email protected]',

src/Core/AmazonService.php

@@ -346,7 +346,7 @@ protected function checkAmazonResult(array $result, Basket $basket, LoggerInterf
         $response = PhpHelper::jsonToArray($result['response']);
 
         // in case of error, the resulting structure is different...
-        if (!isset($result['response'], $result['status']) || $result['status'] !== 200) {
+        if (!isset($result['response'], $result['status']) || ($result['status'] !== 200 && $result['status'] !== 202)) {
             $this->showErrorOnRedirect($logger, $result, (string)$basket->getOrderId());
         }
 

src/Core/ViewConfig.php

@@ -366,8 +366,13 @@ public function getPayloadSignIn(): string
      */
     public function getSignature(string $payload): string
     {
-        $amazonClient = OxidServiceProvider::getAmazonClient();
-        return $amazonClient->generateButtonSignature($payload);
+        try {
+            return OxidServiceProvider::getAmazonClient()->generateButtonSignature($payload);
+        } catch (Exception $exception) {
+            $logger = new Logger();
+            $logger->log('ERROR', $exception->getMessage(), [$exception]);
+            return '';
+        }
     }
 
     /**