Skip to content

Commit 915ce07

Browse files
author
Magento CICD
authored
merge magento/2.2-develop into magento-tsg/2.2-develop-pr30
2 parents c2d49c6 + 32532e8 commit 915ce07

File tree

29 files changed

+1554
-125
lines changed

29 files changed

+1554
-125
lines changed

‎app/code/Magento/Catalog/view/adminhtml/requirejs-config.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,18 @@ var config = {
1616
},
1717
deps: [
1818
'Magento_Catalog/catalog/product'
19-
]
19+
],
20+
config: {
21+
mixins: {
22+
'Magento_Catalog/js/components/use-parent-settings/select': {
23+
'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
24+
},
25+
'Magento_Catalog/js/components/use-parent-settings/textarea': {
26+
'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
27+
},
28+
'Magento_Catalog/js/components/use-parent-settings/single-checkbox': {
29+
'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
30+
}
31+
}
32+
}
2033
};

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -459,34 +459,34 @@
459459
</checkbox>
460460
</formElements>
461461
</field>
462-
<field name="custom_design" sortOrder="180" formElement="select">
462+
<field name="custom_design" component="Magento_Catalog/js/components/use-parent-settings/select" sortOrder="180" formElement="select">
463463
<settings>
464464
<dataType>string</dataType>
465465
<label translate="true">Theme</label>
466466
<imports>
467-
<link name="disabled">${ $.parentName }.custom_use_parent_settings:checked</link>
467+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
468468
</imports>
469469
</settings>
470470
</field>
471-
<field name="page_layout" sortOrder="190" formElement="select">
471+
<field name="page_layout" component="Magento_Catalog/js/components/use-parent-settings/select" sortOrder="190" formElement="select">
472472
<settings>
473473
<dataType>string</dataType>
474474
<label translate="true">Layout</label>
475475
<imports>
476-
<link name="disabled">${ $.parentName }.custom_use_parent_settings:checked</link>
476+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
477477
</imports>
478478
</settings>
479479
</field>
480-
<field name="custom_layout_update" sortOrder="200" formElement="textarea">
480+
<field name="custom_layout_update" component="Magento_Catalog/js/components/use-parent-settings/textarea" sortOrder="200" formElement="textarea">
481481
<settings>
482482
<dataType>string</dataType>
483483
<label translate="true">Layout Update XML</label>
484484
<imports>
485-
<link name="disabled">ns = ${ $.ns }, index = custom_use_parent_settings :checked</link>
485+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
486486
</imports>
487487
</settings>
488488
</field>
489-
<field name="custom_apply_to_products" component="Magento_Ui/js/form/element/single-checkbox" sortOrder="210" formElement="checkbox">
489+
<field name="custom_apply_to_products" component="Magento_Catalog/js/components/use-parent-settings/single-checkbox" sortOrder="210" formElement="checkbox">
490490
<argument name="data" xsi:type="array">
491491
<item name="config" xsi:type="array">
492492
<item name="default" xsi:type="number">0</item>
@@ -499,7 +499,7 @@
499499
<dataType>boolean</dataType>
500500
<label translate="true">Apply Design to Products</label>
501501
<imports>
502-
<link name="disabled">ns = ${ $.ns }, index = custom_use_parent_settings:checked</link>
502+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
503503
</imports>
504504
</settings>
505505
<formElements>

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/select.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
define([
10+
'Magento_Ui/js/form/element/select'
11+
], function (Component) {
12+
'use strict';
13+
14+
return Component;
15+
});

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/single-checkbox.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
define([
10+
'Magento_Ui/js/form/element/single-checkbox'
11+
], function (Component) {
12+
'use strict';
13+
14+
return Component;
15+
});

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/textarea.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
define([
10+
'Magento_Ui/js/form/element/textarea'
11+
], function (Component) {
12+
'use strict';
13+
14+
return Component;
15+
});

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/toggle-disabled-mixin.js

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'underscore'
8+
], function (_) {
9+
'use strict';
10+
11+
var mixin = {
12+
defaults: {
13+
imports: {
14+
toggleDisabled: '${ $.parentName }.custom_use_parent_settings:checked'
15+
},
16+
useParent: false,
17+
useDefaults: false
18+
},
19+
20+
/**
21+
* Disable form input if settings for parent section is used
22+
* or default value is applied.
23+
*
24+
* @param {Boolean} isUseParent
25+
*/
26+
toggleDisabled: function (isUseParent) {
27+
var disabled = this.useParent = isUseParent;
28+
29+
if (!disabled && !_.isUndefined(this.service)) {
30+
disabled = !!this.isUseDefault();
31+
}
32+
33+
this.saveUseDefaults();
34+
this.disabled(disabled);
35+
},
36+
37+
/**
38+
* Stores original state of the field.
39+
*/
40+
saveUseDefaults: function () {
41+
this.useDefaults = this.disabled();
42+
},
43+
44+
/** @inheritdoc */
45+
setInitialValue: function () {
46+
this._super();
47+
this.isUseDefault(this.useDefaults);
48+
49+
return this;
50+
},
51+
52+
/** @inheritdoc */
53+
toggleUseDefault: function (state) {
54+
this._super();
55+
this.disabled(state || this.useParent);
56+
}
57+
};
58+
59+
return function (target) {
60+
return target.extend(mixin);
61+
};
62+
});

‎app/code/Magento/Checkout/Controller/Cart/UpdateItemQty.php

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Checkout\Controller\Cart;
9+
10+
use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
11+
use Magento\Framework\App\Action\Context;
12+
use Magento\Framework\Exception\LocalizedException;
13+
use Magento\Checkout\Model\Session as CheckoutSession;
14+
use Magento\Framework\Serialize\Serializer\Json;
15+
use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
16+
use Magento\Quote\Model\Quote\Item;
17+
use Psr\Log\LoggerInterface;
18+
19+
class UpdateItemQty extends \Magento\Framework\App\Action\Action
20+
{
21+
/**
22+
* @var RequestQuantityProcessor
23+
*/
24+
private $quantityProcessor;
25+
26+
/**
27+
* @var FormKeyValidator
28+
*/
29+
private $formKeyValidator;
30+
31+
/**
32+
* @var CheckoutSession
33+
*/
34+
private $checkoutSession;
35+
36+
/**
37+
* @var Json
38+
*/
39+
private $json;
40+
41+
/**
42+
* @var LoggerInterface
43+
*/
44+
private $logger;
45+
46+
/**
47+
* @param Context $context,
48+
* @param RequestQuantityProcessor $quantityProcessor
49+
* @param FormKeyValidator $formKeyValidator
50+
* @param CheckoutSession $checkoutSession
51+
* @param Json $json
52+
* @param LoggerInterface $logger
53+
*/
54+
public function __construct(
55+
Context $context,
56+
RequestQuantityProcessor $quantityProcessor,
57+
FormKeyValidator $formKeyValidator,
58+
CheckoutSession $checkoutSession,
59+
Json $json,
60+
LoggerInterface $logger
61+
) {
62+
$this->quantityProcessor = $quantityProcessor;
63+
$this->formKeyValidator = $formKeyValidator;
64+
$this->checkoutSession = $checkoutSession;
65+
$this->json = $json;
66+
$this->logger = $logger;
67+
parent::__construct($context);
68+
}
69+
70+
/**
71+
* @return void
72+
*/
73+
public function execute()
74+
{
75+
try {
76+
if (!$this->formKeyValidator->validate($this->getRequest())) {
77+
throw new LocalizedException(
78+
__('Something went wrong while saving the page. Please refresh the page and try again.')
79+
);
80+
}
81+
82+
$cartData = $this->getRequest()->getParam('cart');
83+
if (!is_array($cartData)) {
84+
throw new LocalizedException(
85+
__('Something went wrong while saving the page. Please refresh the page and try again.')
86+
);
87+
}
88+
89+
$cartData = $this->quantityProcessor->process($cartData);
90+
$quote = $this->checkoutSession->getQuote();
91+
92+
foreach ($cartData as $itemId => $itemInfo) {
93+
$item = $quote->getItemById($itemId);
94+
$qty = isset($itemInfo['qty']) ? (double)$itemInfo['qty'] : 0;
95+
if ($item) {
96+
$this->updateItemQuantity($item, $qty);
97+
}
98+
}
99+
100+
$this->jsonResponse();
101+
} catch (LocalizedException $e) {
102+
$this->jsonResponse($e->getMessage());
103+
} catch (\Exception $e) {
104+
$this->logger->critical($e->getMessage());
105+
$this->jsonResponse('Something went wrong while saving the page. Please refresh the page and try again.');
106+
}
107+
}
108+
109+
/**
110+
* Updates quote item quantity.
111+
*
112+
* @param Item $item
113+
* @param float $qty
114+
* @throws LocalizedException
115+
*/
116+
private function updateItemQuantity(Item $item, float $qty)
117+
{
118+
if ($qty > 0) {
119+
$item->setQty($qty);
120+
121+
if ($item->getHasError()) {
122+
throw new LocalizedException(__($item->getMessage()));
123+
}
124+
}
125+
}
126+
127+
/**
128+
* JSON response builder.
129+
*
130+
* @param string $error
131+
* @return void
132+
*/
133+
private function jsonResponse(string $error = '')
134+
{
135+
$this->getResponse()->representJson(
136+
$this->json->serialize($this->getResponseData($error))
137+
);
138+
}
139+
140+
/**
141+
* Returns response data.
142+
*
143+
* @param string $error
144+
* @return array
145+
*/
146+
private function getResponseData(string $error = ''): array
147+
{
148+
$response = [
149+
'success' => true,
150+
];
151+
152+
if (!empty($error)) {
153+
$response = [
154+
'success' => false,
155+
'error_message' => $error,
156+
];
157+
}
158+
159+
return $response;
160+
}
161+
}

0 commit comments

Comments
 (0)