Merge pull request #4 from helloextend/1.0.3

Magento PWA Extension v1.0.3

Author: sagaydakam

Model/Resolver/AddWarrantyToCart.php

@@ -4,6 +4,7 @@
 namespace Extend\WarrantyGraphQl\Model\Resolver;
 
 
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -23,20 +24,32 @@ class AddWarrantyToCart implements ResolverInterface
      */
     private $addProductsToCart;
 
+    /**
+     * @var WarrantyGraphQlHelper
+     */
     protected $warrantyGraphQlHelper;
 
+    /**
+     * Event manager proxy
+     *
+     * @var ManagerInterface
+     */
+    protected $_eventManager = null;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param AddProductsToCart $addProductsToCart
      */
     public function __construct(
         GetCartForUser $getCartForUser,
         AddProductsToCart $addProductsToCart,
+        ManagerInterface $eventManager,
         WarrantyGraphQlHelper $warrantyGraphQlHelper
     )
     {
         $this->getCartForUser = $getCartForUser;
         $this->addProductsToCart = $addProductsToCart;
+        $this->_eventManager = $eventManager;
         $this->warrantyGraphQlHelper = $warrantyGraphQlHelper;
     }
 
@@ -88,7 +101,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cartItems = [
             $cartItem
         ];
-        $this->addProductsToCart->execute($cart, $cartItems);;
+        $this->addProductsToCart->execute($cart, $cartItems);
+
+        $this->_eventManager->dispatch('extend_warranty_added_to_cart',
+            [
+                'warranty_data' => $warrantyRequestData,
+                'qty' => $_qty
+            ]
+        );
 
         return [
             'cart' => [

Observer/RemoveWarranties.php

@@ -9,7 +9,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
-class RemoveWarranties implements ObserverInterface
+class RemoveWarranties extends \Extend\Warranty\Observer\QuoteRemoveItem implements ObserverInterface
 {
 
     /**
@@ -18,31 +18,11 @@ class RemoveWarranties implements ObserverInterface
      */
     public function execute(Observer $observer)
     {
-        /** @var $item \Magento\Quote\Model\Quote\Item */
-        $item = $observer->getEvent()->getQuoteItem();
-        if ($item->getProductType() !== WarrantyType::TYPE_CODE) {
-            $sku = $item->getSku();
-
-            $quote = $item->getQuote();
-            $items = $quote->getAllItems();
-
-            $removeWarranty = true;
-            foreach ($items as $item) {
-                if ($item->getSku() === $sku) {
-                    $removeWarranty = false;
-                    break;
-                }
-            }
-
-            if ($removeWarranty) {
-                foreach ($items as $item) {
-                    if ($item->getProductType() === WarrantyType::TYPE_CODE &&
-                        $item->getOptionByCode('associated_product')->getValue() === $sku) {
-
-                        $quote->removeItem($item->getItemId());
-                    }
-                }
-            }
+        if (!$observer->getQuoteItem()) {
+            /** @var $item \Magento\Quote\Model\Quote\Item */
+            $item = $observer->getEvent()->getQuoteItem();
+            $observer->setData('quote_item', $item);
         }
+        return parent::execute($observer);
     }
 }

Observer/TrackWarrantyAddedToCart.php

@@ -0,0 +1,65 @@
+<?php
+
+
+namespace Extend\WarrantyGraphQl\Observer;
+
+
+use Extend\Warranty\Model\Product\Type as WarrantyType;
+use Magento\Checkout\Helper\Cart;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+class TrackWarrantyAddedToCart implements ObserverInterface
+{
+
+    /**
+     * @var \Extend\Warranty\Helper\Tracking
+     */
+    protected $_trackingHelper;
+
+
+    /**
+     * QuoteRemoveItem constructor.
+     * @param \Extend\Warranty\Helper\Tracking $trackingHelper
+     */
+    public function __construct(
+        \Extend\Warranty\Helper\Tracking $trackingHelper
+    )
+    {
+        $this->_trackingHelper = $trackingHelper;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        $warrantyData = $observer->getWarrantyData();
+        $qty = $observer->getQty();
+        if ($this->_trackingHelper->isTrackingEnabled()) {
+            if (!isset($warrantyData['component']) || $warrantyData['component'] !== 'modal') {
+                $trackingData = [
+                    'eventName' => 'trackOfferAddedToCart',
+                    'productId' => $warrantyData['product'] ?? '',
+                    'productQuantity' => $qty,
+                    'warrantyQuantity' => $qty,
+                    'planId' => $warrantyData['planId'] ?? '',
+                    'area' => 'product_page',
+                    'component' => $warrantyData['component'] ?? 'buttons',
+                ];
+            } else {
+                $trackingData = [
+                    'eventName' => 'trackOfferUpdated',
+                    'productId' => $warrantyData['product'] ?? '',
+                    'productQuantity' => $qty,
+                    'warrantyQuantity' => $qty,
+                    'planId' => $warrantyData['planId'] ?? '',
+                    'area' => 'product_page',
+                    'component' => $warrantyData['component'] ?? 'buttons',
+                ];
+            }
+            $this->_trackingHelper->setTrackingData($trackingData);
+        }
+    }
+}

Plugin/Model/Cart/UpdateCartItemPlugin.php

@@ -56,12 +56,15 @@ public function __construct(
      */
     public function afterExecute($subject, $result, $cart, $cartItemId, $quantity, $customizableOptionsData)
     {
+        $cartId = $this->checkoutSession->getQuoteId();
         $this->checkoutSession->setQuoteId($cart->getId());
+
         $this->_eventManager->dispatch(
             'extend_checkout_cart_update_items_after',
             ['cart' => false]
         );
-        $this->checkoutSession->setQuoteId(null);
+
+        $this->checkoutSession->setQuoteId($cartId);
 
         return $result;
     }

composer.json

@@ -12,7 +12,7 @@
 
     },
     "type": "magento2-module",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": [
 
     ],

etc/graphql/di.xml

@@ -35,5 +35,5 @@
     <type name="\Magento\QuoteGraphQl\Model\Cart\UpdateCartItem">
         <plugin name="extend_warranty_balance_cart" type="\Extend\WarrantyGraphQl\Plugin\Model\Cart\UpdateCartItemPlugin"/>
     </type>
-    <preference for="\Extend\Warranty\Observer\Warranty\RemoveWarranties" type="\Extend\WarrantyGraphQl\Observer\RemoveWarranties"/>
+    <preference for="\Extend\Warranty\Observer\QuoteRemoveItem" type="\Extend\WarrantyGraphQl\Observer\RemoveWarranties"/>
 </config>

etc/graphql/events.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_quote_remove_item">
-        <observer name="remove_warranties" instance="Extend\Warranty\Observer\Warranty\RemoveWarranties"/>
+        <observer name="remove_warranties" instance="Extend\Warranty\Observer\QuoteRemoveItem"/>
+    </event>
+    <event name="extend_warranty_added_to_cart">
+        <observer name="track_warranty_added_to_cart" instance="\Extend\WarrantyGraphQl\Observer\TrackWarrantyAddedToCart"/>
     </event>
     <event name="extend_checkout_cart_update_items_after">
         <observer name="cart_normalize" instance="Extend\Warranty\Observer\Warranty\Normalize"/>