Version 7.1.0-beta.1

WHMCS · Nov 16, 2016 · abadbf6 · abadbf6
1 parent 850545e
commit abadbf6
Show file tree

Hide file tree

Showing 32 changed files with 47,015 additions and 92 deletions.
diff --git a/affiliates.tpl b/affiliates.tpl
@@ -109,8 +109,8 @@
                 <tr class="text-center">
                     <td><span class="hidden">{$referral.datets}</span>{$referral.date}</td>
                     <td>{$referral.service}</td>
-                    <td>{$referral.amountdesc}</td>
-                    <td>{$referral.commission}</td>
+                    <td data-order="{$referral.amountnum}">{$referral.amountdesc}</td>
+                    <td data-order="{$referral.commissionnum}">{$referral.commission}</td>
                     <td><span class='label status status-{$referral.rawstatus|strtolower}'>{$referral.status}</span></td>
                 </tr>
             {/foreach}

diff --git a/clientareacreditcard.tpl b/clientareacreditcard.tpl
@@ -59,7 +59,10 @@
         {include file="$template/includes/alert.tpl" type="error" errorshtml=$errormessage}
     {/if}
 
-    <form class="form-horizontal" role="form" method="post" action="{$smarty.server.PHP_SELF}?action=creditcard">
+
+    <form id="frmNewCc" class="form-horizontal" role="form" method="post" action="{$smarty.server.PHP_SELF}?action=creditcard">
+        <div class="alert alert-danger text-center gateway-errors hidden"></div>
+
         <div class="form-group">
             <label for="inputCardType" class="col-sm-4 control-label">{$LANG.creditcardcardtype}</label>
             <div class="col-sm-4">
@@ -73,7 +76,7 @@
         <div class="form-group">
             <label for="inputCardNumber" class="col-sm-4 control-label">{$LANG.creditcardcardnumber}</label>
             <div class="col-sm-6">
-                <input type="number" class="form-control" id="inputCardNumber" name="ccnumber" autocomplete="off" />
+                <input type="tel" class="form-control" id="inputCardNumber" name="ccnumber" autocomplete="off" />
             </div>
         </div>
         {if $showccissuestart}
@@ -112,22 +115,22 @@
             <div class="form-group">
                 <label for="inputCardIssue" class="col-sm-4 col-xs-12 control-label">{$LANG.creditcardcardissuenum}</label>
                 <div class="col-sm-2 col-xs-4">
-                    <input type="number" class="form-control" id="inputCardIssue" name="ccissuenum" autocomplete="off" />
+                    <input type="tel" class="form-control" id="inputCardIssue" name="ccissuenum" autocomplete="off" />
                 </div>
             </div>
         {/if}
         <div class="form-group">
             <label for="inputCardCVV" class="col-sm-4 col-xs-12 control-label">{$LANG.creditcardcvvnumber}</label>
             <div class="col-sm-7">
-                <input type="number" class="form-control input-inline input-inline-100" id="inputCardCVV" name="cardcvv" autocomplete="off" />
+                <input type="tel" class="form-control input-inline input-inline-100" id="inputCardCVV" name="cardcvv" autocomplete="off" />
                 <button type="button" class="btn btn-link" data-toggle="popover" data-content="<img src='{$BASE_PATH_IMG}/ccv.gif' width='210' />">
                     {$LANG.creditcardcvvwhere}
                 </button>
             </div>
         </div>
         <div class="form-group">
             <div class="text-center">
-                <input class="btn btn-primary" type="submit" name="submit" value="{$LANG.clientareasavechanges}" />
+                <input class="btn btn-primary" id="btnSubmitNewCard" type="submit" name="submit" value="{$LANG.clientareasavechanges}" />
                 <input class="btn btn-default" type="reset" value="{$LANG.cancel}" />
             </div>
         </div>

diff --git a/clientareadomains.tpl b/clientareadomains.tpl
@@ -65,7 +65,7 @@
                                 </span>
                             </td>
                             <td>
-                                <div class="btn-group btn-group-sm">
+                                <div class="btn-group btn-group-sm" style="width:60px;">
                                     <a href="clientarea.php?action=domaindetails&id={$domain.id}" class="btn btn-default"><i class="fa fa-wrench"></i></a>
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                         <span class="caret"></span>

diff --git a/clientareainvoices.tpl b/clientareainvoices.tpl
@@ -39,7 +39,7 @@
                     <td>{$invoice.invoicenum}</td>
                     <td><span class="hidden">{$invoice.normalisedDateCreated}</span>{$invoice.datecreated}</td>
                     <td><span class="hidden">{$invoice.normalisedDateDue}</span>{$invoice.datedue}</td>
-                    <td>{$invoice.total}</td>
+                    <td data-order="{$invoice.totalnum}">{$invoice.total}</td>
                     <td><span class="label status status-{$invoice.statusClass}">{$invoice.status}</span></td>
                     <td class="responsive-edit-button" style="display: none;">
                         <a href="viewinvoice.php?id={$invoice.id}" class="btn btn-block btn-info">

diff --git a/clientareaproducts.tpl b/clientareaproducts.tpl
@@ -31,7 +31,7 @@
             {foreach key=num item=service from=$services}
                 <tr onclick="clickableSafeRedirect(event, 'clientarea.php?action=productdetails&amp;id={$service.id}', false)">
                     <td><strong>{$service.product}</strong>{if $service.domain}<br /><a href="http://{$service.domain}" target="_blank">{$service.domain}</a>{/if}</td>
-                    <td class="text-center">{$service.amount}<br />{$service.billingcycle}</td>
+                    <td class="text-center" data-order="{$service.amountnum}">{$service.amount}<br />{$service.billingcycle}</td>
                     <td class="text-center"><span class="hidden">{$service.normalisedNextDueDate}</span>{$service.nextduedate}</td>
                     <td class="text-center"><span class="label status status-{$service.status|strtolower}">{$service.statustext}</span></td>
                     <td class="responsive-edit-button" style="display: none;">

diff --git a/creditcard.tpl b/creditcard.tpl
@@ -15,7 +15,7 @@
 
 {else}
 
-    <form method="post" action="creditcard.php" class="form-horizontal" role="form">
+    <form id="frmPayment" method="post" action="creditcard.php" class="form-horizontal" role="form">
         <input type="hidden" name="action" value="submit" />
         <input type="hidden" name="invoiceid" value="{$invoiceid}" />
 
@@ -26,6 +26,8 @@
                     {include file="$template/includes/alert.tpl" type="error" errorshtml=$errormessage}
                 {/if}
 
+                <div class="alert alert-danger text-center hidden gateway-errors"></div>
+
                 <div class="form-group">
                     <div class="col-sm-8 col-sm-offset-4">
                         <div class="radio">
@@ -118,7 +120,7 @@
                 <div class="form-group cc-details{if !$addingNewCard} hidden{/if}">
                     <label for="inputCardNumber" class="col-sm-4 control-label">{$LANG.creditcardcardnumber}</label>
                     <div class="col-sm-7">
-                        <input type="number" name="ccnumber" id="inputCardNumber" size="30" value="{if $ccnumber}{$ccnumber}{/if}" autocomplete="off" class="form-control newccinfo" />
+                        <input type="tel" name="ccnumber" id="inputCardNumber" size="30" value="{if $ccnumber}{$ccnumber}{/if}" autocomplete="off" class="form-control newccinfo" />
                     </div>
                 </div>
                 {if $showccissuestart}
@@ -184,7 +186,10 @@
                 {/if}
                 <div class="form-group">
                     <div class="text-center">
-                        <input type="submit" class="btn btn-primary btn-lg" value="{$LANG.submitpayment}" onclick="this.value='{$LANG.pleasewait}'" id="btnSubmit" />
+                        <button type="submit" class="btn btn-primary btn-lg" id="btnSubmit" value="{$LANG.submitpayment}">
+                            <span class="pay-text">{$LANG.submitpayment}</span>
+                            <span class="click-text hidden">{$LANG.pleasewait}</span>
+                        </button>
                     </div>
                 </div>