From d1214b8a4ca989242e1e81a317366b58c0fddec7 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 17 Oct 2024 14:11:14 +0300 Subject: [PATCH] =?utf8?q?[ERP-228]=20contest001=20=D0=BF=D0=BE=D0=BF?= =?utf8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=80=D0=B0=D0=BC?= =?utf8?q?=D0=BA=D0=B8=20=D0=B8=20=D1=81=D1=83=D0=BC=D0=BC=D0=B0=203000?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/scripts/tasks/task_09_contest001_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erp24/scripts/tasks/task_09_contest001_update.php b/erp24/scripts/tasks/task_09_contest001_update.php index 47dfb979..23f354b3 100644 --- a/erp24/scripts/tasks/task_09_contest001_update.php +++ b/erp24/scripts/tasks/task_09_contest001_update.php @@ -56,9 +56,9 @@ try { $infoText .= ' test '; ////////////////////////////////////////////// - $sales = Sales::find()->where(['>', 'date', '2024-04-15 00:00:00'])->andWhere(['<=', 'date', '2024-08-15 23:59:59']) - ->andWhere(['operation' => 'Продажа'])->andWhere(['>=', 'summ', '2500'])->orderBy(['date' => SORT_ASC])->all(); - $returns = Sales::find()->where(['>', 'date', '2024-04-15 00:00:00'])->andWhere(['<=', 'date', '2024-08-15 23:59:59']) + $sales = Sales::find()->where(['>', 'date', '2024-10-15 00:00:00'])->andWhere(['<=', 'date', '2025-01-15 23:59:59']) + ->andWhere(['operation' => 'Продажа'])->andWhere(['>=', 'summ', '3000'])->orderBy(['date' => SORT_ASC])->all(); + $returns = Sales::find()->where(['>', 'date', '2024-10-15 00:00:00'])->andWhere(['<=', 'date', '2025-01-15 23:59:59']) ->andWhere(['operation' => 'Возврат'])->all(); $returnCheckIds = []; -- 2.39.5