From: Alexander Smirnov Date: Tue, 4 Jun 2024 09:53:39 +0000 (+0300) Subject: fix part 008 X-Git-Tag: 1.2^2~7^2~1 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=84a863609a638406ae1732d90a7ecf314e34ab6f;p=erp24_rep%2Fyii-erp24%2F.git fix part 008 --- diff --git a/erp24/controllers/EmployeeSalesReportController.php b/erp24/controllers/EmployeeSalesReportController.php index c3cb8174..f95844c8 100644 --- a/erp24/controllers/EmployeeSalesReportController.php +++ b/erp24/controllers/EmployeeSalesReportController.php @@ -84,7 +84,7 @@ class EmployeeSalesReportController extends Controller { $returns = Sales::find()->where(['operation' => Sales::OPERATION_RETURN, 'sales_check' => $salesIds])->all(); $returnIds = ArrayHelper::getColumn($returns, 'sales_check'); - $shift = $model->shift == 0 ? [1, 2] : [$model->shift]; + $shift = $model->shift == 0 ? [1, 2, 5, 8] : ($model->shift == 1 ? [1, 5, 8] : [2]); $timetable = Timetable::find()->select(['COUNT(*) as cnt', 'admin_id']) ->where(['shift_id' => $shift, 'tabel' => '0']) ->andWhere(['between', 'date', $model->date_start, $model->date_end])