From: fomichev Date: Wed, 30 Apr 2025 12:02:50 +0000 (+0300) Subject: Проверка сроков доставки X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=e0152ff5dd6f8163f5dbf2012072ec7485e9d43f;p=erp24_rep%2Fyii-erp24%2F.git Проверка сроков доставки --- diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php index 3fa3a3fe..9fe9157e 100644 --- a/erp24/services/MarketplaceService.php +++ b/erp24/services/MarketplaceService.php @@ -1366,6 +1366,37 @@ class MarketplaceService $marketplaceOrder->save(); $updatedOrdersCount += 1; } + if (!$marketplaceOrder->delivery_to && $marketplaceOrder->readyto_1c === 0) { + $delivery = $order->getDelivery(); + $shipments = $delivery->getShipments(); + if ($shipments) { + foreach ($shipments as $index => $shipment) { + Yii::error("срок доставки: {$index}" . json_encode($shipment, JSON_UNESCAPED_UNICODE)); + } + + $deliveryDateTo = ($shipments[0])->getShipmentDate() ?? null; + $deliveryTimeTo = ($shipments[0])->getShipmentTime() ?? ''; + + if ($deliveryDateTo) { + $datetimeString = str_replace('-', '.', $deliveryDateTo) . ' ' . $deliveryTimeTo; + $timestamp = strtotime($datetimeString); + + if ($timestamp) { + $marketplaceOrder->delivery_to = date('Y-m-d H:i:s', $timestamp); + + if (!$marketplaceOrder->save()) { + Yii::error('Ошибка сохранения сроков доставки: ' . json_encode($marketplaceOrder->getErrors(), JSON_UNESCAPED_UNICODE)); + } else { + $updatedOrdersCount += 1; + } + } else { + Yii::error('Ошибка преобразования даты и времени: ' . $datetimeString); + } + } else { + Yii::error('Отсутствует shipmentDate у первого элемента shipments'); + } + } + } } self::setReadyMarketplaceOrders($marketplaceOrder); }