6.4.0 PA1

m2epro · Dec 8, 2015 · 0df6f48 · 0df6f48
1 parent 51103a7
commit 0df6f48
Show file tree

Hide file tree

Showing 49 changed files with 602 additions and 3,795 deletions.
diff --git a/...de/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View/Sellercentral/Grid.php b/...de/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View/Sellercentral/Grid.php
@@ -330,6 +330,12 @@ protected function _prepareMassaction()
                 'url' => '',
                 'confirm' => Mage::helper('M2ePro')->__('Are you sure?')
             ), 'edit_repricing');
+
+            $this->getMassactionBlock()->addItem('showDetails', array(
+                'label' => Mage::helper('M2ePro')->__('Show Details'),
+                'url' => '',
+                'confirm' => Mage::helper('M2ePro')->__('Are you sure?')
+            ), 'edit_repricing');
         }
         // ---------------------------------------
 

diff --git a/.../community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Order/MerchantFulfillment/Message.php b/.../community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Order/MerchantFulfillment/Message.php
@@ -17,7 +17,7 @@ public function __construct()
 
         // Initialization block
         // ---------------------------------------
-        $this->setId('amazonOrderMerchantFulfillmentBreadcrumb');
+        $this->setId('amazonOrderMerchantFulfillmentMessage');
         // ---------------------------------------
         $this->setTemplate('M2ePro/common/amazon/order/merchant_fulfillment/message.phtml');
     }

diff --git a/...ty/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Template/Description/Edit/Tabs/Definition.php b/...ty/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Template/Description/Edit/Tabs/Definition.php
@@ -102,7 +102,9 @@ public function getForceAddedAttributeOptionHtml($attributeCode, $availableValue
             return '';
         }
 
-        $attributeLabel = Mage::helper('M2ePro/Magento_Attribute')->getAttributeLabel($attributeCode);
+        $attributeLabel = Mage::helper('M2ePro')
+            ->escapeHtml(Mage::helper('M2ePro/Magento_Attribute')->getAttributeLabel($attributeCode));
+
         $html = "<option %s selected=\"selected\">{$attributeLabel}</option>";
 
         return is_null($value) ? sprintf($html, "value='{$attributeCode}'")

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Buy/Listing/ProductSearch/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Buy/Listing/ProductSearch/Grid.php
@@ -178,6 +178,8 @@ public function callbackColumnPrice($value, $row, $column, $isExport)
     {
         if (empty($value)) {
             $value = Mage::helper('M2ePro')->__('N/A');
+        } else {
+            $value = Mage::app()->getLocale()->currency('USD')->toCurrency($value);
         }
 
         return '<div id="price_'.$row->getId().'" style="margin-right: 5px;">'.$value.'</div>';

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/View/Ebay/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Listing/View/Ebay/Grid.php
@@ -1307,6 +1307,8 @@ private function getInitTerapeakWidgetHtml()
             return '';
         }
 
+        $protocolMode = Mage::getStoreConfig('web/secure/use_in_adminhtml') == '1' ? 'https' : 'http';
+
         return <<<HTML
 <style>
     div.tp-research { display: inline-block; }
@@ -1330,7 +1332,7 @@ private function getInitTerapeakWidgetHtml()
     };
 
     var script = new Element('script', {type: 'text/javascript',
-                                        src: 'https://widget.terapeak.com/tools/terapeak-loader.js'});
+                                        src: '$protocolMode://widget.terapeak.com/tools/terapeak-loader.js'});
 
     $$('head').first().appendChild(script);
 

diff --git a/app/code/community/Ess/M2ePro/CHANGELOG b/app/code/community/Ess/M2ePro/CHANGELOG
@@ -1,3 +1,15 @@
+* 6.4.0 (r10097) (08/12/2015)
+
+* Improvement: [Amazon] Many improvements of Amazon's Shipping Services feature (Buy Shipping API)
+* Fix: Blank page if Magento Configs cache was disabled and Compilation was enabled
+* Fix: Major boost of some Extension observers (core blocks render before and after events)
+* Fix: Some data Changes could be lost if more than 500 Magento Products updated at one time
+* Fix: Sales Channels could not be enabled in System -> Configuration if all of them were switched off
+* Fix: Magento Attributes Labels were translated to the selected Locale language (wrong labels)
+* Fix: [eBay] The warnings in Chrome Browser because of unsecure connections to the Terapeak service
+* Fix: [Amazon] Error: "Call to a member function setData() on a non-object" during synchronization in some cases
+* Fix: [Rakuten.com] Unexpected Product Status changing in some cases (Rakuten.com API issue)
+
 * 6.3.9 (r9929) (15/11/2015)
 
 * Added: [Amazon] Ability to use Amazon's Shipping Services feature (Buy Shipping API)

diff --git a/app/code/community/Ess/M2ePro/Helper/Module.php b/app/code/community/Ess/M2ePro/Helper/Module.php
@@ -72,7 +72,7 @@ public function getVersion()
 
     public function getRevision()
     {
-        $revision = '9929';
+        $revision = '10097';
 
         if ($revision == str_replace('|','#','|REVISION|')) {
             $revision = (int)exec('svnversion');

diff --git a/...community/Ess/M2ePro/Model/Amazon/Listing/Product/Action/Type/List/Validator/ListType.php b/...community/Ess/M2ePro/Model/Amazon/Listing/Product/Action/Type/List/Validator/ListType.php
@@ -333,11 +333,11 @@ private function recognizeBySearchWorldwideId()
             }
 
 // M2ePro_TRANSLATIONS
-// %worldwide_id_type% %worldwide_id% provided in Listing Search Settings is not found on Amazon. Please set the correct value and try again.
+// %worldwide_id_type% %worldwide_id% provided in Listing Search Settings is not found on Amazon. Please set Description Policy to create New ASIN/ISBN.
             $this->addMessage(
                 Mage::getSingleton('M2ePro/Log_Abstract')->encodeDescription(
                     '%worldwide_id_type% %worldwide_id% provided in Search Settings
-                     is not found on Amazon. Please set the correct value and try again.',
+                     is not found on Amazon. Please set Description Policy to create New ASIN/ISBN.',
                     array('!worldwide_id_type' => $worldwideIdType, '!worldwide_id' => $worldwideId)
                 )
             );

diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Order/Builder.php b/app/code/community/Ess/M2ePro/Model/Amazon/Order/Builder.php
@@ -291,7 +291,7 @@ private function hasUpdate($update)
 
     private function processMagentoOrderUpdates()
     {
-        if (!$this->hasUpdates()) {
+        if (!$this->hasUpdates() || is_null($this->order->getMagentoOrder())) {
             return;
         }
 
@@ -315,7 +315,7 @@ private function processMagentoOrderUpdates()
             );
         }
 
-        if (!is_null($this->order->getMagentoOrder()) && $this->hasUpdate(self::UPDATE_EMAIL)) {
+        if ($this->hasUpdate(self::UPDATE_EMAIL)) {
             $magentoOrderUpdater->updateCustomerEmail($this->order->getChildObject()->getBuyerEmail());
         }