Merge pull request #336 from mageplaza/2.4-develop

2.4 develop
mageplaza · Sep 22, 2021 · 8576120 · 8576120
2 parents 73be583 + 7d63e71
commit 8576120
Show file tree

Hide file tree

Showing 36 changed files with 1,195 additions and 1,349 deletions.
diff --git a/.../Adminhtml/System/Config/SyncCustomer.php → Block/Adminhtml/System/Config/Sync.php b/.../Adminhtml/System/Config/SyncCustomer.php → Block/Adminhtml/System/Config/Sync.php
@@ -21,23 +21,25 @@
 
 namespace Mageplaza\Smtp\Block\Adminhtml\System\Config;
 
+use Mageplaza\Smtp\Model\Config\Source\SyncType;
+
 /**
- * Class SyncCustomer
+ * Class Sync
  * @package Mageplaza\Smtp\Block\Adminhtml\System\Config
  */
-class SyncCustomer extends Button
+class Sync extends Button
 {
     /**
      * @var string
      */
-    protected $_template = 'system/config/sync-template.phtml';
+    protected $_template = 'Mageplaza_Smtp::system/config/sync-template.phtml';
 
     /**
      * @return string
      */
     public function getEstimateUrl()
     {
-        return $this->getUrl('adminhtml/smtp_sync/estimatecustomer', ['_current' => true]);
+        return $this->getUrl('adminhtml/smtp_sync/estimate', ['_current' => true]);
     }
 
     /**
@@ -57,34 +59,30 @@ public function getStoreId()
     }
 
     /**
-     * @return mixed
+     * @return array
      */
     public function getSyncSuccessMessage()
     {
-        return __('Customer synchronization has been completed.');
+        return [
+            SyncType::CUSTOMERS   => __('Customer synchronization has been completed.'),
+            SyncType::ORDERS      => __('Order synchronization has been completed.'),
+            SyncType::SUBSCRIBERS => __('Subscriber synchronization has been completed.')
+        ];
     }
 
     /**
      * @return string
      */
     public function getElementId()
     {
-        return 'mp-sync-customer';
+        return 'mp-synchronize';
     }
 
     /**
      * @return string
      */
     public function getComponent()
     {
-        return 'Mageplaza_Smtp/js/sync/customer';
-    }
-
-    /**
-     * @return bool
-     */
-    public function isRenderCss()
-    {
-        return true;
+        return 'Mageplaza_Smtp/js/sync/sync';
     }
 }
diff --git a/Block/Adminhtml/System/Config/SyncOrder.php b/Block/Adminhtml/System/Config/SyncOrder.php
diff --git a/Block/Adminhtml/System/Config/SyncSubscriber.php b/Block/Adminhtml/System/Config/SyncSubscriber.php
diff --git a/Block/Script.php b/Block/Script.php
@@ -22,10 +22,15 @@
 namespace Mageplaza\Smtp\Block;
 
 use Magento\Catalog\Block\Product\Context;
+use Magento\Customer\Model\Context as CustomerContext;
+use Magento\Catalog\Helper\Data;
+use Magento\Catalog\Model\Product;
 use Magento\Customer\Model\SessionFactory as CustomerSession;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Sales\Model\Order;
@@ -63,6 +68,16 @@ class Script extends Template
      */
     protected $httpContext;
 
+    /**
+     * @var Data
+     */
+    protected $taxHelper;
+
+    /**
+     * @var PriceCurrencyInterface
+     */
+    protected $priceCurrency;
+
     /**
      * Script constructor.
      *
@@ -72,6 +87,8 @@ class Script extends Template
      * @param CustomerSession $customerSession
      * @param Registry $registry
      * @param HttpContext $httpContext
+     * @param Data $taxHelper
+     * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
      */
     public function __construct(
@@ -81,13 +98,18 @@ public function __construct(
         CustomerSession $customerSession,
         Registry $registry,
         HttpContext $httpContext,
+        Data $taxHelper,
+        PriceCurrencyInterface $priceCurrency,
         array $data = []
     ) {
         $this->helperEmailMarketing = $helperEmailMarketing;
         $this->checkoutSession      = $checkoutSession;
         $this->customerSession      = $customerSession;
         $this->registry             = $registry;
         $this->httpContext          = $httpContext;
+        $this->taxHelper            = $taxHelper;
+        $this->priceCurrency        = $priceCurrency;
+
         parent::__construct($context, $data);
     }
 
@@ -141,33 +163,37 @@ public function getCurrencyCode()
 
     /**
      * @return array
+     * @throws LocalizedException
      * @throws NoSuchEntityException
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getCustomerData()
     {
-        $isLoggedIn = $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_AUTH);
+        $isLoggedIn = $this->httpContext->getValue(CustomerContext::CONTEXT_AUTH);
         if (!$isLoggedIn) {
             $shippingAddress = $this->checkoutSession->getQuote()->getShippingAddress();
-            $data = [
-                'email' => $shippingAddress->getData('email') === null ? '' : $shippingAddress->getData('email'),
-                'firstname' => $shippingAddress->getData('firstname') === null ? '' : $shippingAddress->getData('firstname'),
-                'lastname' => $shippingAddress->getData('lastname') === null ? '' : $shippingAddress->getData('lastname')
+            $data            = [
+                'email'     => $shippingAddress->getData('email') === null ? '' : $shippingAddress->getData('email'),
+                'firstname' => $shippingAddress->getData('firstname') === null ?
+                    '' : $shippingAddress->getData('firstname'),
+                'lastname'  => $shippingAddress->getData('lastname') === null ?
+                    '' : $shippingAddress->getData('lastname')
             ];
+
             return $data;
         } else {
             $customer = $this->customerSession->create()->getCustomer();
-            $data = [
-                'email' => $customer->getData('email') === null ? '' : $customer->getData('email'),
+            $data     = [
+                'email'     => $customer->getData('email') === null ? '' : $customer->getData('email'),
                 'firstname' => $customer->getData('firstname') === null ? '' : $customer->getData('firstname'),
-                'lastname' => $customer->getData('lastname') === null ? '' : $customer->getData('lastname')
+                'lastname'  => $customer->getData('lastname') === null ? '' : $customer->getData('lastname')
             ];
+
             return $data;
         }
     }
 
     /**
-     * @return array|false
+     * @return array|bool
      * @throws NoSuchEntityException
      */
     public function productAbandoned()
@@ -181,7 +207,8 @@ public function productAbandoned()
                 'collections' => [],
                 'id'          => $product->getId(),
                 'image'       => $imageUrl,
-                'price'       => $product->getFinalPrice(),
+                'price'       => $this->getPrice($product),
+                'priceTax'    => $this->getPrice($product, true),
                 'productType' => $product->getTypeId(),
                 'tags'        => [],
                 'title'       => $product->getName(),
@@ -192,4 +219,23 @@ public function productAbandoned()
 
         return false;
     }
+
+    /**
+     * @param Product $product
+     * @param bool $includeTax
+     *
+     * @return float
+     */
+    public function getPrice($product, $includeTax = false)
+    {
+        $price = number_format($this->priceCurrency->convert($product->getFinalPrice()), 2);
+
+        if ($includeTax) {
+            $price = number_format($this->priceCurrency->convert(
+                $this->taxHelper->getTaxPrice($product, $product->getFinalPrice(), true)
+            ), 2);
+        }
+
+        return $price;
+    }
 }