From efeee838289c4867d0e70f9921a3b3d0a10ebf98 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 25 Jun 2024 16:08:28 +0300 Subject: [PATCH] =?utf8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BF=D1=80?= =?utf8?q?=D0=BE=D0=BC=D0=BE=D0=BA=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=B2=20?= =?utf8?q?=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D1=81?= =?utf8?q?=D0=BA=D1=80=D1=8B=D1=82=D1=83=D1=8E=20=D1=82=D0=B0=D0=B1=D0=BB?= =?utf8?q?=D0=B8=D1=86=D1=83=20=D0=B8=20=D1=8D=D0=BA=D1=81=D0=BF=D0=BE?= =?utf8?q?=D1=80=D1=82=20=D0=B5=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/PromocodeController.php | 9 ++++++--- erp24/views/promocode/edit.php | 13 +++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/erp24/controllers/PromocodeController.php b/erp24/controllers/PromocodeController.php index 0b525905..cb7b262d 100644 --- a/erp24/controllers/PromocodeController.php +++ b/erp24/controllers/PromocodeController.php @@ -17,14 +17,17 @@ class PromocodeController extends Controller public function actionEdit($id = null) { $dataProvider = null; + $promocodesForExport = null; if (!$id) { $model = new Promocode; $model->date_start = date("Y-m-d 00:00:00"); $model->date_end = date("Y-m-d 00:00:00", strtotime("+366 day", time())); } else { $model = Promocode::findOne($id); - $dataProvider = new ActiveDataProvider(['query' => Promocode::find()->where(['base' => Promocode::BASE_SINGLE_USE, 'parent_id' => $id]) - ->orderBy(['created_at' => SORT_DESC, 'code' => SORT_ASC])]); + $promocodeQuery = Promocode::find()->where(['base' => Promocode::BASE_SINGLE_USE, 'parent_id' => $id]) + ->orderBy(['created_at' => SORT_DESC, 'code' => SORT_ASC]); + $dataProvider = new ActiveDataProvider(['query' => $promocodeQuery]); + $promocodesForExport = $promocodeQuery->all(); } /** @var $model Promocode */ if (Yii::$app->request->isPost && $model->load(Yii::$app->request->post())) { @@ -49,6 +52,6 @@ class PromocodeController extends Controller var_dump($model->getErrors()); } } - return $this->render('edit', compact('model', 'dataProvider')); + return $this->render('edit', compact('model', 'dataProvider', 'promocodesForExport')); } } \ No newline at end of file diff --git a/erp24/views/promocode/edit.php b/erp24/views/promocode/edit.php index f6d59bb1..f3106a4b 100644 --- a/erp24/views/promocode/edit.php +++ b/erp24/views/promocode/edit.php @@ -11,6 +11,7 @@ use \yii_app\helpers\PrintBlockHelper; /** @var $model Promocode */ /** @var $dataProvider ActiveDataProvider */ +/** @var $promocodesForExport array */ $this->registerJsFile('https://unpkg.com/xlsx@0.15.1/dist/xlsx.full.min.js', ['position' => \yii\web\View::POS_END]); @@ -70,14 +71,22 @@ $this->registerJsFile('https://unpkg.com/xlsx@0.15.1/dist/xlsx.full.min.js', ['p - +
+ + + + + + +
code ?>
+
$dataProvider, 'columns' => [ -- 2.39.5