Skip to content

Commit 17da6de

Browse files
cparticacpartica
committed
Merge branch 'develop' into FearlessKiwis-MAGETWO-54785-State-province-not-required-mainline
2 parents 6e3d434 + 8063845 commit 17da6de

File tree

273 files changed

+698
-767
lines changed

Some content is hidden

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

273 files changed

+698
-767
lines changed

‎app/code/Magento/Catalog/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ Image,Image
701701
"Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png."
702702
"Image Opacity","Image Opacity"
703703
"Example format: 200x300.","Example format: 200x300."
704+
"This value does not follow the specified format (for example, 200X300).","This value does not follow the specified format (for example, 200X300)."
704705
"Image Position","Image Position"
705706
Small,Small
706707
"Attribute Label","Attribute Label"

‎app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@
5555
<field name="watermark_image_size">
5656
<argument name="data" xsi:type="array">
5757
<item name="config" xsi:type="array">
58+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
5859
<item name="label" xsi:type="string" translate="true">Image Size</item>
5960
<item name="dataType" xsi:type="string">text</item>
6061
<item name="formElement" xsi:type="string">input</item>
6162
<item name="dataScope" xsi:type="string">watermark_image_size</item>
6263
<item name="validation" xsi:type="array">
63-
<item name="validate-digits" xsi:type="boolean">true</item>
64+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
6465
</item>
6566
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
6667
</item>
@@ -118,12 +119,13 @@
118119
<field name="watermark_thumbnail_size">
119120
<argument name="data" xsi:type="array">
120121
<item name="config" xsi:type="array">
122+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
121123
<item name="label" xsi:type="string" translate="true">Image Size</item>
122124
<item name="dataType" xsi:type="string">text</item>
123125
<item name="formElement" xsi:type="string">input</item>
124126
<item name="dataScope" xsi:type="string">watermark_thumbnail_size</item>
125127
<item name="validation" xsi:type="array">
126-
<item name="validate-digits" xsi:type="boolean">true</item>
128+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
127129
</item>
128130
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
129131
</item>
@@ -181,12 +183,13 @@
181183
<field name="watermark_small_image_size">
182184
<argument name="data" xsi:type="array">
183185
<item name="config" xsi:type="array">
186+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
184187
<item name="label" xsi:type="string" translate="true">Image Size</item>
185188
<item name="dataType" xsi:type="string">text</item>
186189
<item name="formElement" xsi:type="string">input</item>
187190
<item name="dataScope" xsi:type="string">watermark_small_image_size</item>
188191
<item name="validation" xsi:type="array">
189-
<item name="validate-digits" xsi:type="boolean">true</item>
192+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
190193
</item>
191194
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
192195
</item>

‎app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* Copyright © 2016 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'jquery',
8+
'Magento_Ui/js/lib/validation/utils',
9+
'Magento_Ui/js/form/element/abstract',
10+
'Magento_Ui/js/lib/validation/validator'
11+
], function ($, utils, Abstract, validator) {
12+
'use strict';
13+
14+
validator.addRule(
15+
'validate-image-size-range',
16+
function (value) {
17+
var dataAttrRange = /^(\d+)x(\d+)$/,
18+
m;
19+
20+
if (utils.isEmptyNoTrim(value)) {
21+
return true;
22+
}
23+
24+
m = dataAttrRange.exec(value);
25+
26+
return !!(m && m[1] > 0 && m[2] > 0);
27+
},
28+
$.mage.__('This value does not follow the specified format (for example, 200X300).')
29+
);
30+
31+
return Abstract.extend({
32+
33+
/**
34+
* Checks for relevant value
35+
*
36+
* @returns {Boolean}
37+
*/
38+
isRangeCorrect: function () {
39+
return validator('validate-image-size-range', this.value()).passed;
40+
}
41+
});
42+
});

‎app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<script>
4141
require([
4242
'jquery',
43-
'Magento_Catalog/js/price-box'
43+
'priceBox'
4444
], function($){
4545
var priceBoxes = $('[data-role=priceBox]');
4646

‎app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,14 @@ protected function getCustomOptionsData($productIds)
12841284
$row['max_characters'] = $option['max_characters'];
12851285
}
12861286

1287+
foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
1288+
if (!isset($option[$fileOptionKey])) {
1289+
continue;
1290+
}
1291+
1292+
$row[$fileOptionKey] = $option[$fileOptionKey];
1293+
}
1294+
12871295
$values = $option->getValues();
12881296

12891297
if ($values) {

‎app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
105105
'radio' => true,
106106
'checkbox' => true,
107107
'multiple' => true,
108+
'file' => ['sku', 'file_extension', 'image_size_x', 'image_size_y'],
108109
];
109110

110111
/**
@@ -1136,6 +1137,28 @@ private function processOptionRow($name, $optionRow)
11361137
$result[$this->columnMaxCharacters] = $optionRow['max_characters'];
11371138
}
11381139

1140+
$result = $this->addFileOptions($result, $optionRow);
1141+
1142+
return $result;
1143+
}
1144+
1145+
/**
1146+
* Add file options
1147+
*
1148+
* @param array $result
1149+
* @param array $optionRow
1150+
* @return array
1151+
*/
1152+
private function addFileOptions($result, $optionRow)
1153+
{
1154+
foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
1155+
if (!isset($optionRow[$fileOptionKey])) {
1156+
continue;
1157+
}
1158+
1159+
$result[self::COLUMN_PREFIX . $fileOptionKey] = $optionRow[$fileOptionKey];
1160+
}
1161+
11391162
return $result;
11401163
}
11411164

‎app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848
<field name="watermark_swatch_image_size">
4949
<argument name="data" xsi:type="array">
5050
<item name="config" xsi:type="array">
51+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
5152
<item name="label" xsi:type="string" translate="true">Image Size</item>
5253
<item name="dataType" xsi:type="string">text</item>
5354
<item name="formElement" xsi:type="string">input</item>
5455
<item name="dataScope" xsi:type="string">watermark_swatch_image_size</item>
5556
<item name="validation" xsi:type="array">
56-
<item name="validate-digits" xsi:type="boolean">true</item>
57+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
5758
</item>
5859
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
5960
</item>

‎app/code/Magento/Ui/view/base/web/js/grid/filters/range.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ define([
66
'underscore',
77
'uiLayout',
88
'mageUtils',
9-
'Magento_Ui/js/form/components/group'
10-
], function (_, layout, utils, Group) {
9+
'Magento_Ui/js/form/components/group',
10+
'mage/translate'
11+
], function (_, layout, utils, Group, $t) {
1112
'use strict';
1213

1314
return Group.extend({
@@ -29,11 +30,11 @@ define([
2930
},
3031
ranges: {
3132
from: {
32-
label: 'from',
33+
label: $t('from'),
3334
dataScope: 'from'
3435
},
3536
to: {
36-
label: 'to',
37+
label: $t('to'),
3738
dataScope: 'to'
3839
}
3940
}

0 commit comments

Comments
 (0)