[project-base] order is updated in GoPay only if configuration is set…

… (#2806)
shopsys · Sep 21, 2023 · ea95910 · ea95910
1 parent a159284
commit ea95910
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/app/.env.test b/app/.env.test
@@ -1,3 +1,11 @@
 # define your env variables for the test environment here
 
 DATABASE_NAME=shopsys-test
+
+GOPAY_IS_PRODUCTION_MODE=false
+GOPAY_EN_GOID=test-data
+GOPAY_EN_CLIENTID=test-data
+GOPAY_EN_CLIENTSECRET=test-data
+GOPAY_CS_GOID=test-data
+GOPAY_CS_CLIENTID=test-data
+GOPAY_CS_CLIENTSECRET=test-data
diff --git a/app/src/Model/GoPay/GoPayClientFactory.php b/app/src/Model/GoPay/GoPayClientFactory.php
@@ -30,10 +30,14 @@ public function createByLocale(string $locale): GoPayClient
      */
     protected function getConfigByLocale(string $locale): array
     {
+        if (!array_key_exists($locale, $this->config)) {
+            throw new GoPayNotConfiguredException();
+        }
+
         $configByLocale = $this->config[$locale];
         $this->config = array_merge($this->config, $configByLocale);
 
-        if ($this->config['goid'] === null) {
+        if ($this->config['goid'] === null || $this->config['goid'] === '') {
             throw new GoPayNotConfiguredException();
         }
 

diff --git a/app/src/Model/Payment/Service/PaymentServiceFacade.php b/app/src/Model/Payment/Service/PaymentServiceFacade.php
@@ -5,6 +5,7 @@
 namespace App\Model\Payment\Service;
 
 use App\FrontendApi\Model\Payment\PaymentSetupCreationData;
+use App\Model\GoPay\Exception\GoPayNotConfiguredException;
 use App\Model\GoPay\Exception\GoPayPaymentDownloadException;
 use App\Model\GoPay\GoPayFacade;
 use App\Model\Order\Order;
@@ -98,7 +99,7 @@ public function updatePaymentTransactionsByOrder(Order $order): void
                 if ($update) {
                     $this->paymentTransactionFacade->edit($paymentTransaction->getId(), $paymentTransactionData);
                 }
-            } catch (PaymentServiceFacadeNotRegisteredException $exception) {
+            } catch (PaymentServiceFacadeNotRegisteredException | GoPayNotConfiguredException $exception) {
                 $this->logger->error($exception->getMessage());
             }
         }