RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-20 01:21:01 +00:00
Code Issues Projects Releases Wiki Activity

fixes for regressions

Browse source
This commit is contained in:
gorokh 2020-02-21 11:48:08 +03:00
parent 4a607f9c29
commit a1b81094d8
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
intaro.retailcrm/classes/general/config/options.xml
View file

@ -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>
</options>

3
intaro.retailcrm/classes/general/config/retailcrm.json
View file

@ -500,6 +500,9 @@
"house": {
"type": "string"
},
"housing": {
"type": "string"
},
"metro": {
"type": "string"
},

4
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View file

@ -1029,6 +1029,10 @@ class RetailCrmHistory
$change['order']['items'] = $items;
}
if ($change['field'] == 'number') {
$orders[$change['order']['id']]['number'] = $change['newValue'];
}
if ($change['order']['payments']) {
$payments = array();
foreach ($change['order']['payments'] as $payment) {

4
intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
View file

@ -258,10 +258,6 @@ class RetailCrmOrder
}
}
$f = fopen($_SERVER["DOCUMENT_ROOT"]."/goev_order_send123456.txt", "a+");
fwrite($f, print_r(array(date('Y-m-d H:i:s'), $order),true));
fclose($f);
$normalizer = new RestNormalizer();
$order = $normalizer->normalize($order, 'orders');