Merge pull request #167 from magento-vanilla/PR

[Vanilla+FireDrakes] Bug fixes
magento · Nov 12, 2015 · 1ee1a3e · 1ee1a3e
2 parents f1c07c5 + 923fcaf
commit 1ee1a3e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 26 deletions.
diff --git a/app/code/Magento/GiftMessage/etc/fieldset.xml b/app/code/Magento/GiftMessage/etc/fieldset.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:DataObject/etc/fieldset.xsd">
     <scope id="global">
-        <fieldset id="quote_convert_address">
+        <fieldset id="sales_convert_quote_address">
             <field name="gift_message_id">
                 <aspect name="to_order" />
             </field>

diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
@@ -63,7 +63,7 @@ public function __construct(
     public function convert(Address $object, $data = [])
     {
         $orderData = $this->objectCopyService->getDataFromFieldset(
-            'quote_convert_address',
+            'sales_convert_quote_address',
             'to_order',
             $object
         );

diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
@@ -56,7 +56,7 @@ public function convert(Address $object, $data = [])
         $orderAddress = $this->orderAddressRepository->create();
 
         $orderAddressData = $this->objectCopyService->getDataFromFieldset(
-            'quote_convert_address',
+            'sales_convert_quote_address',
             'to_order_address',
             $object
         );

diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderAddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderAddressTest.php
@@ -69,7 +69,7 @@ public function testConvert()
          */
         $object = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
         $this->objectCopyMock->expects($this->once())->method('getDataFromFieldset')->with(
-            'quote_convert_address',
+            'sales_convert_quote_address',
             'to_order_address',
             $object
         )->willReturn($orderData);

diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/ToOrderTest.php
@@ -82,7 +82,7 @@ public function testConvert()
         $quote->expects($this->once())->method('getId')->willReturn($quoteId);
         $quote->expects($this->once())->method('getStoreId')->willReturn($storeId);
         $this->objectCopyMock->expects($this->once())->method('getDataFromFieldset')->with(
-            'quote_convert_address',
+            'sales_convert_quote_address',
             'to_order',
             $object
         )->willReturn($orderData);

diff --git a/app/code/Magento/Quote/etc/fieldset.xml b/app/code/Magento/Quote/etc/fieldset.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:DataObject/etc/fieldset.xsd">
     <scope id="global">
-        <fieldset id="quote_convert_address">
+        <fieldset id="sales_convert_quote_address">
             <field name="weight">
                 <aspect name="to_order" />
             </field>

diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml
@@ -283,65 +283,48 @@
             </field>
             <field name="prefix">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="firstname">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="middlename">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="lastname">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="suffix">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="company">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="street">
                 <aspect name="to_order_address" />
             </field>
-            <field name="street">
-                <aspect name="to_customer_address" />
-            </field>
             <field name="city">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="region">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="region_id">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="postcode">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="country_id">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="telephone">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="fax">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
             <field name="email">
                 <aspect name="to_order_address" />
-                <aspect name="to_customer_address" />
             </field>
         </fieldset>
         <fieldset id="sales_convert_quote_payment">
@@ -501,9 +484,11 @@
             </field>
             <field name="discount_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="shipping_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="shipping_incl_tax">
                 <aspect name="to_quote_address_shipping" />
@@ -519,12 +504,15 @@
             </field>
             <field name="base_discount_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="base_shipping_amount">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="base_shipping_incl_tax">
                 <aspect name="to_quote_address_shipping" />
+                <aspect name="to_cm"/>
             </field>
             <field name="base_custbalance_amount">
                 <aspect name="to_quote_address_shipping" />

diff --git a/app/code/Magento/SalesRule/etc/fieldset.xml b/app/code/Magento/SalesRule/etc/fieldset.xml
@@ -19,5 +19,15 @@
                 <aspect name="to_order" />
             </field>
         </fieldset>
+        <fieldset id="sales_convert_order">
+            <field name="shipping_discount_amount">
+                <aspect name="to_cm" />
+                <aspect name="to_quote_address_shipping" />
+            </field>
+            <field name="base_shipping_discount_amount">
+                <aspect name="to_cm" />
+                <aspect name="to_quote_address_shipping" />
+            </field>
+        </fieldset>
     </scope>
 </config>
diff --git a/app/code/Magento/Tax/etc/fieldset.xml b/app/code/Magento/Tax/etc/fieldset.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:DataObject/etc/fieldset.xsd">
     <scope id="global">
-        <fieldset id="quote_convert_address">
+        <fieldset id="sales_convert_quote_address">
             <field name="subtotal_incl_tax">
                 <aspect name="to_order" />
             </field>

diff --git a/lib/web/fotorama/fotorama.min.js b/lib/web/fotorama/fotorama.min.js