forked from Hevelop/magento2-patches
-
Notifications
You must be signed in to change notification settings - Fork 7
/
Patch-Magento_Catalog-M2.1.5-MAGETWO-56410-MAGETWO-56411-github-issues-5931-5612.patch
359 lines (350 loc) · 16.2 KB
/
Patch-Magento_Catalog-M2.1.5-MAGETWO-56410-MAGETWO-56411-github-issues-5931-5612.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
--- a/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -199,6 +199,9 @@ class Helper
$customOptions = [];
foreach ($options as $customOptionData) {
if (empty($customOptionData['is_delete'])) {
+ if (empty($customOptionData['option_id'])) {
+ $customOptionData['option_id'] = null;
+ }
if (isset($customOptionData['values'])) {
$customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
return empty($valueData['is_delete']);
@@ -206,7 +209,6 @@ class Helper
}
$customOption = $this->getCustomOptionFactory()->create(['data' => $customOptionData]);
$customOption->setProductSku($product->getSku());
- $customOption->setOptionId(null);
$customOptions[] = $customOption;
}
}
@@ -317,19 +319,57 @@ class Helper
foreach ($productOptions as $index => $option) {
$optionId = $option['option_id'];
+ $option = $this->overwriteValue(
+ $optionId,
+ $option,
+ $overwriteOptions
+ );
- if (!isset($overwriteOptions[$optionId])) {
- continue;
+ if (isset($option['values']) && isset($overwriteOptions[$optionId]['values'])) {
+ foreach ($option['values'] as $valueIndex => $value) {
+ if (isset($value['option_type_id'])) {
+ $valueId = $value['option_type_id'];
+ $value = $this->overwriteValue(
+ $valueId,
+ $value,
+ $overwriteOptions[$optionId]['values']
+ );
+
+ $option['values'][$valueIndex] = $value;
+ }
+ }
}
+ $productOptions[$index] = $option;
+ }
+
+ return $productOptions;
+ }
+
+ /**
+ * Overwrite values of fields to default, if there are option id and field
+ * name in array overwriteOptions
+ *
+ * @param int $optionId
+ * @param array $option
+ * @param array $overwriteOptions
+ *
+ * @return array
+ */
+ private function overwriteValue($optionId, $option, $overwriteOptions)
+ {
+ if (isset($overwriteOptions[$optionId])) {
foreach ($overwriteOptions[$optionId] as $fieldName => $overwrite) {
if ($overwrite && isset($option[$fieldName]) && isset($option['default_' . $fieldName])) {
- $productOptions[$index][$fieldName] = $option['default_' . $fieldName];
+ $option[$fieldName] = $option['default_' . $fieldName];
+ if ('title' == $fieldName) {
+ $option['is_delete_store_title'] = 1;
+ }
}
}
}
- return $productOptions;
+ return $option;
}
/**
--- a/Model/Product/Option/Repository.php
+++ b/Model/Product/Option/Repository.php
@@ -140,7 +140,41 @@ class Repository implements \Magento\Catalog\Api\ProductCustomOptionRepositoryIn
$product = $this->productRepository->get($productSku);
$metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
$option->setData('product_id', $product->getData($metadata->getLinkField()));
- $option->setOptionId(null);
+ $option->setData('store_id', $product->getStoreId());
+
+ if ($option->getOptionId() && ! $option->getIsDelete()) {
+
+ $options = $product->getOptions();
+
+ if (!$options) {
+ $options = $this->getProductOptions($product);
+ }
+
+ $persistedOption = array_filter(
+ $options,
+ function ($iOption) use ($option) {
+ return $option->getOptionId() == $iOption->getOptionId();
+ }
+ );
+
+ $persistedOption = reset($persistedOption);
+
+ if (!$persistedOption) {
+ throw new NoSuchEntityException();
+ }
+
+ /** @var array $originalValues */
+ $originalValues = $persistedOption->getValues();
+
+ /** @var array $newValues */
+ $newValues = $option->getData('values');
+
+ if ($newValues) {
+ $newValues = $this->markRemovedValues($newValues, $originalValues);
+ $option->setData('values', $newValues);
+ }
+ }
+
$option->save();
return $option;
}
--- a/Model/Product/Option/SaveHandler.php
+++ b/Model/Product/Option/SaveHandler.php
@@ -36,12 +36,28 @@ class SaveHandler implements ExtensionInterface
*/
public function execute($entity, $arguments = [])
{
+ $options = $entity->getOptions();
+ $optionIds = [];
+
+ if ($options) {
+ $optionIds = array_map(
+ function ($option) {
+ /** @var \Magento\Catalog\Model\Product\Option $option */
+ return $option->getOptionId();
+ },
+ $options
+ );
+ }
+
/** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
foreach ($this->optionRepository->getProductOptions($entity) as $option) {
- $this->optionRepository->delete($option);
+ if (!in_array($option->getOptionId(), $optionIds)) {
+ $this->optionRepository->delete($option);
+ }
}
- if ($entity->getOptions()) {
- foreach ($entity->getOptions() as $option) {
+
+ if ($options) {
+ foreach ($options as $option) {
$this->optionRepository->save($option);
}
}
--- a/Model/Product/Option/Validator/Select.php
+++ b/Model/Product/Option/Validator/Select.php
@@ -51,6 +51,10 @@ class Select extends DefaultValidator
$storeId = $option->getProduct()->getStoreId();
}
foreach ($values as $value) {
+ if (isset($value['is_delete']) && (bool)$value['is_delete']) {
+ continue;
+ }
+
$type = isset($value['price_type']) ? $value['price_type'] : null;
$price = isset($value['price']) ? $value['price'] : null;
$title = isset($value['title']) ? $value['title'] : null;
--- a/Model/Product/Option/Value.php
+++ b/Model/Product/Option/Value.php
@@ -200,7 +200,6 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
'store_id',
$this->getOption()->getStoreId()
);
- $this->unsetData('option_type_id');
if ($this->getData('is_delete') == '1') {
if ($this->getId()) {
$this->deleteValues($this->getId());
--- a/Model/ResourceModel/Product/Option.php
+++ b/Model/ResourceModel/Product/Option.php
@@ -247,14 +247,17 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
$titleTableName = $this->getTable('catalog_product_option_title');
foreach ([\Magento\Store\Model\Store::DEFAULT_STORE_ID, $object->getStoreId()] as $storeId) {
$existInCurrentStore = $this->getColFromOptionTable($titleTableName, (int)$object->getId(), (int)$storeId);
- $existInDefaultStore = $this->getColFromOptionTable(
- $titleTableName,
- (int)$object->getId(),
- \Magento\Store\Model\Store::DEFAULT_STORE_ID
- );
+ $existInDefaultStore = (int)$storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID ?
+ $existInCurrentStore :
+ $this->getColFromOptionTable($titleTableName, (int)$object->getId(), \Magento\Store\Model\Store::DEFAULT_STORE_ID);
+
if ($object->getTitle()) {
+ $isDeleteStoreTitle = (bool)$object->getData('is_delete_store_title');
if ($existInCurrentStore) {
- if ($object->getStoreId() == $storeId) {
+ if ($isDeleteStoreTitle && (int)$storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
+ $connection->delete($titleTableName, ['option_title_id = ?' => $existInCurrentStore]);
+
+ } elseif ($object->getStoreId() == $storeId) {
$data = $this->_prepareDataForTable(
new \Magento\Framework\DataObject(['title' => $object->getTitle()]),
$titleTableName
@@ -270,8 +273,12 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
}
} else {
// we should insert record into not default store only of if it does not exist in default store
- if (($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInDefaultStore)
- || ($storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInCurrentStore)
+ if (($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
+ (
+ $storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID &&
+ !$existInCurrentStore &&
+ !$isDeleteStoreTitle
+ )
) {
$data = $this->_prepareDataForTable(
new \Magento\Framework\DataObject(
--- a/Model/ResourceModel/Product/Option/Value.php
+++ b/Model/ResourceModel/Product/Option/Value.php
@@ -231,6 +231,13 @@ class Value extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
);
$optionTypeId = $this->getConnection()->fetchOne($select);
$existInCurrentStore = $this->getOptionIdFromOptionTable($titleTable, (int)$object->getId(), (int)$storeId);
+
+ if ($storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID &&
+ $object->getData('is_delete_store_title')
+ ) {
+ $object->unsetData('title');
+ }
+
if ($object->getTitle()) {
if ($existInCurrentStore) {
if ($storeId == $object->getStoreId()) {
--- a/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -68,6 +68,7 @@ class CustomOptions extends AbstractModifier
const FIELD_ENABLE = 'affect_product_custom_options';
const FIELD_OPTION_ID = 'option_id';
const FIELD_TITLE_NAME = 'title';
+ const FIELD_STORE_TITLE_NAME = 'store_title';
const FIELD_TYPE_NAME = 'type';
const FIELD_IS_REQUIRE_NAME = 'is_require';
const FIELD_SORT_ORDER_NAME = 'sort_order';
@@ -79,6 +80,7 @@ class CustomOptions extends AbstractModifier
const FIELD_IMAGE_SIZE_X_NAME = 'image_size_x';
const FIELD_IMAGE_SIZE_Y_NAME = 'image_size_y';
const FIELD_IS_DELETE = 'is_delete';
+ const FIELD_IS_USE_DEFAULT = 'is_use_default';
/**#@-*/
/**#@+
@@ -162,9 +164,15 @@ class CustomOptions extends AbstractModifier
/** @var \Magento\Catalog\Model\Product\Option $option */
foreach ($productOptions as $index => $option) {
- $options[$index] = $this->formatPriceByPath(static::FIELD_PRICE_NAME, $option->getData());
+ $optionData = $option->getData();
+ $optionData[static::FIELD_IS_USE_DEFAULT] = !$option->getData(static::FIELD_STORE_TITLE_NAME);
+ $options[$index] = $this->formatPriceByPath(static::FIELD_PRICE_NAME, $optionData);
$values = $option->getValues() ?: [];
+ foreach ($values as $value) {
+ $value->setData(static::FIELD_IS_USE_DEFAULT, !$value->getData(static::FIELD_STORE_TITLE_NAME));
+ }
+
/** @var \Magento\Catalog\Model\Product\Option $value */
foreach ($values as $value) {
$options[$index][static::GRID_TYPE_SELECT_NAME][] = $this->formatPriceByPath(
@@ -386,6 +394,7 @@ class CustomOptions extends AbstractModifier
'data' => [
'config' => [
'componentType' => Fieldset::NAME,
+ 'collapsible' => true,
'label' => null,
'sortOrder' => 10,
'opened' => true,
@@ -477,7 +486,6 @@ class CustomOptions extends AbstractModifier
'ns' => static::CUSTOM_OPTIONS_LISTING,
'render_url' => $this->urlBuilder->getUrl('mui/index/render'),
'realTimeLink' => true,
- 'behaviourType' => 'edit',
'externalFilterMode' => false,
'currentProductId' => $this->locator->getProduct()->getId(),
'dataLinks' => [
@@ -529,7 +537,8 @@ class CustomOptions extends AbstractModifier
'component' => 'Magento_Catalog/component/static-type-input',
'valueUpdate' => 'input',
'imports' => [
- 'optionId' => '${ $.provider }:${ $.parentScope }.option_id'
+ 'optionId' => '${ $.provider }:${ $.parentScope }.option_id',
+ 'isUseDefault' => '${ $.provider }:${ $.parentScope }.is_use_default'
]
],
],
@@ -597,6 +606,23 @@ class CustomOptions extends AbstractModifier
*/
protected function getSelectTypeGridConfig($sortOrder)
{
+ $options = [
+ 'arguments' => [
+ 'data' => [
+ 'config' => [
+ 'imports' => [
+ 'optionId' => '${ $.provider }:${ $.parentScope }.option_id',
+ 'optionTypeId' => '${ $.provider }:${ $.parentScope }.option_type_id',
+ 'isUseDefault' => '${ $.provider }:${ $.parentScope }.is_use_default'
+ ],
+ 'service' => [
+ 'template' => 'Magento_Catalog/form/element/helper/custom-option-type-service',
+ ],
+ ],
+ ],
+ ],
+ ];
+
return [
'arguments' => [
'data' => [
@@ -626,7 +652,10 @@ class CustomOptions extends AbstractModifier
],
],
'children' => [
- static::FIELD_TITLE_NAME => $this->getTitleFieldConfig(10),
+ static::FIELD_TITLE_NAME => $this->getTitleFieldConfig(
+ 10,
+ $this->locator->getProduct()->getStoreId() ? $options : []
+ ),
static::FIELD_PRICE_NAME => $this->getPriceFieldConfig(20),
static::FIELD_PRICE_TYPE_NAME => $this->getPriceTypeFieldConfig(30, ['fit' => true]),
static::FIELD_SKU_NAME => $this->getSkuFieldConfig(40),
--- /dev/null
+++ b/view/adminhtml/web/template/form/element/helper/custom-option-type-service.html
@@ -0,0 +1,17 @@
+<!--
+/**
+ * Copyright 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field-service">
+ <input type="checkbox"
+ class="admin__control-checkbox"
+ attr="
+ id: $data.uid + '_default',
+ name: 'options_use_default[' + $data.optionId + '][values][' + $data.optionTypeId + '][' + $data.index + ']',
+ 'data-form-part': $data.ns
+ "
+ ko-checked="$data.isUseDefault">
+ <label translate="'Use Default Value'" attr="for: $data.uid + '_default'" class="admin__field-label"></label>
+</div>