6.42.0 (FINAL RELEASE)

m2epro · Jun 27, 2023 · b1b517d · b1b517d
1 parent e489112
commit b1b517d
Show file tree

Hide file tree

Showing 183 changed files with 463 additions and 673 deletions.
diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/AutoAction/Mode.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/AutoAction/Mode.php
@@ -13,7 +13,7 @@ class Ess_M2ePro_Block_Adminhtml_Amazon_Listing_AutoAction_Mode
 
     public function getHelpPageUrl()
     {
-        return Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, "x/__IVAg");
+        return Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, "auto-add-remove-rules");
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Create/General/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Create/General/Form.php
@@ -287,7 +287,7 @@ protected function _toHtml()
                 values will be used in the Listing settings.</p><br>
                 <p>More detailed information you can find
                 <a href="%url%" target="_blank" class="external-link">here</a>.</p>',
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/YOIVAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'step-1-specify-general-settings')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('General Settings')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Create/Search/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Create/Search/Form.php
@@ -278,7 +278,7 @@ protected function _toHtml()
 <p>More detailed information you can find <a href="%url%" target="_blank" class="external-link">here</a>.</p>
 HTML
                     ,
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/s_IVAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'step-3-specify-search-settings')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('Search Settings')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Create/Selling/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Create/Selling/Form.php
@@ -1180,7 +1180,7 @@ protected function _toHtml()
 <p>More detailed information you can find <a href="%url%" target="_blank" class="external-link">here</a>.</p>
 HTML
                     ,
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/c_IVAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'step-2-specify-selling-settings')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('Selling Settings')
             )

diff --git a/...unity/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Product/Add/SearchAsin/SearchSettings.php b/...unity/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Product/Add/SearchAsin/SearchSettings.php
@@ -54,8 +54,8 @@ protected function _prepareLayout()
 <p>Click <a href="%url2%" target="_blank" class="external-link">here</a> for more detailed information.</p>
 HTML
                     ,
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/xeMVAg'),
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/s_IVAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'asin-isbn-management#271e3b536b4045cf847a54ec26564ff3'),
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'step-3-specify-search-settings')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('Search Settings')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Transferring/Destination.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Transferring/Destination.php
@@ -63,7 +63,7 @@ protected function _toHtml()
 To do it, you have to choose From and To Accounts, Marketplaces, Store Views and Listings.
 Click <a href="%url%" target="_blank">here</a> to learn more detailed information.
 HTML
-                , Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/ztyMAg')),
+                , Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'sell-on-another-amazon-marketplace')),
                 'style'   => 'margin-top: 15px;',
                 'title'   => Mage::helper('M2ePro')->__('Sell on Another Marketplace')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Log/Synchronization.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Log/Synchronization.php
@@ -30,7 +30,7 @@ protected function _toHtml()
                     <strong>Note:</strong> Only errors and warnings are logged.<br><br>
             
                     The detailed information can be found <a href="%url%" target="_blank">here</a>.',
-                    Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(null, null, "x/HN0VAg")
+                    Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(null, null, "logs-events")
                 ),
                 'title' => Mage::helper('M2ePro')->__('Synchronization')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/Components/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/Components/Form.php
@@ -18,7 +18,7 @@ public function __construct()
         $this->setId('configurationComponentsForm');
         $this->setTemplate('M2ePro/configuration/components.phtml');
 
-        $this->setPageHelpLink("x/qVoJAg");
+        $this->setPageHelpLink("global-settings");
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/License/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/License/Form.php
@@ -23,7 +23,7 @@ public function __construct()
 
         // ---------------------------------------
 
-        $this->setPageHelpLink("x/qVoJAg");
+        $this->setPageHelpLink("global-settings");
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/LogsClearing/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/LogsClearing/Form.php
@@ -22,7 +22,7 @@ public function __construct()
 
         $this->setId('configurationLogsClearingForm');
         $this->setTemplate('M2ePro/configuration/logsClearing.phtml');
-        $this->setPageHelpLink("x/qVoJAg");
+        $this->setPageHelpLink("global-settings");
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/Settings/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Configuration/Settings/Form.php
@@ -21,7 +21,7 @@ public function __construct()
 
         $this->setId('configurationSettingsForm');
         $this->setTemplate('M2ePro/configuration/settings.phtml');
-        $this->setPageHelpLink('x/qVoJAg');
+        $this->setPageHelpLink('global-settings');
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/AutoAction/Mode.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/AutoAction/Mode.php
@@ -13,7 +13,7 @@ class Ess_M2ePro_Block_Adminhtml_Ebay_Listing_AutoAction_Mode
 
     public function getHelpPageUrl()
     {
-        return Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/4VoJAg');
+        return Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'set-auto-add-remove-rules');
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/Create/General/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/Create/General/Form.php
@@ -239,7 +239,7 @@ protected function _toHtml()
 More detailed information about ability to work with this Page you can find <a href="%url%" target="_blank">here</a>.
 HTML
                     ,
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/-loJAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'step-1-general-settings')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('General Settings')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/Create/Templates/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/Create/Templates/Form.php
@@ -517,7 +517,7 @@ protected function _toHtml()
 <p>More details in <a href="%url%" target="_blank">our documentation</a>.</p>
 HTML
                     ,
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/CVsJAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'step-2-policies')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('Policies')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/Transferring/Destination.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/Transferring/Destination.php
@@ -72,7 +72,7 @@ protected function _toHtml()
 To do it, you have to choose From and To Accounts, Marketplaces, Store Views and Listings.
 Click <a href="%url%" target="_blank">here</a> to learn more detailed information.
 HTML
-                , Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/o1oJAg')),
+                , Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'sell-on-another-ebay-marketplace')),
                 'style'   => 'margin-top: 15px;',
                 'title'   => Mage::helper('M2ePro')->__('Sell on Another Marketplace')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Log/Synchronization.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Log/Synchronization.php
@@ -30,7 +30,7 @@ protected function _toHtml()
                     <strong>Note:</strong> Only errors and warnings are logged.<br><br>
             
                     The detailed information can be found <a href="%url%" target="_blank">here</a>.',
-                    Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(null, null, "x/zloJAg")
+                    Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(null, null, "logs-and-events")
                 ),
                 'title' => Mage::helper('M2ePro')->__('Synchronization')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Support.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Support.php
@@ -43,7 +43,7 @@ public function __construct()
         );
 
         if ($this->_referrer === null) {
-            $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/rNqMAg');
+            $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, '');
         } else if ($this->_referrer == Ess_M2ePro_Helper_View_Ebay::NICK) {
             $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(Ess_M2ePro_Helper_View_Ebay::NICK);
         } else if ($this->_referrer == Ess_M2ePro_Helper_View_Amazon::NICK) {

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/AutoAction/Mode.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/AutoAction/Mode.php
@@ -13,7 +13,7 @@ class Ess_M2ePro_Block_Adminhtml_Walmart_Listing_AutoAction_Mode
 
     public function getHelpPageUrl()
     {
-        return Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, "x/zeVaAg");
+        return Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, "walmart-integration");
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/Create/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/Create/Form.php
@@ -464,7 +464,7 @@ protected function _toHtml()
                     Select Account under which you want to manage this Listing. Assign the Policy Templates and
                     Magento Store View.<br/><br/>
                     <p>The detailed information can be found <a href="%url%" target="_blank">here</a></p>',
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/zeVaAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'walmart-integration')
                 ),
                 'title'   => Mage::helper('M2ePro')->__('General')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Log/Synchronization.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Log/Synchronization.php
@@ -30,7 +30,7 @@ protected function _toHtml()
                     <strong>Note:</strong> Only errors and warnings are logged.<br><br>
             
                     The detailed information can be found <a href="%url%" target="_blank">here</a>.',
-                    Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(null, null, "x/zeVaAg")
+                    Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(null, null, "walmart-integration")
                 ),
                 'title' => Mage::helper('M2ePro')->__('Synchronization')
             )

diff --git a/...ty/Ess/M2ePro/Block/Adminhtml/Wizard/InstallationWalmart/Installation/Account/Content.php b/...ty/Ess/M2ePro/Block/Adminhtml/Wizard/InstallationWalmart/Installation/Account/Content.php
@@ -32,7 +32,7 @@ protected function _prepareLayout()
 </div>
 HTML
                 ,
-                Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/KOhaAg')
+                Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'account-configuration')
             )
         );
 

diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Order.php b/app/code/community/Ess/M2ePro/Model/Amazon/Order.php
@@ -734,11 +734,12 @@ public function updateShippingStatus(array $trackingDetails = array(), array $it
             );
         }
 
-        if (!empty($trackingDetails['carrier_title'])) {
-            if ($trackingDetails['carrier_title'] == Ess_M2ePro_Model_Order_Shipment_Handler::CUSTOM_CARRIER_CODE &&
-                !empty($trackingDetails['shipping_method'])) {
-                $trackingDetails['carrier_title'] = $trackingDetails['shipping_method'];
-            }
+        if (
+            !empty($trackingDetails['carrier_title'])
+            && $trackingDetails['carrier_title'] == Ess_M2ePro_Model_Order_Shipment_Handler::CUSTOM_CARRIER_CODE
+            && !empty($trackingDetails['shipping_method'])
+        ) {
+            $trackingDetails['carrier_title'] = $trackingDetails['shipping_method'];
         }
 
         $params = array_merge(

diff --git a/app/code/community/Ess/M2ePro/Model/Cron/Task/Amazon/Order/SendInvoice.php b/app/code/community/Ess/M2ePro/Model/Cron/Task/Amazon/Order/SendInvoice.php
@@ -160,8 +160,20 @@ protected function processAccount(Ess_M2ePro_Model_Account $account)
         }
     }
 
+    /**
+     * @param Ess_M2ePro_Model_Account $account
+     * @param Ess_M2ePro_Model_Order $order
+     * @param Ess_M2ePro_Model_Order_Change $change
+     * @return void
+     */
     protected function processMagentoDocument($account, $order, $change)
     {
+        $magentoOrder = $order->getMagentoOrder();
+
+        if ($magentoOrder === null) {
+            return;
+        }
+
         $changeParams = $change->getParams();
         $documentData = $this->getMagentoDocumentData($order, $changeParams['document_type']);
 
@@ -171,7 +183,9 @@ protected function processMagentoDocument($account, $order, $change)
             'amazon_order_id' => $order->getChildObject()->getAmazonOrderId(),
             'document_number' => $documentData['document_number'],
             'document_type'   => $changeParams['document_type'],
-            'document_pdf'    => $documentData['document_pdf']
+            'document_pdf'    => $documentData['document_pdf'],
+            'document_total_amount' => $magentoOrder->getGrandTotal(),
+            'document_total_vat_amount' => $magentoOrder->getTaxAmount(),
         );
 
         /** @var $dispatcherObject Ess_M2ePro_Model_Amazon_Connector_Dispatcher */

diff --git a/...nity/Ess/M2ePro/Model/Cron/Task/Walmart/Listing/SynchronizeInventory/ProcessingRunner.php b/...nity/Ess/M2ePro/Model/Cron/Task/Walmart/Listing/SynchronizeInventory/ProcessingRunner.php
@@ -54,26 +54,4 @@ protected function unsetLocks()
         $account->deleteProcessingLocks('synchronization_walmart', $this->getProcessingObject()->getId());
         $account->deleteProcessingLocks(self::LOCK_ITEM_PREFIX, $this->getProcessingObject()->getId());
     }
-
-    protected function afterLastDataPartProcessed()
-    {
-        parent::afterLastDataPartProcessed();
-
-        $responserParams = $this->getResponserParams();
-        $this->getBlockedProductsHandler()->setResponserParams($responserParams)->handle();
-
-        Mage::getSingleton('core/resource')->getConnection('core_write')->truncateTable(
-            Mage::helper('M2ePro/Module_Database_Structure')->getTableNameWithPrefix('m2epro_walmart_inventory_wpid')
-        );
-    }
-
-    /**
-     * @return Ess_M2ePro_Model_Listing_SynchronizeInventory_Walmart_BlockedProductsHandler
-     */
-    protected function getBlockedProductsHandler()
-    {
-        return Mage::getModel('M2ePro/Listing_SynchronizeInventory_Walmart_BlockedProductsHandler');
-    }
-
-    //##################################
 }
diff --git a/...e/community/Ess/M2ePro/Model/Cron/Task/Walmart/Listing/SynchronizeInventory/Responser.php b/...e/community/Ess/M2ePro/Model/Cron/Task/Walmart/Listing/SynchronizeInventory/Responser.php
@@ -90,8 +90,6 @@ public function failDetected($messageText)
     protected function processResponseData()
     {
         try {
-            $this->storeReceivedWpids();
-
             $filteredData = $this->getListingProductHandler()
                                  ->setResponserParams($this->_params)
                                  ->handle($this->getPreparedResponseData());
@@ -107,26 +105,6 @@ protected function processResponseData()
 
     //########################################
 
-    /**
-     * @throws Zend_Db_Exception
-     */
-    protected function storeReceivedWpids()
-    {
-        $insertData = array();
-        $accountId = $this->getAccount()->getId();
-
-        foreach (array_keys($this->_preparedResponseData) as $wpid) {
-            $insertData[] = array('account_id' => $accountId, 'wpid' => $wpid);
-        }
-
-        Mage::getSingleton('core/resource')->getConnection('core_write')->insertOnDuplicate(
-            Mage::helper('M2ePro/Module_Database_Structure')->getTableNameWithPrefix('m2epro_walmart_inventory_wpid'),
-            $insertData
-        );
-    }
-
-    //########################################
-
     /**
      * @return Ess_M2ePro_Model_Account
      */

diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping.php b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping.php
@@ -542,7 +542,7 @@ protected function getRateTable($type, Ess_M2ePro_Model_Account $account)
                 Mage::helper("M2ePro/Module_Support")->getDocumentationUrl(
                     null,
                     null,
-                    "x/X3NPAg#eBayGuaranteedDelivery-HowtodownloadeBayShippingRateTablestoM2EPro?"
+                    "set-up-shipping-policy#6e8b3db9007740e1a87f1d2a26209a10"
                 )
             )
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ protected function _prepareLayout() @@
     </div>
     HTML
                     ,
-                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/KOhaAg')
+                    Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'account-configuration')
                 )
             );
@@ Expand Down @@