Skip to content

Commit 1dda999

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr34
2 parents 6e9bc45 + ca42048 commit 1dda999

File tree

92 files changed

+2594
-732
lines changed

Some content is hidden

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

92 files changed

+2594
-732
lines changed

‎app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver)
4747
*/
4848
public function getConfig()
4949
{
50+
$requireBillingAddressAll = \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
51+
5052
return [
5153
'payment' => [
5254
self::PAYPAL_CODE => [
@@ -60,6 +62,8 @@ public function getConfig()
6062
'vaultCode' => self::PAYPAL_VAULT_CODE,
6163
'skipOrderReview' => $this->config->isSkipOrderReview(),
6264
'paymentIcon' => $this->config->getPayPalIcon(),
65+
'isRequiredBillingAddress' =>
66+
(int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll
6367
]
6468
]
6569
];

‎app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public function testGetConfig($expected)
7777
'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
7878
]);
7979

80+
$this->config->method('isRequiredBillingAddress')
81+
->willReturn(1);
82+
8083
self::assertEquals($expected, $this->configProvider->getConfig());
8184
}
8285

@@ -101,7 +104,8 @@ public function getConfigDataProvider()
101104
'skipOrderReview' => false,
102105
'paymentIcon' => [
103106
'width' => 30, 'height' => 26, 'url' => 'https://icon.test.url'
104-
]
107+
],
108+
'isRequiredBillingAddress' => true
105109
]
106110
]
107111
]

‎app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@ define([
206206
beforePlaceOrder: function (data) {
207207
this.setPaymentMethodNonce(data.nonce);
208208

209-
if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
209+
if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
210+
typeof data.details.billingAddress !== 'undefined'
211+
) {
210212
this.setBillingAddress(data.details, data.details.billingAddress);
211213
}
212214

@@ -264,6 +266,14 @@ define([
264266
return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
265267
},
266268

269+
/**
270+
* Is billing address required from PayPal side
271+
* @returns {Boolean}
272+
*/
273+
isRequiredBillingAddress: function () {
274+
return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
275+
},
276+
267277
/**
268278
* Get configuration for PayPal
269279
* @returns {Object}

‎app/code/Magento/Catalog/Block/Product/View/Gallery.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
use Magento\Framework\Stdlib\ArrayUtils;
2424

2525
/**
26+
* Product gallery block
27+
*
2628
* @api
2729
* @since 100.0.2
2830
*/
@@ -139,7 +141,7 @@ public function getGalleryImagesJson()
139141
'thumb' => $image->getData('small_image_url'),
140142
'img' => $image->getData('medium_image_url'),
141143
'full' => $image->getData('large_image_url'),
142-
'caption' => $image->getData('label'),
144+
'caption' => ($image->getLabel() ?: $this->getProduct()->getName()),
143145
'position' => $image->getData('position'),
144146
'isMain' => $this->isMainImage($image),
145147
'type' => str_replace('external-', '', $image->getMediaType()),
@@ -196,6 +198,8 @@ public function isMainImage($image)
196198
}
197199

198200
/**
201+
* Returns image attribute
202+
*
199203
* @param string $imageId
200204
* @param string $attributeName
201205
* @param string $default
@@ -222,6 +226,8 @@ private function getConfigView()
222226
}
223227

224228
/**
229+
* Returns image gallery config object
230+
*
225231
* @return Collection
226232
*/
227233
private function getGalleryImagesConfig()

‎app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php‎

Lines changed: 101 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ public function __construct(
102102
}
103103

104104
/**
105+
* Execute create handler
106+
*
105107
* @param object $product
106108
* @param array $arguments
107109
* @return object
@@ -167,23 +169,19 @@ public function execute($product, $arguments = [])
167169
if (empty($attrData) && empty($clearImages) && empty($newImages) && empty($existImages)) {
168170
continue;
169171
}
170-
if (in_array($attrData, $clearImages)) {
171-
$product->setData($mediaAttrCode, 'no_selection');
172-
}
173-
174-
if (in_array($attrData, array_keys($newImages))) {
175-
$product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
176-
$product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
177-
}
178-
179-
if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
180-
$product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
181-
}
182-
if (!empty($product->getData($mediaAttrCode))) {
183-
$product->addAttributeUpdate(
172+
$this->processMediaAttribute(
173+
$product,
174+
$mediaAttrCode,
175+
$clearImages,
176+
$newImages
177+
);
178+
if (in_array($mediaAttrCode, ['image', 'small_image', 'thumbnail'])) {
179+
$this->processMediaAttributeLabel(
180+
$product,
184181
$mediaAttrCode,
185-
$product->getData($mediaAttrCode),
186-
$product->getStoreId()
182+
$clearImages,
183+
$newImages,
184+
$existImages
187185
);
188186
}
189187
}
@@ -208,6 +206,8 @@ public function execute($product, $arguments = [])
208206
}
209207

210208
/**
209+
* Returns media gallery atribute instance
210+
*
211211
* @return \Magento\Catalog\Api\Data\ProductAttributeInterface
212212
* @since 101.0.0
213213
*/
@@ -223,6 +223,8 @@ public function getAttribute()
223223
}
224224

225225
/**
226+
* Process delete images
227+
*
226228
* @param \Magento\Catalog\Model\Product $product
227229
* @param array $images
228230
* @return void
@@ -234,6 +236,8 @@ protected function processDeletedImages($product, array &$images)
234236
}
235237

236238
/**
239+
* Process images
240+
*
237241
* @param \Magento\Catalog\Model\Product $product
238242
* @param array $images
239243
* @return void
@@ -296,6 +300,8 @@ protected function processNewImage($product, array &$image)
296300
}
297301

298302
/**
303+
* Duplicate attribute
304+
*
299305
* @param \Magento\Catalog\Model\Product $product
300306
* @return $this
301307
* @since 101.0.0
@@ -364,6 +370,8 @@ private function getSafeFilename($file)
364370
}
365371

366372
/**
373+
* Returns file name according to tmp name
374+
*
367375
* @param string $file
368376
* @return string
369377
* @since 101.0.0
@@ -449,4 +457,81 @@ private function getMediaAttributeCodes()
449457
}
450458
return $this->mediaAttributeCodes;
451459
}
460+
461+
/**
462+
* Process media attribute
463+
*
464+
* @param \Magento\Catalog\Model\Product $product
465+
* @param string $mediaAttrCode
466+
* @param array $clearImages
467+
* @param array $newImages
468+
*/
469+
private function processMediaAttribute(
470+
\Magento\Catalog\Model\Product $product,
471+
$mediaAttrCode,
472+
array $clearImages,
473+
array $newImages
474+
) {
475+
$attrData = $product->getData($mediaAttrCode);
476+
if (in_array($attrData, $clearImages)) {
477+
$product->setData($mediaAttrCode, 'no_selection');
478+
}
479+
480+
if (in_array($attrData, array_keys($newImages))) {
481+
$product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
482+
}
483+
if (!empty($product->getData($mediaAttrCode))) {
484+
$product->addAttributeUpdate(
485+
$mediaAttrCode,
486+
$product->getData($mediaAttrCode),
487+
$product->getStoreId()
488+
);
489+
}
490+
}
491+
492+
/**
493+
* Process media attribute label
494+
*
495+
* @param \Magento\Catalog\Model\Product $product
496+
* @param string $mediaAttrCode
497+
* @param array $clearImages
498+
* @param array $newImages
499+
* @param array $existImages
500+
*/
501+
private function processMediaAttributeLabel(
502+
\Magento\Catalog\Model\Product $product,
503+
$mediaAttrCode,
504+
array $clearImages,
505+
array $newImages,
506+
array $existImages
507+
) {
508+
$resetLabel = false;
509+
$attrData = $product->getData($mediaAttrCode);
510+
if (in_array($attrData, $clearImages)) {
511+
$product->setData($mediaAttrCode . '_label', null);
512+
$resetLabel = true;
513+
}
514+
515+
if (in_array($attrData, array_keys($newImages))) {
516+
$product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
517+
}
518+
519+
if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
520+
$product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
521+
}
522+
523+
if ($attrData === 'no_selection' && !empty($product->getData($mediaAttrCode . '_label'))) {
524+
$product->setData($mediaAttrCode . '_label', null);
525+
$resetLabel = true;
526+
}
527+
if (!empty($product->getData($mediaAttrCode . '_label'))
528+
|| $resetLabel === true
529+
) {
530+
$product->addAttributeUpdate(
531+
$mediaAttrCode . '_label',
532+
$product->getData($mediaAttrCode . '_label'),
533+
$product->getStoreId()
534+
);
535+
}
536+
}
452537
}

‎app/code/Magento/Catalog/Model/ResourceModel/Product/BaseSelectProcessorInterface.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface BaseSelectProcessorInterface
12+
*
1213
* @api
1314
* @since 101.0.3
1415
*/
@@ -20,6 +21,8 @@ interface BaseSelectProcessorInterface
2021
const PRODUCT_TABLE_ALIAS = 'child';
2122

2223
/**
24+
* Process the select statement
25+
*
2326
* @param Select $select
2427
* @return Select
2528
* @since 101.0.3

‎app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\EntityManager\MetadataPool;
1414
use Magento\Store\Api\StoreResolverInterface;
1515
use Magento\Store\Model\Store;
16+
use Magento\Store\Model\StoreManagerInterface;
1617

1718
/**
1819
* Class StatusBaseSelectProcessor
@@ -30,28 +31,32 @@ class StatusBaseSelectProcessor implements BaseSelectProcessorInterface
3031
private $metadataPool;
3132

3233
/**
33-
* @var StoreResolverInterface
34+
* @var StoreManagerInterface
3435
*/
35-
private $storeResolver;
36+
private $storeManager;
3637

3738
/**
3839
* @param Config $eavConfig
3940
* @param MetadataPool $metadataPool
4041
* @param StoreResolverInterface $storeResolver
42+
* @param StoreManagerInterface $storeManager
43+
*
44+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4145
*/
4246
public function __construct(
4347
Config $eavConfig,
4448
MetadataPool $metadataPool,
45-
StoreResolverInterface $storeResolver
49+
StoreResolverInterface $storeResolver,
50+
StoreManagerInterface $storeManager = null
4651
) {
4752
$this->eavConfig = $eavConfig;
4853
$this->metadataPool = $metadataPool;
49-
$this->storeResolver = $storeResolver;
54+
$this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
55+
->get(StoreManagerInterface::class);
5056
}
5157

5258
/**
53-
* @param Select $select
54-
* @return Select
59+
* @inheritdoc
5560
*/
5661
public function process(Select $select)
5762
{
@@ -70,7 +75,7 @@ public function process(Select $select)
7075
['status_attr' => $statusAttribute->getBackendTable()],
7176
"status_attr.{$linkField} = " . self::PRODUCT_TABLE_ALIAS . ".{$linkField}"
7277
. ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
73-
. ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
78+
. ' AND status_attr.store_id = ' . $this->storeManager->getStore()->getId(),
7479
[]
7580
);
7681

‎app/code/Magento/Catalog/Plugin/Model/Attribute/Backend/AttributeValidation.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@
77

88
use Magento\Store\Model\Store;
99

10+
/**
11+
* Attribute validation
12+
*/
1013
class AttributeValidation
1114
{
1215
/**
1316
* @var \Magento\Store\Model\StoreManagerInterface
1417
*/
1518
private $storeManager;
1619

20+
/**
21+
* @var array
22+
*/
23+
private $allowedEntityTypes;
24+
1725
/**
1826
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
1927
* @param array $allowedEntityTypes
@@ -27,9 +35,12 @@ public function __construct(
2735
}
2836

2937
/**
38+
* Around validate
39+
*
3040
* @param \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend $subject
3141
* @param \Closure $proceed
3242
* @param \Magento\Framework\DataObject $entity
43+
* @throws \Magento\Framework\Exception\NoSuchEntityException
3344
* @return bool
3445
*/
3546
public function aroundValidate(
@@ -41,7 +52,7 @@ public function aroundValidate(
4152
return $entity instanceof $allowedEntity;
4253
}, $this->allowedEntityTypes)));
4354

44-
if ($isAllowedType && $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
55+
if ($isAllowedType && (int) $this->storeManager->getStore()->getId() !== Store::DEFAULT_STORE_ID) {
4556
$attrCode = $subject->getAttribute()->getAttributeCode();
4657
// Null is meaning "no value" which should be overridden by value from default scope
4758
if (array_key_exists($attrCode, $entity->getData()) && $entity->getData($attrCode) === null) {

0 commit comments

Comments
 (0)