Merge pull request #85 from Invertus/SL-130/currency-select

SL-130:currency options is now taken from API
Invertus · Nov 8, 2022 · 08c3a80 · 08c3a80
2 parents a2df45e + ada2d82
commit 08c3a80
Show file tree

Hide file tree

Showing 47 changed files with 36 additions and 15 deletions.
diff --git a/.github/.htaccess b/.github/.htaccess
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/User-guide-saferpay-module-for-prestashop-int-en.pdf b/User-guide-saferpay-module-for-prestashop-int-en.pdf
diff --git a/config/service.yml b/config/service.yml
@@ -187,6 +187,7 @@ services:
             - '@=service("adapter.context")'
             - '@Invertus\SaferPay\Repository\SaferPayPaymentRepository'
             - '@Invertus\SaferPay\Repository\SaferPayRestrictionRepository'
+            - '@Invertus\SaferPay\Service\SaferPayObtainPaymentMethods'
         tags:
             - { name: saferpay.paymentrestriction }
 

diff --git a/controllers/admin/AdminSaferPayOfficialPaymentController.php b/controllers/admin/AdminSaferPayOfficialPaymentController.php
@@ -177,7 +177,7 @@ protected function renderShoppingPointOptions()
                     'paymentMethod' => $paymentMethod,
                     'countryOptions' => $this->getActiveCountriesList(),
                     'countrySelect' => $selectedCountries,
-                    'currencyOptions' => $this->getActiveCurrenciesList(),
+                    'currencyOptions' => $this->getActiveCurrenciesList($paymentMethod),
                     'currencySelect' => $selectedCurrencies,
                     'is_field_active' => $isFieldActive,
                     'supported_field_payments' => SaferPayConfig::FIELD_SUPPORTED_PAYMENT_METHODS,
@@ -212,17 +212,21 @@ public function getActiveCountriesList($onlyActive = true)
         return $countriesWithNames;
     }
 
-    public function getActiveCurrenciesList($onlyActive = true)
+    public function getActiveCurrenciesList($paymentMethod)
     {
-        $langId = $this->context->language->id;
-        $currencies = Currency::getCurrencies($langId, $onlyActive);
-        $currenciesWithNames = [];
-        $currenciesWithNames[0] = $this->l('All');
-        foreach ($currencies as $currency) {
-            $currenciesWithNames[$currency->id] = $currency->name;
+        /** @var \Invertus\SaferPay\Service\SaferPayObtainPaymentMethods $saferPayObtainPaymentMethods */
+        $saferPayObtainPaymentMethods = $this->module->getModuleContainer()->get(SaferPayObtainPaymentMethods::class);
+
+        $paymentMethods = $saferPayObtainPaymentMethods->obtainPaymentMethods();
+
+        $currencyOptions[0] = $this->l('All');
+        foreach ($paymentMethods[$paymentMethod]['currencies'] as $currencyIso) {
+            if (Currency::getIdByIsoCode($currencyIso)) {
+                $currencyOptions[Currency::getIdByIsoCode($currencyIso)] = $currencyIso;
+            }
         }
 
-        return $currenciesWithNames;
+        return $currencyOptions;
     }
 
     protected function initForm()

diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
diff --git a/src/Api/Request/ObtainPaymentMethodsService.php b/src/Api/Request/ObtainPaymentMethodsService.php
diff --git a/src/DTO/Request/ObtainPaymentMethods/ObtainPaymentMethodsRequest.php b/src/DTO/Request/ObtainPaymentMethods/ObtainPaymentMethodsRequest.php
diff --git a/src/DTO/Request/PendingNotification.php b/src/DTO/Request/PendingNotification.php
diff --git a/src/Enum/ControllerName.php b/src/Enum/ControllerName.php
diff --git a/src/Enum/PaymentType.php b/src/Enum/PaymentType.php
diff --git a/src/Presentation/Loader/PaymentFormAssetLoader.php b/src/Presentation/Loader/PaymentFormAssetLoader.php
diff --git a/src/Provider/PaymentRestrictionProvider.php b/src/Provider/PaymentRestrictionProvider.php
diff --git a/src/Provider/PaymentRestrictionProviderInterface.php b/src/Provider/PaymentRestrictionProviderInterface.php
diff --git a/src/Provider/PaymentTypeProvider.php b/src/Provider/PaymentTypeProvider.php
diff --git a/src/Service/LegacyTranslator.php b/src/Service/LegacyTranslator.php
diff --git a/src/Service/PaymentRestrictionValidation/BasePaymentRestrictionValidation.php b/src/Service/PaymentRestrictionValidation/BasePaymentRestrictionValidation.php
@@ -23,9 +23,11 @@
 
 namespace Invertus\SaferPay\Service\PaymentRestrictionValidation;
 
+use Currency;
 use Invertus\SaferPay\Adapter\LegacyContext;
 use Invertus\SaferPay\Repository\SaferPayPaymentRepository;
 use Invertus\SaferPay\Repository\SaferPayRestrictionRepository;
+use Invertus\SaferPay\Service\SaferPayObtainPaymentMethods;
 use Invertus\SaferPay\Service\SaferPayRestrictionCreator;
 
 class BasePaymentRestrictionValidation implements PaymentRestrictionValidationInterface
@@ -45,14 +47,21 @@ class BasePaymentRestrictionValidation implements PaymentRestrictionValidationIn
      */
     private $legacyContext;
 
+    /**
+     * @var SaferPayObtainPaymentMethods
+     */
+    private $obtainPaymentMethods;
+
     public function __construct(
         LegacyContext $legacyContext,
         SaferPayPaymentRepository $paymentRepository,
-        SaferPayRestrictionRepository $restrictionRepository
+        SaferPayRestrictionRepository $restrictionRepository,
+        SaferPayObtainPaymentMethods $obtainPaymentMethods
     ) {
         $this->paymentRepository = $paymentRepository;
         $this->restrictionRepository = $restrictionRepository;
         $this->legacyContext = $legacyContext;
+        $this->obtainPaymentMethods = $obtainPaymentMethods;
     }
 
     /**
@@ -133,9 +142,14 @@ private function isCurrencySupportedByPaymentName($paymentName)
     {
         $enabledCurrencies = $this->getEnabledCurrenciesByPaymentName($paymentName);
 
-        $isAllCurrencies = in_array('0', $enabledCurrencies);
-        $isCurrencyInList = in_array($this->legacyContext->getCurrencyId(), $enabledCurrencies);
+        if (in_array('0', $enabledCurrencies)) {
+            $enabledCurrencies = [];
+            $currencyOptions = $this->obtainPaymentMethods->obtainPaymentMethods()[$paymentName]['currencies'];
+            foreach ($currencyOptions as $isoCode) {
+                $enabledCurrencies[$isoCode] = $isoCode;
+            }
+        }
 
-        return $isCurrencyInList || $isAllCurrencies;
+        return in_array($this->legacyContext->getCurrencyIsoCode(), $enabledCurrencies);
     }
 }
diff --git a/src/Service/PaymentRestrictionValidation/WlcryptopaymentsPaymentRestrictionValidation.php b/src/Service/PaymentRestrictionValidation/WlcryptopaymentsPaymentRestrictionValidation.php
diff --git a/src/Service/Request/ObtainPaymentMethodsObjectCreator.php b/src/Service/Request/ObtainPaymentMethodsObjectCreator.php
diff --git a/src/Service/SaferPayMailService.php b/src/Service/SaferPayMailService.php
diff --git a/src/Service/SaferPayObtainPaymentMethods.php b/src/Service/SaferPayObtainPaymentMethods.php
@@ -59,18 +59,20 @@ public function obtainPaymentMethods()
         if (!empty($paymentMethodsObject->PaymentMethods)) {
             foreach ($paymentMethodsObject->PaymentMethods as $paymentMethodObject) {
                 $paymentNotation = $this->saferPayPaymentNotation->getShortName($paymentMethodObject->PaymentMethod);
-                $paymentMethods[] = [
+                $paymentMethods[$paymentNotation] = [
                     'paymentMethod' => $paymentNotation,
                     'logoUrl' => $paymentMethodObject->LogoUrl,
+                    'currencies' => $paymentMethodObject->Currencies
                 ];
             }
         }
 
         if (!empty($paymentMethodsObject->Wallets)) {
             foreach ($paymentMethodsObject->Wallets as $wallet) {
-                $paymentMethods[] = [
+                $paymentMethods[$wallet->WalletName] = [
                     'paymentMethod' => $wallet->WalletName,
                     'logoUrl' => $wallet->LogoUrl,
+                    'currencies' => $paymentMethodObject->Currencies
                 ];
             }
         }

diff --git a/src/Service/SaferPayPaymentNotation.php b/src/Service/SaferPayPaymentNotation.php
diff --git a/src/Service/SaferPayRefreshPaymentsService.php b/src/Service/SaferPayRefreshPaymentsService.php
diff --git a/src/Service/TranslatorInterface.php b/src/Service/TranslatorInterface.php
diff --git a/...Service/PaymentRestrictionValidation/WlcryptopaymentsPaymentRestrictionValidationTest.php b/...Service/PaymentRestrictionValidation/WlcryptopaymentsPaymentRestrictionValidationTest.php
diff --git a/tests/Unit/Service/SaferPayPaymentNotationTest.php b/tests/Unit/Service/SaferPayPaymentNotationTest.php
diff --git a/translations/lt.php b/translations/lt.php
diff --git a/upgrade/install-1.0.18.php b/upgrade/install-1.0.18.php
diff --git a/views/img/APPLEPAY.png b/views/img/APPLEPAY.png
diff --git a/views/img/BANCONTACT.png b/views/img/BANCONTACT.png
diff --git a/views/img/IDEAL.png b/views/img/IDEAL.png
diff --git a/views/img/KLARNA.png b/views/img/KLARNA.png
diff --git a/views/img/WLCRYPTOPAYMENTS.png b/views/img/WLCRYPTOPAYMENTS.png
diff --git a/views/img/readme/img.png b/views/img/readme/img.png
diff --git a/views/img/readme/pic1.png b/views/img/readme/pic1.png
diff --git a/views/img/readme/pic2.png b/views/img/readme/pic2.png
diff --git a/views/img/readme/ss1.png b/views/img/readme/ss1.png
diff --git a/views/img/readme/ss2.png b/views/img/readme/ss2.png
diff --git a/views/img/readme/ss3.png b/views/img/readme/ss3.png
diff --git a/views/img/readme/ss4.png b/views/img/readme/ss4.png
diff --git a/views/img/readme/ss5.png b/views/img/readme/ss5.png
diff --git a/views/img/readme/ss6.png b/views/img/readme/ss6.png
diff --git a/views/img/readme/ss7.png b/views/img/readme/ss7.png
diff --git a/views/js/front/hosted-templates/hosted_fields.js b/views/js/front/hosted-templates/hosted_fields.js
diff --git a/views/js/front/hosted-templates/hosted_fields_16.js b/views/js/front/hosted-templates/hosted_fields_16.js