From 0eb900ffd635664c61b24184ebb9da40d6e6c286 Mon Sep 17 00:00:00 2001 From: AGSTR <144728914+agstrxyz@users.noreply.github.com> Date: Sat, 4 Jan 2025 01:59:20 +0700 Subject: [PATCH] Update plan.php --- system/controllers/plan.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/system/controllers/plan.php b/system/controllers/plan.php index 53c1a93d..76e53a5d 100644 --- a/system/controllers/plan.php +++ b/system/controllers/plan.php @@ -615,6 +615,17 @@ switch ($action) { ->left_outer_join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan')) ->where('tbl_voucher.status', '0'); } + if (!empty($selected_datetime)) { + $v = ORM::for_table('tbl_plans') + ->left_outer_join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan')) + ->where('tbl_voucher.status', '0') + ->where('tbl_voucher.created_at', $selected_datetime) + ->limit($limit); + $vc = ORM::for_table('tbl_plans') + ->left_outer_join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan')) + ->where('tbl_voucher.status', '0'); + + } if (in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) { $v = $v->find_many(); $vc = $vc->count(); @@ -628,7 +639,6 @@ switch ($action) { $v = $v->where_in('generated_by', $sales)->find_many(); $vc = $vc->where_in('generated_by', $sales)->count(); } - $template = file_get_contents("pages/Voucher.html"); $template = str_replace('[[company_name]]', $config['CompanyName'], $template); @@ -648,7 +658,7 @@ switch ($action) { 'created_datetime' ) ->where_not_equal('created_at', '0') - ->select_expr('COUNT(*)', 'voucher_count') + ->select_expr('COUNT(*)', 'voucher_count') ->group_by('created_datetime') ->order_by_desc('created_datetime') ->find_array();