Skip to content

Commit 6fac1fe

Browse files
IvanPletnyovIvanPletnyov
committed
Merge remote-tracking branch 'origin/MC-31028' into 2.4-develop-com-pr6
2 parents 41b5daf + c482b31 commit 6fac1fe

File tree

11 files changed

+618
-261
lines changed

11 files changed

+618
-261
lines changed

‎dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/DateGroupDataProvider.php‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\TestFramework\Catalog\Block\Product\View\Options;
99

1010
use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
11+
use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
1112
use Magento\Catalog\Model\Product\Option;
1213

1314
/**
@@ -31,7 +32,7 @@ public function getData(): array
3132
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
3233
Option::KEY_IS_REQUIRE => 1,
3334
Option::KEY_PRICE => 10,
34-
Option::KEY_PRICE_TYPE => 'fixed',
35+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
3536
Option::KEY_SKU => 'test-option-date-title-1',
3637
],
3738
[
@@ -46,7 +47,7 @@ public function getData(): array
4647
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
4748
Option::KEY_IS_REQUIRE => 0,
4849
Option::KEY_PRICE => 10,
49-
Option::KEY_PRICE_TYPE => 'fixed',
50+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
5051
Option::KEY_SKU => 'test-option-date-title-2',
5152
],
5253
[
@@ -61,7 +62,7 @@ public function getData(): array
6162
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
6263
Option::KEY_IS_REQUIRE => 0,
6364
Option::KEY_PRICE => 50,
64-
Option::KEY_PRICE_TYPE => 'fixed',
65+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
6566
Option::KEY_SKU => 'test-option-date-title-3',
6667
],
6768
[
@@ -76,7 +77,7 @@ public function getData(): array
7677
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE,
7778
Option::KEY_IS_REQUIRE => 0,
7879
Option::KEY_PRICE => 50,
79-
Option::KEY_PRICE_TYPE => 'percent',
80+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
8081
Option::KEY_SKU => 'test-option-date-title-4',
8182
],
8283
[
@@ -91,7 +92,7 @@ public function getData(): array
9192
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
9293
Option::KEY_IS_REQUIRE => 1,
9394
Option::KEY_PRICE => 10,
94-
Option::KEY_PRICE_TYPE => 'fixed',
95+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
9596
Option::KEY_SKU => 'test-option-date-and-time-title-1',
9697
],
9798
[
@@ -106,7 +107,7 @@ public function getData(): array
106107
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
107108
Option::KEY_IS_REQUIRE => 0,
108109
Option::KEY_PRICE => 10,
109-
Option::KEY_PRICE_TYPE => 'fixed',
110+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
110111
Option::KEY_SKU => 'test-option-date-and-time-title-2',
111112
],
112113
[
@@ -121,7 +122,7 @@ public function getData(): array
121122
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
122123
Option::KEY_IS_REQUIRE => 0,
123124
Option::KEY_PRICE => 50,
124-
Option::KEY_PRICE_TYPE => 'fixed',
125+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
125126
Option::KEY_SKU => 'test-option-date-and-time-title-3',
126127
],
127128
[
@@ -136,7 +137,7 @@ public function getData(): array
136137
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME,
137138
Option::KEY_IS_REQUIRE => 0,
138139
Option::KEY_PRICE => 50,
139-
Option::KEY_PRICE_TYPE => 'percent',
140+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
140141
Option::KEY_SKU => 'test-option-date-and-time-title-4',
141142
],
142143
[
@@ -151,7 +152,7 @@ public function getData(): array
151152
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
152153
Option::KEY_IS_REQUIRE => 1,
153154
Option::KEY_PRICE => 10,
154-
Option::KEY_PRICE_TYPE => 'fixed',
155+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
155156
Option::KEY_SKU => 'test-option-time-title-1',
156157
],
157158
[
@@ -166,7 +167,7 @@ public function getData(): array
166167
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
167168
Option::KEY_IS_REQUIRE => 0,
168169
Option::KEY_PRICE => 10,
169-
Option::KEY_PRICE_TYPE => 'fixed',
170+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
170171
Option::KEY_SKU => 'test-option-time-title-2',
171172
],
172173
[
@@ -181,7 +182,7 @@ public function getData(): array
181182
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
182183
Option::KEY_IS_REQUIRE => 0,
183184
Option::KEY_PRICE => 50,
184-
Option::KEY_PRICE_TYPE => 'fixed',
185+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
185186
Option::KEY_SKU => 'test-option-time-title-3',
186187
],
187188
[
@@ -196,7 +197,7 @@ public function getData(): array
196197
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_TIME,
197198
Option::KEY_IS_REQUIRE => 0,
198199
Option::KEY_PRICE => 50,
199-
Option::KEY_PRICE_TYPE => 'percent',
200+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
200201
Option::KEY_SKU => 'test-option-time-title-4',
201202
],
202203
[

‎dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/FileGroupDataProvider.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\TestFramework\Catalog\Block\Product\View\Options;
99

1010
use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
11+
use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
1112
use Magento\Catalog\Model\Product\Option;
1213

1314
/**
@@ -31,7 +32,7 @@ public function getData(): array
3132
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
3233
Option::KEY_IS_REQUIRE => 1,
3334
Option::KEY_PRICE => 10,
34-
Option::KEY_PRICE_TYPE => 'fixed',
35+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
3536
Option::KEY_SKU => 'test-option-file-title-1',
3637
Option::KEY_SORT_ORDER => 1,
3738
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -51,7 +52,7 @@ public function getData(): array
5152
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
5253
Option::KEY_IS_REQUIRE => 0,
5354
Option::KEY_PRICE => 10,
54-
Option::KEY_PRICE_TYPE => 'fixed',
55+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
5556
Option::KEY_SKU => 'test-option-file-title-2',
5657
Option::KEY_SORT_ORDER => 1,
5758
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -71,7 +72,7 @@ public function getData(): array
7172
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
7273
Option::KEY_IS_REQUIRE => 0,
7374
Option::KEY_PRICE => 50,
74-
Option::KEY_PRICE_TYPE => 'fixed',
75+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
7576
Option::KEY_SKU => 'test-option-file-title-3',
7677
Option::KEY_SORT_ORDER => 1,
7778
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -91,7 +92,7 @@ public function getData(): array
9192
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
9293
Option::KEY_IS_REQUIRE => 0,
9394
Option::KEY_PRICE => 50,
94-
Option::KEY_PRICE_TYPE => 'percent',
95+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
9596
Option::KEY_SKU => 'test-option-file-title-4',
9697
Option::KEY_SORT_ORDER => 1,
9798
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -111,7 +112,7 @@ public function getData(): array
111112
Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FILE,
112113
Option::KEY_IS_REQUIRE => 0,
113114
Option::KEY_PRICE => 50,
114-
Option::KEY_PRICE_TYPE => 'percent',
115+
Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
115116
Option::KEY_SKU => 'test-option-file-title-5',
116117
Option::KEY_SORT_ORDER => 1,
117118
Option::KEY_FILE_EXTENSION => 'png, jpg',
@@ -122,7 +123,7 @@ public function getData(): array
122123
'block_with_required_class' => '<div class="field file">',
123124
'label_for_created_option' => '<label class="label" for="options_%s_file"',
124125
'title' => '<span>Test option file title 5</span>',
125-
'price' => 'data-price-amount="5"',
126+
'price' => 'data-price-amount="50"',
126127
'required_element' => '/<input type="file"/',
127128
'file_extension' => '<strong>png, jpg</strong>',
128129
'file_width' => '/%s:.*<strong>10 px.<\/strong>/',

‎dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/SelectGroupDataProvider.php‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\TestFramework\Catalog\Block\Product\View\Options;
99

1010
use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
11+
use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
1112
use Magento\Catalog\Model\Product\Option;
1213
use Magento\Catalog\Model\Product\Option\Value;
1314

@@ -35,7 +36,7 @@ public function getData(): array
3536
[
3637
Value::KEY_TITLE => 'Test option drop-down title 1 value 1',
3738
Value::KEY_PRICE => 10,
38-
Value::KEY_PRICE_TYPE => 'fixed',
39+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
3940
Value::KEY_SKU => 'test-option-drop-down-title-1-value-1',
4041
],
4142
[
@@ -58,7 +59,7 @@ public function getData(): array
5859
[
5960
Value::KEY_TITLE => 'Test option drop-down title 2 value 1',
6061
Value::KEY_PRICE => 10,
61-
Value::KEY_PRICE_TYPE => 'fixed',
62+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
6263
Value::KEY_SKU => 'test-option-drop-down-title-2-value-1',
6364
],
6465
[
@@ -81,7 +82,7 @@ public function getData(): array
8182
[
8283
Value::KEY_TITLE => 'Test option drop-down title 3 value 1',
8384
Value::KEY_PRICE => 50,
84-
Value::KEY_PRICE_TYPE => 'fixed',
85+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
8586
Value::KEY_SKU => 'test-option-drop-down-title-3-value-1',
8687
],
8788
[
@@ -104,7 +105,7 @@ public function getData(): array
104105
[
105106
Value::KEY_TITLE => 'Test option drop-down title 4 value 1',
106107
Value::KEY_PRICE => 50,
107-
Value::KEY_PRICE_TYPE => 'percent',
108+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
108109
Value::KEY_SKU => 'test-option-drop-down-title-4-value-1',
109110
],
110111
[
@@ -127,7 +128,7 @@ public function getData(): array
127128
[
128129
Value::KEY_TITLE => 'Test option radio-button title 1 value 1',
129130
Value::KEY_PRICE => 10,
130-
Value::KEY_PRICE_TYPE => 'fixed',
131+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
131132
Value::KEY_SKU => 'test-option-radio-button-title-1-value-1',
132133
],
133134
[
@@ -147,7 +148,7 @@ public function getData(): array
147148
[
148149
Value::KEY_TITLE => 'Test option radio-button title 2 value 1',
149150
Value::KEY_PRICE => 10,
150-
Value::KEY_PRICE_TYPE => 'fixed',
151+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
151152
Value::KEY_SKU => 'test-option-radio-button-title-2-value-1',
152153
],
153154
[
@@ -167,7 +168,7 @@ public function getData(): array
167168
[
168169
Value::KEY_TITLE => 'Test option radio-button title 3 value 1',
169170
Value::KEY_PRICE => 50,
170-
Value::KEY_PRICE_TYPE => 'fixed',
171+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
171172
Value::KEY_SKU => 'test-option-radio-button-title-3-value-1',
172173
],
173174
[
@@ -187,7 +188,7 @@ public function getData(): array
187188
[
188189
Value::KEY_TITLE => 'Test option radio-button title 4 value 1',
189190
Value::KEY_PRICE => 50,
190-
Value::KEY_PRICE_TYPE => 'percent',
191+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
191192
Value::KEY_SKU => 'test-option-radio-button-title-4-value-1',
192193
],
193194
[
@@ -207,7 +208,7 @@ public function getData(): array
207208
[
208209
Value::KEY_TITLE => 'Test option checkbox title 1 value 1',
209210
Value::KEY_PRICE => 10,
210-
Value::KEY_PRICE_TYPE => 'fixed',
211+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
211212
Value::KEY_SKU => 'test-option-checkbox-title-1-value-1',
212213
],
213214
[
@@ -227,7 +228,7 @@ public function getData(): array
227228
[
228229
Value::KEY_TITLE => 'Test option checkbox title 2 value 1',
229230
Value::KEY_PRICE => 10,
230-
Value::KEY_PRICE_TYPE => 'fixed',
231+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
231232
Value::KEY_SKU => 'test-option-checkbox-title-2-value-1',
232233
],
233234
[
@@ -247,7 +248,7 @@ public function getData(): array
247248
[
248249
Value::KEY_TITLE => 'Test option checkbox title 3 value 1',
249250
Value::KEY_PRICE => 50,
250-
Value::KEY_PRICE_TYPE => 'fixed',
251+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
251252
Value::KEY_SKU => 'test-option-checkbox-title-3-value-1',
252253
],
253254
[
@@ -267,7 +268,7 @@ public function getData(): array
267268
[
268269
Value::KEY_TITLE => 'Test option checkbox title 4 value 1',
269270
Value::KEY_PRICE => 50,
270-
Value::KEY_PRICE_TYPE => 'percent',
271+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
271272
Value::KEY_SKU => 'test-option-checkbox-title-4-value-1',
272273
],
273274
[
@@ -287,7 +288,7 @@ public function getData(): array
287288
[
288289
Value::KEY_TITLE => 'Test option multiselect title 1 value 1',
289290
Value::KEY_PRICE => 10,
290-
Value::KEY_PRICE_TYPE => 'fixed',
291+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
291292
Value::KEY_SKU => 'test-option-multiselect-title-1-value-1',
292293
],
293294
[
@@ -307,7 +308,7 @@ public function getData(): array
307308
[
308309
Value::KEY_TITLE => 'Test option multiselect title 2 value 1',
309310
Value::KEY_PRICE => 10,
310-
Value::KEY_PRICE_TYPE => 'fixed',
311+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
311312
Value::KEY_SKU => 'test-option-multiselect-title-2-value-1',
312313
],
313314
[
@@ -327,7 +328,7 @@ public function getData(): array
327328
[
328329
Value::KEY_TITLE => 'Test option multiselect title 3 value 1',
329330
Value::KEY_PRICE => 50,
330-
Value::KEY_PRICE_TYPE => 'fixed',
331+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
331332
Value::KEY_SKU => 'test-option-multiselect-title-3-value-1',
332333
],
333334
[
@@ -347,7 +348,7 @@ public function getData(): array
347348
[
348349
Value::KEY_TITLE => 'Test option multiselect title 4 value 1',
349350
Value::KEY_PRICE => 50,
350-
Value::KEY_PRICE_TYPE => 'percent',
351+
Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
351352
Value::KEY_SKU => 'test-option-multiselect-title-4-value-1',
352353
],
353354
[

0 commit comments

Comments
 (0)