Merge pull request #870 from mollie/PIPRES-349-update-carrier-callers

PIPRES-349: Update carrier callers
mollie · May 14, 2024 · 4fc0249 · 4fc0249
2 parents a149a88 + 8e6c0cb
commit 4fc0249
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 3 deletions.
diff --git a/mollie.php b/mollie.php
@@ -27,6 +27,7 @@
 use Mollie\Service\ExceptionService;
 use Mollie\ServiceProvider\LeagueServiceContainerProvider;
 use Mollie\Subscription\Handler\CustomerAddressUpdateHandler;
+use Mollie\Subscription\Handler\UpdateSubscriptionCarrierHandler;
 use Mollie\Subscription\Install\AttributeInstaller;
 use Mollie\Subscription\Install\DatabaseTableInstaller;
 use Mollie\Subscription\Install\HookInstaller;
@@ -1271,6 +1272,39 @@ public function hookActionObjectAddressDeleteAfter(array $params): void
         $this->addPreventDeleteErrorMessage();
     }
 
+    public function hookActionCarrierUpdate(array $params): void
+    {
+        $oldCarrierId = $params['id_carrier'] ?? 0;
+        $newCarrier = $params['carrier'] ?? null;
+
+        if (empty($oldCarrierId) || empty($newCarrier)) {
+            return;
+        }
+
+        /** @var UpdateSubscriptionCarrierHandler $subscriptionCarrierUpdateHandler */
+        $subscriptionCarrierUpdateHandler = $this->getService(UpdateSubscriptionCarrierHandler::class);
+
+        /** @var ConfigurationAdapter $configuration */
+        $configuration = $this->getService(ConfigurationAdapter::class);
+
+        /** @var PrestaLoggerInterface $logger */
+        $logger = $this->getService(PrestaLoggerInterface::class);
+
+        if ((int) $oldCarrierId !== (int) $configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID)) {
+            return;
+        }
+
+        $failedSubscriptionOrderIdsToUpdate = $subscriptionCarrierUpdateHandler->run((int) $newCarrier->id);
+
+        if (empty($failedSubscriptionOrderIdsToUpdate)) {
+            return;
+        }
+
+        $logger->error('Failed to update subscription carrier for all orders.', [
+            'failed_subscription_order_ids' => json_encode($failedSubscriptionOrderIdsToUpdate),
+        ]);
+    }
+
     public function hookActionFrontControllerAfterInit(): void
     {
         $this->frontControllerAfterInit();

diff --git a/src/Install/Installer.php b/src/Install/Installer.php
@@ -171,6 +171,7 @@ public static function getHooks()
             'actionObjectOrderPaymentAddAfter',
             'displayProductAdditionalInfo',
             'displayCustomerAccount',
+            'actionCarrierUpdate',
         ];
     }
 

diff --git a/src/Install/Uninstall.php b/src/Install/Uninstall.php
@@ -96,7 +96,6 @@ private function deleteConfig()
             Config::METHODS_CONFIG,
             Config::MOLLIE_MAIL_WHEN_COMPLETED,
             Config::MOLLIE_API_KEY_TEST,
-            Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID,
             Config::MOLLIE_SUBSCRIPTION_ENABLED,
         ];
 

diff --git a/subscription/Controller/Symfony/SubscriptionController.php b/subscription/Controller/Symfony/SubscriptionController.php
@@ -15,11 +15,15 @@
 namespace Mollie\Subscription\Controller\Symfony;
 
 use Exception;
+use Mollie\Adapter\ConfigurationAdapter;
 use Mollie\Adapter\Shop;
+use Mollie\Config\Config;
+use Mollie\Logger\PrestaLoggerInterface;
 use Mollie\Subscription\Exception\SubscriptionApiException;
 use Mollie\Subscription\Filters\SubscriptionFilters;
 use Mollie\Subscription\Grid\SubscriptionGridDefinitionFactory;
 use Mollie\Subscription\Handler\SubscriptionCancellationHandler;
+use Mollie\Subscription\Handler\UpdateSubscriptionCarrierHandler;
 use Mollie\Utility\PsVersionUtility;
 use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
 use PrestaShop\PrestaShop\Core\Grid\GridFactoryInterface;
@@ -96,6 +100,8 @@ public function submitOptionsAction(Request $request): RedirectResponse
             return $this->redirectToRoute('admin_subscription_index');
         }
 
+        $this->updateSubscriptionCarrier($form->getData()['carrier']);
+
         $formHandler->save($form->getData());
 
         $this->addFlash(
@@ -106,6 +112,34 @@ public function submitOptionsAction(Request $request): RedirectResponse
         return $this->redirectToRoute('admin_subscription_index');
     }
 
+    private function updateSubscriptionCarrier(int $newCarrierId): void
+    {
+        /** @var ConfigurationAdapter $configuration */
+        $configuration = $this->module->getService(ConfigurationAdapter::class);
+        $oldCarrierId = $configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
+
+        if (empty($oldCarrierId) || empty($newCarrierId)) {
+            $this->addFlash(
+                'error',
+                $this->module->l('Carrier not found', self::FILE_NAME)
+            );
+        }
+
+        /** @var UpdateSubscriptionCarrierHandler $subscriptionCarrierUpdateHandler */
+        $subscriptionCarrierUpdateHandler = $this->module->getService(UpdateSubscriptionCarrierHandler::class);
+
+        /** @var PrestaLoggerInterface $logger */
+        $logger = $this->module->getService(PrestaLoggerInterface::class);
+
+        $failedSubscriptionOrderIdsToUpdate = $subscriptionCarrierUpdateHandler->run($newCarrierId);
+
+        if (!empty($failedSubscriptionOrderIdsToUpdate)) {
+            $logger->error('Failed to update subscription carrier for all orders.', [
+                'failed_subscription_order_ids' => json_encode($failedSubscriptionOrderIdsToUpdate),
+            ]);
+        }
+    }
+
     /**
      * Provides filters functionality.
      *

diff --git a/subscription/Repository/RecurringOrderRepository.php b/subscription/Repository/RecurringOrderRepository.php
@@ -35,8 +35,8 @@ public function getAllOrdersBasedOnStatuses(array $statuses, int $shopId): array
             ->select(
                 'mro.id_mol_recurring_order as id, mro.mollie_subscription_id,
                 mro.mollie_customer_id, mro.id_cart,
-                mro.id_mol_recurring_product as id_recurring_product,
-                mro.id_invoice_address, mro.id_delivery_address'
+                mro.id_mol_recurring_orders_product as id_recurring_product,
+                mro.id_address_invoice, mro.id_delivery_address'
             )
             ->from('mol_recurring_order', 'mro')
             ->leftJoin(

diff --git a/views/templates/admin/Subscription/subscriptions-settings.html.twig b/views/templates/admin/Subscription/subscriptions-settings.html.twig
@@ -9,6 +9,8 @@
  * @codingStandardsIgnoreStart
  *#}
 
+{% import '@PrestaShop/Admin/macros.html.twig' as ps %}
+
 {% set subscriptionOptions = subscriptionOptionsForm %}
 
 {% if subscriptionOptionsForm.subscription_options is defined and subscriptionOptionsForm.subscription_options %}