Skip to content

Commit 747f3ac

Browse files
VladimirZaetsVladimirZaets
authored
Merge pull request #1460 from magento-chaika/chaika-pr1
Bugs - MAGETWO-71637 [Magento Cloud] - Uncaught Error: Call to a member function getPrice() on null - MAGETWO-63704 [Backport] - Scheduled Update removes all simple variations from Configurable product - for 2.1 - MAGETWO-70991 [Backport] - [Magento Cloud] - 503 when editing a bundle in wishlist - for 2.1 - MAGETWO-57616 [Backport] - [MERCHANT] Integrity Constraint Violation when creating orders - for 2.1 - MAGETWO-70521 [Backport] Could not save the WYSIWYG if configuration set to Disabled by Default - for 2.1.x
2 parents ada41e1 + 534a9b7 commit 747f3ac

File tree

7 files changed

+122
-16
lines changed

7 files changed

+122
-16
lines changed

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,22 @@ var catalogWysiwygEditor = {
6969
$(elementId + '_editor').value = $(elementId).value;
7070
},
7171
okDialogWindow : function(dialogWindow) {
72-
if (dialogWindow.options.firedElementId) {
73-
wysiwygObj = eval('wysiwyg'+dialogWindow.options.firedElementId+'_editor');
72+
var $firedElement = jQuery('#' + dialogWindow.options.firedElementId),
73+
$editorElement = jQuery('#' + dialogWindow.options.firedElementId + '_editor'),
74+
firedElementId = $firedElement.attr('id'),
75+
wysiwygObj = window['wysiwyg' + firedElementId + '_editor'];
76+
77+
if ($firedElement.length) {
7478
wysiwygObj.turnOff();
7579
if (tinyMCE.get(wysiwygObj.id)) {
76-
$(dialogWindow.options.firedElementId).value = tinyMCE.get(wysiwygObj.id).getContent();
80+
$firedElement.val(tinyMCE.get(wysiwygObj.id).getContent()).change();
7781
} else {
78-
if ($(dialogWindow.options.firedElementId+'_editor')) {
79-
$(dialogWindow.options.firedElementId).value = $(dialogWindow.options.firedElementId+'_editor').value;
80-
}
82+
$firedElement.val($editorElement.val()).change();
83+
}
84+
85+
if (tinyMCE.get(firedElementId)) {
86+
tinyMCE.get(firedElementId).load();
8187
}
82-
tinyMCE.editors[dialogWindow.options.firedElementId].load();
8388
if (typeof varienGlobalEvents != undefined) {
8489
varienGlobalEvents.fireEvent('tinymceChange');
8590
}

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,8 @@ define([
301301
* Chose action for the form save button
302302
*/
303303
saveFormHandler: function() {
304-
this.source.data["product"]["configurable-matrix-serialized"] =
305-
JSON.stringify(this.source.data["configurable-matrix"]);
306-
delete this.source.data["configurable-matrix"];
307-
this.source.data["product"]["associated_product_ids_serialized"] =
308-
JSON.stringify(this.source.data["associated_product_ids"]);
309-
delete this.source.data["associated_product_ids"];
304+
this.serializeData();
305+
310306
if (this.checkForNewAttributes()) {
311307
this.formSaveParams = arguments;
312308
this.attributeSetHandlerModal().openModal();
@@ -315,6 +311,29 @@ define([
315311
}
316312
},
317313

314+
/**
315+
* Serialize data for specific form fields
316+
*
317+
* Get data from outdated fields, serialize it and produce new form fields.
318+
*
319+
* Outdated fields:
320+
* - configurable-matrix;
321+
* - associated_product_ids.
322+
*
323+
* New fields:
324+
* - configurable-matrix-serialized;
325+
* - associated_product_ids_serialized.
326+
*/
327+
serializeData: function () {
328+
this.source.data["product"]["configurable-matrix-serialized"] =
329+
JSON.stringify(this.source.data["configurable-matrix"]);
330+
delete this.source.data["configurable-matrix"];
331+
332+
this.source.data["product"]["associated_product_ids_serialized"] =
333+
JSON.stringify(this.source.data["associated_product_ids"]);
334+
delete this.source.data["associated_product_ids"];
335+
},
336+
318337
/**
319338
* Check for newly added attributes
320339
* @returns {Boolean}

‎app/code/Magento/Quote/Model/Quote.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2161,6 +2161,12 @@ public function reserveOrderId()
21612161
{
21622162
if (!$this->getReservedOrderId()) {
21632163
$this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
2164+
} else {
2165+
//checking if reserved order id was already used for some order
2166+
//if yes reserving new one if not using old one
2167+
if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
2168+
$this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
2169+
}
21642170
}
21652171
return $this;
21662172
}

‎app/code/Magento/Quote/Model/ResourceModel/Quote.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,25 @@ public function getReservedOrderId($quote)
172172
->getNextValue();
173173
}
174174

175+
/**
176+
* Check is order increment id use in sales/order table
177+
*
178+
* @param int $orderIncrementId
179+
* @return bool
180+
*/
181+
public function isOrderIncrementIdUsed($orderIncrementId)
182+
{
183+
/** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
184+
$adapter = $this->getConnection();
185+
$bind = [':increment_id' => $orderIncrementId];
186+
/** @var \Magento\Framework\DB\Select $select */
187+
$select = $adapter->select()
188+
->from($this->getTable('sales_order'), 'entity_id')
189+
->where('increment_id = :increment_id');
190+
$entity_id = $adapter->fetchOne($select, $bind);
191+
return ($entity_id > 0);
192+
}
193+
175194
/**
176195
* Mark quotes - that depend on catalog price rules - to be recollected on demand
177196
*

‎app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,10 @@ protected function setUp()
307307
'customerRepository' => $this->customerRepositoryMock,
308308
'objectCopyService' => $this->objectCopyServiceMock,
309309
'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
310-
'customerDataFactory' => $this->customerDataFactoryMock
310+
'customerDataFactory' => $this->customerDataFactoryMock,
311+
'data' => [
312+
'reserved_order_id' => 1000001
313+
]
311314
]
312315
);
313316
}
@@ -1233,4 +1236,39 @@ public function testGetAllItems()
12331236

12341237
$this->assertEquals($itemResult, $this->quote->getAllItems());
12351238
}
1239+
1240+
/**
1241+
* Test to verify if existing reserved_order_id in use
1242+
*
1243+
* @param bool $isReservedOrderIdExist
1244+
* @param int $reservedOrderId
1245+
* @dataProvider reservedOrderIdDataProvider
1246+
*/
1247+
public function testReserveOrderId($isReservedOrderIdExist, $reservedOrderId)
1248+
{
1249+
$this->resourceMock
1250+
->expects($this->once())
1251+
->method('isOrderIncrementIdUsed')
1252+
->with(1000001)
1253+
->willReturn($isReservedOrderIdExist);
1254+
$this->resourceMock
1255+
->expects($this->any())
1256+
->method('getReservedOrderId')
1257+
->willReturn($reservedOrderId);
1258+
$this->quote->reserveOrderId();
1259+
$this->assertEquals($reservedOrderId, $this->quote->getReservedOrderId());
1260+
}
1261+
1262+
/**
1263+
* DataProvider for reservedId test
1264+
*
1265+
* @return array
1266+
*/
1267+
public function reservedOrderIdDataProvider()
1268+
{
1269+
return [
1270+
'id_already_in_use' => [true, 100002],
1271+
'id_not_in_use' => [false, 1000001]
1272+
];
1273+
}
12361274
}

‎app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
template="Magento_Catalog::product/view/addto.phtml" cacheable="false">
2323
<block class="Magento\Wishlist\Block\Item\Configure" name="view.addto.wishlist.bundle" after="view.addto.requisition"
2424
template="item/configure/addto/wishlist.phtml" />
25-
<block class="Magento\Catalog\Block\Product\View\Addto\Compare" name="view.addto.compare.bundle" after="view.addto.wishlist"
25+
<block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare.bundle" after="view.addto.wishlist"
2626
template="Magento_Catalog::product/view/addto/compare.phtml" />
2727
</block>
2828
</block>

‎dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ protected function _getCustomerDataArray()
432432
\Magento\Customer\Model\Data\Customer::WEBSITE_ID => 1
433433
];
434434
}
435-
435+
436436
/**
437437
* Test to verify that disabled product cannot be added to cart.
438438
*
@@ -457,4 +457,23 @@ public function testAddedProductToQuoteIsSalable()
457457
$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
458458
$quote->addProduct($product);
459459
}
460+
461+
/**
462+
* Test to verify that reserved_order_id will be changed if it already in used
463+
*
464+
* @magentoDataFixture Magento/Sales/_files/order.php
465+
* @magentoDataFixture Magento/Quote/_files/empty_quote.php
466+
*/
467+
public function testReserveOrderId()
468+
{
469+
$objectManager = Bootstrap::getObjectManager();
470+
/** @var \Magento\Quote\Model\Quote $quote */
471+
$quote = $objectManager->create(Quote::class);
472+
$quote->load('reserved_order_id', 'reserved_order_id');
473+
$quote->reserveOrderId();
474+
$this->assertEquals('reserved_order_id', $quote->getReservedOrderId());
475+
$quote->setReservedOrderId('100000001');
476+
$quote->reserveOrderId();
477+
$this->assertNotEquals('100000001', $quote->getReservedOrderId());
478+
}
460479
}

0 commit comments

Comments
 (0)