Кнопка по успеху и правки чеков

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index 09163194477345e0d37468d38821346f1d37388b..07c89f4296f8ce480be80e774cc0741d53c90063 100644 (file)
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -654,7 +654,7 @@ class MarketplaceOrdersController extends Controller
     {
         $model = $this->findModel($id);
 
-        if ($model->status->code !== 'PROCESSING') {
+        if ($model->status->code !== 'DELIVERY') {
             Yii::$app->session->setFlash('error', 'Невозможно обновить статус заказа, так как он не находится в состоянии PROCESSING.');
             return $this->redirect(['index']);
         }

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 4ed103b1b26692671d128c96eaca8f5d20f2c49b..83bf3664e40ef0f7df6a42760bfc8c0c523ebb5f 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2485,7 +2485,6 @@ class MarketplaceService
             $createChecks = new CreateChecks;
             $createChecks->order_guid = $marketplaceOrder->guid;
             $createChecks->marketplace_order_id = $marketplaceOrder->marketplace_order_id;
-            $createChecks->order_id = (int)$marketplaceOrder->marketplace_order_id;
 
             $eit = ExportImportTable::find()
                 ->select(['export_val'])

diff --git a/erp24/views/marketplace-orders/index.php b/erp24/views/marketplace-orders/index.php
index 92732abd71eaae0ede4f5805b324850a6ec64428..a2461d54960e917e884d15bcab67243dda1884bc 100644 (file)
--- a/erp24/views/marketplace-orders/index.php
+++ b/erp24/views/marketplace-orders/index.php
@@ -113,10 +113,10 @@ YiiAsset::register($this);
                     $cancelUrl = Url::to(['update-to-cancelled-status', 'id' => $model->id]);
                     $output = Html::tag('span', $status, ['class' => "badge $class"]);
                     $output .= '<div class="mt-2">';
-                    if ($status === 'PROCESSING' && Yii::$app->user->identity->group_id == 81) {
-                        if ($substatus === 'STARTED') {
+                    if (in_array($status ,['PROCESSING', 'DELIVERY']) && Yii::$app->user->identity->group_id == 81) {
+                        if ($status === 'DELIVERY') {
                             $output .= '<div class="mt-2">' .
-                                Html::a('Ð\93оÑ\82ов', $readyUrl, [
+                                Html::a('УÑ\81пеÑ\85 из Ð\9cÐ\9f', $readyUrl, [
                                     'class' => 'btn btn-sm btn-success',
                                     'data-method' => 'post',
                                     'data-confirm' =>