Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2025-08-01 v6.7.3
- Добавлено логирование ошибок при редактировании заказа

## 2025-07-08 v6.7.2
- Скрыта опция Daemon Collector

Expand Down
24 changes: 18 additions & 6 deletions intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
use RetailCrm\Response\ApiResponse;
use Intaro\RetailCrm\Component\ConfigProvider;
use Intaro\RetailCrm\Model\Api\Response\OrdersCreateResponse;
use Intaro\RetailCrm\Model\Api\Response\OrdersEditResponse;

IncludeModuleLangFile(__FILE__);

Expand Down Expand Up @@ -474,9 +475,9 @@ public static function orderSend(
Logger::getInstance()->write($order, 'orderCreate');

$crmBasket = RCrmActions::apiMethod($api, 'cartGet', __METHOD__, $externalId, $site);
$orderResponse = $client->createOrder($order, $site);
$orderCreateResponse = $client->createOrder($order, $site);

if ($orderResponse instanceof OrdersCreateResponse && !$orderResponse->success) {
if ($orderCreateResponse instanceof OrdersCreateResponse && !$orderCreateResponse->success) {

Logger::getInstance()->write([
'methodApi' => 'orderCreate',
Expand All @@ -487,7 +488,7 @@ public static function orderSend(

}

if (!empty($crmBasket['cart']) && $orderResponse instanceof OrdersCreateResponse && !empty($orderResponse->id) ) {
if (!empty($crmBasket['cart']) && $orderCreateResponse instanceof OrdersCreateResponse && !empty($orderResponse->id) ) {
RCrmActions::apiMethod(
$api,
'cartClear',
Expand All @@ -498,20 +499,31 @@ public static function orderSend(
'externalId' => $externalId
],
'order' => [
'id' => $orderResponse->id
'id' => $orderCreateResponse->id
]
],
$site
);
}

return $orderResponse;
return $orderCreateResponse;
}

if ($methodApi === 'ordersEdit') {
Logger::getInstance()->write($order, 'orderEdit');

return $client->editOrder($order, $site);
$orderEditResponse = $client->editOrder($order, $site);

if ($orderEditResponse instanceof OrdersEditResponse && !$orderEditResponse->success) {
Logger::getInstance()->write([
'methodApi' => 'orderEdit',
'errorMsg' => $orderEditResponse->errorMsg ?? '',
'errors' => $orderEditResponse->errors ?? '',
'params' => ['number' => $order['number'], 'externalId' => $order['externalId']]
], 'apiErrors');
}

return $orderEditResponse;
}
}

Expand Down
2 changes: 1 addition & 1 deletion intaro.retailcrm/description.ru
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Скрыта опция Daemon Collector
- Добавлено логирование ошибок при редактировании заказов
4 changes: 2 additions & 2 deletions intaro.retailcrm/install/version.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

$arModuleVersion = [
'VERSION' => '6.7.2',
'VERSION_DATE' => '2025-07-08 15:30:00'
'VERSION' => '6.7.3',
'VERSION_DATE' => '2025-08-01 15:30:00'
];
2 changes: 1 addition & 1 deletion intaro.retailcrm/lib/component/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
class Constants
{
public const MODULE_VERSION = '6.7.2';
public const MODULE_VERSION = '6.7.3';
public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null';
public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-';
public const CRM_USERS_MAP = 'crm_users_map';
Expand Down