From 5e098a62e6574af477fbc5c5944c1d1ad44af218 Mon Sep 17 00:00:00 2001
From: mandan2 <mantasda2@gmail.com>
Date: Mon, 25 Sep 2023 17:47:28 +0300
Subject: [PATCH 1/3] PIPRES-261: Get carrier price to create subscription

---
 .../CouldNotProvideCarrierDeliveryPrice.php   |  62 +++++++
 .../Provider/CarrierDeliveryPriceProvider.php | 122 ++++++++++++++
 .../CarrierDeliveryPriceProviderTest.php      | 159 ++++++++++++++++++
 3 files changed, 343 insertions(+)
 create mode 100644 subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
 create mode 100644 subscription/Provider/CarrierDeliveryPriceProvider.php
 create mode 100644 tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php

diff --git a/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php b/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
new file mode 100644
index 000000000..c6f20a9e4
--- /dev/null
+++ b/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Mollie\Subscription\Exception;
+
+class CouldNotProvideCarrierDeliveryPrice extends MollieSubscriptionException
+{
+    public static function failedToFindSelectedCarrierForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to find selected carrier for subscription order',
+            ExceptionCode::ORDER_FAILED_TO_FIND_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER
+        );
+    }
+
+    public static function failedToFindOrderCart(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to find order cart',
+            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_CART
+        );
+    }
+
+    public static function failedToFindOrderCustomer(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to find order customer',
+            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_CUSTOMER
+        );
+    }
+
+    public static function failedToApplySelectedCarrierForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to apply selected carrier for subscription order',
+            ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER
+        );
+    }
+
+    public static function failedToFindOrderDeliveryAddress(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to find order delivery address',
+            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DELIVERY_ADDRESS
+        );
+    }
+
+    public static function failedToFindOrderDeliveryCountry(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to find order delivery country',
+            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DELIVERY_COUNTRY
+        );
+    }
+
+    public static function failedToGetSelectedCarrierPriceForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
+    {
+        return new self(
+            'Failed to get selected carrier price for subscription order',
+            ExceptionCode::ORDER_FAILED_TO_GET_SELECTED_CARRIER_PRICE_FOR_SUBSCRIPTION_ORDER
+        );
+    }
+}
diff --git a/subscription/Provider/CarrierDeliveryPriceProvider.php b/subscription/Provider/CarrierDeliveryPriceProvider.php
new file mode 100644
index 000000000..f22f794e8
--- /dev/null
+++ b/subscription/Provider/CarrierDeliveryPriceProvider.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Mollie\Subscription\Provider;
+
+use Mollie\Adapter\ConfigurationAdapter;
+use Mollie\Config\Config;
+use Mollie\Repository\AddressRepositoryInterface;
+use Mollie\Repository\CarrierRepositoryInterface;
+use Mollie\Repository\CartRepositoryInterface;
+use Mollie\Repository\CountryRepositoryInterface;
+use Mollie\Repository\CustomerRepositoryInterface;
+use Mollie\Subscription\Exception\CouldNotProvideCarrierDeliveryPrice;
+
+class CarrierDeliveryPriceProvider
+{
+    /** @var ConfigurationAdapter */
+    private $configuration;
+    /** @var CarrierRepositoryInterface */
+    private $carrierRepository;
+    /** @var AddressRepositoryInterface */
+    private $addressRepository;
+    /** @var CustomerRepositoryInterface */
+    private $customerRepository;
+    /** @var CartRepositoryInterface */
+    private $cartRepository;
+    /** @var CountryRepositoryInterface */
+    private $countryRepository;
+
+    public function __construct(
+        ConfigurationAdapter $configuration,
+        CarrierRepositoryInterface $carrierRepository,
+        AddressRepositoryInterface $addressRepository,
+        CustomerRepositoryInterface $customerRepository,
+        CartRepositoryInterface $cartRepository,
+        CountryRepositoryInterface $countryRepository
+    ) {
+        $this->configuration = $configuration;
+        $this->carrierRepository = $carrierRepository;
+        $this->addressRepository = $addressRepository;
+        $this->customerRepository = $customerRepository;
+        $this->cartRepository = $cartRepository;
+        $this->countryRepository = $countryRepository;
+    }
+
+    /**
+     * @throws CouldNotProvideCarrierDeliveryPrice
+     */
+    public function getPrice(int $addressDeliveryId, int $cartId, int $customerId, array $subscriptionProduct): float
+    {
+        $subscriptionCarrierId = (int) $this->configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
+
+        /** @var \Carrier|null $carrier */
+        $carrier = $this->carrierRepository->findOneBy([
+            'id_carrier' => $subscriptionCarrierId,
+        ]);
+
+        if (!$carrier) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToFindSelectedCarrierForSubscriptionOrder();
+        }
+
+        /** @var \Cart|null $cart */
+        $cart = $this->cartRepository->findOneBy([
+            'id_cart' => $cartId,
+        ]);
+
+        if (!$cart) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderCart();
+        }
+
+        /** @var \Customer|null $customer */
+        $customer = $this->customerRepository->findOneBy([
+            'id_customer' => $customerId,
+        ]);
+
+        if (!$customer) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderCustomer();
+        }
+
+        $getAvailableOrderCarriers = $this->carrierRepository->getCarriersForOrder(
+            $this->addressRepository->getZoneById($addressDeliveryId),
+            $customer->getGroups(),
+            $cart
+        );
+
+        if (!in_array($subscriptionCarrierId, array_column($getAvailableOrderCarriers, 'id_carrier'), false)) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToApplySelectedCarrierForSubscriptionOrder();
+        }
+
+        /** @var \Address|bool $address */
+        $address = $this->addressRepository->findOneBy([
+            'id_address' => $addressDeliveryId,
+        ]);
+
+        if (!$address) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderDeliveryAddress();
+        }
+
+        /** @var \Country|bool $country */
+        $country = $this->countryRepository->findOneBy([
+            'id_country' => $address->id_country,
+        ]);
+
+        if (!$country) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderDeliveryCountry();
+        }
+
+        /** @var float|bool $deliveryPrice */
+        $deliveryPrice = $cart->getPackageShippingCost(
+            $subscriptionCarrierId,
+            true,
+            $country,
+            [$subscriptionProduct],
+            $this->addressRepository->getZoneById($addressDeliveryId)
+        );
+
+        if (is_bool($deliveryPrice) && !$deliveryPrice) {
+            throw CouldNotProvideCarrierDeliveryPrice::failedToGetSelectedCarrierPriceForSubscriptionOrder();
+        }
+
+        return (float) $deliveryPrice;
+    }
+}
diff --git a/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php b/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php
new file mode 100644
index 000000000..bf8e5416c
--- /dev/null
+++ b/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Mollie\Tests\Integration\Subscription\Provider;
+
+use Mollie\Adapter\ConfigurationAdapter;
+use Mollie\Config\Config;
+use Mollie\Subscription\Exception\CouldNotProvideCarrierDeliveryPrice;
+use Mollie\Subscription\Exception\ExceptionCode;
+use Mollie\Subscription\Provider\CarrierDeliveryPriceProvider;
+use Mollie\Tests\Integration\BaseTestCase;
+use Mollie\Tests\Integration\Factory\AddressFactory;
+use Mollie\Tests\Integration\Factory\CarrierFactory;
+use Mollie\Tests\Integration\Factory\CartFactory;
+use Mollie\Tests\Integration\Factory\ProductFactory;
+
+class CarrierDeliveryPriceProviderTest extends BaseTestCase
+{
+    public function setUp(): void
+    {
+        /** @var ConfigurationAdapter $configuration */
+        $configuration = $this->getService(ConfigurationAdapter::class);
+
+        $this->subscriptionOrderCarrierId = $configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
+
+        parent::setUp();
+    }
+
+    public function tearDown(): void
+    {
+        /** @var ConfigurationAdapter $configuration */
+        $configuration = $this->getService(ConfigurationAdapter::class);
+
+        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $this->subscriptionOrderCarrierId);
+
+        parent::tearDown();
+    }
+
+    public function testItSuccessfullyProvidesCarrierDeliveryPrice(): void
+    {
+        $address = AddressFactory::create();
+        $carrier = CarrierFactory::create([
+            'price' => 999.00,
+        ]);
+        $cart = CartFactory::create([
+            'id_carrier' => $carrier->id,
+        ]);
+
+        /** @var ConfigurationAdapter $configuration */
+        $configuration = $this->getService(ConfigurationAdapter::class);
+
+        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id);
+
+        $targetProduct = ProductFactory::create([
+            'quantity' => 10,
+        ]);
+        $product1 = ProductFactory::create([
+            'quantity' => 10,
+        ]);
+        $product2 = ProductFactory::create([
+            'quantity' => 10,
+        ]);
+
+        $cart->updateQty(2, $targetProduct->id);
+
+        $targetProductArray = $cart->getProducts()[0];
+
+        $cart->updateQty(2, $product1->id);
+        $cart->updateQty(3, $product2->id);
+
+        /** @var CarrierDeliveryPriceProvider $carrierDeliveryPriceProvider */
+        $carrierDeliveryPriceProvider = $this->getService(CarrierDeliveryPriceProvider::class);
+
+        $result = $carrierDeliveryPriceProvider->getPrice(
+            $address->id,
+            $cart->id,
+            $cart->id_customer,
+            $targetProductArray
+        );
+
+        $this->assertEquals(999.00, $result);
+
+        $this->removeFactories([
+            $carrier,
+            $address,
+            $cart,
+            $targetProduct,
+            $product1,
+            $product2,
+        ]);
+    }
+
+    public function testItUnsuccessfullyProvidesCarrierDeliveryPriceCarrierIsOutOfZone(): void
+    {
+        $address = AddressFactory::create();
+        $carrier = CarrierFactory::create([
+            'price' => 999.00,
+            'id_zones_to_delete' => [
+                $address::getZoneById($address->id),
+            ],
+        ]);
+        $cart = CartFactory::create([
+            'id_carrier' => $carrier->id,
+        ]);
+
+        /** @var ConfigurationAdapter $configuration */
+        $configuration = $this->getService(ConfigurationAdapter::class);
+
+        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id);
+
+        $targetProduct = ProductFactory::create([
+            'quantity' => 10,
+        ]);
+        $product1 = ProductFactory::create([
+            'quantity' => 10,
+        ]);
+        $product2 = ProductFactory::create([
+            'quantity' => 10,
+        ]);
+
+        $cart->updateQty(2, $targetProduct->id);
+
+        $targetProductArray = $cart->getProducts()[0];
+
+        $cart->updateQty(2, $product1->id);
+        $cart->updateQty(3, $product2->id);
+
+        $this->expectException(CouldNotProvideCarrierDeliveryPrice::class);
+        $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER);
+
+        /** @var CarrierDeliveryPriceProvider $carrierDeliveryPriceProvider */
+        $carrierDeliveryPriceProvider = $this->getService(CarrierDeliveryPriceProvider::class);
+
+        $carrierDeliveryPriceProvider->getPrice(
+            $address->id,
+            $cart->id,
+            $cart->id_customer,
+            $targetProductArray
+        );
+
+        $this->removeFactories([
+            $carrier,
+            $address,
+            $cart,
+            $targetProduct,
+            $product1,
+            $product2,
+        ]);
+    }
+
+    /**
+     * @param \ObjectModel[] $objects
+     */
+    private function removeFactories(array $objects): void
+    {
+        foreach ($objects as $object) {
+            $object->delete();
+        }
+    }
+}

From 96041d935ecb3caf2beeadab83824b61d7aa2a4a Mon Sep 17 00:00:00 2001
From: mandan2 <mantasda2@gmail.com>
Date: Tue, 26 Sep 2023 13:45:46 +0300
Subject: [PATCH 2/3] renamed some services and added additional conditions for
 carrier retrieve

---
 .../CouldNotProvideCarrierDeliveryPrice.php   |  62 -------
 .../Provider/CarrierDeliveryPriceProvider.php | 122 --------------
 .../CarrierDeliveryPriceProviderTest.php      | 159 ------------------
 3 files changed, 343 deletions(-)
 delete mode 100644 subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
 delete mode 100644 subscription/Provider/CarrierDeliveryPriceProvider.php
 delete mode 100644 tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php

diff --git a/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php b/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
deleted file mode 100644
index c6f20a9e4..000000000
--- a/subscription/Exception/CouldNotProvideCarrierDeliveryPrice.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Mollie\Subscription\Exception;
-
-class CouldNotProvideCarrierDeliveryPrice extends MollieSubscriptionException
-{
-    public static function failedToFindSelectedCarrierForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find selected carrier for subscription order',
-            ExceptionCode::ORDER_FAILED_TO_FIND_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER
-        );
-    }
-
-    public static function failedToFindOrderCart(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order cart',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_CART
-        );
-    }
-
-    public static function failedToFindOrderCustomer(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order customer',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_CUSTOMER
-        );
-    }
-
-    public static function failedToApplySelectedCarrierForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to apply selected carrier for subscription order',
-            ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER
-        );
-    }
-
-    public static function failedToFindOrderDeliveryAddress(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order delivery address',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DELIVERY_ADDRESS
-        );
-    }
-
-    public static function failedToFindOrderDeliveryCountry(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to find order delivery country',
-            ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DELIVERY_COUNTRY
-        );
-    }
-
-    public static function failedToGetSelectedCarrierPriceForSubscriptionOrder(): CouldNotProvideCarrierDeliveryPrice
-    {
-        return new self(
-            'Failed to get selected carrier price for subscription order',
-            ExceptionCode::ORDER_FAILED_TO_GET_SELECTED_CARRIER_PRICE_FOR_SUBSCRIPTION_ORDER
-        );
-    }
-}
diff --git a/subscription/Provider/CarrierDeliveryPriceProvider.php b/subscription/Provider/CarrierDeliveryPriceProvider.php
deleted file mode 100644
index f22f794e8..000000000
--- a/subscription/Provider/CarrierDeliveryPriceProvider.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Mollie\Subscription\Provider;
-
-use Mollie\Adapter\ConfigurationAdapter;
-use Mollie\Config\Config;
-use Mollie\Repository\AddressRepositoryInterface;
-use Mollie\Repository\CarrierRepositoryInterface;
-use Mollie\Repository\CartRepositoryInterface;
-use Mollie\Repository\CountryRepositoryInterface;
-use Mollie\Repository\CustomerRepositoryInterface;
-use Mollie\Subscription\Exception\CouldNotProvideCarrierDeliveryPrice;
-
-class CarrierDeliveryPriceProvider
-{
-    /** @var ConfigurationAdapter */
-    private $configuration;
-    /** @var CarrierRepositoryInterface */
-    private $carrierRepository;
-    /** @var AddressRepositoryInterface */
-    private $addressRepository;
-    /** @var CustomerRepositoryInterface */
-    private $customerRepository;
-    /** @var CartRepositoryInterface */
-    private $cartRepository;
-    /** @var CountryRepositoryInterface */
-    private $countryRepository;
-
-    public function __construct(
-        ConfigurationAdapter $configuration,
-        CarrierRepositoryInterface $carrierRepository,
-        AddressRepositoryInterface $addressRepository,
-        CustomerRepositoryInterface $customerRepository,
-        CartRepositoryInterface $cartRepository,
-        CountryRepositoryInterface $countryRepository
-    ) {
-        $this->configuration = $configuration;
-        $this->carrierRepository = $carrierRepository;
-        $this->addressRepository = $addressRepository;
-        $this->customerRepository = $customerRepository;
-        $this->cartRepository = $cartRepository;
-        $this->countryRepository = $countryRepository;
-    }
-
-    /**
-     * @throws CouldNotProvideCarrierDeliveryPrice
-     */
-    public function getPrice(int $addressDeliveryId, int $cartId, int $customerId, array $subscriptionProduct): float
-    {
-        $subscriptionCarrierId = (int) $this->configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
-
-        /** @var \Carrier|null $carrier */
-        $carrier = $this->carrierRepository->findOneBy([
-            'id_carrier' => $subscriptionCarrierId,
-        ]);
-
-        if (!$carrier) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindSelectedCarrierForSubscriptionOrder();
-        }
-
-        /** @var \Cart|null $cart */
-        $cart = $this->cartRepository->findOneBy([
-            'id_cart' => $cartId,
-        ]);
-
-        if (!$cart) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderCart();
-        }
-
-        /** @var \Customer|null $customer */
-        $customer = $this->customerRepository->findOneBy([
-            'id_customer' => $customerId,
-        ]);
-
-        if (!$customer) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderCustomer();
-        }
-
-        $getAvailableOrderCarriers = $this->carrierRepository->getCarriersForOrder(
-            $this->addressRepository->getZoneById($addressDeliveryId),
-            $customer->getGroups(),
-            $cart
-        );
-
-        if (!in_array($subscriptionCarrierId, array_column($getAvailableOrderCarriers, 'id_carrier'), false)) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToApplySelectedCarrierForSubscriptionOrder();
-        }
-
-        /** @var \Address|bool $address */
-        $address = $this->addressRepository->findOneBy([
-            'id_address' => $addressDeliveryId,
-        ]);
-
-        if (!$address) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderDeliveryAddress();
-        }
-
-        /** @var \Country|bool $country */
-        $country = $this->countryRepository->findOneBy([
-            'id_country' => $address->id_country,
-        ]);
-
-        if (!$country) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToFindOrderDeliveryCountry();
-        }
-
-        /** @var float|bool $deliveryPrice */
-        $deliveryPrice = $cart->getPackageShippingCost(
-            $subscriptionCarrierId,
-            true,
-            $country,
-            [$subscriptionProduct],
-            $this->addressRepository->getZoneById($addressDeliveryId)
-        );
-
-        if (is_bool($deliveryPrice) && !$deliveryPrice) {
-            throw CouldNotProvideCarrierDeliveryPrice::failedToGetSelectedCarrierPriceForSubscriptionOrder();
-        }
-
-        return (float) $deliveryPrice;
-    }
-}
diff --git a/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php b/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php
deleted file mode 100644
index bf8e5416c..000000000
--- a/tests/Integration/Subscription/Provider/CarrierDeliveryPriceProviderTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace Mollie\Tests\Integration\Subscription\Provider;
-
-use Mollie\Adapter\ConfigurationAdapter;
-use Mollie\Config\Config;
-use Mollie\Subscription\Exception\CouldNotProvideCarrierDeliveryPrice;
-use Mollie\Subscription\Exception\ExceptionCode;
-use Mollie\Subscription\Provider\CarrierDeliveryPriceProvider;
-use Mollie\Tests\Integration\BaseTestCase;
-use Mollie\Tests\Integration\Factory\AddressFactory;
-use Mollie\Tests\Integration\Factory\CarrierFactory;
-use Mollie\Tests\Integration\Factory\CartFactory;
-use Mollie\Tests\Integration\Factory\ProductFactory;
-
-class CarrierDeliveryPriceProviderTest extends BaseTestCase
-{
-    public function setUp(): void
-    {
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $this->subscriptionOrderCarrierId = $configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID);
-
-        parent::setUp();
-    }
-
-    public function tearDown(): void
-    {
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $this->subscriptionOrderCarrierId);
-
-        parent::tearDown();
-    }
-
-    public function testItSuccessfullyProvidesCarrierDeliveryPrice(): void
-    {
-        $address = AddressFactory::create();
-        $carrier = CarrierFactory::create([
-            'price' => 999.00,
-        ]);
-        $cart = CartFactory::create([
-            'id_carrier' => $carrier->id,
-        ]);
-
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id);
-
-        $targetProduct = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product1 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product2 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-
-        $cart->updateQty(2, $targetProduct->id);
-
-        $targetProductArray = $cart->getProducts()[0];
-
-        $cart->updateQty(2, $product1->id);
-        $cart->updateQty(3, $product2->id);
-
-        /** @var CarrierDeliveryPriceProvider $carrierDeliveryPriceProvider */
-        $carrierDeliveryPriceProvider = $this->getService(CarrierDeliveryPriceProvider::class);
-
-        $result = $carrierDeliveryPriceProvider->getPrice(
-            $address->id,
-            $cart->id,
-            $cart->id_customer,
-            $targetProductArray
-        );
-
-        $this->assertEquals(999.00, $result);
-
-        $this->removeFactories([
-            $carrier,
-            $address,
-            $cart,
-            $targetProduct,
-            $product1,
-            $product2,
-        ]);
-    }
-
-    public function testItUnsuccessfullyProvidesCarrierDeliveryPriceCarrierIsOutOfZone(): void
-    {
-        $address = AddressFactory::create();
-        $carrier = CarrierFactory::create([
-            'price' => 999.00,
-            'id_zones_to_delete' => [
-                $address::getZoneById($address->id),
-            ],
-        ]);
-        $cart = CartFactory::create([
-            'id_carrier' => $carrier->id,
-        ]);
-
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->getService(ConfigurationAdapter::class);
-
-        $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id);
-
-        $targetProduct = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product1 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-        $product2 = ProductFactory::create([
-            'quantity' => 10,
-        ]);
-
-        $cart->updateQty(2, $targetProduct->id);
-
-        $targetProductArray = $cart->getProducts()[0];
-
-        $cart->updateQty(2, $product1->id);
-        $cart->updateQty(3, $product2->id);
-
-        $this->expectException(CouldNotProvideCarrierDeliveryPrice::class);
-        $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER_FOR_SUBSCRIPTION_ORDER);
-
-        /** @var CarrierDeliveryPriceProvider $carrierDeliveryPriceProvider */
-        $carrierDeliveryPriceProvider = $this->getService(CarrierDeliveryPriceProvider::class);
-
-        $carrierDeliveryPriceProvider->getPrice(
-            $address->id,
-            $cart->id,
-            $cart->id_customer,
-            $targetProductArray
-        );
-
-        $this->removeFactories([
-            $carrier,
-            $address,
-            $cart,
-            $targetProduct,
-            $product1,
-            $product2,
-        ]);
-    }
-
-    /**
-     * @param \ObjectModel[] $objects
-     */
-    private function removeFactories(array $objects): void
-    {
-        foreach ($objects as $object) {
-            $object->delete();
-        }
-    }
-}

From cc45938fe119a52836b6718423211ef0389aca3c Mon Sep 17 00:00:00 2001
From: mandan2 <mantasda2@gmail.com>
Date: Mon, 2 Oct 2023 13:34:30 +0300
Subject: [PATCH 3/3] PIPRES-261: Minor improvements

---
 src/Builder/FormBuilder.php                   | 10 +++---
 .../CouldNotCreateOrderPaymentFee.php         |  2 +-
 src/Exception/CouldNotInstallModule.php       |  2 +-
 src/Exception/CouldNotUpdateOrderTotals.php   |  2 +-
 .../CouldNotHandleOrderPaymentFee.php         |  8 ++---
 .../CouldNotHandleRecurringOrder.php          |  4 +--
 .../Exception/CouldNotPresentOrderDetail.php  |  8 ++---
 ...rovideSubscriptionCarrierDeliveryPrice.php | 14 ++++----
 .../Handler/RecurringOrderHandler.php         |  6 ++--
 .../Subscription/subscriptions-faq.html.twig  | 36 +++++++++----------
 .../customerRecurringOrderDetailProduct.tpl   | 18 +++++-----
 11 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/src/Builder/FormBuilder.php b/src/Builder/FormBuilder.php
index 5f77b946b..111c9f83f 100644
--- a/src/Builder/FormBuilder.php
+++ b/src/Builder/FormBuilder.php
@@ -845,12 +845,10 @@ private function getShippingOptions(string $tab): array
         ];
 
         foreach ($carriers as $carrier) {
-            $mappedCarrier = [];
-
-            $mappedCarrier['id'] = $carrier->id;
-            $mappedCarrier['name'] = $carrier->name;
-
-            $mappedCarriers[] = $mappedCarrier;
+            $mappedCarriers[] = [
+                'id' => $carrier->id,
+                'name' => $carrier->name,
+            ];
         }
 
         $header = [
diff --git a/src/Exception/CouldNotCreateOrderPaymentFee.php b/src/Exception/CouldNotCreateOrderPaymentFee.php
index dd7919550..0ac620f71 100644
--- a/src/Exception/CouldNotCreateOrderPaymentFee.php
+++ b/src/Exception/CouldNotCreateOrderPaymentFee.php
@@ -7,7 +7,7 @@
 
 class CouldNotCreateOrderPaymentFee extends MollieException
 {
-    public static function failedToInsertOrderPaymentFee(Exception $exception): CouldNotCreateOrderPaymentFee
+    public static function failedToInsertOrderPaymentFee(Exception $exception): self
     {
         return new self(
             'Failed to insert order payment fee.',
diff --git a/src/Exception/CouldNotInstallModule.php b/src/Exception/CouldNotInstallModule.php
index 9ff488ae8..c9fd4b06c 100644
--- a/src/Exception/CouldNotInstallModule.php
+++ b/src/Exception/CouldNotInstallModule.php
@@ -6,7 +6,7 @@
 
 class CouldNotInstallModule extends MollieException
 {
-    public static function failedToInstallOrderState(string $orderStateName, \Exception $exception): CouldNotInstallModule
+    public static function failedToInstallOrderState(string $orderStateName, \Exception $exception): self
     {
         return new self(
             sprintf('Failed to install order state (%s).', $orderStateName),
diff --git a/src/Exception/CouldNotUpdateOrderTotals.php b/src/Exception/CouldNotUpdateOrderTotals.php
index 6c8625bbc..69bda3404 100644
--- a/src/Exception/CouldNotUpdateOrderTotals.php
+++ b/src/Exception/CouldNotUpdateOrderTotals.php
@@ -7,7 +7,7 @@
 
 class CouldNotUpdateOrderTotals extends MollieException
 {
-    public static function failedToUpdateOrderTotals(Exception $exception): CouldNotUpdateOrderTotals
+    public static function failedToUpdateOrderTotals(Exception $exception): self
     {
         return new self(
             'Failed to update order totals.',
diff --git a/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php b/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php
index cab968358..077c1f55a 100644
--- a/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php
+++ b/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php
@@ -8,7 +8,7 @@
 
 class CouldNotHandleOrderPaymentFee extends MollieException
 {
-    public static function failedToRetrievePaymentMethod(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToRetrievePaymentMethod(Throwable $exception): self
     {
         return new self(
             'Failed to retrieve payment method',
@@ -17,7 +17,7 @@ public static function failedToRetrievePaymentMethod(Throwable $exception): Coul
         );
     }
 
-    public static function failedToRetrievePaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToRetrievePaymentFee(Throwable $exception): self
     {
         return new self(
             'Failed to retrieve payment fee',
@@ -26,7 +26,7 @@ public static function failedToRetrievePaymentFee(Throwable $exception): CouldNo
         );
     }
 
-    public static function failedToCreateOrderPaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToCreateOrderPaymentFee(Throwable $exception): self
     {
         return new self(
             'Failed to create order payment fee',
@@ -35,7 +35,7 @@ public static function failedToCreateOrderPaymentFee(Throwable $exception): Coul
         );
     }
 
-    public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): self
     {
         return new self(
             'Failed to update order total with payment fee.',
diff --git a/subscription/Exception/CouldNotHandleRecurringOrder.php b/subscription/Exception/CouldNotHandleRecurringOrder.php
index e1dbc95e1..88c00de19 100644
--- a/subscription/Exception/CouldNotHandleRecurringOrder.php
+++ b/subscription/Exception/CouldNotHandleRecurringOrder.php
@@ -4,7 +4,7 @@
 
 class CouldNotHandleRecurringOrder extends MollieSubscriptionException
 {
-    public static function failedToFindSelectedCarrier(): CouldNotHandleRecurringOrder
+    public static function failedToFindSelectedCarrier(): self
     {
         return new self(
             'Failed to find selected carrier',
@@ -12,7 +12,7 @@ public static function failedToFindSelectedCarrier(): CouldNotHandleRecurringOrd
         );
     }
 
-    public static function failedToApplySelectedCarrier(): CouldNotHandleRecurringOrder
+    public static function failedToApplySelectedCarrier(): self
     {
         return new self(
             'Failed to apply selected carrier',
diff --git a/subscription/Exception/CouldNotPresentOrderDetail.php b/subscription/Exception/CouldNotPresentOrderDetail.php
index 2b07862b9..8ed1c4c34 100644
--- a/subscription/Exception/CouldNotPresentOrderDetail.php
+++ b/subscription/Exception/CouldNotPresentOrderDetail.php
@@ -4,7 +4,7 @@
 
 class CouldNotPresentOrderDetail extends MollieSubscriptionException
 {
-    public static function failedToFindOrder(): CouldNotPresentOrderDetail
+    public static function failedToFindOrder(): self
     {
         return new self(
             'Failed to find order',
@@ -12,7 +12,7 @@ public static function failedToFindOrder(): CouldNotPresentOrderDetail
         );
     }
 
-    public static function failedToFindOrderDetail(): CouldNotPresentOrderDetail
+    public static function failedToFindOrderDetail(): self
     {
         return new self(
             'Failed to find order detail',
@@ -20,7 +20,7 @@ public static function failedToFindOrderDetail(): CouldNotPresentOrderDetail
         );
     }
 
-    public static function failedToFindProduct(): CouldNotPresentOrderDetail
+    public static function failedToFindProduct(): self
     {
         return new self(
             'Failed to find product',
@@ -28,7 +28,7 @@ public static function failedToFindProduct(): CouldNotPresentOrderDetail
         );
     }
 
-    public static function failedToFindCurrency(): CouldNotPresentOrderDetail
+    public static function failedToFindCurrency(): self
     {
         return new self(
             'Failed to find currency',
diff --git a/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php b/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php
index 6c9709b7f..9d2f5fafb 100644
--- a/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php
+++ b/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php
@@ -4,7 +4,7 @@
 
 class CouldNotProvideSubscriptionCarrierDeliveryPrice extends MollieSubscriptionException
 {
-    public static function failedToFindSelectedCarrier(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindSelectedCarrier(): self
     {
         return new self(
             'Failed to find selected carrier',
@@ -12,7 +12,7 @@ public static function failedToFindSelectedCarrier(): CouldNotProvideSubscriptio
         );
     }
 
-    public static function failedToFindOrderCart(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderCart(): self
     {
         return new self(
             'Failed to find order cart',
@@ -20,7 +20,7 @@ public static function failedToFindOrderCart(): CouldNotProvideSubscriptionCarri
         );
     }
 
-    public static function failedToFindOrderCustomer(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderCustomer(): self
     {
         return new self(
             'Failed to find order customer',
@@ -28,7 +28,7 @@ public static function failedToFindOrderCustomer(): CouldNotProvideSubscriptionC
         );
     }
 
-    public static function failedToApplySelectedCarrier(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToApplySelectedCarrier(): self
     {
         return new self(
             'Failed to apply selected carrier',
@@ -36,7 +36,7 @@ public static function failedToApplySelectedCarrier(): CouldNotProvideSubscripti
         );
     }
 
-    public static function failedToFindOrderDeliveryAddress(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderDeliveryAddress(): self
     {
         return new self(
             'Failed to find order delivery address',
@@ -44,7 +44,7 @@ public static function failedToFindOrderDeliveryAddress(): CouldNotProvideSubscr
         );
     }
 
-    public static function failedToFindOrderDeliveryCountry(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderDeliveryCountry(): self
     {
         return new self(
             'Failed to find order delivery country',
@@ -52,7 +52,7 @@ public static function failedToFindOrderDeliveryCountry(): CouldNotProvideSubscr
         );
     }
 
-    public static function failedToGetSelectedCarrierPrice(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToGetSelectedCarrierPrice(): self
     {
         return new self(
             'Failed to get selected carrier price',
diff --git a/subscription/Handler/RecurringOrderHandler.php b/subscription/Handler/RecurringOrderHandler.php
index 60d919792..c7cfb4b0e 100644
--- a/subscription/Handler/RecurringOrderHandler.php
+++ b/subscription/Handler/RecurringOrderHandler.php
@@ -203,9 +203,9 @@ private function createSubscription(Payment $transaction, MolRecurringOrder $rec
 
         $newCart->update();
 
-        if (sprintf('%d,', (int) $carrier->id) !==
-            $newCart->getDeliveryOption(null, false, false)[$newCart->id_address_delivery]
-        ) {
+        $cartCarrier = (int) ($newCart->getDeliveryOption(null, false, false)[$newCart->id_address_delivery] ?? 0);
+
+        if ((int) $carrier->id !== $cartCarrier) {
             throw CouldNotHandleRecurringOrder::failedToApplySelectedCarrier();
         }
 
diff --git a/views/templates/admin/Subscription/subscriptions-faq.html.twig b/views/templates/admin/Subscription/subscriptions-faq.html.twig
index 07bcc9659..45db6380e 100644
--- a/views/templates/admin/Subscription/subscriptions-faq.html.twig
+++ b/views/templates/admin/Subscription/subscriptions-faq.html.twig
@@ -32,11 +32,11 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ subscriptionCreationTittle }}
+          <i class="material-icons">info_outline</i> {{ subscriptionCreationTittle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{subscriptionCreation}}</p>
+            <p>{{ subscriptionCreation|escape }}</p>
           </div>
         </div>
       </div>
@@ -47,11 +47,11 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ importantInformationTittle }}
+          <i class="material-icons">info_outline</i> {{ importantInformationTittle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{importantInformation}}</p>
+            <p>{{ importantInformation|escape }}</p>
           </div>
         </div>
       </div>
@@ -62,14 +62,14 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ carrierInformationTitle }}
+          <i class="material-icons">info_outline</i> {{ carrierInformationTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{carrierInformation1}}</p>
-            <p>{{carrierInformation2}}</p>
-            <p>{{carrierInformation3}}</p>
-            <p>{{carrierInformation4}}</p>
+            <p>{{ carrierInformation1|escape }}</p>
+            <p>{{ carrierInformation2|escape }}</p>
+            <p>{{ carrierInformation3|escape }}</p>
+            <p>{{ carrierInformation4|escape }}</p>
           </div>
         </div>
       </div>
@@ -80,12 +80,12 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ cartRuleTitle }}
+          <i class="material-icons">info_outline</i> {{ cartRuleTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{cartRule}}</p>
-            <p>{{cartRule2}}</p>
+            <p>{{ cartRule|escape }}</p>
+            <p>{{ cartRule2|escape }}</p>
           </div>
         </div>
       </div>
@@ -96,11 +96,11 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ giftWrappingTitle }}
+          <i class="material-icons">info_outline</i> {{ giftWrappingTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{giftWrapping1}}</p>
+            <p>{{ giftWrapping1|escape }}</p>
           </div>
         </div>
       </div>
@@ -111,13 +111,13 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ subscriptionOrderLogicTitle }}
+          <i class="material-icons">info_outline</i> {{ subscriptionOrderLogicTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{recurringOrderCreation}}</p>
-            <p>{{recurringOrderPrice}}</p>
-            <p>{{recurringOrderAPIChanges}}</p>
+            <p>{{ recurringOrderCreation|escape }}</p>
+            <p>{{ recurringOrderPrice|escape }}</p>
+            <p>{{ recurringOrderAPIChanges|escape }}</p>
           </div>
         </div>
       </div>
diff --git a/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl b/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl
index 1d071ee68..73a902eb7 100644
--- a/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl
+++ b/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl
@@ -4,27 +4,27 @@
       <div class="row product-info">
         <div class="col-12 col-lg-6 product-img">
           <img class="img"
-               src="{$order.img}"
+               src="{$order.img|escape:'htmlall':'UTF-8'}"
                itemprop="image" width="200">
         </div>
         <div class="col-12 col-lg-6">
-          <a href="{$order.link}"><p><b>{l s='Product:' mod='mollie'}</b> {$order.name}</p></a>
-          <p><b>{l s='Quantity:' mod='mollie'}</b> {$order.quantity}</p>
-          <p><b>{l s='Unit price:' mod='mollie'}</b> {$order.unit_price}</p>
+          <a href="{$order.link|escape:'htmlall':'UTF-8'}"><p><b>{l s='Product:' mod='mollie'}</b> {$order.name|escape:'htmlall':'UTF-8'}</p></a>
+          <p><b>{l s='Quantity:' mod='mollie'}</b> {$order.quantity|escape:'htmlall':'UTF-8'}</p>
+          <p><b>{l s='Unit price:' mod='mollie'}</b> {$order.unit_price|escape:'htmlall':'UTF-8'}</p>
         </div>
       </div>
     </div>
     <div class="col-12 col-lg-6">
-      <p><b>{l s='Total:' mod='mollie'}</b> {$order.total}</p>
-      <p><b>{l s='Subscription status:' mod='mollie'}</b> {$order.status}</p>
-      <p><b>{l s='Subscription start date:' mod='mollie'}</b> {$order.start_date}</p>
+      <p><b>{l s='Total:' mod='mollie'}</b> {$order.total|escape:'htmlall':'UTF-8'}</p>
+      <p><b>{l s='Subscription status:' mod='mollie'}</b> {$order.status|escape:'htmlall':'UTF-8'}</p>
+      <p><b>{l s='Subscription start date:' mod='mollie'}</b> {$order.start_date|escape:'htmlall':'UTF-8'}</p>
 
       {if isset($order.next_payment_date)}
-        <p><b>{l s='Next payment date:' mod='mollie'}</b> {$order.next_payment_date}</p>
+        <p><b>{l s='Next payment date:' mod='mollie'}</b> {$order.next_payment_date|escape:'htmlall':'UTF-8'}</p>
       {/if}
 
       {if isset($order.cancelled_date)}
-        <p><b>{l s='Cancelled date:' mod='mollie'}</b> {$order.cancelled_date}</p>
+        <p><b>{l s='Cancelled date:' mod='mollie'}</b> {$order.cancelled_date|escape:'htmlall':'UTF-8'}</p>
       {/if}
     </div>
   </div>