Skip to content

Commit c054ff6

Browse files
miniyevminiyev
committed
1.3.5 (FINAL RELEASE)
1 parent 5dbbdc1 commit c054ff6

File tree

2,299 files changed

+14270
-5098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,299 files changed

+14270
-5098
lines changed

‎Block/Adminhtml/Account/Grid.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Account;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Grid\AbstractGrid;
@@ -45,6 +51,7 @@ protected function _prepareColumns()
4551
'align' => 'left',
4652
'width' => '150px',
4753
'type' => 'datetime',
54+
'filter' => '\Ess\M2ePro\Block\Adminhtml\Magento\Grid\Column\Filter\Datetime',
4855
'format' => \IntlDateFormatter::MEDIUM,
4956
'filter_time' => true,
5057
'index' => 'create_date',
@@ -56,6 +63,7 @@ protected function _prepareColumns()
5663
'align' => 'left',
5764
'width' => '150px',
5865
'type' => 'datetime',
66+
'filter' => '\Ess\M2ePro\Block\Adminhtml\Magento\Grid\Column\Filter\Datetime',
5967
'format' => \IntlDateFormatter::MEDIUM,
6068
'filter_time' => true,
6169
'index' => 'update_date',

‎Block/Adminhtml/Account/Switcher.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Account;
410

511
class Switcher extends \Ess\M2ePro\Block\Adminhtml\Component\Switcher

‎Block/Adminhtml/Amazon/Account.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/*
44
* @author M2E Pro Developers Team
5-
* @copyright 2011-2015 ESS-UA [M2E Pro]
5+
* @copyright M2E LTD
66
* @license Commercial use is forbidden
77
*/
88

‎Block/Adminhtml/Amazon/Account/Edit.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Form\AbstractContainer;

‎Block/Adminhtml/Amazon/Account/Edit/Form.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account\Edit;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Form\AbstractForm;

‎Block/Adminhtml/Amazon/Account/Edit/Tabs.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account\Edit;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Tabs\AbstractTabs;

‎Block/Adminhtml/Amazon/Account/Edit/Tabs/General.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account\Edit\Tabs;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Form\AbstractForm;
@@ -65,20 +71,16 @@ protected function _prepareForm()
6571
self::HELP_BLOCK,
6672
[
6773
'content' => $this->__(<<<HTML
68-
<p>Fill in the Title, choose the Marketplace you want to work with and click on the Get Access Data link.
69-
You will be redirected to Amazon Website.</p><br>
70-
<p><strong>Note:</strong> To be eligible to sell on Amazon, Sellers must have at least one of the following:
71-
a non-individual <i>Selling on Amazon Account</i>, an <i>Amazon WebStore Account</i>, a
72-
<i>Checkout by Amazon Account</i>, or an <i>Amazon Product Ads Account</i>. If you are an individual Seller you
73-
have to upgrade to a Pro Merchant Seller Account from the Amazon Services Selling on Amazon Page.</p><br>
74-
<p>Sign-in and complete the steps to obtain access to a specific Marketplace:</p>
74+
<p><strong>Important note:</strong> to be eligible to sell on Amazon, seller must have at least one of the following Amazon accounts: <br>
75+
Non-individual Amazon seller, Amazon Payments, Amazon Fresh, Amazon Business, Amazon Prime Now, Amazon Webstore, Amazon Product Ads, Amazon Supply.</p>
76+
<p>Individual sellers may upgrade to a Pro Merchant seller account.</p> <br>
77+
<p>Specify an Account Title, select an Amazon Marketplace, click <strong>Get Access Data</strong> and proceed with the following steps to grant M2E Pro access to your Amazon data:</p>
7578
<ul>
76-
<li><p>Select - 'I want to use an application to access my Amazon Seller Account with MWS.'</p></li>
77-
<li><p>Accept the Amazon MWS License Agreement.</p></li>
78-
<li><p>The Merchant ID and MWS Auth Token will be automatically filled in.</p></li>
79-
</ul><br>
80-
<p>More detailed information about how to work with this
81-
Page you can find <a href="%url%" target="_blank" class="external-link">here</a>.</p>
79+
<li>sign in to your Seller Central account;</li>
80+
<li>confirm you allow M2E Pro to access your Amazon selling account;</li>
81+
</ul>
82+
<p>Amazon Authorization Token will be generated automatically. After you get back to M2E Pro Amazon Account Configuration page, click <strong>Save</strong> to apply the changes.</p><br>
83+
<p>More detailed information on how to work with this page can be found <a href="%url%" target="_blank">here</a>.</p>
8284
HTML
8385
, $this->getHelper('Module\Support')->getDocumentationArticleUrl('x/MgItAQ'))
8486
]
@@ -227,7 +229,7 @@ protected function _prepareForm()
227229
'value' => $isAuthMode ? $merchantId : ($isEdit ? $formData['merchant_id'] : ''),
228230
'display' => $isEdit,
229231
'disabled' => $isEdit,
230-
'tooltip' => $this->__('Paste generated Merchant ID from Amazon. (It must look like: A15UFR7CZVW5YA).')
232+
'tooltip' => $this->__('Your Amazon Seller ID.')
231233
]
232234
);
233235
if (!$isEdit) {
@@ -245,9 +247,7 @@ protected function _prepareForm()
245247
'required' => true,
246248
'value' => $isAuthMode ? $mwsToken : ($isEdit ? $formData['token'] : ''),
247249
'display' => $isEdit,
248-
'tooltip' => $this->__(
249-
'Paste generated MWS Auth Token from Amazon.
250-
(It must look like: amzn.mws.bna3f75c-a683-49c7-6da0-749y33313dft).')
250+
'tooltip' => $this->__('An obtained Amazon Authorization Token.')
251251
]
252252
);
253253
if (!$isEdit) {

‎Block/Adminhtml/Amazon/Account/Edit/Tabs/ListingOther.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account\Edit\Tabs;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Form\AbstractForm;
@@ -99,7 +105,7 @@ protected function _prepareForm()
99105
'related_store_id',
100106
self::STORE_SWITCHER,
101107
[
102-
'container_id' => 'marketplaces_related_store_id_container',
108+
'container_id' => 'other_listings_store_view_tr',
103109
'name' => 'related_store_id',
104110
'label' => $this->__('Related Store View'),
105111
'value' => $formData['related_store_id'],

‎Block/Adminhtml/Amazon/Account/Edit/Tabs/Order.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account\Edit\Tabs;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Form\AbstractForm;

‎Block/Adminhtml/Amazon/Account/Edit/Tabs/Repricing.php‎

Lines changed: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
39
namespace Ess\M2ePro\Block\Adminhtml\Amazon\Account\Edit\Tabs;
410

511
use Ess\M2ePro\Block\Adminhtml\Magento\Form\AbstractForm;
@@ -37,7 +43,7 @@ protected function _prepareForm()
3743
self::HELP_BLOCK,
3844
[
3945
'content' => $this->__(<<<HTML
40-
You can use the <strong>Repricing Tool</strong> developed by M2E Pro Team to improve your
46+
You can use the <strong>Repricing Tool</strong> developed by M2E Pro Team to improve your
4147
Offer position on Amazon Channel. Repricing functionality provides you with the constant edge over your Competitors.
4248
<br /><br />
4349
Use <strong>Link Now</strong> button to add your M2E Pro Amazon Account to Amazon Repricing Service.
@@ -52,7 +58,7 @@ protected function _prepareForm()
5258
You can <strong>Add/Remove Items</strong> to/from the Repricing Service via M2E Pro.
5359
Select appropriate action in Seller Central View Mode of your M2E Pro Listing.
5460
<br /><br />
55-
In case you decide to stop using the Repricing Tool for M2E Pro Listings, you can click on
61+
In case you decide to stop using the Repricing Tool for M2E Pro Listings, you can click on
5662
<strong>Unlink</strong> button. The repricing process will be stopped for Products from this M2E Pro Amazon Account.
5763
The Product Prices will be updated via M2E Pro again.
5864
<br /><br />
@@ -250,23 +256,23 @@ protected function _prepareForm()
250256
$this->getTooltipHtml(
251257
$this->__('
252258
<strong>Regular Price</strong> is a common Price without any changes.
253-
This value is used for Repricing Rules configuration and plays the role of the roll-back Price in case
254-
the Rules cannot be applied or the Goals provided in the Repricing Rules cannot be achieved.
259+
This value is used for Repricing Rules configuration and plays the role of the roll-back Price in case
260+
the Rules cannot be applied or the Goals provided in the Repricing Rules cannot be achieved.
255261
<a href="%url1%" target="_blank">Learn more</a> about using the Regular Price in Repricing Service.
256262
<br /><br />
257263
Specify the settings for automatic update of the Regular Price:
258264
<br /><br />
259265
<strong>Manually</strong> - means that the Product Price value will be provided manually;<br />
260-
<strong>According to Selling Format Policy settings</strong> - means that the Price value will be set based
266+
<strong>According to Selling Format Policy settings</strong> - means that the Price value will be set based
261267
on the Selling Format Policy settings;<br />
262-
<strong>From Product Price</strong> - means that the Price value
268+
<strong>From Product Price</strong> - means that the Price value
263269
will be taken from Magento Product Price Attribute;<br />
264-
<strong>From Special Price</strong> - means that the Price value
270+
<strong>From Special Price</strong> - means that the Price value
265271
will be taken from Magento Special Price Attribute;<br />
266-
<strong>From Magento Attribute</strong> - means that the Price value
272+
<strong>From Magento Attribute</strong> - means that the Price value
267273
will be taken from the selected Magento Attribute.<br />
268274
<br />
269-
Please note, only common (available in all Attribute sets in your Magento) Text or Price field Attributes
275+
Please note, only common (available in all Attribute sets in your Magento) Text or Price field Attributes
270276
are available for the selection.
271277
<br /><br />
272278
More detailed information on how to work with this option can be found
@@ -397,21 +403,21 @@ protected function _prepareForm()
397403
$fieldTooltip = '<div class="fix-magento-tooltip" style="margin-left: 20px; margin-right: 20px;">' .
398404
$this->getTooltipHtml(
399405
$this->__('
400-
<strong>Min Price</strong> is the lowest Price which you could sell your Item at.
406+
<strong>Min Price</strong> is the lowest Price which you could sell your Item at.
401407
<a href="%url1%" target="_blank">Learn more</a> about using the Max Price in Repricing Service.
402408
<br /><br />
403409
Specify the settings for automatic update of the Min Price:
404410
<br /><br />
405411
<strong>Manually</strong> - means that the Product Price value will be provided manually;<br />
406-
<strong>Less than Regular Price by Value</strong> - means that the Min Price value
412+
<strong>Less than Regular Price by Value</strong> - means that the Min Price value
407413
will be taken as a Regular Price decreased by the value you set.
408414
For example, you set the Value 5. Your Regular price is 17. So the Min Price will be 12.<br />
409-
<strong>Less than Regular Price by Percent</strong> - means that the Min Price value
415+
<strong>Less than Regular Price by Percent</strong> - means that the Min Price value
410416
will be taken as a Regular Price decreased by the percent you set.
411417
For example, you set 50%. Your regular price is 10. So the Min Price will be 5.<br />
412418
<strong>From Magento Attribute</strong> - means that the Price value will be taken from the selected Magento Attribute.
413419
<br /><br />
414-
Please note, only common (available in all Attribute sets in your Magento)
420+
Please note, only common (available in all Attribute sets in your Magento)
415421
Text or Price field Attributes are available for the selection.
416422
<br /><br />
417423
More detailed information on how to work with this option can be found
@@ -604,21 +610,21 @@ protected function _prepareForm()
604610
$fieldTooltip = '<div class="fix-magento-tooltip" style="margin-left: 20px; margin-right: 20px;">' .
605611
$this->getTooltipHtml(
606612
$this->__('
607-
<strong>Max Price</strong> is the highest Price which you could sell your Item at.
613+
<strong>Max Price</strong> is the highest Price which you could sell your Item at.
608614
<a href="%url%" target="_blank">Learn more</a> about using the Min Price in Repricing Service.
609615
<br /><br />
610616
Specify the settings for automatic update of the Max Price:
611617
<br /><br />
612618
<strong>Manually</strong> - means that the Product Price value will be provided manually;<br />
613-
<strong>More than Regular Price by Value</strong> - means that the Max Price value
619+
<strong>More than Regular Price by Value</strong> - means that the Max Price value
614620
will be taken as a Regular Price increased by the value you set.
615621
For example, you set the Value 5. Your Regular price is 17. So the Max Price will be 22.<br />
616-
<strong>More than Regular Price by Percent</strong> - means that the Max Price value
622+
<strong>More than Regular Price by Percent</strong> - means that the Max Price value
617623
will be taken as a Regular Price increased by the percent you set.
618624
For example, you set 50 Percent. Your regular price is 10. So the Max Price will be 15.<br />
619625
<strong>From Magento Attribute</strong> - means that the Max Price value will be taken from the selected Attribute.
620626
<br /><br />
621-
Please note, only common (available in all Attribute sets in your Magento)
627+
Please note, only common (available in all Attribute sets in your Magento)
622628
Text or Price field Attributes are available for the selection.
623629
<br /><br />
624630
More detailed information on how to work with this option can be found
@@ -821,18 +827,18 @@ protected function _prepareForm()
821827
],
822828
'create_magento_attribute' => true,
823829
'value' => $value,
824-
'after_element_html' => '
825-
<div class="fix-magento-tooltip" style="margin-left: 20px; margin-right: 20px;">' . $this->getTooltipHtml($this->__('
826-
This option allows you to set when you would like to disable dynamic repricing for your M2E Pro Items.
830+
'after_element_html' => '<div class="fix-magento-tooltip" style="margin-left: 20px; margin-right: 20px;">' .
831+
$this->getTooltipHtml($this->__('
832+
This option allows you to set when you would like to disable dynamic repricing for your M2E Pro Items.
827833
<a href="%url1%" target="_blank">Learn more</a> about the Product Disabling feature.
828834
<br /><br />
829835
<strong>Manually</strong> - means that the dynamic repricing can be disabled only manually;<br />
830-
<strong>When Status is Disabled</strong> - means that the dynamic repricing
836+
<strong>When Status is Disabled</strong> - means that the dynamic repricing
831837
will be automatically paused for the Product which has Disabled status in Magento;<br />
832-
<strong>From Magento Attribute</strong> - means that the dynamic repricing
838+
<strong>From Magento Attribute</strong> - means that the dynamic repricing
833839
will be automatically paused for the Product if ‘Yes’ value is provided in specified Attribute.
834840
<br /><br />
835-
Please note, only common (available in all Attribute sets in your Magento)
841+
Please note, only common (available in all Attribute sets in your Magento)
836842
Text or Price field Attributes are available for the selection.
837843
<br /><br />
838844
More detailed information on how to work with this option can be found
@@ -843,28 +849,7 @@ protected function _prepareForm()
843849
]
844850
)->addCustomAttribute('allowed_attribute_types', 'boolean');
845851

846-
if ($repricing) {
847-
$this->js->addOnReadyJs(<<<JS
848-
require([], function(){
849-
$('regular_price_mode')
850-
.observe('change', AmazonAccountObj.regular_price_mode_change)
851-
.simulate('change');
852-
853-
$('min_price_mode')
854-
.observe('change', AmazonAccountObj.min_price_mode_change)
855-
.simulate('change');
856-
857-
$('max_price_mode')
858-
.observe('change', AmazonAccountObj.max_price_mode_change)
859-
.simulate('change');
860-
861-
$('disable_mode')
862-
.observe('change', AmazonAccountObj.disable_mode_change)
863-
.simulate('change');
864-
});
865-
JS
866-
);
867-
} else {
852+
if (!$repricing) {
868853
$this->js->addOnReadyJs(<<<JS
869854
require([
870855
'M2ePro/Plugin/AreaWrapper'

0 commit comments

Comments
 (0)