View Invoice from Customer side

hotspotbilling · Mar 14, 2024 · 68d3c91 · 68d3c91
1 parent e206a58
commit 68d3c91
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # CHANGELOG
 
+## 2024.3.14
+
+- Add Note to Invoices
+- Add Additional Bill
+- View Invoice from Customer side
+
 ## 2024.3.13
 
 - Postpaid System

diff --git a/system/controllers/customers.php b/system/controllers/customers.php
@@ -135,7 +135,7 @@
             $ui->assign('gateway', $gateway);
             $ui->assign('channel', $channel);
             $ui->assign('server', $b['routers']);
-            $ui->assign('using', 'default');
+            $ui->assign('using', 'cash');
             $ui->assign('plan', $plan);
             $ui->display('recharge-confirm.tpl');
         }

diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php
@@ -49,7 +49,11 @@
         $ui->display('user-activation-list.tpl');
 
         break;
-
+    case 'invoice':
+        $id = $routes[2];
+        $in = ORM::for_table('tbl_transactions')->where('username', $user['username'])->where('id', $id)->find_one();
+        Package::createInvoice($in);
+        $ui->display('invoice-customer.tpl');
     default:
         $ui->display('a404.tpl');
 }
diff --git a/system/lan/english.json b/system/lan/english.json
@@ -486,5 +486,6 @@
     "Total": "Total",
     "Current_Cycle": "Current Cycle",
     "Additional_Cost": "Additional Cost",
-    "Remaining": "Remaining"
+    "Remaining": "Remaining",
+    "": ""
 }
diff --git a/ui/ui/invoice-customer.tpl b/ui/ui/invoice-customer.tpl
@@ -0,0 +1,21 @@
+{include file="sections/user-header.tpl"}
+
+<div class="row">
+    <div class="col-md-4 col-md-offset-2">
+        <div class="panel panel-hovered panel-primary panel-stacked mb30">
+            <div class="panel-heading">{$in['invoice']}</div>
+            <div class="panel-body">
+                <form class="form-horizontal" method="post" action="{$_url}prepaid/print" target="_blank">
+                    <pre id="content">{$invoice}</pre>
+                    <input type="hidden" name="id" value="{$in['id']}">
+                    <a href="{$_url}voucher/list-activated" class="btn btn-default btn-sm"><i
+                            class="ion-reply-all"></i>{Lang::T('Finish')}</a>
+                    <a href="https://api.whatsapp.com/send/?text={$whatsapp}" target="_blank"
+                    class="btn btn-primary btn-sm">
+                    <i class="glyphicon glyphicon-share"></i> WhatsApp</a>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+{include file="sections/user-footer.tpl"}
diff --git a/ui/ui/recharge-confirm.tpl b/ui/ui/recharge-confirm.tpl
@@ -50,7 +50,7 @@
                             {$plan['validity_unit']}</span>
                     </li>
                     <li class="list-group-item">
-                        <b>{Lang::T('Using')}</b> <span class="pull-right">{$using}</span>
+                        <b>{Lang::T('Using')}</b> <span class="pull-right">{ucwords($using)}</span>
                     </li>
                 </ul>
                 <center><b>{Lang::T('Total')}</b></center>

diff --git a/ui/ui/recharge.tpl b/ui/ui/recharge.tpl
@@ -45,7 +45,7 @@
                         <label class="col-md-2 control-label">{Lang::T('Using')}</label>
                         <div class="col-md-6">
                             <select name="using" class="form-control">
-                                <option value="default">{Lang::T('Default')}</option>
+                                <option value="cash">{Lang::T('Cash')}</option>
                                 {if $_c['enable_balance'] eq 'yes'}
                                     <option value="balance">{Lang::T('Customer Balance')}</option>
                                 {/if}

diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-activation-list.tpl
@@ -10,7 +10,7 @@
                     <table id="datatable" class="table table-bordered table-striped table-condensed">
                         <thead>
                             <tr>
-                                <th>{Lang::T('Username')}</th>
+                                <th>{Lang::T('Invoice')}</th>
                                 <th>{Lang::T('Plan Name')}</th>
                                 <th>{Lang::T('Plan Price')}</th>
                                 <th>{Lang::T('Type')}</th>
@@ -21,8 +21,8 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr>
-                                    <td>{$ds['username']}</td>
+                                <tr onclick="window.location.href = '{$_url}voucher/invoice/{$ds['id']}'" style="cursor: pointer;">
+                                    <td>{$ds['invoice']}</td>
                                     <td>{$ds['plan_name']}</td>
                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                     <td>{$ds['type']}</td>

diff --git a/version.json b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.3.13"
+    "version": "2024.3.14"
 }