From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 26 Jun 2026 06:33:10 +0000 (+0300)
Subject: feat: активность магазинов в actionGetStores
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=5136cb1939dd1e6e8bafdb53b6a902060ace73a5;p=erp24_rep%2Fyii-erp24%2F.git

feat: активность магазинов в actionGetStores
---

diff --git a/erp24/api2/controllers/DataTestController.php b/erp24/api2/controllers/DataTestController.php
index d9585471..4783e795 100644
--- a/erp24/api2/controllers/DataTestController.php
+++ b/erp24/api2/controllers/DataTestController.php
@@ -115,8 +115,9 @@ class DataTestController extends BaseController
 
         try {
             $stores = CityStore::find()
-                ->select(['id', 'name'])
-                ->orderBy(['name' => SORT_ASC])
+                ->select(['{{%city_store}}.id', '{{%city_store}}.name', 'csp.is_active'])
+                ->leftJoin('{{%city_store_params}} csp', 'csp.store_id = {{%city_store}}.id')
+                ->orderBy(['{{%city_store}}.name' => SORT_ASC])
                 ->asArray()
                 ->all();
 
@@ -276,7 +277,7 @@ class DataTestController extends BaseController
                         'summ'      => (float)$sale['summ'],
                         'operation' => $sale['operation'],
                         'status'    => $sale['status'],
-                        'skidka'    => (float)$sale['skidka'],
+                        'skidka'    => (float)$sale['skнапиши idka'],
                         'seller_id' => $sale['seller_id'] ?? null,
                         'products'  => []
                     ];