diff --git a/ui/ui/sections/user-header.tpl b/ui/ui/sections/user-header.tpl index 7b0787a4..64c38ffb 100644 --- a/ui/ui/sections/user-header.tpl +++ b/ui/ui/sections/user-header.tpl @@ -118,17 +118,6 @@ -
  • - - - {$_L['Voucher']} - - - -
  • @@ -139,9 +128,16 @@
  • Voucher
    • {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }
  • {Lang::T('Package')}
    • +
  • {Lang::T('History')}
    • {/if} +
  • + + + {Lang::T('History')} + +
  • diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-activation-list.tpl index bebbc782..0394cfc1 100644 --- a/ui/ui/user-activation-list.tpl +++ b/ui/ui/user-activation-list.tpl @@ -23,7 +23,7 @@ {$ds['username']} {$ds['plan_name']} - {$ds['price']} + {$_c['currency_code']} {number_format($ds['price'],2,$_c['dec_point'],$_c['thousands_sep'])} {$ds['type']} {date($_c['date_format'], strtotime($ds['recharged_on']))} {$ds['time']} {date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']} diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl index 5d386c7a..d0b9f8e4 100644 --- a/ui/ui/user-dashboard.tpl +++ b/ui/ui/user-dashboard.tpl @@ -1,67 +1,95 @@ {include file="sections/user-header.tpl"} -
    -
    -
    -
    {$_L['Account_Information']}
    - - - - - - - - - - - - - - - - - -
    {$_L['Username']}{$_bill['username']}
    {$_L['Plan_Name']}{$_bill['namebp']}
    {$_L['Created_On']}{if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['recharged_on']))} {$_bill['time']}{/if} 
    {$_L['Expires_On']}{if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['expiration']))} {$_bill['time']}{/if} 
    -
    -
    -
    -
    {$_L['Voucher_Activation']}
    -
    -
    -
    - -
    - -
    -
    +
    +
    +
    +
    {$_L['Account_Information']}
    + + + + + + + + + + + + + + + + + +
    {$_L['Username']}{$_bill['username']}
    {$_L['Plan_Name']}{$_bill['namebp']}
    {$_L['Created_On']}{if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['recharged_on']))} {$_bill['time']}{/if} 
    {$_L['Expires_On']}{if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['expiration']))} {$_bill['time']}{/if} 
    +
    +
    +
    +
    {$_L['Voucher_Activation']}
    +
    + +
    + +
    + +
    +
    -
    -
    - -
    -
    - -
    -
    - {$_L['Order_Voucher']} -
    - {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' } -
    -
    - {Lang::T('Order Package')} -
    -
    - {/if} -
    -
    -
    -
    -
    -
    {$_L['Announcement']}
    -
    - {include file="$_path/../pages/Announcement.html"} -
    -
    -
    -
    +
    +
    + +
    +
    + +
    +
    + {$_L['Order_Voucher']} +
    + {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' } +
    +
    + {Lang::T('Order Package')} +
    +
    + {/if} +
    +
    +
    + {if $unpaid } +
    +
    {Lang::T('Unpaid Order')}
    + + + + + + + + + + + + + + + + + + + +
    {Lang::T('expired')}{date({$_c['date_format']}, strtotime($unpaid['expired_date']))} {date('H:i', strtotime($unpaid['expired_date']))}
    {$_L['Plan_Name']}{$unpaid['plan_name']}
    {$_L['Plan_Price']}{$unpaid['price']}
    {Lang::T('Routers')}{$unpaid['routers']}
    +
    + {Lang::T('PAY NOW')} +
    +
    + {/if} +
    +
    +
    {$_L['Announcement']}
    +
    + {include file="$_path/../pages/Announcement.html"} +
    +
    +
    +
    {include file="sections/user-footer.tpl"} diff --git a/ui/ui/user-orderHistory.tpl b/ui/ui/user-orderHistory.tpl new file mode 100644 index 00000000..98da2239 --- /dev/null +++ b/ui/ui/user-orderHistory.tpl @@ -0,0 +1,51 @@ +{include file="sections/user-header.tpl"} + +
    +
    +
    +
    {$_L['Order_History']}
    +
    +
    + + + + + + + + + + + + + + + + {foreach $d as $ds} + + + + + + + + + + + + {/foreach} + +
    {$_L['Plan_Name']}{Lang::T('Gateway')}{Lang::T('Routers')}{$_L['Type']}{$_L['Plan_Price']}{$_L['Created_On']}{$_L['Expires_On']}{Lang::T('Date Done')}{$_L['Method']}
    {$ds['plan_name']}{$ds['gateway']}{$ds['routers']}{$ds['payment_channel']}{number_format($ds['price'],2,$_c['dec_point'],$_c['thousands_sep'])}{date("{$_c['date_format']} H:i", strtotime($ds['created_date']))}{date("{$_c['date_format']} H:i", strtotime($ds['expired_date']))}{if $ds['status']!=1}{date("{$_c['date_format']} H:i", strtotime($ds['paid_date']))}{/if}{if $ds['status']==1}{$_L['UNPAID']} + {elseif $ds['status']==2}{$_L['PAID']} + {elseif $ds['status']==3}{$_L['FAILED']} + {elseif $ds['status']==4}{$_L['CANCELED']} + {elseif $ds['status']==5}{$_L['UNKNOWN']}{/if}
    +
    + {$paginator['contents']} +
    +
    +
    +
    + + +{include file="sections/user-footer.tpl"}