Fix rebase

PrestaShopCorp · Apr 24, 2024 · 6ead436 · 6ead436
1 parent 04981df
commit 6ead436
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 248 deletions.
diff --git a/config/common.yml b/config/common.yml
@@ -136,7 +136,7 @@ services:
     class: 'PrestaShop\Module\PrestashopCheckout\ShopContext'
     public: true
     arguments:
-      - '@PrestaShop\Module\PrestashopCheckout\Environment\PaymentEnv'
+      - '@PrestaShop\Module\PrestashopCheckout\Environment\Env'
 
   PrestaShop\Module\PrestashopCheckout\Shop\ShopProvider:
     class: 'PrestaShop\Module\PrestashopCheckout\Shop\ShopProvider'

diff --git a/controllers/admin/AdminAjaxPrestashopCheckoutController.php b/controllers/admin/AdminAjaxPrestashopCheckoutController.php
@@ -267,10 +267,10 @@ private function updateExpressCheckoutSettings()
 
         $maaslandHttpClient->updateSettings([
             'settings' => [
-                'cb' => (bool)$configuration->get('PS_CHECKOUT_CARD_PAYMENT_ENABLED'),
-                'express_in_product' => (bool)$ecConfiguration->isProductPageEnabled(),
-                'express_in_cart' => (bool)$ecConfiguration->isOrderPageEnabled(),
-                'express_in_checkout' => (bool)$ecConfiguration->isCheckoutPageEnabled(),
+                'cb' => (bool) $configuration->get('PS_CHECKOUT_CARD_PAYMENT_ENABLED'),
+                'express_in_product' => (bool) $ecConfiguration->isProductPageEnabled(),
+                'express_in_cart' => (bool) $ecConfiguration->isOrderPageEnabled(),
+                'express_in_checkout' => (bool) $ecConfiguration->isCheckoutPageEnabled(),
             ],
         ]);
     }

diff --git a/src/Adapter/LinkAdapter.php b/src/Adapter/LinkAdapter.php
@@ -20,9 +20,6 @@
 
 namespace PrestaShop\Module\PrestashopCheckout\Adapter;
 
-use PrestaShop\Module\PrestashopCheckout\Environment\PaymentEnv;
-use PrestaShop\Module\PrestashopCheckout\ShopContext;
-
 /**
  * Link adapter
  */
@@ -53,14 +50,12 @@ public function __construct(\Link $link = null)
      * @param array $params
      *
      * @return string
-     *
-     * @throws \PrestaShopException
      */
     public function getAdminLink($controller, $withToken = true, $sfRouteParams = [], $params = [])
     {
         $shop = \Context::getContext()->shop;
 
-        if ((new ShopContext(new PaymentEnv()))->isShop17()) {
+        if (version_compare(_PS_VERSION_, '1.7.0.0', '>=')) {
             $adminLink = $this->link->getAdminLink($controller, $withToken, $sfRouteParams, $params);
 
             if ($shop->virtual_uri !== '') {

diff --git a/src/Cart/CartInterface.php b/src/Cart/CartInterface.php
diff --git a/src/Cart/CartRepositoryInterface.php b/src/Cart/CartRepositoryInterface.php
diff --git a/src/Checkout/EventSubscriber/CheckoutEventSubscriber.php b/src/Checkout/EventSubscriber/CheckoutEventSubscriber.php
@@ -43,7 +43,6 @@
 
 class CheckoutEventSubscriber implements EventSubscriberInterface
 {
-
     /**
      * @var CommandBusInterface
      */

diff --git a/src/Dispatcher/OrderDispatcher.php b/src/Dispatcher/OrderDispatcher.php
@@ -20,9 +20,7 @@
 
 namespace PrestaShop\Module\PrestashopCheckout\Dispatcher;
 
-use Module;
 use PrestaShop\Module\PrestashopCheckout\Event\EventDispatcherInterface;
-use PrestaShop\Module\PrestashopCheckout\Event\SymfonyEventDispatcherAdapter;
 use PrestaShop\Module\PrestashopCheckout\Exception\PsCheckoutException;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Event\PayPalOrderApprovalReversedEvent;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Event\PayPalOrderApprovedEvent;
@@ -38,7 +36,6 @@
 use PrestaShop\Module\PrestashopCheckout\PayPal\PaymentToken\Event\PaymentTokenDeletedEvent;
 use PrestaShop\Module\PrestashopCheckout\PayPal\PaymentToken\Event\PaymentTokenDeletionInitiatedEvent;
 use PrestaShop\Module\PrestashopCheckout\PayPal\PayPalConfiguration;
-use Ps_checkout;
 use Psr\Log\LoggerInterface;
 
 class OrderDispatcher implements DispatcherInterface

diff --git a/src/Environment/Env.php b/src/Environment/Env.php
@@ -22,7 +22,6 @@
 
 use PrestaShop\Module\PrestashopCheckout\PayPal\Mode;
 use PrestaShop\Module\PrestashopCheckout\PayPal\PayPalConfiguration;
-use Ps_checkout;
 
 /**
  * Get the current environment used: prod or test // sandbox or live
@@ -140,7 +139,6 @@ public function getPaymentApiUrl()
         return $this->getEnv('PAYMENT_API_URL_LIVE');
     }
 
-
     /**
      * @return string
      */
@@ -164,4 +162,18 @@ public function getPaypalClientId()
 
         return $this->getEnv('PAYPAL_CLIENT_ID_LIVE');
     }
+
+    /**
+     * @return string
+     */
+    public function getBnCode()
+    {
+        $bnCode = $this->getEnv('PAYPAL_BN_CODE');
+
+        if (empty($bnCode)) {
+            $bnCode = 'PrestaShop_Cart_PSXO_PSDownload';
+        }
+
+        return $bnCode;
+    }
 }
diff --git a/src/Http/MaaslandHttpClient.php b/src/Http/MaaslandHttpClient.php
@@ -25,9 +25,7 @@
 use Http\Client\Exception\NetworkException;
 use Http\Client\Exception\RequestException;
 use Http\Client\Exception\TransferException;
-use PrestaShop\Module\PrestashopCheckout\Configuration\PrestaShopConfiguration;
 use PrestaShop\Module\PrestashopCheckout\Exception\PayPalException;
-use PrestaShop\Module\PrestashopCheckout\ExpressCheckout\ExpressCheckoutConfiguration;
 use PrestaShop\Module\PrestashopCheckout\PayPalError;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -147,6 +145,7 @@ public function getShopSignature(array $payload, array $options = [])
      * Used to notify PSL on settings update
      *
      * @return array
+     *
      * @throws PayPalException
      */
     public function updateSettings(array $payload)

diff --git a/src/PayPal/Order/CreatePayPalOrderPayloadBuilderInterface.php b/src/PayPal/Order/CreatePayPalOrderPayloadBuilderInterface.php
diff --git a/src/Presenter/Order/OrderPresenter.php b/src/Presenter/Order/OrderPresenter.php
@@ -280,7 +280,7 @@ private function getTotal()
                 continue;
             }
 
-            $total += (float)$purchase['amount']['value'];
+            $total += (float) $purchase['amount']['value'];
             $currency = $purchase['amount']['currency_code'];
         }
 

diff --git a/src/Provider/PaymentMethodLogoProvider.php b/src/Provider/PaymentMethodLogoProvider.php
@@ -20,8 +20,6 @@
 
 namespace PrestaShop\Module\PrestashopCheckout\Provider;
 
-use Ps_checkout;
-
 class PaymentMethodLogoProvider
 {
     /**

diff --git a/src/Repository/PsAccountRepository.php b/src/Repository/PsAccountRepository.php
@@ -21,7 +21,6 @@
 namespace PrestaShop\Module\PrestashopCheckout\Repository;
 
 use Exception;
-use PrestaShop\Module\PrestashopCheckout\Configuration\PrestaShopConfiguration;
 use PrestaShop\Module\PrestashopCheckout\Entity\PsAccount;
 use PrestaShop\PsAccountsInstaller\Installer\Facade\PsAccounts;
 

diff --git a/src/ShopContext.php b/src/ShopContext.php
@@ -20,21 +20,21 @@
 
 namespace PrestaShop\Module\PrestashopCheckout;
 
-use PrestaShop\Module\PrestashopCheckout\Environment\PaymentEnv;
+use PrestaShop\Module\PrestashopCheckout\Environment\Env;
 
 /**
  * Get the shop context
  */
 class ShopContext
 {
     /**
-     * @var PaymentEnv
+     * @var Env
      */
-    private $paymentEnv;
+    private $env;
 
-    public function __construct(PaymentEnv $paymentEnv)
+    public function __construct(Env $env)
     {
-        $this->paymentEnv = $paymentEnv;
+        $this->env = $env;
     }
 
     /**
@@ -55,11 +55,7 @@ public function isReady()
      */
     public function getBnCode()
     {
-        if ($this->isReady()) { // if on ready send an empty bn-code
-            return '';
-        }
-
-        return $this->paymentEnv->getBnCode();
+        return $this->env->getBnCode();
     }
 
     public function isShop17()