prepare release 1.5.2 (#175)

mollie · Aug 5, 2021 · ecd06ff · ecd06ff
1 parent cf40675
commit ecd06ff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "kiener/mollie-payments-plugin",
   "description": "Mollie Payments",
-  "version": "v1.5.1",
+  "version": "v1.5.2",
   "type": "shopware-platform-plugin",
   "license": "MIT",
   "authors": [

diff --git a/src/Facade/MollieOrderPaymentFlow.php b/src/Facade/MollieOrderPaymentFlow.php
@@ -57,8 +57,7 @@ public function __construct(
     public function process(OrderTransactionEntity $transaction, OrderEntity $order, Order $mollieOrder, SalesChannelContext $salesChannelContext): bool
     {
         $paymentStatus = $this->orderStatusConverter->getMollieStatus($mollieOrder);
-        $settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannelId());
-
+        $settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
         // this is only mollie payment flow here we are doing failed management here
         $this->orderStatusUpdater->updatePaymentStatus($transaction, $paymentStatus, $salesChannelContext->getContext());
         $this->orderStatusUpdater->updateOrderStatus($order, $paymentStatus, $settings, $salesChannelContext->getContext());

diff --git a/src/Facade/MolliePaymentFinalize.php b/src/Facade/MolliePaymentFinalize.php
@@ -78,7 +78,7 @@ public function finalize(AsyncPaymentTransactionStruct $transactionStruct, Sales
 
         $paymentStatus = $this->orderStatusConverter->getMollieStatus($mollieOrder);
         $this->orderStatusUpdater->updatePaymentStatus($transactionStruct->getOrderTransaction(), $paymentStatus, $salesChannelContext->getContext());
-        $settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannelId());
+        $settings = $this->settingsService->getSettings($salesChannelContext->getSalesChannel()->getId());
         $this->orderStatusUpdater->updateOrderStatus($order, $paymentStatus, $settings, $salesChannelContext->getContext());
 
         if (MolliePaymentStatus::isFailedStatus($paymentStatus)) {

diff --git a/src/Factory/MollieApiFactory.php b/src/Factory/MollieApiFactory.php
@@ -83,7 +83,7 @@ public function getClient(?string $salesChannelId = null): MollieApiClient
 
             // @todo Add plugin version variable
             $this->apiClient->addVersionString(
-                'MollieShopware6/1.5.1'
+                'MollieShopware6/1.5.2'
             );
         } catch (Exception $e) {
             $this->logger->error($e->getMessage(), [$e]);

diff --git a/src/Handler/PaymentHandler.php b/src/Handler/PaymentHandler.php
@@ -180,10 +180,14 @@ public function finalize(AsyncPaymentTransactionStruct $transaction, Request $re
         } catch (CustomerCanceledAsyncPaymentException $exception) {
             throw $exception;
         } catch (Throwable $exception) {
+            $e=null;
+            if ($exception instanceof \Exception) {
+                $e=$exception;
+            }
             $this->logger->addEntry(
                 $exception->getMessage(),
                 $salesChannelContext->getContext(),
-                $exception,
+                $e,
                 null,
                 Logger::ERROR
             );