Add new extension attribute - buyer login (#75)

macopedia · Aug 3, 2020 · 2eaa1d9 · 2eaa1d9
1 parent b50ce32
commit 2eaa1d9
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 3 deletions.
diff --git a/Api/Data/CheckoutForm/BuyerInterface.php b/Api/Data/CheckoutForm/BuyerInterface.php
@@ -8,10 +8,12 @@ interface BuyerInterface
     public function setFirstName(string $firstName);
     public function setLastName(string $lastName);
     public function setEmail(string $email);
+    public function setLogin(string $login);
 
     public function getFirstName(): ?string;
     public function getLastName(): ?string;
     public function getEmail(): ?string;
+    public function getLogin(): ?string;
 
     /**
      * @param array $rawData

diff --git a/Block/OriginOrderData.php b/Block/OriginOrderData.php
@@ -18,6 +18,8 @@ class OriginOrderData extends Template
      * @var Registry
      */
     private $registry;
+
+    /* @var \Magento\Sales\Model\Order */
     private $order;
 
     /**
@@ -54,4 +56,12 @@ public function getExternalID()
         // TODO use ExtensionAttributesInterface
         return $this->order->getData('external_id');
     }
+
+    /**
+     * @return mixed
+     */
+    public function getBuyerLogin()
+    {
+        return $this->order->getData('allegro_buyer_login');
+    }
 }
diff --git a/Model/Data/CheckoutForm/Buyer.php b/Model/Data/CheckoutForm/Buyer.php
@@ -11,6 +11,7 @@ class Buyer extends DataObject implements BuyerInterface
     const FIRST_NAME_FIELD_NAME = 'first_name';
     const LAST_NAME_FIELD_NAME = 'last_name';
     const EMAIL_FIELD_NAME = 'email';
+    const LOGIN_FIELD_NAME = 'login';
 
     /**
      * @param string $firstName
@@ -36,6 +37,14 @@ public function setEmail(string $email)
         $this->setData(self::EMAIL_FIELD_NAME, $email);
     }
 
+    /**
+     * @param string $login
+     */
+    public function setLogin(string $login)
+    {
+        $this->setData(self::LOGIN_FIELD_NAME, $login);
+    }
+
     /**
      * @return string|null
      */
@@ -60,6 +69,14 @@ public function getEmail(): ?string
         return $this->getData(self::EMAIL_FIELD_NAME);
     }
 
+    /**
+     * @return string|null
+     */
+    public function getLogin(): ?string
+    {
+        return $this->getData(self::LOGIN_FIELD_NAME);
+    }
+
     /**
      * @param array $rawData
      */
@@ -74,5 +91,9 @@ public function setRawData(array $rawData)
         if (isset($rawData['email'])) {
             $this->setEmail($rawData['email']);
         }
+
+        if (isset($rawData['login'])) {
+            $this->setLogin($rawData['login']);
+        }
     }
 }
diff --git a/Model/OrderImporter/Creator.php b/Model/OrderImporter/Creator.php
@@ -137,6 +137,7 @@ public function execute(CheckoutFormInterface $checkoutForm)
         }
         $cartExtension->setExternalId($checkoutForm->getId());
         $cartExtension->setOrderFrom(OriginOfOrder::ALLEGRO);
+        $cartExtension->setAllegroBuyerLogin($checkoutForm->getBuyer()->getLogin());
         $quote->setExtensionAttributes($cartExtension);
 
         $quote->setAllegroShippingPrice($checkoutForm->getDelivery()->getCost()->getAmount());

diff --git a/Observer/CopyFieldsFromQuoteToOrderObserver.php b/Observer/CopyFieldsFromQuoteToOrderObserver.php
@@ -39,6 +39,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($cartExtensions) {
             $order->setData('external_id', $cartExtensions->getExternalId());
             $order->setData('order_from', $cartExtensions->getOrderFrom());
+            $order->setData('allegro_buyer_login', $cartExtensions->getAllegroBuyerLogin());
         }
 
         $this->objectCopyService->copyFieldsetToTarget('sales_convert_quote', 'to_order', $quote, $order);

diff --git a/etc/db_schema.xml b/etc/db_schema.xml
@@ -4,18 +4,21 @@
         <column xsi:type="varchar" length="255" name="order_from" nullable="true" comment="Where the order comes from"/>
         <column xsi:type="varchar" length="255" name="external_id" nullable="true" comment="External order ID"/>
         <column xsi:type="varchar" length="255" name="external_guid" nullable="true" comment="External order GUID"/>
+        <column xsi:type="varchar" length="255" name="allegro_buyer_login" nullable="true" comment="Allegro buyer login"/>
     </table>
 
     <table name="sales_order_grid">
         <column xsi:type="varchar" length="255" name="order_from" nullable="true" comment="Where the order comes from"/>
         <column xsi:type="varchar" length="255" name="external_id" nullable="true" comment="External order ID"/>
         <column xsi:type="varchar" length="255" name="external_guid" nullable="true" comment="External order GUID"/>
+        <column xsi:type="varchar" length="255" name="allegro_buyer_login" nullable="true" comment="Allegro buyer login"/>
     </table>
 
     <table name="quote">
         <column xsi:type="varchar" length="255" name="order_from" nullable="true" comment="Where the order comes from"/>
         <column xsi:type="varchar" length="255" name="external_id" nullable="true" comment="External order ID"/>
         <column xsi:type="varchar" length="255" name="external_guid" nullable="true" comment="External order GUID"/>
+        <column xsi:type="varchar" length="255" name="allegro_buyer_login" nullable="true" comment="Allegro buyer login"/>
     </table>
 
     <table name="sales_order_item">

diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
@@ -3,21 +3,24 @@
         "column": {
             "order_from": true,
             "external_id": true,
-            "external_guid": true
+            "external_guid": true,
+            "allegro_buyer_login": true
         }
     },
     "sales_order_grid": {
         "column": {
             "order_from": true,
             "external_id": true,
-            "external_guid": true
+            "external_guid": true,
+            "allegro_buyer_login": true
         }
     },
     "quote": {
         "column": {
             "order_from": true,
             "external_id": true,
-            "external_guid": true
+            "external_guid": true,
+            "allegro_buyer_login": true
         }
     },
     "sales_order_item": {

diff --git a/etc/di.xml b/etc/di.xml
@@ -92,6 +92,7 @@
             <argument name="columns" xsi:type="array">
                 <item name="external_id" xsi:type="string">sales_order.external_id</item>
                 <item name="order_from" xsi:type="string">sales_order.order_from</item>
+                <item name="allegro_buyer_login" xsi:type="string">sales_order.allegro_buyer_login</item>
             </argument>
         </arguments>
     </virtualType>

diff --git a/etc/extension_attributes.xml b/etc/extension_attributes.xml
@@ -4,11 +4,13 @@
     <extension_attributes for="Magento\Quote\Api\Data\CartInterface">
         <attribute code="order_from" type="string"/>
         <attribute code="external_id" type="string"/>
+        <attribute code="allegro_buyer_login" type="string"/>
     </extension_attributes>
 
     <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
         <attribute code="order_from" type="string"/>
         <attribute code="external_id" type="string"/>
+        <attribute code="allegro_buyer_login" type="string"/>
     </extension_attributes>
 
     <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">

diff --git a/etc/fieldset.xml b/etc/fieldset.xml
@@ -8,6 +8,9 @@
             <field name="order_from">
                 <aspect name="to_order" />
             </field>
+            <field name="allegro_buyer_login">
+                <aspect name="to_order" />
+            </field>
         </fieldset>
     </scope>
 </config>
diff --git a/i18n/pl_PL.csv b/i18n/pl_PL.csv
@@ -162,3 +162,4 @@
 "Product SKU","SKU produktu"
 "Reservation ID","ID rezerwacji"
 "Reservations enabled","Rezerwacje włączone"
+"Buyer login","Login kupującego"
diff --git a/view/adminhtml/templates/origin_order_data.phtml b/view/adminhtml/templates/origin_order_data.phtml
@@ -13,4 +13,6 @@
         <?= $block->escapeHtml($block->getOrderOrigin()) ?></p>
     <p><strong><?= $block->escapeHtml(__('External ID')) ?></strong>:
         <?= $block->escapeHtml($block->getExternalId()) ?></p>
+    <p><strong><?= $block->escapeHtml(__('Buyer login')) ?></strong>:
+        <?= $block->escapeHtml($block->getBuyerLogin()) ?></p>
 <?php endif ?>
diff --git a/view/adminhtml/ui_component/sales_order_grid.xml b/view/adminhtml/ui_component/sales_order_grid.xml
@@ -21,5 +21,14 @@
                 </item>
             </argument>
         </column>
+        <column name="allegro_buyer_login">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="label" xsi:type="string" translate="true">Buyer login</item>
+                </item>
+            </argument>
+        </column>
     </columns>
 </listing>