Merge pull request #4 from logeecom/master

PISYL-87 Add Billie payment method
mollie · Oct 3, 2023 · a3ad196 · a3ad196
2 parents 459f842 + e6ebd7b
commit a3ad196
Show file tree

Hide file tree

Showing 73 changed files with 1,882 additions and 1,756 deletions.
diff --git a/features/admin/managing_mollie_payment_method.feature b/features/admin/managing_mollie_payment_method.feature
@@ -13,7 +13,6 @@ Feature: Adding a new mollie payment method
         Given I want to create a new Mollie payment method
         When I name it "Mollie" in "English (United States)"
         And I specify its code as "mollie_test"
-        And I fill the Profile ID with "MOLLIE_PROFILE_KEY"
         And I fill the API key with "MOLLIE_TEST_API_KEY"
         And make it available in channel "Web-EUR"
         And I add it

diff --git a/features/admin/managing_mollie_recurring_subscription.feature b/features/admin/managing_mollie_recurring_subscription.feature
@@ -13,7 +13,6 @@ Feature: Adding a new mollie recurring subscription
         Given I want to create a new Mollie recurring subscription
         When I name it "Mollie Recurring Subscription" in "English (United States)"
         And I specify its code as "mollie_recurring_subscription_test"
-        And I fill the Profile ID with "MOLLIE_PROFILE_KEY"
         And I fill the API key with "MOLLIE_TEST_API_KEY"
         And make it available in channel "Web-EUR"
         And I add it

diff --git a/features/admin/mollie_payment_method_validation.feature b/features/admin/mollie_payment_method_validation.feature
@@ -20,7 +20,6 @@ Feature: Mollie payment method validation
     Scenario: Trying to add a new mollie payment method without the correct api key
         Given I want to create a new Mollie payment method
         When I name it "Mollie" in "English (United States)"
-        And I fill the Profile ID with "MOLLIE_PROFILE_KEY"
         And I fill the API key with "tttt_jdqkCbp55GRnfb9nFRz7R555pJMW4"
         And I add it
         And I should be notified with error 'Invalid API key. An API key must start with "test_".' message

diff --git a/src/Action/ConvertMolliePaymentAction.php b/src/Action/ConvertMolliePaymentAction.php
@@ -9,8 +9,10 @@
 use SyliusMolliePlugin\Entity\MollieGatewayConfigInterface;
 use SyliusMolliePlugin\Factory\ApiCustomerFactoryInterface;
 use SyliusMolliePlugin\Helper\ConvertOrderInterface;
+use SyliusMolliePlugin\Helper\IntToStringConverterInterface;
 use SyliusMolliePlugin\Helper\PaymentDescriptionInterface;
 use SyliusMolliePlugin\Payments\PaymentTerms\Options;
+use SyliusMolliePlugin\Provider\Divisor\DivisorProviderInterface;
 use SyliusMolliePlugin\Resolver\PaymentLocaleResolverInterface;
 use Mollie\Api\Types\PaymentMethod;
 use Payum\Core\Action\ActionInterface;
@@ -49,20 +51,30 @@ final class ConvertMolliePaymentAction extends BaseApiAwareAction implements Act
     /** @var ApiCustomerFactoryInterface */
     private $apiCustomerFactory;
 
+    /** @var IntToStringConverterInterface */
+    private $intToStringConverter;
+
+    /** @var DivisorProviderInterface */
+    private $divisorProvider;
+
     public function __construct(
         PaymentDescriptionInterface $paymentDescription,
         RepositoryInterface $mollieMethodsRepository,
         ConvertOrderInterface $orderConverter,
         CustomerContextInterface $customerContext,
         PaymentLocaleResolverInterface $paymentLocaleResolver,
-        ApiCustomerFactoryInterface $apiCustomerFactory
+        ApiCustomerFactoryInterface $apiCustomerFactory,
+        IntToStringConverterInterface $intToStringConverter,
+        DivisorProviderInterface $divisorProvider
     ) {
         $this->paymentDescription = $paymentDescription;
         $this->mollieMethodsRepository = $mollieMethodsRepository;
         $this->orderConverter = $orderConverter;
         $this->customerContext = $customerContext;
         $this->paymentLocaleResolver = $paymentLocaleResolver;
         $this->apiCustomerFactory = $apiCustomerFactory;
+        $this->intToStringConverter = $intToStringConverter;
+        $this->divisorProvider = $divisorProvider;
     }
 
     /** @param Convert|mixed $request */
@@ -82,10 +94,10 @@ public function execute($request): void
         Assert::notNull($payment->getCurrencyCode());
         $this->gateway->execute($currency = new GetCurrency($payment->getCurrencyCode()));
 
-        $divisor = 10 ** $currency->exp;
+        $divisor = $this->divisorProvider->getDivisorForCurrency($currency);
 
         Assert::notNull($payment->getAmount());
-        $amount = number_format(abs($payment->getAmount() / $divisor), 2, '.', '');
+        $amount = $this->intToStringConverter->convertIntToString($payment->getAmount(), $divisor);
 
         $paymentOptions = $payment->getDetails();
 

diff --git a/src/Action/ConvertMollieSubscriptionPaymentAction.php b/src/Action/ConvertMollieSubscriptionPaymentAction.php
@@ -8,7 +8,9 @@
 use SyliusMolliePlugin\Action\Api\BaseApiAwareAction;
 use SyliusMolliePlugin\Entity\OrderInterface;
 use SyliusMolliePlugin\Helper\ConvertOrderInterface;
+use SyliusMolliePlugin\Helper\IntToStringConverterInterface;
 use SyliusMolliePlugin\Helper\PaymentDescriptionInterface;
+use SyliusMolliePlugin\Provider\Divisor\DivisorProviderInterface;
 use SyliusMolliePlugin\Request\Api\CreateCustomer;
 use SyliusMolliePlugin\Resolver\PaymentLocaleResolverInterface;
 use Mollie\Api\Types\PaymentMethod;
@@ -19,9 +21,9 @@
 use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Request\Convert;
 use Payum\Core\Request\GetCurrency;
-use Sylius\Bundle\CoreBundle\Context\CustomerContext;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Customer\Context\CustomerContextInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Webmozart\Assert\Assert;
 
@@ -38,24 +40,34 @@ final class ConvertMollieSubscriptionPaymentAction extends BaseApiAwareAction im
     /** @var ConvertOrderInterface */
     private $orderConverter;
 
-    /** @var CustomerContext */
+    /** @var CustomerContextInterface */
     private $customerContext;
 
     /** @var PaymentLocaleResolverInterface */
     private $paymentLocaleResolver;
 
+    /** @var IntToStringConverterInterface */
+    private $intToStringConverter;
+
+    /** @var DivisorProviderInterface */
+    private $divisorProvider;
+
     public function __construct(
         PaymentDescriptionInterface $paymentDescription,
         RepositoryInterface $mollieMethodsRepository,
         ConvertOrderInterface $orderConverter,
-        CustomerContext $customerContext,
-        PaymentLocaleResolverInterface $paymentLocaleResolver
+        CustomerContextInterface $customerContext,
+        PaymentLocaleResolverInterface $paymentLocaleResolver,
+        IntToStringConverterInterface $intToStringConverter,
+        DivisorProviderInterface $divisorProvider
     ) {
         $this->paymentDescription = $paymentDescription;
         $this->mollieMethodsRepository = $mollieMethodsRepository;
         $this->orderConverter = $orderConverter;
         $this->customerContext = $customerContext;
         $this->paymentLocaleResolver = $paymentLocaleResolver;
+        $this->intToStringConverter = $intToStringConverter;
+        $this->divisorProvider = $divisorProvider;
     }
 
     /** @param Convert|mixed $request */
@@ -78,10 +90,10 @@ public function execute($request): void
         Assert::notNull($payment->getCurrencyCode());
         $this->gateway->execute($currency = new GetCurrency($payment->getCurrencyCode()));
 
-        $divisor = 10 ** $currency->exp;
+        $divisor = $this->divisorProvider->getDivisorForCurrency($currency);
 
         Assert::notNull($payment->getAmount());
-        $amount = number_format(abs($payment->getAmount() / $divisor), 2, '.', '');
+        $amount = $this->intToStringConverter->convertIntToString($payment->getAmount(), $divisor);
         $paymentOptions = $payment->getDetails();
 
         $cartToken = $paymentOptions['cartToken'];

diff --git a/src/Calculator/CalculateTaxAmount.php b/src/Calculator/CalculateTaxAmount.php
@@ -21,6 +21,6 @@ public function calculate(float $taxRateAmount, int $amount): string
     {
         $shippingTaxAmount = round($amount - ($amount / (1 + $taxRateAmount)));
 
-        return $this->converter->convertIntToString((int) $shippingTaxAmount, 100);
+        return $this->converter->convertIntToString((int) $shippingTaxAmount);
     }
 }
diff --git a/src/Creator/PaymentRefundCommandCreator.php b/src/Creator/PaymentRefundCommandCreator.php
@@ -6,6 +6,7 @@
 namespace SyliusMolliePlugin\Creator;
 
 use SyliusMolliePlugin\Exceptions\OfflineRefundPaymentMethodNotFound;
+use SyliusMolliePlugin\Provider\Divisor\DivisorProviderInterface;
 use SyliusMolliePlugin\Refund\Units\PaymentUnitsItemRefundInterface;
 use SyliusMolliePlugin\Refund\Units\ShipmentUnitRefundInterface;
 use Mollie\Api\Resources\Payment;
@@ -36,20 +37,25 @@ final class PaymentRefundCommandCreator implements PaymentRefundCommandCreatorIn
     /** @var RefundPaymentMethodsProviderInterface */
     private $refundPaymentMethodProvider;
 
+    /** @var DivisorProviderInterface */
+    private $divisorProvider;
+
     public function __construct(
         RepositoryInterface $orderRepository,
         RepositoryInterface $refundUnitsRepository,
         PaymentUnitsItemRefundInterface $itemRefund,
         ShipmentUnitRefundInterface $shipmentRefund,
         AdjustmentFactoryInterface $adjustmentFactory,
-        RefundPaymentMethodsProviderInterface $refundPaymentMethodProvider
+        RefundPaymentMethodsProviderInterface $refundPaymentMethodProvider,
+        DivisorProviderInterface $divisorProvider
     ) {
         $this->orderRepository = $orderRepository;
         $this->refundUnitsRepository = $refundUnitsRepository;
         $this->itemRefund = $itemRefund;
         $this->shipmentRefund = $shipmentRefund;
         $this->adjustmentFactory = $adjustmentFactory;
         $this->refundPaymentMethodProvider = $refundPaymentMethodProvider;
+        $this->divisorProvider = $divisorProvider;
     }
 
     public function fromPayment(Payment $payment): RefundUnits
@@ -65,7 +71,7 @@ public function fromPayment(Payment $payment): RefundUnits
         $refunded = $this->getSumOfAmountExistingRefunds($allRefunded);
 
         Assert::notNull($payment->amountRefunded);
-        $mollieRefund = (float) $payment->amountRefunded->value * 100;
+        $mollieRefund = (float) $payment->amountRefunded->value * $this->divisorProvider->getDivisor();
         $toRefund = (int) $mollieRefund - $refunded;
 
         Assert::notNull($order->getChannel());

diff --git a/src/Documentation/DocumentationLinks.php b/src/Documentation/DocumentationLinks.php
@@ -13,7 +13,6 @@ final class DocumentationLinks implements DocumentationLinksInterface
         'single_click' => 'https://help.mollie.com/hc/en-us/articles/115000671249-What-are-single-click-payments-and-how-does-it-work-',
         'mollie_components' => 'https://www.mollie.com/en/news/post/better-checkout-flows-with-mollie-components',
         'payment_methods' => 'https://docs.mollie.com/orders/why-use-orders',
-        'profile_id' => 'https://www.mollie.com/dashboard/developers/api-keys',
         'api_key' => 'https://www.mollie.com/dashboard/developers/api-keys',
     ];
 
@@ -62,16 +61,6 @@ public function getPaymentMethodDoc(): string
         );
     }
 
-    public function getProfileIdDoc(): string
-    {
-        return \sprintf(
-            '%s <a target="_blank" href="%s"> %s </a>',
-            $this->translator->trans('sylius_mollie_plugin.ui.you_can_find_you_profile_id'),
-            self::DOCUMENTATION_LINKS['profile_id'],
-            $this->translator->trans('sylius_mollie_plugin.ui.mollie_profile_id')
-        );
-    }
-
     public function getApiKeyDoc(): string
     {
         return \sprintf(

diff --git a/src/Documentation/DocumentationLinksInterface.php b/src/Documentation/DocumentationLinksInterface.php
@@ -13,7 +13,5 @@ public function getMollieComponentsDoc(): string;
 
     public function getPaymentMethodDoc(): string;
 
-    public function getProfileIdDoc(): string;
-
     public function getApiKeyDoc(): string;
 }
diff --git a/src/Factory/MollieGatewayConfigFactory.php b/src/Factory/MollieGatewayConfigFactory.php
@@ -61,4 +61,9 @@ public function create(
 
         return $mollieGatewayConfig;
     }
+
+    public function createNew(): MollieGatewayConfigInterface
+    {
+        return $this->mollieGatewayConfigFactory->createNew();
+    }
 }
diff --git a/src/Factory/MollieGatewayConfigFactoryInterface.php b/src/Factory/MollieGatewayConfigFactoryInterface.php
@@ -5,11 +5,12 @@
 
 namespace SyliusMolliePlugin\Factory;
 
+use Sylius\Component\Resource\Factory\FactoryInterface;
 use SyliusMolliePlugin\Entity\GatewayConfigInterface;
 use SyliusMolliePlugin\Entity\MollieGatewayConfigInterface;
 use SyliusMolliePlugin\Payments\Methods\MethodInterface;
 
-interface MollieGatewayConfigFactoryInterface
+interface MollieGatewayConfigFactoryInterface extends FactoryInterface
 {
     public function create(
         MethodInterface $method,

diff --git a/src/Factory/MollieGatewayFactoryInterface.php b/src/Factory/MollieGatewayFactoryInterface.php
@@ -10,6 +10,7 @@ interface MollieGatewayFactoryInterface
     /** @deprecated since 3.7.0 use MollieGatewayFactoryInterface::LOCALES_AVAILABLE_MAP instead */
     public const LOCALES_AVAILABLE = [
         'en_US',
+        'en_GB',
         'nl_NL',
         'nl_BE',
         'fr_FR',
@@ -34,6 +35,7 @@ interface MollieGatewayFactoryInterface
 
     public const LOCALES_AVAILABLE_MAP = [
         'en_US' => 'en_US',
+        'en_GB' => 'en_GB',
         'nl_NL' => 'nl_NL',
         'nl_BE' => 'nl_BE',
         'fr_FR' => 'fr_FR',

diff --git a/src/Factory/MollieSubscriptionGatewayFactory.php b/src/Factory/MollieSubscriptionGatewayFactory.php
@@ -48,7 +48,7 @@ protected function populateConfig(ArrayObject $config): void
                 $mollieApiClient->setConfig($config->toUnsafeArray());
                 $mollieApiClient->setIsRecurringSubscription(true);
                 $mollieApiClient->addVersionString(\sprintf('Sylius/%s', Kernel::VERSION));
-                $mollieApiClient->addVersionString(\sprintf('SyliusMolliePlugin/%s', $mollieApiClient->getVersion()));
+                $mollieApiClient->addVersionString(\sprintf('SubscriptionSyliusMolliePlugin/%s', $mollieApiClient->getVersion()));
                 $mollieApiClient->addVersionString(\sprintf('uap/%s', $mollieApiClient->getUserAgentToken()));
 
                 return $mollieApiClient;

diff --git a/src/Form/Type/MollieGatewayConfigurationType.php b/src/Form/Type/MollieGatewayConfigurationType.php
@@ -5,12 +5,14 @@
 
 namespace SyliusMolliePlugin\Form\Type;
 
+use SyliusMolliePlugin\Client\MollieApiClient;
 use SyliusMolliePlugin\Documentation\DocumentationLinksInterface;
 use SyliusMolliePlugin\Payments\PaymentTerms\Options;
 use SyliusMolliePlugin\Validator\Constraints\LiveApiKeyIsNotBlank;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -28,10 +30,13 @@ final class MollieGatewayConfigurationType extends AbstractType
 
     /** @var DocumentationLinksInterface */
     private $documentationLinks;
+    /** @var MollieApiClient */
+    private $apiClient;
 
-    public function __construct(DocumentationLinksInterface $documentationLinks)
+    public function __construct(DocumentationLinksInterface $documentationLinks, MollieApiClient $apiClient)
     {
         $this->documentationLinks = $documentationLinks;
+        $this->apiClient = $apiClient;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -44,14 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'sylius_mollie_plugin.ui.api_key_choice_live' => true,
                 ],
             ])
-            ->add('profile_id', TextType::class, [
-                'label' => $this->documentationLinks->getProfileIdDoc(),
-                'constraints' => [
-                    new NotBlank([
-                        'message' => 'sylius_mollie_plugin.profile_id.not_blank',
-                        'groups' => ['sylius'],
-                    ]),
-                ],
+            ->add('profile_id', HiddenType::class, [
             ])
             ->add(self::API_KEY_TEST, PasswordType::class, [
                 'always_empty' => false,
@@ -127,6 +125,20 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
 
                 $data['payum.http_client'] = '@sylius_mollie_plugin.mollie_api_client';
 
+                $event->setData($data);
+            })
+            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event): void {
+                $data = $event->getData();
+
+                if (array_key_exists('environment', $data)) {
+                    $apiKey = $this->getMollieApiKey($data);
+
+                    $this->apiClient->setApiKey($apiKey);
+                    $profile = $this->apiClient->profiles->getCurrent();
+
+                    $data['profile_id'] = $profile->id;
+                }
+
                 $event->setData($data);
             });
     }
@@ -147,4 +159,18 @@ public function configureOptions(OptionsResolver $resolver): void
             new LiveApiKeyIsNotBlank($defaults),
         ]);
     }
+
+    /**
+     * @param array $config
+     *
+     * @return string
+     */
+    private function getMollieApiKey(array $config): string
+    {
+        if ($config['environment']) {
+            return $config[MollieGatewayConfigurationType::API_KEY_LIVE];
+        }
+
+        return $config[MollieGatewayConfigurationType::API_KEY_TEST];
+    }
 }