From 5136cb1939dd1e6e8bafdb53b6a902060ace73a5 Mon Sep 17 00:00:00 2001 From: fomichev Date: Fri, 26 Jun 2026 09:33:10 +0300 Subject: [PATCH] =?utf8?q?feat:=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD?= =?utf8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=BC=D0=B0=D0=B3=D0=B0=D0=B7=D0=B8?= =?utf8?q?=D0=BD=D0=BE=D0=B2=20=D0=B2=20actionGetStores?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataTestController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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' => [] ]; -- 2.39.5