Feature/mag 565

Cron/AutoCaptureDeferredPayments.php

@@ -24,6 +24,7 @@
 use Payplug\Payments\Gateway\Config\Standard;
 use Payplug\Payments\Helper\Config;
 use Payplug\Payments\Logger\Logger;
+use Payplug\Payments\Service\InitEnvQa;
 
 class AutoCaptureDeferredPayments
 {
@@ -41,7 +42,8 @@ public function __construct(
         private readonly Transaction $transaction,
         private readonly Config $config,
         private readonly TransportBuilder $transportBuilder,
-        private readonly OrderIdentity $orderIdentity
+        private readonly OrderIdentity $orderIdentity,
+        private readonly InitEnvQa $initEnvQa
     ) {
     }
 
@@ -53,6 +55,8 @@ public function execute(): void
     {
         $this->logger->info('Running the AutoCaptureDeferredPayments cron');
 
+        $this->initEnvQa->execute();
+
         // All the invoiceable order will populate this array
         $orderToInvoiceIds = [];
 

Cron/CheckOrderConsistency.php

@@ -6,14 +6,15 @@
 
 use Magento\Framework\Api\SearchCriteriaBuilderFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\OrderPaymentRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Payplug\Exception\PayplugException;
 use Payplug\Payments\Helper\Data;
 use Payplug\Payments\Logger\Logger;
+use Payplug\Payments\Service\InitEnvQa;
 use Payplug\Resource\Payment as ResourcePayment;
 
 class CheckOrderConsistency
@@ -24,11 +25,12 @@ class CheckOrderConsistency
     public const PAST_HOURS_TO_CHECK = 4;
 
     public function __construct(
-        private Logger $logger,
-        private SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
-        private OrderPaymentRepositoryInterface $paymentRepository,
-        private OrderRepositoryInterface $orderRepository,
-        private Data $payplugHelper
+        private readonly Logger $logger,
+        private readonly SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
+        private readonly OrderPaymentRepositoryInterface $paymentRepository,
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly Data $payplugHelper,
+        private readonly InitEnvQa $initEnvQa
     ) {
     }
 
@@ -39,6 +41,8 @@ public function execute(): void
     {
         $this->logger->info('Running the CheckOrderConsistency cron');
 
+        $this->initEnvQa->execute();
+
         $magentoOrdersPayments = $this->getCheckablePayplugOrderPaymentsList();
 
         if (count($magentoOrdersPayments) >= 0) {
@@ -86,7 +90,7 @@ public function execute(): void
                 $this->logger->info(
                     sprintf(
                         'No payplug payment found for the magento order %s.',
-                    $magentoOrder->getEntityId()
+                        $magentoOrder->getEntityId()
                     )
                 );
             }

Observer/InitEnvQaOnFrontDispatch.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Payplug\Payments\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+use Payplug\Payments\Service\InitEnvQa;
+
+class InitEnvQaOnFrontDispatch implements ObserverInterface
+{
+    public function __construct(
+        private readonly InitEnvQa $initEnvQa
+    ) {
+    }
+
+    public function execute(Observer $observer): void
+    {
+        $this->initEnvQa->execute();
+    }
+}

Plugin/InitEnvQaOnRestDispatch.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Payplug\Payments\Plugin;
+
+use Magento\Framework\App\RequestInterface as Request;
+use Magento\Webapi\Controller\Rest;
+use Payplug\Payments\Service\InitEnvQa;
+
+class InitEnvQaOnRestDispatch
+{
+    public function __construct(
+        private readonly InitEnvQa $initEnvQa
+    ) {
+    }
+
+    public function beforeDispatch(Rest $subject, Request $request): array
+    {
+        $this->initEnvQa->execute();
+
+        return [$request];
+    }
+}

Service/InitEnvQa.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Payplug\Payments\Service;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Payplug\Core\APIRoutes as BaseAPIRoutes;
+
+class InitEnvQa
+{
+    public const XML_PATH_ENABLE_QA = 'payplug_payments/qa/enable';
+    private const XML_PATH_PAYPLUG_API_URL_KEY = 'payplug_payments/qa/api_url';
+    private const XML_PATH_PAYPLUG_SERVICE_URL_KEY = 'payplug_payments/qa/service_url';
+
+    public function __construct(
+        private readonly ScopeConfigInterface $scopeConfig
+    ) {
+    }
+
+    public function execute(): bool
+    {
+        $apiUrl = $this->scopeConfig->getValue(self::XML_PATH_PAYPLUG_API_URL_KEY);
+        $serviceUrl = $this->scopeConfig->getValue(self::XML_PATH_PAYPLUG_SERVICE_URL_KEY);
+
+        if ($this->isQaEnabled() === false || empty($apiUrl) || empty($serviceUrl)) {
+            return false;
+        }
+
+        BaseAPIRoutes::setApiBaseUrl($apiUrl);
+        BaseAPIRoutes::setServiceBaseUrl($serviceUrl);
+
+        return true;
+    }
+
+    public function isQaEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLE_QA);
+    }
+}

ViewModel/UrlProvider.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Payplug\Payments\ViewModel;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\ScopeInterface;
+use Payplug\Payments\Service\InitEnvQa;
+
+class UrlProvider implements ArgumentInterface
+{
+    private const XML_PATH_PAYPLUG_SECURE_URL_KEY = 'payplug_payments/qa/secure_url';
+    private const XML_PATH_PAYPLUG_INTEGRATED_PAYMENT_JS_URL_KEY = 'payplug_payments/qa/integrated_payment_js_url';
+    private const DEFAULT_SECURE_URL = 'https://secure.payplug.com';
+    private const DEFAULT_INTEGRATED_PAYMENT_JS_URL = 'https://cdn.payplug.com/js/integrated-payment/v1/index';
+    private const APPLEPAY_SDK_URL = 'https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js';
+
+    public function __construct(
+        private readonly ScopeConfigInterface $scopeConfig,
+        private readonly InitEnvQa $initEnvQa
+    ) {
+    }
+
+    public function getPayplugSecureUrl(): string
+    {
+        $customSecureUrl = $this->scopeConfig->getValue(self::XML_PATH_PAYPLUG_SECURE_URL_KEY);
+
+        if ($this->initEnvQa->isQaEnabled() === true && $customSecureUrl) {
+            return $customSecureUrl;
+        }
+
+        return self::DEFAULT_SECURE_URL;
+    }
+
+    public function getPayplugIntegratedPaymentJsUrl(): string
+    {
+        $customIntegratedPaymentJsUrl = $this->scopeConfig->getValue(self::XML_PATH_PAYPLUG_INTEGRATED_PAYMENT_JS_URL_KEY);
+
+        if ($this->initEnvQa->isQaEnabled() === true && $customIntegratedPaymentJsUrl) {
+            return $customIntegratedPaymentJsUrl;
+        }
+
+        return self::DEFAULT_INTEGRATED_PAYMENT_JS_URL;
+    }
+
+    public function isApplePayEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag('payment/payplug_payments_apple_pay/active', ScopeInterface::SCOPE_STORE);
+    }
+
+    public function getApplePaySdkUrl(): string
+    {
+        return self::APPLEPAY_SDK_URL;
+    }
+}

composer.json

@@ -20,6 +20,7 @@
     "magento/module-sales": "102.0.*|103.0.*",
     "payplug/payplug-php": "^4.0.0",
     "giggsey/libphonenumber-for-php": "^8.10",
+    "symfony/dotenv": "*",
     "ext-openssl": "*"
   },
   "autoload": {

etc/adminhtml/system.xml

@@ -78,6 +78,13 @@
                 <field id="client_data"/>
                 <field id="access_token_data"/>
             </group>
+            <group id="qa">
+                <field id="enable"/>
+                <field id="api_url"/>
+                <field id="service_url"/>
+                <field id="secure_url"/>
+                <field id="integrated_payment_js_url"/>
+            </group>
         </section>
         <section id="payment" type="text" sortOrder="400" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="payplug_payments_standard" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">

etc/events.xml

@@ -4,6 +4,7 @@
         <observer name="payplug_payments_section_payment_saved" instance="Payplug\Payments\Observer\PaymentConfigObserver"/>
     </event>
     <event name="controller_action_predispatch">
+        <observer name="payplug_payments_init_env_qa_on_front_dispatch" instance="Payplug\Payments\Observer\InitEnvQaOnFrontDispatch" />
         <observer name="payplug_payments_display_notice" instance="Payplug\Payments\Observer\DisplayNoticeObserver" />
     </event>
     <event name="controller_action_predispatch_sales_order_creditmemo_new">

etc/webapi_rest/di.xml

@@ -0,0 +1,6 @@
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Webapi\Controller\Rest">
+        <plugin name="payplug_payments_init_env_qa_on_rest_dispatch" type="Payplug\Payments\Plugin\InitEnvQaOnRestDispatch"/>
+    </type>
+</config>

view/frontend/layout/catalog_product_view_applepay.xml

@@ -3,7 +3,11 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.components">
-            <block class="Payplug\Payments\Block\Formjs" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml"/>
+            <block class="Magento\Framework\View\Element\Template" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml">
+                <arguments>
+                    <argument name="urlProviderViewModel" xsi:type="object">Payplug\Payments\ViewModel\UrlProvider</argument>
+                </arguments>
+            </block>
         </referenceBlock>
 
         <referenceContainer name="product.info.form.content">

view/frontend/layout/checkout_cart_index.xml

@@ -2,7 +2,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.components">
-            <block class="Payplug\Payments\Block\Formjs" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml"/>
+            <block class="Magento\Framework\View\Element\Template" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml">
+                <arguments>
+                    <argument name="urlProviderViewModel" xsi:type="object">Payplug\Payments\ViewModel\UrlProvider</argument>
+                </arguments>
+            </block>
         </referenceBlock>
 
         <referenceContainer name="checkout.cart.totals.container">

view/frontend/layout/checkout_index_index.xml

@@ -2,7 +2,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.components">
-            <block class="Payplug\Payments\Block\Formjs" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml"/>
+            <block class="Magento\Framework\View\Element\Template" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml">
+                <arguments>
+                    <argument name="urlProviderViewModel" xsi:type="object">Payplug\Payments\ViewModel\UrlProvider</argument>
+                </arguments>
+            </block>
         </referenceBlock>
         <referenceBlock name="checkout.root">
             <arguments>

view/frontend/layout/onestepcheckout_index_index.xml

@@ -2,7 +2,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.components">
-            <block class="Payplug\Payments\Block\Formjs" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml"/>
+            <block class="Magento\Framework\View\Element\Template" name="payplug_payments_formjs" template="Payplug_Payments::checkout/formjs.phtml">
+                <arguments>
+                    <argument name="urlProviderViewModel" xsi:type="object">Payplug\Payments\ViewModel\UrlProvider</argument>
+                </arguments>
+            </block>
         </referenceBlock>
     </body>
 </page>

view/frontend/requirejs-config.js

@@ -3,8 +3,5 @@ const config = {
         '*': {
             'oneyPopin': 'Payplug_Payments/js/view/oney/popin'
         }
-    },
-    paths: {
-        'payplugIntegrated': 'https://cdn.payplug.com/js/integrated-payment/v1/index'
     }
-};
+};