AyeCode / invoicing

includes/data/sample-payment-form.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
@@ -16,7 +16,7 @@ 
 
         'placeholder' => 'jon@snow.com',
         'value'       => '',
-        'label'       => __( 'Billing Email', 'invoicing' ),
+        'label'       => __('Billing Email', 'invoicing'),
         'description' => '',
         'required'    => true,
         'id'          => 'mmdwqzpox',
@@ -28,9 +28,9 @@ 
     array(
 
         'value'        => '',
-        'input_label'  => __( 'Coupon Code', 'invoicing' ),
-        'button_label' => __( 'Apply Coupon', 'invoicing' ),
-        'description'  => __( 'Have a discount code? Enter it above.', 'invoicing' ),
+        'input_label'  => __('Coupon Code', 'invoicing'),
+        'button_label' => __('Apply Coupon', 'invoicing'),
+        'description'  => __('Have a discount code? Enter it above.', 'invoicing'),
         'id'           => 'kcicdiscount',
         'name'         => 'kcicdiscount',
         'type'         => 'discount',
@@ -50,7 +50,7 @@ 
     ),
 
     array(
-        'text'    => __( 'Select Payment Method', 'invoicing' ),
+        'text'    => __('Select Payment Method', 'invoicing'),
         'id'          => 'gtscicd',
         'name'        => 'gtscicd',
         'type'        => 'gateway_select',
@@ -62,8 +62,8 @@ 
 
         'value'       =>'',
         'class'       => 'btn-primary',
-        'label'       => __( 'Pay Now »', 'invoicing' ),
-        'description' => __( 'By continuing with your payment, you are agreeing to our privacy policy and terms of service.', 'invoicing' ),
+        'label'       => __('Pay Now »', 'invoicing'),
+        'description' => __('By continuing with your payment, you are agreeing to our privacy policy and terms of service.', 'invoicing'),
         'id'          => 'rtqljyy',
         'name'        => 'rtqljyy',
         'type'        => 'pay_button',

includes/data/default-payment-form.php

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
@@ -16,7 +16,7 @@ 
 
         'placeholder' => 'jon@snow.com',
         'value'       => '',
-        'label'       => __( 'Billing Email', 'invoicing' ),
+        'label'       => __('Billing Email', 'invoicing'),
         'description' => '',
         'required'    => true,
         'id'          => 'mmdwqzpox',
@@ -34,7 +34,7 @@ 
             array(
                 'placeholder'  => 'Jon',
                 'value'        => '',
-                'label'        => __( 'First Name', 'invoicing' ),
+                'label'        => __('First Name', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -44,7 +44,7 @@ 
             array(
                 'placeholder'  => 'Snow',
                 'value'        => '',
-                'label'        => __( 'Last Name', 'invoicing' ),
+                'label'        => __('Last Name', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -54,7 +54,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'Address', 'invoicing' ),
+                'label'        => __('Address', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -64,7 +64,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'City', 'invoicing' ),
+                'label'        => __('City', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -72,9 +72,9 @@ 
             ),
 
             array(
-                'placeholder'  => __( 'Select your country' ),
+                'placeholder'  => __('Select your country'),
                 'value'        => '',
-                'label'        => __( 'Country', 'invoicing' ),
+                'label'        => __('Country', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -82,9 +82,9 @@ 
             ),
 
             array(
-                'placeholder'  => __( 'Choose a state', 'invoicing' ),
+                'placeholder'  => __('Choose a state', 'invoicing'),
                 'value'        => '',
-                'label'        => __( 'State / Province', 'invoicing' ),
+                'label'        => __('State / Province', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -94,7 +94,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'ZIP / Postcode', 'invoicing' ),
+                'label'        => __('ZIP / Postcode', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -104,7 +104,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'Phone', 'invoicing' ),
+                'label'        => __('Phone', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -114,7 +114,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'Company', 'invoicing' ),
+                'label'        => __('Company', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -124,7 +124,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'VAT Number', 'invoicing' ),
+                'label'        => __('VAT Number', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -136,9 +136,9 @@ 
     array(
 
         'value'        => '',
-        'input_label'  => __( 'Coupon Code', 'invoicing' ),
-        'button_label' => __( 'Apply Coupon', 'invoicing' ),
-        'description'  => __( 'Have a discount code? Enter it above.', 'invoicing' ),
+        'input_label'  => __('Coupon Code', 'invoicing'),
+        'button_label' => __('Apply Coupon', 'invoicing'),
+        'description'  => __('Have a discount code? Enter it above.', 'invoicing'),
         'id'           => 'kcicdiscount',
         'name'         => 'kcicdiscount',
         'type'         => 'discount',
@@ -158,7 +158,7 @@ 
     ),
 
     array(
-        'text'    => __( 'Select Payment Method', 'invoicing' ),
+        'text'    => __('Select Payment Method', 'invoicing'),
         'id'          => 'gtscicd',
         'name'        => 'gtscicd',
         'type'        => 'gateway_select',
@@ -170,8 +170,8 @@ 
 
         'value'       =>'',
         'class'       => 'btn-primary',
-        'label'       => __( 'Pay Now »', 'invoicing' ),
-        'description' => __( 'By continuing with your payment, you are agreeing to our privacy policy and terms of service.', 'invoicing' ),
+        'label'       => __('Pay Now »', 'invoicing'),
+        'description' => __('By continuing with your payment, you are agreeing to our privacy policy and terms of service.', 'invoicing'),
         'id'          => 'rtqljyy',
         'name'        => 'rtqljyy',
         'type'        => 'pay_button',

templates/payment-forms/elements/discount.php

Spacing +7 added lines, -7 removed lines

@@ -8,24 +8,24 @@
  * @var GetPaid_Payment_Form $form The current payment form
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( ! getpaid_has_published_discount() ) {
+if (!getpaid_has_published_discount()) {
     return;
 }
 
-$placeholder = esc_attr( $input_label );
-$label       = sanitize_text_field( $button_label );
+$placeholder = esc_attr($input_label);
+$label       = sanitize_text_field($button_label);
 
-if ( ! empty( $description ) ) {
+if (!empty($description)) {
     $description = "<small class='form-text text-muted'>$description</small>";
 } else {
     $description = '';
 }
 
 $discount_code = '';
-if ( ! empty( $form->invoice ) ) {
-    $discount_code = esc_attr( $form->invoice->get_discount_code() );
+if (!empty($form->invoice)) {
+    $discount_code = esc_attr($form->invoice->get_discount_code());
 }
 
 ?>

includes/wpinv-discount-functions.php

Spacing +44 added lines, -44 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of discount type.
@@ -17,8 +17,8 @@ 
     return apply_filters(
         'wpinv_discount_types',
         array(
-            'percent'   => __( 'Percentage', 'invoicing' ),
-            'flat'     => __( 'Flat Amount', 'invoicing' ),
+            'percent'   => __('Percentage', 'invoicing'),
+            'flat'     => __('Flat Amount', 'invoicing'),
         )
     );
 }
@@ -28,46 +28,46 @@ 
  * 
  * @return string
  */
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : $type;
+    return isset($types[$type]) ? $types[$type] : $type;
 }
 
 /**
  * Deletes a discount via the admin page.
  * 
  */
-function wpinv_delete_discount( $data ) {
+function wpinv_delete_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->delete( true );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->delete(true);
 
 }
-add_action( 'getpaid_authenticated_admin_action_delete_discount', 'wpinv_delete_discount' );
+add_action('getpaid_authenticated_admin_action_delete_discount', 'wpinv_delete_discount');
 
 /**
  * Deactivates a discount via the admin page.
  */
-function wpinv_activate_discount( $data ) {
+function wpinv_activate_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->set_status( 'publish' );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->set_status('publish');
     $discount->save();
 
 }
-add_action( 'getpaid_authenticated_admin_action_activate_discount', 'wpinv_activate_discount' );
+add_action('getpaid_authenticated_admin_action_activate_discount', 'wpinv_activate_discount');
 
 /**
  * Activates a discount via the admin page.
  */
-function wpinv_deactivate_discount( $data ) {
+function wpinv_deactivate_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->set_status( 'pending' );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->set_status('pending');
     $discount->save();
 
 }
-add_action( 'getpaid_authenticated_admin_action_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('getpaid_authenticated_admin_action_deactivate_discount', 'wpinv_deactivate_discount');
 
 /**
  * Fetches a discount object.
@@ -76,8 +76,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount( $discount ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount($discount) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -87,8 +87,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount_obj( $discount = 0 ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount_obj($discount = 0) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -98,10 +98,10 @@ 
  * @param string|int $value The field value
  * @return bool|WPInv_Discount
  */
-function wpinv_get_discount_by( $deprecated = null, $value = '' ) {
-    $discount = new WPInv_Discount( $value );
+function wpinv_get_discount_by($deprecated = null, $value = '') {
+    $discount = new WPInv_Discount($value);
 
-    if ( $discount->get_id() != 0 ) {
+    if ($discount->get_id() != 0) {
         return $discount;
     }
 
@@ -116,9 +116,9 @@ 
 function wpinv_get_discount_statuses() {
 
     return array(
-        'expired'  => __( 'Expired', 'invoicing' ),
-        'publish'  => __( 'Active', 'invoicing' ),
-        'inactive' => __( 'Inactive', 'invoicing' ),
+        'expired'  => __('Expired', 'invoicing'),
+        'publish'  => __('Active', 'invoicing'),
+        'inactive' => __('Inactive', 'invoicing'),
     );
 
 }
@@ -126,9 +126,9 @@ 
 /**
  * Retrieves an invoice status label.
  */
-function wpinv_discount_status( $status ) {
+function wpinv_discount_status($status) {
     $statuses = wpinv_get_discount_statuses();
-    return isset( $statuses[ $status ] ) ? $statuses[ $status ] : __( 'Inactive', 'invoicing' );
+    return isset($statuses[$status]) ? $statuses[$status] : __('Inactive', 'invoicing');
 }
 
 /**
@@ -138,12 +138,12 @@ 
  * @param int|array|string|WPInv_Discount $code discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_recurring( $discount = 0, $code = 0 ) {
+function wpinv_discount_is_recurring($discount = 0, $code = 0) {
 
-    if( ! empty( $discount ) ) {
-        $discount    = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount    = wpinv_get_discount_obj($discount);
     } else {
-        $discount    = wpinv_get_discount_obj( $code );
+        $discount    = wpinv_get_discount_obj($code);
     }
 
     return $discount->get_is_recurring();
@@ -158,35 +158,35 @@ 
  * @param WPInv_Discount $discount
  * @return array
  */
-function getpaid_calculate_invoice_discount( $invoice, $discount ) {
+function getpaid_calculate_invoice_discount($invoice, $discount) {
 
 	$initial_discount   = 0;
 	$recurring_discount = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->get_items() as $item) {
 
 		// Abort if it is not valid for this item.
-		if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+		if (!$discount->is_valid_for_items(array($item->get_id()))) {
 			continue;
 		}
 
 		// Calculate the initial amount...
-		$item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
+		$item_discount           = $discount->get_discounted_amount($item->get_sub_total());
 		$recurring_item_discount = 0;
 
 		// ... and maybe the recurring amount.
-		if ( $item->is_recurring() && $discount->is_recurring() ) {
-			$recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+		if ($item->is_recurring() && $discount->is_recurring()) {
+			$recurring_item_discount = $discount->get_discounted_amount($item->get_recurring_sub_total());
 		}
 
 		// Discount should not exceed discounted amount.
-		if ( ! $discount->is_type( 'percent' ) ) {
+		if (!$discount->is_type('percent')) {
 
-			if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
+			if (($initial_discount + $item_discount) > $discount->get_amount()) {
 				$item_discount = $discount->get_amount() - $initial_discount;
 			}
 
-			if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
+			if (($recurring_discount + $recurring_item_discount) > $discount->get_amount()) {
 				$recurring_item_discount = $discount->get_amount() - $recurring_discount;
 			}
 
@@ -219,10 +219,10 @@ 
         array(
             'post_type'   => 'wpi_discount',
             'numberposts' => 1,
-            'fields'      => array( 'ids' ),
+            'fields'      => array('ids'),
         )
     );
 
-    return ! empty( $discounts );
+    return !empty($discounts);
 
 }

includes/data/email-settings.php

Spacing +226 added lines, -226 removed lines

@@ -8,24 +8,24 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the due date reminder options.
 $overdue_days_options       = array();
-$overdue_days_options['0']  = __( 'On the Due Date', 'invoicing' );
-$overdue_days_options['1']  = __( '1 day after Due Date', 'invoicing' );
+$overdue_days_options['0']  = __('On the Due Date', 'invoicing');
+$overdue_days_options['1']  = __('1 day after Due Date', 'invoicing');
 
-for ( $i = 2; $i <= 10; $i++ ) {
-    $overdue_days_options["$i"] = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+for ($i = 2; $i <= 10; $i++) {
+    $overdue_days_options["$i"] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
 }
 
 // Prepare up coming renewal reminder options.
 $renewal_days_options       = array();
-$renewal_days_options['0']  = __( 'On the renewal date', 'invoicing' );
-$renewal_days_options['1']  = __( '1 day before the renewal date', 'invoicing' );
+$renewal_days_options['0']  = __('On the renewal date', 'invoicing');
+$renewal_days_options['1']  = __('1 day before the renewal date', 'invoicing');
 
-for ( $i = 2; $i <= 10; $i++ ) {
-    $renewal_days_options["$i"]   = wp_sprintf( __( '%d days before the renewal date', 'invoicing' ), $i );
+for ($i = 2; $i <= 10; $i++) {
+    $renewal_days_options["$i"] = wp_sprintf(__('%d days before the renewal date', 'invoicing'), $i);
 }
 
 // Default, built-in gateways
@@ -34,45 +34,45 @@ 
 
         'email_new_invoice_header' => array(
             'id'       => 'email_new_invoice_header',
-            'name'     => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to the site admin whenever there is a new invoice.', 'invoicing' ),
+            'name'     => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to the site admin whenever there is a new invoice.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_new_invoice_active' => array(
             'id'       => 'email_new_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_new_invoice_subject' => array(
             'id'       => 'email_new_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing' ),
+            'std'      => __('[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_new_invoice_heading' => array(
             'id'       => 'email_new_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'New invoice', 'invoicing' ),
+            'std'      => __('New invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_new_invoice_body' => array(
             'id'       => 'email_new_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -82,45 +82,45 @@ 
 
         'email_cancelled_invoice_header' => array(
             'id'       => 'email_cancelled_invoice_header',
-            'name'     => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to the site admin whenever invoices are cancelled.', 'invoicing' ),
+            'name'     => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to the site admin whenever invoices are cancelled.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_cancelled_invoice_active' => array(
             'id'       => 'email_cancelled_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_cancelled_invoice_subject' => array(
             'id'       => 'email_cancelled_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing' ),
+            'std'      => __('[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_cancelled_invoice_heading' => array(
             'id'       => 'email_cancelled_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Cancelled Invoice', 'invoicing' ),
+            'std'      => __('Cancelled Invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_cancelled_invoice_body' => array(
             'id'       => 'email_cancelled_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -131,45 +131,45 @@ 
 
         'email_failed_invoice_header' => array(
             'id'       => 'email_failed_invoice_header',
-            'name'     => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing' ),
+            'name'     => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_failed_invoice_active' => array(
             'id'       => 'email_failed_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_failed_invoice_subject' => array(
             'id'       => 'email_failed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Failed invoice ({invoice_number})', 'invoicing' ),
+            'std'      => __('[{site_title}] Failed invoice ({invoice_number})', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_failed_invoice_heading' => array(
             'id'       => 'email_failed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Failed invoice', 'invoicing' ),
+            'std'      => __('Failed invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_failed_invoice_body' => array(
             'id'       => 'email_failed_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -179,53 +179,53 @@ 
 
         'email_onhold_invoice_header' => array(
             'id'       => 'email_onhold_invoice_header',
-            'name'     => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers whenever their invoices are held.', 'invoicing' ),
+            'name'     => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers whenever their invoices are held.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_onhold_invoice_active' => array(
             'id'       => 'email_onhold_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_onhold_invoice_admin_bcc' => array(
             'id'       => 'email_onhold_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_onhold_invoice_subject' => array(
             'id'       => 'email_onhold_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_onhold_invoice_heading' => array(
             'id'       => 'email_onhold_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Thank you for your invoice', 'invoicing' ),
+            'std'      => __('Thank you for your invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_onhold_invoice_body' => array(
             'id'       => 'email_onhold_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -236,53 +236,53 @@ 
 
         'email_processing_invoice_header' => array(
             'id'       => 'email_processing_invoice_header',
-            'name'     => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to users whenever payments for their invoices are processing.', 'invoicing' ),
+            'name'     => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to users whenever payments for their invoices are processing.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_processing_invoice_active' => array(
             'id'       => 'email_processing_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_processing_invoice_admin_bcc' => array(
             'id'       => 'email_processing_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_processing_invoice_subject' => array(
             'id'       => 'email_processing_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_processing_invoice_heading' => array(
             'id'       => 'email_processing_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Thank you for your invoice', 'invoicing' ),
+            'std'      => __('Thank you for your invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_processing_invoice_body' => array(
             'id'       => 'email_processing_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -293,61 +293,61 @@ 
 
         'email_completed_invoice_header' => array(
             'id'       => 'email_completed_invoice_header',
-            'name'     => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers when their invoices are marked as paid.', 'invoicing' ),
+            'name'     => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers when their invoices are marked as paid.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_completed_invoice_active' => array(
             'id'       => 'email_completed_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_completed_invoice_renewal_active' => array(
             'id'       => 'email_completed_invoice_renewal_active',
-            'name'     => __( 'Enable renewal notification', 'invoicing' ),
-            'desc'     => __( 'Should this email be sent for renewals too?', 'invoicing' ),
+            'name'     => __('Enable renewal notification', 'invoicing'),
+            'desc'     => __('Should this email be sent for renewals too?', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_completed_invoice_admin_bcc' => array(
             'id'       => 'email_completed_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1,
         ),
 
         'email_completed_invoice_subject' => array(
             'id'       => 'email_completed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_completed_invoice_heading' => array(
             'id'       => 'email_completed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been paid', 'invoicing' ),
+            'std'      => __('Your invoice has been paid', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_completed_invoice_body' => array(
             'id'       => 'email_completed_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -358,53 +358,53 @@ 
 
         'email_refunded_invoice_header' => array(
             'id'       => 'email_refunded_invoice_header',
-            'name'     => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to users when their invoices are marked as refunded.', 'invoicing' ),
+            'name'     => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to users when their invoices are marked as refunded.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_refunded_invoice_active' => array(
             'id'       => 'email_refunded_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_refunded_invoice_admin_bcc' => array(
             'id'       => 'email_refunded_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_refunded_invoice_subject' => array(
             'id'       => 'email_refunded_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_refunded_invoice_heading' => array(
             'id'       => 'email_refunded_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been refunded', 'invoicing' ),
+            'std'      => __('Your invoice has been refunded', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_refunded_invoice_body' => array(
             'id'       => 'email_refunded_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -415,53 +415,53 @@ 
 
         'email_user_invoice_header' => array(
             'id'       => 'email_user_invoice_header',
-            'name'     => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers containing their invoice information and payment links.', 'invoicing' ),
+            'name'     => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers containing their invoice information and payment links.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_user_invoice_active' => array(
             'id'       => 'email_user_invoice_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_user_invoice_admin_bcc' => array(
             'id'       => 'email_user_invoice_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_user_invoice_subject' => array(
             'id'       => 'email_user_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_invoice_heading' => array(
             'id'       => 'email_user_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+            'std'      => __('Your invoice {invoice_number} details', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_invoice_body' => array(
             'id'       => 'email_user_invoice_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -471,53 +471,53 @@ 
 
         'email_user_note_header' => array(
             'id'       => 'email_user_note_header',
-            'name'     => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent when you add a customer note to an invoice/quote.', 'invoicing' ),
+            'name'     => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent when you add a customer note to an invoice/quote.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_user_note_active' => array(
             'id'       => 'email_user_note_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_user_note_admin_bcc' => array(
             'id'       => 'email_user_note_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_user_note_subject' => array(
             'id'       => 'email_user_note_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_note_heading' => array(
             'id'       => 'email_user_note_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'A note has been added to your {invoice_label}', 'invoicing' ),
+            'std'      => __('A note has been added to your {invoice_label}', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_user_note_body' => array(
             'id'       => 'email_user_note_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {name},</p><p>Following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -527,63 +527,63 @@ 
 
         'email_overdue_header' => array(
             'id'       => 'email_overdue_header',
-            'name'     => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing' ),
+            'name'     => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+            'desc'     => __('Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_overdue_active' => array(
             'id'       => 'email_overdue_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_overdue_admin_bcc' => array(
             'id'       => 'email_overdue_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_overdue_days' => array(
             'id'       => 'email_overdue_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like payment reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1' ),
+            'std'      => array('1'),
             'type'     => 'multicheck',
             'options'  => $overdue_days_options,
         ),
 
         'email_overdue_subject' => array(
             'id'       => 'email_overdue_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Payment Reminder', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_overdue_heading' => array(
             'id'       => 'email_overdue_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Payment reminder for your invoice', 'invoicing' ),
+            'std'      => __('Payment reminder for your invoice', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_overdue_body' => array(
             'id'       => 'email_overdue_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
+            'name'     => __('Email Content', 'invoicing'),
             'desc'     => wpinv_get_merge_tags_help_text(),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+            'std'      => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -594,63 +594,63 @@ 
 
         'email_renewal_reminder_header' => array(
             'id'       => 'email_renewal_reminder_header',
-            'name'     => '<h3>' . __( 'Renewal Reminder', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent to customers whenever their subscription is about to expire.', 'invoicing' ),
+            'name'     => '<h3>' . __('Renewal Reminder', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent to customers whenever their subscription is about to expire.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_renewal_reminder_active' => array(
             'id'       => 'email_renewal_reminder_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_renewal_reminder_admin_bcc' => array(
             'id'       => 'email_renewal_reminder_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_renewal_reminder_days' => array(
             'id'       => 'email_renewal_reminder_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like renewal reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like renewal reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1', '5', '10' ),
+            'std'      => array('1', '5', '10'),
             'type'     => 'multicheck',
             'options'  => $renewal_days_options,
         ),
 
         'email_renewal_reminder_subject' => array(
             'id'       => 'email_renewal_reminder_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Renewal Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Renewal Reminder', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_renewal_reminder_heading' => array(
             'id'       => 'email_renewal_reminder_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Upcoming renewal reminder', 'invoicing' ),
+            'std'      => __('Upcoming renewal reminder', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_renewal_reminder_body' => array(
             'id'       => 'email_renewal_reminder_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -661,53 +661,53 @@ 
 
         'email_subscription_trial_header' => array(
             'id'       => 'email_subscription_trial_header',
-            'name'     => '<h3>' . __( 'Trial Started', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent when a customer starts a subscription trial.', 'invoicing' ),
+            'name'     => '<h3>' . __('Trial Started', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent when a customer starts a subscription trial.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_subscription_trial_active' => array(
             'id'       => 'email_subscription_trial_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_subscription_trial_admin_bcc' => array(
             'id'       => 'email_subscription_trial_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 0
         ),
 
         'email_subscription_trial_subject' => array(
             'id'       => 'email_subscription_trial_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription trial email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription trial email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Trial Started', 'invoicing' ),
+            'std'      => __('[{site_title}] Trial Started', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_trial_heading' => array(
             'id'       => 'email_subscription_trial_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Trial Started', 'invoicing' ),
+            'std'      => __('Trial Started', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_trial_body' => array(
             'id'       => 'email_subscription_trial_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -717,53 +717,53 @@ 
 
         'email_subscription_cancelled_header' => array(
             'id'       => 'email_subscription_cancelled_header',
-            'name'     => '<h3>' . __( 'Subscription Cancelled', 'invoicing' ) . '</h3>',
-            'desc'     => __( 'These emails are sent when a customer cancels their subscription.', 'invoicing' ),
+            'name'     => '<h3>' . __('Subscription Cancelled', 'invoicing') . '</h3>',
+            'desc'     => __('These emails are sent when a customer cancels their subscription.', 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_subscription_cancelled_active' => array(
             'id'       => 'email_subscription_cancelled_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_cancelled_admin_bcc' => array(
             'id'       => 'email_subscription_cancelled_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_cancelled_subject' => array(
             'id'       => 'email_subscription_cancelled_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription cancelled email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription cancelled email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_cancelled_heading' => array(
             'id'       => 'email_subscription_cancelled_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Cancelled', 'invoicing' ),
+            'std'      => __('Subscription Cancelled', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_cancelled_body' => array(
             'id'       => 'email_subscription_cancelled_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -773,53 +773,53 @@ 
 
         'email_subscription_expired_header' => array(
             'id'       => 'email_subscription_expired_header',
-            'name'     => '<h3>' . __( 'Subscription Expired', 'invoicing' ) . '</h3>',
-            'desc'     => __( "These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing' ),
+            'name'     => '<h3>' . __('Subscription Expired', 'invoicing') . '</h3>',
+            'desc'     => __("These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing'),
             'type'     => 'header',
         ),
 
         'email_subscription_expired_active' => array(
             'id'       => 'email_subscription_expired_active',
-            'name'     => __( 'Enable/Disable', 'invoicing' ),
-            'desc'     => __( 'Enable this email notification', 'invoicing' ),
+            'name'     => __('Enable/Disable', 'invoicing'),
+            'desc'     => __('Enable this email notification', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_expired_admin_bcc' => array(
             'id'       => 'email_subscription_expired_admin_bcc',
-            'name'     => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'     => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'     => __('Enable Admin BCC', 'invoicing'),
+            'desc'     => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'     => 'checkbox',
             'std'      => 1
         ),
 
         'email_subscription_expired_subject' => array(
             'id'       => 'email_subscription_expired_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription expired email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription expired email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Expired', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Expired', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_expired_heading' => array(
             'id'       => 'email_subscription_expired_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'type'     => 'text',
-            'std'      => __( 'Subscription Expired', 'invoicing' ),
+            'std'      => __('Subscription Expired', 'invoicing'),
             'help-tip' => true,
             'size'     => 'large'
         ),
 
         'email_subscription_expired_body' => array(
             'id'       => 'email_subscription_expired_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),
@@ -829,53 +829,53 @@ 
 
         'email_subscription_complete_header' => array(
             'id'     => 'email_subscription_complete_header',
-            'name'   => '<h3>' . __( 'Subscription Complete', 'invoicing' ) . '</h3>',
-            'desc'   => __( 'These emails are sent when a customer completes their subscription.', 'invoicing' ),
+            'name'   => '<h3>' . __('Subscription Complete', 'invoicing') . '</h3>',
+            'desc'   => __('These emails are sent when a customer completes their subscription.', 'invoicing'),
             'type'   => 'header',
         ),
 
         'email_subscription_complete_active' => array(
             'id'      => 'email_subscription_complete_active',
-            'name'    => __( 'Enable/Disable', 'invoicing' ),
-            'desc'    => __( 'Enable this email notification', 'invoicing' ),
+            'name'    => __('Enable/Disable', 'invoicing'),
+            'desc'    => __('Enable this email notification', 'invoicing'),
             'type'    => 'checkbox',
             'std'     => 1
         ),
 
         'email_subscription_complete_admin_bcc' => array(
             'id'      => 'email_subscription_complete_admin_bcc',
-            'name'    => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc'    => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name'    => __('Enable Admin BCC', 'invoicing'),
+            'desc'    => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type'    => 'checkbox',
             'std'     => 1
         ),
 
         'email_subscription_complete_subject' => array(
             'id'       => 'email_subscription_complete_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription complete email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription complete email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Complete', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Complete', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_complete_heading' => array(
             'id'       => 'email_subscription_complete_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Complete', 'invoicing' ),
+            'std'      => __('Subscription Complete', 'invoicing'),
             'size'     => 'large'
         ),
 
         'email_subscription_complete_body' => array(
             'id'       => 'email_subscription_complete_body',
-            'name'     => __( 'Email Content', 'invoicing' ),
-            'desc'     => wpinv_get_merge_tags_help_text( true ),
+            'name'     => __('Email Content', 'invoicing'),
+            'desc'     => wpinv_get_merge_tags_help_text(true),
             'type'     => 'rich_editor',
-            'std'      => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing'),
             'class'    => 'large',
             'size'     => 10,
         ),