Some code clean up and adding styles for text alignment.

Get the forms to all output the labels right aligned when next to
inputs.

diff --git a/classes/billingSupport.php b/classes/billingSupport.php
index ec82396..d9b8a22 100644 (file)
--- a/classes/billingSupport.php
+++ b/classes/billingSupport.php
@@ -560,15 +560,10 @@ class GlmBillingSupport
      */
     public function viewInvoice( $invoice_id )
     {
-        $invoice = $this->getInvoiceById( $invoice_id );
-        // echo '<pre>$invoice: ' . print_r( $invoice, true ) . '</pre>';
+        $invoice    = $this->getInvoiceById( $invoice_id );
         $line_items = $this->getLineItemsForInvoice( $invoice_id );
-        // echo '<pre>$line_items: ' . print_r( $line_items, true ) . '</pre>';
-        // echo '<pre>$this->config: ' . print_r( $this->config, true ) . '</pre>';
-        $account = $this->getAccountById( $invoice['account'] );
-        // echo '<pre>$account: ' . print_r( $account, true ) . '</pre>';
-        $payments = $this->getInvoicePaymentsByInvoiceId( $invoice_id );
-        // echo '<pre>$payments: ' . print_r( $payments, true ) . '</pre>';
+        $account    = $this->getAccountById( $invoice['account'] );
+        $payments   = $this->getInvoicePaymentsByInvoiceId( $invoice_id );
 
         $templateData = array(
             'settings'   => $this->config['settings'],
@@ -579,7 +574,6 @@ class GlmBillingSupport
         );
 
         $invoiceHtml = $this->generateInvoiceHtml( $templateData, 'admin/billing/invoiceStore.html' );
-        // echo '<pre>$invoiceHtml: ' . print_r( $invoiceHtml, true ) . '</pre>';
         return $invoiceHtml;
     }
 
@@ -604,6 +598,12 @@ class GlmBillingSupport
             ),
             ARRAY_A
         );
+        foreach ( $line_items as &$item ) {
+            $index = (int)$item['recurrence'];
+            if ( $item.recurring && $this->config['recurrence'][$index] ) {
+                $item['recurrence_string'] = $this->config['recurrence'][$index];
+            }
+        }
         return $line_items;
     }
 

diff --git a/views/admin/billing/editAccount.html b/views/admin/billing/editAccount.html
index 8351960..ea7ad2e 100644 (file)
--- a/views/admin/billing/editAccount.html
+++ b/views/admin/billing/editAccount.html
@@ -24,7 +24,7 @@
     <table class="glm-admin-table">
 
         <tr>
-            <th {if $account.fieldRequired.ref_name} class="glm-required"}{/if}>Name</th>
+            <th style="text-align: right;" {if $account.fieldRequired.ref_name} class="glm-required"{/if}>Name</th>
             <td {if $account.fieldFail.ref_name}class="glm-form-bad-input" data-tabid="glm-name"{/if}>
                 <input type="text" name="ref_name" value="{$account.fieldData.ref_name}" class="glm-form-text-input-medium">
             {if $account.fieldFail.ref_name}<p>{$account.fieldFail.ref_name}</p>{/if}<br>
@@ -32,7 +32,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.anniversary_date} class="glm-required"}{/if}>Anniversary Date</th>
+            <th style="text-align: right;" {if $account.fieldRequired.anniversary_date} class="glm-required"{/if}>Anniversary Date</th>
             <td {if $account.fieldFail.anniversary_date}class="glm-form-bad-input" data-tabid="glm-anniversary-date"{/if}>
                 <input type="text" name="anniversary_date" value="{$account.fieldData.anniversary_date.date}" class="glm-form-text-input-medium">
             {if $account.fieldFail.anniversary_date}<p>{$account.fieldFail.anniversary_date}</p>{/if}<br>
@@ -40,7 +40,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.renewal_date} class="glm-required"}{/if}>Renewal Date</th>
+            <th style="text-align: right;" {if $account.fieldRequired.renewal_date} class="glm-required"{/if}>Renewal Date</th>
             <td {if $account.fieldFail.renewal_date}class="glm-form-bad-input" data-tabid="glm-renewal-date"{/if}>
                 <input type="text" name="renewal_date" value="{$account.fieldData.renewal_date.date}" class="glm-form-text-input-medium">
             {if $account.fieldFail.renewal_date}<p>{$account.fieldFail.renewal_date}</p>{/if}<br>
@@ -48,7 +48,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.email} class="glm-required"}{/if}>Billing Email</th>
+            <th style="text-align: right;" {if $account.fieldRequired.email} class="glm-required"{/if}>Billing Email</th>
             <td {if $account.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-email"{/if}>
                 <input type="text" name="email" value="{$account.fieldData.email}" class="glm-form-text-input-medium">
             {if $account.fieldFail.email}<p>{$account.fieldFail.email}</p>{/if}<br>
@@ -56,7 +56,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_fname} class="glm-required"}{/if}>Billing First Name</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_fname} class="glm-required"{/if}>Billing First Name</th>
             <td {if $account.fieldFail.billing_fname}class="glm-form-bad-input" data-tabid="glm-billing-fname"{/if}>
                 <input type="text" name="billing_fname" value="{$account.fieldData.billing_fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_fname}<p>{$account.fieldFail.billing_fname}</p>{/if}<br>
@@ -64,7 +64,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_lname} class="glm-required"}{/if}>Billing Last Name</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_lname} class="glm-required"{/if}>Billing Last Name</th>
             <td {if $account.fieldFail.billing_lname}class="glm-form-bad-input" data-tabid="glm-billing-lname"{/if}>
                 <input type="text" name="billing_lname" value="{$account.fieldData.billing_lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_lname}<p>{$account.fieldFail.billing_lname}</p>{/if}<br>
@@ -72,7 +72,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_addr1} class="glm-required"}{/if}>Billing Address 1</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_addr1} class="glm-required"{/if}>Billing Address 1</th>
             <td {if $account.fieldFail.billing_addr1}class="glm-form-bad-input" data-tabid="glm-billing-addr1"{/if}>
                 <input type="text" name="billing_addr1" value="{$account.fieldData.billing_addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_addr1}<p>{$account.fieldFail.billing_addr1}</p>{/if}<br>
@@ -80,7 +80,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_addr2} class="glm-required"}{/if}>Billing Address2</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_addr2} class="glm-required"{/if}>Billing Address2</th>
             <td {if $account.fieldFail.billing_addr2}class="glm-form-bad-input" data-tabid="glm-billing-addr2"{/if}>
                 <input type="text" name="billing_addr2" value="{$account.fieldData.billing_addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_addr2}<p>{$account.fieldFail.billing_addr2}</p>{/if}<br>
@@ -88,7 +88,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_city} class="glm-required"}{/if}>Billing City</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_city} class="glm-required"{/if}>Billing City</th>
             <td {if $account.fieldFail.billing_city}class="glm-form-bad-input" data-tabid="glm-billing-city"{/if}>
                 <input type="text" name="billing_city" value="{$account.fieldData.billing_city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_city}<p>{$account.fieldFail.billing_city}</p>{/if}<br>
@@ -96,7 +96,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_state} class="glm-required"}{/if}>Billing State</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_state} class="glm-required"{/if}>Billing State</th>
             <td {if $account.fieldFail.billing_state}class="glm-form-bad-input" data-tabid="glm-billing-state"{/if}>
                 <select name="billing_state">
                     <option value=""></option>
@@ -111,7 +111,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_zip} class="glm-required"}{/if}>Billing Zip</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_zip} class="glm-required"{/if}>Billing Zip</th>
             <td {if $account.fieldFail.billing_zip}class="glm-form-bad-input" data-tabid="glm-billing-zip"{/if}>
                 <input type="text" name="billing_zip" value="{$account.fieldData.billing_zip}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_zip}<p>{$account.fieldFail.billing_zip}</p>{/if}<br>
@@ -119,7 +119,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.billing_phone} class="glm-required"}{/if}>Billing Phone</th>
+            <th style="text-align: right;" {if $account.fieldRequired.billing_phone} class="glm-required"{/if}>Billing Phone</th>
             <td {if $account.fieldFail.billing_phone}class="glm-form-bad-input" data-tabid="glm-billing-phone"{/if}>
                 <input type="text" name="billing_phone" value="{$account.fieldData.billing_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.billing_phone}<p>{$account.fieldFail.billing_phone}</p>{/if}<br>

diff --git a/views/admin/billing/editInvoice.html b/views/admin/billing/editInvoice.html
index bc47a27..a0b90ed 100644 (file)
--- a/views/admin/billing/editInvoice.html
+++ b/views/admin/billing/editInvoice.html
@@ -16,31 +16,31 @@
             <input type="hidden" name="option" value="insert">
         {/if}
         <div class="glm-row">
-            <div class="glm-columns glm-small-12 glm-large-8">
+            <div class="glm-columns glm-small-12 glm-large-12">
 
                 <div class="glm-row">
-                    <div class="glm-columns glm-small-12 glm-large-3 glm-required">
+                    <div style="text-align: right;padding-right: 5px;" class="glm-columns glm-small-12 glm-large-3 glm-required">
                         Billing Account
                     </div>
-                    <div class="glm-columns glm-small-12 glm-large-9">
+                    <div class="glm-columns glm-small-12 glm-large-8">
                         <input id="glm_member_accounts_hidden" type="hidden" name="account" />
                         <input id="glm_member_accounts" name="account_input" required />
                         <a id="newAccountButton" href="#">New Account</a>
                     </div>
                 </div>
                 <div class="glm-row">
-                    <div class="glm-columns glm-small-12 glm-large-3 glm-required">
+                    <div style="text-align: right;padding-right: 5px;" class="glm-columns glm-small-12 glm-large-3 glm-required">
                         Due Date
                     </div>
-                    <div class="glm-columns glm-small-12 glm-large-9">
+                    <div class="glm-columns glm-small-12 glm-large-8">
                         <input class="datepicker" id="invoice_due_date" type="text" name="due_date" required>
                     </div>
                 </div>
                 <div class="glm-row">
-                    <div class="glm-columns glm-small-12 glm-large-3">
+                    <div style="text-align: right;padding-right: 5px;" class="glm-columns glm-small-12 glm-large-3">
                         Notes
                     </div>
-                    <div class="glm-columns glm-small-12 glm-large-9">
+                    <div class="glm-columns glm-small-12 glm-large-8">
                         <textarea name="notes"></textarea>
                     </div>
                 </div>
@@ -60,7 +60,7 @@
             <div class="glm-columns glm-small-12 glm-large-10">
                 <div class="glm-row">
                     <div class="glm-columns glm-small-8" style="text-align: right;">
-                        Total Amount:&nbsp;&nbsp;&nbsp;
+                        Total Amount: &nbsp;&nbsp;&nbsp;
                         <input type="hidden" id="invoice-total-amount" value="" />
                     </div>
                     <div class="glm-columns glm-small-4" id="invoice-total"> $0.00 </div>
@@ -81,61 +81,61 @@
         <input id="non-member-account" type="hidden" name="ref_dest" value="">
         <table>
             <tr>
-                <th class="glm-required">Member Name</th>
+                <th class="glm-required" align="right">Member Name</th>
                 <td>
                     <input id="glm_member_name" type="text" name="ref_name" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Anniversary Date</th>
+                <th class="glm-required" align="right">Anniversary Date</th>
                 <td>
                     <input class="datepicker" type="text" name="anniversary_date" value="">
                 </td>
             </tr>
             <tr>
-                <th>Renewal Date</th>
+                <th align="right">Renewal Date</th>
                 <td>
                     <input class="datepicker" type="text" name="renewal_date" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing Email</th>
+                <th class="glm-required" align="right">Billing Email</th>
                 <td>
                     <input type="text" name="email" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing First Name</th>
+                <th class="glm-required" align="right">Billing First Name</th>
                 <td>
                     <input type="text" name="billing_fname" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing Last Name</th>
+                <th class="glm-required" align="right">Billing Last Name</th>
                 <td>
                     <input type="text" name="billing_lname" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing Address 1</th>
+                <th class="glm-required" align="right">Billing Address 1</th>
                 <td>
                     <input type="text" name="billing_addr1" value="">
                 </td>
             </tr>
             <tr>
-                <th>Billing Address 2</th>
+                <th align="right">Billing Address 2</th>
                 <td>
                     <input type="text" name="billing_addr2" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing City</th>
+                <th class="glm-required" align="right">Billing City</th>
                 <td>
                     <input type="text" name="billing_city" value="">
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing State</th>
+                <th class="glm-required" align="right">Billing State</th>
                 <td>
                     <select name="billing_state">
                         <option value=""></option>
@@ -148,13 +148,13 @@
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Billing Zip</th>
+                <th class="glm-required" align="right">Billing Zip</th>
                 <td>
                     <input type="text" name="billing_zip" value="">
                 </td>
             </tr>
             <tr>
-                <th>Billing Phone</th>
+                <th align="right">Billing Phone</th>
                 <td>
                     <input type="text" name="billing_phone" value="">
                 </td>
@@ -170,7 +170,7 @@
         <input type="hidden" name="option" value="addLineItem">
         <table>
             <tr>
-                <th class="glm-required">Invoice Type </th>
+                <th class="glm-required" align="right">Invoice Type </th>
                 <td>
                     <select id="line_item_type" name="line_item_type">
                         <option value="">Select Invoice Type</option>
@@ -202,7 +202,7 @@
     <p class="validateCustomTips glm-required">* Required!</p>
     <table>
         <tr>
-            <th class="glm-required">Parent</th>
+            <th class="glm-required" align="right">Parent</th>
             <td>
                 <select id="cf_parent_select" name="cf_parent" required>
                     <option value="0">No Parent</option>
@@ -215,11 +215,11 @@
             </td>
         </tr>
         <tr>
-            <th class="glm-required">Line Item Name</th>
+            <th class="glm-required" align="right">Line Item Name</th>
             <td><input name="cf_name" /></td>
         </tr>
         <tr>
-            <th class="glm-required">Amount</th>
+            <th class="glm-required" align="right">Amount <br> Numbers only (999.99)</th>
             <td><input name="cf_amount" /></td>
         </tr>
     </table>

diff --git a/views/admin/billing/invoiceStore.html b/views/admin/billing/invoiceStore.html
index ad7b402..ac1d4b0 100644 (file)
--- a/views/admin/billing/invoiceStore.html
+++ b/views/admin/billing/invoiceStore.html
@@ -82,7 +82,7 @@
                         <td align="left" width="70">{$invoice.transaction_time|date_format:"%D"}</td>
                         <td align="right" width="20">{$item.quantity}</td>
                         <td align="right" width="10">&nbsp;</td>
-                        <td align="left">{$item.name}</td>
+                        <td align="left">{$item.name}{if $item.recurring && $item.recurrence_string} ( {$item.recurrence_string} ){/if}</td>
                         <td align="right" width="60">${$item.amount|string_format:"%.2f"}</td>
                         <td align="right" width="60">${$item.total|string_format:"%.2f"}</td>
                     </tr>
@@ -121,10 +121,12 @@
     </tr>
     {/if}
     <tr><td colspan="2">&nbsp;</td></tr>
+    {* Footer of invoice *}
     <tr>
         <td colspan="2" align="center" style="font-size: 12px;">Please return Coupon Below with Payment</td>
     </tr>
     <tr><td colspan="2"><hr></td></tr>
+    {* Shows the Billing Account name and address and the total amount owed. *}
     <tr>
         <td colspan="2">
             <table width="100%">

diff --git a/views/admin/settings/billing.html b/views/admin/settings/billing.html
index 73ae194..8ff0339 100644 (file)
--- a/views/admin/settings/billing.html
+++ b/views/admin/settings/billing.html
@@ -21,7 +21,7 @@
                     <table class="glm-admin-table">
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_logo} class="glm-required"}{/if}>Company Logo</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_logo} class="glm-required"}{/if}>Company Logo</th>
                             <td {if $billingSettings.fieldFail.company_logo}class="glm-form-bad-input" data-tabid="glm-company-logo"{/if}>
                                 {if $billingSettings.fieldData.company_logo}
                                     <img src="{$glmPluginMediaUrl}/images/small/{$billingSettings.fieldData.company_logo}">
@@ -35,7 +35,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_name} class="glm-required"}{/if}>Company Name</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_name} class="glm-required"}{/if}>Company Name</th>
                             <td {if $billingSettings.fieldFail.company_name}class="glm-form-bad-input" data-tabid="glm-company-name"{/if}>
                                 <input type="text" name="company_name" value="{$billingSettings.fieldData.company_name}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_name}<p>{$billingSettings.fieldFail.company_name}</p>{/if}<br>
@@ -43,7 +43,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_name2} class="glm-required"}{/if}>Company Name 2</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_name2} class="glm-required"}{/if}>Company Name 2</th>
                             <td {if $billingSettings.fieldFail.company_name2}class="glm-form-bad-input" data-tabid="glm-company-name2"{/if}>
                                 <input type="text" name="company_name2" value="{$billingSettings.fieldData.company_name2}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_name2}<p>{$billingSettings.fieldFail.company_name2}</p>{/if}<br>
@@ -51,7 +51,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_addr1} class="glm-required"}{/if}>Company Address 1</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_addr1} class="glm-required"}{/if}>Company Address 1</th>
                             <td {if $billingSettings.fieldFail.company_addr1}class="glm-form-bad-input" data-tabid="glm-company-addr1"{/if}>
                                 <input type="text" name="company_addr1" value="{$billingSettings.fieldData.company_addr1}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_addr1}<p>{$billingSettings.fieldFail.company_addr1}</p>{/if}<br>
@@ -59,7 +59,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_addr2} class="glm-required"}{/if}>Company Address 2</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_addr2} class="glm-required"}{/if}>Company Address 2</th>
                             <td {if $billingSettings.fieldFail.company_addr2}class="glm-form-bad-input" data-tabid="glm-company-addr2"{/if}>
                                 <input type="text" name="company_addr2" value="{$billingSettings.fieldData.company_addr2}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_addr2}<p>{$billingSettings.fieldFail.company_addr2}</p>{/if}<br>
@@ -67,7 +67,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_city} class="glm-required"}{/if}>Company City</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_city} class="glm-required"}{/if}>Company City</th>
                             <td {if $billingSettings.fieldFail.company_city}class="glm-form-bad-input" data-tabid="glm-company-city"{/if}>
                                 <input type="text" name="company_city" value="{$billingSettings.fieldData.company_city}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_city}<p>{$billingSettings.fieldFail.company_city}</p>{/if}<br>
@@ -75,7 +75,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_state} class="glm-required"}{/if}>Company State</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_state} class="glm-required"}{/if}>Company State</th>
                             <td {if $billingSettings.fieldFail.company_state}class="glm-form-bad-input" data-tabid="glm-company-state"{/if}>
                                 <select name="company_state">
                                     <option value=""></option>
@@ -90,7 +90,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_zip} class="glm-required"}{/if}>Company Zip</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_zip} class="glm-required"}{/if}>Company Zip</th>
                             <td {if $billingSettings.fieldFail.company_zip}class="glm-form-bad-input" data-tabid="glm-company-zip"{/if}>
                                 <input type="text" name="company_zip" value="{$billingSettings.fieldData.company_zip}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_zip}<p>{$billingSettings.fieldFail.company_zip}</p>{/if}<br>
@@ -98,7 +98,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_phone} class="glm-required"}{/if}>Company Phone</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_phone} class="glm-required"}{/if}>Company Phone</th>
                             <td {if $billingSettings.fieldFail.company_phone}class="glm-form-bad-input" data-tabid="glm-company-phone"{/if}>
                                 <input type="text" name="company_phone" value="{$billingSettings.fieldData.company_phone}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_phone}<p>{$billingSettings.fieldFail.company_phone}</p>{/if}<br>
@@ -106,7 +106,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_email} class="glm-required"}{/if}>Company Email</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_email} class="glm-required"}{/if}>Company Email</th>
                             <td {if $billingSettings.fieldFail.company_email}class="glm-form-bad-input" data-tabid="glm-company-email"{/if}>
                                 <input type="text" name="company_email" value="{$billingSettings.fieldData.company_email}" class="glm-form-text-input-short">
                             {if $billingSettings.fieldFail.company_email}<p>{$billingSettings.fieldFail.company_email}</p>{/if}<br>
@@ -114,7 +114,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.company_url} class="glm-required"}{/if}>Company URL</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.company_url} class="glm-required"}{/if}>Company URL</th>
                             <td {if $billingSettings.fieldFail.company_url}class="glm-form-bad-input" data-tabid="glm-company-url"{/if}>
                                 <input type="text" name="company_url" value="{$billingSettings.fieldData.company_url}" class="glm-form-text-input-medium">
                             {if $billingSettings.fieldFail.company_url}<p>{$billingSettings.fieldFail.company_url}</p>{/if}<br>
@@ -122,7 +122,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $billingSettings.fieldRequired.payment_terms} class="glm-required"}{/if}>Payment Terms</th>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.payment_terms} class="glm-required"}{/if}>Payment Terms</th>
                             <td {if $billingSettings.fieldFail.payment_terms}class="glm-form-bad-input" data-tabid="glm-payment-terms"{/if}>
                                 <input type="text" name="payment_terms" value="{$billingSettings.fieldData.payment_terms}" class="glm-form-text-input-medium">
                             {if $billingSettings.fieldFail.payment_terms}<p>{$billingSettings.fieldFail.payment_terms}</p>{/if}<br>

diff --git a/views/admin/settings/editNotificationType.html b/views/admin/settings/editNotificationType.html
index 2eae49d..b71f269 100644 (file)
--- a/views/admin/settings/editNotificationType.html
+++ b/views/admin/settings/editNotificationType.html
@@ -18,7 +18,7 @@
     <table class="glm-admin-table glm-event-table">
 
         <tr>
-            <th {if $notification.fieldRequired.name} class="glm-required"}{/if}>Name</th>
+            <th style="text-align: right;" {if $notification.fieldRequired.name} class="glm-required"}{/if}>Name</th>
             <td {if $notification.fieldFail.name}class="glm-form-bad-input" data-tabid="glm-name"{/if}>
                 <input type="text" name="name" value="{$notification.fieldData.name}" class="glm-form-text-input-medium">
                 {if $notification.fieldFail.name}<p>{$notification.fieldFail.name}</p>{/if}<br>
@@ -30,11 +30,11 @@
         </tr>
 
         <tr>
-            <th colspan="2">Due Date</th>
+            <th style="text-align: right;" colspan="2">Due Date</th>
         </tr>
 
         <tr>
-            <th class="glm-required"><input type="radio" name="send_by" value="date" required{if $notification.fieldData.send_by_date.value} checked{/if}></th>
+            <th style="text-align: right;" class="glm-required"><input type="radio" name="send_by" value="date" required{if $notification.fieldData.send_by_date.value} checked{/if}></th>
             <td>
                 <input
                     type="number"
@@ -62,7 +62,7 @@
         </tr>
 
         <tr>
-            <th><input type="radio" name="send_by" value="action" required{if $notification.fieldData.send_by_action.value} checked{/if}></th>
+            <th style="text-align: right;"><input type="radio" name="send_by" value="action" required{if $notification.fieldData.send_by_action.value} checked{/if}></th>
             <td>
                 <select name="send_action">
                     {foreach $send_action as $id => $val}
@@ -73,7 +73,7 @@
         </tr>
 
         <tr>
-            <th {if $notification.fieldRequired.subject} class="glm-required"}{/if}>Subject</th>
+            <th style="text-align: right;" {if $notification.fieldRequired.subject} class="glm-required"}{/if}>Subject</th>
             <td {if $notification.fieldFail.subject}class="glm-form-bad-input" data-tabid="glm-subject"{/if}>
                 <input type="text" name="subject" value="{$notification.fieldData.subject}" class="glm-form-text-input-medium">
             {if $notification.fieldFail.subject}<p>{$notification.fieldFail.subject}</p>{/if}<br>
@@ -81,7 +81,7 @@
         </tr>
 
         <tr>
-            <th {if $notification.fieldRequired.from_header} class="glm-required"}{/if}>From</th>
+            <th style="text-align: right;" {if $notification.fieldRequired.from_header} class="glm-required"}{/if}>From</th>
             <td {if $notification.fieldFail.from_header}class="glm-form-bad-input" data-tabid="glm-fromheader"{/if}>
                 <input type="text" name="from_header" value="{$notification.fieldData.from_header}" class="glm-form-text-input-medium">
             {if $notification.fieldFail.from_header}<p>{$notification.fieldFail.from_header}</p>{/if}<br>
@@ -89,7 +89,7 @@
         </tr>
 
         <tr>
-            <th {if $notification.fieldRequired.replyto} class="glm-required"}{/if}>Reply-To</th>
+            <th style="text-align: right;" {if $notification.fieldRequired.replyto} class="glm-required"}{/if}>Reply-To</th>
             <td {if $notification.fieldFail.replyto}class="glm-form-bad-input" data-tabid="glm-replyto"{/if}>
                 <input type="text" name="replyto" value="{$notification.fieldData.replyto}" class="glm-form-text-input-medium">
             {if $notification.fieldFail.replyto}<p>{$notification.fieldFail.replyto}</p>{/if}<br>
@@ -97,7 +97,7 @@
         </tr>
 
         <tr>
-            <th {if $notification.fieldRequired.message}class="glm-required"{/if}>Message:</th>
+            <th style="text-align: right;" {if $notification.fieldRequired.message}class="glm-required"{/if}>Message:</th>
             <td {if $notification.fieldFail.message}class="glm-form-bad-input" data-tabid="glm-message"{/if}>
                 {php}
                     wp_editor('{$notification.fieldData.message|escape:quotes}', 'glm_descr', array(

diff --git a/views/admin/settings/invoiceTypes.html b/views/admin/settings/invoiceTypes.html
index cbf894f..40c3c25 100644 (file)
--- a/views/admin/settings/invoiceTypes.html
+++ b/views/admin/settings/invoiceTypes.html
@@ -78,13 +78,13 @@
         <input id="edit-id" type="hidden" name="id" value="">
         <table class="glm-admin-table">
             <tr>
-                <th class="glm-required">Invoice Type Name:</th>
+                <th style="text-align: right;" class="glm-required">Invoice Type Name:</th>
                 <td>
                     <input id="edit-name" type="text" name="name" class="glm-form-text-input" required>
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Parent:</th>
+                <th style="text-align: right;" class="glm-required">Parent:</th>
                 <td>
                     <select id="edit-parent" name="parent">
                         <option value="0">(none)</option>
@@ -99,20 +99,20 @@
                 </td>
             </tr>
             <tr>
-                <th class="glm-required">Amount:Numbers only (999.99)</th>
+                <th style="text-align: right;" class="glm-required">Amount:Numbers only (999.99)</th>
                 <td>
                     <input id="edit-amount" type="text" name="amount" class="glm-form-text-input" required>
                 </td>
             </tr>
             <tr>
-                <th>Recurring:</th>
+                <th style="text-align: right;">Recurring:</th>
                 <td>
                     <input type="hidden" name="recurring" class="glm-form-text-input" value="0">
                     <input id="edit-recurring" type="checkbox" name="recurring" class="glm-form-text-input" value="1">
                 </td>
             </tr>
             <tr>
-                <th>Recurrence:</th>
+                <th style="text-align: right;">Recurrence:</th>
                 <td>
                     <select id="edit-recurrence" name="recurrence">
                         <option value="">(none)</option>