AyeCode / invoicing

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.</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.</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.</p>', 'invoicing' ),
+            'std'      => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled.</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.</p>', 'invoicing' ),
+            'std'      => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through.</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.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment.</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}.</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}.</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.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid.</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.</p>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded.</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}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing' ),
+            'std'      => __('<p>Hi {name},</p><p>Following note has been added to your {invoice_label}:</p><blockquote class="wpinv-note">{customer_note}</blockquote>', 'invoicing'),
             'class'    => 'large',
             'size'     => '10'
         ),
@@ -528,63 +528,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,
         ),
@@ -595,63 +595,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,
         ),
@@ -662,53 +662,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,
         ),
@@ -718,53 +718,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,
         ),
@@ -774,53 +774,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,
         ),
@@ -830,53 +830,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,
         ),

includes/admin/class-getpaid-admin.php

Spacing +186 added lines, -186 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main admin class.
@@ -37,13 +37,13 @@ 
     /**
 	 * Class constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 
-        $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->admin_path = plugin_dir_path(__FILE__);
+		$this->admin_url   = plugins_url('/', __FILE__);
 		$this->reports     = new GetPaid_Reports();
 
-        if ( is_admin() ) {
+        if (is_admin()) {
 			$this->init_admin_hooks();
         }
 
@@ -54,22 +54,22 @@ 
 	 *
 	 */
 	private function init_admin_hooks() {
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
-        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
-        add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
-        add_action( 'admin_init', array( $this, 'activation_redirect') );
-        add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-        add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action('admin_enqueue_scripts', array($this, 'enqeue_scripts'));
+        add_filter('admin_body_class', array($this, 'admin_body_class'));
+        add_action('admin_init', array($this, 'init_ayecode_connect_helper'));
+        add_action('admin_init', array($this, 'activation_redirect'));
+        add_action('admin_init', array($this, 'maybe_do_admin_action'));
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('getpaid_authenticated_admin_action_rate_plugin', array($this, 'redirect_to_wordpress_rating_page'));
+		add_action('getpaid_authenticated_admin_action_send_invoice', array($this, 'send_customer_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice_reminder', array($this, 'send_customer_payment_reminder'));
+        add_action('getpaid_authenticated_admin_action_reset_tax_rates', array($this, 'admin_reset_tax_rates'));
+		add_action('getpaid_authenticated_admin_action_create_missing_pages', array($this, 'admin_create_missing_pages'));
+		add_action('getpaid_authenticated_admin_action_create_missing_tables', array($this, 'admin_create_missing_tables'));
+		add_action('getpaid_authenticated_admin_action_migrate_old_invoices', array($this, 'admin_migrate_old_invoices'));
+		add_action('getpaid_authenticated_admin_action_recalculate_discounts', array($this, 'admin_recalculate_discounts'));
+		add_filter('admin_footer_text', array($this, 'admin_footer_text'));
+		do_action('getpaid_init_admin_hooks', $this);
 
     }
 
@@ -80,37 +80,37 @@ 
 	public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page    = isset($_GET['page']) ? $_GET['page'] : '';
 		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( false !== stripos( $page, 'wpi' ) ) {
+        if (false !== stripos($page, 'wpi')) {
 
             // Styles.
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-            wp_enqueue_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array( 'wp-color-picker' ), $version );
-            wp_enqueue_style( 'select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all' );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+            wp_enqueue_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array('wp-color-picker'), $version);
+            wp_enqueue_style('select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all');
 
             // Scripts.
-            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array( 'jquery' ), WPINV_VERSION );
+            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array('jquery'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-            wp_enqueue_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'wp-color-picker' ),  $version );
-            wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', apply_filters( 'wpinv_admin_js_localize', $this->get_admin_i18() ) );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+            wp_enqueue_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'wp-color-picker'), $version);
+            wp_localize_script('wpinv-admin-script', 'WPInv_Admin', apply_filters('wpinv_admin_js_localize', $this->get_admin_i18()));
 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+		if ('wpi_payment_form' == $page && $editing) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
+		if ($page == 'wpinv-subscriptions') {
+			wp_enqueue_script('postbox');
 		}
 
     }
@@ -123,32 +123,32 @@ 
         global $post;
 
 		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days'
+			'period' => isset($_GET['date_range']) ? sanitize_text_field($_GET['date_range']) : '7_days'
 		);
 
-		if ( $date_range['period'] == 'custom' ) {
+		if ($date_range['period'] == 'custom') {
 			
-			if ( isset( $_GET['from'] ) ) {
-				$date_range[ 'after' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+			if (isset($_GET['from'])) {
+				$date_range['after'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['from']), current_time('timestamp')) - DAY_IN_SECONDS);
 			}
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range[ 'before' ] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+			if (isset($_GET['to'])) {
+				$date_range['before'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['to']), current_time('timestamp')) + DAY_IN_SECONDS);
 			}
 
 		}
 
         $i18n = array(
-            'ajax_url'                  => admin_url( 'admin-ajax.php' ),
-            'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
+            'ajax_url'                  => admin_url('admin-ajax.php'),
+            'post_ID'                   => isset($post->ID) ? $post->ID : '',
+			'wpinv_nonce'               => wp_create_nonce('wpinv-nonce'),
+			'rest_nonce'                => wp_create_nonce('wp_rest'),
+			'rest_root'                 => esc_url_raw(rest_url()),
 			'date_range'                => $date_range,
-            'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
-            'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
-            'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
-            'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
+            'add_invoice_note_nonce'    => wp_create_nonce('add-invoice-note'),
+            'delete_invoice_note_nonce' => wp_create_nonce('delete-invoice-note'),
+            'invoice_item_nonce'        => wp_create_nonce('invoice-item'),
+            'billing_details_nonce'     => wp_create_nonce('get-billing-details'),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
 			'currency_symbol'           => wpinv_currency_symbol(),
@@ -157,38 +157,38 @@ 
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
             'decimals'                  => wpinv_decimals(),
-            'save_invoice'              => __( 'Save Invoice', 'invoicing' ),
-            'status_publish'            => wpinv_status_nicename( 'publish' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'delete_tax_rate'           => __( 'Are you sure you wish to delete this tax rate?', 'invoicing' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'FillBillingDetails'        => __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' ),
-            'confirmCalcTotals'         => __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' ),
-            'AreYouSure'                => __( 'Are you sure?', 'invoicing' ),
-            'errDeleteItem'             => __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' ),
-            'delete_subscription'       => __( 'Are you sure you want to delete this subscription?', 'invoicing' ),
-            'action_edit'               => __( 'Edit', 'invoicing' ),
-            'action_cancel'             => __( 'Cancel', 'invoicing' ),
-            'item_description'          => __( 'Item Description', 'invoicing' ),
-            'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
-            'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
+            'save_invoice'              => __('Save Invoice', 'invoicing'),
+            'status_publish'            => wpinv_status_nicename('publish'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'delete_tax_rate'           => __('Are you sure you wish to delete this tax rate?', 'invoicing'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'FillBillingDetails'        => __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'),
+            'confirmCalcTotals'         => __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing'),
+            'AreYouSure'                => __('Are you sure?', 'invoicing'),
+            'errDeleteItem'             => __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'),
+            'delete_subscription'       => __('Are you sure you want to delete this subscription?', 'invoicing'),
+            'action_edit'               => __('Edit', 'invoicing'),
+            'action_cancel'             => __('Cancel', 'invoicing'),
+            'item_description'          => __('Item Description', 'invoicing'),
+            'invoice_description'       => __('Invoice Description', 'invoicing'),
+            'discount_description'      => __('Discount Description', 'invoicing'),
+			'searching'                 => __('Searching', 'invoicing'),
+			'loading'                   => __('Loading...', 'invoicing'),
+			'search_customers'          => __('Enter customer name or email', 'invoicing'),
+			'search_items'              => __('Enter item name', 'invoicing'),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (!empty($post) && getpaid_is_invoice_post_type($post->post_type)) {
 
-			$invoice              = new WPInv_Invoice( $post );
+			$invoice              = new WPInv_Invoice($post);
 			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('Save %s', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('%s Description', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 		}
@@ -202,24 +202,24 @@ 
 	 * @param  string $footer_text
 	 * @return string
 	 */
-	public function admin_footer_text( $footer_text ) {
+	public function admin_footer_text($footer_text) {
 		global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
+        if (apply_filters('getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing()) && false !== stripos($page, 'wpi')) {
 
 			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+			if (!get_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', true)) {
 
-				$rating_url  = esc_url(
+				$rating_url = esc_url(
 					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+						admin_url('admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin'),
 						'getpaid-nonce',
 						'getpaid-nonce'
 						)
@@ -227,7 +227,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+					__('If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing'),
 					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
 				);
 
@@ -235,7 +235,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
+					__('Thank you for using %s!', 'invoicing'),
 					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
 				);
 
@@ -252,8 +252,8 @@ 
 	 * @since  2.0.0
 	 */
 	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+		update_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', 1);
+		wp_redirect('https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post');
 		exit;
 	}
 
@@ -264,30 +264,30 @@ 
 	protected function load_payment_form_scripts() {
         global $post;
 
-        wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+		wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+		wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+		wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
 
 		wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+				'elements'      => wpinv_get_data('payment-form-elements'),
+				'form_elements' => getpaid_get_payment_form_elements($post->ID),
 				'currency'      => wpinv_currency_symbol(),
 				'position'      => wpinv_currency_position(),
 				'decimals'      => (int) wpinv_decimals(),
 				'thousands_sep' => wpinv_thousands_separator(),
 				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
+				'form_items'    => gepaid_get_form_items($post->ID),
 				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
-        wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+        wp_enqueue_script('wpinv-admin-payment-form-script');
 
     }
 
@@ -298,25 +298,25 @@ 
      * @return string
 	 *
 	 */
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
 		global $pagenow, $post, $current_screen;
 
 
-        $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
-        if ( false !== stripos( $page, 'wpi' ) ) {
-            $classes .= ' wpi-' . sanitize_key( $page );
+        if (false !== stripos($page, 'wpi')) {
+            $classes .= ' wpi-' . sanitize_key($page);
         }
 
-        if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
+        if (in_array($page, wpinv_parse_list('wpi_invoice wpi_payment_form wpi_quote'))) {
             $classes .= ' wpinv-cpt wpinv';
 		}
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+		if (getpaid_is_invoice_post_type($page)) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
@@ -326,19 +326,19 @@ 
     /**
 	 * Maybe show the AyeCode Connect Notice.
 	 */
-	public function init_ayecode_connect_helper(){
+	public function init_ayecode_connect_helper() {
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+				'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+				'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+				'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+				'connect_button'    => __("Connect Site", "invoicing"),
+				'connecting_button'    => __("Connecting...", "invoicing"),
+				'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+				'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             ),
-            array( 'wpi-addons' )
+            array('wpi-addons')
         );
 
     }
@@ -350,20 +350,20 @@ 
 	 */
 	public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+		$redirected = get_option('wpinv_redirected_to_settings');
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+		if (!empty($redirected) || wp_doing_ajax() || !current_user_can('manage_options')) {
 			return;
 		}
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+	    update_option('wpinv_redirected_to_settings', 1);
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
 
 	}
@@ -373,9 +373,9 @@ 
      */
     public function maybe_do_admin_action() {
 
-        if ( wpinv_current_user_can_manage_invoicing() && isset( $_REQUEST['getpaid-admin-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-admin-action'] );
-            do_action( "getpaid_authenticated_admin_action_$key", $_REQUEST );
+        if (wpinv_current_user_can_manage_invoicing() && isset($_REQUEST['getpaid-admin-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+            $key = sanitize_key($_REQUEST['getpaid-admin-action']);
+            do_action("getpaid_authenticated_admin_action_$key", $_REQUEST);
         }
 
     }
@@ -385,16 +385,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
+    public function send_customer_invoice($args) {
+		$sent = getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($args['invoice_id']), true);
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Invoice was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not send the invoice to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not send the invoice to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -403,16 +403,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_payment_reminder($args) {
+		$sent = getpaid()->get('invoice_emails')->force_send_overdue_notice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Payment reminder was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent payment reminder to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -422,8 +422,8 @@ 
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -435,8 +435,8 @@ 
     public function admin_create_missing_pages() {
 		$installer = new GetPaid_Installer();
 		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		$this->show_success(__('GetPaid pages updated.', 'invoicing'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -448,35 +448,35 @@ 
 		global $wpdb;
 		$installer = new GetPaid_Installer();
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'" ) != $wpdb->prefix . 'wpinv_subscriptions' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}wpinv_subscriptions'") != $wpdb->prefix . 'wpinv_subscriptions') {
 			$installer->create_subscriptions_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) != $wpdb->prefix . 'getpaid_invoices' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'") != $wpdb->prefix . 'getpaid_invoices') {
 			$installer->create_invoices_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'" ) != $wpdb->prefix . 'getpaid_invoice_items' ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoice_items'") != $wpdb->prefix . 'getpaid_invoice_items') {
 			$installer->create_invoice_items_table();
 
-			if ( $wpdb->last_error !== '' ) {
-				$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+			if ($wpdb->last_error !== '') {
+				$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 			}
 		}
 
-		if ( ! $this->has_notices() ) {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+		if (!$this->has_notices()) {
+			$this->show_success(__('Your GetPaid tables have been updated.', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -491,10 +491,10 @@ 
 		$installer->migrate_old_invoices();
 
 		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+		$this->show_success(__('Your invoices have been migrated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -508,36 +508,36 @@ 
 
 		// Fetch all invoices that have discount codes.
 		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+		$invoices = $wpdb->get_col("SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+			$invoice = new WPInv_Invoice($invoice);
 
-			if ( ! $invoice->exists() ) {
+			if (!$invoice->exists()) {
 				continue;
 			}
 
 			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if (!$discount->exists()) {
 				continue;
 			}
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			$invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
+			if ($invoice->get_total_discount() > 0) {
 				$invoice->save();
 			}
 
 		}
 
 		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+		$this->show_success(__('Discounts have been recalculated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -549,8 +549,8 @@ 
      * @return array
 	 */
 	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
-        return is_array( $notices ) ? $notices : array();
+		$notices = get_option('wpinv_admin_notices');
+        return is_array($notices) ? $notices : array();
 	}
 
 	/**
@@ -560,7 +560,7 @@ 
      * @return array
 	 */
 	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
+		return count($this->get_notices()) > 0;
 	}
 
 	/**
@@ -570,7 +570,7 @@ 
 	 * @since       1.0.19
 	 */
 	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
+		delete_option('wpinv_admin_notices');
 	}
 
 	/**
@@ -579,16 +579,16 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function save_notice( $type, $message ) {
+	public function save_notice($type, $message) {
 		$notices = $this->get_notices();
 
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
+		if (empty($notices[$type]) || !is_array($notices[$type])) {
+			$notices[$type] = array();
 		}
 
-		$notices[ $type ][] = $message;
+		$notices[$type][] = $message;
 
-		update_option( 'wpinv_admin_notices', $notices );
+		update_option('wpinv_admin_notices', $notices);
 	}
 
 	/**
@@ -598,8 +598,8 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
+	public function show_success($msg) {
+		$this->save_notice('success', $msg);
 	}
 
 	/**
@@ -609,8 +609,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
+	public function show_error($msg) {
+		$this->save_notice('error', $msg);
 	}
 
 	/**
@@ -620,8 +620,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
+	public function show_warning($msg) {
+		$this->save_notice('warning', $msg);
 	}
 
 	/**
@@ -631,8 +631,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
+	public function show_info($msg) {
+		$this->save_notice('info', $msg);
 	}
 
 	/**
@@ -646,32 +646,32 @@ 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+		foreach ($notices as $type => $messages) {
 
-			if ( ! is_array( $messages ) ) {
+			if (!is_array($messages)) {
 				continue;
 			}
 
-            $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
-                $message = wp_kses_post( $message );
+            $type = sanitize_key($type);
+			foreach ($messages as $message) {
+                $message = wp_kses_post($message);
 				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+		foreach (array('checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page') as $page) {
 
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = esc_url(
+			if (!is_numeric(wpinv_get_option($page, false))) {
+				$url = esc_url(
 					wp_nonce_url(
-						add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+						add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 						'getpaid-nonce',
 						'getpaid-nonce'
 					)
 				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
+				$message  = __('Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing');
+				$message2 = __('Generate Pages', 'invoicing');
 				echo "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>";
 				break;
 			}

includes/class-getpaid-invoice-notification-emails.php

Spacing +106 added lines, -106 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles invoice notificaiton emails.
@@ -28,7 +28,7 @@ 
 		$this->invoice_actions = apply_filters(
 			'getpaid_notification_email_invoice_triggers',
 			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+				'getpaid_new_invoice'                   => array('new_invoice', 'user_invoice'),
 				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
 				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
 				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
@@ -50,11 +50,11 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+		add_filter('getpaid_get_email_merge_tags', array($this, 'invoice_merge_tags'), 10, 2);
+		add_filter('getpaid_invoice_email_recipients', array($this, 'filter_email_recipients'), 10, 2);
 
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
+		foreach ($this->invoice_actions as $hook => $email_type) {
+			$this->init_email_type_hook($hook, $email_type);
 		}
 	}
 
@@ -64,25 +64,25 @@ 
 	 * @param string $hook
 	 * @param string|array $email_type
 	 */
-	public function init_email_type_hook( $hook, $email_type ) {
+	public function init_email_type_hook($hook, $email_type) {
 
-		$email_type = wpinv_parse_list( $email_type );
+		$email_type = wpinv_parse_list($email_type);
 
-		foreach ( $email_type as $type ) {
+		foreach ($email_type as $type) {
 
-			$email = new GetPaid_Notification_Email( $type );
+			$email = new GetPaid_Notification_Email($type);
 
 			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
+			if (method_exists($this, $type)) {
+				add_action($hook, array($this, $type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+			do_action('getpaid_invoice_init_email_type_hook', $type, $hook);
 		}
 
 	}
@@ -93,19 +93,19 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
+	public function invoice_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
+		if (is_a($object, 'WPInv_Invoice')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
+				$this->get_invoice_merge_tags($object)
 			);
 		}
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
+				$this->get_invoice_merge_tags($object->get_parent_payment())
 			);
 		}
 
@@ -119,35 +119,35 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_invoice_merge_tags( $invoice ) {
+	public function get_invoice_merge_tags($invoice) {
 
 		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
+		if (!$invoice->get_id()) {
 			return array();
 		}
 
 		$merge_tags = array(
-			'{name}'                => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'           => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'          => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'           => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'               => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'      => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'    => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'       => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'        => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'    => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}'=> esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'        => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'    => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'       => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'       => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}' => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'   => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'              => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+			'{name}'                => sanitize_text_field($invoice->get_user_full_name()),
+			'{full_name}'           => sanitize_text_field($invoice->get_user_full_name()),
+			'{first_name}'          => sanitize_text_field($invoice->get_first_name()),
+			'{last_name}'           => sanitize_text_field($invoice->get_last_name()),
+			'{email}'               => sanitize_email($invoice->get_email()),
+			'{invoice_number}'      => sanitize_text_field($invoice->get_number()),
+			'{invoice_currency}'    => sanitize_text_field($invoice->get_currency()),
+			'{invoice_total}'       => sanitize_text_field(wpinv_price($invoice->get_total(), $invoice->get_currency())),
+			'{invoice_link}'        => esc_url($invoice->get_view_url()),
+			'{invoice_pay_link}'    => esc_url($invoice->get_checkout_payment_url()),
+			'{invoice_receipt_link}'=> esc_url($invoice->get_receipt_url()),
+			'{invoice_date}'        => getpaid_format_date_value($invoice->get_date_created()),
+			'{invoice_due_date}'    => getpaid_format_date_value($invoice->get_due_date(), __('on receipt', 'invoicing')),
+			'{invoice_quote}'       => sanitize_text_field(strtolower($invoice->get_label())),
+			'{invoice_label}'       => sanitize_text_field(ucfirst($invoice->get_label())),
+			'{invoice_description}' => wp_kses_post($invoice->get_description()),
+			'{subscription_name}'   => wp_kses_post($invoice->get_subscription_name()),
+			'{is_was}'              => strtotime($invoice->get_due_date()) < current_time('timestamp') ? __('was', 'invoicing') : __('is', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+		return apply_filters('getpaid_invoice_email_merge_tags', $merge_tags, $invoice);
 	}
 
 	/**
@@ -159,35 +159,35 @@ 
 	 * @param string|array $recipients
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+	public function send_email($invoice, $email, $type, $recipients, $extra_args = array()) {
 
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_before_send_invoice_notification', $type, $invoice, $email);
 
 		$mailer     = new GetPaid_Notification_Email_Sender();
 		$merge_tags = $email->get_merge_tags();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
+			apply_filters('getpaid_invoice_email_recipients', wpinv_parse_list($recipients), $email),
+			$email->add_merge_tags($email->get_subject(), $merge_tags),
+			$email->get_content($merge_tags, $extra_args),
 			$email->get_attachments()
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
+				$email->add_merge_tags($email->get_subject() . __(' - ADMIN BCC COPY', 'invoicing'), $merge_tags),
+				$email->get_content($merge_tags),
 				$email->get_attachments()
 			);
 		}
 
-		if ( ! $result ) {
-			$invoice->add_note( sprintf( __( 'Failed sending %s notification email.', 'invoicing' ), sanitize_key( $type ) ), false, false, true );
+		if (!$result) {
+			$invoice->add_note(sprintf(__('Failed sending %s notification email.', 'invoicing'), sanitize_key($type)), false, false, true);
 		}
 
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_after_send_invoice_notification', $type, $invoice, $email);
 
 		return $result;
 	}
@@ -198,14 +198,14 @@ 
 	 * @param array $recipients
 	 * @param GetPaid_Notification_Email $email
 	 */
-	public function filter_email_recipients( $recipients, $email ) {
+	public function filter_email_recipients($recipients, $email) {
 
-		if ( ! $email->is_admin_email() ) {
+		if (!$email->is_admin_email()) {
 			$cc = $email->object->get_email_cc();
 
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+			if (!empty($cc)) {
+				$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 			}
 
 		}
@@ -219,17 +219,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function new_invoice( $invoice ) {
+	public function new_invoice($invoice) {
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+		if (!$invoice->is_type('invoice') || $this->is_payment_form_invoice($invoice->get_id())) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -238,12 +238,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function cancelled_invoice( $invoice ) {
+	public function cancelled_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -252,12 +252,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function failed_invoice( $invoice ) {
+	public function failed_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -266,12 +266,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function onhold_invoice( $invoice ) {
+	public function onhold_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -280,12 +280,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function processing_invoice( $invoice ) {
+	public function processing_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -294,17 +294,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function completed_invoice( $invoice ) {
+	public function completed_invoice($invoice) {
 
 		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+		if ($invoice->is_renewal() && !wpinv_get_option('email_completed_invoice_renewal_active', false)) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -313,12 +313,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function refunded_invoice( $invoice ) {
+	public function refunded_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -328,21 +328,21 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param bool $force
 	 */
-	public function user_invoice( $invoice, $force = false ) {
+	public function user_invoice($invoice, $force = false) {
 
-		if ( ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+		if (!empty($GLOBALS['wpinv_skip_invoice_notification'])) {
 			return;
 		}
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+		if (!$invoice->is_type('invoice') || (empty($force) && $this->is_payment_form_invoice($invoice->get_id()))) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -352,8 +352,8 @@ 
 	 * @param int $invoice
 	 * @return bool
 	 */
-	public function is_payment_form_invoice( $invoice ) {
-		return empty( $_GET['getpaid-admin-action'] ) && ( 'payment_form' == get_post_meta( $invoice, 'wpinv_created_via', true ) || 'geodirectory' == get_post_meta( $invoice, 'wpinv_created_via', true ) );
+	public function is_payment_form_invoice($invoice) {
+		return empty($_GET['getpaid-admin-action']) && ('payment_form' == get_post_meta($invoice, 'wpinv_created_via', true) || 'geodirectory' == get_post_meta($invoice, 'wpinv_created_via', true));
 	}
 
 	/**
@@ -362,12 +362,12 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $note
 	 */
-	public function user_note( $invoice, $note ) {
+	public function user_note($invoice, $note) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient, array('customer_note' => $note));
 
 	}
 
@@ -376,9 +376,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+	public function force_send_overdue_notice($invoice) {
+		$email = new GetPaid_Notification_Email('overdue', $invoice);
+		return $this->send_email($invoice, $email, 'overdue', $invoice->get_email());
 	}
 
 	/**
@@ -389,37 +389,37 @@ 
 	public function overdue() {
 		global $wpdb;
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
+		$date_query = $this->get_date_query($reminder_days);
 
 		// Invoices table.
 		$table = $wpdb->prefix . 'getpaid_invoices';
 
 		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
+		$invoices = $wpdb->get_col(
 			"SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
 			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
+			if (!$this->is_payment_form_invoice($invoice)) {
+				$invoice       = new WPInv_Invoice($invoice);
 				$email->object = $invoice;
 
-				if ( $invoice->needs_payment() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+				if ($invoice->needs_payment()) {
+					$this->send_email($invoice, $email, __FUNCTION__, $invoice->get_email());
 				}
 
 			}
@@ -434,14 +434,14 @@ 
 	 * @param array $reminder_days
 	 * @return string
 	 */
-	public function get_date_query( $reminder_days ) {
+	public function get_date_query($reminder_days) {
 
 		$date_query = array(
 			'relation'  => 'OR'
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("-$days days", current_time('timestamp'))));
 
 			$date_query[] = array(
 				'year'  => $date['year'],
@@ -451,7 +451,7 @@ 
 
 		}
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+		$date_query = new WP_Date_Query($date_query, 'invoices.due_date');
 
 		return $date_query->get_sql();
 

includes/admin/class-getpaid-installer.php

Spacing +71 added lines, -71 removed lines

@@ -8,7 +8,7 @@ 
  * @since   2.0.2
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main installer/updater class.
@@ -25,10 +25,10 @@ 
 	 *
 	 * @param string $upgrade_from The current invoicing version.
 	 */
-	public function upgrade_db( $upgrade_from ) {
+	public function upgrade_db($upgrade_from) {
 
 		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
+		update_option('wpinv_version', WPINV_VERSION);
 
 		// Setup the invoice Custom Post Type.
 		GetPaid_Post_Types::register_post_types();
@@ -48,7 +48,7 @@ 
 		// Create any missing database tables.
 		$method = "upgrade_from_$upgrade_from";
 
-		if ( method_exists( $this, $method ) ) {
+		if (method_exists($this, $method)) {
 			$this->$method();
 		}
 
@@ -64,7 +64,7 @@ 
 		$this->create_invoice_items_table();
 
 		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
 	}
 
 	/**
@@ -75,28 +75,28 @@ 
 		global $wpdb;
 
 		// Invoices.
-		$results = $wpdb->get_results( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+		$results = $wpdb->get_results("SELECT ID FROM {$wpdb->posts} WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+		if (!empty($results)) {
+			$wpdb->query("UPDATE {$wpdb->posts} SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
 
 			// Clean post cache
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->ID );
+			foreach ($results as $row) {
+				clean_post_cache($row->ID);
 			}
 
 		}
 
 		// Item meta key changes
 		$query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-		$results = $wpdb->get_results( $query );
+		$results = $wpdb->get_results($query);
 
-		if ( ! empty( $results ) ) {
-			$wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-			$wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-			$wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+		if (!empty($results)) {
+			$wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+			$wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+			$wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
 
-			foreach ( $results as $row ) {
-				clean_post_cache( $row->post_id );
+			foreach ($results as $row) {
+				clean_post_cache($row->post_id);
 			}
 
 		}
@@ -129,7 +129,7 @@ 
 	 */
 	public function upgrade_from_207() {
 		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+		$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);");
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 *
 	 */
 	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+		$GLOBALS['wp_roles']->add_cap('administrator', 'manage_invoicing');
 	}
 
 	/**
@@ -152,8 +152,8 @@ 
 
 				// Checkout page.
 				'checkout_page' => array(
-					'name'      => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'     => _x( 'Checkout', 'Page title', 'invoicing' ),
+					'name'      => _x('gp-checkout', 'Page slug', 'invoicing'),
+					'title'     => _x('Checkout', 'Page title', 'invoicing'),
 					'content'   => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
@@ -164,8 +164,8 @@ 
 
 				// Invoice history page.
 				'invoice_history_page' => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-invoices', 'Page slug', 'invoicing'),
+					'title'   => _x('My Invoices', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
@@ -176,8 +176,8 @@ 
 
 				// Success page content.
 				'success_page' => array(
-					'name'     => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'    => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+					'name'     => _x('gp-receipt', 'Page slug', 'invoicing'),
+					'title'    => _x('Payment Confirmation', 'Page title', 'invoicing'),
 					'content'  => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
@@ -188,16 +188,16 @@ 
 
 				// Failure page content.
 				'failure_page' => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+					'name'    => _x('gp-transaction-failed', 'Page slug', 'invoicing'),
+					'title'   => _x('Transaction Failed', 'Page title', 'invoicing'),
+					'content' => __('Your transaction failed, please try again or contact site support.', 'invoicing'),
 					'parent'  => 'gp-checkout',
 				),
 
 				// Subscriptions history page.
 				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-subscriptions', 'Page slug', 'invoicing'),
+					'title'   => _x('My Subscriptions', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
@@ -209,8 +209,8 @@ 
 			)
 		);
 
-		foreach ( $pages as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+		foreach ($pages as $key => $page) {
+			wpinv_create_page(esc_sql($page['name']), $key, $page['title'], $page['content'], $page['parent']);
 		}
 
 	}
@@ -223,7 +223,7 @@ 
 
 		global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Create tables.
 		$charset_collate = $wpdb->get_charset_collate();
@@ -250,7 +250,7 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -261,7 +261,7 @@ 
 	public function create_invoices_table() {
 		global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Create tables.
 		$charset_collate = $wpdb->get_charset_collate();
@@ -301,7 +301,7 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -312,7 +312,7 @@ 
 	public function create_invoice_items_table() {
 		global $wpdb;
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Create tables.
 		$charset_collate = $wpdb->get_charset_collate();
@@ -338,7 +338,7 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -351,40 +351,40 @@ 
 
 		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
 		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+		$migrated            = $wpdb->get_col("SELECT post_id FROM $invoices_table");
 		$invoices            = array_unique(
 			get_posts(
 				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+					'post_type'      => array('wpi_invoice', 'wpi_quote'),
 					'posts_per_page' => -1,
 					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
+					'post_status'    => array_keys(get_post_stati()),
 					'exclude'        => (array) $migrated,
 				)
 			)
 		);
 
 		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
+		if (empty($invoices)) {
 			return;
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php');
 
 		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
+			$invoice = new WPInv_Legacy_Invoice($invoice);
 
-			if ( empty( $invoice->ID ) ) {
+			if (empty($invoice->ID)) {
 				return;
 			}
 
-			$fields = array (
+			$fields = array(
 				'post_id'        => $invoice->ID,
 				'number'         => $invoice->get_number(),
 				'key'            => $invoice->get_key(),
-				'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
+				'type'           => str_replace('wpi_', '', $invoice->post_type),
 				'mode'           => $invoice->mode,
 				'user_ip'        => $invoice->get_ip(),
 				'first_name'     => $invoice->get_first_name(),
@@ -413,27 +413,27 @@ 
 				'custom_meta'    => $invoice->payment_meta
 			);
 
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
+			foreach ($fields as $key => $val) {
+				if (is_null($val)) {
 					$val = '';
 				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
+				$val = maybe_serialize($val);
+				$fields[$key] = $wpdb->prepare('%s', $val);
 			}
 
-			$fields = implode( ', ', $fields );
+			$fields = implode(', ', $fields);
 			$invoice_rows[] = "($fields)";
 
 			$item_rows    = array();
 			$item_columns = array();
-			foreach ( $invoice->get_cart_details() as $details ) {
+			foreach ($invoice->get_cart_details() as $details) {
 				$fields = array(
 					'post_id'          => $invoice->ID,
 					'item_id'          => $details['id'],
 					'item_name'        => $details['name'],
-					'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+					'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
 					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+					'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
 					'tax'              => $details['tax'],
 					'item_price'       => $details['item_price'],
 					'custom_price'     => $details['custom_price'],
@@ -445,31 +445,31 @@ 
 					'fees'             => $details['fees'],
 				);
 
-				$item_columns = array_keys ( $fields );
+				$item_columns = array_keys($fields);
 
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
+				foreach ($fields as $key => $val) {
+					if (is_null($val)) {
 						$val = '';
 					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
+					$val = maybe_serialize($val);
+					$fields[$key] = $wpdb->prepare('%s', $val);
 				}
 
-				$fields = implode( ', ', $fields );
+				$fields = implode(', ', $fields);
 				$item_rows[] = "($fields)";
 			}
 
-			$item_rows    = implode( ', ', $item_rows );
-			$item_columns = implode( ', ', $item_columns );
-			$wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+			$item_rows    = implode(', ', $item_rows);
+			$item_columns = implode(', ', $item_columns);
+			$wpdb->query("INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows");
 		}
 
-		if ( empty( $invoice_rows ) ) {
+		if (empty($invoice_rows)) {
 			return;
 		}
 
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+		$invoice_rows = implode(', ', $invoice_rows);
+		$wpdb->query("INSERT INTO $invoices_table VALUES $invoice_rows");
 
 	}
 
@@ -480,12 +480,12 @@ 
 	public static function rename_gateways_label() {
 		global $wpdb;
 
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+		foreach (array_keys(wpinv_get_payment_gateways()) as $gateway) {
 
 			$wpdb->update(
 				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+				array('gateway' => $gateway),
+				array('gateway' => wpinv_get_gateway_admin_label($gateway)),
 				'%s',
 				'%s'
 			);

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-payment-meta.php

Spacing +24 added lines, -24 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,10 +21,10 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         ?>
 
@@ -47,12 +47,12 @@ 
                                 'id'          => 'wpinv_key',
                                 'name'        => 'wpinv_key',
                                 'label'       => sprintf(
-                                    __( '%s Key:', 'invoicing' ),
-                                    ucfirst( $invoice->get_invoice_quote_type() )
+                                    __('%s Key:', 'invoicing'),
+                                    ucfirst($invoice->get_invoice_quote_type())
                                 ),
                                 'label_type'  => 'vertical',
                                 'class'       => 'form-control-sm',
-                                'value'       => $invoice->get_key( 'edit' ),
+                                'value'       => $invoice->get_key('edit'),
                                 'extra_attributes' => array(
                                     'onclick'  => 'this.select();',
                                     'readonly' => 'true',
@@ -67,8 +67,8 @@ 
                                 'id'          => 'wpinv_view_url',
                                 'name'        => 'wpinv_view_url',
                                 'label'       => sprintf(
-                                    __( '%s URL:', 'invoicing' ),
-                                    ucfirst( $invoice->get_invoice_quote_type() )
+                                    __('%s URL:', 'invoicing'),
+                                    ucfirst($invoice->get_invoice_quote_type())
                                 ),
                                 'label_type'  => 'vertical',
                                 'class'       => 'form-control-sm',
@@ -81,7 +81,7 @@ 
                         );
 
                         // If the invoice is paid...
-                        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+                        if ($invoice->is_paid() || $invoice->is_refunded()) {
 
                             // Payment date.
                             echo aui()->input(
@@ -89,11 +89,11 @@ 
                                     'type'        => 'datepicker',
                                     'id'          => 'wpinv_date_completed',
                                     'name'        => 'date_completed',
-                                    'label'       => __( 'Payment Date:', 'invoicing' ),
+                                    'label'       => __('Payment Date:', 'invoicing'),
                                     'label_type'  => 'vertical',
                                     'placeholder' => 'YYYY-MM-DD 00:00',
                                     'class'       => 'form-control-sm',
-                                    'value'       => $invoice->get_date_completed( 'edit' ),
+                                    'value'       => $invoice->get_date_completed('edit'),
                                     'extra_attributes' => array(
                                         'data-enable-time' => 'true',
                                         'data-time_24hr'   => 'true',
@@ -108,10 +108,10 @@ 
                                     'type'        => 'text',
                                     'id'          => 'wpinv_gateway',
                                     'name'        => '',
-                                    'label'       => __( 'Gateway:', 'invoicing' ),
+                                    'label'       => __('Gateway:', 'invoicing'),
                                     'label_type'  => 'vertical',
                                     'class'       => 'form-control-sm',
-                                    'value'       => wpinv_get_gateway_admin_label( $invoice->get_gateway( 'edit' ) ),
+                                    'value'       => wpinv_get_gateway_admin_label($invoice->get_gateway('edit')),
                                     'extra_attributes' => array(
                                         'onclick'  => 'this.select();',
                                         'readonly' => 'true',
@@ -125,11 +125,11 @@ 
                                     'type'        => 'text',
                                     'id'          => 'wpinv_transaction_id',
                                     'name'        => 'wpinv_transaction_id',
-                                    'label'       => __( 'Transaction ID:', 'invoicing' ),
+                                    'label'       => __('Transaction ID:', 'invoicing'),
                                     'label_type'  => 'vertical',
                                     'class'       => 'form-control-sm',
-                                    'value'       => $invoice->get_transaction_id( 'edit' ),
-                                    'help_text'   => apply_filters( 'wpinv_invoice_transaction_link_' . $invoice->get_gateway( 'edit' ), '', $invoice->get_transaction_id(), $invoice ),
+                                    'value'       => $invoice->get_transaction_id('edit'),
+                                    'help_text'   => apply_filters('wpinv_invoice_transaction_link_' . $invoice->get_gateway('edit'), '', $invoice->get_transaction_id(), $invoice),
                                     'extra_attributes' => array(
                                         'onclick'  => 'this.select();',
                                         'readonly' => 'true',
@@ -143,10 +143,10 @@ 
                                     'type'        => 'text',
                                     'id'          => 'wpinv_currency',
                                     'name'        => 'wpinv_currency',
-                                    'label'       => __( 'Currency:', 'invoicing' ),
+                                    'label'       => __('Currency:', 'invoicing'),
                                     'label_type'  => 'vertical',
                                     'class'       => 'form-control-sm',
-                                    'value'       => $invoice->get_currency( 'edit' ),
+                                    'value'       => $invoice->get_currency('edit'),
                                     'extra_attributes' => array(
                                         'onclick'  => 'this.select();',
                                         'readonly' => 'true',
@@ -156,7 +156,7 @@ 
 
                         } else {
 
-                            if ( 'wpi_invoice' == $invoice->get_post_type() ) {
+                            if ('wpi_invoice' == $invoice->get_post_type()) {
 
                                 // Payment URL.
                                 echo aui()->input(
@@ -164,7 +164,7 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_payment_url',
                                         'name'        => 'wpinv_payment_url',
-                                        'label'       => __( 'Payment URL:', 'invoicing' ),
+                                        'label'       => __('Payment URL:', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'class'       => 'form-control-sm',
                                         'value'       => $invoice->get_checkout_payment_url(),
@@ -180,13 +180,13 @@ 
                                     array(
                                         'id'               => 'wpinv_gateway',
                                         'name'             => 'wpinv_gateway',
-                                        'label'            => __( 'Gateway:', 'invoicing' ),
+                                        'label'            => __('Gateway:', 'invoicing'),
                                         'label_type'       => 'vertical',
-                                        'placeholder'      => __( 'Select Gateway', 'invoicing' ),
-                                        'value'            => $invoice->get_gateway( 'edit' ),
+                                        'placeholder'      => __('Select Gateway', 'invoicing'),
+                                        'value'            => $invoice->get_gateway('edit'),
                                         'select2'          => true,
                                         'data-allow-clear' => 'false',
-                                        'options'          => wp_list_pluck( wpinv_get_enabled_payment_gateways( true ), 'admin_label' ),
+                                        'options'          => wp_list_pluck(wpinv_get_enabled_payment_gateways(true), 'admin_label'),
                                     )
                                 );
 

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-address.php

Spacing +83 added lines, -83 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,14 +21,14 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Prepare the invoice.
-        $invoice  = new WPInv_Invoice( $post );
-        $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-        $customer = new WP_User( $customer );
-        $display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        $invoice  = new WPInv_Invoice($post);
+        $customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
+        $customer = new WP_User($customer);
+        $display  = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
         ?>
 
@@ -43,11 +43,11 @@ 
                         <div class="col-12 col-sm-6">
                             <div id="getpaid-invoice-user-id-wrapper" class="form-group">
                                 <div>
-                                    <label for="post_author_override"><?php _e( 'Customer', 'invoicing' );?></label>
+                                    <label for="post_author_override"><?php _e('Customer', 'invoicing'); ?></label>
                                 </div>
                                 <div>
-                                    <select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
-                                        <option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo sanitize_text_field( $display ); ?> </option>)
+                                    <select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
+                                        <option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo sanitize_text_field($display); ?> </option>)
                                     </select>
                                 </div>
                             </div>
@@ -60,7 +60,7 @@ 
                                             'type'        => 'text',
                                             'id'          => 'getpaid-invoice-new-user-email',
                                             'name'        => 'wpinv_email',
-                                            'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+                                            'label'       => __('Email', 'invoicing') . '<span class="required">*</span>',
                                             'label_type'  => 'vertical',
                                             'placeholder' => 'john@doe.com',
                                             'class'       => 'form-control-sm',
@@ -70,18 +70,18 @@ 
                             </div>
                         </div>
                         <div class="col-12 col-sm-6 form-group mt-sm-4">
-                            <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
+                            <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
                                 <a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
                                     <i aria-hidden="true" class="fa fa-refresh"></i>
-                                    <?php _e( 'Fill User Details', 'invoicing' );?>
+                                    <?php _e('Fill User Details', 'invoicing'); ?>
                                 </a>
                                 <a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
                                     <i aria-hidden="true" class="fa fa-plus"></i>
-                                    <?php _e( 'Add New User', 'invoicing' );?>
+                                    <?php _e('Add New User', 'invoicing'); ?>
                                 </a>
                                 <a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
                                     <i aria-hidden="true" class="fa fa-close"></i>
-                                    <?php _e( 'Cancel', 'invoicing' );?>
+                                    <?php _e('Cancel', 'invoicing'); ?>
                                 </a>
                             <?php endif; ?>
                         </div>
@@ -94,11 +94,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_first_name',
                                         'name'        => 'wpinv_first_name',
-                                        'label'       => __( 'First Name', 'invoicing' ),
+                                        'label'       => __('First Name', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_first_name( 'edit' ),
+                                        'value'       => $invoice->get_first_name('edit'),
                                     )
                                 );
                             ?>
@@ -110,11 +110,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_last_name',
                                         'name'        => 'wpinv_last_name',
-                                        'label'       => __( 'Last Name', 'invoicing' ),
+                                        'label'       => __('Last Name', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_last_name( 'edit' ),
+                                        'value'       => $invoice->get_last_name('edit'),
                                     )
                                 );
                             ?>
@@ -129,11 +129,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_company',
                                         'name'        => 'wpinv_company',
-                                        'label'       => __( 'Company', 'invoicing' ),
+                                        'label'       => __('Company', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_company( 'edit' ),
+                                        'value'       => $invoice->get_company('edit'),
                                     )
                                 );
                             ?>
@@ -145,11 +145,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_vat_number',
                                         'name'        => 'wpinv_vat_number',
-                                        'label'       => __( 'Vat Number', 'invoicing' ),
+                                        'label'       => __('Vat Number', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_vat_number( 'edit' ),
+                                        'value'       => $invoice->get_vat_number('edit'),
                                     )
                                 );
                             ?>
@@ -164,11 +164,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_address',
                                         'name'        => 'wpinv_address',
-                                        'label'       => __( 'Address', 'invoicing' ),
+                                        'label'       => __('Address', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_address( 'edit' ),
+                                        'value'       => $invoice->get_address('edit'),
                                     )
                                 );
                             ?>
@@ -180,11 +180,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_city',
                                         'name'        => 'wpinv_city',
-                                        'label'       => __( 'City', 'invoicing' ),
+                                        'label'       => __('City', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_city( 'edit' ),
+                                        'value'       => $invoice->get_city('edit'),
                                     )
                                 );
                             ?>
@@ -198,11 +198,11 @@ 
                                     array(
                                         'id'          => 'wpinv_country',
                                         'name'        => 'wpinv_country',
-                                        'label'       => __( 'Country', 'invoicing' ),
+                                        'label'       => __('Country', 'invoicing'),
                                         'label_type'  => 'vertical',
-                                        'placeholder' => __( 'Choose a country', 'invoicing' ),
+                                        'placeholder' => __('Choose a country', 'invoicing'),
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_country( 'edit' ),
+                                        'value'       => $invoice->get_country('edit'),
                                         'options'     => wpinv_get_country_list(),
                                         'data-allow-clear' => 'false',
                                         'select2'          => true,
@@ -213,20 +213,20 @@ 
                         <div class="col-12 col-sm-6">
                             <?php
 
-                                $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+                                $states = wpinv_get_country_states($invoice->get_country('edit'));
 
-                                if ( empty( $states ) ) {
+                                if (empty($states)) {
 
                                     echo aui()->input(
                                         array(
                                             'type'        => 'text',
                                             'id'          => 'wpinv_state',
                                             'name'        => 'wpinv_state',
-                                            'label'       => __( 'State', 'invoicing' ),
+                                            'label'       => __('State', 'invoicing'),
                                             'label_type'  => 'vertical',
                                             'placeholder' => '',
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_state( 'edit' ),
+                                            'value'       => $invoice->get_state('edit'),
                                         )
                                     );
 
@@ -236,11 +236,11 @@ 
                                         array(
                                             'id'          => 'wpinv_state',
                                             'name'        => 'wpinv_state',
-                                            'label'       => __( 'State', 'invoicing' ),
+                                            'label'       => __('State', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select a state', 'invoicing' ),
+                                            'placeholder' => __('Select a state', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_state( 'edit' ),
+                                            'value'       => $invoice->get_state('edit'),
                                             'options'     => $states,
                                             'data-allow-clear' => 'false',
                                             'select2'          => true,
@@ -261,11 +261,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_zip',
                                         'name'        => 'wpinv_zip',
-                                        'label'       => __( 'Zip / Postal Code', 'invoicing' ),
+                                        'label'       => __('Zip / Postal Code', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_zip( 'edit' ),
+                                        'value'       => $invoice->get_zip('edit'),
                                     )
                                 );
                             ?>
@@ -277,11 +277,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_phone',
                                         'name'        => 'wpinv_phone',
-                                        'label'       => __( 'Phone', 'invoicing' ),
+                                        'label'       => __('Phone', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_phone( 'edit' ),
+                                        'value'       => $invoice->get_phone('edit'),
                                     )
                                 );
                             ?>
@@ -297,49 +297,49 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post_id );
+        $invoice = new WPInv_Invoice($post_id);
 
         // Load new data.
         $invoice->set_props(
 			array(
-                'template'             => isset( $_POST['wpinv_template'] ) ? wpinv_clean( $_POST['wpinv_template'] ) : null,
-                'email_cc'             => isset( $_POST['wpinv_cc'] ) ? wpinv_clean( $_POST['wpinv_cc'] ) : null,
-                'disable_taxes'        => isset( $_POST['disable_taxes'] ),
-                'currency'             => isset( $_POST['wpinv_currency'] ) ? wpinv_clean( $_POST['wpinv_currency'] ) : null,
-                'gateway'              => ( $invoice->needs_payment() && isset( $_POST['wpinv_gateway'] ) ) ? wpinv_clean( $_POST['wpinv_gateway'] ) : null,
-                'address'              => isset( $_POST['wpinv_address'] ) ? wpinv_clean( $_POST['wpinv_address'] ) : null,
-                'vat_number'           => isset( $_POST['wpinv_vat_number'] ) ? wpinv_clean( $_POST['wpinv_vat_number'] ) : null,
-                'company'              => isset( $_POST['wpinv_company'] ) ? wpinv_clean( $_POST['wpinv_company'] ) : null,
-                'zip'                  => isset( $_POST['wpinv_zip'] ) ? wpinv_clean( $_POST['wpinv_zip'] ) : null,
-                'state'                => isset( $_POST['wpinv_state'] ) ? wpinv_clean( $_POST['wpinv_state'] ) : null,
-                'city'                 => isset( $_POST['wpinv_city'] ) ? wpinv_clean( $_POST['wpinv_city'] ) : null,
-                'country'              => isset( $_POST['wpinv_country'] ) ? wpinv_clean( $_POST['wpinv_country'] ) : null,
-                'phone'                => isset( $_POST['wpinv_phone'] ) ? wpinv_clean( $_POST['wpinv_phone'] ) : null,
-                'first_name'           => isset( $_POST['wpinv_first_name'] ) ? wpinv_clean( $_POST['wpinv_first_name'] ) : null,
-                'last_name'            => isset( $_POST['wpinv_last_name'] ) ? wpinv_clean( $_POST['wpinv_last_name'] ) : null,
-                'author'               => isset( $_POST['post_author_override'] ) ? wpinv_clean( $_POST['post_author_override'] ) : null,
-                'date_created'         => isset( $_POST['date_created'] ) ? wpinv_clean( $_POST['date_created'] ) : null,
-                'due_date'             => isset( $_POST['wpinv_due_date'] ) ? wpinv_clean( $_POST['wpinv_due_date'] ) : null,
-                'number'               => isset( $_POST['wpinv_number'] ) ? wpinv_clean( $_POST['wpinv_number'] ) : null,
-                'status'               => isset( $_POST['wpinv_status'] ) ? wpinv_clean( $_POST['wpinv_status'] ) : null,
+                'template'             => isset($_POST['wpinv_template']) ? wpinv_clean($_POST['wpinv_template']) : null,
+                'email_cc'             => isset($_POST['wpinv_cc']) ? wpinv_clean($_POST['wpinv_cc']) : null,
+                'disable_taxes'        => isset($_POST['disable_taxes']),
+                'currency'             => isset($_POST['wpinv_currency']) ? wpinv_clean($_POST['wpinv_currency']) : null,
+                'gateway'              => ($invoice->needs_payment() && isset($_POST['wpinv_gateway'])) ? wpinv_clean($_POST['wpinv_gateway']) : null,
+                'address'              => isset($_POST['wpinv_address']) ? wpinv_clean($_POST['wpinv_address']) : null,
+                'vat_number'           => isset($_POST['wpinv_vat_number']) ? wpinv_clean($_POST['wpinv_vat_number']) : null,
+                'company'              => isset($_POST['wpinv_company']) ? wpinv_clean($_POST['wpinv_company']) : null,
+                'zip'                  => isset($_POST['wpinv_zip']) ? wpinv_clean($_POST['wpinv_zip']) : null,
+                'state'                => isset($_POST['wpinv_state']) ? wpinv_clean($_POST['wpinv_state']) : null,
+                'city'                 => isset($_POST['wpinv_city']) ? wpinv_clean($_POST['wpinv_city']) : null,
+                'country'              => isset($_POST['wpinv_country']) ? wpinv_clean($_POST['wpinv_country']) : null,
+                'phone'                => isset($_POST['wpinv_phone']) ? wpinv_clean($_POST['wpinv_phone']) : null,
+                'first_name'           => isset($_POST['wpinv_first_name']) ? wpinv_clean($_POST['wpinv_first_name']) : null,
+                'last_name'            => isset($_POST['wpinv_last_name']) ? wpinv_clean($_POST['wpinv_last_name']) : null,
+                'author'               => isset($_POST['post_author_override']) ? wpinv_clean($_POST['post_author_override']) : null,
+                'date_created'         => isset($_POST['date_created']) ? wpinv_clean($_POST['date_created']) : null,
+                'due_date'             => isset($_POST['wpinv_due_date']) ? wpinv_clean($_POST['wpinv_due_date']) : null,
+                'number'               => isset($_POST['wpinv_number']) ? wpinv_clean($_POST['wpinv_number']) : null,
+                'status'               => isset($_POST['wpinv_status']) ? wpinv_clean($_POST['wpinv_status']) : null,
 			)
         );
 
         // Discount code.
-        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+        if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
-            if ( isset( $_POST['wpinv_discount_code'] ) ) {
-                $invoice->set_discount_code( $_POST['wpinv_discount_code'] );
+            if (isset($_POST['wpinv_discount_code'])) {
+                $invoice->set_discount_code($_POST['wpinv_discount_code']);
             }
 
-            $discount = new WPInv_Discount( $invoice->get_discount_code() );
-            if ( $discount->exists() ) {
-                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            $discount = new WPInv_Discount($invoice->get_discount_code());
+            if ($discount->exists()) {
+                $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
             } else {
-                $invoice->remove_discount( 'discount_code' );
+                $invoice->remove_discount('discount_code');
             }
 
             // Recalculate totals.
@@ -348,17 +348,17 @@ 
         }
 
         // If we're creating a new user...
-        if ( ! empty( $_POST['wpinv_new_user'] ) && is_email( $_POST['wpinv_email'] ) ) {
+        if (!empty($_POST['wpinv_new_user']) && is_email($_POST['wpinv_email'])) {
 
             // Attempt to create the user.
-            $user = wpinv_create_user( sanitize_email( $_POST['wpinv_email'] ) );
+            $user = wpinv_create_user(sanitize_email($_POST['wpinv_email']));
 
 
             // If successful, update the invoice author.
-            if ( is_numeric( $user ) ) {
-                $invoice->set_author( $user );
+            if (is_numeric($user)) {
+                $invoice->set_author($user);
             } else {
-                wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+                wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
             }
         }
 
@@ -372,23 +372,23 @@ 
         $GLOBALS['wpinv_skip_invoice_notification'] = false;
 
         // (Maybe) send new user notification.
-        if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', true ) ) {
-            wp_send_new_user_notifications( $user, 'user' );
+        if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', true)) {
+            wp_send_new_user_notifications($user, 'user');
         }
 
-        if ( ! empty( $_POST['send_to_customer'] ) && ! $invoice->is_draft() ) {
+        if (!empty($_POST['send_to_customer']) && !$invoice->is_draft()) {
 
-            $sent = getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+            $sent = getpaid()->get('invoice_emails')->user_invoice($invoice, true);
 
-            if ( $sent ) {
-                getpaid_admin()->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+            if ($sent) {
+                getpaid_admin()->show_success(__('Invoice was successfully sent to the customer', 'invoicing'));
             } else {
-                getpaid_admin()->show_error( __( 'Could not send the invoice to the customer', 'invoicing' ) );
+                getpaid_admin()->show_error(__('Could not send the invoice to the customer', 'invoicing'));
             }
 
         }
 
         // Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
+		do_action('wpinv_invoice_metabox_saved', $invoice);
 	}
 }

includes/gateways/class-getpaid-authorize-net-gateway.php

Spacing +172 added lines, -172 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'tokens', 'addons' );
+    protected $supports = array('subscription', 'sandbox', 'tokens', 'addons');
 
     /**
 	 * Payment method order.
@@ -52,7 +52,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD' );
+	public $currencies = array('USD', 'CAD', 'GBP', 'DKK', 'NOK', 'PLN', 'SEK', 'AUD', 'EUR', 'NZD');
 
     /**
 	 * URL to view a transaction.
@@ -66,12 +66,12 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'Credit Card / Debit Card', 'invoicing' );
-        $this->method_title         = __( 'Authorize.Net', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->title                = __('Credit Card / Debit Card', 'invoicing');
+        $this->method_title         = __('Authorize.Net', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-        add_filter( 'getpaid_daily_maintenance_should_expire_subscription', array( $this, 'maybe_renew_subscription' ), 10, 2 );
-        add_filter( 'getpaid_authorizenet_sandbox_notice', array( $this, 'sandbox_notice' ) );
+        add_filter('getpaid_daily_maintenance_should_expire_subscription', array($this, 'maybe_renew_subscription'), 10, 2);
+        add_filter('getpaid_authorizenet_sandbox_notice', array($this, 'sandbox_notice'));
         parent::__construct();
     }
 
@@ -81,13 +81,13 @@ 
 	 * @param int $invoice_id 0 or invoice id.
 	 * @param GetPaid_Payment_Form $form Current payment form.
 	 */
-    public function payment_fields( $invoice_id, $form ) {
+    public function payment_fields($invoice_id, $form) {
 
         // Let the user select a payment method.
         echo $this->saved_payment_methods();
 
         // Show the credit card entry form.
-        echo $this->new_payment_method_entry( $this->get_cc_form( true ) );
+        echo $this->new_payment_method_entry($this->get_cc_form(true));
     }
 
     /**
@@ -100,64 +100,64 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
 	 * @return string|WP_Error Payment profile id.
 	 */
-	public function create_customer_profile( $invoice, $submission_data, $save = true ) {
+	public function create_customer_profile($invoice, $submission_data, $save = true) {
 
         // Remove non-digits from the number
-        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number'] );
+        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number']);
 
         // Generate args.
         $args = array(
             'createCustomerProfileRequest' => array(
                 'merchantAuthentication'   => $this->get_auth_params(),
                 'profile'                  => array(
-                    'merchantCustomerId'   => getpaid_limit_length( $invoice->get_user_id(), 20 ),
-                    'description'          => getpaid_limit_length( $invoice->get_full_name(), 255 ),
-                    'email'                => getpaid_limit_length( $invoice->get_email(), 255 ),
+                    'merchantCustomerId'   => getpaid_limit_length($invoice->get_user_id(), 20),
+                    'description'          => getpaid_limit_length($invoice->get_full_name(), 255),
+                    'email'                => getpaid_limit_length($invoice->get_email(), 255),
                     'paymentProfiles'      => array(
                         'customerType'     => 'individual',
 
                         // Billing information.
                         'billTo'           => array(
-                            'firstName'    => getpaid_limit_length( $invoice->get_first_name(), 50 ),
-                            'lastName'     => getpaid_limit_length( $invoice->get_last_name(), 50 ),
-                            'address'      => getpaid_limit_length( $invoice->get_address(), 60 ),
-                            'city'         => getpaid_limit_length( $invoice->get_city(), 40 ),
-                            'state'        => getpaid_limit_length( $invoice->get_state(), 40 ),
-                            'zip'          => getpaid_limit_length( $invoice->get_zip(), 20 ),
-                            'country'      => getpaid_limit_length( $invoice->get_country(), 60 ),
+                            'firstName'    => getpaid_limit_length($invoice->get_first_name(), 50),
+                            'lastName'     => getpaid_limit_length($invoice->get_last_name(), 50),
+                            'address'      => getpaid_limit_length($invoice->get_address(), 60),
+                            'city'         => getpaid_limit_length($invoice->get_city(), 40),
+                            'state'        => getpaid_limit_length($invoice->get_state(), 40),
+                            'zip'          => getpaid_limit_length($invoice->get_zip(), 20),
+                            'country'      => getpaid_limit_length($invoice->get_country(), 60),
                         ),
 
                         // Payment information.
-                        'payment'          => $this->get_payment_information( $submission_data['authorizenet'] ),
+                        'payment'          => $this->get_payment_information($submission_data['authorizenet']),
                     )
                 ),
-                'validationMode'           => $this->is_sandbox( $invoice ) ? 'testMode' : 'liveMode',
+                'validationMode'           => $this->is_sandbox($invoice) ? 'testMode' : 'liveMode',
             )
         );
 
-        $response = $this->post( apply_filters( 'getpaid_authorizenet_customer_profile_args', $args, $invoice ), $invoice );
+        $response = $this->post(apply_filters('getpaid_authorizenet_customer_profile_args', $args, $invoice), $invoice);
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return $response;
         }
 
-        update_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), $response->customerProfileId );
+        update_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), $response->customerProfileId);
 
         // Save the payment token.
-        if ( $save ) {
+        if ($save) {
             $this->save_token(
                 array(
                     'id'      => $response->customerPaymentProfileIdList[0],
-                    'name'    => getpaid_get_card_name( $submission_data['authorizenet']['cc_number'] ) . '····' . substr( $submission_data['authorizenet']['cc_number'], -4 ),
+                    'name'    => getpaid_get_card_name($submission_data['authorizenet']['cc_number']) . '····' . substr($submission_data['authorizenet']['cc_number'], -4),
                     'default' => true,
-                    'type'    => $this->is_sandbox( $invoice ) ? 'sandbox' : 'live',
+                    'type'    => $this->is_sandbox($invoice) ? 'sandbox' : 'live',
                 )
             );
         }
 
         // Add a note about the validation response.
         $invoice->add_note(
-            sprintf( __( 'Created Authorize.NET customer profile: %s', 'invoicing' ), $response->validationDirectResponseList[0] ),
+            sprintf(__('Created Authorize.NET customer profile: %s', 'invoicing'), $response->validationDirectResponseList[0]),
             false,
             false,
             true
@@ -174,7 +174,7 @@ 
 	 * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-profile
 	 */
-	public function get_customer_profile( $profile_id ) {
+	public function get_customer_profile($profile_id) {
 
         // Generate args.
         $args = array(
@@ -184,7 +184,7 @@ 
             )
         );
 
-        return $this->post( $args, false );
+        return $this->post($args, false);
 
     }
 
@@ -199,10 +199,10 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-create-customer-profile
 	 * @return string|WP_Error Profile id.
 	 */
-	public function create_customer_payment_profile( $customer_profile, $invoice, $submission_data, $save ) {
+	public function create_customer_payment_profile($customer_profile, $invoice, $submission_data, $save) {
 
         // Remove non-digits from the number
-        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number'] );
+        $submission_data['authorizenet']['cc_number'] = preg_replace('/\D/', '', $submission_data['authorizenet']['cc_number']);
 
         // Generate args.
         $args = array(
@@ -213,34 +213,34 @@ 
 
                     // Billing information.
                     'billTo'           => array(
-                        'firstName'    => getpaid_limit_length( $invoice->get_first_name(), 50 ),
-                        'lastName'     => getpaid_limit_length( $invoice->get_last_name(), 50 ),
-                        'address'      => getpaid_limit_length( $invoice->get_address(), 60 ),
-                        'city'         => getpaid_limit_length( $invoice->get_city(), 40 ),
-                        'state'        => getpaid_limit_length( $invoice->get_state(), 40 ),
-                        'zip'          => getpaid_limit_length( $invoice->get_zip(), 20 ),
-                        'country'      => getpaid_limit_length( $invoice->get_country(), 60 ),
+                        'firstName'    => getpaid_limit_length($invoice->get_first_name(), 50),
+                        'lastName'     => getpaid_limit_length($invoice->get_last_name(), 50),
+                        'address'      => getpaid_limit_length($invoice->get_address(), 60),
+                        'city'         => getpaid_limit_length($invoice->get_city(), 40),
+                        'state'        => getpaid_limit_length($invoice->get_state(), 40),
+                        'zip'          => getpaid_limit_length($invoice->get_zip(), 20),
+                        'country'      => getpaid_limit_length($invoice->get_country(), 60),
                     ),
 
                     // Payment information.
-                    'payment'          => $this->get_payment_information( $submission_data['authorizenet'] )
+                    'payment'          => $this->get_payment_information($submission_data['authorizenet'])
                 ),
-                'validationMode'       => $this->is_sandbox( $invoice ) ? 'testMode' : 'liveMode',
+                'validationMode'       => $this->is_sandbox($invoice) ? 'testMode' : 'liveMode',
             )
         );
 
-        $response = $this->post( apply_filters( 'getpaid_authorizenet_create_customer_payment_profile_args', $args, $invoice ), $invoice );
+        $response = $this->post(apply_filters('getpaid_authorizenet_create_customer_payment_profile_args', $args, $invoice), $invoice);
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return $response;
         }
 
         // Save the payment token.
-        if ( $save ) {
+        if ($save) {
             $this->save_token(
                 array(
                     'id'      => $response->customerPaymentProfileId,
-                    'name'    => getpaid_get_card_name( $submission_data['authorizenet']['cc_number'] ) . ' ···· ' . substr( $submission_data['authorizenet']['cc_number'], -4 ),
+                    'name'    => getpaid_get_card_name($submission_data['authorizenet']['cc_number']) . ' ···· ' . substr($submission_data['authorizenet']['cc_number'], -4),
                     'default' => true
                 )
             );
@@ -248,7 +248,7 @@ 
 
         // Add a note about the validation response.
         $invoice->add_note(
-            sprintf( __( 'Saved Authorize.NET payment profile: %s', 'invoicing' ), $response->validationDirectResponse ),
+            sprintf(__('Saved Authorize.NET payment profile: %s', 'invoicing'), $response->validationDirectResponse),
             false,
             false,
             true
@@ -267,7 +267,7 @@ 
 	 * @return string|WP_Error Profile id.
      * @link https://developer.authorize.net/api/reference/index.html#customer-profiles-get-customer-payment-profile
 	 */
-	public function get_customer_payment_profile( $customer_profile_id, $payment_profile_id ) {
+	public function get_customer_payment_profile($customer_profile_id, $payment_profile_id) {
 
         // Generate args.
         $args = array(
@@ -278,7 +278,7 @@ 
             )
         );
 
-        return $this->post( $args, false );
+        return $this->post($args, false);
 
     }
 
@@ -291,7 +291,7 @@ 
      * @link https://developer.authorize.net/api/reference/index.html#payment-transactions-charge-a-customer-profile
 	 * @return WP_Error|object
 	 */
-	public function charge_customer_payment_profile( $customer_profile_id, $payment_profile_id, $invoice ) {
+	public function charge_customer_payment_profile($customer_profile_id, $payment_profile_id, $invoice) {
 
         // Generate args.
         $args = array(
@@ -311,28 +311,28 @@ 
                         )
                     ),
                     'order'                    => array(
-                        'invoiceNumber'        => getpaid_limit_length( $invoice->get_number(), 20 ),
+                        'invoiceNumber'        => getpaid_limit_length($invoice->get_number(), 20),
                     ),
-                    'lineItems'                => array( 'lineItem' => $this->get_line_items( $invoice ) ),
+                    'lineItems'                => array('lineItem' => $this->get_line_items($invoice)),
                     'tax'                      => array(
                         'amount'               => $invoice->get_total_tax(),
-                        'name'                 => __( 'TAX', 'invoicing' ),
+                        'name'                 => __('TAX', 'invoicing'),
                     ),
-                    'poNumber'                 => getpaid_limit_length( $invoice->get_number(), 25 ),
+                    'poNumber'                 => getpaid_limit_length($invoice->get_number(), 25),
                     'customer'                 => array(
-                        'id'                   => getpaid_limit_length( $invoice->get_user_id(), 25 ),
-                        'email'                => getpaid_limit_length( $invoice->get_email(), 25 ),
+                        'id'                   => getpaid_limit_length($invoice->get_user_id(), 25),
+                        'email'                => getpaid_limit_length($invoice->get_email(), 25),
                     ),
                     'customerIP'               => $invoice->get_ip(),
                 )
             )
         );
 
-        if ( 0 == $invoice->get_total_tax() ) {
-            unset( $args['createTransactionRequest']['transactionRequest']['tax'] );
+        if (0 == $invoice->get_total_tax()) {
+            unset($args['createTransactionRequest']['transactionRequest']['tax']);
         }
 
-        return $this->post( apply_filters( 'getpaid_authorizenet_charge_customer_payment_profile_args', $args, $invoice ), $invoice );
+        return $this->post(apply_filters('getpaid_authorizenet_charge_customer_payment_profile_args', $args, $invoice), $invoice);
 
     }
 
@@ -342,29 +342,29 @@ 
      * @param stdClass $result Api response.
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function process_charge_response( $result, $invoice ) {
+	public function process_charge_response($result, $invoice) {
 
         wpinv_clear_errors();
 		$response_code = (int) $result->transactionResponse->responseCode;
 
 		// Succeeded.
-		if ( 1 == $response_code || 4 == $response_code ) {
+		if (1 == $response_code || 4 == $response_code) {
 
 			// Maybe set a transaction id.
-			if ( ! empty( $result->transactionResponse->transId ) ) {
-				$invoice->set_transaction_id( $result->transactionResponse->transId );
+			if (!empty($result->transactionResponse->transId)) {
+				$invoice->set_transaction_id($result->transactionResponse->transId);
 			}
 
-			$invoice->add_note( sprintf( __( 'Authentication code: %s (%s).', 'invoicing' ), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber ), false, false, true );
+			$invoice->add_note(sprintf(__('Authentication code: %s (%s).', 'invoicing'), $result->transactionResponse->authCode, $result->transactionResponse->accountNumber), false, false, true);
 
-			if ( 1 == $response_code ) {
+			if (1 == $response_code) {
 				return $invoice->mark_paid();
 			}
 
-			$invoice->set_status( 'wpi-onhold' );
+			$invoice->set_status('wpi-onhold');
         	$invoice->add_note(
                 sprintf(
-                    __( 'Held for review: %s', 'invoicing' ),
+                    __('Held for review: %s', 'invoicing'),
                     $result->transactionResponse->messages->message[0]->description
                 )
 			);
@@ -373,11 +373,11 @@ 
 
 		}
 
-        wpinv_set_error( 'card_declined', __( 'Credit card declined.', 'invoicing' ) );
+        wpinv_set_error('card_declined', __('Credit card declined.', 'invoicing'));
 
-        if ( ! empty( $result->transactionResponse->errors ) ) {
+        if (!empty($result->transactionResponse->errors)) {
             $errors = (object) $result->transactionResponse->errors;
-            wpinv_set_error( $errors->error[0]->errorCode, esc_html( $errors->error[0]->errorText ) );
+            wpinv_set_error($errors->error[0]->errorCode, esc_html($errors->error[0]->errorText));
         }
 
     }
@@ -389,10 +389,10 @@ 
 	 * @param array $card Card details.
 	 * @return array
 	 */
-	public function get_payment_information( $card ) {
+	public function get_payment_information($card) {
         return array(
 
-            'creditCard'         => array (
+            'creditCard'         => array(
                 'cardNumber'     => $card['cc_number'],
                 'expirationDate' => $card['cc_expire_year'] . '-' . $card['cc_expire_month'],
                 'cardCode'       => $card['cc_cvv2'],
@@ -408,8 +408,8 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_customer_profile_meta_name( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
+	public function get_customer_profile_meta_name($invoice) {
+        return $this->is_sandbox($invoice) ? 'getpaid_authorizenet_sandbox_customer_profile_id' : 'getpaid_authorizenet_customer_profile_id';
     }
 
     /**
@@ -420,34 +420,34 @@ 
      * @param WPInv_Invoice $invoice
 	 * @return WP_Error|string The payment profile id
 	 */
-	public function validate_submission_data( $submission_data, $invoice ) {
+	public function validate_submission_data($submission_data, $invoice) {
 
         // Validate authentication details.
         $auth = $this->get_auth_params();
 
-        if ( empty( $auth['name'] ) || empty( $auth['transactionKey'] ) ) {
-            return new WP_Error( 'invalid_settings', __( 'Please set-up your login id and transaction key before using this gateway.', 'invoicing') );
+        if (empty($auth['name']) || empty($auth['transactionKey'])) {
+            return new WP_Error('invalid_settings', __('Please set-up your login id and transaction key before using this gateway.', 'invoicing'));
         }
 
         // Validate the payment method.
-        if ( empty( $submission_data['getpaid-authorizenet-payment-method'] ) ) {
-            return new WP_Error( 'invalid_payment_method', __( 'Please select a different payment method or add a new card.', 'invoicing') );
+        if (empty($submission_data['getpaid-authorizenet-payment-method'])) {
+            return new WP_Error('invalid_payment_method', __('Please select a different payment method or add a new card.', 'invoicing'));
         }
 
         // Are we adding a new payment method?
-        if ( 'new' != $submission_data['getpaid-authorizenet-payment-method'] ) {
+        if ('new' != $submission_data['getpaid-authorizenet-payment-method']) {
             return $submission_data['getpaid-authorizenet-payment-method'];
         }
 
         // Retrieve the customer profile id.
-        $profile_id = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $profile_id = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
 
         // Create payment method.
-        if ( empty( $profile_id ) ) {
-            return $this->create_customer_profile( $invoice, $submission_data, ! empty( $submission_data['getpaid-authorizenet-new-payment-method'] ) );
+        if (empty($profile_id)) {
+            return $this->create_customer_profile($invoice, $submission_data, !empty($submission_data['getpaid-authorizenet-new-payment-method']));
         }
 
-        return $this->create_customer_payment_profile( $profile_id, $invoice, $submission_data, ! empty( $submission_data['getpaid-authorizenet-new-payment-method'] ) );
+        return $this->create_customer_payment_profile($profile_id, $invoice, $submission_data, !empty($submission_data['getpaid-authorizenet-new-payment-method']));
 
     }
 
@@ -458,16 +458,16 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return array
 	 */
-	public function get_line_items( $invoice ) {
+	public function get_line_items($invoice) {
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
+        foreach ($invoice->get_items() as $item) {
 
             $amount  = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
             $items[] = array(
-                'itemId'      => getpaid_limit_length( $item->get_id(), 31 ),
-                'name'        => getpaid_limit_length( $item->get_raw_name(), 31 ),
-                'description' => getpaid_limit_length( $item->get_description(), 255 ),
+                'itemId'      => getpaid_limit_length($item->get_id(), 31),
+                'name'        => getpaid_limit_length($item->get_raw_name(), 31),
+                'description' => getpaid_limit_length($item->get_description(), 255),
                 'quantity'    => (string) $invoice->get_template() == 'amount' ? 1 : $item->get_quantity(),
                 'unitPrice'   => (float) $amount,
                 'taxable'     => wpinv_use_taxes() && $invoice->is_taxable() && 'tax-exempt' != $item->get_vat_rule(),
@@ -475,15 +475,15 @@ 
 
         }
 
-        foreach ( $invoice->get_fees() as $fee_name => $fee ) {
+        foreach ($invoice->get_fees() as $fee_name => $fee) {
 
-            $amount  = $invoice->is_renewal() ? $fee['recurring_fee'] : $fee['initial_fee'];
+            $amount = $invoice->is_renewal() ? $fee['recurring_fee'] : $fee['initial_fee'];
 
-            if ( $amount > 0 ) {
+            if ($amount > 0) {
                 $items[] = array(
-                    'itemId'      => getpaid_limit_length( $fee_name, 31 ),
-                    'name'        => getpaid_limit_length( $fee_name, 31 ),
-                    'description' => getpaid_limit_length( $fee_name, 255 ),
+                    'itemId'      => getpaid_limit_length($fee_name, 31),
+                    'name'        => getpaid_limit_length($fee_name, 31),
+                    'description' => getpaid_limit_length($fee_name, 255),
                     'quantity'    => '1',
                     'unitPrice'   => (float) $amount,
                     'taxable'     => false,
@@ -504,36 +504,36 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Validate the submitted data.
-        $payment_profile_id = $this->validate_submission_data( $submission_data, $invoice );
+        $payment_profile_id = $this->validate_submission_data($submission_data, $invoice);
 
         // Do we have an error?
-        if ( is_wp_error( $payment_profile_id ) ) {
-            wpinv_set_error( $payment_profile_id->get_error_code(), $payment_profile_id->get_error_message() );
-            wpinv_send_back_to_checkout( $invoice );
+        if (is_wp_error($payment_profile_id)) {
+            wpinv_set_error($payment_profile_id->get_error_code(), $payment_profile_id->get_error_message());
+            wpinv_send_back_to_checkout($invoice);
         }
 
         // Save the payment method to the order.
-        update_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', $payment_profile_id );
+        update_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', $payment_profile_id);
 
         // Check if this is a subscription or not.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
-        if ( ! empty( $subscription ) ) {
-            $this->process_subscription( $invoice, $subscription );
+        $subscription = getpaid_get_invoice_subscription($invoice);
+        if (!empty($subscription)) {
+            $this->process_subscription($invoice, $subscription);
         }
 
         // If it is free, send to the success page.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-            wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+            wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
         }
 
         // Charge the payment profile.
-        $this->process_initial_payment( $invoice );
+        $this->process_initial_payment($invoice);
 
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
         exit;
 
@@ -544,23 +544,23 @@ 
 	 *
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function process_initial_payment( $invoice ) {
+	protected function process_initial_payment($invoice) {
 
-		$payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-        $customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
+		$payment_profile_id = get_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+        $customer_profile = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
+		$result             = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $invoice);
 
 		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
-			wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
-			wpinv_send_back_to_checkout( $invoice );
+		if (is_wp_error($result)) {
+			wpinv_set_error($result->get_error_code(), $result->get_error_message());
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Process the response.
-		$this->process_charge_response( $result, $invoice );
+		$this->process_charge_response($result, $invoice);
 
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 	}
@@ -571,24 +571,24 @@ 
      * @param WPInv_Invoice $invoice Invoice.
      * @param WPInv_Subscription $subscription Subscription.
 	 */
-	public function process_subscription( $invoice, $subscription ) {
+	public function process_subscription($invoice, $subscription) {
 
         // Check if there is an initial amount to charge.
-        if ( (float) $invoice->get_total() > 0 ) {
-			$this->process_initial_payment( $invoice );
+        if ((float) $invoice->get_total() > 0) {
+			$this->process_initial_payment($invoice);
         }
 
         // Activate the subscription.
-        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-        $expiry   = date( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+        $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+        $expiry   = date('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-		$subscription->set_next_renewal_date( $expiry );
-		$subscription->set_date_created( current_time( 'mysql' ) );
-		$subscription->set_profile_id( $invoice->generate_key() );
+		$subscription->set_next_renewal_date($expiry);
+		$subscription->set_date_created(current_time('mysql'));
+		$subscription->set_profile_id($invoice->generate_key());
 		$subscription->activate();
 
 		// Redirect to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -599,20 +599,20 @@ 
 	 * @param bool $should_expire
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $should_expire, $subscription ) {
+	public function maybe_renew_subscription($should_expire, $subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id != $subscription->get_gateway() || ! $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id != $subscription->get_gateway() || !$subscription->has_status('active trialling')) {
             return $should_expire;
         }
 
         // If this is the last renewal, complete the subscription.
-        if ( $subscription->is_last_renewal() ) {
+        if ($subscription->is_last_renewal()) {
             $subscription->complete();
             return false;
         }
 
-        $this->renew_subscription( $subscription );
+        $this->renew_subscription($subscription);
 
         return false;
 
@@ -623,28 +623,28 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function renew_subscription( $subscription ) {
+	public function renew_subscription($subscription) {
 
 		// Generate the renewal invoice.
 		$new_invoice = $subscription->create_payment();
 		$old_invoice = $subscription->get_parent_payment();
 
-        if ( empty( $new_invoice ) ) {
-            $old_invoice->add_note( __( 'Error generating a renewal invoice.', 'invoicing' ), false, false, false );
+        if (empty($new_invoice)) {
+            $old_invoice->add_note(__('Error generating a renewal invoice.', 'invoicing'), false, false, false);
             $subscription->failing();
             return;
         }
 
         // Charge the payment method.
-		$payment_profile_id = get_post_meta( $old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $old_invoice->get_user_id(), $this->get_customer_profile_meta_name( $old_invoice ), true );
-		$result             = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $new_invoice );
+		$payment_profile_id = get_post_meta($old_invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+		$customer_profile   = get_user_meta($old_invoice->get_user_id(), $this->get_customer_profile_meta_name($old_invoice), true);
+		$result             = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $new_invoice);
 
 		// Do we have an error?
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
 			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), $result->get_error_message() ),
+				sprintf(__('Error renewing subscription : ( %s ).', 'invoicing'), $result->get_error_message()),
 				true,
 				false,
 				true
@@ -655,12 +655,12 @@ 
 		}
 
 		// Process the response.
-		$this->process_charge_response( $result, $new_invoice );
+		$this->process_charge_response($result, $new_invoice);
 
-		if ( wpinv_get_errors() ) {
+		if (wpinv_get_errors()) {
 
 			$old_invoice->add_note(
-				sprintf( __( 'Error renewing subscription : ( %s ).', 'invoicing' ), getpaid_get_errors_html() ),
+				sprintf(__('Error renewing subscription : ( %s ).', 'invoicing'), getpaid_get_errors_html()),
 				true,
 				false,
 				true
@@ -670,7 +670,7 @@ 
 
         }
 
-        $subscription->add_payment( array(), $new_invoice );
+        $subscription->add_payment(array(), $new_invoice);
         $subscription->renew();
     }
 
@@ -681,34 +681,34 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
         global $getpaid_authorize_addons;
 
         $getpaid_authorize_addons = array();
-        foreach ( $items as $item ) {
+        foreach ($items as $item) {
 
-            if ( is_null( $invoice->get_item( $item->get_id() ) ) && ! is_wp_error( $invoice->add_item( $item ) ) ) {
+            if (is_null($invoice->get_item($item->get_id())) && !is_wp_error($invoice->add_item($item))) {
                 $getpaid_authorize_addons[] = $item;
             }
 
         }
 
-        if ( empty( $getpaid_authorize_addons ) ) {
+        if (empty($getpaid_authorize_addons)) {
             return;
         }
 
         $invoice->recalculate_total();
 
-        $payment_profile_id = get_post_meta( $invoice->get_id(), 'getpaid_authorizenet_profile_id', true );
-		$customer_profile   = get_user_meta( $invoice->get_user_id(), $this->get_customer_profile_meta_name( $invoice ), true );
+        $payment_profile_id = get_post_meta($invoice->get_id(), 'getpaid_authorizenet_profile_id', true);
+		$customer_profile = get_user_meta($invoice->get_user_id(), $this->get_customer_profile_meta_name($invoice), true);
 
-        add_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ), 10, 2 );
-        $result = $this->charge_customer_payment_profile( $customer_profile, $payment_profile_id, $invoice );
-        remove_filter( 'getpaid_authorizenet_charge_customer_payment_profile_args', array( $this, 'filter_addons_request' ) );
+        add_filter('getpaid_authorizenet_charge_customer_payment_profile_args', array($this, 'filter_addons_request'), 10, 2);
+        $result = $this->charge_customer_payment_profile($customer_profile, $payment_profile_id, $invoice);
+        remove_filter('getpaid_authorizenet_charge_customer_payment_profile_args', array($this, 'filter_addons_request'));
 
-        if ( is_wp_error( $result ) ) {
-            wpinv_set_error( $result->get_error_code(), $result->get_error_message() );
+        if (is_wp_error($result)) {
+            wpinv_set_error($result->get_error_code(), $result->get_error_message());
             return;
         }
 
@@ -721,19 +721,19 @@ 
      * @param array $args
 	 * @return array
 	 */
-    public function filter_addons_request( $args ) {
+    public function filter_addons_request($args) {
 
         global $getpaid_authorize_addons;
         $total = 0;
 
-        foreach ( $getpaid_authorize_addons as $addon ) {
+        foreach ($getpaid_authorize_addons as $addon) {
             $total += $addon->get_sub_total();
         }
 
         $args['createTransactionRequest']['transactionRequest']['amount'] = $total;
 
-        if ( isset( $args['createTransactionRequest']['transactionRequest']['tax'] ) ) {
-            unset( $args['createTransactionRequest']['transactionRequest']['tax'] );
+        if (isset($args['createTransactionRequest']['transactionRequest']['tax'])) {
+            unset($args['createTransactionRequest']['transactionRequest']['tax']);
         }
 
         return $args;
@@ -746,7 +746,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-            __( 'SANDBOX ENABLED. You can use sandbox testing details only. See the %sAuthorize.NET Sandbox Testing Guide%s for more details.', 'invoicing' ),
+            __('SANDBOX ENABLED. You can use sandbox testing details only. See the %sAuthorize.NET Sandbox Testing Guide%s for more details.', 'invoicing'),
             '<a href="https://developer.authorize.net/hello_world/testing_guide.html">',
             '</a>'
         );
@@ -758,42 +758,42 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['authorizenet_active']['desc'] .= " ($currencies)";
-        $admin_settings['authorizenet_desc']['std']     = __( 'Pay securely using your credit or debit card.', 'invoicing' );
+        $admin_settings['authorizenet_desc']['std']     = __('Pay securely using your credit or debit card.', 'invoicing');
 
         $admin_settings['authorizenet_login_id'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_login_id',
-            'name' => __( 'API Login ID', 'invoicing' ),
-            'desc' => '<a href="https://support.authorize.net/s/article/How-do-I-obtain-my-API-Login-ID-and-Transaction-Key"><em>' . __( 'How do I obtain my API Login ID and Transaction Key?', 'invoicing' ) . '</em></a>',
+            'name' => __('API Login ID', 'invoicing'),
+            'desc' => '<a href="https://support.authorize.net/s/article/How-do-I-obtain-my-API-Login-ID-and-Transaction-Key"><em>' . __('How do I obtain my API Login ID and Transaction Key?', 'invoicing') . '</em></a>',
         );
 
         $admin_settings['authorizenet_transaction_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_transaction_key',
-            'name' => __( 'Transaction Key', 'invoicing' ),
+            'name' => __('Transaction Key', 'invoicing'),
         );
 
         $admin_settings['authorizenet_signature_key'] = array(
             'type' => 'text',
             'id'   => 'authorizenet_signature_key',
-            'name' => __( 'Signature Key', 'invoicing' ),
-            'desc' => '<a href="https://support.authorize.net/s/article/What-is-a-Signature-Key"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'name' => __('Signature Key', 'invoicing'),
+            'desc' => '<a href="https://support.authorize.net/s/article/What-is-a-Signature-Key"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
         );
 
         $admin_settings['authorizenet_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'authorizenet_ipn_url',
-            'name'     => __( 'Webhook URL', 'invoicing' ),
+            'name'     => __('Webhook URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Create a new webhook using this URL as the endpoint URL and set it to receive all payment events.', 'invoicing' ) . ' <a href="https://support.authorize.net/s/article/How-do-I-add-edit-Webhook-notification-end-points"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __('Create a new webhook using this URL as the endpoint URL and set it to receive all payment events.', 'invoicing') . ' <a href="https://support.authorize.net/s/article/How-do-I-add-edit-Webhook-notification-end-points"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'custom'   => 'authorizenet',
             'readonly' => true,
         );

includes/class-wpinv.php

Spacing +164 added lines, -164 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -81,23 +81,23 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('session', new WPInv_Session_Handler());
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -105,8 +105,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -117,23 +117,23 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 11);
+		add_action('wp_footer', array($this, 'wp_footer'));
+		add_action('wp_head', array($this, 'wp_head'));
+		add_action('widgets_init', array(&$this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -141,10 +141,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -154,21 +154,21 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+	public function load_textdomain($locale = NULL) {
+		if (empty($locale)) {
+			$locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
 		}
 
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+		$locale = apply_filters('plugin_locale', $locale, 'invoicing');
 
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+		unload_textdomain('invoicing');
+		load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+		load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
 
 		/**
 		 * Define language constants.
 		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
+		require_once(WPINV_PLUGIN_DIR . 'language.php');
 	}
 
 	/**
@@ -177,78 +177,78 @@ 
 	public function includes() {
 
 		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
 
 		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+		require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+		require_once(WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php');
 
 		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/invoice-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/subscription-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/user-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/error-functions.php');
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/getpaid.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php');
 			// load the user class only on the users.php page
 			global $pagenow;
-			if($pagenow=='users.php'){
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+		if (defined('WP_CLI') && WP_CLI) {
+			require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
 	}
@@ -261,21 +261,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -290,10 +290,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 
@@ -307,7 +307,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Maybe upgrade.
 		$this->maybe_upgrade_database();
@@ -324,17 +324,17 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+		if ('yes' != get_option('wpinv_renamed_gateways')) {
 			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
+			update_option('wpinv_renamed_gateways', 'yes');
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -344,14 +344,14 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
+		$gateway = wpinv_clean($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
@@ -359,27 +359,27 @@ 
 	public function enqueue_scripts() {
 
 		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
+		do_action('getpaid_enqueue_scripts');
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['loading']              = __('Loading...', 'invoicing');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ),  $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('jquery'), $version, true);
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 	}
 
@@ -391,24 +391,24 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 
 		}
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
@@ -422,7 +422,7 @@ 
 
 		// Currently, UX Builder does not work particulaly well with SuperDuper.
 		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+		if (function_exists('ux_builder_is_active') && ux_builder_is_active()) {
 			return;
 		}
 
@@ -439,8 +439,8 @@ 
 			)
 		);
 
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
+		foreach ($widgets as $widget) {
+			register_widget($widget);
 		}
 		
 	}
@@ -452,29 +452,29 @@ 
 	 */
 	public function maybe_upgrade_database() {
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+		$wpi_version = get_option('wpinv_version', 0);
 
-		if ( $wpi_version == WPINV_VERSION ) {
+		if ($wpi_version == WPINV_VERSION) {
 			return;
 		}
 
 		$installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
+		if (empty($wpi_version)) {
+			return $installer->upgrade_db(0);
 		}
 
-		$upgrades  = array(
+		$upgrades = array(
 			'0.0.5' => '004',
 			'1.0.3' => '102',
 			'2.0.0' => '118',
 			'2.0.8' => '207',
 		);
 
-		foreach ( $upgrades as $key => $method ) {
+		foreach ($upgrades as $key => $method) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
+			if (version_compare($wpi_version, $key, '<')) {
+				return $installer->upgrade_db($method);
 			}
 
 		}
@@ -488,11 +488,11 @@ 
 	 */
 	public function maybe_flush_permalinks() {
 
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
+		$flush = get_option('wpinv_flush_permalinks', 0);
 
-		if ( ! empty( $flush ) ) {
+		if (!empty($flush)) {
 			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
+			delete_option('wpinv_flush_permalinks');
 		}
 
 	}
@@ -503,10 +503,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -514,24 +514,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 
@@ -541,7 +541,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
+		wpinv_get_template('frontend-footer.php');
 	}
 
 	/**
@@ -550,7 +550,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
+		wpinv_get_template('frontend-head.php');
 	}
 
 }

includes/payments/class-getpaid-payment-form-submission-taxes.php

Spacing +52 added lines, -52 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -29,22 +29,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		if ( $this->skip_taxes ) {
+		if ($this->skip_taxes) {
 			return;
 		}
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+		if ($submission->has_invoice()) {
+			$this->taxes = array_replace($submission->get_invoice()->get_taxes(), $this->taxes);
 		}
 
 	}
@@ -56,24 +56,24 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item->get_id(), $item->get_sub_total(), $submission->get_discount_code(), false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item->get_id(), $item->get_recurring_sub_total(), $submission->get_discount_code(), true ), $rates );
+		$rates    = getpaid_get_item_tax_rates($item, $submission->country, $submission->state);
+		$rates    = getpaid_filter_item_tax_rates($item, $rates);
+		$taxes    = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item->get_id(), $item->get_sub_total(), $submission->get_discount_code(), false), $rates);
+		$r_taxes  = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item->get_id(), $item->get_recurring_sub_total(), $submission->get_discount_code(), true), $rates);
 
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+		foreach ($taxes as $name => $amount) {
+			$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+			$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
 
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
+			if (!isset($this->taxes[$name])) {
+				$this->taxes[$name] = $tax;
 				continue;
 			}
 
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+			$this->taxes[$name]['initial_tax']   += $tax['initial_tax'];
+			$this->taxes[$name]['recurring_tax'] += $tax['recurring_tax'];
 
 		}
 
@@ -86,11 +86,11 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function has_digital_item( $submission ) {
+	public function has_digital_item($submission) {
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				return true;
 			}
 
@@ -106,7 +106,7 @@ 
 	 * @return bool
 	 */
 	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
+		return self::is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
+	public static function is_eu_country($country) {
+		return getpaid_is_eu_state($country) || getpaid_is_gst_country($country);
 	}
 
 	/**
@@ -127,8 +127,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
+	public static function is_eu_transaction($customer_country) {
+		return self::is_eu_country($customer_country) && self::is_eu_store();
 	}
 
 	/**
@@ -138,12 +138,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number', 'billing');
+		if (!is_null($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
@@ -156,12 +156,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_company( $submission ) {
+	public function get_company($submission) {
 
 		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
+		$company = $submission->get_field('wpinv_company', 'billing');
+		if (!empty($company)) {
+			return wpinv_clean($company);
 		}
 
 		// Retrieve from the invoice.
@@ -176,10 +176,10 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
+	public function requires_vat($ip_in_eu, $country_in_eu) {
 
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
+		$prevent_b2c = !empty($prevent_b2c);
 		$is_eu       = $ip_in_eu || $country_in_eu;
 
 		return $prevent_b2c && $is_eu;
@@ -191,45 +191,45 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$in_eu = $this->is_eu_transaction( $submission->country );
+		$in_eu = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
+		$vat_number  = $this->get_vat_number($submission);
 		$ip_country  = getpaid_get_ip_country();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+		if ($submission->is_initial_fetch() && empty($vat_number)) {
 			return;
 		}
 
 		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
 			throw new Exception(
-				__( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
+				__('Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing')
 			);
 
 		}
 
-		if ( empty( $vat_number ) ) {
+		if (empty($vat_number)) {
 			return;
 		}
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
+		if (wpinv_should_validate_vat_number() && !wpinv_validate_vat_number($vat_number, $submission->country)) {
+			throw new Exception(__('Your VAT number is invalid', 'invoicing'));
 		}
 
-		if (  wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+		if (wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option('vat_same_country_rule', 'vat_too')) {
 			return;
 		}