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

v.2.3.2

Browse source
This commit is contained in:
Akolzin Dmitry 2018-01-12 10:31:11 +03:00
parent 4fa3b1e5fc
commit 7f94305d61
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
## 2017-12-27 v.2.3.2
* Исправлен баг с рассчетом суммы заказа
* Добавлен перехват исключения при редактировании отгруженной доставки
## 2017-12-27 v.2.3.1
* Исправлены мелкие баги и недочеты

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

@ -402,7 +402,7 @@ class RetailCrmHistory
if (!is_object($newOrder) || !$newOrder instanceof \Bitrix\Sale\Order) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'Bitrix\Sale\Order::create', 'Error order create');
continue;;
continue;
}
$externalId = $newOrder->getId();
@ -696,7 +696,6 @@ class RetailCrmHistory
$orderSumm += $deliverySumm;
$newOrder->setField('PRICE', $orderSumm);
$order['summ'] = $orderSumm;
//payment
@ -731,6 +730,7 @@ class RetailCrmHistory
unset($orderCrm);
}
$newOrder->setField('PRICE', $orderSumm);
$newOrder->save();
if ($newHistoryPayments) {
@ -1022,7 +1022,7 @@ class RetailCrmHistory
*
* @param object $order
*
* @return void
* @return void | boolean
*/
public static function shipmentItemReset($order)
{
@ -1032,7 +1032,14 @@ class RetailCrmHistory
foreach ($shipmentCollection as $shipment) {
if (!$shipment->isSystem()) {
$shipmentItemColl = $shipment->getShipmentItemCollection();
$shipmentItemColl->resetCollection($basket);
try {
$shipmentItemColl->resetCollection($basket);
} catch (\Bitrix\Main\NotSupportedException $NotSupportedException) {
RCrmActions::eventLog('RetailCrmHistory::shipmentItemReset', '\Bitrix\Sale\ShipmentItemCollection::resetCollection()', $NotSupportedException->getMessage());
return false;
}
}
}
}

3
intaro.retailcrm/description.ru
View file

@ -1 +1,2 @@
- Исправлены мелкие баги и недочеты
- Исправлен баг с рассчетом суммы заказа
- Добавлен перехват исключения при редактировании отгруженной доставки

4
intaro.retailcrm/install/version.php
View file

@ -1,5 +1,5 @@
<?
$arModuleVersion = array(
"VERSION" => "2.3.1",
"VERSION_DATE" => "2017-12-27 10:00:00"
"VERSION" => "2.3.2",
"VERSION_DATE" => "2017-01-12 10:30:00"
);