From: marina Date: Tue, 4 Feb 2025 07:53:49 +0000 (+0300) Subject: ERP-302 Редактирование букета X-Git-Tag: 1.7~20^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d0930f31f253c6cdf3b6e4ab40e23abfa354d85b;p=erp24_rep%2Fyii-erp24%2F.git ERP-302 Редактирование букета --- diff --git a/erp24/actions/dashboard/SalesAction.php b/erp24/actions/dashboard/SalesAction.php index 23b6d87b..670f9f2f 100755 --- a/erp24/actions/dashboard/SalesAction.php +++ b/erp24/actions/dashboard/SalesAction.php @@ -140,7 +140,7 @@ class SalesAction extends Action ->leftJoin(['a' => 'admin'], 't.admin_id = a.id') ->leftJoin('export_import_table e', 'entity_id = t.store_id and entity = \'city_store\'') ->where(['=', 'date', $date1]) - ->andWhere(['active' => 1]) + ->andWhere(['t.active' => 1]) ->select([ 'e.export_val AS store_id', new \yii\db\Expression(