ERP-329 Новый интерфейс для работы с заказами мп и амо

diff --git a/erp24/records/OrdersUnion.php b/erp24/records/OrdersUnion.php
index 6e16f18369a345a7381f961091425a6158064275..51922f1e8d406ed03fad000072031fb5b3750840 100644 (file)
--- a/erp24/records/OrdersUnion.php
+++ b/erp24/records/OrdersUnion.php
@@ -8,6 +8,7 @@ use yii\db\Query;
 class OrdersUnion extends ActiveRecord
 {
     public $delivery_date;
+    public $source_id;
     public $delivery_address;
     public const AMO = 'amo';
     public const MARKETPLACE = 'marketplace';
@@ -29,6 +30,7 @@ class OrdersUnion extends ActiveRecord
             ->select([
                 new \yii\db\Expression("'amo' AS source"),
                 'id',
+                'CAST(id AS VARCHAR(64)) AS source_id',
                 'delivery_date',
                 'status_id',
                 new \yii\db\Expression('NULLIF(store_id, \'\')::INTEGER AS store_id'),
@@ -56,6 +58,7 @@ class OrdersUnion extends ActiveRecord
                 ELSE 'Marketplace' 
             END AS source"),
                 'mo.id',
+                'mo.marketplace_order_id as source_id',
                 'mod.delivery_end AS delivery_date',
                 'mo.status_id',
                 'mo.store_id',

diff --git a/erp24/views/marketplace-orders/all-orders.php b/erp24/views/marketplace-orders/all-orders.php
index 8d3a342c0b678a3b14daafddffb2788eb7539bd1..d41cafd40b6b095f0660476d364bc08ea29770a8 100644 (file)
--- a/erp24/views/marketplace-orders/all-orders.php
+++ b/erp24/views/marketplace-orders/all-orders.php
@@ -1,10 +1,10 @@
 <?php
 
 use app\records\OrdersUnion;
+use dosamigos\datetimepicker\DateTimePicker;
 use OpenAPI\Client\Model\OrderPaymentMethodType;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use kartik\date\DatePicker;
 use kartik\select2\Select2;
 use yii\grid\GridView;
 use yii_app\records\CityStore;
@@ -38,13 +38,17 @@ $this->registerJsFile('/js/marketplace-orders/marketplace-orders.js', ['position
             </div>
             <div class="col-md-4">
 
-                <?= DatePicker::widget([
+                <?= DateTimePicker::widget([
                     'name' => 'delivery_date',
                     'value' => Yii::$app->request->get('delivery_date'),
                     'options' => ['placeholder' => 'Выберите дату'],
-                    'pluginOptions' => [
-                        'format' => 'yyyy-mm-dd',
+                    'language' => 'ru',
+                    'template' => '{input}',
+                    'clientOptions' => [
+                        'format' => 'Y-m-d',
                         'autoclose' => true,
+                        'todayBtn' => true,
+                        'minView' => 2,
                     ],
                 ]); ?>
             </div>
@@ -71,6 +75,10 @@ $this->registerJsFile('/js/marketplace-orders/marketplace-orders.js', ['position
         'dataProvider' => $dataProvider,
         'columns' => [
             'id',
+            [
+                'attribute' => 'source_id',
+                'label' => 'ID в источнике',
+            ],
             [
                 'attribute' => 'source',
                 'label' => 'Источник',