MOL-658 apple pay direct for esd products

Components/Account/Account.php

@@ -10,6 +10,7 @@
 use Shopware\Components\Password\Manager;
 use Shopware\Models\Customer\Customer;
 use Shopware\Models\Order\Order;
+use Shopware\Models\User\User;
 use Shopware_Components_Config;
 use Symfony\Component\Validator\ConstraintViolation;
 use Throwable;
@@ -92,6 +93,16 @@ public function isLoggedIn()
         return !empty($userId);
     }
 
+    /**
+     * Gets if the user is signed in with a guest account.
+     *
+     * @return bool
+     */
+    public function isLoggedInAsGuest()
+    {
+        return boolval($this->session->offsetGet('sOneTimeAccount'));
+    }
+
     /**
      * @param string $email
      * @param string $firstname

Components/ApplePayDirect/Services/ApplePayButtonBuilder.php

@@ -2,15 +2,14 @@
 
 namespace MollieShopware\Components\ApplePayDirect\Services;
 
-use Doctrine\ORM\EntityNotFoundException;
 use Enlight_Controller_Request_Request;
 use Enlight_View;
+use MollieShopware\Components\Account\Account;
 use MollieShopware\Components\ApplePayDirect\Models\Button\ApplePayButton;
 use MollieShopware\Components\ApplePayDirect\Models\Button\DisplayOption;
 use MollieShopware\Components\Config;
 use MollieShopware\Components\Country\CountryIsoParser;
 use Shopware\Models\Shop\Shop;
-use Symfony\Component\Validator\Constraints\NotBlank;
 
 class ApplePayButtonBuilder
 {
@@ -22,6 +21,13 @@ class ApplePayButtonBuilder
      */
     const KEY_MOLLIE_APPLEPAY_BUTTON = 'sMollieApplePayDirectButton';
 
+    /** @var Account */
+    private $accountService;
+
+    /**
+     * @var \Shopware_Proxies_sBasketProxy
+     */
+    private $sBasket;
 
     /**
      * @var Config
@@ -34,7 +40,7 @@ class ApplePayButtonBuilder
     private $configShopware;
 
     /**
-     * @var \sAdmin
+     * @var \Shopware_Proxies_sAdminProxy
      */
     private $sAdmin;
 
@@ -50,20 +56,25 @@ class ApplePayButtonBuilder
 
 
     /**
+     * @param Account $accountService
      * @param Config $configMollie
      * @param \Shopware_Components_Config $configShopware
      * @param ApplePayPaymentMethod $applePayPaymentMethod
      * @param ApplePayDirectDisplayOptions $restrictionService
+     * @param \sAdmin|\Shopware_Proxies_sAdminProxy $sAdmin
+     * @param \sBasket|\Shopware_Proxies_sBasketProxy $sBasket
      */
-    public function __construct(Config $configMollie, \Shopware_Components_Config $configShopware, ApplePayPaymentMethod $applePayPaymentMethod, ApplePayDirectDisplayOptions $restrictionService)
+    public function __construct(Account $accountService, Config $configMollie, \Shopware_Components_Config $configShopware, ApplePayPaymentMethod $applePayPaymentMethod, ApplePayDirectDisplayOptions $restrictionService, $sAdmin, $sBasket)
     {
+        $this->accountService = $accountService;
         $this->configMollie = $configMollie;
         $this->configShopware = $configShopware;
         $this->restrictionService = $restrictionService;
+        $this->applePayPaymentMethod = $applePayPaymentMethod;
 
         # attention, modules does not exist in CLI
-        $this->sAdmin = Shopware()->Modules()->Admin();
-        $this->applePayPaymentMethod = $applePayPaymentMethod;
+        $this->sAdmin = $sAdmin;
+        $this->sBasket = $sBasket;
     }
 
 
@@ -78,7 +89,6 @@ public function addButtonStatus(Enlight_Controller_Request_Request $request, Enl
         /** @var string $controller */
         $controller = strtolower($request->getControllerName());
 
-
         $isActive = $this->applePayPaymentMethod->isApplePayDirectEnabled();
 
         if ($isActive) {
@@ -90,8 +100,17 @@ public function addButtonStatus(Enlight_Controller_Request_Request $request, Enl
             if ($isRiskManagementBlocked) {
                 $isActive = false;
             }
-        }
 
+            # if a customer has esd products in the basket, check if
+            # the customer is logged in with a full customer account
+            $hasEsdProductsInBasket = $controller === 'checkout' && $this->basketHasEsdProducts();
+            $isEsdProductDetailPage = $controller === 'detail' && boolval($view->getAssign('sArticle')['esd']) === true;
+            $isUserLoggedIn = $this->accountService->isLoggedIn() && !$this->accountService->isLoggedInAsGuest();
+
+            if (($hasEsdProductsInBasket || $isEsdProductDetailPage) && !$isUserLoggedIn) {
+                $isActive = false;
+            }
+        }
 
         # apple pay requires a country iso
         # we use the first one from our country list.
@@ -137,4 +156,9 @@ public function addButtonStatus(Enlight_Controller_Request_Request $request, Enl
 
         $view->assign(self::KEY_MOLLIE_APPLEPAY_BUTTON, $button->toArray());
     }
+
+    private function basketHasEsdProducts()
+    {
+        return $this->sBasket->sCheckForESD();
+    }
 }

Resources/services/components/applepay_direct.xml

@@ -16,10 +16,13 @@
 
         <service id="mollie_shopware.components.apple_pay_direct.services.button_builder"
                  class="MollieShopware\Components\ApplePayDirect\Services\ApplePayButtonBuilder" public="true">
+            <argument type="service" id="mollie_shopware.components.account.account" />
             <argument type="service" id="mollie_shopware.config"/>
             <argument type="service" id="config"/>
             <argument type="service" id="mollie_shopware.components.apple_pay_direct.services.payment_method"/>
             <argument type="service" id="mollie_shopware.components.apple_pay_direct.services.display_option"/>
+            <argument type="expression">container.get('Shopware_Components_Modules').Admin()</argument>
+            <argument type="expression">container.get('Shopware_Components_Modules').Basket()</argument>
         </service>
 
         <service id="mollie_shopware.components.apple_pay_direct.services.formatter"