Release bug fixes (#8)

controllers/front/bancontactAjax.php

@@ -66,7 +66,7 @@ private function createTransaction()
             $paymentMethod,
             $orderNumber
         );
-        $newPayment = $this->module->api->payments->create($paymentData->jsonSerialize(), ['include' => 'details.qrCode']);
+        $newPayment = $this->module->getApiClient()->payments->create($paymentData->jsonSerialize(), ['include' => 'details.qrCode']);
 
         $this->ajaxDie(json_encode(
             [

controllers/front/payScreen.php

@@ -58,7 +58,7 @@ public function setMedia()
         $profileIdProvider = $this->module->getMollieContainer(ProfileIdProviderInterface::class);
 
         Media::addJsDef([
-            'profileId' => $profileIdProvider->getProfileId($this->module->api),
+            'profileId' => $profileIdProvider->getProfileId($this->module->getApiClient()),
         ]);
         $this->addJS("{$this->module->getPathUri()}views/js/front/mollie_iframe.js");
         $this->addCSS("{$this->module->getPathUri()}views/css/mollie_iframe.css");

controllers/front/return.php

@@ -217,9 +217,9 @@ protected function processGetStatus()
 
         $isOrder = TransactionUtility::isOrderTransaction($transactionId);
         if ($isOrder) {
-            $transaction = $this->module->api->orders->get($transactionId, ['embed' => 'payments']);
+            $transaction = $this->module->getApiClient()->orders->get($transactionId, ['embed' => 'payments']);
         } else {
-            $transaction = $this->module->api->payments->get($transactionId);
+            $transaction = $this->module->getApiClient()->payments->get($transactionId);
         }
 
         $orderStatus = $transaction->status;

controllers/front/webhook.php

@@ -76,16 +76,16 @@ protected function executeWebhook()
             $this->respond('failed', HttpStatusCode::HTTP_UNPROCESSABLE_ENTITY, 'Missing transaction id');
         }
 
-        if (!$this->module->api) {
+        if (!$this->module->getApiClient()) {
             $this->respond('failed', HttpStatusCode::HTTP_UNAUTHORIZED, 'API key is missing or incorrect');
         }
         try {
             if (TransactionUtility::isOrderTransaction($transactionId)) {
-                $transaction = $this->module->api->orders->get($transactionId, ['embed' => 'payments']);
+                $transaction = $this->module->getApiClient()->orders->get($transactionId, ['embed' => 'payments']);
             } else {
-                $transaction = $this->module->api->payments->get($transactionId);
+                $transaction = $this->module->getApiClient()->payments->get($transactionId);
                 if ($transaction->orderId) {
-                    $transaction = $this->module->api->orders->get($transaction->orderId, ['embed' => 'payments']);
+                    $transaction = $this->module->getApiClient()->orders->get($transaction->orderId, ['embed' => 'payments']);
                 }
             }
             $metaData = $transaction->metadata;

mollie.php

@@ -24,6 +24,7 @@
 use Mollie\Service\ExceptionService;
 use Mollie\Utility\PsVersionUtility;
 use Mollie\Verification\IsPaymentInformationAvailable;
+use PrestaShop\PrestaShop\Core\Localization\Locale\Repository;
 
 require_once __DIR__ . '/vendor/autoload.php';
 
@@ -68,7 +69,7 @@ public function __construct()
 
         parent::__construct();
 
-        $this->ps_versions_compliancy = ['min' => '1.7', 'max' => _PS_VERSION_];
+        $this->ps_versions_compliancy = ['min' => '1.7', 'max' => '1.7.8.9'];
         $this->displayName = $this->l('Mollie');
         $this->description = $this->l('Mollie Payments');
 
@@ -144,6 +145,15 @@ public function uninstall()
         return parent::uninstall();
     }
 
+    public function getApiClient(int $shopId = null)
+    {
+        if (!$this->api) {
+            $this->setApiKey($shopId);
+        }
+
+        return $this->api;
+    }
+
     public function enable($force_all = false)
     {
         if (!$this->isPhpVersionCompliant()) {
@@ -366,11 +376,17 @@ public function hookDisplayHeader(array $params)
             return;
         }
 
+        $apiClient = $this->getApiClient();
+
+        if (!$apiClient) {
+            return '';
+        }
+
         /** @var ProfileIdProviderInterface $profileIdProvider */
         $profileIdProvider = $this->getMollieContainer(ProfileIdProviderInterface::class);
 
         Media::addJsDef([
-            'profileId' => $profileIdProvider->getProfileId($this->api),
+            'profileId' => $profileIdProvider->getProfileId($apiClient),
             'isoCode' => $this->context->language->locale,
             'isTestMode' => \Mollie\Config\Config::isTestMode(),
         ]);
@@ -699,7 +715,9 @@ public function hookActionOrderStatusUpdate(array $params = [])
             return;
         }
 
-        if (!$this->api) {
+        $apiClient = $this->getApiClient($this->context->shop->id);
+
+        if (!$apiClient) {
             return;
         }
 
@@ -720,7 +738,7 @@ public function hookActionOrderStatusUpdate(array $params = [])
         $logger = $this->getMollieContainer(PrestaLoggerInterface::class);
 
         try {
-            $shipmentSenderHandler->handleShipmentSender($this->api, $order, $orderStatus);
+            $shipmentSenderHandler->handleShipmentSender($apiClient, $order, $orderStatus);
         } catch (ShipmentCannotBeSentException $exception) {
             $logger->error($exceptionService->getErrorMessageForException(
                 $exception,
@@ -796,15 +814,26 @@ public function hookActionEmailSendBefore($params)
                 'id_order' => (int) $order->id,
             ]);
 
-            $feeTaxIncl = $molOrderPaymentFee->fee_tax_incl ?? 0.00;
+            $feeTaxIncl = !empty($molOrderPaymentFee->fee_tax_incl) ? (float) $molOrderPaymentFee->fee_tax_incl : 0.00;
 
             if (PsVersionUtility::isPsVersionLowerThan(_PS_VERSION_, '1.7.6.0')) {
                 $orderFee = $tools->displayPrice(
                     $feeTaxIncl,
                     $orderCurrency
                 );
             } else {
-                $orderFee = $this->context->getCurrentLocale()->formatPrice(
+                /**
+                 * NOTE: Locale in context is set at init() method but in this case init() doesn't always get executed first.
+                 */
+                /** @var Repository $localeRepo */
+                $localeRepo = $this->get('prestashop.core.localization.locale.repository');
+
+                /**
+                 * NOTE: context language is set based on customer/employee context
+                 */
+                $locale = $localeRepo->getLocale($this->context->language->getLocale());
+
+                $orderFee = $locale->formatPrice(
                     $feeTaxIncl,
                     $orderCurrency->iso_code
                 );
@@ -830,19 +859,20 @@ public function hookDisplayPDFInvoice($params): string
             return '';
         }
 
-        $localeRepo = $this->get('prestashop.core.localization.locale.repository');
+        /** @var InvoicePdfTemplateBuilder $invoiceTemplateBuilder */
+        $invoiceTemplateBuilder = $this->getMollieContainer(InvoicePdfTemplateBuilder::class);
 
-        if (!$localeRepo) {
-            return '';
-        }
+        $locale = null;
 
-        /**
-         * NOTE: context language is set based on customer/employee context
-         */
-        $locale = $localeRepo->getLocale($this->context->language->getLocale());
+        if (PsVersionUtility::isPsVersionHigherThen(_PS_VERSION_, '1.7.6.0')) {
+            /** @var Repository $localeRepo */
+            $localeRepo = $this->get('prestashop.core.localization.locale.repository');
 
-        /** @var InvoicePdfTemplateBuilder $invoiceTemplateBuilder */
-        $invoiceTemplateBuilder = $this->getMollieContainer(InvoicePdfTemplateBuilder::class);
+             /**
+             * NOTE: context language is set based on customer/employee context
+             */
+             $locale = $localeRepo->getLocale($this->context->language->getLocale());
+        }
 
         $templateParams = $invoiceTemplateBuilder
             ->setOrder($params['object']->getOrder())
@@ -931,6 +961,12 @@ public function hookActionValidateOrder($params)
             return;
         }
 
+        $apiClient = $this->getApiClient($this->context->shop->id);
+
+        if (!$apiClient) {
+            return;
+        }
+
         //NOTE as mollie-email-send is only in manual order creation in backoffice this should work only when mollie payment is chosen.
         if (!empty(Tools::getValue('mollie-email-send')) &&
             $params['order']->module === $this->name
@@ -957,7 +993,7 @@ public function hookActionValidateOrder($params)
                 $orderReference
             );
 
-            $newPayment = $this->api->payments->create($paymentData->jsonSerialize());
+            $newPayment = $apiClient->payments->create($paymentData->jsonSerialize());
 
             /** @var \Mollie\Repository\PaymentMethodRepository $paymentMethodRepository */
             $paymentMethodRepository = $this->getMollieContainer(\Mollie\Repository\PaymentMethodRepository::class);

src/Application/CommandHandler/RequestApplePayPaymentSessionHandler.php

@@ -39,7 +39,7 @@ public function __construct(Mollie $module, ApiServiceInterface $apiService)
     public function handle(RequestApplePayPaymentSession $command): array
     {
         try {
-            $response = $this->apiService->requestApplePayPaymentSession($this->module->api, $command->getValidationUrl());
+            $response = $this->apiService->requestApplePayPaymentSession($this->module->getApiClient(), $command->getValidationUrl());
         } catch (MollieApiException $e) {
             /* Message is only displayed in console */
             return [

src/Builder/FormBuilder.php

@@ -115,7 +115,7 @@ public function __construct(
     public function buildSettingsForm()
     {
         $isApiKeyProvided = (bool) EnvironmentUtility::getApiKey();
-        $isApiKeyProvided = ($isApiKeyProvided && $this->module->api !== null);
+        $isApiKeyProvided = ($isApiKeyProvided && $this->module->getApiClient() !== null);
 
         $inputs = $this->getAccountSettingsSection($isApiKeyProvided);
 
@@ -394,7 +394,7 @@ protected function getAccountSettingsSection($isApiKeyProvided)
             'name' => '',
             'title' => $this->module->l('Payment methods', self::FILE_NAME),
         ];
-        $molliePaymentMethods = $this->apiService->getMethodsForConfig($this->module->api);
+        $molliePaymentMethods = $this->apiService->getMethodsForConfig($this->module->getApiClient());
 
         if (empty($molliePaymentMethods)) {
             $input[] = [

src/Builder/InvoicePdfTemplateBuilder.php

@@ -27,7 +27,7 @@ final class InvoicePdfTemplateBuilder implements TemplateBuilderInterface
     private $order;
     /** @var MolOrderPaymentFeeRepositoryInterface */
     private $molOrderPaymentFeeRepository;
-    /** @var Locale */
+    /** @var Locale|null */
     private $locale;
     /** @var CurrencyRepositoryInterface */
     private $currencyRepository;
@@ -51,7 +51,10 @@ public function setOrder(Order $order): InvoicePdfTemplateBuilder
         return $this;
     }
 
-    public function setLocale(Locale $locale): InvoicePdfTemplateBuilder
+    /**
+     * @param Locale|null $locale
+     */
+    public function setLocale($locale): InvoicePdfTemplateBuilder
     {
         $this->locale = $locale;
 

src/Service/CancelService.php

@@ -52,7 +52,7 @@ public function doCancelOrderLines($transactionId, $lines = [])
     {
         try {
             /** @var Order $payment */
-            $order = $this->module->api->orders->get($transactionId, ['embed' => 'payments']);
+            $order = $this->module->getApiClient()->orders->get($transactionId, ['embed' => 'payments']);
             if ([] === $lines) {
                 $order->cancel();
             } else {

src/Service/ConfigFieldService.php

@@ -99,8 +99,8 @@ public function getConfigFieldsValues()
             Config::MOLLIE_KLARNA_INVOICE_ON => Configuration::get(Config::MOLLIE_KLARNA_INVOICE_ON),
         ];
 
-        if (Mollie\Utility\EnvironmentUtility::getApiKey() && $this->module->api !== null) {
-            foreach ($this->apiService->getMethodsForConfig($this->module->api) as $method) {
+        if (Mollie\Utility\EnvironmentUtility::getApiKey() && $this->module->getApiClient() !== null) {
+            foreach ($this->apiService->getMethodsForConfig($this->module->getApiClient()) as $method) {
                 $countryIds = $this->countryRepository->getMethodCountryIds($method['id']);
                 if ($countryIds) {
                     $configFields = array_merge($configFields, [Config::MOLLIE_COUNTRIES . $method['id'] . '[]' => $countryIds]);

src/Service/CustomerService.php

@@ -96,7 +96,7 @@ public function getCustomer(int $customerId)
     public function createCustomer($name, $email)
     {
         try {
-            return $this->mollie->api->customers->create(
+            return $this->mollie->getApiClient()->customers->create(
                 [
                     'name' => $name,
                     'email' => $email,

src/Service/MollieOrderCreationService.php

@@ -140,10 +140,10 @@ private function createPayment($data, $selectedApi)
         try {
             if (Config::MOLLIE_ORDERS_API === $selectedApi) {
                 /** @var MollieOrderAlias $payment */
-                $payment = $this->module->api->orders->create($data, ['embed' => 'payments']);
+                $payment = $this->module->getApiClient()->orders->create($data, ['embed' => 'payments']);
             } else {
                 /** @var MolliePaymentAlias $payment */
-                $payment = $this->module->api->payments->create($data);
+                $payment = $this->module->getApiClient()->payments->create($data);
             }
 
             return $payment;

src/Service/MollieOrderInfoService.php

@@ -80,7 +80,7 @@ public function displayMollieOrderInfo($input)
         $transaction = $this->paymentMethodRepository->getPaymentBy('transaction_id', $transactionId);
         $order = new Order($transaction['order_id']);
         $this->module->updateApiKey($order->id_shop);
-        if (!$this->module->api) {
+        if (!$this->module->getApiClient()) {
             return ['success' => false];
         }
         try {
@@ -96,12 +96,12 @@ public function displayMollieOrderInfo($input)
 
                         return [
                             'success' => isset($status['status']) && 'success' === $status['status'],
-                            'payment' => $this->apiService->getFilteredApiPayment($this->module->api, $transactionId, false),
+                            'payment' => $this->apiService->getFilteredApiPayment($this->module->getApiClient(), $transactionId, false),
                         ];
                     case 'retrieve':
                         return [
                             'success' => true,
-                            'payment' => $this->apiService->getFilteredApiPayment($this->module->api, $transactionId, false),
+                            'payment' => $this->apiService->getFilteredApiPayment($this->module->getApiClient(), $transactionId, false),
                         ];
                     default:
                         return ['success' => false];
@@ -117,21 +117,21 @@ public function displayMollieOrderInfo($input)
 
                         return [
                             'success' => true,
-                            'order' => $this->apiService->getFilteredApiOrder($this->module->api, $transactionId),
+                            'order' => $this->apiService->getFilteredApiOrder($this->module->getApiClient(), $transactionId),
                             'tracking' => $tracking,
                         ];
                     case 'ship':
                         $status = $this->shipService->doShipOrderLines($transactionId, isset($input['orderLines']) ? $input['orderLines'] : [], isset($input['tracking']) ? $input['tracking'] : null);
 
-                        return array_merge($status, ['order' => $this->apiService->getFilteredApiOrder($this->module->api, $transactionId)]);
+                        return array_merge($status, ['order' => $this->apiService->getFilteredApiOrder($this->module->getApiClient(), $transactionId)]);
                     case 'refund':
                         $status = $this->refundService->doRefundOrderLines($input['order'], isset($input['orderLines']) ? $input['orderLines'] : []);
 
-                        return array_merge($status, ['order' => $this->apiService->getFilteredApiOrder($this->module->api, $input['order']['id'])]);
+                        return array_merge($status, ['order' => $this->apiService->getFilteredApiOrder($this->module->getApiClient(), $input['order']['id'])]);
                     case 'cancel':
                         $status = $this->cancelService->doCancelOrderLines($transactionId, isset($input['orderLines']) ? $input['orderLines'] : []);
 
-                        return array_merge($status, ['order' => $this->apiService->getFilteredApiOrder($this->module->api, $transactionId)]);
+                        return array_merge($status, ['order' => $this->apiService->getFilteredApiOrder($this->module->getApiClient(), $transactionId)]);
                     default:
                         return ['success' => false];
                 }

src/Service/MolliePaymentMailService.php

@@ -73,7 +73,7 @@ public function sendSecondChanceMail($orderId)
 
         $this->module->updateApiKey($order->id_shop);
         /** @var MollieApiClient $api */
-        $api = $this->module->api;
+        $api = $this->module->getApiClient();
 
         try {
             if (TransactionUtility::isOrderTransaction($transactionId)) {

src/Service/PaymentMethodService.php

@@ -188,7 +188,7 @@ public function savePaymentMethod($method)
     public function getMethodsForCheckout()
     {
         $apiKey = EnvironmentUtility::getApiKey();
-        if (!$apiKey || $this->module->api === null) {
+        if (!$apiKey || $this->module->getApiClient() === null) {
             return [];
         }
         /* @phpstan-ignore-next-line */
@@ -478,7 +478,7 @@ private function getSupportedMollieMethods()
         $cartAmount = $this->orderTotalProvider->getOrderTotal();
 
         /** @var BaseCollection|MethodCollection $methods */
-        $methods = $this->module->api->methods->allActive(
+        $methods = $this->module->getApiClient()->methods->allActive(
             [
                 'resource' => 'orders',
                 'include' => 'issuers',

src/Service/RefundService.php

@@ -59,7 +59,7 @@ public function doPaymentRefund($transactionId, $amount = null)
     {
         try {
             /** @var Payment $payment */
-            $payment = $this->module->api->payments->get($transactionId);
+            $payment = $this->module->getApiClient()->payments->get($transactionId);
             if ($amount) {
                 $payment->refund([
                     'amount' => [
@@ -112,7 +112,7 @@ public function doRefundOrderLines(array $orderData, $lines = [])
         $availableRefund = $orderData['availableRefundAmount'];
         try {
             /** @var MollieOrderAlias $payment */
-            $order = $this->module->api->orders->get($transactionId, ['embed' => 'payments']);
+            $order = $this->module->getApiClient()->orders->get($transactionId, ['embed' => 'payments']);
             $isOrderLinesRefundPossible = RefundUtility::isOrderLinesRefundPossible($lines, $availableRefund);
             if ($isOrderLinesRefundPossible) {
                 $refund = RefundUtility::getRefundLines($lines);