фикс удаления

diff --git a/erp24/controllers/SupplierController.php b/erp24/controllers/SupplierController.php
index 3c9a529f9e8915d4bed60cfd0a0352bcee210d2f..db098bbb0da8199bcb26bc9fd5b5e25e247f903e 100644 (file)
--- a/erp24/controllers/SupplierController.php
+++ b/erp24/controllers/SupplierController.php
@@ -144,7 +144,7 @@ class SupplierController extends BaseController
             return $this->asJson([
                 'success' => true,
                 'message' => sprintf(
-                    'Ð\9fоÑ\81Ñ\82авÑ\89ик "%s" деакÑ\82ивиÑ\80ован. СвÑ\8fзаннÑ\8bÑ\85 запиÑ\81ей: маÑ\80киÑ\80овки â\80\94 %d, маппинги â\80\94 %d.',
+                    'Ð\9fоÑ\81Ñ\82авÑ\89ик "%s" деакÑ\82ивиÑ\80ован. Ð\9cаÑ\80киÑ\80овки: %d, маппинги: %d.',
                     $model->name,
                     $result['markings'],
                     $result['product_mappings']

diff --git a/erp24/records/ProductMapping.php b/erp24/records/ProductMapping.php
index 1f7fc44e2ff909ffabd20d38ce5f2db460b6a271..7c3526e31356ef0bdd57b9850f2fd5af44849549 100644 (file)
--- a/erp24/records/ProductMapping.php
+++ b/erp24/records/ProductMapping.php
@@ -23,6 +23,7 @@ use yii\db\Expression;
  * @property string|null $article
  * @property string|null $barcode
  * @property int $quant                   Кратность заказа (>=1)
+ * @property bool $is_active
  * @property int $created_by
  * @property int|null $updated_by
  * @property string $created_at
@@ -97,6 +98,8 @@ class ProductMapping extends ActiveRecord
             ],
             ['supplier_id', 'validatePartialUnique'],
             [['article', 'barcode', 'plantation_id'], 'default', 'value' => null],
+            ['is_active', 'boolean'],
+            ['is_active', 'default', 'value' => true],
             ['marking_ids', 'each', 'rule' => ['integer']],
             ['marking_ids', 'default', 'value' => []],
         ];
@@ -113,6 +116,7 @@ class ProductMapping extends ActiveRecord
             'article' => 'Артикул',
             'barcode' => 'Штрихкод',
             'quant' => 'Квант',
+            'is_active' => 'Статус',
             'marking_ids' => 'Маркировки',
         ];
     }

diff --git a/erp24/records/Supplier.php b/erp24/records/Supplier.php
index 71cfb424ee15b8b16a7d4c99b4fbf32f47d931c5..73c7531bd137e2d19232775520905a022299907c 100644 (file)
--- a/erp24/records/Supplier.php
+++ b/erp24/records/Supplier.php
@@ -167,13 +167,13 @@ class Supplier extends ActiveRecord
                 ->execute();
 
             $mappingsCount = (int)Yii::$app->db->createCommand()
-                ->update('{{%erp24.product_mappings}}', ['deleted_at' => new Expression('NOW()')], ['supplier_id' => $this->id, 'deleted_at' => null])
+                ->update('{{%erp24.product_mappings}}', ['is_active' => false], ['supplier_id' => $this->id, 'is_active' => true])
                 ->execute();
 
             $transaction->commit();
 
             return [
-                'markings' => $markingsCount,
+                'markings'        => $markingsCount,
                 'product_mappings' => $mappingsCount,
             ];
         } catch (\Exception $e) {