AyeCode / invoicing

templates/payment-forms-admin/edit/text.php

Spacing +9 added lines, -9 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php _e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php _e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

templates/payment-forms-admin/edit/website.php

Spacing +9 added lines, -9 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php _e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php _e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

includes/data/admin-settings.php

Spacing +168 added lines, -168 removed lines

@@ -8,211 +8,211 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $getpaid_pages = GetPaid_Installer::get_pages();
-$pages         = wpinv_get_pages( true );
+$pages         = wpinv_get_pages(true);
     
 $currencies = wpinv_get_currencies();
     
 $currency_code_options = array();
-foreach ( $currencies as $code => $name ) {
-    $currency_code_options[ $code ] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol( $code ) . ')';
+foreach ($currencies as $code => $name) {
+    $currency_code_options[$code] = $code . ' - ' . $name . ' (' . wpinv_currency_symbol($code) . ')';
 }
 
 $invoice_number_padd_options = array();
-for ( $i = 0; $i <= 20; $i++ ) {
+for ($i = 0; $i <= 20; $i++) {
     $invoice_number_padd_options[$i] = $i;
 }
     
 $currency_symbol = wpinv_currency_symbol();
     
 $last_number = $reset_number = '';
-if ( $last_invoice_number = get_option( 'wpinv_last_invoice_number' ) ) {
-    $last_invoice_number = preg_replace( '/[^0-9]/', '', $last_invoice_number );
+if ($last_invoice_number = get_option('wpinv_last_invoice_number')) {
+    $last_invoice_number = preg_replace('/[^0-9]/', '', $last_invoice_number);
 
-    if ( !empty( $last_invoice_number ) ) {
-        $last_number = ' ' . wp_sprintf( __( "( Last Invoice's sequential number: <b>%s</b> )", 'invoicing' ), $last_invoice_number );
+    if (!empty($last_invoice_number)) {
+        $last_number = ' ' . wp_sprintf(__("( Last Invoice's sequential number: <b>%s</b> )", 'invoicing'), $last_invoice_number);
     }
 
     $nonce = wp_create_nonce('reset_invoice_count');
-    $reset_number = '<a href="'.add_query_arg(array('reset_invoice_count' => 1, '_nonce' => $nonce)).'" class="btn button">'.__('Force Reset Sequence', 'invoicing' ). '</a>';
+    $reset_number = '<a href="' . add_query_arg(array('reset_invoice_count' => 1, '_nonce' => $nonce)) . '" class="btn button">' . __('Force Reset Sequence', 'invoicing') . '</a>';
 }
     
 $alert_wrapper_start = '<p style="color: #F00">';
 $alert_wrapper_close = '</p>';
 
 return array(
-    'general' => apply_filters( 'wpinv_settings_general',
+    'general' => apply_filters('wpinv_settings_general',
         array(
             'main' => array(
                 'location_settings' => array(
                     'id'   => 'location_settings',
-                    'name' => '<h3>' . __( 'Default Location', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Default Location', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'default_country' => array(
                     'id'      => 'default_country',
-                    'name'    => __( 'Default Country', 'invoicing' ),
-                    'desc'    => __( 'Where does your store operate from?', 'invoicing' ),
+                    'name'    => __('Default Country', 'invoicing'),
+                    'desc'    => __('Where does your store operate from?', 'invoicing'),
                     'type'    => 'select',
                     'options' => wpinv_get_country_list(),
                     'std'     => 'GB',
                     'class'   => 'wpi_select2',
-                    'placeholder' => __( 'Select a country', 'invoicing' ),
+                    'placeholder' => __('Select a country', 'invoicing'),
                 ),
                 'default_state' => array(
                     'id'      => 'default_state',
-                    'name'    => __( 'Default State / Province', 'invoicing' ),
-                    'desc'    => __( 'What state / province does your store operate from?', 'invoicing' ),
+                    'name'    => __('Default State / Province', 'invoicing'),
+                    'desc'    => __('What state / province does your store operate from?', 'invoicing'),
                     'type'    => 'country_states',
                     'class'   => 'wpi_select2',
-                    'placeholder' => __( 'Select a state', 'invoicing' ),
+                    'placeholder' => __('Select a state', 'invoicing'),
                 ),
                 'store_name' => array(
                     'id'   => 'store_name',
-                    'name' => __( 'Store Name', 'invoicing' ),
-                    'desc' => __( 'Store name to print on invoices.', 'invoicing' ),
+                    'name' => __('Store Name', 'invoicing'),
+                    'desc' => __('Store name to print on invoices.', 'invoicing'),
                     'std'     => get_option('blogname'),
                     'type' => 'text',
                 ),
                 'logo' => array(
                     'id'   => 'logo',
-                    'name' => __( 'Logo URL', 'invoicing' ),
-                    'desc' => __( 'Store logo to print on invoices.', 'invoicing' ),
+                    'name' => __('Logo URL', 'invoicing'),
+                    'desc' => __('Store logo to print on invoices.', 'invoicing'),
                     'type' => 'text',
                 ),
                 'logo_width'      => array(
                     'id'          => 'logo_width',
-                    'name'        => __( 'Logo width', 'invoicing' ),
-                    'desc'        => __( 'Logo width to use in invoice image.', 'invoicing' ),
+                    'name'        => __('Logo width', 'invoicing'),
+                    'desc'        => __('Logo width to use in invoice image.', 'invoicing'),
                     'type'        => 'number',
-                    'placeholder' => __( 'Auto', 'invoicing' ),
+                    'placeholder' => __('Auto', 'invoicing'),
                 ),
                 'logo_height'     => array(
                     'id'          => 'logo_height',
-                    'name'        => __( 'Logo height', 'invoicing' ),
-                    'desc'        => __( 'Logo height to use in invoice image.', 'invoicing' ),
+                    'name'        => __('Logo height', 'invoicing'),
+                    'desc'        => __('Logo height to use in invoice image.', 'invoicing'),
                     'type'        => 'number',
-                    'placeholder' => __( 'Auto', 'invoicing' ),
+                    'placeholder' => __('Auto', 'invoicing'),
                 ),
                 'store_address' => array(
                     'id'   => 'store_address',
-                    'name' => __( 'Store Address', 'invoicing' ),
-                    'desc' => __( 'Enter the store address to display on invoice', 'invoicing' ),
+                    'name' => __('Store Address', 'invoicing'),
+                    'desc' => __('Enter the store address to display on invoice', 'invoicing'),
                     'type' => 'textarea',
                 ),
                 'page_settings' => array(
                     'id'   => 'page_settings',
-                    'name' => '<h3>' . __( 'Page Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Page Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'checkout_page' => array(
                     'id'          => 'checkout_page',
-                    'name'        => __( 'Checkout Page', 'invoicing' ),
-                    'desc'        => __( 'This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing' ),
+                    'name'        => __('Checkout Page', 'invoicing'),
+                    'desc'        => __('This is the checkout page where buyers will complete their payments. The <b>[wpinv_checkout]</b> short code must be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['checkout_page'] ) ? '' : $getpaid_pages['checkout_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['checkout_page']) ? '' : $getpaid_pages['checkout_page']['content'],
                     'help-tip'    => true,
                 ),
                 'success_page' => array(
                     'id'          => 'success_page',
-                    'name'        => __( 'Success Page', 'invoicing' ),
-                    'desc'        => __( 'This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing' ),
+                    'name'        => __('Success Page', 'invoicing'),
+                    'desc'        => __('This is the page buyers are sent to after completing their payments. The <b>[wpinv_receipt]</b> short code should be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['success_page'] ) ? '' : $getpaid_pages['success_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['success_page']) ? '' : $getpaid_pages['success_page']['content'],
                     'help-tip'    => true,
                 ),
                 'failure_page' => array(
                     'id'          => 'failure_page',
-                    'name'        => __( 'Failed Transaction Page', 'invoicing' ),
-                    'desc'        => __( 'This is the page buyers are sent to if their transaction is cancelled or fails.', 'invoicing' ),
+                    'name'        => __('Failed Transaction Page', 'invoicing'),
+                    'desc'        => __('This is the page buyers are sent to if their transaction is cancelled or fails.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['failure_page'] ) ? '' : $getpaid_pages['failure_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['failure_page']) ? '' : $getpaid_pages['failure_page']['content'],
                     'help-tip'    => true,
                 ),
                 'invoice_history_page' => array(
                     'id'          => 'invoice_history_page',
-                    'name'        => __( 'Invoice History Page', 'invoicing' ),
-                    'desc'        => __( 'This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing' ),
+                    'name'        => __('Invoice History Page', 'invoicing'),
+                    'desc'        => __('This page shows an invoice history for the current user. The <b>[wpinv_history]</b> short code should be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['invoice_history_page'] ) ? '' : $getpaid_pages['invoice_history_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['invoice_history_page']) ? '' : $getpaid_pages['invoice_history_page']['content'],
                     'help-tip'    => true,
                 ),
                 'invoice_subscription_page' => array(
                     'id'          => 'invoice_subscription_page',
-                    'name'        => __( 'Invoice Subscriptions Page', 'invoicing' ),
-                    'desc'        => __( 'This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing' ),
+                    'name'        => __('Invoice Subscriptions Page', 'invoicing'),
+                    'desc'        => __('This page shows subscriptions history for the current user. The <b>[wpinv_subscriptions]</b> short code should be on this page.', 'invoicing'),
                     'type'        => 'select',
                     'options'     => $pages,
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
-                    'default_content' => empty( $getpaid_pages['invoice_subscription_page'] ) ? '' : $getpaid_pages['invoice_subscription_page']['content'],
+                    'placeholder' => __('Select a page', 'invoicing'),
+                    'default_content' => empty($getpaid_pages['invoice_subscription_page']) ? '' : $getpaid_pages['invoice_subscription_page']['content'],
                     'help-tip'    => true,
                 ),
             ),
             'currency_section' => array(
                 'currency_settings' => array(
                     'id'   => 'currency_settings',
-                    'name' => '<h3>' . __( 'Currency Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Currency Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'currency' => array(
                     'id'      => 'currency',
-                    'name'    => __( 'Currency', 'invoicing' ),
-                    'desc'    => __( 'Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing' ),
+                    'name'    => __('Currency', 'invoicing'),
+                    'desc'    => __('Choose your currency. Note that some payment gateways have currency restrictions.', 'invoicing'),
                     'type'    => 'select',
                     'class'       => 'wpi_select2',
                     'options' => $currency_code_options,
                 ),
                 'currency_position' => array(
                     'id'      => 'currency_position',
-                    'name'    => __( 'Currency Position', 'invoicing' ),
-                    'desc'    => __( 'Choose the location of the currency sign.', 'invoicing' ),
+                    'name'    => __('Currency Position', 'invoicing'),
+                    'desc'    => __('Choose the location of the currency sign.', 'invoicing'),
                     'type'    => 'select',
                     'class'   => 'wpi_select2',
                     'options'  => array(
-                        'left'        => __( 'Left', 'invoicing' ) . ' (' . $currency_symbol . wpinv_format_amount( '99.99' ) . ')',
-                        'right'       => __( 'Right', 'invoicing' ) . ' ('. wpinv_format_amount( '99.99' ) . $currency_symbol . ')',
-                        'left_space'  => __( 'Left with space', 'invoicing' ) . ' (' . $currency_symbol . ' ' . wpinv_format_amount( '99.99' ) . ')',
-                        'right_space' => __( 'Right with space', 'invoicing' ) . ' (' . wpinv_format_amount( '99.99' ) . ' ' . $currency_symbol . ')'
+                        'left'        => __('Left', 'invoicing') . ' (' . $currency_symbol . wpinv_format_amount('99.99') . ')',
+                        'right'       => __('Right', 'invoicing') . ' (' . wpinv_format_amount('99.99') . $currency_symbol . ')',
+                        'left_space'  => __('Left with space', 'invoicing') . ' (' . $currency_symbol . ' ' . wpinv_format_amount('99.99') . ')',
+                        'right_space' => __('Right with space', 'invoicing') . ' (' . wpinv_format_amount('99.99') . ' ' . $currency_symbol . ')'
                     )
                 ),
                 'thousands_separator' => array(
                     'id'   => 'thousands_separator',
-                    'name' => __( 'Thousands Separator', 'invoicing' ),
-                    'desc' => __( 'The symbol (usually , or .) to separate thousands', 'invoicing' ),
+                    'name' => __('Thousands Separator', 'invoicing'),
+                    'desc' => __('The symbol (usually , or .) to separate thousands', 'invoicing'),
                     'type' => 'text',
                     'size' => 'small',
                     'std'  => ',',
                 ),
                 'decimal_separator' => array(
                     'id'   => 'decimal_separator',
-                    'name' => __( 'Decimal Separator', 'invoicing' ),
-                    'desc' => __( 'The symbol (usually , or .) to separate decimal points', 'invoicing' ),
+                    'name' => __('Decimal Separator', 'invoicing'),
+                    'desc' => __('The symbol (usually , or .) to separate decimal points', 'invoicing'),
                     'type' => 'text',
                     'size' => 'small',
                     'std'  => '.',
                 ),
                 'decimals' => array(
                     'id'   => 'decimals',
-                    'name' => __( 'Number of Decimals', 'invoicing' ),
-                    'desc' => __( 'This sets the number of decimal points shown in displayed prices.', 'invoicing' ),
+                    'name' => __('Number of Decimals', 'invoicing'),
+                    'desc' => __('This sets the number of decimal points shown in displayed prices.', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => '2',
@@ -224,21 +224,21 @@ 
             'labels' => array(
                 'labels' => array(
                     'id'   => 'labels_settings',
-                    'name' => '<h3>' . __( 'Invoice Labels', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Invoice Labels', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'vat_invoice_notice_label' => array(
                     'id' => 'vat_invoice_notice_label',
-                    'name' => __( 'Invoice Notice Label', 'invoicing' ),
-                    'desc' => __( 'Use this to add an invoice notice section (label) to your invoices', 'invoicing' ),
+                    'name' => __('Invoice Notice Label', 'invoicing'),
+                    'desc' => __('Use this to add an invoice notice section (label) to your invoices', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
                 'vat_invoice_notice' => array(
                     'id' => 'vat_invoice_notice',
-                    'name' => __( 'Invoice notice', 'invoicing' ),
-                    'desc' =>   __( 'Use this to add an invoice notice section (description) to your invoices', 'invoicing' ),
+                    'name' => __('Invoice notice', 'invoicing'),
+                    'desc' =>   __('Use this to add an invoice notice section (description) to your invoices', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
@@ -250,22 +250,22 @@ 
             'main' => array(
                 'gateway_settings' => array(
                     'id'   => 'api_header',
-                    'name' => '<h3>' . __( 'Gateway Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Gateway Settings', 'invoicing') . '</h3>',
                     'desc' => '',
                     'type' => 'header',
                 ),
                 'gateways' => array(
                     'id'      => 'gateways',
-                    'name'    => __( 'Payment Gateways', 'invoicing' ),
-                    'desc'    => __( 'Choose the payment gateways you want to enable.', 'invoicing' ),
+                    'name'    => __('Payment Gateways', 'invoicing'),
+                    'desc'    => __('Choose the payment gateways you want to enable.', 'invoicing'),
                     'type'    => 'gateways',
-                    'std'     => array( 'manual'=>1 ),
+                    'std'     => array('manual'=>1),
                     'options' => wpinv_get_payment_gateways(),
                 ),
                 'default_gateway' => array(
                     'id'      => 'default_gateway',
-                    'name'    => __( 'Default Gateway', 'invoicing' ),
-                    'desc'    => __( 'This gateway will be loaded automatically with the checkout page.', 'invoicing' ),
+                    'name'    => __('Default Gateway', 'invoicing'),
+                    'desc'    => __('This gateway will be loaded automatically with the checkout page.', 'invoicing'),
                     'type'    => 'gateway_select',
                     'std'     => 'manual',
                     'class'   => 'wpi_select2',
@@ -280,32 +280,32 @@ 
             'main' => array(
                 'tax_settings' => array(
                     'id'   => 'tax_settings',
-                    'name' => '<h3>' . __( 'Tax Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Tax Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_taxes' => array(
                     'id'       => 'enable_taxes',
-                    'name'     => __( 'Enable Taxes', 'invoicing' ),
-                    'desc'     => __( 'Enable tax rates and calculations.', 'invoicing' ),
+                    'name'     => __('Enable Taxes', 'invoicing'),
+                    'desc'     => __('Enable tax rates and calculations.', 'invoicing'),
                     'type'     => 'checkbox',
                     'std'      => 0,
                 ),
 
                 'tax_subtotal_rounding' => array(
                     'id'                => 'tax_subtotal_rounding',
-                    'name'              => __( 'Rounding', 'invoicing' ),
-                    'desc'              => __( 'Round tax at subtotal level, instead of rounding per tax rate', 'invoicing' ),
+                    'name'              => __('Rounding', 'invoicing'),
+                    'desc'              => __('Round tax at subtotal level, instead of rounding per tax rate', 'invoicing'),
                     'type'              => 'checkbox',
                     'std'               => 1,
                 ),
 
                 'prices_include_tax' => array(
                     'id'      => 'prices_include_tax',
-                    'name'    => __( 'Prices entered with tax', 'invoicing' ),
+                    'name'    => __('Prices entered with tax', 'invoicing'),
                     'options' => array(
-                        'yes' => __( 'Yes, I will enter prices inclusive of tax', 'invoicing' ),
-                        'no'  => __( 'No, I will enter prices exclusive of tax', 'invoicing' ),
+                        'yes' => __('Yes, I will enter prices inclusive of tax', 'invoicing'),
+                        'no'  => __('No, I will enter prices exclusive of tax', 'invoicing'),
                     ),
                     'type'    => 'select',
                     'std'     => 'no',
@@ -313,10 +313,10 @@ 
 
                 'tax_base'              => array(
                     'id'                => 'tax_base',
-                    'name'              => __( 'Calculate tax based on', 'invoicing' ),
+                    'name'              => __('Calculate tax based on', 'invoicing'),
                     'options'           => array(
-                        'billing'       => __( 'Customer billing address', 'invoicing' ),
-                        'base'          => __( 'Shop base address', 'invoicing' ),
+                        'billing'       => __('Customer billing address', 'invoicing'),
+                        'base'          => __('Shop base address', 'invoicing'),
                     ),
                     'type'              => 'select',
                     'std'               => 'billing',
@@ -324,10 +324,10 @@ 
 
                 'tax_display_totals'    => array(
                     'id'                => 'tax_display_totals',
-                    'name'              => __( 'Display tax totals', 'invoicing' ),
+                    'name'              => __('Display tax totals', 'invoicing'),
                     'options'           => array(
-                        'single'        => __( 'As a single total', 'invoicing' ),
-                        'individual'    => __( 'As individual tax rates', 'invoicing' ),
+                        'single'        => __('As a single total', 'invoicing'),
+                        'individual'    => __('As individual tax rates', 'invoicing'),
                     ),
                     'type'              => 'select',
                     'std'               => 'individual',
@@ -335,8 +335,8 @@ 
 
                 'tax_rate' => array(
                     'id'   => 'tax_rate',
-                    'name' => __( 'Fallback Tax Rate', 'invoicing' ),
-                    'desc' => __( 'Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing' ),
+                    'name' => __('Fallback Tax Rate', 'invoicing'),
+                    'desc' => __('Enter a percentage, such as 6.5. Customers not in a specific rate will be charged this rate.', 'invoicing'),
                     'type' => 'number',
                     'size' => 'small',
                     'min'  => '0',
@@ -348,8 +348,8 @@ 
             'rates' => array(
                 'tax_rates' => array(
                     'id'   => 'tax_rates',
-                    'name' => '<h3>' . __( 'Tax Rates', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Enter tax rates for specific regions.', 'invoicing' ),
+                    'name' => '<h3>' . __('Tax Rates', 'invoicing') . '</h3>',
+                    'desc' => __('Enter tax rates for specific regions.', 'invoicing'),
                     'type' => 'tax_rates',
                 ),
             ),
@@ -358,45 +358,45 @@ 
 
                 'vat_company_name' => array(
                     'id' => 'vat_company_name',
-                    'name' => __( 'Company Name', 'invoicing' ),
-                    'desc' => wp_sprintf(__( 'Verify your company name and  VAT number on the %sEU VIES System.%s', 'invoicing' ), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>' ),
+                    'name' => __('Company Name', 'invoicing'),
+                    'desc' => wp_sprintf(__('Verify your company name and  VAT number on the %sEU VIES System.%s', 'invoicing'), '<a href="http://ec.europa.eu/taxation_customs/vies/" target="_blank">', '</a>'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
 
                 'vat_number' => array(
                     'id'   => 'vat_number',
-                    'name' => __( 'VAT Number', 'invoicing' ),
-                    'desc' => __( 'Enter your VAT number including the country identifier, eg: GB123456789', 'invoicing' ),
+                    'name' => __('VAT Number', 'invoicing'),
+                    'desc' => __('Enter your VAT number including the country identifier, eg: GB123456789', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                 ),
 
                 'vat_prevent_b2c_purchase' => array(
                     'id' => 'vat_prevent_b2c_purchase',
-                    'name' => __( 'Prevent B2C Sales', 'invoicing' ),
-                    'desc' => __( 'Require everyone in the EU to provide a VAT number.', 'invoicing' ),
+                    'name' => __('Prevent B2C Sales', 'invoicing'),
+                    'desc' => __('Require everyone in the EU to provide a VAT number.', 'invoicing'),
                     'type' => 'checkbox'
                 ),
 
                 'validate_vat_number' => array(
                     'id'   => 'validate_vat_number',
-                    'name' => __( 'Validate VAT Number', 'invoicing' ),
-                    'desc' => __( 'Validate VAT numbers with VIES.', 'invoicing' ),
+                    'name' => __('Validate VAT Number', 'invoicing'),
+                    'desc' => __('Validate VAT numbers with VIES.', 'invoicing'),
                     'type' => 'checkbox'
                 ),
 
                 'vat_same_country_rule' => array(
                     'id'          => 'vat_same_country_rule',
-                    'name'        => __( 'Same Country Rule', 'invoicing' ),
-                    'desc'        => __( 'What should happen if a customer is from the same country as your business?', 'invoicing' ),
+                    'name'        => __('Same Country Rule', 'invoicing'),
+                    'desc'        => __('What should happen if a customer is from the same country as your business?', 'invoicing'),
                     'type'        => 'select',
                     'options'     => array(
-                        'no'        => __( 'Do not charge tax', 'invoicing' ),
-                        'always'    => __( 'Charge tax unless vat number is validated', 'invoicing' ),
-                        'vat_too'   => __( 'Charge tax even if vat number is validated', 'invoicing' )
+                        'no'        => __('Do not charge tax', 'invoicing'),
+                        'always'    => __('Charge tax unless vat number is validated', 'invoicing'),
+                        'vat_too'   => __('Charge tax even if vat number is validated', 'invoicing')
                     ),
-                    'placeholder' => __( 'Select an option', 'invoicing' ),
+                    'placeholder' => __('Select an option', 'invoicing'),
                     'std'         => 'vat_too',
                 ),
 
@@ -410,59 +410,59 @@ 
             'main' => array(
                 'email_settings_header' => array(
                     'id'   => 'email_settings_header',
-                    'name' => '<h3>' . __( 'Email Sender Options', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Email Sender Options', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'email_from_name' => array(
                     'id'   => 'email_from_name',
-                    'name' => __( 'From Name', 'invoicing' ),
-                    'desc' => __( 'Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing' ),
-                    'std' => esc_attr( get_bloginfo( 'name', 'display' ) ),
+                    'name' => __('From Name', 'invoicing'),
+                    'desc' => __('Enter the sender\'s name appears in outgoing invoice emails. This should be your site name.', 'invoicing'),
+                    'std' => esc_attr(get_bloginfo('name', 'display')),
                     'type' => 'text',
                 ),
                 'email_from' => array(
                     'id'   => 'email_from',
-                    'name' => __( 'From Email', 'invoicing' ),
-                    'desc' => sprintf (__( 'Email address to send invoice emails from. This will act as the "from" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing' ), $alert_wrapper_start, $alert_wrapper_close),
-                    'std' => get_option( 'admin_email' ),
+                    'name' => __('From Email', 'invoicing'),
+                    'desc' => sprintf(__('Email address to send invoice emails from. This will act as the "from" address. %s If emails are not being sent it may be that your hosting prevents emails being sent if the email domains do not match.%s', 'invoicing'), $alert_wrapper_start, $alert_wrapper_close),
+                    'std' => get_option('admin_email'),
                     'type' => 'text',
                 ),
                 'admin_email' => array(
                     'id'   => 'admin_email',
-                    'name' => __( 'Admin Email', 'invoicing' ),
-                    'desc' => __( 'Where should we send admin notifications? This will is also act as the "reply-to" address for invoice emails', 'invoicing' ),
-                    'std' => get_option( 'admin_email' ),
+                    'name' => __('Admin Email', 'invoicing'),
+                    'desc' => __('Where should we send admin notifications? This will is also act as the "reply-to" address for invoice emails', 'invoicing'),
+                    'std' => get_option('admin_email'),
                     'type' => 'text',
                 ),
                 'overdue_settings_header' => array(
                     'id'   => 'overdue_settings_header',
-                    'name' => '<h3>' . __( 'Due Date Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Due Date Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'overdue_active' => array(
                     'id'   => 'overdue_active',
-                    'name' => __( 'Enable Due Date', 'invoicing' ),
-                    'desc' => __( 'Check this to enable due date option for invoices.', 'invoicing' ),
+                    'name' => __('Enable Due Date', 'invoicing'),
+                    'desc' => __('Check this to enable due date option for invoices.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => false,
                 ),
                 'email_template_header' => array(
                     'id'   => 'email_template_header',
-                    'name' => '<h3>' . __( 'Email Template', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Email Template', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'email_header_image' => array(
                     'id'   => 'email_header_image',
-                    'name' => __( 'Header Image', 'invoicing' ),
-                    'desc' => __( 'URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing' ),
+                    'name' => __('Header Image', 'invoicing'),
+                    'desc' => __('URL to an image you want to show in the email header. Upload images using the media uploader (Admin > Media).', 'invoicing'),
                     'std' => '',
                     'type' => 'text',
                 ),
                 'email_footer_text' => array(
                     'id'   => 'email_footer_text',
-                    'name' => __( 'Footer Text', 'invoicing' ),
-                    'desc' => __( 'The text to appear in the footer of all invoice emails.', 'invoicing' ),
-                    'std' => get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ),
+                    'name' => __('Footer Text', 'invoicing'),
+                    'desc' => __('The text to appear in the footer of all invoice emails.', 'invoicing'),
+                    'std' => get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing'),
                     'type' => 'textarea',
                     'class' => 'regular-text',
                     'rows' => 2,
@@ -470,29 +470,29 @@ 
                 ),
                 'email_base_color' => array(
                     'id'   => 'email_base_color',
-                    'name' => __( 'Base Color', 'invoicing' ),
-                    'desc' => __( 'The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing' ),
+                    'name' => __('Base Color', 'invoicing'),
+                    'desc' => __('The base color for invoice email template. Default <code>#557da2</code>.', 'invoicing'),
                     'std' => '#557da2',
                     'type' => 'color',
                 ),
                 'email_background_color' => array(
                     'id'   => 'email_background_color',
-                    'name' => __( 'Background Color', 'invoicing' ),
-                    'desc' => __( 'The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing' ),
+                    'name' => __('Background Color', 'invoicing'),
+                    'desc' => __('The background color of email template. Default <code>#f5f5f5</code>.', 'invoicing'),
                     'std' => '#f5f5f5',
                     'type' => 'color',
                 ),
                 'email_body_background_color' => array(
                     'id'   => 'email_body_background_color',
-                    'name' => __( 'Body Background Color', 'invoicing' ),
-                    'desc' => __( 'The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing' ),
+                    'name' => __('Body Background Color', 'invoicing'),
+                    'desc' => __('The main body background color of email template. Default <code>#fdfdfd</code>.', 'invoicing'),
                     'std' => '#fdfdfd',
                     'type' => 'color',
                 ),
                 'email_text_color' => array(
                     'id'   => 'email_text_color',
-                    'name' => __( 'Body Text Color', 'invoicing' ),
-                    'desc' => __( 'The main body text color. Default <code>#505050</code>.', 'invoicing' ),
+                    'name' => __('Body Text Color', 'invoicing'),
+                    'desc' => __('The main body text color. Default <code>#505050</code>.', 'invoicing'),
                     'std' => '#505050',
                     'type' => 'color',
                 ),
@@ -507,7 +507,7 @@ 
     ),
 
     // Integrations.
-    'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'settings', 'id' ),
+    'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'settings', 'id'),
 
     /** Privacy Settings */
     'privacy' => apply_filters('wpinv_settings_privacy',
@@ -515,17 +515,17 @@ 
             'main' => array(
                 'invoicing_privacy_policy_settings' => array(
                     'id'   => 'invoicing_privacy_policy_settings',
-                    'name' => '<h3>' . __( 'Privacy Policy', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Privacy Policy', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'privacy_page' => array(
                     'id'          => 'privacy_page',
-                    'name'        => __( 'Privacy Page', 'invoicing' ),
-                    'desc'        => __( 'If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing' ),
+                    'name'        => __('Privacy Page', 'invoicing'),
+                    'desc'        => __('If no privacy policy page set in Settings->Privacy default settings, this page will be used on checkout page.', 'invoicing'),
                     'type'        => 'select',
-                    'options'     => wpinv_get_pages( true,  __( 'Select a page', 'invoicing' )),
+                    'options'     => wpinv_get_pages(true, __('Select a page', 'invoicing')),
                     'class'       => 'wpi_select2',
-                    'placeholder' => __( 'Select a page', 'invoicing' ),
+                    'placeholder' => __('Select a page', 'invoicing'),
                 ),
             ),
         )
@@ -536,19 +536,19 @@ 
             'main' => array(
                 'invoice_number_format_settings' => array(
                     'id'   => 'invoice_number_format_settings',
-                    'name' => '<h3>' . __( 'Invoice Number', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Invoice Number', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'sequential_invoice_number' => array(
                     'id'   => 'sequential_invoice_number',
-                    'name' => __( 'Sequential Invoice Numbers', 'invoicing' ),
-                    'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing' ) . $reset_number,
+                    'name' => __('Sequential Invoice Numbers', 'invoicing'),
+                    'desc' => __('Check this box to enable sequential invoice numbers.', 'invoicing') . $reset_number,
                     'type' => 'checkbox',
                 ),
                 'invoice_sequence_start' => array(
                     'id'   => 'invoice_sequence_start',
-                    'name' => __( 'Sequential Starting Number', 'invoicing' ),
-                    'desc' => __( 'The number at which the invoice number sequence should begin.', 'invoicing' ) . $last_number,
+                    'name' => __('Sequential Starting Number', 'invoicing'),
+                    'desc' => __('The number at which the invoice number sequence should begin.', 'invoicing') . $last_number,
                     'type' => 'number',
                     'size' => 'small',
                     'std'  => '1',
@@ -556,8 +556,8 @@ 
                 ),
                 'invoice_number_padd' => array(
                     'id'      => 'invoice_number_padd',
-                    'name'    => __( 'Minimum Digits', 'invoicing' ),
-                    'desc'    => __( 'If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing' ),
+                    'name'    => __('Minimum Digits', 'invoicing'),
+                    'desc'    => __('If the invoice number has less digits than this number, it is left padded with 0s. Ex: invoice number 108 will padded to 00108 if digits set to 5. The default 0 means no padding.', 'invoicing'),
                     'type'    => 'select',
                     'options' => $invoice_number_padd_options,
                     'std'     => 5,
@@ -565,8 +565,8 @@ 
                 ),
                 'invoice_number_prefix' => array(
                     'id' => 'invoice_number_prefix',
-                    'name' => __( 'Invoice Number Prefix', 'invoicing' ),
-                    'desc' => __( 'Prefix for all invoice numbers. Ex: INV-', 'invoicing' ),
+                    'name' => __('Invoice Number Prefix', 'invoicing'),
+                    'desc' => __('Prefix for all invoice numbers. Ex: INV-', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                     'std' => 'INV-',
@@ -574,46 +574,46 @@ 
                 ),
                 'invoice_number_postfix' => array(
                     'id' => 'invoice_number_postfix',
-                    'name' => __( 'Invoice Number Postfix', 'invoicing' ),
-                    'desc' => __( 'Postfix for all invoice numbers.', 'invoicing' ),
+                    'name' => __('Invoice Number Postfix', 'invoicing'),
+                    'desc' => __('Postfix for all invoice numbers.', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
                     'std' => ''
                 ),
                 'checkout_settings' => array(
                     'id'   => 'checkout_settings',
-                    'name' => '<h3>' . __( 'Checkout Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Checkout Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'disable_new_user_emails' => array(
                     'id'   => 'disable_new_user_emails',
-                    'name' => __( 'Disable new user emails', 'invoicing' ),
-                    'desc' => __( 'Do not send an email to customers when a new user account is created for them.', 'invoicing' ),
+                    'name' => __('Disable new user emails', 'invoicing'),
+                    'desc' => __('Do not send an email to customers when a new user account is created for them.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
                 'login_to_checkout' => array(
                     'id'   => 'login_to_checkout',
-                    'name' => __( 'Require Login To Checkout', 'invoicing' ),
-                    'desc' => __( 'If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing' ),
+                    'name' => __('Require Login To Checkout', 'invoicing'),
+                    'desc' => __('If ticked then user needs to be logged in to view or pay invoice, can only view or pay their own invoice. If unticked then anyone can view or pay the invoice.', 'invoicing'),
                     'type' => 'checkbox',
                 ),
                 'maxmind_license_key' => array(
                     'id'   => 'maxmind_license_key',
-                    'name' => __( 'MaxMind License Key', 'invoicing' ),
+                    'name' => __('MaxMind License Key', 'invoicing'),
                     'type' => 'text',
                     'size' => 'regular',
-                    'desc' => __( "Enter you license key if you would like to use MaxMind to automatically detect a customer's country.", 'invoicing' ) . ' <a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __( 'How to generate a free license key.', 'invoicing' ) . '</a>',
+                    'desc' => __("Enter you license key if you would like to use MaxMind to automatically detect a customer's country.", 'invoicing') . ' <a href="https://support.maxmind.com/account-faq/license-keys/how-do-i-generate-a-license-key/">' . __('How to generate a free license key.', 'invoicing') . '</a>',
                 ),
 
                 'uninstall_settings' => array(
                     'id'   => 'uninstall_settings',
-                    'name' => '<h3>' . __( 'Uninstall Settings', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Uninstall Settings', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'remove_data_on_unistall' => array(
                     'id'   => 'remove_data_on_unistall',
-                    'name' => __( 'Remove Data on Uninstall?', 'invoicing' ),
-                    'desc' => __( 'Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing' ),
+                    'name' => __('Remove Data on Uninstall?', 'invoicing'),
+                    'desc' => __('Check this box if you would like Invoicing plugin to completely remove all of its data when the plugin is deleted/uninstalled.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => ''
                 ),
@@ -622,13 +622,13 @@ 
             'custom-css' => array(
                 'css_settings' => array(
                     'id'   => 'css_settings',
-                    'name' => '<h3>' . __( 'Custom CSS', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('Custom CSS', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
                 'template_custom_css' => array(
                     'id' => 'template_custom_css',
-                    'name' => __( 'Invoice Template CSS', 'invoicing' ),
-                    'desc' => __( 'Add CSS to modify appearance of the print invoice page.', 'invoicing' ),
+                    'name' => __('Invoice Template CSS', 'invoicing'),
+                    'desc' => __('Add CSS to modify appearance of the print invoice page.', 'invoicing'),
                     'type' => 'textarea',
                     'class'=> 'regular-text',
                     'rows' => 10,
@@ -642,8 +642,8 @@ 
             'main' => array(
                 'tool_settings' => array(
                     'id'   => 'tool_settings',
-                    'name' => '<h3>' . __( 'Diagnostic Tools', 'invoicing' ) . '</h3>',
-                    'desc' => __( 'Invoicing diagnostic tools', 'invoicing' ),
+                    'name' => '<h3>' . __('Diagnostic Tools', 'invoicing') . '</h3>',
+                    'desc' => __('Invoicing diagnostic tools', 'invoicing'),
                     'type' => 'tools',
                 ),
             ),

includes/admin/class-getpaid-installer.php

Indentation +369 added lines, -369 removed lines

@@ -20,222 +20,222 @@ 
  */
 class GetPaid_Installer {
 
-	/**
-	 * Upgrades the install.
-	 *
-	 * @param string $upgrade_from The current invoicing version.
-	 */
-	public function upgrade_db( $upgrade_from ) {
-
-		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
-
-		// Setup the invoice Custom Post Type.
-		GetPaid_Post_Types::register_post_types();
-
-		// Clear the permalinks
-		flush_rewrite_rules();
-
-		// Maybe create new/missing pages.
-		$this->create_pages();
-
-		// Maybe re(add) admin capabilities.
-		$this->add_capabilities();
-
-		// Maybe create the default payment form.
-		wpinv_get_default_payment_form();
-
-		// Create any missing database tables.
-		$method = "upgrade_from_$upgrade_from";
-
-		if ( method_exists( $this, $method ) ) {
-			$this->$method();
-		}
-
-	}
-
-	/**
-	 * Do a fresh install.
-	 *
-	 */
-	public function upgrade_from_0() {
-		$this->create_subscriptions_table();
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-
-		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-	}
-
-	/**
-	 * Upgrade to 0.0.5
-	 *
-	 */
-	public function upgrade_from_004() {
-		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' )" );
-
-			// Clean post cache
-			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 );
-
-		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 );
-			}
-
-		}
-
-		$this->upgrade_from_102();
-	}
-
-	/**
-	 * Upgrade to 1.0.3
-	 *
-	 */
-	public function upgrade_from_102() {
-		$this->create_subscriptions_table();
-		$this->upgrade_from_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-		$this->migrate_old_invoices();
-	}
-
-	/**
-	 * Upgrade to version 2.0.8.
-	 *
-	 */
-	public function upgrade_from_207() {
-		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
-	}
-
-	/**
-	 * Give administrators the capability to manage GetPaid.
-	 *
-	 */
-	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
-	}
-
-	/**
-	 * Retreives GetPaid pages.
-	 *
-	 */
-	public static function get_pages() {
-
-		return apply_filters(
-			'wpinv_create_pages',
-			array(
-
-				// Checkout page.
-				'checkout_page' => array(
-					'name'      => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'     => _x( 'Checkout', 'Page title', 'invoicing' ),
-					'content'   => '
+    /**
+     * Upgrades the install.
+     *
+     * @param string $upgrade_from The current invoicing version.
+     */
+    public function upgrade_db( $upgrade_from ) {
+
+        // Save the current invoicing version.
+        update_option( 'wpinv_version', WPINV_VERSION );
+
+        // Setup the invoice Custom Post Type.
+        GetPaid_Post_Types::register_post_types();
+
+        // Clear the permalinks
+        flush_rewrite_rules();
+
+        // Maybe create new/missing pages.
+        $this->create_pages();
+
+        // Maybe re(add) admin capabilities.
+        $this->add_capabilities();
+
+        // Maybe create the default payment form.
+        wpinv_get_default_payment_form();
+
+        // Create any missing database tables.
+        $method = "upgrade_from_$upgrade_from";
+
+        if ( method_exists( $this, $method ) ) {
+            $this->$method();
+        }
+
+    }
+
+    /**
+     * Do a fresh install.
+     *
+     */
+    public function upgrade_from_0() {
+        $this->create_subscriptions_table();
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+
+        // Save default tax rates.
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+    }
+
+    /**
+     * Upgrade to 0.0.5
+     *
+     */
+    public function upgrade_from_004() {
+        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' )" );
+
+            // Clean post cache
+            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 );
+
+        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 );
+            }
+
+        }
+
+        $this->upgrade_from_102();
+    }
+
+    /**
+     * Upgrade to 1.0.3
+     *
+     */
+    public function upgrade_from_102() {
+        $this->create_subscriptions_table();
+        $this->upgrade_from_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+        $this->migrate_old_invoices();
+    }
+
+    /**
+     * Upgrade to version 2.0.8.
+     *
+     */
+    public function upgrade_from_207() {
+        global $wpdb;
+        $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+    }
+
+    /**
+     * Give administrators the capability to manage GetPaid.
+     *
+     */
+    public function add_capabilities() {
+        $GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+    }
+
+    /**
+     * Retreives GetPaid pages.
+     *
+     */
+    public static function get_pages() {
+
+        return apply_filters(
+            'wpinv_create_pages',
+            array(
+
+                // Checkout page.
+                'checkout_page' => array(
+                    'name'      => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
+                    'title'     => _x( 'Checkout', 'Page title', 'invoicing' ),
+                    'content'   => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
 						<!-- /wp:shortcode -->
 					',
-					'parent'    => '',
-				),
-
-				// Invoice history page.
-				'invoice_history_page' => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'    => '',
+                ),
+
+                // Invoice history page.
+                'invoice_history_page' => array(
+                    'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
-
-				// Success page content.
-				'success_page' => array(
-					'name'     => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'    => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
-					'content'  => '
+                    'parent'  => '',
+                ),
+
+                // Success page content.
+                'success_page' => array(
+                    'name'     => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
+                    'title'    => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+                    'content'  => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
 					<!-- /wp:shortcode -->
 				',
-					'parent'   => 'gp-checkout',
-				),
-
-				// 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' ),
-					'parent'  => 'gp-checkout',
-				),
-
-				// Subscriptions history page.
-				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'   => 'gp-checkout',
+                ),
+
+                // 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' ),
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Subscriptions history page.
+                'invoice_subscription_page' => array(
+                    'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
 					<!-- /wp:shortcode -->
 				',
-					'parent' => '',
-				),
+                    'parent' => '',
+                ),
 
-			)
-		);
+            )
+        );
 
-	}
+    }
 
-	/**
-	 * Re-create GetPaid pages.
-	 *
-	 */
-	public function create_pages() {
+    /**
+     * Re-create GetPaid pages.
+     *
+     */
+    public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
-		}
+        foreach ( self::get_pages() as $key => $page ) {
+            wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+        }
 
-	}
+    }
 
-	/**
-	 * Create subscriptions table.
-	 *
-	 */
-	public function create_subscriptions_table() {
+    /**
+     * Create subscriptions table.
+     *
+     */
+    public function create_subscriptions_table() {
 
-		global $wpdb;
+        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();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
 			id bigint(20) unsigned NOT NULL auto_increment,
 			customer_id bigint(20) NOT NULL,
 			frequency int(11) NOT NULL DEFAULT '1',
@@ -258,22 +258,22 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoices table.
-	 *
-	 */
-	public function create_invoices_table() {
-		global $wpdb;
+    /**
+     * Create invoices table.
+     *
+     */
+    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();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
             `number` VARCHAR(100),
             `key` VARCHAR(100),
@@ -309,22 +309,22 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoice items table.
-	 *
-	 */
-	public function create_invoice_items_table() {
-		global $wpdb;
+    /**
+     * Create invoice items table.
+     *
+     */
+    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();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -346,159 +346,159 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public function migrate_old_invoices() {
-		global $wpdb;
-
-		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
-		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
-		$invoices            = array_unique(
-			get_posts(
-				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
-					'posts_per_page' => -1,
-					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
-					'exclude'        => (array) $migrated,
-				)
-			)
-		);
-
-		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
-			return;
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
-
-		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
-
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
-
-			if ( empty( $invoice->ID ) ) {
-				return;
-			}
-
-			$fields = array (
-				'post_id'        => $invoice->ID,
-				'number'         => $invoice->get_number(),
-				'key'            => $invoice->get_key(),
-				'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
-				'mode'           => $invoice->mode,
-				'user_ip'        => $invoice->get_ip(),
-				'first_name'     => $invoice->get_first_name(),
-				'last_name'      => $invoice->get_last_name(),
-				'address'        => $invoice->get_address(),
-				'city'           => $invoice->city,
-				'state'          => $invoice->state,
-				'country'        => $invoice->country,
-				'zip'            => $invoice->zip,
-				'adddress_confirmed' => (int) $invoice->adddress_confirmed,
-				'gateway'        => $invoice->get_gateway(),
-				'transaction_id' => $invoice->get_transaction_id(),
-				'currency'       => $invoice->get_currency(),
-				'subtotal'       => $invoice->get_subtotal(),
-				'tax'            => $invoice->get_tax(),
-				'fees_total'     => $invoice->get_fees_total(),
-				'total'          => $invoice->get_total(),
-				'discount'       => $invoice->get_discount(),
-				'discount_code'  => $invoice->get_discount_code(),
-				'disable_taxes'  => $invoice->disable_taxes,
-				'due_date'       => $invoice->get_due_date(),
-				'completed_date' => $invoice->get_completed_date(),
-				'company'        => $invoice->company,
-				'vat_number'     => $invoice->vat_number,
-				'vat_rate'       => $invoice->vat_rate,
-				'custom_meta'    => $invoice->payment_meta
-			);
-
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
-					$val = '';
-				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
-			}
-
-			$fields = implode( ', ', $fields );
-			$invoice_rows[] = "($fields)";
-
-			$item_rows    = array();
-			$item_columns = array();
-			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'],
-					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
-					'tax'              => $details['tax'],
-					'item_price'       => $details['item_price'],
-					'custom_price'     => $details['custom_price'],
-					'quantity'         => $details['quantity'],
-					'discount'         => $details['discount'],
-					'subtotal'         => $details['subtotal'],
-					'price'            => $details['price'],
-					'meta'             => $details['meta'],
-					'fees'             => $details['fees'],
-				);
-
-				$item_columns = array_keys ( $fields );
-
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
-						$val = '';
-					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
-				}
-
-				$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" );
-		}
-
-		if ( empty( $invoice_rows ) ) {
-			return;
-		}
-
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public static function rename_gateways_label() {
-		global $wpdb;
-
-		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 ) ),
-				'%s',
-				'%s'
-			);
-
-		}
-	}
+        dbDelta( $sql );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public function migrate_old_invoices() {
+        global $wpdb;
+
+        $invoices_table      = $wpdb->prefix . 'getpaid_invoices';
+        $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
+        $migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+        $invoices            = array_unique(
+            get_posts(
+                array(
+                    'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                    'posts_per_page' => -1,
+                    'fields'         => 'ids',
+                    'post_status'    => array_keys( get_post_stati() ),
+                    'exclude'        => (array) $migrated,
+                )
+            )
+        );
+
+        // Abort if we do not have any invoices.
+        if ( empty( $invoices ) ) {
+            return;
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+
+        $invoice_rows = array();
+        foreach ( $invoices as $invoice ) {
+
+            $invoice = new WPInv_Legacy_Invoice( $invoice );
+
+            if ( empty( $invoice->ID ) ) {
+                return;
+            }
+
+            $fields = array (
+                'post_id'        => $invoice->ID,
+                'number'         => $invoice->get_number(),
+                'key'            => $invoice->get_key(),
+                'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
+                'mode'           => $invoice->mode,
+                'user_ip'        => $invoice->get_ip(),
+                'first_name'     => $invoice->get_first_name(),
+                'last_name'      => $invoice->get_last_name(),
+                'address'        => $invoice->get_address(),
+                'city'           => $invoice->city,
+                'state'          => $invoice->state,
+                'country'        => $invoice->country,
+                'zip'            => $invoice->zip,
+                'adddress_confirmed' => (int) $invoice->adddress_confirmed,
+                'gateway'        => $invoice->get_gateway(),
+                'transaction_id' => $invoice->get_transaction_id(),
+                'currency'       => $invoice->get_currency(),
+                'subtotal'       => $invoice->get_subtotal(),
+                'tax'            => $invoice->get_tax(),
+                'fees_total'     => $invoice->get_fees_total(),
+                'total'          => $invoice->get_total(),
+                'discount'       => $invoice->get_discount(),
+                'discount_code'  => $invoice->get_discount_code(),
+                'disable_taxes'  => $invoice->disable_taxes,
+                'due_date'       => $invoice->get_due_date(),
+                'completed_date' => $invoice->get_completed_date(),
+                'company'        => $invoice->company,
+                'vat_number'     => $invoice->vat_number,
+                'vat_rate'       => $invoice->vat_rate,
+                'custom_meta'    => $invoice->payment_meta
+            );
+
+            foreach ( $fields as $key => $val ) {
+                if ( is_null( $val ) ) {
+                    $val = '';
+                }
+                $val = maybe_serialize( $val );
+                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            }
+
+            $fields = implode( ', ', $fields );
+            $invoice_rows[] = "($fields)";
+
+            $item_rows    = array();
+            $item_columns = array();
+            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'],
+                    'vat_rate'         => $details['vat_rate'],
+                    'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                    'tax'              => $details['tax'],
+                    'item_price'       => $details['item_price'],
+                    'custom_price'     => $details['custom_price'],
+                    'quantity'         => $details['quantity'],
+                    'discount'         => $details['discount'],
+                    'subtotal'         => $details['subtotal'],
+                    'price'            => $details['price'],
+                    'meta'             => $details['meta'],
+                    'fees'             => $details['fees'],
+                );
+
+                $item_columns = array_keys ( $fields );
+
+                foreach ( $fields as $key => $val ) {
+                    if ( is_null( $val ) ) {
+                        $val = '';
+                    }
+                    $val = maybe_serialize( $val );
+                    $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                }
+
+                $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" );
+        }
+
+        if ( empty( $invoice_rows ) ) {
+            return;
+        }
+
+        $invoice_rows = implode( ', ', $invoice_rows );
+        $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public static function rename_gateways_label() {
+        global $wpdb;
+
+        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 ) ),
+                '%s',
+                '%s'
+            );
+
+        }
+    }
 
 }

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]
@@ -217,8 +217,8 @@ 
 	 */
 	public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+		foreach (self::get_pages() as $key => $page) {
+			wpinv_create_page(esc_sql($page['name']), $key, $page['title'], $page['content'], $page['parent']);
 		}
 
 	}
@@ -231,7 +231,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();
@@ -258,7 +258,7 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -269,7 +269,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();
@@ -309,7 +309,7 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -320,7 +320,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();
@@ -346,7 +346,7 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -359,40 +359,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(),
@@ -421,27 +421,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'],
@@ -453,31 +453,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");
 
 	}
 
@@ -488,12 +488,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'
 			);

vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.1.49";
-	if(version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.1.49";
+    if(version_compare($this_version , $ayecode_ui_version, '>')){
+        $ayecode_ui_version = $this_version ;
+        $ayecode_ui_file_key = wp_hash( __FILE__ );
+    }
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
-	}
+    global $ayecode_ui_file_key;
+    if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
+        include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
+        include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+    }
 },1);
 
 /**
  * Add the function that calls the class.
  */
 if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
-			return false;
-		}
-		return AUI::instance();
-	}
+    function aui(){
+        if(!class_exists("AUI",false)){
+            return false;
+        }
+        return AUI::instance();
+    }
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -6,39 +6,39 @@
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
+add_action('after_setup_theme', function() {
+	global $ayecode_ui_version, $ayecode_ui_file_key;
 	$this_version = "0.1.49";
-	if(version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
+	if (version_compare($this_version, $ayecode_ui_version, '>')) {
+		$ayecode_ui_version = $this_version;
+		$ayecode_ui_file_key = wp_hash(__FILE__);
 	}
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
-add_action('after_setup_theme', function () {
+add_action('after_setup_theme', function() {
 	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+	if ($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash(__FILE__)) {
+		include_once(dirname(__FILE__) . '/includes/class-aui.php');
+		include_once(dirname(__FILE__) . '/includes/ayecode-ui-settings.php');
 	}
 },1);
 
 /**
  * Add the function that calls the class.
  */
-if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
+if (!function_exists('aui')) {
+	function aui() {
+		if (!class_exists("AUI", false)) {
 			return false;
 		}
 		return AUI::instance();

vendor/composer/InstalledVersions.php

Indentation +54 added lines, -54 removed lines

@@ -12,8 +12,8 @@ 
 class InstalledVersions
 {
 private static $installed = array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -21,87 +21,87 @@ 
     ),
     'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.49',
-      'version' => '0.1.49.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '00082d05acd50d4ce103e054f483ca24f106f93c',
+        'pretty_version' => '0.1.49',
+        'version' => '0.1.49.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '00082d05acd50d4ce103e054f483ca24f106f93c',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.12',
-      'version' => '1.0.12.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '754cca6fda775f3e0b56b90a810dfcaea62ea288',
+        'pretty_version' => '1.0.12',
+        'version' => '1.0.12.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '754cca6fda775f3e0b56b90a810dfcaea62ea288',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '1.0.26',
-      'version' => '1.0.26.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '9f0c4fc4ff5fc3ffbe3346ae9964ae11b7032131',
+        'pretty_version' => '1.0.26',
+        'version' => '1.0.26.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '9f0c4fc4ff5fc3ffbe3346ae9964ae11b7032131',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.11.0',
-      'version' => '1.11.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'ae03311f45dfe194412081526be2e003960df74b',
+        'pretty_version' => 'v1.11.0',
+        'version' => '1.11.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'ae03311f45dfe194412081526be2e003960df74b',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );
 
 

Spacing +22 added lines, -22 removed lines

@@ -11,93 +11,93 @@
 
 class InstalledVersions
 {
-private static $installed = array (
+private static $installed = array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     'name' => 'ayecode/invoicing',
   ),
   'versions' => 
-  array (
+  array(
     'ayecode/ayecode-connect-helper' => 
-    array (
+    array(
       'pretty_version' => '1.0.3',
       'version' => '1.0.3.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
-    array (
+    array(
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     ),
     'ayecode/wp-ayecode-ui' => 
-    array (
+    array(
       'pretty_version' => '0.1.49',
       'version' => '0.1.49.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '00082d05acd50d4ce103e054f483ca24f106f93c',
     ),
     'ayecode/wp-font-awesome-settings' => 
-    array (
+    array(
       'pretty_version' => '1.0.12',
       'version' => '1.0.12.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '754cca6fda775f3e0b56b90a810dfcaea62ea288',
     ),
     'ayecode/wp-super-duper' => 
-    array (
+    array(
       'pretty_version' => '1.0.26',
       'version' => '1.0.26.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '9f0c4fc4ff5fc3ffbe3346ae9964ae11b7032131',
     ),
     'composer/installers' => 
-    array (
+    array(
       'pretty_version' => 'v1.11.0',
       'version' => '1.11.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'ae03311f45dfe194412081526be2e003960df74b',
     ),
     'maxmind-db/reader' => 
-    array (
+    array(
       'pretty_version' => 'v1.6.0',
       'version' => '1.6.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),
     'shama/baton' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),

vendor/composer/installed.php

Indentation +54 added lines, -54 removed lines

@@ -1,6 +1,6 @@ 
 <?php return array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -8,85 +8,85 @@ 
     ),
     'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.49',
-      'version' => '0.1.49.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '00082d05acd50d4ce103e054f483ca24f106f93c',
+        'pretty_version' => '0.1.49',
+        'version' => '0.1.49.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '00082d05acd50d4ce103e054f483ca24f106f93c',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.12',
-      'version' => '1.0.12.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '754cca6fda775f3e0b56b90a810dfcaea62ea288',
+        'pretty_version' => '1.0.12',
+        'version' => '1.0.12.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '754cca6fda775f3e0b56b90a810dfcaea62ea288',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '1.0.26',
-      'version' => '1.0.26.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '9f0c4fc4ff5fc3ffbe3346ae9964ae11b7032131',
+        'pretty_version' => '1.0.26',
+        'version' => '1.0.26.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '9f0c4fc4ff5fc3ffbe3346ae9964ae11b7032131',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.11.0',
-      'version' => '1.11.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'ae03311f45dfe194412081526be2e003960df74b',
+        'pretty_version' => 'v1.11.0',
+        'version' => '1.11.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'ae03311f45dfe194412081526be2e003960df74b',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );

Spacing +22 added lines, -22 removed lines

@@ -1,90 +1,90 @@
-<?php return array (
+<?php return array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     'name' => 'ayecode/invoicing',
   ),
   'versions' => 
-  array (
+  array(
     'ayecode/ayecode-connect-helper' => 
-    array (
+    array(
       'pretty_version' => '1.0.3',
       'version' => '1.0.3.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
-    array (
+    array(
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '7382ee9010a937feb1a5f52ade4e45a6b171565e',
     ),
     'ayecode/wp-ayecode-ui' => 
-    array (
+    array(
       'pretty_version' => '0.1.49',
       'version' => '0.1.49.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '00082d05acd50d4ce103e054f483ca24f106f93c',
     ),
     'ayecode/wp-font-awesome-settings' => 
-    array (
+    array(
       'pretty_version' => '1.0.12',
       'version' => '1.0.12.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '754cca6fda775f3e0b56b90a810dfcaea62ea288',
     ),
     'ayecode/wp-super-duper' => 
-    array (
+    array(
       'pretty_version' => '1.0.26',
       'version' => '1.0.26.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '9f0c4fc4ff5fc3ffbe3346ae9964ae11b7032131',
     ),
     'composer/installers' => 
-    array (
+    array(
       'pretty_version' => 'v1.11.0',
       'version' => '1.11.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'ae03311f45dfe194412081526be2e003960df74b',
     ),
     'maxmind-db/reader' => 
-    array (
+    array(
       'pretty_version' => 'v1.6.0',
       'version' => '1.6.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),
     'shama/baton' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),

includes/admin/views/html-gateways-edit.php

Spacing +15 added lines, -15 removed lines

@@ -4,29 +4,29 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $gateways = wpinv_get_payment_gateways();
-ksort( $gateways );
+ksort($gateways);
 
 ?>
 <div class="table-responsive">
     <table id="wpinv_gateways_select" class="table border bg-white form-table">
-        <caption><?php echo esc_html_e( 'This table displays installed payment methods.', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('This table displays installed payment methods.', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top text-left">
-                    <?php _e( 'Payment Method', 'invoicing' ); ?>
+                    <?php _e('Payment Method', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-center">
-                    <?php _e( 'Enabled', 'invoicing' ); ?>
+                    <?php _e('Enabled', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-center">
-                    <?php _e( 'Supports Subscriptions', 'invoicing' ); ?>
+                    <?php _e('Supports Subscriptions', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-right" style="width:32px">&nbsp;</th>
@@ -35,15 +35,15 @@ 
         </thead>
 
         <tbody>
-            <?php foreach ( $gateways as $id => $gateway ) : ?>
+            <?php foreach ($gateways as $id => $gateway) : ?>
                 <tr>
                     <td class="getpaid-payment-method text-left">
-                        <a style="color: #0073aa;" href="<?php echo esc_url( add_query_arg( 'section', $id ) ); ?>" class="font-weight-bold"><?php echo sanitize_text_field( $gateway['admin_label'] ); ?></a>
+                        <a style="color: #0073aa;" href="<?php echo esc_url(add_query_arg('section', $id)); ?>" class="font-weight-bold"><?php echo sanitize_text_field($gateway['admin_label']); ?></a>
                     </td>
                     <td class="getpaid-payment-method-enabled text-center">
                         <?php
 
-                            if ( wpinv_is_gateway_active( $id ) ) {
+                            if (wpinv_is_gateway_active($id)) {
                                 echo "<i class='text-success fa fa-check'></i>";
                             } else {
                                 echo "<i class='text-dark fa fa-times'></i>";
@@ -54,10 +54,10 @@ 
                     <td class="getpaid-payment-method-subscription text-center">
                         <?php
 
-                            $supports = apply_filters( "wpinv_{$id}_support_subscription", false );
-                            $supports = apply_filters( 'getapid_gateway_supports_subscription', $supports, $id );
+                            $supports = apply_filters("wpinv_{$id}_support_subscription", false);
+                            $supports = apply_filters('getapid_gateway_supports_subscription', $supports, $id);
 
-                            if ( $supports ) {
+                            if ($supports) {
                                 echo "<i class='text-success fa fa-check'></i>";
                             } else {
                                 echo "<i class='text-dark fa fa-times'></i>";
@@ -67,7 +67,7 @@ 
                     </td>
 
                     <td class="getpaid-payment-method-action text-right">
-                        <a class="button button-secondary" href="<?php echo esc_url( add_query_arg( 'section', $id ) ); ?>"><?php _e( 'Manage', 'invoicing' ); ?></a>
+                        <a class="button button-secondary" href="<?php echo esc_url(add_query_arg('section', $id)); ?>"><?php _e('Manage', 'invoicing'); ?></a>
                     </td>
 
                 </tr>
@@ -77,8 +77,8 @@ 
         <tfoot>
             <tr class="table-light">
                 <td colspan="4" class="border-top">
-                    <a class="button button-secondary getpaid-install-gateways" href="<?php echo esc_url( admin_url( 'admin.php?page=wpi-addons&tab=gateways' ) ); ?>">
-                        <span><?php _e( 'Add Payment Methods', 'invoicing' ); ?></span>
+                    <a class="button button-secondary getpaid-install-gateways" href="<?php echo esc_url(admin_url('admin.php?page=wpi-addons&tab=gateways')); ?>">
+                        <span><?php _e('Add Payment Methods', 'invoicing'); ?></span>
                     </a>
                 </td>
             </tr>

includes/gateways/class-getpaid-paypal-gateway.php

Indentation +231 added lines, -231 removed lines

@@ -13,94 +13,94 @@ 
 class GetPaid_Paypal_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'paypal';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 1;
 
     /**
-	 * Stores line items to send to PayPal.
-	 *
-	 * @var array
-	 */
+     * Stores line items to send to PayPal.
+     *
+     * @var array
+     */
     protected $line_items = array();
 
     /**
-	 * Endpoint for requests from PayPal.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to PayPal.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from PayPal.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to PayPal.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://www.{sandbox}paypal.com/activity/payment/%s';
 
     /**
-	 * URL to view a subscription.
-	 *
-	 * @var string
-	 */
-	public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
+     * URL to view a subscription.
+     *
+     * @var string
+     */
+    public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->title                = __( 'PayPal Standard', 'invoicing' );
         $this->method_title         = __( 'PayPal Standard', 'invoicing' );
         $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
         $this->notify_url           = wpinv_get_ipn_url( $this->id );
 
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
+        add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
         add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
 
         parent::__construct();
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Get redirect url.
         $paypal_redirect = $this->get_request_url( $invoice );
@@ -123,15 +123,15 @@ 
     }
 
     /**
-	 * Get the PayPal request URL for an invoice.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return string
-	 */
-	public function get_request_url( $invoice ) {
+     * Get the PayPal request URL for an invoice.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return string
+     */
+    public function get_request_url( $invoice ) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+        $this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
         $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
@@ -144,44 +144,44 @@ 
 
         return add_query_arg( $paypal_args, $this->endpoint );
 
-	}
+    }
 
     /**
-	 * Get PayPal Args for passing to PP.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_paypal_args( $invoice ) {
+     * Get PayPal Args for passing to PP.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_paypal_args( $invoice ) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
-
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
-			$force_one_line_item = true;
-		}
-
-		$paypal_args = apply_filters(
-			'getpaid_paypal_args',
-			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
-			),
-			$invoice
-		);
-
-		return $this->fix_request_length( $invoice, $paypal_args );
+        $force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+
+        if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+            $force_one_line_item = true;
+        }
+
+        $paypal_args = apply_filters(
+            'getpaid_paypal_args',
+            array_merge(
+                $this->get_transaction_args( $invoice ),
+                $this->get_line_item_args( $invoice, $force_one_line_item )
+            ),
+            $invoice
+        );
+
+        return $this->fix_request_length( $invoice, $paypal_args );
     }
 
     /**
-	 * Get transaction args for paypal request.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_transaction_args( $invoice ) {
-
-		return array(
+     * Get transaction args for paypal request.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_transaction_args( $invoice ) {
+
+        return array(
             'cmd'           => '_cart',
             'business'      => wpinv_get_option( 'paypal_email', false ),
             'no_shipping'   => '1',
@@ -206,16 +206,16 @@ 
     }
 
     /**
-	 * Get line item args for paypal request.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @param  bool     $force_one_line_item Create only one item for this invoice.
-	 * @return array
-	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+     * Get line item args for paypal request.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @param  bool     $force_one_line_item Create only one item for this invoice.
+     * @return array
+     */
+    protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
+        if ( $force_one_line_item ) {
             return $this->get_line_item_args_single_item( $invoice );
         }
 
@@ -235,129 +235,129 @@ 
             $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+        return array_merge( $line_item_args, $this->get_line_items() );
 
     }
 
     /**
-	 * Get line item args for paypal request as a single line item.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_line_item_args_single_item( $invoice ) {
-		$this->delete_line_items();
+     * Get line item args for paypal request as a single line item.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_line_item_args_single_item( $invoice ) {
+        $this->delete_line_items();
 
         $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
 
-		return $this->get_line_items();
+        return $this->get_line_items();
     }
 
     /**
-	 * Return all line items.
-	 */
-	protected function get_line_items() {
-		return $this->line_items;
-	}
+     * Return all line items.
+     */
+    protected function get_line_items() {
+        return $this->line_items;
+    }
 
     /**
-	 * Remove all line items.
-	 */
-	protected function delete_line_items() {
-		$this->line_items = array();
+     * Remove all line items.
+     */
+    protected function delete_line_items() {
+        $this->line_items = array();
     }
 
     /**
-	 * Prepare line items to send to paypal.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 */
-	protected function prepare_line_items( $invoice ) {
-		$this->delete_line_items();
-
-		// Items.
-		foreach ( $invoice->get_items() as $item ) {
-			$amount   = $item->get_price();
-			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+     * Prepare line items to send to paypal.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     */
+    protected function prepare_line_items( $invoice ) {
+        $this->delete_line_items();
+
+        // Items.
+        foreach ( $invoice->get_items() as $item ) {
+            $amount   = $item->get_price();
+            $quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
+            $this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
+        foreach ( $invoice->get_fees() as $fee => $data ) {
             $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
         }
 
     }
 
     /**
-	 * Add PayPal Line Item.
-	 *
-	 * @param  string $item_name Item name.
-	 * @param  float    $quantity Item quantity.
-	 * @param  float  $amount Amount.
-	 * @param  string $item_number Item number.
-	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
-
-		$item = apply_filters(
-			'getpaid_paypal_line_item',
-			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
-				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
-				'item_number' => $item_number,
-			),
-			$item_name,
-			$quantity,
-			$amount,
-			$item_number
-		);
-
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
+     * Add PayPal Line Item.
+     *
+     * @param  string $item_name Item name.
+     * @param  float    $quantity Item quantity.
+     * @param  float  $amount Amount.
+     * @param  string $item_number Item number.
+     */
+    protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
+        $index = ( count( $this->line_items ) / 4 ) + 1;
+
+        $item = apply_filters(
+            'getpaid_paypal_line_item',
+            array(
+                'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+                'quantity'    => (float) $quantity,
+                'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+                'item_number' => $item_number,
+            ),
+            $item_name,
+            $quantity,
+            $amount,
+            $item_number
+        );
+
+        $this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
         $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+        $this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
+        $this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
     }
 
     /**
-	 * If the default request with line items is too long, generate a new one with only one line item.
-	 *
-	 * https://support.microsoft.com/en-us/help/208427/maximum-url-length-is-2-083-characters-in-internet-explorer.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice to be sent to Paypal.
-	 * @param array    $paypal_args Arguments sent to Paypal in the request.
-	 * @return array
-	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
-		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
-
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
-			return $paypal_args;
-		}
-
-		return apply_filters(
-			'getpaid_paypal_args',
-			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
-			),
-			$invoice
-		);
+     * If the default request with line items is too long, generate a new one with only one line item.
+     *
+     * https://support.microsoft.com/en-us/help/208427/maximum-url-length-is-2-083-characters-in-internet-explorer.
+     *
+     * @param WPInv_Invoice $invoice Invoice to be sent to Paypal.
+     * @param array    $paypal_args Arguments sent to Paypal in the request.
+     * @return array
+     */
+    protected function fix_request_length( $invoice, $paypal_args ) {
+        $max_paypal_length = 2083;
+        $query_candidate   = http_build_query( $paypal_args, '', '&' );
+
+        if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+            return $paypal_args;
+        }
+
+        return apply_filters(
+            'getpaid_paypal_args',
+            array_merge(
+                $this->get_transaction_args( $invoice ),
+                $this->get_line_item_args( $invoice, true )
+            ),
+            $invoice
+        );
 
     }
 
     /**
-	 * Processes recurring invoices.
-	 *
-	 * @param  array $paypal_args PayPal args.
-	 * @param  WPInv_Invoice    $invoice Invoice object.
-	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+     * Processes recurring invoices.
+     *
+     * @param  array $paypal_args PayPal args.
+     * @param  WPInv_Invoice    $invoice Invoice object.
+     */
+    public function process_subscription( $paypal_args, $invoice ) {
 
         // Make sure this is a subscription.
         if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
@@ -382,11 +382,11 @@ 
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
-			// Trial period length.
-			$paypal_args['p1'] = $subscription_item->get_trial_interval();
+            // Trial period length.
+            $paypal_args['p1'] = $subscription_item->get_trial_interval();
 
-			// Trial period.
-			$paypal_args['t1'] = $subscription_item->get_trial_period();
+            // Trial period.
+            $paypal_args['t1'] = $subscription_item->get_trial_period();
 
         } else if ( $initial_amount != $recurring_amount ) {
 
@@ -409,40 +409,40 @@ 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+        if ( ! isset( $param_number ) || 1 == $param_number ) {
 
-			// Subscription price
-			$paypal_args['a3'] = $recurring_amount;
+            // Subscription price
+            $paypal_args['a3'] = $recurring_amount;
 
-			// Subscription duration
-			$paypal_args['p3'] = $interval;
+            // Subscription duration
+            $paypal_args['p3'] = $interval;
 
-			// Subscription period
-			$paypal_args['t3'] = $period;
+            // Subscription period
+            $paypal_args['t3'] = $period;
 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+        if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
 
-			// Non-recurring payments
-			$paypal_args['src'] = 0;
+            // Non-recurring payments
+            $paypal_args['src'] = 0;
 
-		} else {
+        } else {
 
-			$paypal_args['src'] = 1;
+            $paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+            if ( $bill_times > 0 ) {
 
-				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
-					$bill_times--;
-				}
+                // An initial period is being used to charge a sign-up fee
+                if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+                    $bill_times--;
+                }
 
                 // Make sure it's not over the max of 52
                 $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
 
-			}
+            }
         }
 
         // Force return URL so that order description & instructions display
@@ -458,19 +458,19 @@ 
         }
 
         return apply_filters(
-			'getpaid_paypal_subscription_args',
-			$paypal_args,
-			$invoice
+            'getpaid_paypal_subscription_args',
+            $paypal_args,
+            $invoice
         );
 
     }
 
     /**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
         new GetPaid_Paypal_Gateway_IPN_Handler( $this );
     }
 
@@ -480,19 +480,19 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
-			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
-			'</a>'
-		);
+            __( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+            '<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
+            '</a>'
+        );
 
     }
 
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+    /**
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -518,7 +518,7 @@ 
             'readonly' => true,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

Spacing +97 added lines, -97 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
+    protected $supports = array('subscription', 'sandbox', 'single_subscription_group');
 
     /**
 	 * Payment method order.
@@ -59,7 +59,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+	public $currencies = array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR');
 
     /**
 	 * URL to view a transaction.
@@ -80,13 +80,13 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'PayPal Standard', 'invoicing' );
-        $this->method_title         = __( 'PayPal Standard', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->title                = __('PayPal Standard', 'invoicing');
+        $this->method_title         = __('PayPal Standard', 'invoicing');
+        $this->checkout_button_text = __('Proceed to PayPal', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
-        add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
+		add_filter('getpaid_paypal_args', array($this, 'process_subscription'), 10, 2);
+        add_filter('getpaid_paypal_sandbox_notice', array($this, 'sandbox_notice'));
 
         parent::__construct();
     }
@@ -100,16 +100,16 @@ 
 	 * @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) {
 
         // Get redirect url.
-        $paypal_redirect = $this->get_request_url( $invoice );
+        $paypal_redirect = $this->get_request_url($invoice);
 
         // Add a note about the request url.
         $invoice->add_note(
             sprintf(
-                __( 'Redirecting to PayPal: %s', 'invoicing' ),
-                esc_url( $paypal_redirect )
+                __('Redirecting to PayPal: %s', 'invoicing'),
+                esc_url($paypal_redirect)
             ),
             false,
             false,
@@ -117,7 +117,7 @@ 
         );
 
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
 
     }
@@ -128,21 +128,21 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
-        $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
+        $paypal_args = map_deep($this->get_paypal_args($invoice), 'urlencode');
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $paypal_args['bn'] = 'GetPaid_Subscribe_WPS_US';
         } else {
             $paypal_args['bn'] = 'GetPaid_ShoppingCart_WPS_US';
         }
 
-        return add_query_arg( $paypal_args, $this->endpoint );
+        return add_query_arg($paypal_args, $this->endpoint);
 
 	}
 
@@ -152,25 +152,25 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_paypal_args( $invoice ) {
+	protected function get_paypal_args($invoice) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+		$force_one_line_item = apply_filters('getpaid_paypal_force_one_line_item', true, $invoice);
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+		if ($invoice->is_recurring() || (wpinv_use_taxes() && wpinv_prices_include_tax())) {
 			$force_one_line_item = true;
 		}
 
 		$paypal_args = apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, $force_one_line_item)
 			),
 			$invoice
 		);
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+		return $this->fix_request_length($invoice, $paypal_args);
     }
 
     /**
@@ -179,11 +179,11 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_transaction_args( $invoice ) {
+	protected function get_transaction_args($invoice) {
 
 		return array(
             'cmd'           => '_cart',
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'no_shipping'   => '1',
             'shipping'      => '0',
             'no_note'       => '1',
@@ -191,16 +191,16 @@ 
             'rm'            => is_ssl() ? 2 : 1,
             'upload'        => 1,
             'currency_code' => $invoice->get_currency(), // https://developer.paypal.com/docs/nvp-soap-api/currency-codes/#paypal
-            'return'        => esc_url_raw( $this->get_return_url( $invoice ) ),
-            'cancel_return' => esc_url_raw( $invoice->get_checkout_payment_url() ),
-            'notify_url'    => getpaid_limit_length( $this->notify_url, 255 ),
-            'invoice'       => getpaid_limit_length( $invoice->get_number(), 127 ),
+            'return'        => esc_url_raw($this->get_return_url($invoice)),
+            'cancel_return' => esc_url_raw($invoice->get_checkout_payment_url()),
+            'notify_url'    => getpaid_limit_length($this->notify_url, 255),
+            'invoice'       => getpaid_limit_length($invoice->get_number(), 127),
             'custom'        => $invoice->get_id(),
-            'first_name'    => getpaid_limit_length( $invoice->get_first_name(), 32 ),
-            'last_name'     => getpaid_limit_length( $invoice->get_last_name(), 64 ),
-            'country'       => getpaid_limit_length( $invoice->get_country(), 2 ),
-            'email'         => getpaid_limit_length( $invoice->get_email(), 127 ),
-            'cbt'           => get_bloginfo( 'name' )
+            'first_name'    => getpaid_limit_length($invoice->get_first_name(), 32),
+            'last_name'     => getpaid_limit_length($invoice->get_last_name(), 64),
+            'country'       => getpaid_limit_length($invoice->get_country(), 2),
+            'email'         => getpaid_limit_length($invoice->get_email(), 127),
+            'cbt'           => get_bloginfo('name')
         );
 
     }
@@ -212,30 +212,30 @@ 
 	 * @param  bool     $force_one_line_item Create only one item for this invoice.
 	 * @return array
 	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+	protected function get_line_item_args($invoice, $force_one_line_item = false) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
-            return $this->get_line_item_args_single_item( $invoice );
+		if ($force_one_line_item) {
+            return $this->get_line_item_args_single_item($invoice);
         }
 
         // Send each line item individually.
         $line_item_args = array();
 
         // Prepare line items.
-        $this->prepare_line_items( $invoice );
+        $this->prepare_line_items($invoice);
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $line_item_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $line_item_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_tax(), 2);
         }
 
         // Add discount.
-        if ( $invoice->get_total_discount() > 0 ) {
-            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
+        if ($invoice->get_total_discount() > 0) {
+            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_discount(), 2);
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+		return array_merge($line_item_args, $this->get_line_items());
 
     }
 
@@ -245,11 +245,11 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_line_item_args_single_item( $invoice ) {
+	protected function get_line_item_args_single_item($invoice) {
 		$this->delete_line_items();
 
-        $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $item_name = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
+		$this->add_line_item($item_name, 1, wpinv_round_amount((float) $invoice->get_total(), 2, true), $invoice->get_id());
 
 		return $this->get_line_items();
     }
@@ -273,19 +273,19 @@ 
 	 *
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 */
-	protected function prepare_line_items( $invoice ) {
+	protected function prepare_line_items($invoice) {
 		$this->delete_line_items();
 
 		// Items.
-		foreach ( $invoice->get_items() as $item ) {
+		foreach ($invoice->get_items() as $item) {
 			$amount   = $item->get_price();
 			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+			$this->add_line_item($item->get_raw_name(), $quantity, $amount, $item->get_id());
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
-            $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
+		foreach ($invoice->get_fees() as $fee => $data) {
+            $this->add_line_item($fee, 1, wpinv_sanitize_amount($data['initial_fee']));
         }
 
     }
@@ -298,15 +298,15 @@ 
 	 * @param  float  $amount Amount.
 	 * @param  string $item_number Item number.
 	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
+	protected function add_line_item($item_name, $quantity = 1, $amount = 0.0, $item_number = '') {
+		$index = (count($this->line_items) / 4) + 1;
 
 		$item = apply_filters(
 			'getpaid_paypal_line_item',
 			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+				'item_name'   => html_entity_decode(getpaid_limit_length($item_name ? wp_strip_all_tags($item_name) : __('Item', 'invoicing'), 127), ENT_NOQUOTES, 'UTF-8'),
 				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+				'amount'      => wpinv_sanitize_amount((float) $amount, 2),
 				'item_number' => $item_number,
 			),
 			$item_name,
@@ -315,12 +315,12 @@ 
 			$item_number
 		);
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
-        $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items['item_name_' . $index] = getpaid_limit_length($item['item_name'], 127);
+        $this->line_items['quantity_' . $index] = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+		$this->line_items['amount_' . $index]      = $item['amount'] * $item['quantity'];
+		$this->line_items['item_number_' . $index] = getpaid_limit_length($item['item_number'], 127);
     }
 
     /**
@@ -332,19 +332,19 @@ 
 	 * @param array    $paypal_args Arguments sent to Paypal in the request.
 	 * @return array
 	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
+	protected function fix_request_length($invoice, $paypal_args) {
 		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
+		$query_candidate   = http_build_query($paypal_args, '', '&');
 
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+		if (strlen($this->endpoint . $query_candidate) <= $max_paypal_length) {
 			return $paypal_args;
 		}
 
 		return apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, true)
 			),
 			$invoice
 		);
@@ -357,10 +357,10 @@ 
 	 * @param  array $paypal_args PayPal args.
 	 * @param  WPInv_Invoice    $invoice Invoice object.
 	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+	public function process_subscription($paypal_args, $invoice) {
 
         // Make sure this is a subscription.
-        if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
+        if (!$invoice->is_recurring() || !$subscription = getpaid_get_invoice_subscription($invoice)) {
             return $paypal_args;
         }
 
@@ -368,17 +368,17 @@ 
         $paypal_args['cmd'] = '_xclick-subscriptions';
 
         // Subscription name.
-        $paypal_args['item_name'] = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
+        $paypal_args['item_name'] = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
 
         // Get subscription args.
-        $period                 = strtoupper( substr( $subscription->get_period(), 0, 1) );
+        $period                 = strtoupper(substr($subscription->get_period(), 0, 1));
         $interval               = (int) $subscription->get_frequency();
         $bill_times             = (int) $subscription->get_bill_times();
-        $initial_amount         = (float) wpinv_sanitize_amount( $invoice->get_initial_total(), 2 );
-        $recurring_amount       = (float) wpinv_sanitize_amount( $invoice->get_recurring_total(), 2 );
-        $subscription_item      = $invoice->get_recurring( true );
+        $initial_amount         = (float) wpinv_sanitize_amount($invoice->get_initial_total(), 2);
+        $recurring_amount       = (float) wpinv_sanitize_amount($invoice->get_recurring_total(), 2);
+        $subscription_item      = $invoice->get_recurring(true);
 
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
@@ -388,28 +388,28 @@ 
 			// Trial period.
 			$paypal_args['t1'] = $subscription_item->get_trial_period();
 
-        } else if ( $initial_amount != $recurring_amount ) {
+        } else if ($initial_amount != $recurring_amount) {
 
             // No trial period, but initial amount includes a sign-up fee and/or other items, so charge it as a separate period.
 
-            if ( 1 == $bill_times ) {
+            if (1 == $bill_times) {
                 $param_number = 3;
             } else {
                 $param_number = 1;
             }
 
-            $paypal_args[ 'a' . $param_number ] = $initial_amount ? $initial_amount : 0;
+            $paypal_args['a' . $param_number] = $initial_amount ? $initial_amount : 0;
 
             // Sign Up interval
-            $paypal_args[ 'p' . $param_number ] = $interval;
+            $paypal_args['p' . $param_number] = $interval;
 
             // Sign Up unit of duration
-            $paypal_args[ 't' . $param_number ] = $period;
+            $paypal_args['t' . $param_number] = $period;
 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+		if (!isset($param_number) || 1 == $param_number) {
 
 			// Subscription price
 			$paypal_args['a3'] = $recurring_amount;
@@ -423,7 +423,7 @@ 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+		if (1 == $bill_times || ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial() && 2 == $bill_times)) {
 
 			// Non-recurring payments
 			$paypal_args['src'] = 0;
@@ -432,15 +432,15 @@ 
 
 			$paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+			if ($bill_times > 0) {
 
 				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+				if ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial()) {
 					$bill_times--;
 				}
 
                 // Make sure it's not over the max of 52
-                $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+                $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
 
 			}
         }
@@ -449,10 +449,10 @@ 
         $paypal_args['rm'] = 2;
 
         // Get rid of redudant items.
-        foreach ( array( 'item_name_1', 'quantity_1', 'amount_1', 'item_number_1' ) as $arg ) {
+        foreach (array('item_name_1', 'quantity_1', 'amount_1', 'item_number_1') as $arg) {
 
-            if ( isset( $paypal_args[ $arg ] ) ) {
-                unset( $paypal_args[ $arg ] );
+            if (isset($paypal_args[$arg])) {
+                unset($paypal_args[$arg]);
             }
 
         }
@@ -471,7 +471,7 @@ 
 	 * @return void
 	 */
 	public function verify_ipn() {
-        new GetPaid_Paypal_Gateway_IPN_Handler( $this );
+        new GetPaid_Paypal_Gateway_IPN_Handler($this);
     }
 
     /**
@@ -480,7 +480,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+			__('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing'),
 			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
 			'</a>'
 		);
@@ -492,29 +492,29 @@ 
 	 *
 	 * @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['paypal_active']['desc'] .= " ($currencies)";
-        $admin_settings['paypal_desc']['std']     = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+        $admin_settings['paypal_desc']['std']     = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
 
         $admin_settings['paypal_email'] = array(
             'type' => 'text',
             'id'   => 'paypal_email',
-            'name' => __( 'PayPal Email', 'invoicing' ),
-            'desc' => __( "Please enter your PayPal account's email address. Use your sandbox email address in case you've enabled sandbox above.", 'invoicing' ),
+            'name' => __('PayPal Email', 'invoicing'),
+            'desc' => __("Please enter your PayPal account's email address. Use your sandbox email address in case you've enabled sandbox above.", 'invoicing'),
         );
 
         $admin_settings['paypal_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'paypal_ipn_url',
-            'name'     => __( 'IPN Url', 'invoicing' ),
+            'name'     => __('IPN Url', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( "If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing' ) . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __("If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing') . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'readonly' => true,
         );