AyeCode / invoicing

templates/emails/wpinv-email-completed_invoice.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/emails/wpinv-email-user_note.php

Spacing +10 added lines, -10 removed lines

@@ -1,22 +1,22 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/emails/wpinv-email-overdue.php

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/wpinv-subscriptions-history.php

Spacing +10 added lines, -10 removed lines

@@ -29,16 +29,16 @@
     <table class="table table-bordered table-hover table-responsive wpi-user-subscriptions">
         <thead>
         <tr>
-            <th class="sub-no"><span class="nobr"><?php _e( 'No.', 'invoicing' ); ?></span></th>
-            <th class="sub-amount"><span class="nobr"><?php _e( 'Initial Amount', 'invoicing' ); ?></span></th>
-            <th class="sub-cycle"><span class="nobr"><?php _e( 'Billing Cycle', 'invoicing' ); ?></span></th>
-            <th class="sub-billed"><span class="nobr"><?php _e( 'Times Billed', 'invoicing' ); ?></span></th>
-            <th class="sub-status"><span class="nobr"><?php _e( 'Status', 'invoicing' ); ?></span></th>
-            <th class="sub-invoice"><span class="nobr"><?php _e( 'Invoice', 'invoicing' ); ?></span></th>
-            <th class="sub-item"><span class="nobr"><?php _e( 'Item', 'invoicing' ); ?></span></th>
-            <th class="sub-gateway"><span class="nobr"><?php _e( 'Gateway', 'invoicing' ); ?></span></th>
-            <th class="sub-expiry"><span class="nobr"><?php _e( 'Expires On', 'invoicing' ); ?></span></th>
-            <th class="sub-actions"><span class="nobr"><?php _e( 'Actions', 'invoicing' ); ?></span></th>
+            <th class="sub-no"><span class="nobr"><?php _e('No.', 'invoicing'); ?></span></th>
+            <th class="sub-amount"><span class="nobr"><?php _e('Initial Amount', 'invoicing'); ?></span></th>
+            <th class="sub-cycle"><span class="nobr"><?php _e('Billing Cycle', 'invoicing'); ?></span></th>
+            <th class="sub-billed"><span class="nobr"><?php _e('Times Billed', 'invoicing'); ?></span></th>
+            <th class="sub-status"><span class="nobr"><?php _e('Status', 'invoicing'); ?></span></th>
+            <th class="sub-invoice"><span class="nobr"><?php _e('Invoice', 'invoicing'); ?></span></th>
+            <th class="sub-item"><span class="nobr"><?php _e('Item', 'invoicing'); ?></span></th>
+            <th class="sub-gateway"><span class="nobr"><?php _e('Gateway', 'invoicing'); ?></span></th>
+            <th class="sub-expiry"><span class="nobr"><?php _e('Expires On', 'invoicing'); ?></span></th>
+            <th class="sub-actions"><span class="nobr"><?php _e('Actions', 'invoicing'); ?></span></th>
         </tr>
         </thead>
 

templates/wpinv-invoice-history.php

Spacing +43 added lines, -43 removed lines

@@ -1,83 +1,83 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( !( $user_id = get_current_user_id() ) ) {
+if (!($user_id = get_current_user_id())) {
     ?>
-    <div class="wpinv-empty alert alert-error"><?php _e( 'You are not allowed to access this section', 'invoicing' ) ;?></div>
+    <div class="wpinv-empty alert alert-error"><?php _e('You are not allowed to access this section', 'invoicing'); ?></div>
     <?php
     return;
 }
 
 global $current_page;
-$current_page   = empty( $current_page ) ? 1 : absint( $current_page );
-$query          = apply_filters( 'wpinv_user_invoices_query', array( 'user' => $user_id, 'page' => $current_page, 'paginate' => true ) );
-$user_invoices  = wpinv_get_invoices( $query );
+$current_page   = empty($current_page) ? 1 : absint($current_page);
+$query          = apply_filters('wpinv_user_invoices_query', array('user' => $user_id, 'page' => $current_page, 'paginate' => true));
+$user_invoices  = wpinv_get_invoices($query);
 $has_invoices   = 0 < $user_invoices->total;
     
-do_action( 'wpinv_before_user_invoices', $has_invoices ); ?>
+do_action('wpinv_before_user_invoices', $has_invoices); ?>
 
-<?php if ( $has_invoices ) { ?>
+<?php if ($has_invoices) { ?>
 	<table class="table table-bordered table-hover table-responsive wpi-user-invoices">
 		<thead>
 			<tr>
-				<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-					<th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+				<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+					<th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
 				<?php endforeach; ?>
 			</tr>
 		</thead>
 
 		<tbody>
-			<?php foreach ( $user_invoices->invoices as $invoice ) {
+			<?php foreach ($user_invoices->invoices as $invoice) {
 				?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-							<?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-								<?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-							<?php elseif ( 'invoice-number' === $column_id ) : ?>
-								<a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-									<?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+					<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+						<td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+							<?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+								<?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+							<?php elseif ('invoice-number' === $column_id) : ?>
+								<a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+									<?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
 								</a>
 
-							<?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'invoice-status' === $column_id ) : ?>
-								<?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+							<?php elseif ('invoice-status' === $column_id) : ?>
+								<?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-							<?php elseif ( 'invoice-total' === $column_id ) : ?>
-								<?php echo $invoice->get_total( true ); ?>
+							<?php elseif ('invoice-total' === $column_id) : ?>
+								<?php echo $invoice->get_total(true); ?>
 
-							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
+							<?php elseif ('invoice-actions' === $column_id) : ?>
 								<?php
 									$actions = array(
 										'pay'    => array(
 											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+											'name' => __('Pay Now', 'invoicing'),
                                             'class' => 'btn-success'
 										),
                                         'print'   => array(
 											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+											'name' => __('Print', 'invoicing'),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
 										)
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 									}
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
+									if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+										foreach ($actions as $key => $action) {
 											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                            echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                            echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
 										}
 									}
 								?>
@@ -89,9 +89,9 @@ 
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
+	<?php if (1 < $user_invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
@@ -103,20 +103,20 @@ 
 			else
 				$current_page = 1;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
+				'current' => max(1, $current_page),
 				'total'   => $user_invoices->max_num_pages,
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
 <?php } else { ?>
 	<div class="wpinv-empty alert-info">
-		<?php _e( 'No invoice has been made yet.', 'invoicing' ); ?>
+		<?php _e('No invoice has been made yet.', 'invoicing'); ?>
 	</div>
 <?php } ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $has_invoices ); ?>
+<?php do_action('wpinv_after_user_invoices', $has_invoices); ?>

includes/class-wpinv-cache-helper.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,18 +14,18 @@ 
      * Hook in methods.
      */
     public static function init() {
-        add_action( 'init', array( __CLASS__, 'init_hooks' ), 0 );
-        add_action( 'admin_notices', array( __CLASS__, 'notices' ) );
+        add_action('init', array(__CLASS__, 'init_hooks'), 0);
+        add_action('admin_notices', array(__CLASS__, 'notices'));
     }
 
     public static function init_hooks() {
-        if ( false === ( $page_uris = get_transient( 'wpinv_cache_excluded_uris' ) ) ) {
-            $checkout_page = wpinv_get_option( 'checkout_page', '' );
-            $success_page  = wpinv_get_option( 'success_page', '' );
-            $failure_page  = wpinv_get_option( 'failure_page', '' );
-            $history_page  = wpinv_get_option( 'invoice_history_page', '' );
-            $subscr_page   = wpinv_get_option( 'invoice_subscription_page', '' );
-            if ( empty( $checkout_page ) || empty( $success_page ) || empty( $failure_page ) || empty( $history_page ) || empty( $subscr_page ) ) {
+        if (false === ($page_uris = get_transient('wpinv_cache_excluded_uris'))) {
+            $checkout_page = wpinv_get_option('checkout_page', '');
+            $success_page  = wpinv_get_option('success_page', '');
+            $failure_page  = wpinv_get_option('failure_page', '');
+            $history_page  = wpinv_get_option('invoice_history_page', '');
+            $subscr_page   = wpinv_get_option('invoice_subscription_page', '');
+            if (empty($checkout_page) || empty($success_page) || empty($failure_page) || empty($history_page) || empty($subscr_page)) {
                 return;
             }
 
@@ -39,34 +39,34 @@ 
             $page_uris[] = 'p=' . $subscr_page;
 
             // Exclude permalinks
-            $checkout_page  = get_post( $checkout_page );
-            $success_page   = get_post( $success_page );
-            $failure_page   = get_post( $failure_page );
-            $history_page   = get_post( $history_page );
-            $subscr_page    = get_post( $subscr_page );
+            $checkout_page  = get_post($checkout_page);
+            $success_page   = get_post($success_page);
+            $failure_page   = get_post($failure_page);
+            $history_page   = get_post($history_page);
+            $subscr_page    = get_post($subscr_page);
 
-            if ( ! is_null( $checkout_page ) ) {
+            if (!is_null($checkout_page)) {
                 $page_uris[] = '/' . $checkout_page->post_name;
             }
-            if ( ! is_null( $success_page ) ) {
+            if (!is_null($success_page)) {
                 $page_uris[] = '/' . $success_page->post_name;
             }
-            if ( ! is_null( $failure_page ) ) {
+            if (!is_null($failure_page)) {
                 $page_uris[] = '/' . $failure_page->post_name;
             }
-            if ( ! is_null( $history_page ) ) {
+            if (!is_null($history_page)) {
                 $page_uris[] = '/' . $history_page->post_name;
             }
-            if ( ! is_null( $subscr_page ) ) {
+            if (!is_null($subscr_page)) {
                 $page_uris[] = '/' . $subscr_page->post_name;
             }
 
-            set_transient( 'wpinv_cache_excluded_uris', $page_uris );
+            set_transient('wpinv_cache_excluded_uris', $page_uris);
         }
 
-        if ( is_array( $page_uris ) ) {
-            foreach( $page_uris as $uri ) {
-                if ( strstr( $_SERVER['REQUEST_URI'], $uri ) ) {
+        if (is_array($page_uris)) {
+            foreach ($page_uris as $uri) {
+                if (strstr($_SERVER['REQUEST_URI'], $uri)) {
                     self::nocache();
                     break;
                 }
@@ -79,14 +79,14 @@ 
      * @access private
      */
     private static function nocache() {
-        if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-            define( "DONOTCACHEPAGE", true );
+        if (!defined('DONOTCACHEPAGE')) {
+            define("DONOTCACHEPAGE", true);
         }
-        if ( ! defined( 'DONOTCACHEOBJECT' ) ) {
-            define( "DONOTCACHEOBJECT", true );
+        if (!defined('DONOTCACHEOBJECT')) {
+            define("DONOTCACHEOBJECT", true);
         }
-        if ( ! defined( 'DONOTCACHEDB' ) ) {
-            define( "DONOTCACHEDB", true );
+        if (!defined('DONOTCACHEDB')) {
+            define("DONOTCACHEDB", true);
         }
         nocache_headers();
     }
@@ -95,18 +95,18 @@ 
      * notices function.
      */
     public static function notices() {
-        if ( ! function_exists( 'w3tc_pgcache_flush' ) || ! function_exists( 'w3_instance' ) ) {
+        if (!function_exists('w3tc_pgcache_flush') || !function_exists('w3_instance')) {
             return;
         }
 
-        $config   = w3_instance( 'W3_Config' );
-        $enabled  = $config->get_integer( 'dbcache.enabled' );
-        $settings = array_map( 'trim', $config->get_array( 'dbcache.reject.sql' ) );
+        $config   = w3_instance('W3_Config');
+        $enabled  = $config->get_integer('dbcache.enabled');
+        $settings = array_map('trim', $config->get_array('dbcache.reject.sql'));
 
-        if ( $enabled && ! in_array( '_wp_session_', $settings ) ) {
+        if ($enabled && !in_array('_wp_session_', $settings)) {
             ?>
             <div class="error">
-                <p><?php printf( __( 'In order for <strong>database caching</strong> to work with Invoicing you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'invoicing' ), '<code>_wp_session_</code>', admin_url( 'admin.php?page=w3tc_dbcache' ) ); ?></p>
+                <p><?php printf(__('In order for <strong>database caching</strong> to work with Invoicing you must add %1$s to the "Ignored Query Strings" option in <a href="%2$s">W3 Total Cache settings</a>.', 'invoicing'), '<code>_wp_session_</code>', admin_url('admin.php?page=w3tc_dbcache')); ?></p>
             </div>
             <?php
         }

includes/wpinv-discount-functions.php

Spacing +470 added lines, -470 removed lines

@@ -7,90 +7,90 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_get_discount_types() {
     $discount_types = array(
-                        'percent'   => __( 'Percentage', 'invoicing' ),
-                        'flat'     => __( 'Flat Amount', 'invoicing' ),
+                        'percent'   => __('Percentage', 'invoicing'),
+                        'flat'     => __('Flat Amount', 'invoicing'),
                     );
-    return (array)apply_filters( 'wpinv_discount_types', $discount_types );
+    return (array)apply_filters('wpinv_discount_types', $discount_types);
 }
 
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : '';
+    return isset($types[$type]) ? $types[$type] : '';
 }
 
-function wpinv_delete_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_delete_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to delete discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to delete discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     $discount_id = $data['discount'];
-    wpinv_remove_discount( $discount_id );
+    wpinv_remove_discount($discount_id);
 }
-add_action( 'wpinv_delete_discount', 'wpinv_delete_discount' );
+add_action('wpinv_delete_discount', 'wpinv_delete_discount');
 
-function wpinv_activate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_activate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to edit discount codes', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to edit discount codes', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'publish' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'publish');
 }
-add_action( 'wpinv_activate_discount', 'wpinv_activate_discount' );
+add_action('wpinv_activate_discount', 'wpinv_activate_discount');
 
-function wpinv_deactivate_discount( $data ) {
-    if ( ! isset( $data['_wpnonce'] ) || ! wp_verify_nonce( $data['_wpnonce'], 'wpinv_discount_nonce' ) ) {
-        wp_die( __( 'Trying to cheat or something?', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_deactivate_discount($data) {
+    if (!isset($data['_wpnonce']) || !wp_verify_nonce($data['_wpnonce'], 'wpinv_discount_nonce')) {
+        wp_die(__('Trying to cheat or something?', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
-    if( ! current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to create discount codes', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to create discount codes', 'invoicing'), array('response' => 403));
     }
 
-    $id = absint( $data['discount'] );
-    wpinv_update_discount_status( $id, 'pending' );
+    $id = absint($data['discount']);
+    wpinv_update_discount_status($id, 'pending');
 }
-add_action( 'wpinv_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('wpinv_deactivate_discount', 'wpinv_deactivate_discount');
 
-function wpinv_get_discounts( $args = array() ) {
+function wpinv_get_discounts($args = array()) {
     $defaults = array(
         'post_type'      => 'wpi_discount',
         'posts_per_page' => 20,
         'paged'          => null,
-        'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+        'post_status'    => array('publish', 'pending', 'draft', 'expired')
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
 
-    $discounts = get_posts( $args );
+    $discounts = get_posts($args);
 
-    if ( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
-    if( ! $discounts && ! empty( $args['s'] ) ) {
+    if (!$discounts && !empty($args['s'])) {
         $args['meta_key']     = '_wpi_discount_code';
         $args['meta_value']   = $args['s'];
         $args['meta_compare'] = 'LIKE';
-        unset( $args['s'] );
-        $discounts = get_posts( $args );
+        unset($args['s']);
+        $discounts = get_posts($args);
     }
 
-    if( $discounts ) {
+    if ($discounts) {
         return $discounts;
     }
 
@@ -102,9 +102,9 @@ 
 
     $discounts  = wpinv_get_discounts();
 
-    if ( $discounts) {
-        foreach ( $discounts as $discount ) {
-            if ( wpinv_is_discount_active( $discount->ID ) ) {
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            if (wpinv_is_discount_active($discount->ID)) {
                 $has_active = true;
                 break;
             }
@@ -113,38 +113,38 @@ 
     return $has_active;
 }
 
-function wpinv_get_discount( $discount_id = 0 ) {
-    if( empty( $discount_id ) ) {
+function wpinv_get_discount($discount_id = 0) {
+    if (empty($discount_id)) {
         return false;
     }
     
-    if ( get_post_type( $discount_id ) != 'wpi_discount' ) {
+    if (get_post_type($discount_id) != 'wpi_discount') {
         return false;
     }
 
-    $discount = get_post( $discount_id );
+    $discount = get_post($discount_id);
 
     return $discount;
 }
 
-function wpinv_get_discount_by_code( $code = '' ) {
-    if( empty( $code ) || ! is_string( $code ) ) {
+function wpinv_get_discount_by_code($code = '') {
+    if (empty($code) || !is_string($code)) {
         return false;
     }
 
-    return wpinv_get_discount_by( 'code', $code );
+    return wpinv_get_discount_by('code', $code);
 }
 
-function wpinv_get_discount_by( $field = '', $value = '' ) {
-    if( empty( $field ) || empty( $value ) ) {
+function wpinv_get_discount_by($field = '', $value = '') {
+    if (empty($field) || empty($value)) {
         return false;
     }
 
-    if( ! is_string( $field ) ) {
+    if (!is_string($field)) {
         return false;
     }
 
-    switch( strtolower( $field ) ) {
+    switch (strtolower($field)) {
 
         case 'code':
             $meta_query     = array();
@@ -154,32 +154,32 @@ 
                 'compare' => '='
             );
             
-            $discount = wpinv_get_discounts( array(
+            $discount = wpinv_get_discounts(array(
                 'posts_per_page' => 1,
                 'post_status'    => 'any',
                 'meta_query'     => $meta_query,
-            ) );
+            ));
             
-            if( $discount ) {
+            if ($discount) {
                 $discount = $discount[0];
             }
 
             break;
 
         case 'id':
-            $discount = wpinv_get_discount( $value );
+            $discount = wpinv_get_discount($value);
 
             break;
 
         case 'name':
-            $discount = get_posts( array(
+            $discount = get_posts(array(
                 'post_type'      => 'wpi_discount',
                 'name'           => $value,
                 'posts_per_page' => 1,
                 'post_status'    => 'any'
-            ) );
+            ));
 
-            if( $discount ) {
+            if ($discount) {
                 $discount = $discount[0];
             }
 
@@ -189,96 +189,96 @@ 
             return false;
     }
 
-    if( ! empty( $discount ) ) {
+    if (!empty($discount)) {
         return $discount;
     }
 
     return false;
 }
 
-function wpinv_store_discount( $post_id, $data, $post, $update = false ) {
+function wpinv_store_discount($post_id, $data, $post, $update = false) {
     $meta = array(
-        'code'              => isset( $data['code'] )             ? sanitize_text_field( $data['code'] )              : '',
-        'type'              => isset( $data['type'] )             ? sanitize_text_field( $data['type'] )              : 'percent',
-        'amount'            => isset( $data['amount'] )           ? wpinv_sanitize_amount( $data['amount'] )          : '',
-        'start'             => isset( $data['start'] )            ? sanitize_text_field( $data['start'] )             : '',
-        'expiration'        => isset( $data['expiration'] )       ? sanitize_text_field( $data['expiration'] )        : '',
-        'min_total'         => isset( $data['min_total'] )        ? wpinv_sanitize_amount( $data['min_total'] )       : '',
-        'max_total'         => isset( $data['max_total'] )        ? wpinv_sanitize_amount( $data['max_total'] )       : '',
-        'max_uses'          => isset( $data['max_uses'] )         ? absint( $data['max_uses'] )                       : '',
-        'items'             => isset( $data['items'] )            ? $data['items']                                    : array(),
-        'excluded_items'    => isset( $data['excluded_items'] )   ? $data['excluded_items']                           : array(),
-        'is_recurring'      => isset( $data['recurring'] )        ? (bool)$data['recurring']                          : false,
-        'is_single_use'     => isset( $data['single_use'] )       ? (bool)$data['single_use']                         : false,
-        'uses'              => isset( $data['uses'] )             ? (int)$data['uses']                                : false,
+        'code'              => isset($data['code']) ? sanitize_text_field($data['code']) : '',
+        'type'              => isset($data['type']) ? sanitize_text_field($data['type']) : 'percent',
+        'amount'            => isset($data['amount']) ? wpinv_sanitize_amount($data['amount']) : '',
+        'start'             => isset($data['start']) ? sanitize_text_field($data['start']) : '',
+        'expiration'        => isset($data['expiration']) ? sanitize_text_field($data['expiration']) : '',
+        'min_total'         => isset($data['min_total']) ? wpinv_sanitize_amount($data['min_total']) : '',
+        'max_total'         => isset($data['max_total']) ? wpinv_sanitize_amount($data['max_total']) : '',
+        'max_uses'          => isset($data['max_uses']) ? absint($data['max_uses']) : '',
+        'items'             => isset($data['items']) ? $data['items'] : array(),
+        'excluded_items'    => isset($data['excluded_items']) ? $data['excluded_items'] : array(),
+        'is_recurring'      => isset($data['recurring']) ? (bool)$data['recurring'] : false,
+        'is_single_use'     => isset($data['single_use']) ? (bool)$data['single_use'] : false,
+        'uses'              => isset($data['uses']) ? (int)$data['uses'] : false,
     );
 
-    if ( $meta['type'] == 'percent' && (float)$meta['amount'] > 100 ) {
+    if ($meta['type'] == 'percent' && (float)$meta['amount'] > 100) {
         $meta['amount'] = 100;
     }
 
-    if ( !empty( $meta['start'] ) ) {
-        $meta['start']      = date_i18n( 'Y-m-d H:i:s', strtotime( $meta['start'] ) );
+    if (!empty($meta['start'])) {
+        $meta['start'] = date_i18n('Y-m-d H:i:s', strtotime($meta['start']));
     }
 
-    if ( !empty( $meta['expiration'] ) ) {
-        $meta['expiration'] = date_i18n( 'Y-m-d H:i:s', strtotime( $meta['expiration'] ) );
+    if (!empty($meta['expiration'])) {
+        $meta['expiration'] = date_i18n('Y-m-d H:i:s', strtotime($meta['expiration']));
 
-        if ( !empty( $meta['start'] ) && strtotime( $meta['start'] ) > strtotime( $meta['expiration'] ) ) {
+        if (!empty($meta['start']) && strtotime($meta['start']) > strtotime($meta['expiration'])) {
             $meta['expiration'] = $meta['start'];
         }
     }
     
-    if ( $meta['uses'] === false ) {
-        unset( $meta['uses'] );
+    if ($meta['uses'] === false) {
+        unset($meta['uses']);
     }
     
-    if ( ! empty( $meta['items'] ) ) {
-        foreach ( $meta['items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['items'][ $key ] );
+    if (!empty($meta['items'])) {
+        foreach ($meta['items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['items'][$key]);
             }
         }
     }
     
-    if ( ! empty( $meta['excluded_items'] ) ) {
-        foreach ( $meta['excluded_items'] as $key => $item ) {
-            if ( 0 === intval( $item ) ) {
-                unset( $meta['excluded_items'][ $key ] );
+    if (!empty($meta['excluded_items'])) {
+        foreach ($meta['excluded_items'] as $key => $item) {
+            if (0 === intval($item)) {
+                unset($meta['excluded_items'][$key]);
             }
         }
     }
     
-    $meta = apply_filters( 'wpinv_update_discount', $meta, $post_id, $post );
+    $meta = apply_filters('wpinv_update_discount', $meta, $post_id, $post);
     
-    do_action( 'wpinv_pre_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_pre_update_discount', $meta, $post_id, $post);
     
-    foreach( $meta as $key => $value ) {
-        update_post_meta( $post_id, '_wpi_discount_' . $key, $value );
+    foreach ($meta as $key => $value) {
+        update_post_meta($post_id, '_wpi_discount_' . $key, $value);
     }
     
-    do_action( 'wpinv_post_update_discount', $meta, $post_id, $post );
+    do_action('wpinv_post_update_discount', $meta, $post_id, $post);
     
     return $post_id;
 }
 
-function wpinv_remove_discount( $discount_id = 0 ) {
-    do_action( 'wpinv_pre_delete_discount', $discount_id );
+function wpinv_remove_discount($discount_id = 0) {
+    do_action('wpinv_pre_delete_discount', $discount_id);
 
-    wp_delete_post( $discount_id, true );
+    wp_delete_post($discount_id, true);
 
-    do_action( 'wpinv_post_delete_discount', $discount_id );
+    do_action('wpinv_post_delete_discount', $discount_id);
 }
 
-function wpinv_update_discount_status( $code_id = 0, $new_status = 'publish' ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_update_discount_status($code_id = 0, $new_status = 'publish') {
+    $discount = wpinv_get_discount($code_id);
 
-    if ( $discount ) {
-        do_action( 'wpinv_pre_update_discount_status', $code_id, $new_status, $discount->post_status );
+    if ($discount) {
+        do_action('wpinv_pre_update_discount_status', $code_id, $new_status, $discount->post_status);
 
-        wp_update_post( array( 'ID' => $code_id, 'post_status' => $new_status ) );
+        wp_update_post(array('ID' => $code_id, 'post_status' => $new_status));
 
-        do_action( 'wpinv_post_update_discount_status', $code_id, $new_status, $discount->post_status );
+        do_action('wpinv_post_update_discount_status', $code_id, $new_status, $discount->post_status);
 
         return true;
     }
@@ -286,173 +286,173 @@ 
     return false;
 }
 
-function wpinv_discount_exists( $code_id ) {
-    if ( wpinv_get_discount(  $code_id ) ) {
+function wpinv_discount_exists($code_id) {
+    if (wpinv_get_discount($code_id)) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_is_discount_active( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_active($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        if ( wpinv_is_discount_expired( $code_id ) ) {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is expired.', 'invoicing' ) );
+    if ($discount) {
+        if (wpinv_is_discount_expired($code_id)) {
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is expired.', 'invoicing'));
             }
-        } elseif ( $discount->post_status == 'publish' ) {
+        } elseif ($discount->post_status == 'publish') {
             $return = true;
         } else {
-            if( defined( 'DOING_AJAX' ) ) {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active.', 'invoicing' ) );
+            if (defined('DOING_AJAX')) {
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active.', 'invoicing'));
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_active', $return, $code_id );
+    return apply_filters('wpinv_is_discount_active', $return, $code_id);
 }
 
-function wpinv_get_discount_code( $code_id = null ) {
-    $code = get_post_meta( $code_id, '_wpi_discount_code', true );
+function wpinv_get_discount_code($code_id = null) {
+    $code = get_post_meta($code_id, '_wpi_discount_code', true);
 
-    return apply_filters( 'wpinv_get_discount_code', $code, $code_id );
+    return apply_filters('wpinv_get_discount_code', $code, $code_id);
 }
 
-function wpinv_get_discount_start_date( $code_id = null ) {
-    $start_date = get_post_meta( $code_id, '_wpi_discount_start', true );
+function wpinv_get_discount_start_date($code_id = null) {
+    $start_date = get_post_meta($code_id, '_wpi_discount_start', true);
 
-    return apply_filters( 'wpinv_get_discount_start_date', $start_date, $code_id );
+    return apply_filters('wpinv_get_discount_start_date', $start_date, $code_id);
 }
 
-function wpinv_get_discount_expiration( $code_id = null ) {
-    $expiration = get_post_meta( $code_id, '_wpi_discount_expiration', true );
+function wpinv_get_discount_expiration($code_id = null) {
+    $expiration = get_post_meta($code_id, '_wpi_discount_expiration', true);
 
-    return apply_filters( 'wpinv_get_discount_expiration', $expiration, $code_id );
+    return apply_filters('wpinv_get_discount_expiration', $expiration, $code_id);
 }
 
-function wpinv_get_discount_max_uses( $code_id = null ) {
-    $max_uses = get_post_meta( $code_id, '_wpi_discount_max_uses', true );
+function wpinv_get_discount_max_uses($code_id = null) {
+    $max_uses = get_post_meta($code_id, '_wpi_discount_max_uses', true);
 
-    return (int) apply_filters( 'wpinv_get_discount_max_uses', $max_uses, $code_id );
+    return (int)apply_filters('wpinv_get_discount_max_uses', $max_uses, $code_id);
 }
 
-function wpinv_get_discount_uses( $code_id = null ) {
-    $uses = get_post_meta( $code_id, '_wpi_discount_uses', true );
+function wpinv_get_discount_uses($code_id = null) {
+    $uses = get_post_meta($code_id, '_wpi_discount_uses', true);
 
-    return (int) apply_filters( 'wpinv_get_discount_uses', $uses, $code_id );
+    return (int)apply_filters('wpinv_get_discount_uses', $uses, $code_id);
 }
 
-function wpinv_get_discount_min_total( $code_id = null ) {
-    $min_total = get_post_meta( $code_id, '_wpi_discount_min_total', true );
+function wpinv_get_discount_min_total($code_id = null) {
+    $min_total = get_post_meta($code_id, '_wpi_discount_min_total', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_min_total', $min_total, $code_id );
+    return (float)apply_filters('wpinv_get_discount_min_total', $min_total, $code_id);
 }
 
-function wpinv_get_discount_max_total( $code_id = null ) {
-    $max_total = get_post_meta( $code_id, '_wpi_discount_max_total', true );
+function wpinv_get_discount_max_total($code_id = null) {
+    $max_total = get_post_meta($code_id, '_wpi_discount_max_total', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_max_total', $max_total, $code_id );
+    return (float)apply_filters('wpinv_get_discount_max_total', $max_total, $code_id);
 }
 
-function wpinv_get_discount_amount( $code_id = null ) {
-    $amount = get_post_meta( $code_id, '_wpi_discount_amount', true );
+function wpinv_get_discount_amount($code_id = null) {
+    $amount = get_post_meta($code_id, '_wpi_discount_amount', true);
 
-    return (float) apply_filters( 'wpinv_get_discount_amount', $amount, $code_id );
+    return (float)apply_filters('wpinv_get_discount_amount', $amount, $code_id);
 }
 
-function wpinv_get_discount_type( $code_id = null, $name = false ) {
-    $type = strtolower( get_post_meta( $code_id, '_wpi_discount_type', true ) );
+function wpinv_get_discount_type($code_id = null, $name = false) {
+    $type = strtolower(get_post_meta($code_id, '_wpi_discount_type', true));
     
-    if ( $name ) {
-        $name = wpinv_get_discount_type_name( $type );
+    if ($name) {
+        $name = wpinv_get_discount_type_name($type);
         
-        return apply_filters( 'wpinv_get_discount_type_name', $name, $code_id );
+        return apply_filters('wpinv_get_discount_type_name', $name, $code_id);
     }
 
-    return apply_filters( 'wpinv_get_discount_type', $type, $code_id );
+    return apply_filters('wpinv_get_discount_type', $type, $code_id);
 }
 
-function wpinv_discount_status( $status ) {
-    switch( $status ){
+function wpinv_discount_status($status) {
+    switch ($status) {
         case 'expired' :
-            $name = __( 'Expired', 'invoicing' );
+            $name = __('Expired', 'invoicing');
             break;
         case 'publish' :
         case 'active' :
-            $name = __( 'Active', 'invoicing' );
+            $name = __('Active', 'invoicing');
             break;
         default :
-            $name = __( 'Inactive', 'invoicing' );
+            $name = __('Inactive', 'invoicing');
             break;
     }
     return $name;
 }
 
-function wpinv_get_discount_excluded_items( $code_id = null ) {
-    $excluded_items = get_post_meta( $code_id, '_wpi_discount_excluded_items', true );
+function wpinv_get_discount_excluded_items($code_id = null) {
+    $excluded_items = get_post_meta($code_id, '_wpi_discount_excluded_items', true);
 
-    if ( empty( $excluded_items ) || ! is_array( $excluded_items ) ) {
+    if (empty($excluded_items) || !is_array($excluded_items)) {
         $excluded_items = array();
     }
 
-    return (array) apply_filters( 'wpinv_get_discount_excluded_items', $excluded_items, $code_id );
+    return (array)apply_filters('wpinv_get_discount_excluded_items', $excluded_items, $code_id);
 }
 
-function wpinv_get_discount_item_reqs( $code_id = null ) {
-    $item_reqs = get_post_meta( $code_id, '_wpi_discount_items', true );
+function wpinv_get_discount_item_reqs($code_id = null) {
+    $item_reqs = get_post_meta($code_id, '_wpi_discount_items', true);
 
-    if ( empty( $item_reqs ) || ! is_array( $item_reqs ) ) {
+    if (empty($item_reqs) || !is_array($item_reqs)) {
         $item_reqs = array();
     }
 
-    return (array) apply_filters( 'wpinv_get_discount_item_reqs', $item_reqs, $code_id );
+    return (array)apply_filters('wpinv_get_discount_item_reqs', $item_reqs, $code_id);
 }
 
-function wpinv_get_discount_item_condition( $code_id = 0 ) {
-    return get_post_meta( $code_id, '_wpi_discount_item_condition', true );
+function wpinv_get_discount_item_condition($code_id = 0) {
+    return get_post_meta($code_id, '_wpi_discount_item_condition', true);
 }
 
-function wpinv_is_discount_not_global( $code_id = 0 ) {
-    return (bool) get_post_meta( $code_id, '_wpi_discount_is_not_global', true );
+function wpinv_is_discount_not_global($code_id = 0) {
+    return (bool)get_post_meta($code_id, '_wpi_discount_is_not_global', true);
 }
 
-function wpinv_is_discount_expired( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_expired($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $expiration = wpinv_get_discount_expiration( $code_id );
-        if ( $expiration ) {
-            $expiration = strtotime( $expiration );
-            if ( $expiration < current_time( 'timestamp' ) ) {
+    if ($discount) {
+        $expiration = wpinv_get_discount_expiration($code_id);
+        if ($expiration) {
+            $expiration = strtotime($expiration);
+            if ($expiration < current_time('timestamp')) {
                 // Discount is expired
-                wpinv_update_discount_status( $code_id, 'pending' );
+                wpinv_update_discount_status($code_id, 'pending');
                 $return = true;
             }
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_expired', $return, $code_id );
+    return apply_filters('wpinv_is_discount_expired', $return, $code_id);
 }
 
-function wpinv_is_discount_started( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_started($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $start_date = wpinv_get_discount_start_date( $code_id );
+    if ($discount) {
+        $start_date = wpinv_get_discount_start_date($code_id);
 
-        if ( $start_date ) {
-            $start_date = strtotime( $start_date );
+        if ($start_date) {
+            $start_date = strtotime($start_date);
 
-            if ( $start_date < current_time( 'timestamp' ) ) {
+            if ($start_date < current_time('timestamp')) {
                 // Discount has past the start date
                 $return = true;
             } else {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
             }
         } else {
             // No start date for this discount, so has to be true
@@ -460,159 +460,159 @@ 
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_started', $return, $code_id );
+    return apply_filters('wpinv_is_discount_started', $return, $code_id);
 }
 
-function wpinv_check_discount_dates( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_check_discount_dates($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $start_date = wpinv_get_discount_start_date( $code_id );
+    if ($discount) {
+        $start_date = wpinv_get_discount_start_date($code_id);
 
-        if ( $start_date ) {
-            $start_date = strtotime( $start_date );
+        if ($start_date) {
+            $start_date = strtotime($start_date);
 
-            if ( $start_date < current_time( 'timestamp' ) ) {
+            if ($start_date < current_time('timestamp')) {
                 // Discount has past the start date
                 $return = true;
             } else {
-                wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not active yet.', 'invoicing' ) );
+                wpinv_set_error('wpinv-discount-error', __('This discount is not active yet.', 'invoicing'));
             }
         } else {
             // No start date for this discount, so has to be true
             $return = true;
         }
         
-        if ( $return ) {
-            $expiration = wpinv_get_discount_expiration( $code_id );
+        if ($return) {
+            $expiration = wpinv_get_discount_expiration($code_id);
             
-            if ( $expiration ) {
-                $expiration = strtotime( $expiration );
-                if ( $expiration < current_time( 'timestamp' ) ) {
+            if ($expiration) {
+                $expiration = strtotime($expiration);
+                if ($expiration < current_time('timestamp')) {
                     // Discount is expired
-                    wpinv_update_discount_status( $code_id, 'pending' );
+                    wpinv_update_discount_status($code_id, 'pending');
                     $return = true;
                 }
             }
         }
     }
     
-    return apply_filters( 'wpinv_check_discount_dates', $return, $code_id );
+    return apply_filters('wpinv_check_discount_dates', $return, $code_id);
 }
 
-function wpinv_is_discount_maxed_out( $code_id = null ) {
-    $discount = wpinv_get_discount(  $code_id );
+function wpinv_is_discount_maxed_out($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $uses = wpinv_get_discount_uses( $code_id );
+    if ($discount) {
+        $uses = wpinv_get_discount_uses($code_id);
         // Large number that will never be reached
-        $max_uses = wpinv_get_discount_max_uses( $code_id );
+        $max_uses = wpinv_get_discount_max_uses($code_id);
         // Should never be greater than, but just in case
-        if ( $uses >= $max_uses && ! empty( $max_uses ) ) {
+        if ($uses >= $max_uses && !empty($max_uses)) {
             // Discount is maxed out
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount has reached its maximum usage.', 'invoicing' ) );
+            wpinv_set_error('wpinv-discount-error', __('This discount has reached its maximum usage.', 'invoicing'));
             $return = true;
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_maxed_out', $return, $code_id );
+    return apply_filters('wpinv_is_discount_maxed_out', $return, $code_id);
 }
 
-function wpinv_discount_is_min_met( $code_id = null ) {
-    $discount = wpinv_get_discount( $code_id );
+function wpinv_discount_is_min_met($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $min         = (float)wpinv_get_discount_min_total( $code_id );
-        $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $code_id );
+    if ($discount) {
+        $min         = (float)wpinv_get_discount_min_total($code_id);
+        $cart_amount = (float)wpinv_get_cart_discountable_subtotal($code_id);
 
-        if ( !$min > 0 || $cart_amount >= $min ) {
+        if (!$min > 0 || $cart_amount >= $min) {
             // Minimum has been met
             $return = true;
         } else {
-            wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Minimum invoice of %s not met.', 'invoicing' ), wpinv_price( wpinv_format_amount( $min ) ) ) );
+            wpinv_set_error('wpinv-discount-error', sprintf(__('Minimum invoice of %s not met.', 'invoicing'), wpinv_price(wpinv_format_amount($min))));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_min_met', $return, $code_id );
+    return apply_filters('wpinv_is_discount_min_met', $return, $code_id);
 }
 
-function wpinv_discount_is_max_met( $code_id = null ) {
-    $discount = wpinv_get_discount( $code_id );
+function wpinv_discount_is_max_met($code_id = null) {
+    $discount = wpinv_get_discount($code_id);
     $return   = false;
 
-    if ( $discount ) {
-        $max         = (float)wpinv_get_discount_max_total( $code_id );
-        $cart_amount = (float)wpinv_get_cart_discountable_subtotal( $code_id );
+    if ($discount) {
+        $max         = (float)wpinv_get_discount_max_total($code_id);
+        $cart_amount = (float)wpinv_get_cart_discountable_subtotal($code_id);
 
-        if ( !$max > 0 || $cart_amount <= $max ) {
+        if (!$max > 0 || $cart_amount <= $max) {
             // Minimum has been met
             $return = true;
         } else {
-            wpinv_set_error( 'wpinv-discount-error', sprintf( __( 'Maximum invoice of %s not met.', 'invoicing' ), wpinv_price( wpinv_format_amount( $max ) ) ) );
+            wpinv_set_error('wpinv-discount-error', sprintf(__('Maximum invoice of %s not met.', 'invoicing'), wpinv_price(wpinv_format_amount($max))));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_max_met', $return, $code_id );
+    return apply_filters('wpinv_is_discount_max_met', $return, $code_id);
 }
 
-function wpinv_discount_is_single_use( $code_id = 0 ) {
-    $single_use = get_post_meta( $code_id, '_wpi_discount_is_single_use', true );
-    return (bool) apply_filters( 'wpinv_is_discount_single_use', $single_use, $code_id );
+function wpinv_discount_is_single_use($code_id = 0) {
+    $single_use = get_post_meta($code_id, '_wpi_discount_is_single_use', true);
+    return (bool)apply_filters('wpinv_is_discount_single_use', $single_use, $code_id);
 }
 
-function wpinv_discount_is_recurring( $code_id = 0, $code = false ) {
-    if ( $code ) {
-        $discount = wpinv_get_discount_by_code( $code_id );
+function wpinv_discount_is_recurring($code_id = 0, $code = false) {
+    if ($code) {
+        $discount = wpinv_get_discount_by_code($code_id);
         
-        if ( !empty( $discount ) ) {
+        if (!empty($discount)) {
             $code_id = $discount->ID;
         }
     }
     
-    $recurring = get_post_meta( $code_id, '_wpi_discount_is_recurring', true );
+    $recurring = get_post_meta($code_id, '_wpi_discount_is_recurring', true);
     
-    return (bool) apply_filters( 'wpinv_is_discount_recurring', $recurring, $code_id, $code );
+    return (bool)apply_filters('wpinv_is_discount_recurring', $recurring, $code_id, $code);
 }
 
-function wpinv_discount_item_reqs_met( $code_id = null ) {
-    $item_reqs    = wpinv_get_discount_item_reqs( $code_id );
-    $condition    = wpinv_get_discount_item_condition( $code_id );
-    $excluded_ps  = wpinv_get_discount_excluded_items( $code_id );
+function wpinv_discount_item_reqs_met($code_id = null) {
+    $item_reqs    = wpinv_get_discount_item_reqs($code_id);
+    $condition    = wpinv_get_discount_item_condition($code_id);
+    $excluded_ps  = wpinv_get_discount_excluded_items($code_id);
     $cart_items   = wpinv_get_cart_contents();
-    $cart_ids     = $cart_items ? wp_list_pluck( $cart_items, 'id' ) : null;
+    $cart_ids     = $cart_items ? wp_list_pluck($cart_items, 'id') : null;
     $ret          = false;
 
-    if ( empty( $item_reqs ) && empty( $excluded_ps ) ) {
+    if (empty($item_reqs) && empty($excluded_ps)) {
         $ret = true;
     }
 
     // Normalize our data for item requirements, exclusions and cart data
     // First absint the items, then sort, and reset the array keys
-    $item_reqs = array_map( 'absint', $item_reqs );
-    asort( $item_reqs );
-    $item_reqs = array_values( $item_reqs );
+    $item_reqs = array_map('absint', $item_reqs);
+    asort($item_reqs);
+    $item_reqs = array_values($item_reqs);
 
-    $excluded_ps  = array_map( 'absint', $excluded_ps );
-    asort( $excluded_ps );
-    $excluded_ps  = array_values( $excluded_ps );
+    $excluded_ps  = array_map('absint', $excluded_ps);
+    asort($excluded_ps);
+    $excluded_ps  = array_values($excluded_ps);
 
-    $cart_ids     = array_map( 'absint', $cart_ids );
-    asort( $cart_ids );
-    $cart_ids     = array_values( $cart_ids );
+    $cart_ids     = array_map('absint', $cart_ids);
+    asort($cart_ids);
+    $cart_ids     = array_values($cart_ids);
 
     // Ensure we have requirements before proceeding
-    if ( !$ret && ! empty( $item_reqs ) ) {
-        switch( $condition ) {
+    if (!$ret && !empty($item_reqs)) {
+        switch ($condition) {
             case 'all' :
                 // Default back to true
                 $ret = true;
 
-                foreach ( $item_reqs as $item_id ) {
-                    if ( !wpinv_item_in_cart( $item_id ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                foreach ($item_reqs as $item_id) {
+                    if (!wpinv_item_in_cart($item_id)) {
+                        wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                         $ret = false;
                         break;
                     }
@@ -621,15 +621,15 @@ 
                 break;
 
             default : // Any
-                foreach ( $item_reqs as $item_id ) {
-                    if ( wpinv_item_in_cart( $item_id ) ) {
+                foreach ($item_reqs as $item_id) {
+                    if (wpinv_item_in_cart($item_id)) {
                         $ret = true;
                         break;
                     }
                 }
 
-                if( ! $ret ) {
-                    wpinv_set_error( 'wpinv-discount-error', __( 'The item requirements for this discount are not met.', 'invoicing' ) );
+                if (!$ret) {
+                    wpinv_set_error('wpinv-discount-error', __('The item requirements for this discount are not met.', 'invoicing'));
                 }
 
                 break;
@@ -638,70 +638,70 @@ 
         $ret = true;
     }
 
-    if( ! empty( $excluded_ps ) ) {
+    if (!empty($excluded_ps)) {
         // Check that there are items other than excluded ones in the cart
-        if( $cart_ids == $excluded_ps ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is not valid for the cart contents.', 'invoicing' ) );
+        if ($cart_ids == $excluded_ps) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is not valid for the cart contents.', 'invoicing'));
             $ret = false;
         }
     }
 
-    return (bool) apply_filters( 'wpinv_is_discount_item_req_met', $ret, $code_id, $condition );
+    return (bool)apply_filters('wpinv_is_discount_item_req_met', $ret, $code_id, $condition);
 }
 
-function wpinv_is_discount_used( $code = null, $user = '', $code_id = 0 ) {
+function wpinv_is_discount_used($code = null, $user = '', $code_id = 0) {
     global $wpi_checkout_id;
     
     $return = false;
 
-    if ( empty( $code_id ) ) {
-        $code_id = wpinv_get_discount_id_by_code( $code );
+    if (empty($code_id)) {
+        $code_id = wpinv_get_discount_id_by_code($code);
         
-        if( empty( $code_id ) ) {
+        if (empty($code_id)) {
             return false; // No discount was found
         }
     }
 
-    if ( wpinv_discount_is_single_use( $code_id ) ) {
+    if (wpinv_discount_is_single_use($code_id)) {
         $payments = array();
 
         $user_id = 0;
-        if ( is_int( $user ) ) {
-            $user_id = absint( $user );
-        } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
+        if (is_int($user)) {
+            $user_id = absint($user);
+        } else if (is_email($user) && $user_data = get_user_by('email', $user)) {
             $user_id = $user_data->ID;
-        } else if ( $user_data = get_user_by( 'login', $user ) ) {
+        } else if ($user_data = get_user_by('login', $user)) {
             $user_id = $user_data->ID;
-        } else if ( absint( $user ) > 0 ) {
-            $user_id = absint( $user );
+        } else if (absint($user) > 0) {
+            $user_id = absint($user);
         }
 
-        if ( !empty( $user_id ) ) {
-            $query    = array( 'user' => $user_id, 'limit' => false );
-            $payments = wpinv_get_invoices( $query ); // Get all payments with matching user id
+        if (!empty($user_id)) {
+            $query    = array('user' => $user_id, 'limit' => false);
+            $payments = wpinv_get_invoices($query); // Get all payments with matching user id
         }
 
-        if ( $payments ) {
-            foreach ( $payments as $payment ) {
+        if ($payments) {
+            foreach ($payments as $payment) {
                 // Don't count discount used for current invoice chekcout.
-                if ( !empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+                if (!empty($wpi_checkout_id) && $wpi_checkout_id == $payment->ID) {
                     continue;
                 }
                 
-                if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
+                if ($payment->has_status(array('wpi-cancelled', 'wpi-failed'))) {
                     continue;
                 }
 
-                $discounts = $payment->get_discounts( true );
-                if ( empty( $discounts ) ) {
+                $discounts = $payment->get_discounts(true);
+                if (empty($discounts)) {
                     continue;
                 }
 
-                $discounts = $discounts && !is_array( $discounts ) ? explode( ',', $discounts ) : $discounts;
+                $discounts = $discounts && !is_array($discounts) ? explode(',', $discounts) : $discounts;
 
-                if ( !empty( $discounts ) && is_array( $discounts ) ) {
-                    if ( in_array( strtolower( $code ), array_map( 'strtolower', $discounts ) ) ) {
-                        wpinv_set_error( 'wpinv-discount-error', __( 'This discount has already been redeemed.', 'invoicing' ) );
+                if (!empty($discounts) && is_array($discounts)) {
+                    if (in_array(strtolower($code), array_map('strtolower', $discounts))) {
+                        wpinv_set_error('wpinv-discount-error', __('This discount has already been redeemed.', 'invoicing'));
                         $return = true;
                         break;
                     }
@@ -710,61 +710,61 @@ 
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_used', $return, $code, $user );
+    return apply_filters('wpinv_is_discount_used', $return, $code, $user);
 }
 
-function wpinv_is_discount_valid( $code = '', $user = '', $set_error = true ) {
+function wpinv_is_discount_valid($code = '', $user = '', $set_error = true) {
     $return      = false;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
-    $user        = trim( $user );
+    $discount_id = wpinv_get_discount_id_by_code($code);
+    $user        = trim($user);
 
-    if ( wpinv_get_cart_contents() ) {
-        if ( $discount_id ) {
+    if (wpinv_get_cart_contents()) {
+        if ($discount_id) {
             if (
-                wpinv_is_discount_active( $discount_id ) &&
-                wpinv_check_discount_dates( $discount_id ) &&
-                !wpinv_is_discount_maxed_out( $discount_id ) &&
-                !wpinv_is_discount_used( $code, $user, $discount_id ) &&
-                wpinv_discount_is_min_met( $discount_id ) &&
-                wpinv_discount_is_max_met( $discount_id ) &&
-                wpinv_discount_item_reqs_met( $discount_id )
+                wpinv_is_discount_active($discount_id) &&
+                wpinv_check_discount_dates($discount_id) &&
+                !wpinv_is_discount_maxed_out($discount_id) &&
+                !wpinv_is_discount_used($code, $user, $discount_id) &&
+                wpinv_discount_is_min_met($discount_id) &&
+                wpinv_discount_is_max_met($discount_id) &&
+                wpinv_discount_item_reqs_met($discount_id)
             ) {
                 $return = true;
             }
-        } elseif( $set_error ) {
-            wpinv_set_error( 'wpinv-discount-error', __( 'This discount is invalid.', 'invoicing' ) );
+        } elseif ($set_error) {
+            wpinv_set_error('wpinv-discount-error', __('This discount is invalid.', 'invoicing'));
         }
     }
 
-    return apply_filters( 'wpinv_is_discount_valid', $return, $discount_id, $code, $user );
+    return apply_filters('wpinv_is_discount_valid', $return, $discount_id, $code, $user);
 }
 
-function wpinv_get_discount_id_by_code( $code ) {
-    $discount = wpinv_get_discount_by_code( $code );
-    if( $discount ) {
+function wpinv_get_discount_id_by_code($code) {
+    $discount = wpinv_get_discount_by_code($code);
+    if ($discount) {
         return $discount->ID;
     }
     return false;
 }
 
-function wpinv_get_discounted_amount( $code, $base_price ) {
+function wpinv_get_discounted_amount($code, $base_price) {
     $amount      = $base_price;
-    $discount_id = wpinv_get_discount_id_by_code( $code );
+    $discount_id = wpinv_get_discount_id_by_code($code);
 
-    if( $discount_id ) {
-        $type        = wpinv_get_discount_type( $discount_id );
-        $rate        = wpinv_get_discount_amount( $discount_id );
+    if ($discount_id) {
+        $type        = wpinv_get_discount_type($discount_id);
+        $rate        = wpinv_get_discount_amount($discount_id);
 
-        if ( $type == 'flat' ) {
+        if ($type == 'flat') {
             // Set amount
             $amount = $base_price - $rate;
-            if ( $amount < 0 ) {
+            if ($amount < 0) {
                 $amount = 0;
             }
 
         } else {
             // Percentage discount
-            $amount = $base_price - ( $base_price * ( $rate / 100 ) );
+            $amount = $base_price - ($base_price * ($rate / 100));
         }
 
     } else {
@@ -773,108 +773,108 @@ 
 
     }
 
-    return apply_filters( 'wpinv_discounted_amount', $amount );
+    return apply_filters('wpinv_discounted_amount', $amount);
 }
 
-function wpinv_increase_discount_usage( $code ) {
+function wpinv_increase_discount_usage($code) {
 
-    $id   = wpinv_get_discount_id_by_code( $code );
-    $uses = wpinv_get_discount_uses( $id );
+    $id   = wpinv_get_discount_id_by_code($code);
+    $uses = wpinv_get_discount_uses($id);
 
-    if ( $uses ) {
+    if ($uses) {
         $uses++;
     } else {
         $uses = 1;
     }
 
-    update_post_meta( $id, '_wpi_discount_uses', $uses );
+    update_post_meta($id, '_wpi_discount_uses', $uses);
 
-    do_action( 'wpinv_discount_increase_use_count', $uses, $id, $code );
+    do_action('wpinv_discount_increase_use_count', $uses, $id, $code);
 
     return $uses;
 
 }
 
-function wpinv_decrease_discount_usage( $code ) {
+function wpinv_decrease_discount_usage($code) {
 
-    $id   = wpinv_get_discount_id_by_code( $code );
-    $uses = wpinv_get_discount_uses( $id );
+    $id   = wpinv_get_discount_id_by_code($code);
+    $uses = wpinv_get_discount_uses($id);
 
-    if ( $uses ) {
+    if ($uses) {
         $uses--;
     }
 
-    if ( $uses < 0 ) {
+    if ($uses < 0) {
         $uses = 0;
     }
 
-    update_post_meta( $id, '_wpi_discount_uses', $uses );
+    update_post_meta($id, '_wpi_discount_uses', $uses);
 
-    do_action( 'wpinv_discount_decrease_use_count', $uses, $id, $code );
+    do_action('wpinv_discount_decrease_use_count', $uses, $id, $code);
 
     return $uses;
 
 }
 
-function wpinv_format_discount_rate( $type, $amount ) {
-    if ( $type == 'flat' ) {
-        return wpinv_price( wpinv_format_amount( $amount ) );
+function wpinv_format_discount_rate($type, $amount) {
+    if ($type == 'flat') {
+        return wpinv_price(wpinv_format_amount($amount));
     } else {
         return $amount . '%';
     }
 }
 
-function wpinv_set_cart_discount( $code = '' ) {    
-    if ( wpinv_multiple_discounts_allowed() ) {
+function wpinv_set_cart_discount($code = '') {    
+    if (wpinv_multiple_discounts_allowed()) {
         // Get all active cart discounts
         $discounts = wpinv_get_cart_discounts();
     } else {
         $discounts = false; // Only one discount allowed per purchase, so override any existing
     }
 
-    if ( $discounts ) {
-        $key = array_search( strtolower( $code ), array_map( 'strtolower', $discounts ) );
-        if( false !== $key ) {
-            unset( $discounts[ $key ] ); // Can't set the same discount more than once
+    if ($discounts) {
+        $key = array_search(strtolower($code), array_map('strtolower', $discounts));
+        if (false !== $key) {
+            unset($discounts[$key]); // Can't set the same discount more than once
         }
         $discounts[] = $code;
     } else {
         $discounts = array();
         $discounts[] = $code;
     }
-    $discounts = array_values( $discounts );
+    $discounts = array_values($discounts);
     
     $data = wpinv_get_checkout_session();
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         $data = array();
     } else {
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = implode( ',', $discounts );
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = implode(',', $discounts);
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
     }
     $data['cart_discounts'] = $discounts;
     
-    wpinv_set_checkout_session( $data );
+    wpinv_set_checkout_session($data);
     
     return $discounts;
 }
 
-function wpinv_unset_cart_discount( $code = '' ) {    
+function wpinv_unset_cart_discount($code = '') {    
     $discounts = wpinv_get_cart_discounts();
 
-    if ( $code && !empty( $discounts ) && in_array( $code, $discounts ) ) {
-        $key = array_search( $code, $discounts );
-        unset( $discounts[ $key ] );
+    if ($code && !empty($discounts) && in_array($code, $discounts)) {
+        $key = array_search($code, $discounts);
+        unset($discounts[$key]);
             
         $data = wpinv_get_checkout_session();
         $data['cart_discounts'] = $discounts;
-        if ( !empty( $data['invoice_id'] ) && $payment_meta = wpinv_get_invoice_meta( $data['invoice_id'] ) ) {
-            $payment_meta['user_info']['discount']  = !empty( $discounts ) ? implode( ',', $discounts ) : '';
-            update_post_meta( $data['invoice_id'], '_wpinv_payment_meta', $payment_meta );
+        if (!empty($data['invoice_id']) && $payment_meta = wpinv_get_invoice_meta($data['invoice_id'])) {
+            $payment_meta['user_info']['discount'] = !empty($discounts) ? implode(',', $discounts) : '';
+            update_post_meta($data['invoice_id'], '_wpinv_payment_meta', $payment_meta);
         }
         
-        wpinv_set_checkout_session( $data );
+        wpinv_set_checkout_session($data);
     }
 
     return $discounts;
@@ -883,27 +883,27 @@ 
 function wpinv_unset_all_cart_discounts() {
     $data = wpinv_get_checkout_session();
     
-    if ( !empty( $data ) && isset( $data['cart_discounts'] ) ) {
-        unset( $data['cart_discounts'] );
+    if (!empty($data) && isset($data['cart_discounts'])) {
+        unset($data['cart_discounts']);
         
-         wpinv_set_checkout_session( $data );
+         wpinv_set_checkout_session($data);
          return true;
     }
     
     return false;
 }
 
-function wpinv_get_cart_discounts( $items = array() ) {
+function wpinv_get_cart_discounts($items = array()) {
     $session = wpinv_get_checkout_session();
     
-    $discounts = !empty( $session['cart_discounts'] ) ? $session['cart_discounts'] : false;
+    $discounts = !empty($session['cart_discounts']) ? $session['cart_discounts'] : false;
     return $discounts;
 }
 
-function wpinv_cart_has_discounts( $items = array() ) {
+function wpinv_cart_has_discounts($items = array()) {
     $ret = false;
 
-    if ( wpinv_get_cart_discounts( $items ) ) {
+    if (wpinv_get_cart_discounts($items)) {
         $ret = true;
     }
     
@@ -914,131 +914,131 @@ 
     }
     */
 
-    return apply_filters( 'wpinv_cart_has_discounts', $ret );
+    return apply_filters('wpinv_cart_has_discounts', $ret);
 }
 
-function wpinv_get_cart_discounted_amount( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounted_amount($items = array(), $discounts = false) {
     $amount = 0.00;
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items  = !empty($items) ? $items : wpinv_get_cart_content_details();
 
-    if ( $items ) {
-        $discounts = wp_list_pluck( $items, 'discount' );
+    if ($items) {
+        $discounts = wp_list_pluck($items, 'discount');
 
-        if ( is_array( $discounts ) ) {
-            $discounts = array_map( 'floatval', $discounts );
-            $amount    = array_sum( $discounts );
+        if (is_array($discounts)) {
+            $discounts = array_map('floatval', $discounts);
+            $amount    = array_sum($discounts);
         }
     }
 
-    return apply_filters( 'wpinv_get_cart_discounted_amount', $amount );
+    return apply_filters('wpinv_get_cart_discounted_amount', $amount);
 }
 
-function wpinv_get_cart_items_discount_amount( $items = array(), $discount = false ) {
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+function wpinv_get_cart_items_discount_amount($items = array(), $discount = false) {
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( empty( $discount ) || empty( $items ) ) {
+    if (empty($discount) || empty($items)) {
         return 0;
     }
 
     $amount = 0;
     
-    foreach ( $items as $item ) {
-        $amount += wpinv_get_cart_item_discount_amount( $item, $discount );
+    foreach ($items as $item) {
+        $amount += wpinv_get_cart_item_discount_amount($item, $discount);
     }
     
-    $amount = wpinv_round_amount( $amount );
+    $amount = wpinv_round_amount($amount);
 
     return $amount;
 }
 
-function wpinv_get_cart_item_discount_amount( $item = array(), $discount = false ) {
+function wpinv_get_cart_item_discount_amount($item = array(), $discount = false) {
     global $wpinv_is_last_cart_item, $wpinv_flat_discount_total;
     
     $amount = 0;
 
-    if ( empty( $item ) || empty( $item['id'] ) ) {
+    if (empty($item) || empty($item['id'])) {
         return $amount;
     }
 
-    if ( empty( $item['quantity'] ) ) {
+    if (empty($item['quantity'])) {
         return $amount;
     }
 
-    if ( empty( $item['options'] ) ) {
+    if (empty($item['options'])) {
         $item['options'] = array();
     }
 
-    $price            = wpinv_get_cart_item_price( $item['id'], $item, $item['options'] );
+    $price            = wpinv_get_cart_item_price($item['id'], $item, $item['options']);
     $discounted_price = $price;
 
     $discounts = false === $discount ? wpinv_get_cart_discounts() : $discount;
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return $amount;
     }
 
-    if ( $discounts ) {
-        if ( is_array( $discounts ) ) {
-            $discounts = array_values( $discounts );
+    if ($discounts) {
+        if (is_array($discounts)) {
+            $discounts = array_values($discounts);
         } else {
-            $discounts = explode( ',', $discounts );
+            $discounts = explode(',', $discounts);
         }
     }
 
-    if( $discounts ) {
-        foreach ( $discounts as $discount ) {
-            $code_id = wpinv_get_discount_id_by_code( $discount );
+    if ($discounts) {
+        foreach ($discounts as $discount) {
+            $code_id = wpinv_get_discount_id_by_code($discount);
 
             // Check discount exists
-            if( ! $code_id ) {
+            if (!$code_id) {
                 continue;
             }
 
-            $reqs           = wpinv_get_discount_item_reqs( $code_id );
-            $excluded_items = wpinv_get_discount_excluded_items( $code_id );
+            $reqs           = wpinv_get_discount_item_reqs($code_id);
+            $excluded_items = wpinv_get_discount_excluded_items($code_id);
 
             // Make sure requirements are set and that this discount shouldn't apply to the whole cart
-            if ( !empty( $reqs ) && wpinv_is_discount_not_global( $code_id ) ) {
-                foreach ( $reqs as $item_id ) {
-                    if ( $item_id == $item['id'] && ! in_array( $item['id'], $excluded_items ) ) {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+            if (!empty($reqs) && wpinv_is_discount_not_global($code_id)) {
+                foreach ($reqs as $item_id) {
+                    if ($item_id == $item['id'] && !in_array($item['id'], $excluded_items)) {
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             } else {
                 // This is a global cart discount
-                if ( !in_array( $item['id'], $excluded_items ) ) {
-                    if ( 'flat' === wpinv_get_discount_type( $code_id ) ) {
+                if (!in_array($item['id'], $excluded_items)) {
+                    if ('flat' === wpinv_get_discount_type($code_id)) {
                         $items_subtotal    = 0.00;
                         $cart_items        = wpinv_get_cart_contents();
                         
-                        foreach ( $cart_items as $cart_item ) {
-                            if ( ! in_array( $cart_item['id'], $excluded_items ) ) {
-                                $options = !empty( $cart_item['options'] ) ? $cart_item['options'] : array();
-                                $item_price      = wpinv_get_cart_item_price( $cart_item['id'], $cart_item, $options );
+                        foreach ($cart_items as $cart_item) {
+                            if (!in_array($cart_item['id'], $excluded_items)) {
+                                $options = !empty($cart_item['options']) ? $cart_item['options'] : array();
+                                $item_price      = wpinv_get_cart_item_price($cart_item['id'], $cart_item, $options);
                                 $items_subtotal += $item_price * $cart_item['quantity'];
                             }
                         }
 
-                        $subtotal_percent  = ( ( $price * $item['quantity'] ) / $items_subtotal );
-                        $code_amount       = wpinv_get_discount_amount( $code_id );
+                        $subtotal_percent  = (($price * $item['quantity']) / $items_subtotal);
+                        $code_amount       = wpinv_get_discount_amount($code_id);
                         $discounted_amount = $code_amount * $subtotal_percent;
                         $discounted_price -= $discounted_amount;
 
-                        $wpinv_flat_discount_total += round( $discounted_amount, wpinv_currency_decimal_filter() );
+                        $wpinv_flat_discount_total += round($discounted_amount, wpinv_currency_decimal_filter());
 
-                        if ( $wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount ) {
+                        if ($wpinv_is_last_cart_item && $wpinv_flat_discount_total < $code_amount) {
                             $adjustment = $code_amount - $wpinv_flat_discount_total;
                             $discounted_price -= $adjustment;
                         }
                     } else {
-                        $discounted_price -= $price - wpinv_get_discounted_amount( $discount, $price );
+                        $discounted_price -= $price - wpinv_get_discounted_amount($discount, $price);
                     }
                 }
             }
         }
 
-        $amount = ( $price - apply_filters( 'wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price ) );
+        $amount = ($price - apply_filters('wpinv_get_cart_item_discounted_amount', $discounted_price, $discounts, $item, $price));
 
-        if ( 'flat' !== wpinv_get_discount_type( $code_id ) ) {
+        if ('flat' !== wpinv_get_discount_type($code_id)) {
             $amount = $amount * $item['quantity'];
         }
     }
@@ -1046,59 +1046,59 @@ 
     return $amount;
 }
 
-function wpinv_cart_discounts_html( $items = array() ) {
-    echo wpinv_get_cart_discounts_html( $items );
+function wpinv_cart_discounts_html($items = array()) {
+    echo wpinv_get_cart_discounts_html($items);
 }
 
-function wpinv_get_cart_discounts_html( $items = array(), $discounts = false ) {
+function wpinv_get_cart_discounts_html($items = array(), $discounts = false) {
     global $wpi_cart_columns;
     
-    $items  = !empty( $items ) ? $items : wpinv_get_cart_content_details();
+    $items = !empty($items) ? $items : wpinv_get_cart_content_details();
     
-    if ( !$discounts ) {
-        $discounts = wpinv_get_cart_discounts( $items );
+    if (!$discounts) {
+        $discounts = wpinv_get_cart_discounts($items);
     }
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
     
-    $discounts = is_array( $discounts ) ? $discounts : array( $discounts );
+    $discounts = is_array($discounts) ? $discounts : array($discounts);
     
     $html = '';
 
-    foreach ( $discounts as $discount ) {
-        $discount_id    = wpinv_get_discount_id_by_code( $discount );
-        $discount_value = wpinv_get_discount_amount( $discount_id );
-        $rate           = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), $discount_value );
-        $amount         = wpinv_get_cart_items_discount_amount( $items, $discount );
-        $remove_btn     = '<a title="' . esc_attr__( 'Remove discount', 'invoicing' ) . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
+    foreach ($discounts as $discount) {
+        $discount_id    = wpinv_get_discount_id_by_code($discount);
+        $discount_value = wpinv_get_discount_amount($discount_id);
+        $rate           = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), $discount_value);
+        $amount         = wpinv_get_cart_items_discount_amount($items, $discount);
+        $remove_btn     = '<a title="' . esc_attr__('Remove discount', 'invoicing') . '" data-code="' . $discount . '" data-value="' . $discount_value . '" class="wpi-discount-remove" href="javascript:void(0);">[<i class="fa fa-times" aria-hidden="true"></i>]</a> ';
         
         $html .= '<tr class="wpinv_cart_footer_row wpinv_cart_discount_row">';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_first', $items );
+        do_action('wpinv_checkout_table_discount_first', $items);
         $html .= ob_get_clean();
-        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label( $discount, $rate, false ) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price( wpinv_format_amount( $amount ) ) . '</span></td>';
+        $html .= '<td class="wpinv_cart_discount_label text-right" colspan="' . $wpi_cart_columns . '">' . $remove_btn . '<strong>' . wpinv_cart_discount_label($discount, $rate, false) . '</strong></td><td class="wpinv_cart_discount text-right"><span data-discount="' . $amount . '" class="wpinv_cart_discount_amount">&ndash;' . wpinv_price(wpinv_format_amount($amount)) . '</span></td>';
         ob_start();
-        do_action( 'wpinv_checkout_table_discount_last', $items );
+        do_action('wpinv_checkout_table_discount_last', $items);
         $html .= ob_get_clean();
         $html .= '</tr>';
     }
 
-    return apply_filters( 'wpinv_get_cart_discounts_html', $html, $discounts, $rate );
+    return apply_filters('wpinv_get_cart_discounts_html', $html, $discounts, $rate);
 }
 
-function wpinv_display_cart_discount( $formatted = false, $echo = false ) {
+function wpinv_display_cart_discount($formatted = false, $echo = false) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( empty( $discounts ) ) {
+    if (empty($discounts)) {
         return false;
     }
 
-    $discount_id  = wpinv_get_discount_id_by_code( $discounts[0] );
-    $amount       = wpinv_format_discount_rate( wpinv_get_discount_type( $discount_id ), wpinv_get_discount_amount( $discount_id ) );
+    $discount_id  = wpinv_get_discount_id_by_code($discounts[0]);
+    $amount       = wpinv_format_discount_rate(wpinv_get_discount_type($discount_id), wpinv_get_discount_amount($discount_id));
 
-    if ( $echo ) {
+    if ($echo) {
         echo $amount;
     }
 
@@ -1106,135 +1106,135 @@ 
 }
 
 function wpinv_remove_cart_discount() {
-    if ( !isset( $_GET['discount_id'] ) || ! isset( $_GET['discount_code'] ) ) {
+    if (!isset($_GET['discount_id']) || !isset($_GET['discount_code'])) {
         return;
     }
 
-    do_action( 'wpinv_pre_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_pre_remove_cart_discount', absint($_GET['discount_id']));
 
-    wpinv_unset_cart_discount( urldecode( $_GET['discount_code'] ) );
+    wpinv_unset_cart_discount(urldecode($_GET['discount_code']));
 
-    do_action( 'wpinv_post_remove_cart_discount', absint( $_GET['discount_id'] ) );
+    do_action('wpinv_post_remove_cart_discount', absint($_GET['discount_id']));
 
-    wp_redirect( wpinv_get_checkout_uri() ); wpinv_die();
+    wp_redirect(wpinv_get_checkout_uri()); wpinv_die();
 }
-add_action( 'wpinv_remove_cart_discount', 'wpinv_remove_cart_discount' );
+add_action('wpinv_remove_cart_discount', 'wpinv_remove_cart_discount');
 
-function wpinv_maybe_remove_cart_discount( $cart_key = 0 ) {
+function wpinv_maybe_remove_cart_discount($cart_key = 0) {
     $discounts = wpinv_get_cart_discounts();
 
-    if ( !$discounts ) {
+    if (!$discounts) {
         return;
     }
 
-    foreach ( $discounts as $discount ) {
-        if ( !wpinv_is_discount_valid( $discount ) ) {
-            wpinv_unset_cart_discount( $discount );
+    foreach ($discounts as $discount) {
+        if (!wpinv_is_discount_valid($discount)) {
+            wpinv_unset_cart_discount($discount);
         }
     }
 }
-add_action( 'wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount' );
+add_action('wpinv_post_remove_from_cart', 'wpinv_maybe_remove_cart_discount');
 
 function wpinv_multiple_discounts_allowed() {
-    $ret = wpinv_get_option( 'allow_multiple_discounts', false );
-    return (bool) apply_filters( 'wpinv_multiple_discounts_allowed', $ret );
+    $ret = wpinv_get_option('allow_multiple_discounts', false);
+    return (bool)apply_filters('wpinv_multiple_discounts_allowed', $ret);
 }
 
 function wpinv_listen_for_cart_discount() {
     global $wpi_session;
     
-    if ( empty( $_REQUEST['discount'] ) || is_array( $_REQUEST['discount'] ) ) {
+    if (empty($_REQUEST['discount']) || is_array($_REQUEST['discount'])) {
         return;
     }
 
-    $code = preg_replace('/[^a-zA-Z0-9-_]+/', '', $_REQUEST['discount'] );
+    $code = preg_replace('/[^a-zA-Z0-9-_]+/', '', $_REQUEST['discount']);
 
-    $wpi_session->set( 'preset_discount', $code );
+    $wpi_session->set('preset_discount', $code);
 }
 //add_action( 'init', 'wpinv_listen_for_cart_discount', 0 );
 
 function wpinv_apply_preset_discount() {
     global $wpi_session;
     
-    $code = $wpi_session->get( 'preset_discount' );
+    $code = $wpi_session->get('preset_discount');
 
-    if ( !$code ) {
+    if (!$code) {
         return;
     }
 
-    if ( !wpinv_is_discount_valid( $code, '', false ) ) {
+    if (!wpinv_is_discount_valid($code, '', false)) {
         return;
     }
     
-    $code = apply_filters( 'wpinv_apply_preset_discount', $code );
+    $code = apply_filters('wpinv_apply_preset_discount', $code);
 
-    wpinv_set_cart_discount( $code );
+    wpinv_set_cart_discount($code);
 
-    $wpi_session->set( 'preset_discount', null );
+    $wpi_session->set('preset_discount', null);
 }
 //add_action( 'init', 'wpinv_apply_preset_discount', 999 );
 
-function wpinv_get_discount_label( $code, $echo = true ) {
-    $label = wp_sprintf( __( 'Discount%1$s', 'invoicing' ), ( $code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)': '' ) );
-    $label = apply_filters( 'wpinv_get_discount_label', $label, $code );
+function wpinv_get_discount_label($code, $echo = true) {
+    $label = wp_sprintf(__('Discount%1$s', 'invoicing'), ($code != '' && $code != 'none' ? ' (<code>' . $code . '</code>)' : ''));
+    $label = apply_filters('wpinv_get_discount_label', $label, $code);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_cart_discount_label( $code, $rate, $echo = true ) {
-    $label = wp_sprintf( __( '%1$s Discount: %2$s', 'invoicing' ), $rate, $code );
-    $label = apply_filters( 'wpinv_cart_discount_label', $label, $code, $rate );
+function wpinv_cart_discount_label($code, $rate, $echo = true) {
+    $label = wp_sprintf(__('%1$s Discount: %2$s', 'invoicing'), $rate, $code);
+    $label = apply_filters('wpinv_cart_discount_label', $label, $code, $rate);
 
-    if ( $echo ) {
+    if ($echo) {
         echo $label;
     } else {
         return $label;
     }
 }
 
-function wpinv_check_delete_discount( $check, $post, $force_delete ) {
-    if ( $post->post_type == 'wpi_discount' && wpinv_get_discount_uses( $post->ID ) > 0 ) {
+function wpinv_check_delete_discount($check, $post, $force_delete) {
+    if ($post->post_type == 'wpi_discount' && wpinv_get_discount_uses($post->ID) > 0) {
         return true;
     }
     
     return $check;
 }
-add_filter( 'pre_delete_post', 'wpinv_check_delete_discount', 10, 3 );
+add_filter('pre_delete_post', 'wpinv_check_delete_discount', 10, 3);
 
 function wpinv_checkout_form_validate_discounts() {
     global $wpi_checkout_id;
     
     $discounts = wpinv_get_cart_discounts();
     
-    if ( !empty( $discounts ) ) {
+    if (!empty($discounts)) {
         $invalid = false;
         
-        foreach ( $discounts as $key => $code ) {
-            if ( !wpinv_is_discount_valid( $code, (int)wpinv_get_user_id( $wpi_checkout_id ) ) ) {
+        foreach ($discounts as $key => $code) {
+            if (!wpinv_is_discount_valid($code, (int)wpinv_get_user_id($wpi_checkout_id))) {
                 $invalid = true;
                 
-                wpinv_unset_cart_discount( $code );
+                wpinv_unset_cart_discount($code);
             }
         }
         
-        if ( $invalid ) {
+        if ($invalid) {
             $errors = wpinv_get_errors();
-            $error  = !empty( $errors['wpinv-discount-error'] ) ? $errors['wpinv-discount-error'] . ' ' : '';
-            $error  .= __( 'The discount has been removed from cart.', 'invoicing' );
-            wpinv_set_error( 'wpinv-discount-error', $error );
+            $error  = !empty($errors['wpinv-discount-error']) ? $errors['wpinv-discount-error'] . ' ' : '';
+            $error .= __('The discount has been removed from cart.', 'invoicing');
+            wpinv_set_error('wpinv-discount-error', $error);
             
-            wpinv_recalculate_tax( true );
+            wpinv_recalculate_tax(true);
         }
     }
 }
-add_action( 'wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10 );
+add_action('wpinv_before_checkout_form', 'wpinv_checkout_form_validate_discounts', -10);
 
 function wpinv_discount_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_discount_amount', $output );
+    return apply_filters('wpinv_discount_amount', $output);
 }
\ No newline at end of file

includes/gateways/manual.php

Spacing +14 added lines, -14 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_manual_cc_form', '__return_false' );
+add_action('wpinv_manual_cc_form', '__return_false');
 
-function wpinv_process_manual_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_manual_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     /*
@@ -41,22 +41,22 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {        
-        wpinv_set_payment_transaction_id( $invoice->ID, $invoice->generate_key() );
-        wpinv_update_payment_status( $invoice, 'publish' );
+    if (!empty($invoice)) {        
+        wpinv_set_payment_transaction_id($invoice->ID, $invoice->generate_key());
+        wpinv_update_payment_status($invoice, 'publish');
         
         // Empty the shopping cart
         wpinv_empty_cart();
         
-        do_action( 'wpinv_send_to_success_page', $invoice->ID, $payment_data );
+        do_action('wpinv_send_to_success_page', $invoice->ID, $payment_data);
         
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_manual', 'wpinv_process_manual_payment' );
\ No newline at end of file
+add_action('wpinv_gateway_manual', 'wpinv_process_manual_payment');
\ No newline at end of file

includes/gateways/worldpay.php

Spacing +65 added lines, -65 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_worldpay_cc_form', '__return_false' );
+add_action('wpinv_worldpay_cc_form', '__return_false');
 
-function wpinv_process_worldpay_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_worldpay_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
     // Collect payment data
@@ -24,132 +24,132 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         $quantities_enabled = wpinv_item_quantities_enabled();
         
-        $instId     = wpinv_get_option( 'worldpay_instId', false );
+        $instId     = wpinv_get_option('worldpay_instId', false);
         $cartId     = $invoice->get_number();
-        $testMode   = wpinv_is_test_mode( 'worldpay' ) ? 100 : 0;
+        $testMode   = wpinv_is_test_mode('worldpay') ? 100 : 0;
         $name       = $invoice->get_user_full_name();
-        $address    = wp_strip_all_tags( $invoice->get_address(), true );
+        $address    = wp_strip_all_tags($invoice->get_address(), true);
         $postcode   = $invoice->zip;
         $tel        = $invoice->phone;
         $email      = $invoice->get_email();
         $country    = $invoice->country;
-        $amount     = wpinv_sanitize_amount( $invoice->get_total() );
+        $amount     = wpinv_sanitize_amount($invoice->get_total());
         $currency   = wpinv_get_currency();
         
         $items      = array();
-        foreach ( $invoice->get_cart_details() as $item ) {
+        foreach ($invoice->get_cart_details() as $item) {
             $item_desc  = $item['name'];
-            $quantity   = !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-            $item_desc .= ' (' . ( $quantities_enabled ? $quantity . 'x ' : '' ) . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            $quantity   = !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+            $item_desc .= ' (' . ($quantities_enabled ? $quantity . 'x ' : '') . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
             
             $items[] = $item_desc;
         }
         
-        $desc = implode( ', ', $items );
-        if ( wpinv_use_taxes() && $invoice->get_tax() > 0 ) {
-            $desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+        $desc = implode(', ', $items);
+        if (wpinv_use_taxes() && $invoice->get_tax() > 0) {
+            $desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
         }
         
         $extra_params                   = array();
         $extra_params['MC_description'] = $desc;
-        $extra_params['MC_callback']    = wpinv_get_ipn_url( 'worldpay' );
+        $extra_params['MC_callback']    = wpinv_get_ipn_url('worldpay');
         $extra_params['MC_key']         = $invoice->get_key();
         $extra_params['MC_invoice_id']  = $invoice->ID;
         $extra_params['address1']       = $address;
         $extra_params['town']           = $invoice->city;
         $extra_params['region']         = $invoice->state;
-        $extra_params['amountString']   = $invoice->get_total( true );
-        $extra_params['countryString']  = wpinv_country_name( $invoice->country );
+        $extra_params['amountString']   = $invoice->get_total(true);
+        $extra_params['countryString']  = wpinv_country_name($invoice->country);
         $extra_params['compName']       = $invoice->company;
         
-        $extra_params   = apply_filters( 'wpinv_worldpay_form_extra_parameters', $extra_params, $invoice );
+        $extra_params   = apply_filters('wpinv_worldpay_form_extra_parameters', $extra_params, $invoice);
         
-        $redirect_text  = __( 'Redirecting to Worldpay site, click on button if not redirected.', 'invoicing' );
-        $redirect_text  = apply_filters( 'wpinv_worldpay_redirect_text', $redirect_text, $invoice );
+        $redirect_text  = __('Redirecting to Worldpay site, click on button if not redirected.', 'invoicing');
+        $redirect_text  = apply_filters('wpinv_worldpay_redirect_text', $redirect_text, $invoice);
         
         // Empty the shopping cart
         wpinv_empty_cart();
         ?>
 <div class="wpi-worldpay-form" style="padding:20px;font-family:arial,sans-serif;text-align:center;color:#555">
-<?php do_action( 'wpinv_worldpay_form_before', $invoice ); ?>
-<h3><?php echo $redirect_text ;?></h3>
+<?php do_action('wpinv_worldpay_form_before', $invoice); ?>
+<h3><?php echo $redirect_text; ?></h3>
 <form action="<?php echo wpinv_get_worldpay_redirect(); ?>" name="wpi_worldpay_form" method="POST">
-    <input type="hidden" value="<?php echo $amount;?>" name="amount">
-    <input type="hidden" value="<?php echo esc_attr( $cartId );?>" name="cartId">
-    <input type="hidden" value="<?php echo $currency;?>" name="currency">
-    <input type="hidden" value="<?php echo $instId;?>" name="instId">
-    <input type="hidden" value="<?php echo $testMode;?>" name="testMode">
-    <input type="hidden" value="<?php echo esc_attr( $name );?>" name="name">
-    <input type="hidden" value="<?php echo esc_attr( $address );?>" name="address">
-    <input type="hidden" value="<?php echo esc_attr( $postcode );?>" name="postcode">
-    <input type="hidden" value="<?php echo esc_attr( $tel );?>" name="tel">
-    <input type="hidden" value="<?php echo esc_attr( $email );?>" name="email">
-    <input type="hidden" value="<?php echo esc_attr( $country );?>" name="country">
-    <input type="hidden" value="<?php echo esc_attr( $desc );?>" name="desc">
-    <?php foreach ( $extra_params as $param => $value ) { ?>
-        <?php if ( !empty( $value !== false ) ) { ?>
-    <input type="hidden" value="<?php echo esc_attr( $value );?>" name="<?php echo esc_attr( $param );?>">
+    <input type="hidden" value="<?php echo $amount; ?>" name="amount">
+    <input type="hidden" value="<?php echo esc_attr($cartId); ?>" name="cartId">
+    <input type="hidden" value="<?php echo $currency; ?>" name="currency">
+    <input type="hidden" value="<?php echo $instId; ?>" name="instId">
+    <input type="hidden" value="<?php echo $testMode; ?>" name="testMode">
+    <input type="hidden" value="<?php echo esc_attr($name); ?>" name="name">
+    <input type="hidden" value="<?php echo esc_attr($address); ?>" name="address">
+    <input type="hidden" value="<?php echo esc_attr($postcode); ?>" name="postcode">
+    <input type="hidden" value="<?php echo esc_attr($tel); ?>" name="tel">
+    <input type="hidden" value="<?php echo esc_attr($email); ?>" name="email">
+    <input type="hidden" value="<?php echo esc_attr($country); ?>" name="country">
+    <input type="hidden" value="<?php echo esc_attr($desc); ?>" name="desc">
+    <?php foreach ($extra_params as $param => $value) { ?>
+        <?php if (!empty($value !== false)) { ?>
+    <input type="hidden" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($param); ?>">
         <?php } ?>
     <?php } ?>
-    <?php do_action( 'wpinv_worldpay_form_parameters', $invoice ); ?>
-    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e( 'Pay by Debit/Credit Card (WorldPay)', 'invoicing' ) ;?>">
+    <?php do_action('wpinv_worldpay_form_parameters', $invoice); ?>
+    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e('Pay by Debit/Credit Card (WorldPay)', 'invoicing'); ?>">
 </form>
 <script type="text/javascript">document.wpi_worldpay_form.submit();</script>
-<?php do_action( 'wpinv_worldpay_form_after', $invoice ); ?>
+<?php do_action('wpinv_worldpay_form_after', $invoice); ?>
 </div>
         <?php
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment' );
+add_action('wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment');
 
 function wpinv_get_worldpay_redirect() {
-    $redirect = wpinv_is_test_mode( 'worldpay' ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+    $redirect = wpinv_is_test_mode('worldpay') ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
     
-    return apply_filters( 'wpinv_worldpay_redirect', $redirect );
+    return apply_filters('wpinv_worldpay_redirect', $redirect);
 }
 
 function wpinv_process_worldpay_ipn() {
-    $request = wpinv_get_post_data( 'post' );
+    $request = wpinv_get_post_data('post');
     
-    if ( !empty( $request['cartId'] ) && !empty( $request['transStatus'] ) && !empty( $request['installation'] ) && isset( $request['testMode'] ) && isset( $request['MC_invoice_id'] ) && isset( $request['MC_key'] ) ) {
+    if (!empty($request['cartId']) && !empty($request['transStatus']) && !empty($request['installation']) && isset($request['testMode']) && isset($request['MC_invoice_id']) && isset($request['MC_key'])) {
         $invoice_id = $request['MC_invoice_id'];
         
-        if ( $invoice_id == wpinv_get_invoice_id_by_key( $request['MC_key'] ) && $invoice = wpinv_get_invoice( $invoice_id ) ) {
-            if ( $request['transStatus'] == 'Y' ) {                
-                wpinv_update_payment_status( $invoice_id, 'publish' );
-                wpinv_set_payment_transaction_id( $invoice_id, $request['transId'] );
-                wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Worldpay Transaction ID: %s', 'invoicing' ), $request['transId'] ) );
+        if ($invoice_id == wpinv_get_invoice_id_by_key($request['MC_key']) && $invoice = wpinv_get_invoice($invoice_id)) {
+            if ($request['transStatus'] == 'Y') {                
+                wpinv_update_payment_status($invoice_id, 'publish');
+                wpinv_set_payment_transaction_id($invoice_id, $request['transId']);
+                wpinv_insert_payment_note($invoice_id, sprintf(__('Worldpay Transaction ID: %s', 'invoicing'), $request['transId']));
                 return;
-            } else if ( $request['transStatus'] == 'C' ) {
-                wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-                wpinv_insert_payment_note( $invoice_id, __( 'Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing' ) );
+            } else if ($request['transStatus'] == 'C') {
+                wpinv_update_payment_status($invoice_id, 'wpi-failed');
+                wpinv_insert_payment_note($invoice_id, __('Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing'));
                 
-                wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing' ), json_encode( $request ) ), $invoice_id );
+                wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing'), json_encode($request)), $invoice_id);
                 return;
             }
         }
     }
     return;
 }
-add_action( 'wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn' );
+add_action('wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn');
 
 function wpinv_is_worldpay_valid_for_use() {
-    return in_array( wpinv_get_currency(), apply_filters( 'wpinv_worldpay_supported_currencies', array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' )));
+    return in_array(wpinv_get_currency(), apply_filters('wpinv_worldpay_supported_currencies', array('AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR')));
 }
 
-function wpinv_check_worldpay_currency_support( $gateway_list ) {
-    if ( isset( $gateway_list['worldpay'] ) && ! wpinv_is_worldpay_valid_for_use() ) {
-        unset( $gateway_list['worldpay'] );
+function wpinv_check_worldpay_currency_support($gateway_list) {
+    if (isset($gateway_list['worldpay']) && !wpinv_is_worldpay_valid_for_use()) {
+        unset($gateway_list['worldpay']);
     }
     return $gateway_list;
 }
-add_filter( 'wpinv_enabled_payment_gateways', 'wpinv_check_worldpay_currency_support', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_enabled_payment_gateways', 'wpinv_check_worldpay_currency_support', 10, 1);
\ No newline at end of file