Skip to content

Commit 3adc1d9

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.3-develop into magento-pangolin/2.3-tests-pr
2 parents ac88105 + 89cf888 commit 3adc1d9

File tree

272 files changed

+555
-331
lines changed

Some content is hidden

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

272 files changed

+555
-331
lines changed

‎app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php

100755100644
File mode changed.

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml

100755100644
File mode changed.

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddBundleProductToCartFromWishListPageTest.xml renamed to ‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleProductToCartFromWishListPageTest.xml

File renamed without changes.

‎app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
<?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
1717
<input type="hidden"
1818
name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
19-
value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
19+
value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
20+
class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> bundle option"/>
2021
<?php else : ?>
2122
<select multiple="multiple"
2223
size="5"

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,4 +1165,49 @@
11651165
<requiredEntity type="product_extension_attribute">EavStock10</requiredEntity>
11661166
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
11671167
</entity>
1168+
<entity name="SimpleProductPrice10Qty1" type="product">
1169+
<data key="sku" unique="suffix">simple-product_</data>
1170+
<data key="type_id">simple</data>
1171+
<data key="attribute_set_id">4</data>
1172+
<data key="visibility">4</data>
1173+
<data key="name" unique="suffix">SimpleProduct_</data>
1174+
<data key="price">10.00</data>
1175+
<data key="urlKey" unique="suffix">simple-product_</data>
1176+
<data key="status">1</data>
1177+
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
1178+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
1179+
</entity>
1180+
<entity name="VirtualProductPrice10Qty1" type="product">
1181+
<data key="sku" unique="suffix">virtual-product_</data>
1182+
<data key="type_id">virtual</data>
1183+
<data key="attribute_set_id">4</data>
1184+
<data key="name" unique="suffix">VirtualProduct_</data>
1185+
<data key="price">10.00</data>
1186+
<data key="weight">0</data>
1187+
<data key="status">1</data>
1188+
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
1189+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
1190+
</entity>
1191+
<entity name="SimpleProduct2Price10Qty1" type="product">
1192+
<data key="sku" unique="suffix">simple-product-2_</data>
1193+
<data key="type_id">simple</data>
1194+
<data key="attribute_set_id">4</data>
1195+
<data key="name" unique="suffix">SimpleProduct2_</data>
1196+
<data key="price">10.00</data>
1197+
<data key="visibility">4</data>
1198+
<data key="status">1</data>
1199+
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
1200+
</entity>
1201+
<entity name="SimpleProduct3Price10Qty1" type="product2">
1202+
<data key="sku" unique="suffix">simple-product-3_</data>
1203+
<data key="type_id">simple</data>
1204+
<data key="attribute_set_id">4</data>
1205+
<data key="visibility">4</data>
1206+
<data key="name" unique="suffix">SimpleProduct3_</data>
1207+
<data key="price">10.00</data>
1208+
<data key="urlKey" unique="suffix">simple-product-3_</data>
1209+
<data key="status">1</data>
1210+
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
1211+
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
1212+
</entity>
11681213
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

100755100644
File mode changed.

‎app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php

100755100644
File mode changed.

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ protected function getProductOptionTypes()
11531153

11541154
if (count($group['optgroup'])) {
11551155
$options[] = $group;
1156-
$groupIndex += 1;
1156+
$groupIndex++;
11571157
}
11581158
}
11591159

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

100755100644
File mode changed.

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

100755100644
Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
78

89
use Magento\Catalog\Api\Data\ProductAttributeInterface;
910
use Magento\Catalog\Model\Locator\LocatorInterface;
1011
use Magento\Eav\Api\AttributeRepositoryInterface;
11-
use Magento\Ui\Component\Form;
1212
use Magento\Framework\Stdlib\ArrayManager;
13+
use Magento\Ui\Component\Form;
1314

1415
/**
1516
* Data provider for main panel of product page
@@ -60,10 +61,10 @@ public function __construct(
6061
/**
6162
* Customize number fields for advanced price and weight fields.
6263
*
63-
* @since 101.0.0
6464
* @param array $data
6565
* @return array
6666
* @throws \Magento\Framework\Exception\NoSuchEntityException
67+
* @since 101.0.0
6768
*/
6869
public function modifyData(array $data)
6970
{
@@ -125,7 +126,7 @@ protected function customizeAdvancedPriceFormat(array $data)
125126
$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
126127
$this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
127128
$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
128-
(float) $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
129+
(float)$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
129130
}
130131
}
131132

@@ -135,9 +136,9 @@ protected function customizeAdvancedPriceFormat(array $data)
135136
/**
136137
* Customize product form fields.
137138
*
138-
* @since 101.0.0
139139
* @param array $meta
140140
* @return array
141+
* @since 101.0.0
141142
*/
142143
public function modifyMeta(array $meta)
143144
{
@@ -234,9 +235,13 @@ protected function customizeWeightField(array $meta)
234235
null,
235236
'children'
236237
);
237-
$meta = $this->arrayManager->merge($containerPath . static::META_CONFIG_PATH, $meta, [
238-
'component' => 'Magento_Ui/js/form/components/group',
239-
]);
238+
$meta = $this->arrayManager->merge(
239+
$containerPath . static::META_CONFIG_PATH,
240+
$meta,
241+
[
242+
'component' => 'Magento_Ui/js/form/components/group',
243+
]
244+
);
240245

241246
$hasWeightPath = $this->arrayManager->slicePath($weightPath, 0, -1) . '/'
242247
. ProductAttributeInterface::CODE_HAS_WEIGHT;
@@ -438,8 +443,13 @@ protected function formatNumber($value)
438443
$precision = strlen(substr(strrchr($value, "."), 1));
439444
$store = $this->locator->getStore();
440445
$currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
441-
$value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL,
442-
'precision' => $precision]);
446+
$value = $currency->toCurrency(
447+
$value,
448+
[
449+
'display' => \Magento\Framework\Currency::NO_SYMBOL,
450+
'precision' => $precision
451+
]
452+
);
443453

444454
return $value;
445455
}

0 commit comments

Comments
 (0)