From 45e2bb5a96f754b36864ef93a89ad4519958845f Mon Sep 17 00:00:00 2001
From: iBNu Maksum <me@ibnux.net>
Date: Tue, 7 Jan 2025 16:16:38 +0700
Subject: [PATCH] merge coupon and voucer menu

---
 system/lan/english.json   | 21 +++++++++++---------
 ui/ui/sections/header.tpl | 42 +++++++++------------------------------
 version.json              |  2 +-
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/system/lan/english.json b/system/lan/english.json
index f5892a3d..68d9f0c0 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -931,14 +931,17 @@
     "Cards": "Cards",
     "CRM": "CRM",
     "Coupons": "Coupons",
-    "Voucher_Cards": "Voucher Cards",
-    "Create_Date": "Create Date",
+    "Search_Coupons": "Search Coupons",
+    "Add_Coupon": "Add Coupon",
+    "Value": "Value",
+    "Max_Usage": "Max Usage",
+    "Usage_Count": "Usage Count",
+    "Min_Order": "Min Order",
+    "Max_Discount": "Max Discount",
+    "Updated_Date": "Updated Date",
+    "Action": "Action",
+    "No_coupons_found_": "No coupons found.",
     "Delete_Selected": "Delete Selected",
-    "Print_Now": "Print Now",
-    "Vouchers_Per_Page": "Vouchers Per Page",
-    "Save_as_template": "Save as template",
-    "Template_Name": "Template Name",
-    "Voucher_Code": "Voucher Code",
-    "Voucher_Package": "Voucher Package",
-    "Counter": "Counter"
+    "Voucher_Cards": "Voucher Cards",
+    "Create_Date": "Create Date"
 }
\ No newline at end of file
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index f4993f15..ee83736e 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -1254,7 +1254,7 @@
                         </ul>
                     </li>
                     {$_MENU_AFTER_CUSTOMERS}
-                    <li class="{if $_system_menu eq 'plan'}active{/if} treeview">
+                    <li class="{if $_routes[0] eq 'plan' || $_routes[0] eq 'coupons'}active{/if} treeview">
                         <a href="#">
                             <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
                             <span class="pull-right-container">
@@ -1268,6 +1268,14 @@
                             <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
                                     href="{$_url}plan/refill">{Lang::T('Refill Customer')}</a></li>
                             {/if}
+                            {if $_c['disable_voucher'] != 'yes'}
+                            <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
+                                    href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
+                            {/if}
+                            {if $_c['disable_coupons'] != 'yes'}
+                            <li {if $_routes[0] eq 'coupons' }class="active" {/if}><a
+                                    href="{$_url}coupons">{Lang::T('Coupons')}</a></li>
+                            {/if}
                             <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
                                     href="{$_url}plan/recharge">{Lang::T('Recharge Customer')}</a></li>
                             {if $_c['enable_balance'] == 'yes'}
@@ -1305,38 +1313,6 @@
                     </li>
                     {/if}
                     {$_MENU_AFTER_PLANS}
-                    <li class="{if $_system_menu eq 'cards'}active{/if} treeview">
-                        <a href="#">
-                            <i class="glyphicon glyphicon-credit-card"></i> <span>{Lang::T('Cards')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            {if $_c['disable_voucher'] != 'yes'}
-                            <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
-                                    href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
-                            {/if}
-                            {$_MENU_CARDS}
-                        </ul>
-                    </li>
-                    {$_MENU_AFTER_CRM}
-                    <li class="{if $_system_menu eq 'crm'}active{/if} treeview">
-                        <a href="#">
-                            <i class="fa fa-users"></i> <span>{Lang::T('CRM')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            {if $_c['disable_coupons'] != 'yes'}
-                            <li {if $_routes[0] eq 'coupons' }class="active" {/if}><a
-                                    href="{$_url}coupons">{Lang::T('Coupons')}</a></li>
-                            {/if}
-                            {$_MENU_CRM}
-                        </ul>
-                    </li>
-                    {$_MENU_AFTER_CARDS}
                     <li class="{if $_system_menu eq 'reports'}active{/if} treeview">
                         {if in_array($_admin['user_type'],['SuperAdmin','Admin', 'Report'])}
                         <a href="#">
diff --git a/version.json b/version.json
index 82742c92..80f132cc 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.12.6.1"
+    "version": "2025.1.7"
 }
\ No newline at end of file