diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index d6a86c0f..8fb4689c 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -184,13 +184,18 @@ switch ($action) {
$zero = 1;
$gateway = 'Recharge Zero';
}
+ $usings = explode(',', $config['payment_usings']);
+ $usings = array_filter(array_unique($usings));
+ if(count($usings)==0){
+ $usings[] = Lang::T('Cash');
+ }
+ $ui->assign('usings', $usings);
$ui->assign('bills', $bills);
$ui->assign('add_cost', $add_cost);
$ui->assign('cust', $cust);
$ui->assign('gateway', $gateway);
$ui->assign('channel', $channel);
$ui->assign('server', $b['routers']);
- $ui->assign('using', 'cash');
$ui->assign('plan', $plan);
$ui->display('recharge-confirm.tpl');
} else {
diff --git a/system/controllers/plan.php b/system/controllers/plan.php
index 4cb6c12d..a14053db 100644
--- a/system/controllers/plan.php
+++ b/system/controllers/plan.php
@@ -114,6 +114,12 @@ switch ($action) {
$zero = 1;
$gateway = 'Recharge Zero';
}
+ $usings = explode(',', $config['payment_usings']);
+ $usings = array_filter(array_unique($usings));
+ if(count($usings)==0){
+ $usings[] = Lang::T('Cash');
+ }
+ $ui->assign('usings', $usings);
$ui->assign('bills', $bills);
$ui->assign('add_cost', $add_cost);
$ui->assign('cust', $cust);
diff --git a/ui/ui/recharge-confirm.tpl b/ui/ui/recharge-confirm.tpl
index e4c987ab..2b841873 100644
--- a/ui/ui/recharge-confirm.tpl
+++ b/ui/ui/recharge-confirm.tpl
@@ -5,82 +5,91 @@
<div class="panel panel-primary panel-hovered panel-stacked mb30">
<div class="panel-heading">{Lang::T('Confirm')}</div>
<div class="panel-body">
- <center><b>{Lang::T('Customer')}</b></center>
- <ul class="list-group list-group-unbordered">
- <li class="list-group-item">
- <b>{Lang::T('Username')}</b> <span class="pull-right">{$cust['username']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Name')}</b> <span class="pull-right">{$cust['fullname']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Phone Number')}</b> <span class="pull-right">{$cust['phonenumber']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Email')}</b> <span class="pull-right">{$cust['email']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Address')}</b> <span class="pull-right">{$cust['address']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Balance')}</b> <span
- class="pull-right">{Lang::moneyFormat($cust['balance'])}</span>
- </li>
- </ul>
- <center><b>{Lang::T('Plan')}</b></center>
- <ul class="list-group list-group-unbordered">
- <li class="list-group-item">
- <b>{Lang::T('Plan Name')}</b> <span class="pull-right">{$plan['name_plan']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Location')}</b> <span
- class="pull-right">{if $plan['is_radius']}Radius{else}{$plan['routers']}{/if}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Type')}</b> <span
- class="pull-right">{if $plan['prepaid'] eq 'yes'}Prepaid{else}Postpaid{/if}
- {$plan['type']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Plan Price')}</b> <span
- class="pull-right">{if $using eq 'zero'}{Lang::moneyFormat(0)}{else}{Lang::moneyFormat($plan['price'])}{/if}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Plan Validity')}</b> <span class="pull-right">{$plan['validity']}
- {$plan['validity_unit']}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Using')}</b> <span class="pull-right">{ucwords($using)}</span>
- </li>
- </ul>
- <center><b>{Lang::T('Total')}</b></center>
- <ul class="list-group list-group-unbordered">
- {if $using neq 'zero' and $add_cost>0}
- {foreach $bills as $k => $v}
- <li class="list-group-item">
- <b>{$k}</b> <span class="pull-right">{Lang::moneyFormat($v)}</span>
- </li>
- {/foreach}
- <li class="list-group-item">
- <b>{Lang::T('Additional Cost')}</b> <span
- class="pull-right">{Lang::moneyFormat($add_cost)}</span>
- </li>
- <li class="list-group-item">
- <b>{Lang::T('Total')}</b> <small>({Lang::T('Plan Price')} +{Lang::T('Additional Cost')})</small><span class="pull-right"
- style="font-size: large; font-weight:bolder; font-family: 'Courier New', Courier, monospace; ">{Lang::moneyFormat($plan['price']+$add_cost)}</span>
- </li>
- {else}
- <li class="list-group-item">
- <b>{Lang::T('Total')}</b> <span class="pull-right"
- style="font-size: large; font-weight:bolder; font-family: 'Courier New', Courier, monospace; ">{if $using eq 'zero'}{Lang::moneyFormat(0)}{else}{Lang::moneyFormat($plan['price'])}{/if}</span>
- </li>
- {/if}
- </ul>
<form class="form-horizontal" method="post" role="form" action="{$_url}plan/recharge-post">
+ <center><b>{Lang::T('Customer')}</b></center>
+ <ul class="list-group list-group-unbordered">
+ <li class="list-group-item">
+ <b>{Lang::T('Username')}</b> <span class="pull-right">{$cust['username']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Name')}</b> <span class="pull-right">{$cust['fullname']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Phone Number')}</b> <span class="pull-right">{$cust['phonenumber']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Email')}</b> <span class="pull-right">{$cust['email']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Address')}</b> <span class="pull-right">{$cust['address']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Balance')}</b> <span
+ class="pull-right">{Lang::moneyFormat($cust['balance'])}</span>
+ </li>
+ </ul>
+ <center><b>{Lang::T('Plan')}</b></center>
+ <ul class="list-group list-group-unbordered">
+ <li class="list-group-item">
+ <b>{Lang::T('Plan Name')}</b> <span class="pull-right">{$plan['name_plan']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Location')}</b> <span
+ class="pull-right">{if $plan['is_radius']}Radius{else}{$plan['routers']}{/if}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Type')}</b> <span
+ class="pull-right">{if $plan['prepaid'] eq 'yes'}Prepaid{else}Postpaid{/if}
+ {$plan['type']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Plan Price')}</b> <span
+ class="pull-right">{if $using eq 'zero'}{Lang::moneyFormat(0)}{else}{Lang::moneyFormat($plan['price'])}{/if}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Plan Validity')}</b> <span class="pull-right">{$plan['validity']}
+ {$plan['validity_unit']}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Using')}</b> <span class="pull-right">
+ <select name="using" style="background-color: white;outline: 1px;border: 1px solid #b7b7b7;">
+ {foreach $usings as $us}
+ <option value="{trim($us)}" {if $using eq trim($us)}selected{/if}>{trim(ucWords($us))}</option>
+ {/foreach}
+ {if $_c['enable_balance'] eq 'yes'}
+ <option value="balance" {if $using eq 'balance'}selected{/if}>{Lang::T('Customer Balance')}</option>
+ {/if}
+ <option value="zero" {if $using eq 'zero'}selected{/if}>{$_c['currency_code']} 0</option>
+ </select>
+ </span>
+ </li>
+ </ul>
+ <center><b>{Lang::T('Total')}</b></center>
+ <ul class="list-group list-group-unbordered">
+ {if $using neq 'zero' and $add_cost>0}
+ {foreach $bills as $k => $v}
+ <li class="list-group-item">
+ <b>{$k}</b> <span class="pull-right">{Lang::moneyFormat($v)}</span>
+ </li>
+ {/foreach}
+ <li class="list-group-item">
+ <b>{Lang::T('Additional Cost')}</b> <span
+ class="pull-right">{Lang::moneyFormat($add_cost)}</span>
+ </li>
+ <li class="list-group-item">
+ <b>{Lang::T('Total')}</b> <small>({Lang::T('Plan Price')} +{Lang::T('Additional Cost')})</small><span class="pull-right"
+ style="font-size: large; font-weight:bolder; font-family: 'Courier New', Courier, monospace; ">{Lang::moneyFormat($plan['price']+$add_cost)}</span>
+ </li>
+ {else}
+ <li class="list-group-item">
+ <b>{Lang::T('Total')}</b> <span class="pull-right"
+ style="font-size: large; font-weight:bolder; font-family: 'Courier New', Courier, monospace; ">{if $using eq 'zero'}{Lang::moneyFormat(0)}{else}{Lang::moneyFormat($plan['price'])}{/if}</span>
+ </li>
+ {/if}
+ </ul>
<input type="hidden" name="id_customer" value="{$cust['id']}">
<input type="hidden" name="plan" value="{$plan['id']}">
<input type="hidden" name="server" value="{$server}">
- <input type="hidden" name="using" value="{$using}">
<input type="hidden" name="stoken" value="{App::getToken()}">
<center>
<button class="btn btn-success" type="submit">{Lang::T('Recharge')}</button><br>
diff --git a/ui/ui/recharge.tpl b/ui/ui/recharge.tpl
index 5dc93716..ee767c7b 100644
--- a/ui/ui/recharge.tpl
+++ b/ui/ui/recharge.tpl
@@ -46,7 +46,7 @@
<div class="col-md-6">
<select name="using" class="form-control">
{foreach $usings as $using}
- <option value="{trim(ucWords($using))}">{trim(ucWords($using))}</option>
+ <option value="{trim($using)}">{trim(ucWords($using))}</option>
{/foreach}
{if $_c['enable_balance'] eq 'yes'}
<option value="balance">{Lang::T('Customer Balance')}</option>