Skip to content

Commit 1ee1a3e

Browse files
guz-antonguz-anton
committed
Merge pull request #167 from magento-vanilla/PR
[Vanilla+FireDrakes] Bug fixes
2 parents f1c07c5 + 923fcaf commit 1ee1a3e

File tree

10 files changed

+24
-26
lines changed

10 files changed

+24
-26
lines changed

‎app/code/Magento/GiftMessage/etc/fieldset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:DataObject/etc/fieldset.xsd">
1010
<scope id="global">
11-
<fieldset id="quote_convert_address">
11+
<fieldset id="sales_convert_quote_address">
1212
<field name="gift_message_id">
1313
<aspect name="to_order" />
1414
</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct(
6363
public function convert(Address $object, $data = [])
6464
{
6565
$orderData = $this->objectCopyService->getDataFromFieldset(
66-
'quote_convert_address',
66+
'sales_convert_quote_address',
6767
'to_order',
6868
$object
6969
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function convert(Address $object, $data = [])
5656
$orderAddress = $this->orderAddressRepository->create();
5757

5858
$orderAddressData = $this->objectCopyService->getDataFromFieldset(
59-
'quote_convert_address',
59+
'sales_convert_quote_address',
6060
'to_order_address',
6161
$object
6262
);

‎app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderAddressTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testConvert()
6969
*/
7070
$object = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
7171
$this->objectCopyMock->expects($this->once())->method('getDataFromFieldset')->with(
72-
'quote_convert_address',
72+
'sales_convert_quote_address',
7373
'to_order_address',
7474
$object
7575
)->willReturn($orderData);

‎app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testConvert()
8282
$quote->expects($this->once())->method('getId')->willReturn($quoteId);
8383
$quote->expects($this->once())->method('getStoreId')->willReturn($storeId);
8484
$this->objectCopyMock->expects($this->once())->method('getDataFromFieldset')->with(
85-
'quote_convert_address',
85+
'sales_convert_quote_address',
8686
'to_order',
8787
$object
8888
)->willReturn($orderData);

‎app/code/Magento/Quote/etc/fieldset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:DataObject/etc/fieldset.xsd">
1010
<scope id="global">
11-
<fieldset id="quote_convert_address">
11+
<fieldset id="sales_convert_quote_address">
1212
<field name="weight">
1313
<aspect name="to_order" />
1414
</field>

‎app/code/Magento/Sales/etc/fieldset.xml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -283,65 +283,48 @@
283283
</field>
284284
<field name="prefix">
285285
<aspect name="to_order_address" />
286-
<aspect name="to_customer_address" />
287286
</field>
288287
<field name="firstname">
289288
<aspect name="to_order_address" />
290-
<aspect name="to_customer_address" />
291289
</field>
292290
<field name="middlename">
293291
<aspect name="to_order_address" />
294-
<aspect name="to_customer_address" />
295292
</field>
296293
<field name="lastname">
297294
<aspect name="to_order_address" />
298-
<aspect name="to_customer_address" />
299295
</field>
300296
<field name="suffix">
301297
<aspect name="to_order_address" />
302-
<aspect name="to_customer_address" />
303298
</field>
304299
<field name="company">
305300
<aspect name="to_order_address" />
306-
<aspect name="to_customer_address" />
307301
</field>
308302
<field name="street">
309303
<aspect name="to_order_address" />
310304
</field>
311-
<field name="street">
312-
<aspect name="to_customer_address" />
313-
</field>
314305
<field name="city">
315306
<aspect name="to_order_address" />
316-
<aspect name="to_customer_address" />
317307
</field>
318308
<field name="region">
319309
<aspect name="to_order_address" />
320-
<aspect name="to_customer_address" />
321310
</field>
322311
<field name="region_id">
323312
<aspect name="to_order_address" />
324-
<aspect name="to_customer_address" />
325313
</field>
326314
<field name="postcode">
327315
<aspect name="to_order_address" />
328-
<aspect name="to_customer_address" />
329316
</field>
330317
<field name="country_id">
331318
<aspect name="to_order_address" />
332-
<aspect name="to_customer_address" />
333319
</field>
334320
<field name="telephone">
335321
<aspect name="to_order_address" />
336-
<aspect name="to_customer_address" />
337322
</field>
338323
<field name="fax">
339324
<aspect name="to_order_address" />
340-
<aspect name="to_customer_address" />
341325
</field>
342326
<field name="email">
343327
<aspect name="to_order_address" />
344-
<aspect name="to_customer_address" />
345328
</field>
346329
</fieldset>
347330
<fieldset id="sales_convert_quote_payment">
@@ -501,9 +484,11 @@
501484
</field>
502485
<field name="discount_amount">
503486
<aspect name="to_quote_address_shipping" />
487+
<aspect name="to_cm"/>
504488
</field>
505489
<field name="shipping_amount">
506490
<aspect name="to_quote_address_shipping" />
491+
<aspect name="to_cm"/>
507492
</field>
508493
<field name="shipping_incl_tax">
509494
<aspect name="to_quote_address_shipping" />
@@ -519,12 +504,15 @@
519504
</field>
520505
<field name="base_discount_amount">
521506
<aspect name="to_quote_address_shipping" />
507+
<aspect name="to_cm"/>
522508
</field>
523509
<field name="base_shipping_amount">
524510
<aspect name="to_quote_address_shipping" />
511+
<aspect name="to_cm"/>
525512
</field>
526513
<field name="base_shipping_incl_tax">
527514
<aspect name="to_quote_address_shipping" />
515+
<aspect name="to_cm"/>
528516
</field>
529517
<field name="base_custbalance_amount">
530518
<aspect name="to_quote_address_shipping" />

‎app/code/Magento/SalesRule/etc/fieldset.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,15 @@
1919
<aspect name="to_order" />
2020
</field>
2121
</fieldset>
22+
<fieldset id="sales_convert_order">
23+
<field name="shipping_discount_amount">
24+
<aspect name="to_cm" />
25+
<aspect name="to_quote_address_shipping" />
26+
</field>
27+
<field name="base_shipping_discount_amount">
28+
<aspect name="to_cm" />
29+
<aspect name="to_quote_address_shipping" />
30+
</field>
31+
</fieldset>
2232
</scope>
2333
</config>

‎app/code/Magento/Tax/etc/fieldset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:DataObject/etc/fieldset.xsd">
1010
<scope id="global">
11-
<fieldset id="quote_convert_address">
11+
<fieldset id="sales_convert_quote_address">
1212
<field name="subtotal_incl_tax">
1313
<aspect name="to_order" />
1414
</field>

‎lib/web/fotorama/fotorama.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)