PLGSHPS-284: Forcing API request, when install payment methods (#173)

MultiSafepay · Mar 11, 2024 · 579b07d · 579b07d
1 parent e695ef0
commit 579b07d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/MltisafeMultiSafepayPayment.php b/MltisafeMultiSafepayPayment.php
@@ -191,7 +191,7 @@ private function setMinAndMaxAmounts($paymentMethodId, array $paymentMethodAmoun
     private function updatePaymentMethods(UpdateContext $context): void
     {
         $installer = $this->container->get('shopware.plugin_payment_installer');
-        $paymentMethods = (new PaymentMethodsService($this->container))->loadPaymentMethods();
+        $paymentMethods = (new PaymentMethodsService($this->container))->loadPaymentMethods(true);
 
         if (!empty($paymentMethods)) {
             foreach ($paymentMethods as $paymentMethod) {

diff --git a/Service/PaymentMethodsService.php b/Service/PaymentMethodsService.php
@@ -59,12 +59,15 @@ public function __construct($container)
     /**
      * Load payment methods
      *
+     * @param bool|null $force Force the loading of
+     *                         payment methods
+     *
      * @param bool|null $shop Defaults to active shop.
      *                        If false, no shop will be used
      *
      * @return PaymentMethod[]
      */
-    public function loadPaymentMethods(bool $shop = null): array
+    public function loadPaymentMethods(bool $force = false, bool $shop = null): array
     {
         /** @var Zend_Cache_Core $cache */
         $cache = $this->container->get('cache');
@@ -74,7 +77,8 @@ public function loadPaymentMethods(bool $shop = null): array
         $configReader = $this->container->get('shopware.plugin.config_reader');
         $pluginConfig = $configReader ? $configReader->getByPluginName('MltisafeMultiSafepayPayment', $shop) : [];
 
-        if ($cache->load($cacheId) === false) {
+        // Load payment methods using a call to the API
+        if ($force || ($cache->load($cacheId) === false)) {
             $options = [];
 
             if ($pluginConfig['msp_group_card_payment']) {

diff --git a/Subscriber/PaymentMethodsInstaller.php b/Subscriber/PaymentMethodsInstaller.php
@@ -69,7 +69,7 @@ public function __construct($container)
      */
     public function installPaymentMethods(): void
     {
-        $paymentMethods = $this->paymentMethods->loadPaymentMethods();
+        $paymentMethods = $this->paymentMethods->loadPaymentMethods(true);
         $this->disableInactiveMultiSafepayPaymentMethods($paymentMethods);
         $this->installPaymentMethodsInShopware($paymentMethods);
     }
@@ -82,7 +82,7 @@ public function installPaymentMethods(): void
      */
     public function installPaymentMethodsWithoutShop(): void
     {
-        $paymentMethods = $this->paymentMethods->loadPaymentMethods(false);
+        $paymentMethods = $this->paymentMethods->loadPaymentMethods(true, false);
         $this->disableInactiveMultiSafepayPaymentMethods($paymentMethods);
         $this->installPaymentMethodsInShopware($paymentMethods);
     }