Skip to content

Commit a786602

Browse files
raisaevraisaev
committed
1.9.5 (FINAL RELEASE)
1 parent 487a757 commit a786602

File tree

26 files changed

+164
-133
lines changed

26 files changed

+164
-133
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ protected function _prepareForm()
197197
$accessDataFieldConfig = [
198198
'container_id' => 'marketplaces_register_url_container_' . $marketplace['id'],
199199
'label' => '',
200-
'href' => '',
201-
'onclick' => '',
202200
'target' => '_blank',
203201
'value' => $this->__('Get Access Data'),
204202
'class' => 'external-link',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ protected function _prepareForm()
499499
'label' => $this->__('Min Price Percent'),
500500
'name' => 'repricing[min_price_percent]',
501501
'value' => ($repricing) ? $repricing->getData('min_price_percent') : '',
502-
'class' => 'M2ePro-required-when-visible M2ePro-account-repricing-price-value',
502+
'class' => 'M2ePro-required-when-visible M2ePro-account-repricing-price-percent',
503503
'required' => true,
504504
'tooltip' => $this->__(
505505
'Provide the Percent Value which you would like to decrease the Regular Price by.'
@@ -711,7 +711,7 @@ protected function _prepareForm()
711711
'label' => $this->__('Max Price Percent'),
712712
'name' => 'repricing[max_price_percent]',
713713
'value' => ($repricing) ? $repricing->getData('max_price_percent') : '',
714-
'class' => 'M2ePro-required-when-visible M2ePro-account-repricing-price-value',
714+
'class' => 'M2ePro-required-when-visible M2ePro-account-repricing-price-percent',
715715
'required' => true,
716716
'tooltip' => $this->__(
717717
'Provide the Percent Value which you would like to decrease the Regular Price by.'

‎Block/Adminhtml/Ebay/Listing/PickupStore/Grid.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ public function callbackColumnLog($value, $row, $column, $isExport)
546546
}
547547

548548
/** @var \Ess\M2ePro\Block\Adminhtml\Ebay\Grid\Column\Renderer\ViewLogIcon\PickupStore $viewLogIcon */
549-
$viewLogIcon = $this->createBlock('Ebay_Grid_Column_Renderer_ViewLogIcon_Listing');
549+
$viewLogIcon = $this->createBlock('Ebay_Grid_Column_Renderer_ViewLogIcon_PickupStore');
550550
$logIcon = $viewLogIcon->render($row);
551551

552552
if (!empty($logIcon)) {

‎Block/Adminhtml/Ebay/Listing/PickupStore/Variation/Product/View/Grid.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function callbackColumnOnlineAvailability($value, $row, $column, $isExpor
304304
public function callbackColumnLog($value, $row, $column, $isExport)
305305
{
306306
/** @var \Ess\M2ePro\Block\Adminhtml\Ebay\Grid\Column\Renderer\ViewLogIcon\PickupStore $viewLogIcon */
307-
$viewLogIcon = $this->createBlock('Ebay_Grid_Column_Renderer_ViewLogIcon_Listing');
307+
$viewLogIcon = $this->createBlock('Ebay_Grid_Column_Renderer_ViewLogIcon_PickupStore');
308308
$logIcon = $viewLogIcon->render($row);
309309

310310
if (!empty($logIcon)) {

‎Block/Adminhtml/Ebay/Template/Shipping/Edit/Form/Data.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ public function _construct()
4747
{
4848
parent::_construct();
4949

50-
// Initialization block
51-
// ---------------------------------------
5250
$this->setId('ebayTemplateShippingEditFormData');
53-
// ---------------------------------------
51+
52+
$this->css->addFile('ebay/template.css');
5453

5554
$this->formData = $this->getFormData();
5655
$this->marketplaceData = $this->getMarketplaceData();
@@ -1283,8 +1282,8 @@ class="m2epro-field-with-tooltip select admin__control-select M2ePro-validate-ra
12831282
'data' => [
12841283
'name' => 'shipping[weight_minor]',
12851284
'value' => $this->formData['weight_minor'],
1286-
'class' => 'M2ePro-required-when-visible M2ePro-validation-float input-text admin__control-text',
1287-
'style' => 'width: 30%',
1285+
'class' => 'M2ePro-required-when-visible M2ePro-validation-float input-text admin__control-text
1286+
shipping_weight_minor',
12881287
]
12891288
]);
12901289
$weightMinorBlock->setForm($form);
@@ -2553,16 +2552,13 @@ public function getCurrencyAvailabilityMessage()
25532552

25542553
protected function _beforeToHtml()
25552554
{
2556-
// ---------------------------------------
25572555
$buttonBlock = $this
25582556
->createBlock('Magento\Button')
25592557
->setData([
25602558
'label' => $this->__('Remove'),
2561-
'onclick' => 'EbayTemplateShippingObj.removeRow.call(this, \'%type%\');',
25622559
'class' => 'delete icon-btn remove_shipping_method_button'
25632560
]);
25642561
$this->setChild('remove_shipping_method_button', $buttonBlock);
2565-
// ---------------------------------------
25662562

25672563
return parent::_beforeToHtml();
25682564
}

‎Block/Adminhtml/Walmart/Template/SellingFormat/Edit/Form/Promotions.php‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ protected function _beforeToHtml()
7979
$promotionsFromDateCustomAttribute = $this->createElement(
8080
'hidden',
8181
[
82-
'html_id' => 'promotions_from_date_custom_attribute_%i%',
83-
'name' => 'promotions[%i%][from_date][attribute]',
82+
'html_id' => 'promotions_from_date_custom_attribute_temp-i',
83+
'name' => 'promotions[temp-i][from_date][attribute]',
8484
'disabled' => true,
8585
]
8686
);
@@ -89,8 +89,8 @@ protected function _beforeToHtml()
8989
$promotionsFromDateMode = $this->createElement(
9090
Form::SELECT,
9191
[
92-
'html_id' => 'promotions_from_date_mode_%i%',
93-
'name' => 'promotions[%i%][from_date][mode]',
92+
'html_id' => 'promotions_from_date_mode_temp-i',
93+
'name' => 'promotions[temp-i][from_date][mode]',
9494
'values' => $this->getPromotionsFromDateModeOptions(),
9595
'value' => '',
9696
'class' => 'promotions_from_date_mode',
@@ -105,8 +105,8 @@ protected function _beforeToHtml()
105105
$promotionsFromDateValue = $this->createElement(
106106
'text',
107107
[
108-
'html_id' => 'promotions_from_date_value_%i%',
109-
'name' => 'promotions[%i%][from_date][value]',
108+
'html_id' => 'promotions_from_date_value_temp-i',
109+
'name' => 'promotions[temp-i][from_date][value]',
110110
'value' => '',
111111
'class' => 'M2ePro-required-when-visible M2ePro-input-datetime M2ePro-correct-date-range',
112112
'disabled' => true,
@@ -120,8 +120,8 @@ protected function _beforeToHtml()
120120
$promotionsToDateCustomAttribute = $this->createElement(
121121
'hidden',
122122
[
123-
'html_id' => 'promotions_to_date_custom_attribute_%i%',
124-
'name' => 'promotions[%i%][to_date][attribute]',
123+
'html_id' => 'promotions_to_date_custom_attribute_temp-i',
124+
'name' => 'promotions[temp-i][to_date][attribute]',
125125
'disabled' => true,
126126
]
127127
);
@@ -130,8 +130,8 @@ protected function _beforeToHtml()
130130
$promotionsToDateMode = $this->createElement(
131131
Form::SELECT,
132132
[
133-
'html_id' => 'promotions_to_date_mode_%i%',
134-
'name' => 'promotions[%i%][to_date][mode]',
133+
'html_id' => 'promotions_to_date_mode_temp-i',
134+
'name' => 'promotions[temp-i][to_date][mode]',
135135
'values' => $this->getPromotionsToDateModeOptions(),
136136
'value' => '',
137137
'class' => 'promotions_to_date_mode',
@@ -146,8 +146,8 @@ protected function _beforeToHtml()
146146
$promotionsToDateValue = $this->createElement(
147147
'text',
148148
[
149-
'html_id' => 'promotions_to_date_value_%i%',
150-
'name' => 'promotions[%i%][to_date][value]',
149+
'html_id' => 'promotions_to_date_value_temp-i',
150+
'name' => 'promotions[temp-i][to_date][value]',
151151
'value' => '',
152152
'class' => 'M2ePro-required-when-visible M2ePro-input-datetime',
153153
'disabled' => true,
@@ -161,8 +161,8 @@ protected function _beforeToHtml()
161161
$promotionsPriceCustomAttribute = $this->createElement(
162162
'hidden',
163163
[
164-
'html_id' => 'promotions_price_custom_attribute_%i%',
165-
'name' => 'promotions[%i%][price][attribute]',
164+
'html_id' => 'promotions_price_custom_attribute_temp-i',
165+
'name' => 'promotions[temp-i][price][attribute]',
166166
'disabled' => true,
167167
]
168168
);
@@ -171,8 +171,8 @@ protected function _beforeToHtml()
171171
$promotionsPriceMode = $this->createElement(
172172
Form::SELECT,
173173
[
174-
'html_id' => 'promotions_price_mode_%i%',
175-
'name' => 'promotions[%i%][price][mode]',
174+
'html_id' => 'promotions_price_mode_temp-i',
175+
'name' => 'promotions[temp-i][price][mode]',
176176
'required' => true,
177177
'values' => $this->getPromotionsPriceModeOptions(),
178178
'value' => '',
@@ -188,8 +188,8 @@ protected function _beforeToHtml()
188188
$promotionsPriceCoefficient = $this->createElement(
189189
'text',
190190
[
191-
'html_id' => 'promotions_price_coefficient_%i%',
192-
'name' => 'promotions[%i%][price][coefficient]',
191+
'html_id' => 'promotions_price_coefficient_temp-i',
192+
'name' => 'promotions[temp-i][price][coefficient]',
193193
'value' => '',
194194
'class' => 'M2ePro-validate-price-coefficient',
195195
'disabled' => true,
@@ -203,8 +203,8 @@ protected function _beforeToHtml()
203203
$promotionsComparisonPriceCustomAttribute = $this->createElement(
204204
'hidden',
205205
[
206-
'html_id' => 'promotions_comparison_price_custom_attribute_%i%',
207-
'name' => 'promotions[%i%][comparison_price][attribute]',
206+
'html_id' => 'promotions_comparison_price_custom_attribute_temp-i',
207+
'name' => 'promotions[temp-i][comparison_price][attribute]',
208208
'disabled' => true,
209209
]
210210
);
@@ -213,8 +213,8 @@ protected function _beforeToHtml()
213213
$promotionsComparisonPriceMode = $this->createElement(
214214
Form::SELECT,
215215
[
216-
'html_id' => 'promotions_comparison_price_mode_%i%',
217-
'name' => 'promotions[%i%][comparison_price][mode]',
216+
'html_id' => 'promotions_comparison_price_mode_temp-i',
217+
'name' => 'promotions[temp-i][comparison_price][mode]',
218218
'required' => true,
219219
'values' => $this->getPromotionsComparisonPriceModeOptions(),
220220
'value' => '',
@@ -230,8 +230,8 @@ protected function _beforeToHtml()
230230
$promotionsPriceCoefficient = $this->createElement(
231231
'text',
232232
[
233-
'html_id' => 'promotions_comparison_price_coefficient_%i%',
234-
'name' => 'promotions[%i%][comparison_price][coefficient]',
233+
'html_id' => 'promotions_comparison_price_coefficient_temp-i',
234+
'name' => 'promotions[temp-i][comparison_price][coefficient]',
235235
'value' => '',
236236
'class' => 'M2ePro-validate-price-coefficient',
237237
'disabled' => true,
@@ -245,8 +245,8 @@ protected function _beforeToHtml()
245245
$promotionsType = $this->createElement(
246246
Form::SELECT,
247247
[
248-
'html_id' => 'promotions_type_%i%',
249-
'name' => 'promotions[%i%][type]',
248+
'html_id' => 'promotions_type_temp-i',
249+
'name' => 'promotions[temp-i][type]',
250250
'values' => [
251251
[
252252
'value' => Promotion::TYPE_REDUCED,
@@ -269,7 +269,6 @@ protected function _beforeToHtml()
269269
->createBlock('Magento\Button')
270270
->addData([
271271
'label' => $this->__('Remove'),
272-
'onclick' => 'WalmartTemplateSellingFormatObj.removePromotionsPriceRow(this);',
273272
'class' => 'delete icon-btn remove_promotion_price_button'
274273
]);
275274
$this->setData('remove_promotion_price_button', $removePromotionPriceButton);

‎Block/Adminhtml/Walmart/Template/SellingFormat/Edit/Form/ShippingOverrideRules.php‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,13 @@ protected function _beforeToHtml()
7979
$shippingOverrideRuleService = $this->createElement(
8080
Form::SELECT,
8181
[
82-
'html_id' => 'shipping_override_rule_service_%i%',
83-
'name' => 'shipping_override_rule[%i%][method]',
82+
'html_id' => 'shipping_override_rule_service_temp-i',
83+
'name' => 'shipping_override_rule[temp-i][method]',
8484
'values' => $this->getShippingOverrideRuleSeviceOptions(),
8585
'value' => '',
8686
'required' => true,
8787
'disabled' => true,
8888
'class' => 'shipping-override-service',
89-
'style' => 'display: none;'
9089
]
9190
);
9291
$this->setData('shipping_override_rule_service', $shippingOverrideRuleService);
@@ -96,13 +95,12 @@ protected function _beforeToHtml()
9695
$shippingOverrideRuleLocation = $this->createElement(
9796
Form::SELECT,
9897
[
99-
'html_id' => 'shipping_override_rule_location_%i%',
100-
'name' => 'shipping_override_rule[%i%][region]',
98+
'html_id' => 'shipping_override_rule_location_temp-i',
99+
'name' => 'shipping_override_rule[temp-i][region]',
101100
'values' => $this->getShippingOverrideRuleLocationOptions(),
102101
'value' => '',
103102
'disabled' => true,
104103
'class' => 'shipping-override-location',
105-
'style' => 'display: none;'
106104
]
107105
);
108106
$this->setData('shipping_override_rule_location', $shippingOverrideRuleLocation);
@@ -112,8 +110,8 @@ protected function _beforeToHtml()
112110
$shippingOverrideRuleAction = $this->createElement(
113111
Form::SELECT,
114112
[
115-
'html_id' => 'shipping_override_rule_action_%i%',
116-
'name' => 'shipping_override_rule[%i%][is_shipping_allowed]',
113+
'html_id' => 'shipping_override_rule_action_temp-i',
114+
'name' => 'shipping_override_rule[temp-i][is_shipping_allowed]',
117115
'values' => [
118116
[
119117
'value' => '',
@@ -133,7 +131,6 @@ protected function _beforeToHtml()
133131
'required' => true,
134132
'disabled' => true,
135133
'class' => 'shipping-override-action',
136-
'style' => 'display: none;'
137134
]
138135
);
139136
$this->setData('shipping_override_rule_action', $shippingOverrideRuleAction);
@@ -143,8 +140,8 @@ protected function _beforeToHtml()
143140
$shippingOverrideRuleCostMode = $this->createElement(
144141
Form::SELECT,
145142
[
146-
'html_id' => 'shipping_override_rule_cost_mode_%i%',
147-
'name' => 'shipping_override_rule[%i%][cost_mode]',
143+
'html_id' => 'shipping_override_rule_cost_mode_temp-i',
144+
'name' => 'shipping_override_rule[temp-i][cost_mode]',
148145
'values' => [
149146
[
150147
'value' => '',
@@ -170,7 +167,6 @@ protected function _beforeToHtml()
170167
'required' => true,
171168
'disabled' => true,
172169
'class' => 'shipping-override-cost-mode',
173-
'style' => 'display: none;'
174170
]
175171
);
176172
$this->setData('shipping_override_rule_cost_mode', $shippingOverrideRuleCostMode);
@@ -180,13 +176,12 @@ protected function _beforeToHtml()
180176
$shippingOverrideRuleCostValue = $this->createElement(
181177
'text',
182178
[
183-
'html_id' => 'shipping_override_rule_cost_value_%i%',
184-
'name' => 'shipping_override_rule[%i%][cost_value]',
179+
'html_id' => 'shipping_override_rule_cost_value_temp-i',
180+
'name' => 'shipping_override_rule[temp-i][cost_value]',
185181
'value' => '',
186182
'required' => true,
187183
'disabled' => true,
188184
'class' => 'M2ePro-validation-float shipping-override-cost-custom-value',
189-
'style' => 'display: none;'
190185
]
191186
);
192187
$this->setData('shipping_override_rule_cost_value', $shippingOverrideRuleCostValue);
@@ -196,8 +191,8 @@ protected function _beforeToHtml()
196191
$shippingOverrideRuleCostAttribute = $this->createElement(
197192
Form::SELECT,
198193
[
199-
'html_id' => 'shipping_override_rule_cost_attribute_%i%',
200-
'name' => 'shipping_override_rule[%i%][cost_attribute]',
194+
'html_id' => 'shipping_override_rule_cost_attribute_temp-i',
195+
'name' => 'shipping_override_rule[temp-i][cost_attribute]',
201196
'values' => [
202197
[
203198
'value' => '',
@@ -210,7 +205,6 @@ protected function _beforeToHtml()
210205
'required' => true,
211206
'disabled' => true,
212207
'class' => 'shipping-override-cost-custom-attribute',
213-
'style' => 'display: none;'
214208
]
215209
);
216210
$this->setData('shipping_override_rule_cost_attribute', $shippingOverrideRuleCostAttribute);
@@ -225,7 +219,6 @@ protected function _beforeToHtml()
225219
->createBlock('Magento\Button')
226220
->addData([
227221
'label' => $this->__('Remove'),
228-
'onclick' => 'WalmartTemplateSellingFormatObj.removeRow(this);',
229222
'class' => 'delete icon-btn remove_shipping_override_rule_button'
230223
]);
231224
$this->setData('remove_shipping_override_rule_button', $removeButton);

‎CHANGELOG‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
* 1.9.4 (r4436) (16/12/2020)
1+
* 1.9.5 (r4469) (24/12/2020)
2+
Common: [Fixed] Dynamic behavior compatibility in Magento 2.4.* and 2.3.*
3+
Common: [Fixed] "TypeError: Cannot read property 'readAttribute' of undefined js/Marketplace.js:100" is occured when try to Update Now Marketplace on eBay/Amazon/Walmart -> Configuration -> Marketplaces (magento version 2.4)
4+
Common: [Fixed] Remove button does not work for Promotions and Override Mode in Walmart Selling Policy and for Shipping Methods in Ebay Shipping Policy if second field was added (magento version 2.4)
5+
eBay: [Fixed] International Shipping Services are not shown in eBay Shipping policy (magento version 2.3, 2.4)
6+
eBay: [Fixed] Incorrect view of Weight field in eBay Shipping Policy (magento version 2.4)
7+
eBay: [Fixed] Error Invalid block type: Ess\M2ePro\Block\Adminhtml\Ebay\Grid\Column\Renderer\ViewLogIcon\Listing when try to Assign Products to Stores on eBay listing
8+
Amazon: [Fixed] New tab is opened when try to redirect to Amazon during Account creation process (magento version 2.4)
9+
Walmart: [Fixed] "SyntaxError: Failed to execute 'querySelector' on 'Document': '#shipping_override_rule_service_%i%' is not a valid selector." is occured when Selling Policy was opened (magento version 2.4)
10+
Walmart: [Fixed] Locale, Action, Mode, Cost fields are disappeared after add new Override (magento version 2.4)
11+
12+
* 1.9.4 (r4414) (09/12/2020)
213

314
Common: [Fixed] Video screenshot is sent as a preview image to the channel
415
Common: [Fixed] ASIN and Price data get unset if the same SKU is used on a different account

‎Setup/Upgrade/v1_9_4__v1_9_5/Config.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
/*
4+
* @author M2E Pro Developers Team
5+
* @copyright M2E LTD
6+
* @license Commercial use is forbidden
7+
*/
8+
9+
namespace Ess\M2ePro\Setup\Upgrade\v1_9_4__v1_9_5;
10+
11+
use Ess\M2ePro\Model\Setup\Upgrade\Entity\AbstractConfig;
12+
13+
class Config extends AbstractConfig
14+
{
15+
//########################################
16+
17+
public function getFeaturesList()
18+
{
19+
return [];
20+
}
21+
22+
//########################################
23+
}

‎Setup/UpgradeData.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class UpgradeData implements UpgradeDataInterface
8383
'1.9.1' => ['1.9.2'],
8484
'1.9.2' => ['1.9.3'],
8585
'1.9.3' => ['1.9.4'],
86+
'1.9.4' => ['1.9.5'],
8687
];
8788

8889
//########################################

0 commit comments

Comments
 (0)