From 1a8340e0e4f7f5ef16cb9b92341b4c017a39e23f Mon Sep 17 00:00:00 2001
From: gorokh <gorokh@retailcrm.ru>
Date: Tue, 24 Dec 2019 16:35:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B5=D0=BD=D0=B8=D0=B5/=D0=BA=D0=BE=D1=80=D0=BF=D1=83?=
 =?UTF-8?q?=D1=81=20=D0=BD=D0=B0=20=D0=B4=D0=B2=D0=B0=20=D0=BE=D1=82=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classes/general/config/objects.xml        | 21 ++++++++++---------
 .../classes/general/config/options.xml        |  9 ++++----
 .../classes/general/config/retailcrm.json     |  3 +++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/intaro.retailcrm/classes/general/config/objects.xml b/intaro.retailcrm/classes/general/config/objects.xml
index eacca5d8..e2d10b08 100644
--- a/intaro.retailcrm/classes/general/config/objects.xml
+++ b/intaro.retailcrm/classes/general/config/objects.xml
@@ -14,7 +14,7 @@
         <field id="cumulative_discount" group="customer">cumulativeDiscount</field>
         <field id="personal_discount" group="customer">personalDiscount</field>
         <field id="discount_card_number" group="customer">discountCardNumber</field>
-        
+
         <field id="address.index" group="customerAddress">index</field>
         <field id="address.country" group="customerAddress">countryIso</field>
         <field id="address.region" group="customerAddress">region</field>
@@ -28,7 +28,7 @@
         <field id="address.intercom_code" group="customerAddress">intercomCode</field>
         <field id="address.metro" group="customerAddress">metro</field>
         <field id="address.notes" group="customerAddress">notes</field>
-        
+
         <field id="contragent.contragent_type" group="customerContragent">contragentType</field>
         <field id="contragent.legal_name" group="customerContragent">legalName</field>
         <field id="contragent.legal_address" group="customerContragent">legalAddress</field>
@@ -38,7 +38,7 @@
         <field id="contragent.bank_address" group="customerContragent">bankAddress</field>
         <field id="contragent.corr_account" group="customerContragent">corrAccount</field>
         <field id="contragent.bank_account" group="customerContragent">bankAccount</field>
-        
+
         <field id="id" group="order">id</field>
         <field id="created_at" group="order">createdAt</field>
         <field id="order_type" group="order">orderType</field>
@@ -52,7 +52,7 @@
         <field id="patronymic" group="order">patronymic</field>
         <field id="phone" group="order">phone</field>
         <field id="additional_phone" group="order">additionalPhone</field>
-        <field id="email" group="order">email</field> 
+        <field id="email" group="order">email</field>
         <field id="payment_type" group="order">paymentType</field>
         <field id="payment_status" group="order">paymentStatus</field>
         <field id="discount" group="order">discount</field>
@@ -64,7 +64,7 @@
         <field id="shipment_date" group="order">shipmentDate</field>
         <field id="shipped" group="order">shipped</field>
         <!--<field id="order_product" group="order">item</field>-->
-        
+
         <field id="order_product.id" group="item">id</field>
         <field id="order_product.initial_price" group="item">initialPrice</field>
         <field id="order_product.discount" group="item">discount</field>
@@ -72,20 +72,20 @@
         <field id="order_product.quantity" group="item">quantity</field>
         <field id="order_product.status" group="item">status</field>
         <field id="order_product.discount_total" group="item">discountTotal</field>
-        
+
         <field id="payments.status" group="payment">status</field>
         <field id="payments.type" group="payment">type</field>
         <field id="payments.external_id" group="payment">externalId</field>
         <field id="payments.amount" group="payment">amount</field>
         <field id="payments.comment" group="payment">comment</field>
-        
+
         <field id="delivery_type" group="delivery">code</field>
         <field id="delivery_service" group="delivery">service</field>
         <field id="delivery_date" group="delivery">date</field>
         <field id="delivery_time" group="delivery">time</field>
         <field id="delivery_cost" group="delivery">cost</field>
         <field id="delivery_net_cost" group="delivery">netCost</field>
-        
+
         <field id="delivery_address.country" group="orderAddress">country</field>
         <field id="delivery_address.index" group="orderAddress">index</field>
         <field id="delivery_address.region" group="orderAddress">region</field>
@@ -93,15 +93,16 @@
         <field id="delivery_address.street" group="orderAddress">street</field>
         <field id="delivery_address.building" group="orderAddress">building</field>
         <field id="delivery_address.house" group="orderAddress">house</field>
+        <field id="delivery_address.housing" group="orderAddress">housing</field>
         <field id="delivery_address.block" group="orderAddress">block</field>
         <field id="delivery_address.flat" group="orderAddress">flat</field>
         <field id="delivery_address.floor" group="orderAddress">floor</field>
         <field id="delivery_address.intercom_code" group="orderAddress">intercomCode</field>
         <field id="delivery_address.metro" group="orderAddress">metro</field>
         <field id="delivery_address.notes" group="orderAddress">notes</field>
-        
+
         <field id="integration_delivery_data.status" group="integrationDelivery">status</field>
         <field id="integration_delivery_data.track_number" group="integrationDelivery">trackNumber</field>
         <field id="integration_delivery_data.courier" group="integrationDelivery">courier</field>
     </fields>
-</options>
\ No newline at end of file
+</options>
diff --git a/intaro.retailcrm/classes/general/config/options.xml b/intaro.retailcrm/classes/general/config/options.xml
index 789cb31d..29a7d98d 100644
--- a/intaro.retailcrm/classes/general/config/options.xml
+++ b/intaro.retailcrm/classes/general/config/options.xml
@@ -18,7 +18,8 @@
         <field id="intercomcode">Домофон</field>
         <field id="floor">Этаж</field>
         <field id="block">Подъезд</field>
-        <field id="house">Строение / корпус</field>
+        <field id="house">Строение</field>
+        <field id="housing">Корпус</field>
 
         <field id="legalName" group="legal-entity, enterpreneur">Полное наименование</field>
         <field id="legalAddress" group="legal-entity, enterpreneur">Адрес регистрации (Юридический адрес)</field>
@@ -29,13 +30,13 @@
         <field id="bankAddress" group="legal-entity, enterpreneur">Адрес банка</field>
         <field id="corrAccount" group="legal-entity, enterpreneur">Корреспондентский счет</field>
         <field id="bankAccount" group="legal-entity, enterpreneur">Расчетный счет</field>
-        
+
         <field id="KPP" group="legal-entity">КПП</field>
         <field id="OGRN" group="legal-entity">ОГРН</field>
-        
+
         <field id="OGRNIP" group="enterpreneur">ОГРНИП</field>
         <field id="certificateNumber" group="enterpreneur">Номер свидетельства</field>
         <field id="certificateDate" group="enterpreneur">Дата свидетельства</field>
 
     </fields>
-</options>
\ No newline at end of file
+</options>
diff --git a/intaro.retailcrm/classes/general/config/retailcrm.json b/intaro.retailcrm/classes/general/config/retailcrm.json
index 02d708b2..8194eb2f 100644
--- a/intaro.retailcrm/classes/general/config/retailcrm.json
+++ b/intaro.retailcrm/classes/general/config/retailcrm.json
@@ -453,6 +453,9 @@
         "house": {
             "type": "string"
         },
+        "housing": {
+            "type": "string"
+        },
         "metro": {
             "type": "string"
         },