From: Alexander Smirnov Date: Thu, 17 Oct 2024 11:11:14 +0000 (+0300) Subject: [ERP-228] contest001 поправлены рамки и сумма 3000 X-Git-Tag: 1.6~34^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d1214b8a4ca989242e1e81a317366b58c0fddec7;p=erp24_rep%2Fyii-erp24%2F.git [ERP-228] contest001 поправлены рамки и сумма 3000 --- 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 = [];