test

Author: landofcoder

Controller/Cart/Loadquote.php

@@ -98,7 +98,7 @@ public function __construct(
         Publisher $publisher,
         Contact $mauticContact
     ) {
-    
+
         $this->pageFactory      = $pageFactory;
         $this->_quote           = $quote;
         $this->_customerSession = $customerSession;
@@ -123,8 +123,9 @@ public function execute()
             $quote->getResource()->load($quote, $params['id']);
             $magentoStoreId = $quote->getStoreId();
             $configSecretKey = $this->_helper->getConfig(\Lof\Mautic\Helper\Data::MODULE_ABANDONEDCART_TOKEN);
+            $tokenNew = $configSecretKey ? md5($configSecretKey.$params['id']) : "";
 
-            if (!isset($params['token']) || $params['token'] != $configSecretKey) {
+            if (!isset($params['token']) || ($tokenNew && $params['token'] != $tokenNew)) {
                 // @error
                 $this->_message->addErrorMessage(__("You can't access this cart"));
                 $url = $this->_urlHelper->getUrl(
@@ -158,7 +159,7 @@ public function execute()
                 if ($emailAddress = $quote->getCustomerEmail()) {
                     $this->processUpdateContactTag($emailAddress, $quote->getStoreId());
                 }
-                
+
                 if (!$quote->getCustomerId()) {
                     $this->_checkoutSession->setQuoteId($quote->getId());
                     $this->_redirect($url);
@@ -185,7 +186,7 @@ public function execute()
 
     /**
      * process update contact tags
-     * 
+     *
      * @param string $email
      * @param int|string|null $storeId
      * @return bool
@@ -208,4 +209,4 @@ protected function processUpdateContactTag($email, $storeId = null)
         }
         return true;
     }
-}
+}

Queue/Processor/AbandonedCartProcessor.php

@@ -77,13 +77,13 @@ public function process()
                 $this->_processAbandoned($storeId);
             }
         }
-        
+
         return;
     }
 
     /**
      * Process abandoned cart
-     * 
+     *
      * @param int $storeId
      * @return void
      */
@@ -99,6 +99,9 @@ protected function _processAbandoned($storeId)
             $this->customergroups = [];
         }
         $diff = $this->helperData->getConfig(Data::MODULE_DIFF_DATE, $storeId);
+        if (!$diff) { //Disable feature when diff date number is empty
+            return;
+        }
         $expr = sprintf('DATE_SUB(now(), %s)', $this->_getIntervalUnitSql($diff, 'DAY'));
         $from = new \Zend_Db_Expr($expr);
 
@@ -119,7 +122,7 @@ protected function _processAbandoned($storeId)
 
         try {
             foreach ($collection as $quote) {
-                $tokenNew = $token;//.md5(rand(0, 9999999));
+                $tokenNew = md5($token.$quote->getEntityId());
                 $url = $this->_storeManager->getStore($storeId)->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK) . 'mautic/cart/loadquote?id=' . $quote->getEntityId() . '&token=' . $tokenNew;
 
                 $customData = [
@@ -142,7 +145,7 @@ protected function _processAbandoned($storeId)
         } catch (\Exception $e) {
             //log exception at here
         }
-        
+
         return;
     }