From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 22 Apr 2025 08:44:46 +0000 (+0300)
Subject: Доставка и сортировка
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b9d72555fea4cad6f7a862ce674e4defa36dfbf6;p=erp24_rep%2Fyii-erp24%2F.git

Доставка и сортировка
---

diff --git a/erp24/controllers/MarketplaceOrderDeliveryController.php b/erp24/controllers/MarketplaceOrderDeliveryController.php
index c3fe9d12..b74317c0 100644
--- a/erp24/controllers/MarketplaceOrderDeliveryController.php
+++ b/erp24/controllers/MarketplaceOrderDeliveryController.php
@@ -41,6 +41,10 @@ class MarketplaceOrderDeliveryController extends Controller
         $searchModel = new MarketplaceOrderDeliverySearch();
         $dataProvider = $searchModel->search($this->request->queryParams);
 
+        $dataProvider->sort->defaultOrder = [
+            'order_id' => SORT_DESC,
+        ];
+
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
diff --git a/erp24/controllers/MarketplaceOrderItemsController.php b/erp24/controllers/MarketplaceOrderItemsController.php
index d9ff24f5..574abbc0 100644
--- a/erp24/controllers/MarketplaceOrderItemsController.php
+++ b/erp24/controllers/MarketplaceOrderItemsController.php
@@ -41,6 +41,10 @@ class MarketplaceOrderItemsController extends Controller
         $searchModel = new MarketplaceOrderItemsSearch();
         $dataProvider = $searchModel->search($this->request->queryParams);
 
+        $dataProvider->sort->defaultOrder = [
+            'order_id' => SORT_DESC,
+        ];
+
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
diff --git a/erp24/controllers/MarketplaceOrderStatusHistoryController.php b/erp24/controllers/MarketplaceOrderStatusHistoryController.php
index d39e4824..40b97ea2 100644
--- a/erp24/controllers/MarketplaceOrderStatusHistoryController.php
+++ b/erp24/controllers/MarketplaceOrderStatusHistoryController.php
@@ -41,6 +41,10 @@ class MarketplaceOrderStatusHistoryController extends Controller
         $searchModel = new MarketplaceOrderStatusHistorySearch();
         $dataProvider = $searchModel->search($this->request->queryParams);
 
+        $dataProvider->sort->defaultOrder = [
+            'order_id' => SORT_DESC,
+        ];
+
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index 03cb3586..9fb4e5ae 100644
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -184,11 +184,57 @@ class MarketplaceOrdersController extends Controller
                     $orderItem->subsidies = null;
                     if (!$orderItem->save()) {
                         Yii::error(
-                            'Ошибка сохранения элеиента: ' . json_encode($orderItem->getErrors(), JSON_UNESCAPED_UNICODE)
+                            'Ошибка сохранения элемента: ' . json_encode($orderItem->getErrors(), JSON_UNESCAPED_UNICODE)
+                        );
+                        Yii::$app->session->setFlash(
+                            'error',
+                            'Ошибка создания доставки заказа: ' . json_encode($orderItem->getErrors(), JSON_UNESCAPED_UNICODE)
                         );
                     }
                 }
 
+                $marketplaceOrderDelivery = new MarketplaceOrderDelivery();
+                $marketplaceOrderDelivery->order_id = $m->id;
+                $marketplaceOrderDelivery->country = 'Россия';
+                $marketplaceOrderDelivery->postcode = null;
+                $marketplaceOrderDelivery->apartment = null;
+                $marketplaceOrderDelivery->courier_full_name = null;
+                $marketplaceOrderDelivery->courier_phone = null;
+                $marketplaceOrderDelivery->courier_extension = null;
+                $marketplaceOrderDelivery->courier_vehicle_number = null;
+                $marketplaceOrderDelivery->courier_vehicle_description = null;
+
+                $marketplaceOrderDelivery->type = 'DELIVERY';
+                $marketplaceOrderDelivery->service_name = 'FLOWWOW';
+                $marketplaceOrderDelivery->partner_type = 'FLOWWOW';
+                $marketplaceOrderDelivery->delivery_start = date(  'Y-m-d H:i:s' );
+                $marketplaceOrderDelivery->delivery_end = date(  'Y-m-d H:i:s', strtotime("+1 days", strtotime($marketplaceOrderDelivery->delivery_start)));
+
+
+                $address = [
+                    'city' => 'Нижний Новгород',
+                    'street' => 'Речная улица',
+                    'house' => '22',
+                    'latitude' => 56.3269,
+                     'longitude' =>  44.0042,
+                ];
+                $marketplaceOrderDelivery->city = $address['city'];
+                $marketplaceOrderDelivery->street = $address['street'];
+                $marketplaceOrderDelivery->house = $address['house'];
+                $marketplaceOrderDelivery->latitude = $address['latitude'];
+                $marketplaceOrderDelivery->longitude = $address['longitude'];
+
+                if (!$marketplaceOrderDelivery->save()) {
+                    Yii::$app->session->setFlash(
+                        'error',
+                        'Ошибка создания доставки заказа: ' . json_encode($marketplaceOrderDelivery->getErrors(), JSON_UNESCAPED_UNICODE)
+                    );
+                    Yii::error(
+                        'Ошибка сохранения доставки: ' . json_encode($marketplaceOrderDelivery->getErrors(), JSON_UNESCAPED_UNICODE)
+                    );
+                }
+
+
 
                 Yii::$app->session->setFlash('success', "Тестовый заказ Flowwow #{$orderNumber} создан");
             } else {