AyeCode / invoicing

templates/emails/wpinv-email-billing-details.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <a href="<?php echo esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), self_admin_url( 'user-edit.php' ) ) ); ?>"><?php echo esc_html( $invoice->get_user_full_name() ); ?></a>
                     <?php
 } else {
-					echo esc_html( $invoice->get_user_full_name() ); }
+                    echo esc_html( $invoice->get_user_full_name() ); }
 ?>
 </td>
             </tr>

Spacing +21 added lines, -21 removed lines

@@ -1,51 +1,51 @@
 <?php
 // don't load directly
-if ( ! defined( 'ABSPATH' ) ) {
-    die( '-1' );
+if (!defined('ABSPATH')) {
+    die('-1');
 }
 
-do_action( 'wpinv_email_before_billing_details', $invoice ); ?>
+do_action('wpinv_email_before_billing_details', $invoice); ?>
 <div id="wpinv-email-billing">
-    <h3 class="wpinv-address-t"><?php echo esc_html( apply_filters( 'wpinv_email_billing_title', __( 'Billing Details', 'invoicing' ) ) ); ?></h3>
+    <h3 class="wpinv-address-t"><?php echo esc_html(apply_filters('wpinv_email_billing_title', __('Billing Details', 'invoicing'))); ?></h3>
 
     <table class="table table-bordered table-sm wpi-billing-details">
         <tbody>
-            <?php do_action( 'wpinv_email_billing_fields_first', $invoice ); ?>
+            <?php do_action('wpinv_email_billing_fields_first', $invoice); ?>
             <tr class="wpi-receipt-name">
-                <th class="text-left"><?php esc_html_e( 'Name', 'invoicing' ); ?></th>
+                <th class="text-left"><?php esc_html_e('Name', 'invoicing'); ?></th>
                 <td>
                 <?php
-                if ( $sent_to_admin && $invoice->get_user_id() ) {
+                if ($sent_to_admin && $invoice->get_user_id()) {
 ?>
-<a href="<?php echo esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), self_admin_url( 'user-edit.php' ) ) ); ?>"><?php echo esc_html( $invoice->get_user_full_name() ); ?></a>
+<a href="<?php echo esc_url(add_query_arg('user_id', $invoice->get_user_id(), self_admin_url('user-edit.php'))); ?>"><?php echo esc_html($invoice->get_user_full_name()); ?></a>
                     <?php
 } else {
-					echo esc_html( $invoice->get_user_full_name() ); }
+					echo esc_html($invoice->get_user_full_name()); }
 ?>
 </td>
             </tr>
             <tr class="wpi-receipt-email">
-                <th class="text-left"><?php esc_html_e( 'Email', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( sanitize_email( $invoice->get_email() ) ); ?></td>
+                <th class="text-left"><?php esc_html_e('Email', 'invoicing'); ?></th>
+                <td><?php echo esc_html(sanitize_email($invoice->get_email())); ?></td>
             </tr>
-            <?php if ( $invoice->get_company() ) { ?>
+            <?php if ($invoice->get_company()) { ?>
             <tr class="wpi-receipt-company">
-                <th class="text-left"><?php esc_html_e( 'Company', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $invoice->get_company() ); ?></td>
+                <th class="text-left"><?php esc_html_e('Company', 'invoicing'); ?></th>
+                <td><?php echo esc_html($invoice->get_company()); ?></td>
             </tr>
             <?php } ?>
             <tr class="wpi-receipt-address">
-                <th class="text-left"><?php esc_html_e( 'Address', 'invoicing' ); ?></th>
-                <td><?php echo wp_kses_post( wpinv_get_invoice_address_markup( $invoice->get_user_info() ) ); ?></td>
+                <th class="text-left"><?php esc_html_e('Address', 'invoicing'); ?></th>
+                <td><?php echo wp_kses_post(wpinv_get_invoice_address_markup($invoice->get_user_info())); ?></td>
             </tr>
-            <?php if ( $invoice->get_phone() ) { ?>
+            <?php if ($invoice->get_phone()) { ?>
             <tr class="wpi-receipt-phone">
-                <th class="text-left"><?php esc_html_e( 'Phone', 'invoicing' ); ?></th>
-                <td><?php echo esc_html( $invoice->get_phone() ); ?></td>
+                <th class="text-left"><?php esc_html_e('Phone', 'invoicing'); ?></th>
+                <td><?php echo esc_html($invoice->get_phone()); ?></td>
             </tr>
             <?php } ?>
-            <?php do_action( 'wpinv_email_billing_fields_last', $invoice ); ?>
+            <?php do_action('wpinv_email_billing_fields_last', $invoice); ?>
         </tbody>
     </table>
 </div>
-<?php do_action( 'wpinv_email_after_billing_details', $invoice ); ?>
+<?php do_action('wpinv_email_after_billing_details', $invoice); ?>

includes/data-stores/class-getpaid-payment-form-data-store.php

Indentation +169 added lines, -169 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -14,179 +14,179 @@ 
  */
 class GetPaid_Payment_Form_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for a form.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'wpinv_form_elements',
-		'wpinv_form_items',
-		'wpinv_form_earned',
-		'wpinv_form_refunded',
-		'wpinv_form_cancelled',
-		'wpinv_form_failed',
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'wpinv_form_elements'  => 'elements',
-		'wpinv_form_items'     => 'items',
-		'wpinv_form_earned'    => 'earned',
-		'wpinv_form_refunded'  => 'refunded',
-		'wpinv_form_cancelled' => 'cancelled',
-		'wpinv_form_failed'    => 'failed',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for a form.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        'wpinv_form_elements',
+        'wpinv_form_items',
+        'wpinv_form_earned',
+        'wpinv_form_refunded',
+        'wpinv_form_cancelled',
+        'wpinv_form_failed',
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        'wpinv_form_elements'  => 'elements',
+        'wpinv_form_items'     => 'items',
+        'wpinv_form_earned'    => 'earned',
+        'wpinv_form_refunded'  => 'refunded',
+        'wpinv_form_cancelled' => 'cancelled',
+        'wpinv_form_failed'    => 'failed',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new form in the database.
-	 *
-	 * @param GetPaid_Payment_Form $form Form object.
-	 */
-	public function create( &$form ) {
-		$form->set_version( WPINV_VERSION );
-		$form->set_date_created( current_time( 'mysql' ) );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_payment_form_data',
-				array(
-					'post_date'   => $form->get_date_created( 'edit' ),
-					'post_type'   => 'wpi_payment_form',
-					'post_status' => $this->get_post_status( $form ),
-					'ping_status' => 'closed',
-					'post_author' => $form->get_author( 'edit' ),
-					'post_title'  => $form->get_name( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-			$form->set_id( $id );
-			$this->update_post_meta( $form );
-			$form->save_meta_data();
-			$form->apply_changes();
-			$this->clear_caches( $form );
-			do_action( 'getpaid_create_payment_form', $form );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$form->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read a form from the database.
-	 *
-	 * @param GetPaid_Payment_Form $form Form object.
-	 *
-	 */
-	public function read( &$form ) {
-
-		$form->set_defaults();
-		$form_object = get_post( $form->get_id() );
-
-		if ( ! $form->get_id() || ! $form_object || $form_object->post_type != 'wpi_payment_form' ) {
-			$form->last_error = __( 'Invalid form.', 'invoicing' );
-			$form->set_id( 0 );
-			return false;
-		}
-
-		$form->set_props(
-			array(
-				'date_created'  => 0 < $form_object->post_date ? $form_object->post_date : null,
-				'date_modified' => 0 < $form_object->post_modified ? $form_object->post_modified : null,
-				'status'        => $form_object->post_status,
-				'name'          => $form_object->post_title,
-				'author'        => $form_object->post_author,
-			)
-		);
-
-		$this->read_object_data( $form, $form_object );
-		$form->read_meta_data();
-		$form->set_object_read( true );
-		do_action( 'getpaid_read_payment_form', $form );
-
-	}
-
-	/**
-	 * Method to update a form in the database.
-	 *
-	 * @param GetPaid_Payment_Form $form Form object.
-	 */
-	public function update( &$form ) {
-		$form->save_meta_data();
-		$form->set_version( WPINV_VERSION );
-
-		if ( null === $form->get_date_created( 'edit' ) ) {
-			$form->set_date_created( current_time( 'mysql' ) );
-		}
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $form->get_id() );
-
-		$changes = $form->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'     => $form->get_date_created( 'edit' ),
-				'post_status'   => $form->get_status( 'edit' ),
-				'post_title'    => $form->get_name( 'edit' ),
-				'post_author'   => $form->get_author( 'edit' ),
-				'post_modified' => $form->get_date_modified( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $form->get_id() ) );
-				clean_post_cache( $form->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $form->get_id() ), $post_data ) );
-			}
-			$form->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-		$this->update_post_meta( $form );
-		$form->apply_changes();
-		$this->clear_caches( $form );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $form->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_payment_form', $form );
-		} else {
-			do_action( 'getpaid_update_payment_form', $form );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new form in the database.
+     *
+     * @param GetPaid_Payment_Form $form Form object.
+     */
+    public function create( &$form ) {
+        $form->set_version( WPINV_VERSION );
+        $form->set_date_created( current_time( 'mysql' ) );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_payment_form_data',
+                array(
+                    'post_date'   => $form->get_date_created( 'edit' ),
+                    'post_type'   => 'wpi_payment_form',
+                    'post_status' => $this->get_post_status( $form ),
+                    'ping_status' => 'closed',
+                    'post_author' => $form->get_author( 'edit' ),
+                    'post_title'  => $form->get_name( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+            $form->set_id( $id );
+            $this->update_post_meta( $form );
+            $form->save_meta_data();
+            $form->apply_changes();
+            $this->clear_caches( $form );
+            do_action( 'getpaid_create_payment_form', $form );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $form->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read a form from the database.
+     *
+     * @param GetPaid_Payment_Form $form Form object.
+     *
+     */
+    public function read( &$form ) {
+
+        $form->set_defaults();
+        $form_object = get_post( $form->get_id() );
+
+        if ( ! $form->get_id() || ! $form_object || $form_object->post_type != 'wpi_payment_form' ) {
+            $form->last_error = __( 'Invalid form.', 'invoicing' );
+            $form->set_id( 0 );
+            return false;
+        }
+
+        $form->set_props(
+            array(
+                'date_created'  => 0 < $form_object->post_date ? $form_object->post_date : null,
+                'date_modified' => 0 < $form_object->post_modified ? $form_object->post_modified : null,
+                'status'        => $form_object->post_status,
+                'name'          => $form_object->post_title,
+                'author'        => $form_object->post_author,
+            )
+        );
+
+        $this->read_object_data( $form, $form_object );
+        $form->read_meta_data();
+        $form->set_object_read( true );
+        do_action( 'getpaid_read_payment_form', $form );
+
+    }
+
+    /**
+     * Method to update a form in the database.
+     *
+     * @param GetPaid_Payment_Form $form Form object.
+     */
+    public function update( &$form ) {
+        $form->save_meta_data();
+        $form->set_version( WPINV_VERSION );
+
+        if ( null === $form->get_date_created( 'edit' ) ) {
+            $form->set_date_created( current_time( 'mysql' ) );
+        }
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $form->get_id() );
+
+        $changes = $form->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'     => $form->get_date_created( 'edit' ),
+                'post_status'   => $form->get_status( 'edit' ),
+                'post_title'    => $form->get_name( 'edit' ),
+                'post_author'   => $form->get_author( 'edit' ),
+                'post_modified' => $form->get_date_modified( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $form->get_id() ) );
+                clean_post_cache( $form->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $form->get_id() ), $post_data ) );
+            }
+            $form->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+        $this->update_post_meta( $form );
+        $form->apply_changes();
+        $this->clear_caches( $form );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $form->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_payment_form', $form );
+        } else {
+            do_action( 'getpaid_update_payment_form', $form );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------

Spacing +44 added lines, -44 removed lines

@@ -3,7 +3,7 @@ 
  * GetPaid_Payment_Form_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -56,37 +56,37 @@ 
 	 *
 	 * @param GetPaid_Payment_Form $form Form object.
 	 */
-	public function create( &$form ) {
-		$form->set_version( WPINV_VERSION );
-		$form->set_date_created( current_time( 'mysql' ) );
+	public function create(&$form) {
+		$form->set_version(WPINV_VERSION);
+		$form->set_date_created(current_time('mysql'));
 
 		// Create a new post.
 		$id = wp_insert_post(
 			apply_filters(
 				'getpaid_new_payment_form_data',
 				array(
-					'post_date'   => $form->get_date_created( 'edit' ),
+					'post_date'   => $form->get_date_created('edit'),
 					'post_type'   => 'wpi_payment_form',
-					'post_status' => $this->get_post_status( $form ),
+					'post_status' => $this->get_post_status($form),
 					'ping_status' => 'closed',
-					'post_author' => $form->get_author( 'edit' ),
-					'post_title'  => $form->get_name( 'edit' ),
+					'post_author' => $form->get_author('edit'),
+					'post_title'  => $form->get_name('edit'),
 				)
 			),
 			true
 		);
 
-		if ( $id && ! is_wp_error( $id ) ) {
-			$form->set_id( $id );
-			$this->update_post_meta( $form );
+		if ($id && !is_wp_error($id)) {
+			$form->set_id($id);
+			$this->update_post_meta($form);
 			$form->save_meta_data();
 			$form->apply_changes();
-			$this->clear_caches( $form );
-			do_action( 'getpaid_create_payment_form', $form );
+			$this->clear_caches($form);
+			do_action('getpaid_create_payment_form', $form);
 			return true;
 		}
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$form->last_error = $id->get_error_message();
 		}
 
@@ -99,14 +99,14 @@ 
 	 * @param GetPaid_Payment_Form $form Form object.
 	 *
 	 */
-	public function read( &$form ) {
+	public function read(&$form) {
 
 		$form->set_defaults();
-		$form_object = get_post( $form->get_id() );
+		$form_object = get_post($form->get_id());
 
-		if ( ! $form->get_id() || ! $form_object || $form_object->post_type != 'wpi_payment_form' ) {
-			$form->last_error = __( 'Invalid form.', 'invoicing' );
-			$form->set_id( 0 );
+		if (!$form->get_id() || !$form_object || $form_object->post_type != 'wpi_payment_form') {
+			$form->last_error = __('Invalid form.', 'invoicing');
+			$form->set_id(0);
 			return false;
 		}
 
@@ -120,10 +120,10 @@ 
 			)
 		);
 
-		$this->read_object_data( $form, $form_object );
+		$this->read_object_data($form, $form_object);
 		$form->read_meta_data();
-		$form->set_object_read( true );
-		do_action( 'getpaid_read_payment_form', $form );
+		$form->set_object_read(true);
+		do_action('getpaid_read_payment_form', $form);
 
 	}
 
@@ -132,27 +132,27 @@ 
 	 *
 	 * @param GetPaid_Payment_Form $form Form object.
 	 */
-	public function update( &$form ) {
+	public function update(&$form) {
 		$form->save_meta_data();
-		$form->set_version( WPINV_VERSION );
+		$form->set_version(WPINV_VERSION);
 
-		if ( null === $form->get_date_created( 'edit' ) ) {
-			$form->set_date_created( current_time( 'mysql' ) );
+		if (null === $form->get_date_created('edit')) {
+			$form->set_date_created(current_time('mysql'));
 		}
 
 		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $form->get_id() );
+		$previous_status = get_post_status($form->get_id());
 
 		$changes = $form->get_changes();
 
 		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author' ), array_keys( $changes ) ) ) {
+		if (array_intersect(array('date_created', 'date_modified', 'status', 'name', 'author'), array_keys($changes))) {
 			$post_data = array(
-				'post_date'     => $form->get_date_created( 'edit' ),
-				'post_status'   => $form->get_status( 'edit' ),
-				'post_title'    => $form->get_name( 'edit' ),
-				'post_author'   => $form->get_author( 'edit' ),
-				'post_modified' => $form->get_date_modified( 'edit' ),
+				'post_date'     => $form->get_date_created('edit'),
+				'post_status'   => $form->get_status('edit'),
+				'post_title'    => $form->get_name('edit'),
+				'post_author'   => $form->get_author('edit'),
+				'post_modified' => $form->get_date_modified('edit'),
 			);
 
 			/**
@@ -163,25 +163,25 @@ 
 			 * This ensures hooks are fired by either WP itself (admin screen save),
 			 * or an update purely from CRUD.
 			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $form->get_id() ) );
-				clean_post_cache( $form->get_id() );
+			if (doing_action('save_post')) {
+				$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, $post_data, array('ID' => $form->get_id()));
+				clean_post_cache($form->get_id());
 			} else {
-				wp_update_post( array_merge( array( 'ID' => $form->get_id() ), $post_data ) );
+				wp_update_post(array_merge(array('ID' => $form->get_id()), $post_data));
 			}
-			$form->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+			$form->read_meta_data(true); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
 		}
-		$this->update_post_meta( $form );
+		$this->update_post_meta($form);
 		$form->apply_changes();
-		$this->clear_caches( $form );
+		$this->clear_caches($form);
 
 		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $form->get_status( 'edit' );
+		$new_status = $form->get_status('edit');
 
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_payment_form', $form );
+		if ($new_status !== $previous_status && in_array($previous_status, array('new', 'auto-draft', 'draft'), true)) {
+			do_action('getpaid_new_payment_form', $form);
 		} else {
-			do_action( 'getpaid_update_payment_form', $form );
+			do_action('getpaid_update_payment_form', $form);
 		}
 
 	}

includes/data-stores/class-getpaid-data.php

Indentation +857 added lines, -857 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,356 +21,356 @@ 
  */
 abstract class GetPaid_Data {
 
-	/**
-	 * ID for this object.
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	protected $id = 0;
-
-	/**
-	 * Core data for this object. Name value pairs (name + default value).
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Core data changes for this object.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $changes = array();
-
-	/**
-	 * This is false until the object is read from the DB.
-	 *
-	 * @since 1.0.19
-	 * @var bool
-	 */
-	protected $object_read = false;
-
-	/**
-	 * This is the name of this object type.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $object_type = 'data';
-
-	/**
-	 * Extra data for this object. Name value pairs (name + default value).
-	 * Used as a standard way for sub classes (like item types) to add
-	 * additional information to an inherited class.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $extra_data = array();
-
-	/**
-	 * Set to _data on construct so we can track and reset data if needed.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $default_data = array();
-
-	/**
-	 * Contains a reference to the data store for this class.
-	 *
-	 * @since 1.0.19
-	 * @var GetPaid_Data_Store
-	 */
-	protected $data_store;
-
-	/**
-	 * Stores meta in cache for future reads.
-	 * A group must be set to to enable caching.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	protected $cache_group = '';
-
-	/**
-	 * Stores the last error.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $last_error = '';
-
-	/**
-	 * Stores additional meta data.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $meta_data = null;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
-	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
-		$this->default_data = $this->data;
-	}
-
-	/**
-	 * Only store the object ID to avoid serializing the data object instance.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
-		return array( 'id' );
-	}
-
-	/**
-	 * Re-run the constructor with the object ID.
-	 *
-	 * If the object no longer exists, remove the ID.
-	 */
-	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
-
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
-		}
-
-	}
-
-	/**
-	 * When the object is cloned, make sure meta is duplicated correctly.
-	 *
-	 * @since 1.0.19
-	 */
-	public function __clone() {
-		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the data store.
-	 *
-	 * @since  1.0.19
-	 * @return object
-	 */
-	public function get_data_store() {
-		return $this->data_store;
-	}
-
-	/**
-	 * Get the object type.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	public function get_object_type() {
-		return $this->object_type;
-	}
-
-	/**
-	 * Returns the unique ID for this object.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function get_id() {
-		return $this->id;
-	}
-
-	/**
-	 * Get form status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
-    }
-
-	/**
-	 * Delete an object, set the ID to 0, and return result.
-	 *
-	 * @since  1.0.19
-	 * @param  bool $force_delete Should the data be deleted permanently.
-	 * @return bool result
-	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->exists() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Save should create or update based on object existence.
-	 *
-	 * @since  1.0.19
-	 * @return int
-	 */
-	public function save() {
-		if ( ! $this->data_store ) {
-			return $this->get_id();
-		}
-
-		/**
-		 * Trigger action before saving to the DB. Allows you to adjust object props before save.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
-		} else {
-			$this->data_store->create( $this );
-		}
-
-		/**
-		 * Trigger action after saving to the DB.
-		 *
-		 * @param GetPaid_Data          $this The object being saved.
-		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
-		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
-
-		return $this->get_id();
-	}
-
-	/**
-	 * Change data to JSON format.
-	 *
-	 * @since  1.0.19
-	 * @return string Data in JSON format.
-	 */
-	public function __toString() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Returns all data for this object.
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
-	}
-
-	/**
-	 * Returns array of expected data keys for this object.
-	 *
-	 * @since   1.0.19
-	 * @return array
-	 */
-	public function get_data_keys() {
-		return array_keys( $this->data );
-	}
-
-	/**
-	 * Returns all "extra" data keys for an object (for sub objects like item types).
-	 *
-	 * @since  1.0.19
-	 * @return array
-	 */
-	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
-	}
-
-	/**
-	 * Filter null meta values from array.
-	 *
-	 * @since  1.0.19
-	 * @param mixed $meta Meta value to check.
-	 * @return bool
-	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
-	}
-
-	/**
-	 * Get All Meta Data.
-	 *
-	 * @since 1.0.19
-	 * @return array of objects.
-	 */
-	public function get_meta_data() {
-		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
-	}
-
-	/**
-	 * Check if the key is an internal one.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Key to check.
-	 * @return bool   true if it's an internal key, false otherwise
-	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
-
-		if ( ! $internal_meta_key ) {
-			return false;
-		}
-
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
-
-		if ( ! $has_setter_or_getter ) {
-			return false;
-		}
-
-		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-
-		return true;
-	}
-
-	/**
-	 * Magic method for setting data fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.19
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
-
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
-		}
-
-		if ( method_exists( $this, "set_$key" ) ) {
-
-			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->set_prop( $key, $value );
-		}
-
-	}
-
-	/**
+    /**
+     * ID for this object.
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    protected $id = 0;
+
+    /**
+     * Core data for this object. Name value pairs (name + default value).
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Core data changes for this object.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $changes = array();
+
+    /**
+     * This is false until the object is read from the DB.
+     *
+     * @since 1.0.19
+     * @var bool
+     */
+    protected $object_read = false;
+
+    /**
+     * This is the name of this object type.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $object_type = 'data';
+
+    /**
+     * Extra data for this object. Name value pairs (name + default value).
+     * Used as a standard way for sub classes (like item types) to add
+     * additional information to an inherited class.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $extra_data = array();
+
+    /**
+     * Set to _data on construct so we can track and reset data if needed.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $default_data = array();
+
+    /**
+     * Contains a reference to the data store for this class.
+     *
+     * @since 1.0.19
+     * @var GetPaid_Data_Store
+     */
+    protected $data_store;
+
+    /**
+     * Stores meta in cache for future reads.
+     * A group must be set to to enable caching.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    protected $cache_group = '';
+
+    /**
+     * Stores the last error.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $last_error = '';
+
+    /**
+     * Stores additional meta data.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $meta_data = null;
+
+    /**
+     * Default constructor.
+     *
+     * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
+     */
+    public function __construct( $read = 0 ) {
+        $this->data         = array_merge( $this->data, $this->extra_data );
+        $this->default_data = $this->data;
+    }
+
+    /**
+     * Only store the object ID to avoid serializing the data object instance.
+     *
+     * @return array
+     */
+    public function __sleep() {
+        return array( 'id' );
+    }
+
+    /**
+     * Re-run the constructor with the object ID.
+     *
+     * If the object no longer exists, remove the ID.
+     */
+    public function __wakeup() {
+        $this->__construct( absint( $this->id ) );
+
+        if ( ! empty( $this->last_error ) ) {
+            $this->set_id( 0 );
+        }
+
+    }
+
+    /**
+     * When the object is cloned, make sure meta is duplicated correctly.
+     *
+     * @since 1.0.19
+     */
+    public function __clone() {
+        $this->maybe_read_meta_data();
+        if ( ! empty( $this->meta_data ) ) {
+            foreach ( $this->meta_data as $array_key => $meta ) {
+                $this->meta_data[ $array_key ] = clone $meta;
+                if ( ! empty( $meta->id ) ) {
+                    $this->meta_data[ $array_key ]->id = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the data store.
+     *
+     * @since  1.0.19
+     * @return object
+     */
+    public function get_data_store() {
+        return $this->data_store;
+    }
+
+    /**
+     * Get the object type.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    public function get_object_type() {
+        return $this->object_type;
+    }
+
+    /**
+     * Returns the unique ID for this object.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function get_id() {
+        return $this->id;
+    }
+
+    /**
+     * Get form status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
+    }
+
+    /**
+     * Delete an object, set the ID to 0, and return result.
+     *
+     * @since  1.0.19
+     * @param  bool $force_delete Should the data be deleted permanently.
+     * @return bool result
+     */
+    public function delete( $force_delete = false ) {
+        if ( $this->data_store && $this->exists() ) {
+            $this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
+            $this->set_id( 0 );
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Save should create or update based on object existence.
+     *
+     * @since  1.0.19
+     * @return int
+     */
+    public function save() {
+        if ( ! $this->data_store ) {
+            return $this->get_id();
+        }
+
+        /**
+         * Trigger action before saving to the DB. Allows you to adjust object props before save.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        if ( $this->get_id() ) {
+            $this->data_store->update( $this );
+        } else {
+            $this->data_store->create( $this );
+        }
+
+        /**
+         * Trigger action after saving to the DB.
+         *
+         * @param GetPaid_Data          $this The object being saved.
+         * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
+         */
+        do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Change data to JSON format.
+     *
+     * @since  1.0.19
+     * @return string Data in JSON format.
+     */
+    public function __toString() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Returns all data for this object.
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+    }
+
+    /**
+     * Returns array of expected data keys for this object.
+     *
+     * @since   1.0.19
+     * @return array
+     */
+    public function get_data_keys() {
+        return array_keys( $this->data );
+    }
+
+    /**
+     * Returns all "extra" data keys for an object (for sub objects like item types).
+     *
+     * @since  1.0.19
+     * @return array
+     */
+    public function get_extra_data_keys() {
+        return array_keys( $this->extra_data );
+    }
+
+    /**
+     * Filter null meta values from array.
+     *
+     * @since  1.0.19
+     * @param mixed $meta Meta value to check.
+     * @return bool
+     */
+    protected function filter_null_meta( $meta ) {
+        return ! is_null( $meta->value );
+    }
+
+    /**
+     * Get All Meta Data.
+     *
+     * @since 1.0.19
+     * @return array of objects.
+     */
+    public function get_meta_data() {
+        $this->maybe_read_meta_data();
+        return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+    }
+
+    /**
+     * Check if the key is an internal one.
+     *
+     * @since  1.0.19
+     * @param  string $key Key to check.
+     * @return bool   true if it's an internal key, false otherwise
+     */
+    protected function is_internal_meta_key( $key ) {
+        $internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+
+        if ( ! $internal_meta_key ) {
+            return false;
+        }
+
+        $has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+
+        if ( ! $has_setter_or_getter ) {
+            return false;
+        }
+
+        /* translators: %s: $key Key to check */
+        getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+
+        return true;
+    }
+
+    /**
+     * Magic method for setting data fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.19
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
+
+        if ( 'id' == strtolower( $key ) ) {
+            return $this->set_id( $value );
+        }
+
+        if ( method_exists( $this, "set_$key" ) ) {
+
+            /* translators: %s: $key Key to set */
+            getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->set_prop( $key, $value );
+        }
+
+    }
+
+    /**
      * Margic method for retrieving a property.
      */
     public function __get( $key ) {
@@ -378,10 +378,10 @@ 
         // Check if we have a helper method for that.
         if ( method_exists( $this, 'get_' . $key ) ) {
 
-			if ( 'post_type' != $key ) {
-				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
-			}
+            if ( 'post_type' != $key ) {
+                /* translators: %s: $key Key to set */
+                getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+            }
 
             return call_user_func( array( $this, 'get_' . $key ) );
         }
@@ -391,513 +391,513 @@ 
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
-
-    }
-
-	/**
-	 * Get Meta Data by Key.
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @param  bool   $single return first found meta with key, or all with $key.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
-
-		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'get_' . $_key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}();
-			}
-		}
-
-		// Read the meta data if not yet read.
-		$this->maybe_read_meta_data();
-		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
-		$value      = $single ? '' : array();
-
-		if ( ! empty( $array_keys ) ) {
-			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
-			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
-			}
-		}
-
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
-		}
-
-		return $value;
-	}
-
-	/**
-	 * See if meta data exists, since get_meta always returns a '' or array().
-	 *
-	 * @since  1.0.19
-	 * @param  string $key Meta Key.
-	 * @return boolean
-	 */
-	public function meta_exists( $key = '' ) {
-		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
-	}
-
-	/**
-	 * Set all meta data from array.
-	 *
-	 * @since 1.0.19
-	 * @param array $data Key/Value pairs.
-	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
-			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
-				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
-					$this->meta_data[] = new GetPaid_Meta_Data(
-						array(
-							'id'    => $meta['id'],
-							'key'   => $meta['key'],
-							'value' => $meta['value'],
-						)
-					);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add meta data.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string       $key Meta key.
-	 * @param string|array $value Meta value.
-	 * @param bool         $unique Should this be a unique key?.
-	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
-		}
-		$this->meta_data[] = new GetPaid_Meta_Data(
-			array(
-				'key'   => $key,
-				'value' => $value,
-			)
-		);
-
-		$this->save();
-	}
-
-	/**
-	 * Update meta data by key or ID, if provided.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param  string       $key Meta key.
-	 * @param  string|array $value Meta value.
-	 * @param  int          $meta_id Meta ID.
-	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
-			$function = 'set_' . $key;
-
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
-			}
-		}
-
-		$this->maybe_read_meta_data();
-
-		$array_key = false;
-
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
-		} else {
-			// Find matches by key.
-			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
-					$matches[] = $meta_data_array_key;
-				}
-			}
-
-			if ( ! empty( $matches ) ) {
-				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
-				}
-				$array_key = current( $matches );
-			}
-		}
-
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
-			$meta->key   = $key;
-			$meta->value = $value;
-		} else {
-			$this->add_meta_data( $key, $value, true );
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param string $key Meta key.
-	 */
-	public function delete_meta_data( $key ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Delete meta data.
-	 *
-	 * @since 1.0.19
-	 * @param int $mid Meta ID.
-	 */
-	public function delete_meta_data_by_mid( $mid ) {
-		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
-
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
-			}
-		}
-	}
-
-	/**
-	 * Read meta data if null.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
-			$this->read_meta_data();
-		}
-	}
-
-	/**
-	 * Read Meta Data from the database. Ignore any internal properties.
-	 * Uses it's own caches because get_metadata does not provide meta_ids.
-	 *
-	 * @since 1.0.19
-	 * @param bool $force_read True to force a new DB read (and update cache).
-	 */
-	public function read_meta_data( $force_read = false ) {
-
-		// Reset meta data.
-		$this->meta_data = array();
-
-		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
-			return;
-		}
-
-		// Only read from cache if the cache key is set.
-		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
-		}
-
-		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
-
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
-			}
+        return $this->get_prop( $key );
+
+    }
+
+    /**
+     * Get Meta Data by Key.
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @param  bool   $single return first found meta with key, or all with $key.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    public function get_meta( $key = '', $single = true, $context = 'view' ) {
+
+        // Check if this is an internal meta key.
+        $_key = str_replace( '_wpinv', '', $key );
+        $_key = str_replace( 'wpinv', '', $_key );
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'get_' . $_key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}();
+            }
+        }
+
+        // Read the meta data if not yet read.
+        $this->maybe_read_meta_data();
+        $meta_data  = $this->get_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+        $value      = $single ? '' : array();
+
+        if ( ! empty( $array_keys ) ) {
+            // We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
+            if ( $single ) {
+                $value = $meta_data[ current( $array_keys ) ]->value;
+            } else {
+                $value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+            }
+        }
+
+        if ( 'view' === $context ) {
+            $value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+        }
+
+        return $value;
+    }
+
+    /**
+     * See if meta data exists, since get_meta always returns a '' or array().
+     *
+     * @since  1.0.19
+     * @param  string $key Meta Key.
+     * @return boolean
+     */
+    public function meta_exists( $key = '' ) {
+        $this->maybe_read_meta_data();
+        $array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
+        return in_array( $key, $array_keys, true );
+    }
+
+    /**
+     * Set all meta data from array.
+     *
+     * @since 1.0.19
+     * @param array $data Key/Value pairs.
+     */
+    public function set_meta_data( $data ) {
+        if ( ! empty( $data ) && is_array( $data ) ) {
+            $this->maybe_read_meta_data();
+            foreach ( $data as $meta ) {
+                $meta = (array) $meta;
+                if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+                    $this->meta_data[] = new GetPaid_Meta_Data(
+                        array(
+                            'id'    => $meta['id'],
+                            'key'   => $meta['key'],
+                            'value' => $meta['value'],
+                        )
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Add meta data.
+     *
+     * @since 1.0.19
+     *
+     * @param string       $key Meta key.
+     * @param string|array $value Meta value.
+     * @param bool         $unique Should this be a unique key?.
+     */
+    public function add_meta_data( $key, $value, $unique = false ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+        if ( $unique ) {
+            $this->delete_meta_data( $key );
+        }
+        $this->meta_data[] = new GetPaid_Meta_Data(
+            array(
+                'key'   => $key,
+                'value' => $value,
+            )
+        );
+
+        $this->save();
+    }
+
+    /**
+     * Update meta data by key or ID, if provided.
+     *
+     * @since  1.0.19
+     *
+     * @param  string       $key Meta key.
+     * @param  string|array $value Meta value.
+     * @param  int          $meta_id Meta ID.
+     */
+    public function update_meta_data( $key, $value, $meta_id = 0 ) {
+        if ( $this->is_internal_meta_key( $key ) ) {
+            $function = 'set_' . $key;
+
+            if ( is_callable( array( $this, $function ) ) ) {
+                return $this->{$function}( $value );
+            }
+        }
+
+        $this->maybe_read_meta_data();
+
+        $array_key = false;
+
+        if ( $meta_id ) {
+            $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
+            $array_key  = $array_keys ? current( $array_keys ) : false;
+        } else {
+            // Find matches by key.
+            $matches = array();
+            foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
+                if ( $meta->key === $key ) {
+                    $matches[] = $meta_data_array_key;
+                }
+            }
+
+            if ( ! empty( $matches ) ) {
+                // Set matches to null so only one key gets the new value.
+                foreach ( $matches as $meta_data_array_key ) {
+                    $this->meta_data[ $meta_data_array_key ]->value = null;
+                }
+                $array_key = current( $matches );
+            }
+        }
+
+        if ( false !== $array_key ) {
+            $meta        = $this->meta_data[ $array_key ];
+            $meta->key   = $key;
+            $meta->value = $value;
+        } else {
+            $this->add_meta_data( $key, $value, true );
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param string $key Meta key.
+     */
+    public function delete_meta_data( $key ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Delete meta data.
+     *
+     * @since 1.0.19
+     * @param int $mid Meta ID.
+     */
+    public function delete_meta_data_by_mid( $mid ) {
+        $this->maybe_read_meta_data();
+        $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+
+        if ( $array_keys ) {
+            foreach ( $array_keys as $array_key ) {
+                $this->meta_data[ $array_key ]->value = null;
+            }
+        }
+    }
+
+    /**
+     * Read meta data if null.
+     *
+     * @since 1.0.19
+     */
+    protected function maybe_read_meta_data() {
+        if ( is_null( $this->meta_data ) ) {
+            $this->read_meta_data();
+        }
+    }
+
+    /**
+     * Read Meta Data from the database. Ignore any internal properties.
+     * Uses it's own caches because get_metadata does not provide meta_ids.
+     *
+     * @since 1.0.19
+     * @param bool $force_read True to force a new DB read (and update cache).
+     */
+    public function read_meta_data( $force_read = false ) {
+
+        // Reset meta data.
+        $this->meta_data = array();
+
+        // Maybe abort early.
+        if ( ! $this->get_id() || ! $this->data_store ) {
+            return;
+        }
+
+        // Only read from cache if the cache key is set.
+        $cache_key = null;
+        if ( ! $force_read && ! empty( $this->cache_group ) ) {
+            $cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            $raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+        }
+
+        // Should we force read?
+        if ( empty( $raw_meta_data ) ) {
+            $raw_meta_data = $this->data_store->read_meta( $this );
+
+            if ( ! empty( $cache_key ) ) {
+                wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+            }
 }
 
-		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
-
-			foreach ( $raw_meta_data as $meta ) {
-				$this->meta_data[] = new GetPaid_Meta_Data(
-					array(
-						'id'    => (int) $meta->meta_id,
-						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
-					)
-				);
-			}
+        // Set meta data.
+        if ( is_array( $raw_meta_data ) ) {
+
+            foreach ( $raw_meta_data as $meta ) {
+                $this->meta_data[] = new GetPaid_Meta_Data(
+                    array(
+                        'id'    => (int) $meta->meta_id,
+                        'key'   => $meta->meta_key,
+                        'value' => maybe_unserialize( $meta->meta_value ),
+                    )
+                );
+            }
 }
 
-	}
-
-	/**
-	 * Update Meta Data in the database.
-	 *
-	 * @since 1.0.19
-	 */
-	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
-			return;
-		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
-				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
-				$meta->apply_changes();
-			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
-					$meta->apply_changes();
-				}
-			}
-		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
-		}
-	}
-
-	/**
-	 * Set ID.
-	 *
-	 * @since 1.0.19
-	 * @param int $id ID.
-	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
-	}
-
-	/**
-	 * Sets item status.
-	 *
-	 * @since 1.0.19
-	 * @param string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+    }
+
+    /**
+     * Update Meta Data in the database.
+     *
+     * @since 1.0.19
+     */
+    public function save_meta_data() {
+        if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+            return;
+        }
+        foreach ( $this->meta_data as $array_key => $meta ) {
+            if ( is_null( $meta->value ) ) {
+                if ( ! empty( $meta->id ) ) {
+                    $this->data_store->delete_meta( $this, $meta );
+                    unset( $this->meta_data[ $array_key ] );
+                }
+            } elseif ( empty( $meta->id ) ) {
+                $meta->id = $this->data_store->add_meta( $this, $meta );
+                $meta->apply_changes();
+            } else {
+                if ( $meta->get_changes() ) {
+                    $this->data_store->update_meta( $this, $meta );
+                    $meta->apply_changes();
+                }
+            }
+        }
+        if ( ! empty( $this->cache_group ) ) {
+            $cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
+            wp_cache_delete( $cache_key, $this->cache_group );
+        }
+    }
+
+    /**
+     * Set ID.
+     *
+     * @since 1.0.19
+     * @param int $id ID.
+     */
+    public function set_id( $id ) {
+        $this->id = absint( $id );
+    }
+
+    /**
+     * Sets item status.
+     *
+     * @since 1.0.19
+     * @param string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
-
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
-    }
-
-	/**
-	 * Set all props to default values.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_defaults() {
-		$this->data    = $this->default_data;
-		$this->changes = array();
-		$this->set_object_read( false );
-	}
-
-	/**
-	 * Set object read property.
-	 *
-	 * @since 1.0.19
-	 * @param boolean $read Should read?.
-	 */
-	public function set_object_read( $read = true ) {
-		$this->object_read = (bool) $read;
-	}
-
-	/**
-	 * Get object read property.
-	 *
-	 * @since  1.0.19
-	 * @return boolean
-	 */
-	public function get_object_read() {
-		return (bool) $this->object_read;
-	}
-
-	/**
-	 * Set a collection of props in one go, collect any errors, and return the result.
-	 * Only sets using public methods.
-	 *
-	 * @since  1.0.19
-	 *
-	 * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
-	 * @param string $context In what context to run this.
-	 *
-	 * @return bool|WP_Error
-	 */
-	public function set_props( $props, $context = 'set' ) {
-		$errors = false;
-
-		$props = wp_unslash( $props );
-		foreach ( $props as $prop => $value ) {
-			try {
-				/**
-				 * Checks if the prop being set is allowed, and the value is not null.
-				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
-					continue;
-				}
-				$setter = "set_$prop";
-
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
-				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
-					$errors = new WP_Error();
-				}
-				$errors->add( $e->getCode(), $e->getMessage() );
-				$this->last_error = $e->getMessage();
-			}
-		}
-
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
-	}
-
-	/**
-	 * Sets a prop for a setter method.
-	 *
-	 * This stores changes in a special array so we can track what needs saving
-	 * the the DB later.
-	 *
-	 * @since 1.0.19
-	 * @param string $prop Name of prop to set.
-	 * @param mixed  $value Value of the prop.
-	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
-				}
-			} else {
-				$this->data[ $prop ] = $value;
-			}
-		}
-	}
-
-	/**
-	 * Return data changes only.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_changes() {
-		return $this->changes;
-	}
-
-	/**
-	 * Merge changes with data and clear.
-	 *
-	 * @since 1.0.19
-	 */
-	public function apply_changes() {
-		$this->data    = array_replace( $this->data, $this->changes );
-		$this->changes = array();
-	}
-
-	/**
-	 * Prefix for action and filter hooks on data.
-	 *
-	 * @since  1.0.19
-	 * @return string
-	 */
-	protected function get_hook_prefix() {
-		return 'wpinv_get_' . $this->object_type . '_';
-	}
-
-	/**
-	 * Gets a prop for a getter method.
-	 *
-	 * Gets the value from either current pending changes, or the data itself.
-	 * Context controls what happens to the value before it's returned.
-	 *
-	 * @since  1.0.19
-	 * @param  string $prop Name of prop to get.
-	 * @param  string $context What the value is for. Valid values are view and edit.
-	 * @return mixed
-	 */
-	protected function get_prop( $prop, $context = 'view' ) {
-		$value = null;
-
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
-
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Sets a date prop whilst handling formatting and datetime objects.
-	 *
-	 * @since 1.0.19
-	 * @param string         $prop Name of prop to set.
-	 * @param string|integer $value Value of the prop.
-	 */
-	protected function set_date_prop( $prop, $value ) {
-
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
-			return;
-		}
-		$this->set_prop( $prop, $value );
-
-	}
-
-	/**
-	 * When invalid data is found, throw an exception unless reading from the DB.
-	 *
-	 * @since 1.0.19
-	 * @param string $code             Error code.
-	 * @param string $message          Error message.
-	 */
-	protected function error( $code, $message ) {
-		$this->last_error = $message;
-	}
-
-	/**
-	 * Checks if the object is saved in the database
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function exists() {
-		$id = $this->get_id();
-		return ! empty( $id );
-	}
+        $this->set_prop( 'status', $status );
+
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
+    }
+
+    /**
+     * Set all props to default values.
+     *
+     * @since 1.0.19
+     */
+    public function set_defaults() {
+        $this->data    = $this->default_data;
+        $this->changes = array();
+        $this->set_object_read( false );
+    }
+
+    /**
+     * Set object read property.
+     *
+     * @since 1.0.19
+     * @param boolean $read Should read?.
+     */
+    public function set_object_read( $read = true ) {
+        $this->object_read = (bool) $read;
+    }
+
+    /**
+     * Get object read property.
+     *
+     * @since  1.0.19
+     * @return boolean
+     */
+    public function get_object_read() {
+        return (bool) $this->object_read;
+    }
+
+    /**
+     * Set a collection of props in one go, collect any errors, and return the result.
+     * Only sets using public methods.
+     *
+     * @since  1.0.19
+     *
+     * @param array  $props Key value pairs to set. Key is the prop and should map to a setter function name.
+     * @param string $context In what context to run this.
+     *
+     * @return bool|WP_Error
+     */
+    public function set_props( $props, $context = 'set' ) {
+        $errors = false;
+
+        $props = wp_unslash( $props );
+        foreach ( $props as $prop => $value ) {
+            try {
+                /**
+                 * Checks if the prop being set is allowed, and the value is not null.
+                 */
+                if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+                    continue;
+                }
+                $setter = "set_$prop";
+
+                if ( is_callable( array( $this, $setter ) ) ) {
+                    $this->{$setter}( $value );
+                }
+            } catch ( Exception $e ) {
+                if ( ! $errors ) {
+                    $errors = new WP_Error();
+                }
+                $errors->add( $e->getCode(), $e->getMessage() );
+                $this->last_error = $e->getMessage();
+            }
+        }
+
+        return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+    }
+
+    /**
+     * Sets a prop for a setter method.
+     *
+     * This stores changes in a special array so we can track what needs saving
+     * the the DB later.
+     *
+     * @since 1.0.19
+     * @param string $prop Name of prop to set.
+     * @param mixed  $value Value of the prop.
+     */
+    protected function set_prop( $prop, $value ) {
+        if ( array_key_exists( $prop, $this->data ) ) {
+            if ( true === $this->object_read ) {
+                if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
+                    $this->changes[ $prop ] = $value;
+                }
+            } else {
+                $this->data[ $prop ] = $value;
+            }
+        }
+    }
+
+    /**
+     * Return data changes only.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_changes() {
+        return $this->changes;
+    }
+
+    /**
+     * Merge changes with data and clear.
+     *
+     * @since 1.0.19
+     */
+    public function apply_changes() {
+        $this->data    = array_replace( $this->data, $this->changes );
+        $this->changes = array();
+    }
+
+    /**
+     * Prefix for action and filter hooks on data.
+     *
+     * @since  1.0.19
+     * @return string
+     */
+    protected function get_hook_prefix() {
+        return 'wpinv_get_' . $this->object_type . '_';
+    }
+
+    /**
+     * Gets a prop for a getter method.
+     *
+     * Gets the value from either current pending changes, or the data itself.
+     * Context controls what happens to the value before it's returned.
+     *
+     * @since  1.0.19
+     * @param  string $prop Name of prop to get.
+     * @param  string $context What the value is for. Valid values are view and edit.
+     * @return mixed
+     */
+    protected function get_prop( $prop, $context = 'view' ) {
+        $value = null;
+
+        if ( array_key_exists( $prop, $this->data ) ) {
+            $value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+
+            if ( 'view' === $context ) {
+                $value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Sets a date prop whilst handling formatting and datetime objects.
+     *
+     * @since 1.0.19
+     * @param string         $prop Name of prop to set.
+     * @param string|integer $value Value of the prop.
+     */
+    protected function set_date_prop( $prop, $value ) {
+
+        if ( empty( $value ) ) {
+            $this->set_prop( $prop, null );
+            return;
+        }
+        $this->set_prop( $prop, $value );
+
+    }
+
+    /**
+     * When invalid data is found, throw an exception unless reading from the DB.
+     *
+     * @since 1.0.19
+     * @param string $code             Error code.
+     * @param string $message          Error message.
+     */
+    protected function error( $code, $message ) {
+        $this->last_error = $message;
+    }
+
+    /**
+     * Checks if the object is saved in the database
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function exists() {
+        $id = $this->get_id();
+        return ! empty( $id );
+    }
 
 }

Spacing +162 added lines, -162 removed lines

@@ -8,7 +8,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -117,8 +117,8 @@ 
 	 *
 	 * @param int|object|array|string $read ID to load from the DB (optional) or already queried data.
 	 */
-	public function __construct( $read = 0 ) {
-		$this->data         = array_merge( $this->data, $this->extra_data );
+	public function __construct($read = 0) {
+		$this->data         = array_merge($this->data, $this->extra_data);
 		$this->default_data = $this->data;
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @return array
 	 */
 	public function __sleep() {
-		return array( 'id' );
+		return array('id');
 	}
 
 	/**
@@ -137,10 +137,10 @@ 
 	 * If the object no longer exists, remove the ID.
 	 */
 	public function __wakeup() {
-		$this->__construct( absint( $this->id ) );
+		$this->__construct(absint($this->id));
 
-		if ( ! empty( $this->last_error ) ) {
-			$this->set_id( 0 );
+		if (!empty($this->last_error)) {
+			$this->set_id(0);
 		}
 
 	}
@@ -152,11 +152,11 @@ 
 	 */
 	public function __clone() {
 		$this->maybe_read_meta_data();
-		if ( ! empty( $this->meta_data ) ) {
-			foreach ( $this->meta_data as $array_key => $meta ) {
-				$this->meta_data[ $array_key ] = clone $meta;
-				if ( ! empty( $meta->id ) ) {
-					$this->meta_data[ $array_key ]->id = null;
+		if (!empty($this->meta_data)) {
+			foreach ($this->meta_data as $array_key => $meta) {
+				$this->meta_data[$array_key] = clone $meta;
+				if (!empty($meta->id)) {
+					$this->meta_data[$array_key]->id = null;
 				}
 			}
 		}
@@ -199,8 +199,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+	public function get_status($context = 'view') {
+		return $this->get_prop('status', $context);
     }
 
 	/**
@@ -210,10 +210,10 @@ 
 	 * @param  bool $force_delete Should the data be deleted permanently.
 	 * @return bool result
 	 */
-	public function delete( $force_delete = false ) {
-		if ( $this->data_store && $this->exists() ) {
-			$this->data_store->delete( $this, array( 'force_delete' => $force_delete ) );
-			$this->set_id( 0 );
+	public function delete($force_delete = false) {
+		if ($this->data_store && $this->exists()) {
+			$this->data_store->delete($this, array('force_delete' => $force_delete));
+			$this->set_id(0);
 			return true;
 		}
 		return false;
@@ -226,7 +226,7 @@ 
 	 * @return int
 	 */
 	public function save() {
-		if ( ! $this->data_store ) {
+		if (!$this->data_store) {
 			return $this->get_id();
 		}
 
@@ -236,12 +236,12 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_before_' . $this->object_type . '_object_save', $this, $this->data_store);
 
-		if ( $this->get_id() ) {
-			$this->data_store->update( $this );
+		if ($this->get_id()) {
+			$this->data_store->update($this);
 		} else {
-			$this->data_store->create( $this );
+			$this->data_store->create($this);
 		}
 
 		/**
@@ -250,7 +250,7 @@ 
 		 * @param GetPaid_Data          $this The object being saved.
 		 * @param GetPaid_Data_Store_WP $data_store The data store persisting the data.
 		 */
-		do_action( 'getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store );
+		do_action('getpaid_after_' . $this->object_type . '_object_save', $this, $this->data_store);
 
 		return $this->get_id();
 	}
@@ -262,7 +262,7 @@ 
 	 * @return string Data in JSON format.
 	 */
 	public function __toString() {
-		return wp_json_encode( $this->get_data() );
+		return wp_json_encode($this->get_data());
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 * @return array
 	 */
 	public function get_data() {
-		return array_merge( array( 'id' => $this->get_id() ), $this->data, array( 'meta_data' => $this->get_meta_data() ) );
+		return array_merge(array('id' => $this->get_id()), $this->data, array('meta_data' => $this->get_meta_data()));
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 	 * @return array
 	 */
 	public function get_data_keys() {
-		return array_keys( $this->data );
+		return array_keys($this->data);
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	 * @return array
 	 */
 	public function get_extra_data_keys() {
-		return array_keys( $this->extra_data );
+		return array_keys($this->extra_data);
 	}
 
 	/**
@@ -302,8 +302,8 @@ 
 	 * @param mixed $meta Meta value to check.
 	 * @return bool
 	 */
-	protected function filter_null_meta( $meta ) {
-		return ! is_null( $meta->value );
+	protected function filter_null_meta($meta) {
+		return !is_null($meta->value);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	public function get_meta_data() {
 		$this->maybe_read_meta_data();
-		return array_values( array_filter( $this->meta_data, array( $this, 'filter_null_meta' ) ) );
+		return array_values(array_filter($this->meta_data, array($this, 'filter_null_meta')));
 	}
 
 	/**
@@ -324,21 +324,21 @@ 
 	 * @param  string $key Key to check.
 	 * @return bool   true if it's an internal key, false otherwise
 	 */
-	protected function is_internal_meta_key( $key ) {
-		$internal_meta_key = ! empty( $key ) && $this->data_store && in_array( $key, $this->data_store->get_internal_meta_keys(), true );
+	protected function is_internal_meta_key($key) {
+		$internal_meta_key = !empty($key) && $this->data_store && in_array($key, $this->data_store->get_internal_meta_keys(), true);
 
-		if ( ! $internal_meta_key ) {
+		if (!$internal_meta_key) {
 			return false;
 		}
 
-		$has_setter_or_getter = is_callable( array( $this, 'set_' . $key ) ) || is_callable( array( $this, 'get_' . $key ) );
+		$has_setter_or_getter = is_callable(array($this, 'set_' . $key)) || is_callable(array($this, 'get_' . $key));
 
-		if ( ! $has_setter_or_getter ) {
+		if (!$has_setter_or_getter) {
 			return false;
 		}
 
 		/* translators: %s: $key Key to check */
-		getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+		getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Generic add/update/get meta methods should not be used for internal meta data, including "%s". Use getters and setters.', 'invoicing'), $key), '1.0.19');
 
 		return true;
 	}
@@ -352,20 +352,20 @@ 
 	 * @access public
 	 *
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 
-		if ( 'id' == strtolower( $key ) ) {
-			return $this->set_id( $value );
+		if ('id' == strtolower($key)) {
+			return $this->set_id($value);
 		}
 
-		if ( method_exists( $this, "set_$key" ) ) {
+		if (method_exists($this, "set_$key")) {
 
 			/* translators: %s: $key Key to set */
-			getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+			getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing'), $key), '1.0.19');
 
-			call_user_func( array( $this, "set_$key" ), $value );
+			call_user_func(array($this, "set_$key"), $value);
 		} else {
-			$this->set_prop( $key, $value );
+			$this->set_prop($key, $value);
 		}
 
 	}
@@ -373,25 +373,25 @@ 
 	/**
      * Margic method for retrieving a property.
      */
-    public function __get( $key ) {
+    public function __get($key) {
 
         // Check if we have a helper method for that.
-        if ( method_exists( $this, 'get_' . $key ) ) {
+        if (method_exists($this, 'get_' . $key)) {
 
-			if ( 'post_type' != $key ) {
+			if ('post_type' != $key) {
 				/* translators: %s: $key Key to set */
-				getpaid_doing_it_wrong( __FUNCTION__, sprintf( __( 'Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing' ), $key ), '1.0.19' );
+				getpaid_doing_it_wrong(__FUNCTION__, sprintf(__('Object data such as "%s" should not be accessed directly. Use getters and setters.', 'invoicing'), $key), '1.0.19');
 			}
 
-            return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func(array($this, 'get_' . $key));
         }
 
         // Check if the key is in the associated $post object.
-        if ( ! empty( $this->post ) && isset( $this->post->$key ) ) {
+        if (!empty($this->post) && isset($this->post->$key)) {
             return $this->post->$key;
         }
 
-		return $this->get_prop( $key );
+		return $this->get_prop($key);
 
     }
 
@@ -404,15 +404,15 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	public function get_meta( $key = '', $single = true, $context = 'view' ) {
+	public function get_meta($key = '', $single = true, $context = 'view') {
 
 		// Check if this is an internal meta key.
-		$_key = str_replace( '_wpinv', '', $key );
-		$_key = str_replace( 'wpinv', '', $_key );
-		if ( $this->is_internal_meta_key( $key ) ) {
+		$_key = str_replace('_wpinv', '', $key);
+		$_key = str_replace('wpinv', '', $_key);
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'get_' . $_key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
+			if (is_callable(array($this, $function))) {
 				return $this->{$function}();
 			}
 		}
@@ -420,20 +420,20 @@ 
 		// Read the meta data if not yet read.
 		$this->maybe_read_meta_data();
 		$meta_data  = $this->get_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($meta_data, 'key'), $key, true);
 		$value      = $single ? '' : array();
 
-		if ( ! empty( $array_keys ) ) {
+		if (!empty($array_keys)) {
 			// We don't use the $this->meta_data property directly here because we don't want meta with a null value (i.e. meta which has been deleted via $this->delete_meta_data()).
-			if ( $single ) {
-				$value = $meta_data[ current( $array_keys ) ]->value;
+			if ($single) {
+				$value = $meta_data[current($array_keys)]->value;
 			} else {
-				$value = array_intersect_key( $meta_data, array_flip( $array_keys ) );
+				$value = array_intersect_key($meta_data, array_flip($array_keys));
 			}
 		}
 
-		if ( 'view' === $context ) {
-			$value = apply_filters( $this->get_hook_prefix() . $key, $value, $this );
+		if ('view' === $context) {
+			$value = apply_filters($this->get_hook_prefix() . $key, $value, $this);
 		}
 
 		return $value;
@@ -446,10 +446,10 @@ 
 	 * @param  string $key Meta Key.
 	 * @return boolean
 	 */
-	public function meta_exists( $key = '' ) {
+	public function meta_exists($key = '') {
 		$this->maybe_read_meta_data();
-		$array_keys = wp_list_pluck( $this->get_meta_data(), 'key' );
-		return in_array( $key, $array_keys, true );
+		$array_keys = wp_list_pluck($this->get_meta_data(), 'key');
+		return in_array($key, $array_keys, true);
 	}
 
 	/**
@@ -458,12 +458,12 @@ 
 	 * @since 1.0.19
 	 * @param array $data Key/Value pairs.
 	 */
-	public function set_meta_data( $data ) {
-		if ( ! empty( $data ) && is_array( $data ) ) {
+	public function set_meta_data($data) {
+		if (!empty($data) && is_array($data)) {
 			$this->maybe_read_meta_data();
-			foreach ( $data as $meta ) {
+			foreach ($data as $meta) {
 				$meta = (array) $meta;
-				if ( isset( $meta['key'], $meta['value'], $meta['id'] ) ) {
+				if (isset($meta['key'], $meta['value'], $meta['id'])) {
 					$this->meta_data[] = new GetPaid_Meta_Data(
 						array(
 							'id'    => $meta['id'],
@@ -485,18 +485,18 @@ 
 	 * @param string|array $value Meta value.
 	 * @param bool         $unique Should this be a unique key?.
 	 */
-	public function add_meta_data( $key, $value, $unique = false ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function add_meta_data($key, $value, $unique = false) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
 		$this->maybe_read_meta_data();
-		if ( $unique ) {
-			$this->delete_meta_data( $key );
+		if ($unique) {
+			$this->delete_meta_data($key);
 		}
 		$this->meta_data[] = new GetPaid_Meta_Data(
 			array(
@@ -517,12 +517,12 @@ 
 	 * @param  string|array $value Meta value.
 	 * @param  int          $meta_id Meta ID.
 	 */
-	public function update_meta_data( $key, $value, $meta_id = 0 ) {
-		if ( $this->is_internal_meta_key( $key ) ) {
+	public function update_meta_data($key, $value, $meta_id = 0) {
+		if ($this->is_internal_meta_key($key)) {
 			$function = 'set_' . $key;
 
-			if ( is_callable( array( $this, $function ) ) ) {
-				return $this->{$function}( $value );
+			if (is_callable(array($this, $function))) {
+				return $this->{$function}($value);
 			}
 		}
 
@@ -530,33 +530,33 @@ 
 
 		$array_key = false;
 
-		if ( $meta_id ) {
-			$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), $meta_id, true );
-			$array_key  = $array_keys ? current( $array_keys ) : false;
+		if ($meta_id) {
+			$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), $meta_id, true);
+			$array_key  = $array_keys ? current($array_keys) : false;
 		} else {
 			// Find matches by key.
 			$matches = array();
-			foreach ( $this->meta_data as $meta_data_array_key => $meta ) {
-				if ( $meta->key === $key ) {
+			foreach ($this->meta_data as $meta_data_array_key => $meta) {
+				if ($meta->key === $key) {
 					$matches[] = $meta_data_array_key;
 				}
 			}
 
-			if ( ! empty( $matches ) ) {
+			if (!empty($matches)) {
 				// Set matches to null so only one key gets the new value.
-				foreach ( $matches as $meta_data_array_key ) {
-					$this->meta_data[ $meta_data_array_key ]->value = null;
+				foreach ($matches as $meta_data_array_key) {
+					$this->meta_data[$meta_data_array_key]->value = null;
 				}
-				$array_key = current( $matches );
+				$array_key = current($matches);
 			}
 		}
 
-		if ( false !== $array_key ) {
-			$meta        = $this->meta_data[ $array_key ];
+		if (false !== $array_key) {
+			$meta        = $this->meta_data[$array_key];
 			$meta->key   = $key;
 			$meta->value = $value;
 		} else {
-			$this->add_meta_data( $key, $value, true );
+			$this->add_meta_data($key, $value, true);
 		}
 	}
 
@@ -566,13 +566,13 @@ 
 	 * @since 1.0.19
 	 * @param string $key Meta key.
 	 */
-	public function delete_meta_data( $key ) {
+	public function delete_meta_data($key) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'key'), $key, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -583,13 +583,13 @@ 
 	 * @since 1.0.19
 	 * @param int $mid Meta ID.
 	 */
-	public function delete_meta_data_by_mid( $mid ) {
+	public function delete_meta_data_by_mid($mid) {
 		$this->maybe_read_meta_data();
-		$array_keys = array_keys( wp_list_pluck( $this->meta_data, 'id' ), (int) $mid, true );
+		$array_keys = array_keys(wp_list_pluck($this->meta_data, 'id'), (int) $mid, true);
 
-		if ( $array_keys ) {
-			foreach ( $array_keys as $array_key ) {
-				$this->meta_data[ $array_key ]->value = null;
+		if ($array_keys) {
+			foreach ($array_keys as $array_key) {
+				$this->meta_data[$array_key]->value = null;
 			}
 		}
 	}
@@ -600,7 +600,7 @@ 
 	 * @since 1.0.19
 	 */
 	protected function maybe_read_meta_data() {
-		if ( is_null( $this->meta_data ) ) {
+		if (is_null($this->meta_data)) {
 			$this->read_meta_data();
 		}
 	}
@@ -612,41 +612,41 @@ 
 	 * @since 1.0.19
 	 * @param bool $force_read True to force a new DB read (and update cache).
 	 */
-	public function read_meta_data( $force_read = false ) {
+	public function read_meta_data($force_read = false) {
 
 		// Reset meta data.
 		$this->meta_data = array();
 
 		// Maybe abort early.
-		if ( ! $this->get_id() || ! $this->data_store ) {
+		if (!$this->get_id() || !$this->data_store) {
 			return;
 		}
 
 		// Only read from cache if the cache key is set.
 		$cache_key = null;
-		if ( ! $force_read && ! empty( $this->cache_group ) ) {
-			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			$raw_meta_data = wp_cache_get( $cache_key, $this->cache_group );
+		if (!$force_read && !empty($this->cache_group)) {
+			$cache_key     = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			$raw_meta_data = wp_cache_get($cache_key, $this->cache_group);
 		}
 
 		// Should we force read?
-		if ( empty( $raw_meta_data ) ) {
-			$raw_meta_data = $this->data_store->read_meta( $this );
+		if (empty($raw_meta_data)) {
+			$raw_meta_data = $this->data_store->read_meta($this);
 
-			if ( ! empty( $cache_key ) ) {
-				wp_cache_set( $cache_key, $raw_meta_data, $this->cache_group );
+			if (!empty($cache_key)) {
+				wp_cache_set($cache_key, $raw_meta_data, $this->cache_group);
 			}
 }
 
 		// Set meta data.
-		if ( is_array( $raw_meta_data ) ) {
+		if (is_array($raw_meta_data)) {
 
-			foreach ( $raw_meta_data as $meta ) {
+			foreach ($raw_meta_data as $meta) {
 				$this->meta_data[] = new GetPaid_Meta_Data(
 					array(
 						'id'    => (int) $meta->meta_id,
 						'key'   => $meta->meta_key,
-						'value' => maybe_unserialize( $meta->meta_value ),
+						'value' => maybe_unserialize($meta->meta_value),
 					)
 				);
 			}
@@ -660,28 +660,28 @@ 
 	 * @since 1.0.19
 	 */
 	public function save_meta_data() {
-		if ( ! $this->data_store || is_null( $this->meta_data ) ) {
+		if (!$this->data_store || is_null($this->meta_data)) {
 			return;
 		}
-		foreach ( $this->meta_data as $array_key => $meta ) {
-			if ( is_null( $meta->value ) ) {
-				if ( ! empty( $meta->id ) ) {
-					$this->data_store->delete_meta( $this, $meta );
-					unset( $this->meta_data[ $array_key ] );
+		foreach ($this->meta_data as $array_key => $meta) {
+			if (is_null($meta->value)) {
+				if (!empty($meta->id)) {
+					$this->data_store->delete_meta($this, $meta);
+					unset($this->meta_data[$array_key]);
 				}
-			} elseif ( empty( $meta->id ) ) {
-				$meta->id = $this->data_store->add_meta( $this, $meta );
+			} elseif (empty($meta->id)) {
+				$meta->id = $this->data_store->add_meta($this, $meta);
 				$meta->apply_changes();
 			} else {
-				if ( $meta->get_changes() ) {
-					$this->data_store->update_meta( $this, $meta );
+				if ($meta->get_changes()) {
+					$this->data_store->update_meta($this, $meta);
 					$meta->apply_changes();
 				}
 			}
 		}
-		if ( ! empty( $this->cache_group ) ) {
-			$cache_key = GetPaid_Cache_Helper::get_cache_prefix( $this->cache_group ) . GetPaid_Cache_Helper::get_cache_prefix( 'object_' . $this->get_id() ) . 'object_meta_' . $this->get_id();
-			wp_cache_delete( $cache_key, $this->cache_group );
+		if (!empty($this->cache_group)) {
+			$cache_key = GetPaid_Cache_Helper::get_cache_prefix($this->cache_group) . GetPaid_Cache_Helper::get_cache_prefix('object_' . $this->get_id()) . 'object_meta_' . $this->get_id();
+			wp_cache_delete($cache_key, $this->cache_group);
 		}
 	}
 
@@ -691,8 +691,8 @@ 
 	 * @since 1.0.19
 	 * @param int $id ID.
 	 */
-	public function set_id( $id ) {
-		$this->id = absint( $id );
+	public function set_id($id) {
+		$this->id = absint($id);
 	}
 
 	/**
@@ -702,10 +702,10 @@ 
 	 * @param string $status New status.
 	 * @return array details of change.
 	 */
-	public function set_status( $status ) {
+	public function set_status($status) {
         $old_status = $this->get_status();
 
-		$this->set_prop( 'status', $status );
+		$this->set_prop('status', $status);
 
 		return array(
 			'from' => $old_status,
@@ -721,7 +721,7 @@ 
 	public function set_defaults() {
 		$this->data    = $this->default_data;
 		$this->changes = array();
-		$this->set_object_read( false );
+		$this->set_object_read(false);
 	}
 
 	/**
@@ -730,7 +730,7 @@ 
 	 * @since 1.0.19
 	 * @param boolean $read Should read?.
 	 */
-	public function set_object_read( $read = true ) {
+	public function set_object_read($read = true) {
 		$this->object_read = (bool) $read;
 	}
 
@@ -755,33 +755,33 @@ 
 	 *
 	 * @return bool|WP_Error
 	 */
-	public function set_props( $props, $context = 'set' ) {
+	public function set_props($props, $context = 'set') {
 		$errors = false;
 
-		$props = wp_unslash( $props );
-		foreach ( $props as $prop => $value ) {
+		$props = wp_unslash($props);
+		foreach ($props as $prop => $value) {
 			try {
 				/**
 				 * Checks if the prop being set is allowed, and the value is not null.
 				 */
-				if ( is_null( $value ) || in_array( $prop, array( 'prop', 'date_prop', 'meta_data' ), true ) ) {
+				if (is_null($value) || in_array($prop, array('prop', 'date_prop', 'meta_data'), true)) {
 					continue;
 				}
 				$setter = "set_$prop";
 
-				if ( is_callable( array( $this, $setter ) ) ) {
-					$this->{$setter}( $value );
+				if (is_callable(array($this, $setter))) {
+					$this->{$setter}($value);
 				}
-			} catch ( Exception $e ) {
-				if ( ! $errors ) {
+			} catch (Exception $e) {
+				if (!$errors) {
 					$errors = new WP_Error();
 				}
-				$errors->add( $e->getCode(), $e->getMessage() );
+				$errors->add($e->getCode(), $e->getMessage());
 				$this->last_error = $e->getMessage();
 			}
 		}
 
-		return $errors && count( $errors->get_error_codes() ) ? $errors : true;
+		return $errors && count($errors->get_error_codes()) ? $errors : true;
 	}
 
 	/**
@@ -794,14 +794,14 @@ 
 	 * @param string $prop Name of prop to set.
 	 * @param mixed  $value Value of the prop.
 	 */
-	protected function set_prop( $prop, $value ) {
-		if ( array_key_exists( $prop, $this->data ) ) {
-			if ( true === $this->object_read ) {
-				if ( $value !== $this->data[ $prop ] || array_key_exists( $prop, $this->changes ) ) {
-					$this->changes[ $prop ] = $value;
+	protected function set_prop($prop, $value) {
+		if (array_key_exists($prop, $this->data)) {
+			if (true === $this->object_read) {
+				if ($value !== $this->data[$prop] || array_key_exists($prop, $this->changes)) {
+					$this->changes[$prop] = $value;
 				}
 			} else {
-				$this->data[ $prop ] = $value;
+				$this->data[$prop] = $value;
 			}
 		}
 	}
@@ -822,7 +822,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function apply_changes() {
-		$this->data    = array_replace( $this->data, $this->changes );
+		$this->data    = array_replace($this->data, $this->changes);
 		$this->changes = array();
 	}
 
@@ -847,14 +847,14 @@ 
 	 * @param  string $context What the value is for. Valid values are view and edit.
 	 * @return mixed
 	 */
-	protected function get_prop( $prop, $context = 'view' ) {
+	protected function get_prop($prop, $context = 'view') {
 		$value = null;
 
-		if ( array_key_exists( $prop, $this->data ) ) {
-			$value = array_key_exists( $prop, $this->changes ) ? $this->changes[ $prop ] : $this->data[ $prop ];
+		if (array_key_exists($prop, $this->data)) {
+			$value = array_key_exists($prop, $this->changes) ? $this->changes[$prop] : $this->data[$prop];
 
-			if ( 'view' === $context ) {
-				$value = apply_filters( $this->get_hook_prefix() . $prop, $value, $this );
+			if ('view' === $context) {
+				$value = apply_filters($this->get_hook_prefix() . $prop, $value, $this);
 			}
 		}
 
@@ -868,13 +868,13 @@ 
 	 * @param string         $prop Name of prop to set.
 	 * @param string|integer $value Value of the prop.
 	 */
-	protected function set_date_prop( $prop, $value ) {
+	protected function set_date_prop($prop, $value) {
 
-		if ( empty( $value ) ) {
-			$this->set_prop( $prop, null );
+		if (empty($value)) {
+			$this->set_prop($prop, null);
 			return;
 		}
-		$this->set_prop( $prop, $value );
+		$this->set_prop($prop, $value);
 
 	}
 
@@ -885,7 +885,7 @@ 
 	 * @param string $code             Error code.
 	 * @param string $message          Error message.
 	 */
-	protected function error( $code, $message ) {
+	protected function error($code, $message) {
 		$this->last_error = $message;
 	}
 
@@ -897,7 +897,7 @@ 
 	 */
 	public function exists() {
 		$id = $this->get_id();
-		return ! empty( $id );
+		return !empty($id);
 	}
 
 }

includes/data-stores/class-getpaid-subscription-data-store.php

Indentation +182 added lines, -182 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,198 +15,198 @@ 
  */
 class GetPaid_Subscription_Data_Store {
 
-	/**
-	 * A map of database fields to data types.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $database_fields_to_data_type = array(
-		'id'                => '%d',
-		'customer_id'       => '%d',
-		'frequency'         => '%d',
-		'period'            => '%s',
-		'initial_amount'    => '%s',
-		'recurring_amount'  => '%s',
-		'bill_times'        => '%d',
-		'transaction_id'    => '%s',
-		'parent_payment_id' => '%d',
-		'product_id'        => '%d',
-		'created'           => '%s',
-		'expiration'        => '%s',
-		'trial_period'      => '%s',
-		'status'            => '%s',
-		'profile_id'        => '%s',
-	);
-
-	/*
+    /**
+     * A map of database fields to data types.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $database_fields_to_data_type = array(
+        'id'                => '%d',
+        'customer_id'       => '%d',
+        'frequency'         => '%d',
+        'period'            => '%s',
+        'initial_amount'    => '%s',
+        'recurring_amount'  => '%s',
+        'bill_times'        => '%d',
+        'transaction_id'    => '%s',
+        'parent_payment_id' => '%d',
+        'product_id'        => '%d',
+        'created'           => '%s',
+        'expiration'        => '%s',
+        'trial_period'      => '%s',
+        'status'            => '%s',
+        'profile_id'        => '%s',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new subscription in the database.
-	 *
-	 * @param WPInv_Subscription $subscription Subscription object.
-	 */
-	public function create( &$subscription ) {
-		global $wpdb;
-
-		$values  = array();
-		$formats = array();
-
-		$fields = $this->database_fields_to_data_type;
-		unset( $fields['id'] );
-
-		foreach ( $fields as $key => $format ) {
-			$method       = "get_$key";
-			$values[ $key ] = $subscription->$method( 'edit' );
-			$formats[]    = $format;
-		}
-
-		$result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
-
-		if ( $result ) {
-			$subscription->set_id( $wpdb->insert_id );
-			$subscription->apply_changes();
-			$subscription->clear_cache();
-			update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-			do_action( 'getpaid_new_subscription', $subscription );
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read a subscription from the database.
-	 *
-	 * @param WPInv_Subscription $subscription Subscription object.
-	 *
-	 */
-	public function read( &$subscription ) {
-		global $wpdb;
-
-		$subscription->set_defaults();
-
-		if ( ! $subscription->get_id() ) {
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			$subscription->set_id( 0 );
-			return false;
-		}
-
-		// Maybe retrieve from the cache.
-		$raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
-
-		// If not found, retrieve from the db.
-		if ( false === $raw_subscription ) {
-
-			$raw_subscription = $wpdb->get_row(
-				$wpdb->prepare(
-					"SELECT * FROM {$wpdb->prefix}wpinv_subscriptions WHERE id = %d",
-					$subscription->get_id()
-				)
-			);
-
-			// Update the cache with our data
-			wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
-
-		}
-
-		if ( ! $raw_subscription ) {
-			$subscription->set_id( 0 );
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			return false;
-		}
-
-		foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
-			$method     = "set_$key";
-			$subscription->$method( $raw_subscription->$key );
-		}
-
-		$subscription->set_object_read( true );
-		do_action( 'getpaid_read_subscription', $subscription );
-
-	}
-
-	/**
-	 * Method to update a subscription in the database.
-	 *
-	 * @param WPInv_Subscription $subscription Subscription object.
-	 */
-	public function update( &$subscription ) {
-		global $wpdb;
-
-		$changes = $subscription->get_changes();
-		$values  = array();
-		$formats = array();
-
-		foreach ( $this->database_fields_to_data_type as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
-				$method       = "get_$key";
-				$values[ $key ] = $subscription->$method( 'edit' );
-				$formats[]    = $format;
-			}
-		}
-
-		if ( empty( $values ) ) {
-			return;
-		}
-
-		$wpdb->update(
-			$wpdb->prefix . 'wpinv_subscriptions',
-			$values,
-			array(
-				'id' => $subscription->get_id(),
-			),
-			$formats,
-			'%d'
-		);
-
-		// Apply the changes.
-		$subscription->apply_changes();
-
-		// Delete cache.
-		$subscription->clear_cache();
-
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-
-		// Fire a hook.
-		do_action( 'getpaid_update_subscription', $subscription );
-
-	}
-
-	/**
-	 * Method to delete a subscription from the database.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function delete( &$subscription ) {
-		global $wpdb;
-
-		$wpdb->query(
-			$wpdb->prepare(
-				"DELETE FROM {$wpdb->prefix}wpinv_subscriptions
+    /**
+     * Method to create a new subscription in the database.
+     *
+     * @param WPInv_Subscription $subscription Subscription object.
+     */
+    public function create( &$subscription ) {
+        global $wpdb;
+
+        $values  = array();
+        $formats = array();
+
+        $fields = $this->database_fields_to_data_type;
+        unset( $fields['id'] );
+
+        foreach ( $fields as $key => $format ) {
+            $method       = "get_$key";
+            $values[ $key ] = $subscription->$method( 'edit' );
+            $formats[]    = $format;
+        }
+
+        $result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
+
+        if ( $result ) {
+            $subscription->set_id( $wpdb->insert_id );
+            $subscription->apply_changes();
+            $subscription->clear_cache();
+            update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+            do_action( 'getpaid_new_subscription', $subscription );
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read a subscription from the database.
+     *
+     * @param WPInv_Subscription $subscription Subscription object.
+     *
+     */
+    public function read( &$subscription ) {
+        global $wpdb;
+
+        $subscription->set_defaults();
+
+        if ( ! $subscription->get_id() ) {
+            $subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+            $subscription->set_id( 0 );
+            return false;
+        }
+
+        // Maybe retrieve from the cache.
+        $raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
+
+        // If not found, retrieve from the db.
+        if ( false === $raw_subscription ) {
+
+            $raw_subscription = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT * FROM {$wpdb->prefix}wpinv_subscriptions WHERE id = %d",
+                    $subscription->get_id()
+                )
+            );
+
+            // Update the cache with our data
+            wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
+
+        }
+
+        if ( ! $raw_subscription ) {
+            $subscription->set_id( 0 );
+            $subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+            return false;
+        }
+
+        foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
+            $method     = "set_$key";
+            $subscription->$method( $raw_subscription->$key );
+        }
+
+        $subscription->set_object_read( true );
+        do_action( 'getpaid_read_subscription', $subscription );
+
+    }
+
+    /**
+     * Method to update a subscription in the database.
+     *
+     * @param WPInv_Subscription $subscription Subscription object.
+     */
+    public function update( &$subscription ) {
+        global $wpdb;
+
+        $changes = $subscription->get_changes();
+        $values  = array();
+        $formats = array();
+
+        foreach ( $this->database_fields_to_data_type as $key => $format ) {
+            if ( array_key_exists( $key, $changes ) ) {
+                $method       = "get_$key";
+                $values[ $key ] = $subscription->$method( 'edit' );
+                $formats[]    = $format;
+            }
+        }
+
+        if ( empty( $values ) ) {
+            return;
+        }
+
+        $wpdb->update(
+            $wpdb->prefix . 'wpinv_subscriptions',
+            $values,
+            array(
+                'id' => $subscription->get_id(),
+            ),
+            $formats,
+            '%d'
+        );
+
+        // Apply the changes.
+        $subscription->apply_changes();
+
+        // Delete cache.
+        $subscription->clear_cache();
+
+        update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
+        update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+
+        // Fire a hook.
+        do_action( 'getpaid_update_subscription', $subscription );
+
+    }
+
+    /**
+     * Method to delete a subscription from the database.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function delete( &$subscription ) {
+        global $wpdb;
+
+        $wpdb->query(
+            $wpdb->prepare(
+                "DELETE FROM {$wpdb->prefix}wpinv_subscriptions
 				WHERE id = %d",
-				$subscription->get_id()
-			)
-		);
+                $subscription->get_id()
+            )
+        );
 
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
+        delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
+        delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
 
-		// Delete cache.
-		$subscription->clear_cache();
+        // Delete cache.
+        $subscription->clear_cache();
 
-		// Fire a hook.
-		do_action( 'getpaid_delete_subscription', $subscription );
+        // Fire a hook.
+        do_action( 'getpaid_delete_subscription', $subscription );
 
-		$subscription->set_id( 0 );
-	}
+        $subscription->set_id( 0 );
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------

Spacing +38 added lines, -38 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Subscription_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -50,29 +50,29 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 */
-	public function create( &$subscription ) {
+	public function create(&$subscription) {
 		global $wpdb;
 
 		$values  = array();
 		$formats = array();
 
 		$fields = $this->database_fields_to_data_type;
-		unset( $fields['id'] );
+		unset($fields['id']);
 
-		foreach ( $fields as $key => $format ) {
+		foreach ($fields as $key => $format) {
 			$method       = "get_$key";
-			$values[ $key ] = $subscription->$method( 'edit' );
+			$values[$key] = $subscription->$method('edit');
 			$formats[]    = $format;
 		}
 
-		$result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
+		$result = $wpdb->insert($wpdb->prefix . 'wpinv_subscriptions', $values, $formats);
 
-		if ( $result ) {
-			$subscription->set_id( $wpdb->insert_id );
+		if ($result) {
+			$subscription->set_id($wpdb->insert_id);
 			$subscription->apply_changes();
 			$subscription->clear_cache();
-			update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-			do_action( 'getpaid_new_subscription', $subscription );
+			update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id());
+			do_action('getpaid_new_subscription', $subscription);
 			return true;
 		}
 
@@ -85,22 +85,22 @@ 
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 *
 	 */
-	public function read( &$subscription ) {
+	public function read(&$subscription) {
 		global $wpdb;
 
 		$subscription->set_defaults();
 
-		if ( ! $subscription->get_id() ) {
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			$subscription->set_id( 0 );
+		if (!$subscription->get_id()) {
+			$subscription->last_error = __('Invalid subscription ID.', 'invoicing');
+			$subscription->set_id(0);
 			return false;
 		}
 
 		// Maybe retrieve from the cache.
-		$raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
+		$raw_subscription = wp_cache_get($subscription->get_id(), 'getpaid_subscriptions');
 
 		// If not found, retrieve from the db.
-		if ( false === $raw_subscription ) {
+		if (false === $raw_subscription) {
 
 			$raw_subscription = $wpdb->get_row(
 				$wpdb->prepare(
@@ -110,23 +110,23 @@ 
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
+			wp_cache_set($subscription->get_id(), $raw_subscription, 'getpaid_subscriptions');
 
 		}
 
-		if ( ! $raw_subscription ) {
-			$subscription->set_id( 0 );
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+		if (!$raw_subscription) {
+			$subscription->set_id(0);
+			$subscription->last_error = __('Invalid subscription ID.', 'invoicing');
 			return false;
 		}
 
-		foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
-			$method     = "set_$key";
-			$subscription->$method( $raw_subscription->$key );
+		foreach (array_keys($this->database_fields_to_data_type) as $key) {
+			$method = "set_$key";
+			$subscription->$method($raw_subscription->$key);
 		}
 
-		$subscription->set_object_read( true );
-		do_action( 'getpaid_read_subscription', $subscription );
+		$subscription->set_object_read(true);
+		do_action('getpaid_read_subscription', $subscription);
 
 	}
 
@@ -135,22 +135,22 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 */
-	public function update( &$subscription ) {
+	public function update(&$subscription) {
 		global $wpdb;
 
 		$changes = $subscription->get_changes();
 		$values  = array();
 		$formats = array();
 
-		foreach ( $this->database_fields_to_data_type as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
+		foreach ($this->database_fields_to_data_type as $key => $format) {
+			if (array_key_exists($key, $changes)) {
 				$method       = "get_$key";
-				$values[ $key ] = $subscription->$method( 'edit' );
+				$values[$key] = $subscription->$method('edit');
 				$formats[]    = $format;
 			}
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
@@ -170,11 +170,11 @@ 
 		// Delete cache.
 		$subscription->clear_cache();
 
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+		update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id());
+		update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id());
 
 		// Fire a hook.
-		do_action( 'getpaid_update_subscription', $subscription );
+		do_action('getpaid_update_subscription', $subscription);
 
 	}
 
@@ -183,7 +183,7 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function delete( &$subscription ) {
+	public function delete(&$subscription) {
 		global $wpdb;
 
 		$wpdb->query(
@@ -194,16 +194,16 @@ 
 			)
 		);
 
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
+		delete_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id');
+		delete_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id');
 
 		// Delete cache.
 		$subscription->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_delete_subscription', $subscription );
+		do_action('getpaid_delete_subscription', $subscription);
 
-		$subscription->set_id( 0 );
+		$subscription->set_id(0);
 	}
 
 	/*

includes/data-stores/class-getpaid-discount-data-store.php

Indentation +188 added lines, -188 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,198 +15,198 @@ 
  */
 class GetPaid_Discount_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for a discount.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpi_discount_code',
-		'_wpi_discount_amount',
-		'_wpi_discount_start',
-		'_wpi_discount_expiration',
-		'_wpi_discount_type',
-		'_wpi_discount_uses',
-		'_wpi_discount_is_single_use',
-		'_wpi_discount_items',
-		'_wpi_discount_excluded_items',
-		'_wpi_discount_required_items',
-		'_wpi_discount_max_uses',
-		'_wpi_discount_is_recurring',
-		'_wpi_discount_min_total',
-		'_wpi_discount_max_total',
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpi_discount_code'           => 'code',
-		'_wpi_discount_amount'         => 'amount',
-		'_wpi_discount_start'          => 'start',
-		'_wpi_discount_expiration'     => 'expiration',
-		'_wpi_discount_type'           => 'type',
-		'_wpi_discount_uses'           => 'uses',
-		'_wpi_discount_is_single_use'  => 'is_single_use',
-		'_wpi_discount_items'          => 'items',
-		'_wpi_discount_excluded_items' => 'excluded_items',
-		'_wpi_discount_required_items' => 'required_items',
-		'_wpi_discount_max_uses'       => 'max_uses',
-		'_wpi_discount_is_recurring'   => 'is_recurring',
-		'_wpi_discount_min_total'      => 'min_total',
-		'_wpi_discount_max_total'      => 'max_total',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for a discount.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpi_discount_code',
+        '_wpi_discount_amount',
+        '_wpi_discount_start',
+        '_wpi_discount_expiration',
+        '_wpi_discount_type',
+        '_wpi_discount_uses',
+        '_wpi_discount_is_single_use',
+        '_wpi_discount_items',
+        '_wpi_discount_excluded_items',
+        '_wpi_discount_required_items',
+        '_wpi_discount_max_uses',
+        '_wpi_discount_is_recurring',
+        '_wpi_discount_min_total',
+        '_wpi_discount_max_total',
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpi_discount_code'           => 'code',
+        '_wpi_discount_amount'         => 'amount',
+        '_wpi_discount_start'          => 'start',
+        '_wpi_discount_expiration'     => 'expiration',
+        '_wpi_discount_type'           => 'type',
+        '_wpi_discount_uses'           => 'uses',
+        '_wpi_discount_is_single_use'  => 'is_single_use',
+        '_wpi_discount_items'          => 'items',
+        '_wpi_discount_excluded_items' => 'excluded_items',
+        '_wpi_discount_required_items' => 'required_items',
+        '_wpi_discount_max_uses'       => 'max_uses',
+        '_wpi_discount_is_recurring'   => 'is_recurring',
+        '_wpi_discount_min_total'      => 'min_total',
+        '_wpi_discount_max_total'      => 'max_total',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new discount in the database.
-	 *
-	 * @param WPInv_Discount $discount Discount object.
-	 */
-	public function create( &$discount ) {
-		$discount->set_version( WPINV_VERSION );
-		$discount->set_date_created( current_time( 'mysql' ) );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_discount_data',
-				array(
-					'post_date'    => $discount->get_date_created( 'edit' ),
-					'post_type'    => 'wpi_discount',
-					'post_status'  => $this->get_post_status( $discount ),
-					'ping_status'  => 'closed',
-					'post_author'  => $discount->get_author( 'edit' ),
-					'post_title'   => $discount->get_name( 'edit' ),
-					'post_excerpt' => $discount->get_description( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-			$discount->set_id( $id );
-			$this->update_post_meta( $discount );
-			$discount->save_meta_data();
-			$discount->apply_changes();
-			$this->clear_caches( $discount );
-			do_action( 'getpaid_new_discount', $discount );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$discount->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read a discount from the database.
-	 *
-	 * @param WPInv_Discount $discount Discount object.
-	 *
-	 */
-	public function read( &$discount ) {
-
-		$discount->set_defaults();
-		$discount_object = get_post( $discount->get_id() );
-
-		if ( ! $discount->get_id() || ! $discount_object || $discount_object->post_type != 'wpi_discount' ) {
-			$discount->last_error = __( 'Invalid discount.', 'invoicing' );
-			$discount->set_id( 0 );
-			return false;
-		}
-
-		$discount->set_props(
-			array(
-				'date_created'  => 0 < $discount_object->post_date ? $discount_object->post_date : null,
-				'date_modified' => 0 < $discount_object->post_modified ? $discount_object->post_modified : null,
-				'status'        => $discount_object->post_status,
-				'name'          => $discount_object->post_title,
-				'author'        => $discount_object->post_author,
-				'description'   => $discount_object->post_excerpt,
-			)
-		);
-
-		$this->read_object_data( $discount, $discount_object );
-		$discount->read_meta_data();
-		$discount->set_object_read( true );
-		do_action( 'getpaid_read_discount', $discount );
-
-	}
-
-	/**
-	 * Method to update a discount in the database.
-	 *
-	 * @param WPInv_Discount $discount Discount object.
-	 */
-	public function update( &$discount ) {
-		$discount->save_meta_data();
-		$discount->set_version( WPINV_VERSION );
-
-		if ( null === $discount->get_date_created( 'edit' ) ) {
-			$discount->set_date_created( current_time( 'mysql' ) );
-		}
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $discount->get_id() );
-
-		$changes = $discount->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'post_excerpt' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'     => $discount->get_date_created( 'edit' ),
-				'post_status'   => $discount->get_status( 'edit' ),
-				'post_title'    => $discount->get_name( 'edit' ),
-				'post_author'   => $discount->get_author( 'edit' ),
-				'post_modified' => $discount->get_date_modified( 'edit' ),
-				'post_excerpt'  => $discount->get_description( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $discount->get_id() ) );
-				clean_post_cache( $discount->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $discount->get_id() ), $post_data ) );
-			}
-			$discount->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-		$this->update_post_meta( $discount );
-		$discount->apply_changes();
-		$this->clear_caches( $discount );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $discount->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_discount', $discount );
-		} else {
-			do_action( 'getpaid_update_discount', $discount );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new discount in the database.
+     *
+     * @param WPInv_Discount $discount Discount object.
+     */
+    public function create( &$discount ) {
+        $discount->set_version( WPINV_VERSION );
+        $discount->set_date_created( current_time( 'mysql' ) );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_discount_data',
+                array(
+                    'post_date'    => $discount->get_date_created( 'edit' ),
+                    'post_type'    => 'wpi_discount',
+                    'post_status'  => $this->get_post_status( $discount ),
+                    'ping_status'  => 'closed',
+                    'post_author'  => $discount->get_author( 'edit' ),
+                    'post_title'   => $discount->get_name( 'edit' ),
+                    'post_excerpt' => $discount->get_description( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+            $discount->set_id( $id );
+            $this->update_post_meta( $discount );
+            $discount->save_meta_data();
+            $discount->apply_changes();
+            $this->clear_caches( $discount );
+            do_action( 'getpaid_new_discount', $discount );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $discount->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read a discount from the database.
+     *
+     * @param WPInv_Discount $discount Discount object.
+     *
+     */
+    public function read( &$discount ) {
+
+        $discount->set_defaults();
+        $discount_object = get_post( $discount->get_id() );
+
+        if ( ! $discount->get_id() || ! $discount_object || $discount_object->post_type != 'wpi_discount' ) {
+            $discount->last_error = __( 'Invalid discount.', 'invoicing' );
+            $discount->set_id( 0 );
+            return false;
+        }
+
+        $discount->set_props(
+            array(
+                'date_created'  => 0 < $discount_object->post_date ? $discount_object->post_date : null,
+                'date_modified' => 0 < $discount_object->post_modified ? $discount_object->post_modified : null,
+                'status'        => $discount_object->post_status,
+                'name'          => $discount_object->post_title,
+                'author'        => $discount_object->post_author,
+                'description'   => $discount_object->post_excerpt,
+            )
+        );
+
+        $this->read_object_data( $discount, $discount_object );
+        $discount->read_meta_data();
+        $discount->set_object_read( true );
+        do_action( 'getpaid_read_discount', $discount );
+
+    }
+
+    /**
+     * Method to update a discount in the database.
+     *
+     * @param WPInv_Discount $discount Discount object.
+     */
+    public function update( &$discount ) {
+        $discount->save_meta_data();
+        $discount->set_version( WPINV_VERSION );
+
+        if ( null === $discount->get_date_created( 'edit' ) ) {
+            $discount->set_date_created( current_time( 'mysql' ) );
+        }
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $discount->get_id() );
+
+        $changes = $discount->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'post_excerpt' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'     => $discount->get_date_created( 'edit' ),
+                'post_status'   => $discount->get_status( 'edit' ),
+                'post_title'    => $discount->get_name( 'edit' ),
+                'post_author'   => $discount->get_author( 'edit' ),
+                'post_modified' => $discount->get_date_modified( 'edit' ),
+                'post_excerpt'  => $discount->get_description( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $discount->get_id() ) );
+                clean_post_cache( $discount->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $discount->get_id() ), $post_data ) );
+            }
+            $discount->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+        $this->update_post_meta( $discount );
+        $discount->apply_changes();
+        $this->clear_caches( $discount );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $discount->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_discount', $discount );
+        } else {
+            do_action( 'getpaid_update_discount', $discount );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------

Spacing +46 added lines, -46 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Discount_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -73,38 +73,38 @@ 
 	 *
 	 * @param WPInv_Discount $discount Discount object.
 	 */
-	public function create( &$discount ) {
-		$discount->set_version( WPINV_VERSION );
-		$discount->set_date_created( current_time( 'mysql' ) );
+	public function create(&$discount) {
+		$discount->set_version(WPINV_VERSION);
+		$discount->set_date_created(current_time('mysql'));
 
 		// Create a new post.
 		$id = wp_insert_post(
 			apply_filters(
 				'getpaid_new_discount_data',
 				array(
-					'post_date'    => $discount->get_date_created( 'edit' ),
+					'post_date'    => $discount->get_date_created('edit'),
 					'post_type'    => 'wpi_discount',
-					'post_status'  => $this->get_post_status( $discount ),
+					'post_status'  => $this->get_post_status($discount),
 					'ping_status'  => 'closed',
-					'post_author'  => $discount->get_author( 'edit' ),
-					'post_title'   => $discount->get_name( 'edit' ),
-					'post_excerpt' => $discount->get_description( 'edit' ),
+					'post_author'  => $discount->get_author('edit'),
+					'post_title'   => $discount->get_name('edit'),
+					'post_excerpt' => $discount->get_description('edit'),
 				)
 			),
 			true
 		);
 
-		if ( $id && ! is_wp_error( $id ) ) {
-			$discount->set_id( $id );
-			$this->update_post_meta( $discount );
+		if ($id && !is_wp_error($id)) {
+			$discount->set_id($id);
+			$this->update_post_meta($discount);
 			$discount->save_meta_data();
 			$discount->apply_changes();
-			$this->clear_caches( $discount );
-			do_action( 'getpaid_new_discount', $discount );
+			$this->clear_caches($discount);
+			do_action('getpaid_new_discount', $discount);
 			return true;
 		}
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$discount->last_error = $id->get_error_message();
 		}
 
@@ -117,14 +117,14 @@ 
 	 * @param WPInv_Discount $discount Discount object.
 	 *
 	 */
-	public function read( &$discount ) {
+	public function read(&$discount) {
 
 		$discount->set_defaults();
-		$discount_object = get_post( $discount->get_id() );
+		$discount_object = get_post($discount->get_id());
 
-		if ( ! $discount->get_id() || ! $discount_object || $discount_object->post_type != 'wpi_discount' ) {
-			$discount->last_error = __( 'Invalid discount.', 'invoicing' );
-			$discount->set_id( 0 );
+		if (!$discount->get_id() || !$discount_object || $discount_object->post_type != 'wpi_discount') {
+			$discount->last_error = __('Invalid discount.', 'invoicing');
+			$discount->set_id(0);
 			return false;
 		}
 
@@ -139,10 +139,10 @@ 
 			)
 		);
 
-		$this->read_object_data( $discount, $discount_object );
+		$this->read_object_data($discount, $discount_object);
 		$discount->read_meta_data();
-		$discount->set_object_read( true );
-		do_action( 'getpaid_read_discount', $discount );
+		$discount->set_object_read(true);
+		do_action('getpaid_read_discount', $discount);
 
 	}
 
@@ -151,28 +151,28 @@ 
 	 *
 	 * @param WPInv_Discount $discount Discount object.
 	 */
-	public function update( &$discount ) {
+	public function update(&$discount) {
 		$discount->save_meta_data();
-		$discount->set_version( WPINV_VERSION );
+		$discount->set_version(WPINV_VERSION);
 
-		if ( null === $discount->get_date_created( 'edit' ) ) {
-			$discount->set_date_created( current_time( 'mysql' ) );
+		if (null === $discount->get_date_created('edit')) {
+			$discount->set_date_created(current_time('mysql'));
 		}
 
 		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $discount->get_id() );
+		$previous_status = get_post_status($discount->get_id());
 
 		$changes = $discount->get_changes();
 
 		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'post_excerpt' ), array_keys( $changes ) ) ) {
+		if (array_intersect(array('date_created', 'date_modified', 'status', 'name', 'author', 'post_excerpt'), array_keys($changes))) {
 			$post_data = array(
-				'post_date'     => $discount->get_date_created( 'edit' ),
-				'post_status'   => $discount->get_status( 'edit' ),
-				'post_title'    => $discount->get_name( 'edit' ),
-				'post_author'   => $discount->get_author( 'edit' ),
-				'post_modified' => $discount->get_date_modified( 'edit' ),
-				'post_excerpt'  => $discount->get_description( 'edit' ),
+				'post_date'     => $discount->get_date_created('edit'),
+				'post_status'   => $discount->get_status('edit'),
+				'post_title'    => $discount->get_name('edit'),
+				'post_author'   => $discount->get_author('edit'),
+				'post_modified' => $discount->get_date_modified('edit'),
+				'post_excerpt'  => $discount->get_description('edit'),
 			);
 
 			/**
@@ -183,25 +183,25 @@ 
 			 * This ensures hooks are fired by either WP itself (admin screen save),
 			 * or an update purely from CRUD.
 			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $discount->get_id() ) );
-				clean_post_cache( $discount->get_id() );
+			if (doing_action('save_post')) {
+				$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, $post_data, array('ID' => $discount->get_id()));
+				clean_post_cache($discount->get_id());
 			} else {
-				wp_update_post( array_merge( array( 'ID' => $discount->get_id() ), $post_data ) );
+				wp_update_post(array_merge(array('ID' => $discount->get_id()), $post_data));
 			}
-			$discount->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+			$discount->read_meta_data(true); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
 		}
-		$this->update_post_meta( $discount );
+		$this->update_post_meta($discount);
 		$discount->apply_changes();
-		$this->clear_caches( $discount );
+		$this->clear_caches($discount);
 
 		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $discount->get_status( 'edit' );
+		$new_status = $discount->get_status('edit');
 
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_discount', $discount );
+		if ($new_status !== $previous_status && in_array($previous_status, array('new', 'auto-draft', 'draft'), true)) {
+			do_action('getpaid_new_discount', $discount);
 		} else {
-			do_action( 'getpaid_update_discount', $discount );
+			do_action('getpaid_update_discount', $discount);
 		}
 
 	}

includes/data-stores/class-getpaid-invoice-data-store.php

Spacing +134 added lines, -134 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Invoice_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -114,61 +114,61 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 */
-	public function create( &$invoice ) {
-		$invoice->set_version( WPINV_VERSION );
-		$invoice->set_date_created( current_time( 'mysql' ) );
+	public function create(&$invoice) {
+		$invoice->set_version(WPINV_VERSION);
+		$invoice->set_date_created(current_time('mysql'));
 
 		// Create a new post.
 		$id = wp_insert_post(
 			apply_filters(
 				'getpaid_new_invoice_data',
 				array(
-					'post_date'    => $invoice->get_date_created( 'edit' ),
-					'post_type'    => $invoice->get_post_type( 'edit' ),
-					'post_status'  => $this->get_post_status( $invoice ),
+					'post_date'    => $invoice->get_date_created('edit'),
+					'post_type'    => $invoice->get_post_type('edit'),
+					'post_status'  => $this->get_post_status($invoice),
 					'ping_status'  => 'closed',
-					'post_author'  => $invoice->get_user_id( 'edit' ),
-					'post_title'   => $invoice->get_title( 'edit' ),
-					'post_excerpt' => $invoice->get_description( 'edit' ),
-					'post_parent'  => $invoice->get_parent_id( 'edit' ),
+					'post_author'  => $invoice->get_user_id('edit'),
+					'post_title'   => $invoice->get_title('edit'),
+					'post_excerpt' => $invoice->get_description('edit'),
+					'post_parent'  => $invoice->get_parent_id('edit'),
 				)
 			),
 			true
 		);
 
-		if ( $id && ! is_wp_error( $id ) ) {
+		if ($id && !is_wp_error($id)) {
 
 			// Update the new id and regenerate a title.
-			$invoice->set_id( $id );
+			$invoice->set_id($id);
 
 			$invoice->maybe_set_number();
 
 			wp_update_post(
 				array(
 					'ID'         => $invoice->get_id(),
-					'post_title' => $invoice->get_number( 'edit' ),
-					'post_name'  => $invoice->get_path( 'edit' ),
+					'post_title' => $invoice->get_number('edit'),
+					'post_name'  => $invoice->get_path('edit'),
 				)
 			);
 
 			// Save special fields and items.
-			$this->save_special_fields( $invoice );
-			$this->save_items( $invoice );
+			$this->save_special_fields($invoice);
+			$this->save_items($invoice);
 
 			// Update meta data.
-			$this->update_post_meta( $invoice );
+			$this->update_post_meta($invoice);
 			$invoice->save_meta_data();
 
 			// Apply changes.
 			$invoice->apply_changes();
-			$this->clear_caches( $invoice );
+			$this->clear_caches($invoice);
 
 			// Fires after a new invoice is created.
-			do_action( 'getpaid_new_invoice', $invoice );
+			do_action('getpaid_new_invoice', $invoice);
 			return true;
 		}
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$invoice->last_error = $id->get_error_message();
 		}
 
@@ -181,14 +181,14 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 *
 	 */
-	public function read( &$invoice ) {
+	public function read(&$invoice) {
 
 		$invoice->set_defaults();
-		$invoice_object = get_post( $invoice->get_id() );
+		$invoice_object = get_post($invoice->get_id());
 
-		if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
-			$invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
-			$invoice->set_id( 0 );
+		if (!$invoice->get_id() || !$invoice_object || !getpaid_is_invoice_post_type($invoice_object->post_type)) {
+			$invoice->last_error = __('Invalid invoice.', 'invoicing');
+			$invoice->set_id(0);
 			return false;
 		}
 
@@ -206,14 +206,14 @@ 
 			)
 		);
 
-		$invoice->set_type( $invoice_object->post_type );
+		$invoice->set_type($invoice_object->post_type);
 
-		$this->read_object_data( $invoice, $invoice_object );
-		$this->add_special_fields( $invoice );
-		$this->add_items( $invoice );
+		$this->read_object_data($invoice, $invoice_object);
+		$this->add_special_fields($invoice);
+		$this->add_items($invoice);
 		$invoice->read_meta_data();
-		$invoice->set_object_read( true );
-		do_action( 'getpaid_read_invoice', $invoice );
+		$invoice->set_object_read(true);
+		do_action('getpaid_read_invoice', $invoice);
 
 	}
 
@@ -222,35 +222,35 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 */
-	public function update( &$invoice ) {
+	public function update(&$invoice) {
 		$invoice->save_meta_data();
-		$invoice->set_version( WPINV_VERSION );
+		$invoice->set_version(WPINV_VERSION);
 
-		if ( null === $invoice->get_date_created( 'edit' ) ) {
-			$invoice->set_date_created( current_time( 'mysql' ) );
+		if (null === $invoice->get_date_created('edit')) {
+			$invoice->set_date_created(current_time('mysql'));
 		}
 
 		// Ensure both the key and number are set.
 		$invoice->get_path();
 
 		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $invoice->get_id() );
+		$previous_status = get_post_status($invoice->get_id());
 
 		$changes = $invoice->get_changes();
 
 		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
+		if (array_intersect(array('date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path'), array_keys($changes))) {
 			$post_data = array(
-				'post_date'     => $invoice->get_date_created( 'edit' ),
-				'post_date_gmt' => $invoice->get_date_created_gmt( 'edit' ),
-				'post_status'   => $invoice->get_status( 'edit' ),
-				'post_title'    => $invoice->get_name( 'edit' ),
-				'post_author'   => $invoice->get_user_id( 'edit' ),
-				'post_modified' => $invoice->get_date_modified( 'edit' ),
-				'post_excerpt'  => $invoice->get_description( 'edit' ),
-				'post_parent'   => $invoice->get_parent_id( 'edit' ),
-				'post_name'     => $invoice->get_path( 'edit' ),
-				'post_type'     => $invoice->get_post_type( 'edit' ),
+				'post_date'     => $invoice->get_date_created('edit'),
+				'post_date_gmt' => $invoice->get_date_created_gmt('edit'),
+				'post_status'   => $invoice->get_status('edit'),
+				'post_title'    => $invoice->get_name('edit'),
+				'post_author'   => $invoice->get_user_id('edit'),
+				'post_modified' => $invoice->get_date_modified('edit'),
+				'post_excerpt'  => $invoice->get_description('edit'),
+				'post_parent'   => $invoice->get_parent_id('edit'),
+				'post_name'     => $invoice->get_path('edit'),
+				'post_type'     => $invoice->get_post_type('edit'),
 			);
 
 			/**
@@ -261,35 +261,35 @@ 
 			 * This ensures hooks are fired by either WP itself (admin screen save),
 			 * or an update purely from CRUD.
 			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
-				clean_post_cache( $invoice->get_id() );
+			if (doing_action('save_post')) {
+				$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, $post_data, array('ID' => $invoice->get_id()));
+				clean_post_cache($invoice->get_id());
 			} else {
-				wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
+				wp_update_post(array_merge(array('ID' => $invoice->get_id()), $post_data));
 			}
-			$invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+			$invoice->read_meta_data(true); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
 		}
 
 		// Update meta data.
-		$this->update_post_meta( $invoice );
+		$this->update_post_meta($invoice);
 
 		// Save special fields and items.
-		$this->save_special_fields( $invoice );
-		$this->save_items( $invoice );
+		$this->save_special_fields($invoice);
+		$this->save_items($invoice);
 
 		// Apply the changes.
 		$invoice->apply_changes();
 
 		// Clear caches.
-		$this->clear_caches( $invoice );
+		$this->clear_caches($invoice);
 
 		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $invoice->get_status( 'edit' );
+		$new_status = $invoice->get_status('edit');
 
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_invoice', $invoice );
+		if ($new_status !== $previous_status && in_array($previous_status, array('new', 'auto-draft', 'draft'), true)) {
+			do_action('getpaid_new_invoice', $invoice);
 		} else {
-			do_action( 'getpaid_update_invoice', $invoice );
+			do_action('getpaid_update_invoice', $invoice);
 		}
 
 	}
@@ -305,45 +305,45 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function add_special_fields( &$invoice ) {
+    public function add_special_fields(&$invoice) {
 		global $wpdb;
 
 		// Maybe retrieve from the cache.
-		$data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+		$data = wp_cache_get($invoice->get_id(), 'getpaid_invoice_special_fields');
 
 		// If not found, retrieve from the db.
-		if ( false === $data ) {
+		if (false === $data) {
 			$table = $wpdb->prefix . 'getpaid_invoices';
 
 			$data  = $wpdb->get_row(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
+				$wpdb->prepare("SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id()),
 				ARRAY_A
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
+			wp_cache_set($invoice->get_id(), $data, 'getpaid_invoice_special_fields');
 
 		}
 
 		// Abort if the data does not exist.
-		if ( empty( $data ) ) {
-			$invoice->set_object_read( true );
-			$invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
+		if (empty($data)) {
+			$invoice->set_object_read(true);
+			$invoice->set_props(wpinv_get_user_address($invoice->get_user_id()));
 			return;
 		}
 
 		$props = array();
 
-		foreach ( $this->database_fields_to_props as $db_field => $prop ) {
+		foreach ($this->database_fields_to_props as $db_field => $prop) {
 
-			if ( $db_field == 'post_id' ) {
+			if ($db_field == 'post_id') {
 				continue;
 			}
 
-			$props[ $prop ] = $data[ $db_field ];
+			$props[$prop] = $data[$db_field];
 		}
 
-		$invoice->set_props( $props );
+		$invoice->set_props($props);
 
 	}
 
@@ -354,14 +354,14 @@ 
 	 * @param  WPInv_Invoice $invoice       The Invoice object.
 	 * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
 	 */
-	protected function get_special_fields_to_update( $invoice ) {
+	protected function get_special_fields_to_update($invoice) {
 		$fields_to_update = array();
-		$changed_props   = $invoice->get_changes();
+		$changed_props = $invoice->get_changes();
 
 		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) ) {
-				$fields_to_update[ $database_field ] = $prop;
+		foreach ($this->database_fields_to_props as $database_field => $prop) {
+			if (array_key_exists($prop, $changed_props)) {
+				$fields_to_update[$database_field] = $prop;
 			}
 		}
 
@@ -374,25 +374,25 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @since 1.0.19
 	 */
-	protected function update_special_fields( &$invoice ) {
+	protected function update_special_fields(&$invoice) {
 		global $wpdb;
 
 		$updated_props    = array();
-		$fields_to_update = $this->get_special_fields_to_update( $invoice );
+		$fields_to_update = $this->get_special_fields_to_update($invoice);
 
-		foreach ( $fields_to_update as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? (int) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
+		foreach ($fields_to_update as $database_field => $prop) {
+			$value = $invoice->{"get_$prop"}('edit');
+			$value = is_string($value) ? wp_slash($value) : $value;
+			$value = is_bool($value) ? (int) $value : $value;
+			$updated_props[$database_field] = maybe_serialize($value);
 		}
 
-		if ( ! empty( $updated_props ) ) {
+		if (!empty($updated_props)) {
 
 			$table = $wpdb->prefix . 'getpaid_invoices';
-			$wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
-			wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-			do_action( 'getpaid_invoice_update_database_fields', $invoice, $updated_props );
+			$wpdb->update($table, $updated_props, array('post_id' => $invoice->get_id()));
+			wp_cache_delete($invoice->get_id(), 'getpaid_invoice_special_fields');
+			do_action('getpaid_invoice_update_database_fields', $invoice, $updated_props);
 
 		}
 
@@ -404,22 +404,22 @@ 
 	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
 	 * @since 1.0.19
 	 */
-	protected function insert_special_fields( &$invoice ) {
+	protected function insert_special_fields(&$invoice) {
 		global $wpdb;
 
-		$updated_props   = array();
+		$updated_props = array();
 
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? (int) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
+		foreach ($this->database_fields_to_props as $database_field => $prop) {
+			$value = $invoice->{"get_$prop"}('edit');
+			$value = is_string($value) ? wp_slash($value) : $value;
+			$value = is_bool($value) ? (int) $value : $value;
+			$updated_props[$database_field] = maybe_serialize($value);
 		}
 
 		$table = $wpdb->prefix . 'getpaid_invoices';
-		$wpdb->insert( $table, $updated_props );
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-		do_action( 'getpaid_invoice_insert_database_fields', $invoice, $updated_props );
+		$wpdb->insert($table, $updated_props);
+		wp_cache_delete($invoice->get_id(), 'getpaid_invoice_special_fields');
+		do_action('getpaid_invoice_insert_database_fields', $invoice, $updated_props);
 
 	}
 
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function save_special_fields( &$invoice ) {
+    public function save_special_fields(&$invoice) {
 		global $wpdb;
 
 		// The invoices table.
@@ -436,13 +436,13 @@ 
 		$id    = (int) $invoice->get_id();
 		$invoice->maybe_set_key();
 
-		if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
+		if ($wpdb->get_var("SELECT `post_id` FROM $table WHERE `post_id`= $id")) {
 
-			$this->update_special_fields( $invoice );
+			$this->update_special_fields($invoice);
 
 		} else {
 
-			$this->insert_special_fields( $invoice );
+			$this->insert_special_fields($invoice);
 
 		}
 
@@ -453,46 +453,46 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function add_items( &$invoice ) {
+    public function add_items(&$invoice) {
 		global $wpdb;
 
 		// Maybe retrieve from the cache.
-		$items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+		$items = wp_cache_get($invoice->get_id(), 'getpaid_invoice_cart_details');
 
 		// If not found, retrieve from the db.
-		if ( false === $items ) {
+		if (false === $items) {
 			$table = $wpdb->prefix . 'getpaid_invoice_items';
 
 			$items = $wpdb->get_results(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
+				$wpdb->prepare("SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id())
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
+			wp_cache_set($invoice->get_id(), $items, 'getpaid_invoice_cart_details');
 
 		}
 
 		// Abort if no items found.
-        if ( empty( $items ) ) {
+        if (empty($items)) {
             return;
 		}
 
 		$_items = array();
-		foreach ( $items as $item_data ) {
-			$item = new GetPaid_Form_Item( $item_data->item_id );
+		foreach ($items as $item_data) {
+			$item = new GetPaid_Form_Item($item_data->item_id);
 
 			// Set item data.
-			$item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
-			$item->item_discount = wpinv_sanitize_amount( $item_data->discount );
-			$item->set_name( $item_data->item_name );
-			$item->set_description( $item_data->item_description );
-			$item->set_price( $item_data->item_price );
-			$item->set_quantity( $item_data->quantity );
-			$item->set_item_meta( $item_data->meta );
+			$item->item_tax      = wpinv_sanitize_amount($item_data->tax);
+			$item->item_discount = wpinv_sanitize_amount($item_data->discount);
+			$item->set_name($item_data->item_name);
+			$item->set_description($item_data->item_description);
+			$item->set_price($item_data->item_price);
+			$item->set_quantity($item_data->quantity);
+			$item->set_item_meta($item_data->meta);
 			$_items[] = $item;
 		}
 
-		$invoice->set_items( $_items );
+		$invoice->set_items($_items);
 	}
 
 	/**
@@ -500,20 +500,20 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function save_items( $invoice ) {
+    public function save_items($invoice) {
 
 		// Delete previously existing items.
-		$this->delete_items( $invoice );
+		$this->delete_items($invoice);
 
-		$table   = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
 
-		foreach ( $invoice->get_cart_details() as $item_data ) {
-			$item_data = array_map( 'maybe_serialize', $item_data );
-			$GLOBALS['wpdb']->insert( $table, $item_data );
+		foreach ($invoice->get_cart_details() as $item_data) {
+			$item_data = array_map('maybe_serialize', $item_data);
+			$GLOBALS['wpdb']->insert($table, $item_data);
 		}
 
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
-		do_action( 'getpaid_invoice_save_items', $invoice );
+		wp_cache_delete($invoice->get_id(), 'getpaid_invoice_cart_details');
+		do_action('getpaid_invoice_save_items', $invoice);
 
 	}
 
@@ -522,9 +522,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function delete_items( $invoice ) {
+    public function delete_items($invoice) {
 		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+		return $GLOBALS['wpdb']->delete($table, array('post_id' => $invoice->get_id()));
 	}
 
 	/**
@@ -532,9 +532,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice object.
      */
-    public function delete_special_fields( $invoice ) {
+    public function delete_special_fields($invoice) {
 		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+		return $GLOBALS['wpdb']->delete($table, array('post_id' => $invoice->get_id()));
 	}
 
 	/**
@@ -545,10 +545,10 @@ 
 	 * @param  WPInv_Invoice $object GetPaid_Data object.
 	 * @return string
 	 */
-	protected function get_post_status( $object ) {
-		$object_status = $object->get_status( 'edit' );
+	protected function get_post_status($object) {
+		$object_status = $object->get_status('edit');
 
-		if ( ! $object_status ) {
+		if (!$object_status) {
 			$object_status = $object->get_default_status();
 		}
 

Indentation +490 added lines, -490 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,545 +15,545 @@ 
  */
 class GetPaid_Invoice_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for a discount.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpinv_subscr_profile_id',
-		'_wpinv_subscription_id',
-		'_wpinv_taxes',
-		'_wpinv_fees',
-		'_wpinv_discounts',
-		'_wpinv_submission_id',
-		'_wpinv_payment_form',
-		'_wpinv_is_viewed',
-		'_wpinv_phone',
-		'_wpinv_company_id',
-		'wpinv_shipping',
-		'wpinv_email_cc',
-		'wpinv_template',
-		'wpinv_created_via',
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpinv_subscr_profile_id' => 'remote_subscription_id',
-		'_wpinv_subscription_id'   => 'subscription_id',
-		'_wpinv_taxes'             => 'taxes',
-		'_wpinv_fees'              => 'fees',
-		'_wpinv_discounts'         => 'discounts',
-		'_wpinv_submission_id'     => 'submission_id',
-		'_wpinv_payment_form'      => 'payment_form',
-		'_wpinv_is_viewed'         => 'is_viewed',
-		'wpinv_email_cc'           => 'email_cc',
-		'wpinv_template'           => 'template',
-		'wpinv_created_via'        => 'created_via',
-		'_wpinv_phone'             => 'phone',
-		'_wpinv_company_id'        => 'company_id',
-		'wpinv_shipping'           => 'shipping',
-	);
-
-	/**
-	 * A map of database fields to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $database_fields_to_props = array(
-		'post_id'            => 'id',
-		'number'             => 'number',
-		'currency'           => 'currency',
-		'invoice_key'        => 'key',
-		'type'               => 'type',
-		'mode'               => 'mode',
-		'user_ip'            => 'user_ip',
-		'first_name'         => 'first_name',
-		'last_name'          => 'last_name',
-		'address'            => 'address',
-		'city'               => 'city',
-		'state'              => 'state',
-		'country'            => 'country',
-		'zip'                => 'zip',
-		'zip'                => 'zip',
-		'adddress_confirmed' => 'address_confirmed',
-		'gateway'            => 'gateway',
-		'transaction_id'     => 'transaction_id',
-		'currency'           => 'currency',
-		'subtotal'           => 'subtotal',
-		'tax'                => 'total_tax',
-		'fees_total'         => 'total_fees',
-		'discount'           => 'total_discount',
-		'total'              => 'total',
-		'discount_code'      => 'discount_code',
-		'disable_taxes'      => 'disable_taxes',
-		'due_date'           => 'due_date',
-		'completed_date'     => 'completed_date',
-		'company'            => 'company',
-		'vat_number'         => 'vat_number',
-		'vat_rate'           => 'vat_rate',
-		'customer_id'        => 'customer_id',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for a discount.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpinv_subscr_profile_id',
+        '_wpinv_subscription_id',
+        '_wpinv_taxes',
+        '_wpinv_fees',
+        '_wpinv_discounts',
+        '_wpinv_submission_id',
+        '_wpinv_payment_form',
+        '_wpinv_is_viewed',
+        '_wpinv_phone',
+        '_wpinv_company_id',
+        'wpinv_shipping',
+        'wpinv_email_cc',
+        'wpinv_template',
+        'wpinv_created_via',
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpinv_subscr_profile_id' => 'remote_subscription_id',
+        '_wpinv_subscription_id'   => 'subscription_id',
+        '_wpinv_taxes'             => 'taxes',
+        '_wpinv_fees'              => 'fees',
+        '_wpinv_discounts'         => 'discounts',
+        '_wpinv_submission_id'     => 'submission_id',
+        '_wpinv_payment_form'      => 'payment_form',
+        '_wpinv_is_viewed'         => 'is_viewed',
+        'wpinv_email_cc'           => 'email_cc',
+        'wpinv_template'           => 'template',
+        'wpinv_created_via'        => 'created_via',
+        '_wpinv_phone'             => 'phone',
+        '_wpinv_company_id'        => 'company_id',
+        'wpinv_shipping'           => 'shipping',
+    );
+
+    /**
+     * A map of database fields to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $database_fields_to_props = array(
+        'post_id'            => 'id',
+        'number'             => 'number',
+        'currency'           => 'currency',
+        'invoice_key'        => 'key',
+        'type'               => 'type',
+        'mode'               => 'mode',
+        'user_ip'            => 'user_ip',
+        'first_name'         => 'first_name',
+        'last_name'          => 'last_name',
+        'address'            => 'address',
+        'city'               => 'city',
+        'state'              => 'state',
+        'country'            => 'country',
+        'zip'                => 'zip',
+        'zip'                => 'zip',
+        'adddress_confirmed' => 'address_confirmed',
+        'gateway'            => 'gateway',
+        'transaction_id'     => 'transaction_id',
+        'currency'           => 'currency',
+        'subtotal'           => 'subtotal',
+        'tax'                => 'total_tax',
+        'fees_total'         => 'total_fees',
+        'discount'           => 'total_discount',
+        'total'              => 'total',
+        'discount_code'      => 'discount_code',
+        'disable_taxes'      => 'disable_taxes',
+        'due_date'           => 'due_date',
+        'completed_date'     => 'completed_date',
+        'company'            => 'company',
+        'vat_number'         => 'vat_number',
+        'vat_rate'           => 'vat_rate',
+        'customer_id'        => 'customer_id',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new invoice in the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 */
-	public function create( &$invoice ) {
-		$invoice->set_version( WPINV_VERSION );
-		$invoice->set_date_created( current_time( 'mysql' ) );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_invoice_data',
-				array(
-					'post_date'    => $invoice->get_date_created( 'edit' ),
-					'post_type'    => $invoice->get_post_type( 'edit' ),
-					'post_status'  => $this->get_post_status( $invoice ),
-					'ping_status'  => 'closed',
-					'post_author'  => $invoice->get_user_id( 'edit' ),
-					'post_title'   => $invoice->get_title( 'edit' ),
-					'post_excerpt' => $invoice->get_description( 'edit' ),
-					'post_parent'  => $invoice->get_parent_id( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-
-			// Update the new id and regenerate a title.
-			$invoice->set_id( $id );
-
-			$invoice->maybe_set_number();
-
-			wp_update_post(
-				array(
-					'ID'         => $invoice->get_id(),
-					'post_title' => $invoice->get_number( 'edit' ),
-					'post_name'  => $invoice->get_path( 'edit' ),
-				)
-			);
-
-			// Save special fields and items.
-			$this->save_special_fields( $invoice );
-			$this->save_items( $invoice );
-
-			// Update meta data.
-			$this->update_post_meta( $invoice );
-			$invoice->save_meta_data();
-
-			// Apply changes.
-			$invoice->apply_changes();
-			$this->clear_caches( $invoice );
-
-			// Fires after a new invoice is created.
-			do_action( 'getpaid_new_invoice', $invoice );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$invoice->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read an invoice from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 *
-	 */
-	public function read( &$invoice ) {
-
-		$invoice->set_defaults();
-		$invoice_object = get_post( $invoice->get_id() );
-
-		if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
-			$invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
-			$invoice->set_id( 0 );
-			return false;
-		}
-
-		$invoice->set_props(
-			array(
-				'date_created'  => 0 < $invoice_object->post_date ? $invoice_object->post_date : null,
-				'date_modified' => 0 < $invoice_object->post_modified ? $invoice_object->post_modified : null,
-				'status'        => $invoice_object->post_status,
-				'author'        => $invoice_object->post_author,
-				'description'   => $invoice_object->post_excerpt,
-				'parent_id'     => $invoice_object->post_parent,
-				'name'          => $invoice_object->post_title,
-				'path'          => $invoice_object->post_name,
-				'post_type'     => $invoice_object->post_type,
-			)
-		);
-
-		$invoice->set_type( $invoice_object->post_type );
-
-		$this->read_object_data( $invoice, $invoice_object );
-		$this->add_special_fields( $invoice );
-		$this->add_items( $invoice );
-		$invoice->read_meta_data();
-		$invoice->set_object_read( true );
-		do_action( 'getpaid_read_invoice', $invoice );
-
-	}
-
-	/**
-	 * Method to update an invoice in the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
-	 */
-	public function update( &$invoice ) {
-		$invoice->save_meta_data();
-		$invoice->set_version( WPINV_VERSION );
-
-		if ( null === $invoice->get_date_created( 'edit' ) ) {
-			$invoice->set_date_created( current_time( 'mysql' ) );
-		}
-
-		// Ensure both the key and number are set.
-		$invoice->get_path();
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $invoice->get_id() );
-
-		$changes = $invoice->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'     => $invoice->get_date_created( 'edit' ),
-				'post_date_gmt' => $invoice->get_date_created_gmt( 'edit' ),
-				'post_status'   => $invoice->get_status( 'edit' ),
-				'post_title'    => $invoice->get_name( 'edit' ),
-				'post_author'   => $invoice->get_user_id( 'edit' ),
-				'post_modified' => $invoice->get_date_modified( 'edit' ),
-				'post_excerpt'  => $invoice->get_description( 'edit' ),
-				'post_parent'   => $invoice->get_parent_id( 'edit' ),
-				'post_name'     => $invoice->get_path( 'edit' ),
-				'post_type'     => $invoice->get_post_type( 'edit' ),
-			);
-
-			/**
-			 * When updating this object, to prevent infinite loops, use $wpdb
-			 * to update data, since wp_update_post spawns more calls to the
-			 * save_post action.
-			 *
-			 * This ensures hooks are fired by either WP itself (admin screen save),
-			 * or an update purely from CRUD.
-			 */
-			if ( doing_action( 'save_post' ) ) {
-				$GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
-				clean_post_cache( $invoice->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
-			}
-			$invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-
-		// Update meta data.
-		$this->update_post_meta( $invoice );
-
-		// Save special fields and items.
-		$this->save_special_fields( $invoice );
-		$this->save_items( $invoice );
-
-		// Apply the changes.
-		$invoice->apply_changes();
-
-		// Clear caches.
-		$this->clear_caches( $invoice );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $invoice->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_invoice', $invoice );
-		} else {
-			do_action( 'getpaid_update_invoice', $invoice );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new invoice in the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     */
+    public function create( &$invoice ) {
+        $invoice->set_version( WPINV_VERSION );
+        $invoice->set_date_created( current_time( 'mysql' ) );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_invoice_data',
+                array(
+                    'post_date'    => $invoice->get_date_created( 'edit' ),
+                    'post_type'    => $invoice->get_post_type( 'edit' ),
+                    'post_status'  => $this->get_post_status( $invoice ),
+                    'ping_status'  => 'closed',
+                    'post_author'  => $invoice->get_user_id( 'edit' ),
+                    'post_title'   => $invoice->get_title( 'edit' ),
+                    'post_excerpt' => $invoice->get_description( 'edit' ),
+                    'post_parent'  => $invoice->get_parent_id( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+
+            // Update the new id and regenerate a title.
+            $invoice->set_id( $id );
+
+            $invoice->maybe_set_number();
+
+            wp_update_post(
+                array(
+                    'ID'         => $invoice->get_id(),
+                    'post_title' => $invoice->get_number( 'edit' ),
+                    'post_name'  => $invoice->get_path( 'edit' ),
+                )
+            );
+
+            // Save special fields and items.
+            $this->save_special_fields( $invoice );
+            $this->save_items( $invoice );
+
+            // Update meta data.
+            $this->update_post_meta( $invoice );
+            $invoice->save_meta_data();
+
+            // Apply changes.
+            $invoice->apply_changes();
+            $this->clear_caches( $invoice );
+
+            // Fires after a new invoice is created.
+            do_action( 'getpaid_new_invoice', $invoice );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $invoice->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read an invoice from the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     *
+     */
+    public function read( &$invoice ) {
+
+        $invoice->set_defaults();
+        $invoice_object = get_post( $invoice->get_id() );
+
+        if ( ! $invoice->get_id() || ! $invoice_object || ! getpaid_is_invoice_post_type( $invoice_object->post_type ) ) {
+            $invoice->last_error = __( 'Invalid invoice.', 'invoicing' );
+            $invoice->set_id( 0 );
+            return false;
+        }
+
+        $invoice->set_props(
+            array(
+                'date_created'  => 0 < $invoice_object->post_date ? $invoice_object->post_date : null,
+                'date_modified' => 0 < $invoice_object->post_modified ? $invoice_object->post_modified : null,
+                'status'        => $invoice_object->post_status,
+                'author'        => $invoice_object->post_author,
+                'description'   => $invoice_object->post_excerpt,
+                'parent_id'     => $invoice_object->post_parent,
+                'name'          => $invoice_object->post_title,
+                'path'          => $invoice_object->post_name,
+                'post_type'     => $invoice_object->post_type,
+            )
+        );
+
+        $invoice->set_type( $invoice_object->post_type );
+
+        $this->read_object_data( $invoice, $invoice_object );
+        $this->add_special_fields( $invoice );
+        $this->add_items( $invoice );
+        $invoice->read_meta_data();
+        $invoice->set_object_read( true );
+        do_action( 'getpaid_read_invoice', $invoice );
+
+    }
+
+    /**
+     * Method to update an invoice in the database.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
+     */
+    public function update( &$invoice ) {
+        $invoice->save_meta_data();
+        $invoice->set_version( WPINV_VERSION );
+
+        if ( null === $invoice->get_date_created( 'edit' ) ) {
+            $invoice->set_date_created( current_time( 'mysql' ) );
+        }
+
+        // Ensure both the key and number are set.
+        $invoice->get_path();
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $invoice->get_id() );
+
+        $changes = $invoice->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'name', 'author', 'description', 'parent_id', 'post_excerpt', 'path' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'     => $invoice->get_date_created( 'edit' ),
+                'post_date_gmt' => $invoice->get_date_created_gmt( 'edit' ),
+                'post_status'   => $invoice->get_status( 'edit' ),
+                'post_title'    => $invoice->get_name( 'edit' ),
+                'post_author'   => $invoice->get_user_id( 'edit' ),
+                'post_modified' => $invoice->get_date_modified( 'edit' ),
+                'post_excerpt'  => $invoice->get_description( 'edit' ),
+                'post_parent'   => $invoice->get_parent_id( 'edit' ),
+                'post_name'     => $invoice->get_path( 'edit' ),
+                'post_type'     => $invoice->get_post_type( 'edit' ),
+            );
+
+            /**
+             * When updating this object, to prevent infinite loops, use $wpdb
+             * to update data, since wp_update_post spawns more calls to the
+             * save_post action.
+             *
+             * This ensures hooks are fired by either WP itself (admin screen save),
+             * or an update purely from CRUD.
+             */
+            if ( doing_action( 'save_post' ) ) {
+                $GLOBALS['wpdb']->update( $GLOBALS['wpdb']->posts, $post_data, array( 'ID' => $invoice->get_id() ) );
+                clean_post_cache( $invoice->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $invoice->get_id() ), $post_data ) );
+            }
+            $invoice->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+
+        // Update meta data.
+        $this->update_post_meta( $invoice );
+
+        // Save special fields and items.
+        $this->save_special_fields( $invoice );
+        $this->save_items( $invoice );
+
+        // Apply the changes.
+        $invoice->apply_changes();
+
+        // Clear caches.
+        $this->clear_caches( $invoice );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $invoice->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_invoice', $invoice );
+        } else {
+            do_action( 'getpaid_update_invoice', $invoice );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
+    /**
      * Retrieves special fields and adds to the invoice.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function add_special_fields( &$invoice ) {
-		global $wpdb;
-
-		// Maybe retrieve from the cache.
-		$data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-
-		// If not found, retrieve from the db.
-		if ( false === $data ) {
-			$table = $wpdb->prefix . 'getpaid_invoices';
-
-			$data  = $wpdb->get_row(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
-				ARRAY_A
-			);
-
-			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
-
-		}
-
-		// Abort if the data does not exist.
-		if ( empty( $data ) ) {
-			$invoice->set_object_read( true );
-			$invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
-			return;
-		}
-
-		$props = array();
-
-		foreach ( $this->database_fields_to_props as $db_field => $prop ) {
-
-			if ( $db_field == 'post_id' ) {
-				continue;
-			}
-
-			$props[ $prop ] = $data[ $db_field ];
-		}
-
-		$invoice->set_props( $props );
-
-	}
-
-	/**
-	 * Gets a list of special fields that need updated based on change state
-	 * or if they are present in the database or not.
-	 *
-	 * @param  WPInv_Invoice $invoice       The Invoice object.
-	 * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
-	 */
-	protected function get_special_fields_to_update( $invoice ) {
-		$fields_to_update = array();
-		$changed_props   = $invoice->get_changes();
-
-		// Props should be updated if they are a part of the $changed array or don't exist yet.
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			if ( array_key_exists( $prop, $changed_props ) ) {
-				$fields_to_update[ $database_field ] = $prop;
-			}
-		}
-
-		return $fields_to_update;
-	}
-
-	/**
-	 * Helper method that updates all the database fields for an invoice based on it's settings in the WPInv_Invoice class.
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @since 1.0.19
-	 */
-	protected function update_special_fields( &$invoice ) {
-		global $wpdb;
-
-		$updated_props    = array();
-		$fields_to_update = $this->get_special_fields_to_update( $invoice );
-
-		foreach ( $fields_to_update as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? (int) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
-		}
-
-		if ( ! empty( $updated_props ) ) {
-
-			$table = $wpdb->prefix . 'getpaid_invoices';
-			$wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
-			wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-			do_action( 'getpaid_invoice_update_database_fields', $invoice, $updated_props );
-
-		}
-
-	}
-
-	/**
-	 * Helper method that inserts special fields to the database.
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @since 1.0.19
-	 */
-	protected function insert_special_fields( &$invoice ) {
-		global $wpdb;
-
-		$updated_props   = array();
-
-		foreach ( $this->database_fields_to_props as $database_field => $prop ) {
-			$value = $invoice->{"get_$prop"}( 'edit' );
-			$value = is_string( $value ) ? wp_slash( $value ) : $value;
-			$value = is_bool( $value ) ? (int) $value : $value;
-			$updated_props[ $database_field ] = maybe_serialize( $value );
-		}
-
-		$table = $wpdb->prefix . 'getpaid_invoices';
-		$wpdb->insert( $table, $updated_props );
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
-		do_action( 'getpaid_invoice_insert_database_fields', $invoice, $updated_props );
-
-	}
-
-	/**
+        global $wpdb;
+
+        // Maybe retrieve from the cache.
+        $data   = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+
+        // If not found, retrieve from the db.
+        if ( false === $data ) {
+            $table = $wpdb->prefix . 'getpaid_invoices';
+
+            $data  = $wpdb->get_row(
+                $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d LIMIT 1", $invoice->get_id() ),
+                ARRAY_A
+            );
+
+            // Update the cache with our data
+            wp_cache_set( $invoice->get_id(), $data, 'getpaid_invoice_special_fields' );
+
+        }
+
+        // Abort if the data does not exist.
+        if ( empty( $data ) ) {
+            $invoice->set_object_read( true );
+            $invoice->set_props( wpinv_get_user_address( $invoice->get_user_id() ) );
+            return;
+        }
+
+        $props = array();
+
+        foreach ( $this->database_fields_to_props as $db_field => $prop ) {
+
+            if ( $db_field == 'post_id' ) {
+                continue;
+            }
+
+            $props[ $prop ] = $data[ $db_field ];
+        }
+
+        $invoice->set_props( $props );
+
+    }
+
+    /**
+     * Gets a list of special fields that need updated based on change state
+     * or if they are present in the database or not.
+     *
+     * @param  WPInv_Invoice $invoice       The Invoice object.
+     * @return array                        A mapping of field keys => prop names, filtered by ones that should be updated.
+     */
+    protected function get_special_fields_to_update( $invoice ) {
+        $fields_to_update = array();
+        $changed_props   = $invoice->get_changes();
+
+        // Props should be updated if they are a part of the $changed array or don't exist yet.
+        foreach ( $this->database_fields_to_props as $database_field => $prop ) {
+            if ( array_key_exists( $prop, $changed_props ) ) {
+                $fields_to_update[ $database_field ] = $prop;
+            }
+        }
+
+        return $fields_to_update;
+    }
+
+    /**
+     * Helper method that updates all the database fields for an invoice based on it's settings in the WPInv_Invoice class.
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @since 1.0.19
+     */
+    protected function update_special_fields( &$invoice ) {
+        global $wpdb;
+
+        $updated_props    = array();
+        $fields_to_update = $this->get_special_fields_to_update( $invoice );
+
+        foreach ( $fields_to_update as $database_field => $prop ) {
+            $value = $invoice->{"get_$prop"}( 'edit' );
+            $value = is_string( $value ) ? wp_slash( $value ) : $value;
+            $value = is_bool( $value ) ? (int) $value : $value;
+            $updated_props[ $database_field ] = maybe_serialize( $value );
+        }
+
+        if ( ! empty( $updated_props ) ) {
+
+            $table = $wpdb->prefix . 'getpaid_invoices';
+            $wpdb->update( $table, $updated_props, array( 'post_id' => $invoice->get_id() ) );
+            wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+            do_action( 'getpaid_invoice_update_database_fields', $invoice, $updated_props );
+
+        }
+
+    }
+
+    /**
+     * Helper method that inserts special fields to the database.
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @since 1.0.19
+     */
+    protected function insert_special_fields( &$invoice ) {
+        global $wpdb;
+
+        $updated_props   = array();
+
+        foreach ( $this->database_fields_to_props as $database_field => $prop ) {
+            $value = $invoice->{"get_$prop"}( 'edit' );
+            $value = is_string( $value ) ? wp_slash( $value ) : $value;
+            $value = is_bool( $value ) ? (int) $value : $value;
+            $updated_props[ $database_field ] = maybe_serialize( $value );
+        }
+
+        $table = $wpdb->prefix . 'getpaid_invoices';
+        $wpdb->insert( $table, $updated_props );
+        wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_special_fields' );
+        do_action( 'getpaid_invoice_insert_database_fields', $invoice, $updated_props );
+
+    }
+
+    /**
      * Saves all special fields.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function save_special_fields( &$invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// The invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-		$id    = (int) $invoice->get_id();
-		$invoice->maybe_set_key();
+        // The invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+        $id    = (int) $invoice->get_id();
+        $invoice->maybe_set_key();
 
-		if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
+        if ( $wpdb->get_var( "SELECT `post_id` FROM $table WHERE `post_id`= $id" ) ) {
 
-			$this->update_special_fields( $invoice );
+            $this->update_special_fields( $invoice );
 
-		} else {
+        } else {
 
-			$this->insert_special_fields( $invoice );
+            $this->insert_special_fields( $invoice );
 
-		}
+        }
 
-	}
+    }
 
-	/**
+    /**
      * Set's up cart details.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function add_items( &$invoice ) {
-		global $wpdb;
+        global $wpdb;
 
-		// Maybe retrieve from the cache.
-		$items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+        // Maybe retrieve from the cache.
+        $items = wp_cache_get( $invoice->get_id(), 'getpaid_invoice_cart_details' );
 
-		// If not found, retrieve from the db.
-		if ( false === $items ) {
-			$table = $wpdb->prefix . 'getpaid_invoice_items';
+        // If not found, retrieve from the db.
+        if ( false === $items ) {
+            $table = $wpdb->prefix . 'getpaid_invoice_items';
 
-			$items = $wpdb->get_results(
-				$wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
-			);
+            $items = $wpdb->get_results(
+                $wpdb->prepare( "SELECT * FROM $table WHERE `post_id`=%d", $invoice->get_id() )
+            );
 
-			// Update the cache with our data
-			wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
+            // Update the cache with our data
+            wp_cache_set( $invoice->get_id(), $items, 'getpaid_invoice_cart_details' );
 
-		}
+        }
 
-		// Abort if no items found.
+        // Abort if no items found.
         if ( empty( $items ) ) {
             return;
-		}
-
-		$_items = array();
-		foreach ( $items as $item_data ) {
-			$item = new GetPaid_Form_Item( $item_data->item_id );
-
-			// Set item data.
-			$item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
-			$item->item_discount = wpinv_sanitize_amount( $item_data->discount );
-			$item->set_name( $item_data->item_name );
-			$item->set_description( $item_data->item_description );
-			$item->set_price( $item_data->item_price );
-			$item->set_quantity( $item_data->quantity );
-			$item->set_item_meta( $item_data->meta );
-			$_items[] = $item;
-		}
-
-		$invoice->set_items( $_items );
-	}
-
-	/**
+        }
+
+        $_items = array();
+        foreach ( $items as $item_data ) {
+            $item = new GetPaid_Form_Item( $item_data->item_id );
+
+            // Set item data.
+            $item->item_tax      = wpinv_sanitize_amount( $item_data->tax );
+            $item->item_discount = wpinv_sanitize_amount( $item_data->discount );
+            $item->set_name( $item_data->item_name );
+            $item->set_description( $item_data->item_description );
+            $item->set_price( $item_data->item_price );
+            $item->set_quantity( $item_data->quantity );
+            $item->set_item_meta( $item_data->meta );
+            $_items[] = $item;
+        }
+
+        $invoice->set_items( $_items );
+    }
+
+    /**
      * Saves cart details.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function save_items( $invoice ) {
 
-		// Delete previously existing items.
-		$this->delete_items( $invoice );
+        // Delete previously existing items.
+        $this->delete_items( $invoice );
 
-		$table   = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+        $table   = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
 
-		foreach ( $invoice->get_cart_details() as $item_data ) {
-			$item_data = array_map( 'maybe_serialize', $item_data );
-			$GLOBALS['wpdb']->insert( $table, $item_data );
-		}
+        foreach ( $invoice->get_cart_details() as $item_data ) {
+            $item_data = array_map( 'maybe_serialize', $item_data );
+            $GLOBALS['wpdb']->insert( $table, $item_data );
+        }
 
-		wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
-		do_action( 'getpaid_invoice_save_items', $invoice );
+        wp_cache_delete( $invoice->get_id(), 'getpaid_invoice_cart_details' );
+        do_action( 'getpaid_invoice_save_items', $invoice );
 
-	}
+    }
 
-	/**
+    /**
      * Deletes an invoice's cart details from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function delete_items( $invoice ) {
-		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
-	}
+        $table = $GLOBALS['wpdb']->prefix . 'getpaid_invoice_items';
+        return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    }
 
-	/**
+    /**
      * Deletes an invoice's special fields from the database.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice object.
+     *
+     * @param WPInv_Invoice $invoice Invoice object.
      */
     public function delete_special_fields( $invoice ) {
-		$table = $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
-		return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
-	}
-
-	/**
-	 * Get the status to save to the post object.
-	 *
-	 *
-	 * @since 1.0.19
-	 * @param  WPInv_Invoice $object GetPaid_Data object.
-	 * @return string
-	 */
-	protected function get_post_status( $object ) {
-		$object_status = $object->get_status( 'edit' );
-
-		if ( ! $object_status ) {
-			$object_status = $object->get_default_status();
-		}
-
-		return $object_status;
-	}
+        $table = $GLOBALS['wpdb']->prefix . 'getpaid_invoices';
+        return $GLOBALS['wpdb']->delete( $table, array( 'post_id' => $invoice->get_id() ) );
+    }
+
+    /**
+     * Get the status to save to the post object.
+     *
+     *
+     * @since 1.0.19
+     * @param  WPInv_Invoice $object GetPaid_Data object.
+     * @return string
+     */
+    protected function get_post_status( $object ) {
+        $object_status = $object->get_status( 'edit' );
+
+        if ( ! $object_status ) {
+            $object_status = $object->get_default_status();
+        }
+
+        return $object_status;
+    }
 
 }

includes/class-wpinv-subscriptions.php

Indentation +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
 class WPInv_Subscriptions {
 
     /**
-	 * Class constructor.
-	 */
+     * Class constructor.
+     */
     public function __construct() {
 
         // Fire gateway specific hooks when a subscription changes.
@@ -89,12 +89,12 @@ 
     }
 
     /**
-	 * Processes subscription status changes.
+     * Processes subscription status changes.
      *
      * @param WPInv_Subscription $subscription
      * @param string $from
      * @param string $to
-	 */
+     */
     public function process_subscription_status_change( $subscription, $from, $to ) {
 
         $gateway = $subscription->get_gateway();

Spacing +171 added lines, -171 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 /**
  * Main Subscriptions class.
  *
@@ -17,28 +17,28 @@ 
     public function __construct() {
 
         // Fire gateway specific hooks when a subscription changes.
-        add_action( 'getpaid_subscription_status_changed', array( $this, 'process_subscription_status_change' ), 10, 3 );
+        add_action('getpaid_subscription_status_changed', array($this, 'process_subscription_status_change'), 10, 3);
 
         // De-activate a subscription whenever the invoice changes payment statuses.
         // add_action( 'getpaid_invoice_status_wpi-refunded', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
-        add_action( 'getpaid_invoice_status_wpi-failed', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
-        add_action( 'getpaid_invoice_status_wpi-cancelled', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
-        add_action( 'getpaid_invoice_status_wpi-pending', array( $this, 'maybe_deactivate_invoice_subscription' ), 20 );
+        add_action('getpaid_invoice_status_wpi-failed', array($this, 'maybe_deactivate_invoice_subscription'), 20);
+        add_action('getpaid_invoice_status_wpi-cancelled', array($this, 'maybe_deactivate_invoice_subscription'), 20);
+        add_action('getpaid_invoice_status_wpi-pending', array($this, 'maybe_deactivate_invoice_subscription'), 20);
 
         // Handles subscription cancelations.
-        add_action( 'getpaid_authenticated_action_subscription_cancel', array( $this, 'user_cancel_single_subscription' ) );
+        add_action('getpaid_authenticated_action_subscription_cancel', array($this, 'user_cancel_single_subscription'));
 
         // Create a subscription whenever an invoice is created, (and update it when it is updated).
-        add_action( 'wpinv_invoice_metabox_saved', array( $this, 'maybe_update_invoice_subscription' ), 5 );
-        add_action( 'getpaid_checkout_invoice_updated', array( $this, 'maybe_update_invoice_subscription' ), 5 );
+        add_action('wpinv_invoice_metabox_saved', array($this, 'maybe_update_invoice_subscription'), 5);
+        add_action('getpaid_checkout_invoice_updated', array($this, 'maybe_update_invoice_subscription'), 5);
 
         // Handles admin subscription update actions.
-        add_action( 'getpaid_authenticated_admin_action_update_single_subscription', array( $this, 'admin_update_single_subscription' ) );
-        add_action( 'getpaid_authenticated_admin_action_subscription_manual_renew', array( $this, 'admin_renew_single_subscription' ) );
-        add_action( 'getpaid_authenticated_admin_action_subscription_manual_delete', array( $this, 'admin_delete_single_subscription' ) );
+        add_action('getpaid_authenticated_admin_action_update_single_subscription', array($this, 'admin_update_single_subscription'));
+        add_action('getpaid_authenticated_admin_action_subscription_manual_renew', array($this, 'admin_renew_single_subscription'));
+        add_action('getpaid_authenticated_admin_action_subscription_manual_delete', array($this, 'admin_delete_single_subscription'));
 
         // Filter invoice item row actions.
-        add_action( 'getpaid-invoice-page-line-item-actions', array( $this, 'filter_invoice_line_item_actions' ), 10, 3 );
+        add_action('getpaid-invoice-page-line-item-actions', array($this, 'filter_invoice_line_item_actions'), 10, 3);
     }
 
     /**
@@ -47,19 +47,19 @@ 
      * @param WPInv_Invoice $invoice
      * @return WPInv_Subscription|bool
      */
-    public function get_invoice_subscription( $invoice ) {
+    public function get_invoice_subscription($invoice) {
         $subscription_id = $invoice->get_subscription_id();
 
         // Fallback to the parent invoice if the child invoice has no subscription id.
-        if ( empty( $subscription_id ) && $invoice->is_renewal() ) {
+        if (empty($subscription_id) && $invoice->is_renewal()) {
             $subscription_id = $invoice->get_parent_payment()->get_subscription_id();
         }
 
         // Fetch the subscription.
-        $subscription = new WPInv_Subscription( $subscription_id );
+        $subscription = new WPInv_Subscription($subscription_id);
 
         // Return subscription or use a fallback for backwards compatibility.
-        return $subscription->exists() ? $subscription : wpinv_get_invoice_subscription( $invoice );
+        return $subscription->exists() ? $subscription : wpinv_get_invoice_subscription($invoice);
     }
 
     /**
@@ -67,21 +67,21 @@ 
      *
      * @param WPInv_Invoice $invoice
      */
-    public function maybe_deactivate_invoice_subscription( $invoice ) {
+    public function maybe_deactivate_invoice_subscription($invoice) {
 
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( empty( $subscriptions ) ) {
+        if (empty($subscriptions)) {
             return;
         }
 
-        if ( ! is_array( $subscriptions ) ) {
-            $subscriptions = array( $subscriptions );
+        if (!is_array($subscriptions)) {
+            $subscriptions = array($subscriptions);
         }
 
-        foreach ( $subscriptions as $subscription ) {
-            if ( $subscription->is_active() ) {
-                $subscription->set_status( 'pending' );
+        foreach ($subscriptions as $subscription) {
+            if ($subscription->is_active()) {
+                $subscription->set_status('pending');
                 $subscription->save();
             }
         }
@@ -95,15 +95,15 @@ 
      * @param string $from
      * @param string $to
 	 */
-    public function process_subscription_status_change( $subscription, $from, $to ) {
+    public function process_subscription_status_change($subscription, $from, $to) {
 
         $gateway = $subscription->get_gateway();
 
-        if ( ! empty( $gateway ) ) {
-            $gateway = sanitize_key( $gateway );
-            $from    = sanitize_key( $from );
-            $to      = sanitize_key( $to );
-            do_action( "getpaid_{$gateway}_subscription_$to", $subscription, $from );
+        if (!empty($gateway)) {
+            $gateway = sanitize_key($gateway);
+            $from    = sanitize_key($from);
+            $to      = sanitize_key($to);
+            do_action("getpaid_{$gateway}_subscription_$to", $subscription, $from);
         }
 
     }
@@ -116,8 +116,8 @@ 
      * @deprecated
      * @return mixed|string|void
      */
-    public static function wpinv_get_pretty_subscription_frequency( $period, $frequency_count = 1 ) {
-        return getpaid_get_subscription_period_label( $period, $frequency_count );
+    public static function wpinv_get_pretty_subscription_frequency($period, $frequency_count = 1) {
+        return getpaid_get_subscription_period_label($period, $frequency_count);
     }
 
     /**
@@ -127,21 +127,21 @@ 
      * @since       1.0.0
      * @return      void
      */
-    public function user_cancel_single_subscription( $data ) {
+    public function user_cancel_single_subscription($data) {
 
         // Ensure there is a subscription to cancel.
-        if ( empty( $data['subscription'] ) ) {
+        if (empty($data['subscription'])) {
             return;
         }
 
-        $subscription = new WPInv_Subscription( (int) $data['subscription'] );
+        $subscription = new WPInv_Subscription((int) $data['subscription']);
 
         // Ensure that it exists and that it belongs to the current user.
-        if ( ! $subscription->exists() || $subscription->get_customer_id() != get_current_user_id() ) {
+        if (!$subscription->exists() || $subscription->get_customer_id() != get_current_user_id()) {
             $notice = 'perm_cancel_subscription';
 
         // Can it be cancelled.
-        } elseif ( ! $subscription->can_cancel() ) {
+        } elseif (!$subscription->can_cancel()) {
             $notice = 'cannot_cancel_subscription';
 
         // Cancel it.
@@ -157,7 +157,7 @@ 
             'wpinv-notice'   => $notice,
         );
 
-        wp_safe_redirect( add_query_arg( $redirect ) );
+        wp_safe_redirect(add_query_arg($redirect));
         exit;
 
     }
@@ -169,41 +169,41 @@ 
      * @param       WPInv_Invoice $invoice
      * @since       1.0.0
      */
-    public function maybe_create_invoice_subscription( $invoice ) {
+    public function maybe_create_invoice_subscription($invoice) {
         global $getpaid_subscriptions_skip_invoice_update;
 
         // Abort if it is not recurring.
-        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_free() || ! $invoice->is_recurring() || $invoice->is_renewal() ) {
+        if (!$invoice->is_type('invoice') || $invoice->is_free() || !$invoice->is_recurring() || $invoice->is_renewal()) {
             return;
         }
 
         // Either group the subscriptions or only process a single suscription.
-        if ( getpaid_should_group_subscriptions( $invoice ) ) {
+        if (getpaid_should_group_subscriptions($invoice)) {
 
             $subscription_groups = array();
             $is_first            = true;
 
-            foreach ( getpaid_calculate_subscription_totals( $invoice ) as $group_key => $totals ) {
-                $subscription_groups[ $group_key ] = $this->create_invoice_subscription_group( $totals, $invoice, 0, $is_first );
+            foreach (getpaid_calculate_subscription_totals($invoice) as $group_key => $totals) {
+                $subscription_groups[$group_key] = $this->create_invoice_subscription_group($totals, $invoice, 0, $is_first);
 
-                if ( $is_first ) {
+                if ($is_first) {
                     $getpaid_subscriptions_skip_invoice_update = true;
-                    $invoice->set_subscription_id( $subscription_groups[ $group_key ]['subscription_id'] );
+                    $invoice->set_subscription_id($subscription_groups[$group_key]['subscription_id']);
                     $invoice->save();
                     $getpaid_subscriptions_skip_invoice_update = false;
                 }
 
-                $is_first                          = false;
+                $is_first = false;
             }
 
             // Cache subscription groups.
-            update_post_meta( $invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups );
+            update_post_meta($invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups);
             return true;
 
         }
 
         $subscription = new WPInv_Subscription();
-        return $this->update_invoice_subscription( $subscription, $invoice );
+        return $this->update_invoice_subscription($subscription, $invoice);
 
     }
 
@@ -218,46 +218,46 @@ 
      *
      * @since       2.3.0
      */
-    public function create_invoice_subscription_group( $totals, $invoice, $subscription_id = 0, $is_first = false ) {
+    public function create_invoice_subscription_group($totals, $invoice, $subscription_id = 0, $is_first = false) {
 
-        $subscription  = new WPInv_Subscription( (int) $subscription_id );
+        $subscription  = new WPInv_Subscription((int) $subscription_id);
         $initial_amt   = $totals['initial_total'];
         $recurring_amt = $totals['recurring_total'];
         $fees          = array();
 
         // Maybe add recurring fees.
-        if ( $is_first ) {
+        if ($is_first) {
 
-            foreach ( $invoice->get_fees() as $i => $fee ) {
-                if ( ! empty( $fee['recurring_fee'] ) ) {
-                    $initial_amt   += wpinv_sanitize_amount( $fee['initial_fee'] );
-                    $recurring_amt += wpinv_sanitize_amount( $fee['recurring_fee'] );
-                    $fees[ $i ]       = $fee;
+            foreach ($invoice->get_fees() as $i => $fee) {
+                if (!empty($fee['recurring_fee'])) {
+                    $initial_amt   += wpinv_sanitize_amount($fee['initial_fee']);
+                    $recurring_amt += wpinv_sanitize_amount($fee['recurring_fee']);
+                    $fees[$i] = $fee;
                 }
             }
         }
 
-        $subscription->set_customer_id( $invoice->get_user_id() );
-        $subscription->set_parent_invoice_id( $invoice->get_id() );
-        $subscription->set_initial_amount( $initial_amt );
-        $subscription->set_recurring_amount( $recurring_amt );
-        $subscription->set_date_created( current_time( 'mysql' ) );
-        $subscription->set_status( $invoice->is_paid() ? 'active' : 'pending' );
-        $subscription->set_product_id( $totals['item_id'] );
-        $subscription->set_period( $totals['period'] );
-        $subscription->set_frequency( $totals['interval'] );
-        $subscription->set_bill_times( $totals['recurring_limit'] );
-        $subscription->set_next_renewal_date( $totals['renews_on'] );
+        $subscription->set_customer_id($invoice->get_user_id());
+        $subscription->set_parent_invoice_id($invoice->get_id());
+        $subscription->set_initial_amount($initial_amt);
+        $subscription->set_recurring_amount($recurring_amt);
+        $subscription->set_date_created(current_time('mysql'));
+        $subscription->set_status($invoice->is_paid() ? 'active' : 'pending');
+        $subscription->set_product_id($totals['item_id']);
+        $subscription->set_period($totals['period']);
+        $subscription->set_frequency($totals['interval']);
+        $subscription->set_bill_times($totals['recurring_limit']);
+        $subscription->set_next_renewal_date($totals['renews_on']);
 
         // Trial periods.
-        if ( ! empty( $totals['trialling'] ) ) {
-            $subscription->set_trial_period( $totals['trialling'] );
-            $subscription->set_status( 'trialling' );
+        if (!empty($totals['trialling'])) {
+            $subscription->set_trial_period($totals['trialling']);
+            $subscription->set_status('trialling');
 
         // If initial amount is free, treat it as a free trial even if the subscription item does not have a free trial.
-        } elseif ( empty( $initial_amt ) ) {
-            $subscription->set_trial_period( $totals['interval'] . ' ' . $totals['period'] );
-            $subscription->set_status( 'trialling' );
+        } elseif (empty($initial_amt)) {
+            $subscription->set_trial_period($totals['interval'] . ' ' . $totals['period']);
+            $subscription->set_status('trialling');
         }
 
         $subscription->save();
@@ -275,86 +275,86 @@ 
      * @param       WPInv_Invoice $invoice
      * @since       1.0.19
      */
-    public function maybe_update_invoice_subscription( $invoice ) {
+    public function maybe_update_invoice_subscription($invoice) {
         global $getpaid_subscriptions_skip_invoice_update;
 
         // Avoid infinite loops.
-        if ( ! empty( $getpaid_subscriptions_skip_invoice_update ) ) {
+        if (!empty($getpaid_subscriptions_skip_invoice_update)) {
             return;
         }
 
         // Do not process renewals.
-        if ( $invoice->is_renewal() ) {
+        if ($invoice->is_renewal()) {
             return;
         }
 
         // Delete existing subscriptions if available and the invoice is not recurring.
-        if ( ! $invoice->is_recurring() ) {
-            $this->delete_invoice_subscriptions( $invoice );
+        if (!$invoice->is_recurring()) {
+            $this->delete_invoice_subscriptions($invoice);
             return;
         }
 
         // Fetch existing subscriptions.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
         // Create new ones if no existing subscriptions.
-        if ( empty( $subscriptions ) ) {
-            return $this->maybe_create_invoice_subscription( $invoice );
+        if (empty($subscriptions)) {
+            return $this->maybe_create_invoice_subscription($invoice);
         }
 
         // Abort if an invoice is paid and already has a subscription.
-        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+        if ($invoice->is_paid() || $invoice->is_refunded()) {
             return;
         }
 
-        $is_grouped   = is_array( $subscriptions );
-        $should_group = getpaid_should_group_subscriptions( $invoice );
+        $is_grouped   = is_array($subscriptions);
+        $should_group = getpaid_should_group_subscriptions($invoice);
 
         // Ensure that the subscriptions are only grouped if there are more than 1 recurring items.
-        if ( $is_grouped != $should_group ) {
-            $this->delete_invoice_subscriptions( $invoice );
-            delete_post_meta( $invoice->get_id(), 'getpaid_subscription_groups' );
-            return $this->maybe_create_invoice_subscription( $invoice );
+        if ($is_grouped != $should_group) {
+            $this->delete_invoice_subscriptions($invoice);
+            delete_post_meta($invoice->get_id(), 'getpaid_subscription_groups');
+            return $this->maybe_create_invoice_subscription($invoice);
         }
 
         // If there is only one recurring item...
-        if ( ! $is_grouped ) {
-            return $this->update_invoice_subscription( $subscriptions, $invoice );
+        if (!$is_grouped) {
+            return $this->update_invoice_subscription($subscriptions, $invoice);
         }
 
         // Process subscription groups.
-        $current_groups      = getpaid_get_invoice_subscription_groups( $invoice->get_id() );
+        $current_groups      = getpaid_get_invoice_subscription_groups($invoice->get_id());
         $subscription_groups = array();
         $is_first            = true;
 
         // Create new subscription groups.
-        foreach ( getpaid_calculate_subscription_totals( $invoice ) as $group_key => $totals ) {
-            $subscription_id                   = isset( $current_groups[ $group_key ] ) ? $current_groups[ $group_key ]['subscription_id'] : 0;
-            $subscription_groups[ $group_key ] = $this->create_invoice_subscription_group( $totals, $invoice, $subscription_id, $is_first );
+        foreach (getpaid_calculate_subscription_totals($invoice) as $group_key => $totals) {
+            $subscription_id                   = isset($current_groups[$group_key]) ? $current_groups[$group_key]['subscription_id'] : 0;
+            $subscription_groups[$group_key] = $this->create_invoice_subscription_group($totals, $invoice, $subscription_id, $is_first);
 
-            if ( $is_first && $invoice->get_subscription_id() !== $subscription_groups[ $group_key ]['subscription_id'] ) {
+            if ($is_first && $invoice->get_subscription_id() !== $subscription_groups[$group_key]['subscription_id']) {
                 $getpaid_subscriptions_skip_invoice_update = true;
-                $invoice->set_subscription_id( $subscription_groups[ $group_key ]['subscription_id'] );
+                $invoice->set_subscription_id($subscription_groups[$group_key]['subscription_id']);
                 $invoice->save();
                 $getpaid_subscriptions_skip_invoice_update = false;
             }
 
-            $is_first                          = false;
+            $is_first = false;
         }
 
         // Delete non-existent subscription groups.
-        foreach ( $current_groups as $group_key => $data ) {
-            if ( ! isset( $subscription_groups[ $group_key ] ) ) {
-                $subscription = new WPInv_Subscription( (int) $data['subscription_id'] );
+        foreach ($current_groups as $group_key => $data) {
+            if (!isset($subscription_groups[$group_key])) {
+                $subscription = new WPInv_Subscription((int) $data['subscription_id']);
 
-                if ( $subscription->exists() ) {
-                    $subscription->delete( true );
+                if ($subscription->exists()) {
+                    $subscription->delete(true);
                 }
 }
         }
 
         // Cache subscription groups.
-        update_post_meta( $invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups );
+        update_post_meta($invoice->get_id(), 'getpaid_subscription_groups', $subscription_groups);
         return true;
 
     }
@@ -364,20 +364,20 @@ 
      *
      * @param WPInv_Invoice $invoice
      */
-    public function delete_invoice_subscriptions( $invoice ) {
+    public function delete_invoice_subscriptions($invoice) {
 
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( empty( $subscriptions ) ) {
+        if (empty($subscriptions)) {
             return;
         }
 
-        if ( ! is_array( $subscriptions ) ) {
-            $subscriptions = array( $subscriptions );
+        if (!is_array($subscriptions)) {
+            $subscriptions = array($subscriptions);
         }
 
-        foreach ( $subscriptions as $subscription ) {
-            $subscription->delete( true );
+        foreach ($subscriptions as $subscription) {
+            $subscription->delete(true);
         }
 
     }
@@ -390,57 +390,57 @@ 
      * @param       WPInv_Invoice $invoice
      * @since       1.0.19
      */
-    public function update_invoice_subscription( $subscription, $invoice ) {
+    public function update_invoice_subscription($subscription, $invoice) {
 
         // Delete the subscription if an invoice is free or nolonger recurring.
-        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_free() || ! $invoice->is_recurring() ) {
+        if (!$invoice->is_type('invoice') || $invoice->is_free() || !$invoice->is_recurring()) {
             return $subscription->delete();
         }
 
-        $subscription->set_customer_id( $invoice->get_user_id() );
-        $subscription->set_parent_invoice_id( $invoice->get_id() );
-        $subscription->set_initial_amount( $invoice->get_initial_total() );
-        $subscription->set_recurring_amount( $invoice->get_recurring_total() );
-        $subscription->set_date_created( current_time( 'mysql' ) );
-        $subscription->set_status( $invoice->is_paid() ? 'active' : 'pending' );
+        $subscription->set_customer_id($invoice->get_user_id());
+        $subscription->set_parent_invoice_id($invoice->get_id());
+        $subscription->set_initial_amount($invoice->get_initial_total());
+        $subscription->set_recurring_amount($invoice->get_recurring_total());
+        $subscription->set_date_created(current_time('mysql'));
+        $subscription->set_status($invoice->is_paid() ? 'active' : 'pending');
 
         // Get the recurring item and abort if it does not exist.
-        $subscription_item = $invoice->get_recurring( true );
-        if ( ! $subscription_item->get_id() ) {
-            $invoice->set_subscription_id( 0 );
+        $subscription_item = $invoice->get_recurring(true);
+        if (!$subscription_item->get_id()) {
+            $invoice->set_subscription_id(0);
             $invoice->save();
             return $subscription->delete();
         }
 
-        $subscription->set_product_id( $subscription_item->get_id() );
-        $subscription->set_period( $subscription_item->get_recurring_period( true ) );
-        $subscription->set_frequency( $subscription_item->get_recurring_interval() );
-        $subscription->set_bill_times( $subscription_item->get_recurring_limit() );
+        $subscription->set_product_id($subscription_item->get_id());
+        $subscription->set_period($subscription_item->get_recurring_period(true));
+        $subscription->set_frequency($subscription_item->get_recurring_interval());
+        $subscription->set_bill_times($subscription_item->get_recurring_limit());
 
         // Calculate the next renewal date.
-        $period       = $subscription_item->get_recurring_period( true );
+        $period       = $subscription_item->get_recurring_period(true);
         $interval     = $subscription_item->get_recurring_interval();
 
         // If the subscription item has a trial period...
-        if ( $subscription_item->has_free_trial() ) {
-            $period   = $subscription_item->get_trial_period( true );
+        if ($subscription_item->has_free_trial()) {
+            $period   = $subscription_item->get_trial_period(true);
             $interval = $subscription_item->get_trial_interval();
-            $subscription->set_trial_period( $interval . ' ' . $period );
-            $subscription->set_status( 'trialling' );
+            $subscription->set_trial_period($interval . ' ' . $period);
+            $subscription->set_status('trialling');
         }
 
         // If initial amount is free, treat it as a free trial even if the subscription item does not have a free trial.
-        if ( $invoice->has_free_trial() ) {
-            $subscription->set_trial_period( $interval . ' ' . $period );
-            $subscription->set_status( 'trialling' );
+        if ($invoice->has_free_trial()) {
+            $subscription->set_trial_period($interval . ' ' . $period);
+            $subscription->set_status('trialling');
         }
 
         // Calculate the next renewal date.
-        $expiration = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", strtotime( $subscription->get_date_created() ) ) );
+        $expiration = date('Y-m-d H:i:s', strtotime("+$interval $period", strtotime($subscription->get_date_created())));
 
-        $subscription->set_next_renewal_date( $expiration );
+        $subscription->set_next_renewal_date($expiration);
         $subscription->save();
-        $invoice->set_subscription_id( $subscription->get_id() );
+        $invoice->set_subscription_id($subscription->get_id());
         return $subscription->get_id();
 
     }
@@ -451,34 +451,34 @@ 
      * @param       array $data
      * @since       1.0.19
      */
-    public function admin_update_single_subscription( $args ) {
+    public function admin_update_single_subscription($args) {
 
         // Ensure the subscription exists and that a status has been given.
-        if ( empty( $args['subscription_id'] ) ) {
+        if (empty($args['subscription_id'])) {
             return;
         }
 
         // Retrieve the subscriptions.
-        $subscription = new WPInv_Subscription( $args['subscription_id'] );
+        $subscription = new WPInv_Subscription($args['subscription_id']);
 
-        if ( $subscription->get_id() ) {
+        if ($subscription->get_id()) {
 
             $subscription->set_props(
                 array(
-                    'status'       => isset( $args['subscription_status'] ) ? $args['subscription_status'] : null,
-                    'profile_id'   => isset( $args['wpinv_subscription_profile_id'] ) ? $args['wpinv_subscription_profile_id'] : null,
-                    'date_created' => ! empty( $args['wpinv_subscription_date_created'] ) ? $args['wpinv_subscription_date_created'] : null,
-                    'expiration'   => ! empty( $args['wpinv_subscription_expiration'] ) ? $args['wpinv_subscription_expiration'] : null,
-                    'bill_times'   => ! empty( $args['wpinv_subscription_max_bill_times'] ) ? $args['wpinv_subscription_max_bill_times'] : null,
+                    'status'       => isset($args['subscription_status']) ? $args['subscription_status'] : null,
+                    'profile_id'   => isset($args['wpinv_subscription_profile_id']) ? $args['wpinv_subscription_profile_id'] : null,
+                    'date_created' => !empty($args['wpinv_subscription_date_created']) ? $args['wpinv_subscription_date_created'] : null,
+                    'expiration'   => !empty($args['wpinv_subscription_expiration']) ? $args['wpinv_subscription_expiration'] : null,
+                    'bill_times'   => !empty($args['wpinv_subscription_max_bill_times']) ? $args['wpinv_subscription_max_bill_times'] : null,
                 )
             );
 
             $changes = $subscription->get_changes();
 
             $subscription->save();
-            getpaid_admin()->show_info( __( 'Subscription updated', 'invoicing' ) );
+            getpaid_admin()->show_info(__('Subscription updated', 'invoicing'));
 
-            do_action( 'getpaid_admin_updated_subscription', $subscription, $args, $changes );
+            do_action('getpaid_admin_updated_subscription', $subscription, $args, $changes);
         }
 
     }
@@ -489,27 +489,27 @@ 
      * @param       array $data
      * @since       1.0.19
      */
-    public function admin_renew_single_subscription( $args ) {
+    public function admin_renew_single_subscription($args) {
 
         // Ensure the subscription exists and that a status has been given.
-        if ( empty( $args['id'] ) ) {
+        if (empty($args['id'])) {
             return;
         }
 
         // Retrieve the subscriptions.
-        $subscription = new WPInv_Subscription( $args['id'] );
+        $subscription = new WPInv_Subscription($args['id']);
 
-        if ( $subscription->get_id() ) {
+        if ($subscription->get_id()) {
 
-            do_action( 'getpaid_admin_renew_subscription', $subscription );
+            do_action('getpaid_admin_renew_subscription', $subscription);
 
-            $args = array( 'transaction_id', $subscription->get_parent_invoice()->generate_key( 'renewal_' ) );
+            $args = array('transaction_id', $subscription->get_parent_invoice()->generate_key('renewal_'));
 
-            if ( ! $subscription->add_payment( $args ) ) {
-                getpaid_admin()->show_error( __( 'We are unable to renew this subscription as the parent invoice does not exist.', 'invoicing' ) );
+            if (!$subscription->add_payment($args)) {
+                getpaid_admin()->show_error(__('We are unable to renew this subscription as the parent invoice does not exist.', 'invoicing'));
             } else {
                 $subscription->renew();
-                getpaid_admin()->show_info( __( 'This subscription has been renewed and extended.', 'invoicing' ) );
+                getpaid_admin()->show_info(__('This subscription has been renewed and extended.', 'invoicing'));
             }
 
             wp_safe_redirect(
@@ -532,20 +532,20 @@ 
      * @param       array $data
      * @since       1.0.19
      */
-    public function admin_delete_single_subscription( $args ) {
+    public function admin_delete_single_subscription($args) {
 
         // Ensure the subscription exists and that a status has been given.
-        if ( empty( $args['id'] ) ) {
+        if (empty($args['id'])) {
             return;
         }
 
         // Retrieve the subscriptions.
-        $subscription = new WPInv_Subscription( $args['id'] );
+        $subscription = new WPInv_Subscription($args['id']);
 
-        if ( $subscription->delete() ) {
-            getpaid_admin()->show_info( __( 'This subscription has been deleted.', 'invoicing' ) );
+        if ($subscription->delete()) {
+            getpaid_admin()->show_info(__('This subscription has been deleted.', 'invoicing'));
         } else {
-            getpaid_admin()->show_error( __( 'We are unable to delete this subscription. Please try again.', 'invoicing' ) );
+            getpaid_admin()->show_error(__('We are unable to delete this subscription. Please try again.', 'invoicing'));
         }
 
         $redirected = wp_safe_redirect(
@@ -558,7 +558,7 @@ 
             )
         );
 
-        if ( $redirected ) {
+        if ($redirected) {
             exit;
         }
 
@@ -571,16 +571,16 @@ 
      * @param WPInv_Item $item
      * @param WPInv_Invoice $invoice
      */
-    public function filter_invoice_line_item_actions( $actions, $item, $invoice ) {
+    public function filter_invoice_line_item_actions($actions, $item, $invoice) {
 
         // Abort if this invoice uses subscription groups.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-        if ( ! $invoice->is_recurring() || ! is_object( $subscriptions ) ) {
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
+        if (!$invoice->is_recurring() || !is_object($subscriptions)) {
             return $actions;
         }
 
         // Fetch item subscription.
-        $args  = array(
+        $args = array(
             'invoice_in'  => $invoice->is_parent() ? $invoice->get_id() : $invoice->get_parent_id(),
             'product_in'  => $item->get_id(),
             'number'      => 1,
@@ -588,13 +588,13 @@ 
             'fields'      => 'id',
         );
 
-        $subscription = new GetPaid_Subscriptions_Query( $args );
+        $subscription = new GetPaid_Subscriptions_Query($args);
         $subscription = $subscription->get_results();
 
         // In case we found a match...
-        if ( ! empty( $subscription ) ) {
-            $url                     = esc_url( add_query_arg( 'subscription', (int) $subscription[0], get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) );
-            $actions['subscription'] = "<a href='$url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+        if (!empty($subscription)) {
+            $url                     = esc_url(add_query_arg('subscription', (int) $subscription[0], get_permalink((int) wpinv_get_option('invoice_subscription_page'))));
+            $actions['subscription'] = "<a href='$url' class='text-decoration-none'>" . __('Manage Subscription', 'invoicing') . '</a>';
         }
 
         return $actions;

includes/wpinv-gateway-functions.php

Indentation +28 added lines, -28 removed lines

@@ -271,26 +271,26 @@ 
 }
 
 function wpinv_get_chosen_gateway( $invoice_id = 0 ) {
-	$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+    $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
 
     $chosen = false;
     if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) {
         $chosen = $invoice->get_gateway();
     }
 
-	$chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
+    $chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
 
-	if ( false !== $chosen ) {
-		$chosen = preg_replace( '/[^a-zA-Z0-9-_]+/', '', $chosen );
-	}
+    if ( false !== $chosen ) {
+        $chosen = preg_replace( '/[^a-zA-Z0-9-_]+/', '', $chosen );
+    }
 
-	if ( ! empty( $chosen ) ) {
-		$enabled_gateway = urldecode( $chosen );
-	} elseif ( ! empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
-		$enabled_gateway = 'manual';
-	} else {
-		$enabled_gateway = wpinv_get_default_gateway();
-	}
+    if ( ! empty( $chosen ) ) {
+        $enabled_gateway = urldecode( $chosen );
+    } elseif ( ! empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
+        $enabled_gateway = 'manual';
+    } else {
+        $enabled_gateway = wpinv_get_default_gateway();
+    }
 
     if ( ! wpinv_is_gateway_active( $enabled_gateway ) && ! empty( $gateways ) ) {
         if ( wpinv_is_gateway_active( wpinv_get_default_gateway() ) ) {
@@ -300,7 +300,7 @@ 
         }
 }
 
-	return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
+    return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
 }
 
 function wpinv_record_gateway_error( $title = '', $message = '' ) {
@@ -308,22 +308,22 @@ 
 }
 
 function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
-	$ret  = 0;
-	$args = array(
-		'meta_key'    => '_wpinv_gateway',
-		'meta_value'  => $gateway_id,
-		'nopaging'    => true,
-		'post_type'   => 'wpi_invoice',
-		'post_status' => $status,
-		'fields'      => 'ids',
-	);
-
-	$payments = new WP_Query( $args );
-
-	if ( $payments ) {
-		$ret = $payments->post_count;
+    $ret  = 0;
+    $args = array(
+        'meta_key'    => '_wpinv_gateway',
+        'meta_value'  => $gateway_id,
+        'nopaging'    => true,
+        'post_type'   => 'wpi_invoice',
+        'post_status' => $status,
+        'fields'      => 'ids',
+    );
+
+    $payments = new WP_Query( $args );
+
+    if ( $payments ) {
+        $ret = $payments->post_count;
     }
-	return $ret;
+    return $ret;
 }
 
 /**

Spacing +123 added lines, -123 removed lines

@@ -3,7 +3,7 @@ 
  * Contains gateway functions.
  *
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of payment gateways.
@@ -11,30 +11,30 @@ 
  * @return array
  */
 function wpinv_get_payment_gateways() {
-    return apply_filters( 'wpinv_payment_gateways', array() );
+    return apply_filters('wpinv_payment_gateways', array());
 }
 
-function wpinv_payment_gateway_titles( $all_gateways ) {
+function wpinv_payment_gateway_titles($all_gateways) {
 
     $options  = wpinv_get_options();
     $gateways = array();
-    foreach ( $all_gateways as $key => $gateway ) {
-        if ( ! empty( $options[ $key . '_title' ] ) ) {
-            $all_gateways[ $key ]['checkout_label'] = __( $options[ $key . '_title' ], 'invoicing' );
+    foreach ($all_gateways as $key => $gateway) {
+        if (!empty($options[$key . '_title'])) {
+            $all_gateways[$key]['checkout_label'] = __($options[$key . '_title'], 'invoicing');
         }
 
-        $gateways[ $key ] = isset( $options[ $key . '_ordering' ] ) ? $options[ $key . '_ordering' ] : ( isset( $gateway['ordering'] ) ? $gateway['ordering'] : '' );
+        $gateways[$key] = isset($options[$key . '_ordering']) ? $options[$key . '_ordering'] : (isset($gateway['ordering']) ? $gateway['ordering'] : '');
     }
 
-    asort( $gateways );
+    asort($gateways);
 
-    foreach ( $gateways as $gateway => $key ) {
-        $gateways[ $gateway ] = $all_gateways[ $gateway ];
+    foreach ($gateways as $gateway => $key) {
+        $gateways[$gateway] = $all_gateways[$gateway];
     }
 
     return $gateways;
 }
-add_filter( 'wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1 );
+add_filter('wpinv_payment_gateways', 'wpinv_payment_gateway_titles', 1000, 1);
 
 /**
  * Returns an array of enabled gateways.
@@ -42,36 +42,36 @@ 
  * @param bool $sort
  * @return array
  */
-function wpinv_get_enabled_payment_gateways( $sort = false ) {
+function wpinv_get_enabled_payment_gateways($sort = false) {
 
     $enabled = array();
 
-    foreach ( wpinv_get_payment_gateways() as $gateway => $data ) {
+    foreach (wpinv_get_payment_gateways() as $gateway => $data) {
 
-        if ( (int) wpinv_get_option( "{$gateway}_active", $gateway === 'manual' ) === 1 ) {
-            $enabled[ $gateway ] = $data;
+        if ((int) wpinv_get_option("{$gateway}_active", $gateway === 'manual') === 1) {
+            $enabled[$gateway] = $data;
         }
 }
 
-    if ( true === $sort ) {
-        uasort( $enabled, 'wpinv_sort_gateway_order' );
+    if (true === $sort) {
+        uasort($enabled, 'wpinv_sort_gateway_order');
 
         // Reorder our gateways so the default is first
         $default_gateway_id = wpinv_get_default_gateway();
-        if ( isset( $enabled[ $default_gateway_id ] ) ) {
+        if (isset($enabled[$default_gateway_id])) {
             $default_gateway = array(
-                $default_gateway_id => $enabled[ $default_gateway_id ],
+                $default_gateway_id => $enabled[$default_gateway_id],
             );
 
-            unset( $enabled[ $default_gateway_id ] );
-            $enabled = array_merge( $default_gateway, $enabled );
+            unset($enabled[$default_gateway_id]);
+            $enabled = array_merge($default_gateway, $enabled);
         }
 }
 
-    return apply_filters( 'wpinv_enabled_payment_gateways', $enabled );
+    return apply_filters('wpinv_enabled_payment_gateways', $enabled);
 }
 
-function wpinv_sort_gateway_order( $a, $b ) {
+function wpinv_sort_gateway_order($a, $b) {
     return $a['ordering'] - $b['ordering'];
 }
 
@@ -81,9 +81,9 @@ 
  * @param string $gateway
  * @return bool
  */
-function wpinv_is_gateway_active( $gateway ) {
-    $is_active = (int) wpinv_get_option( "{$gateway}_active", $gateway === 'manual' ) === 1;
-    return apply_filters( 'wpinv_is_gateway_active', $is_active, $gateway );
+function wpinv_is_gateway_active($gateway) {
+    $is_active = (int) wpinv_get_option("{$gateway}_active", $gateway === 'manual') === 1;
+    return apply_filters('wpinv_is_gateway_active', $is_active, $gateway);
 }
 
 /**
@@ -92,11 +92,11 @@ 
  * @return string|false
  */
 function wpinv_get_default_gateway() {
-    $default  = wpinv_get_option( 'default_gateway' );
+    $default  = wpinv_get_option('default_gateway');
     $gateways = wpinv_get_enabled_payment_gateways();
-    $default  = ! empty( $default ) && isset( $gateways[ $default ] ) ? $default : false;
+    $default  = !empty($default) && isset($gateways[$default]) ? $default : false;
 
-    return apply_filters( 'wpinv_default_gateway', $default );
+    return apply_filters('wpinv_default_gateway', $default);
 }
 
 /**
@@ -105,17 +105,17 @@ 
  * @param string $gateway The gateway to key.
  * @return string
  */
-function wpinv_get_gateway_admin_label( $gateway ) {
+function wpinv_get_gateway_admin_label($gateway) {
 
-    if ( empty( $gateway ) || 'none' == $gateway ) {
-        return esc_html__( 'No Gateway', 'invoicing' );
+    if (empty($gateway) || 'none' == $gateway) {
+        return esc_html__('No Gateway', 'invoicing');
     }
 
     $gateways = wpinv_get_payment_gateways();
-    $label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway;
-    $gateway  = apply_filters( 'wpinv_gateway_admin_label', $label, $gateway );
+    $label    = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway;
+    $gateway  = apply_filters('wpinv_gateway_admin_label', $label, $gateway);
 
-    return wpinv_clean( $gateway );
+    return wpinv_clean($gateway);
 }
 
 /**
@@ -123,48 +123,48 @@ 
  *
  * @param string $gateway
  */
-function wpinv_get_gateway_description( $gateway ) {
+function wpinv_get_gateway_description($gateway) {
 
     $options     = wpinv_get_options();
-    $description = ! empty( $options[ $gateway . '_desc' ] ) ? $options[ $gateway . '_desc' ] : '';
+    $description = !empty($options[$gateway . '_desc']) ? $options[$gateway . '_desc'] : '';
 
-    return apply_filters( 'wpinv_gateway_description', $description, $gateway );
+    return apply_filters('wpinv_gateway_description', $description, $gateway);
 }
 
-function wpinv_get_gateway_button_label( $gateway ) {
-    return apply_filters( 'wpinv_gateway_' . $gateway . '_button_label', '' );
+function wpinv_get_gateway_button_label($gateway) {
+    return apply_filters('wpinv_gateway_' . $gateway . '_button_label', '');
 }
 
-function wpinv_get_gateway_checkout_label( $gateway ) {
+function wpinv_get_gateway_checkout_label($gateway) {
     $gateways = wpinv_get_payment_gateways();
-    $label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['checkout_label'] : $gateway;
+    $label    = isset($gateways[$gateway]) ? $gateways[$gateway]['checkout_label'] : $gateway;
 
-    if ( $gateway == 'none' ) {
-        $label = __( 'None', 'invoicing' );
+    if ($gateway == 'none') {
+        $label = __('None', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_gateway_checkout_label', ucfirst( $label ), $gateway );
+    return apply_filters('wpinv_gateway_checkout_label', ucfirst($label), $gateway);
 }
 
-function wpinv_settings_sections_gateways( $settings ) {
+function wpinv_settings_sections_gateways($settings) {
     $gateways = wpinv_get_payment_gateways();
-    ksort( $gateways );
+    ksort($gateways);
 
-    foreach ( $gateways as $key => $gateway ) {
-        $settings[ $key ] = $gateway['admin_label'];
+    foreach ($gateways as $key => $gateway) {
+        $settings[$key] = $gateway['admin_label'];
     }
 
     return $settings;
 }
-add_filter( 'wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1 );
+add_filter('wpinv_settings_sections_gateways', 'wpinv_settings_sections_gateways', 10, 1);
 
 /**
  * Adds GateWay settings.
  */
-function wpinv_settings_gateways( $settings ) {
+function wpinv_settings_gateways($settings) {
 
     // Loop through each gateway.
-    foreach ( wpinv_get_payment_gateways() as $key => $gateway ) {
+    foreach (wpinv_get_payment_gateways() as $key => $gateway) {
 
         $gateway_settings = array(
 
@@ -172,7 +172,7 @@ 
             "{$key}_header"   => array(
 
                 'id'     => "{$key}_gateway_header",
-                'name'   => '<h3>' . wp_sprintf( __( '%s Settings', 'invoicing' ), $gateway['admin_label'] ) . '</h3>',
+                'name'   => '<h3>' . wp_sprintf(__('%s Settings', 'invoicing'), $gateway['admin_label']) . '</h3>',
                 'custom' => $key,
                 'type'   => 'gateway_header',
 
@@ -181,8 +181,8 @@ 
             // Activate/Deactivate a gateway.
             "{$key}_active"   => array(
                 'id'   => $key . '_active',
-                'name' => __( 'Activate', 'invoicing' ),
-                'desc' => wp_sprintf( __( 'Enable %s', 'invoicing' ), $gateway['admin_label'] ),
+                'name' => __('Activate', 'invoicing'),
+                'desc' => wp_sprintf(__('Enable %s', 'invoicing'), $gateway['admin_label']),
                 'type' => 'checkbox',
                 'std'  => $key === 'manual' ? '1' : '0',
             ),
@@ -190,8 +190,8 @@ 
             // Activate/Deactivate sandbox.
             "{$key}_sandbox"  => array(
                 'id'   => $key . '_sandbox',
-                'name' => __( 'Sandbox', 'invoicing' ),
-                'desc' => __( 'Enable sandbox to test payments', 'invoicing' ),
+                'name' => __('Sandbox', 'invoicing'),
+                'desc' => __('Enable sandbox to test payments', 'invoicing'),
                 'type' => 'checkbox',
                 'std'  => '1',
             ),
@@ -199,52 +199,52 @@ 
             // Checkout title.
             "{$key}_title"    => array(
                 'id'   => $key . '_title',
-                'name' => __( 'Checkout Title', 'invoicing' ),
-                'std'  => isset( $gateway['checkout_label'] ) ? $gateway['checkout_label'] : '',
+                'name' => __('Checkout Title', 'invoicing'),
+                'std'  => isset($gateway['checkout_label']) ? $gateway['checkout_label'] : '',
                 'type' => 'text',
             ),
 
             // Checkout description.
             "{$key}_desc"     => array(
                 'id'   => $key . '_desc',
-                'name' => __( 'Checkout Description', 'invoicing' ),
-                'std'  => apply_filters( "getpaid_default_{$key}_checkout_description", '' ),
+                'name' => __('Checkout Description', 'invoicing'),
+                'std'  => apply_filters("getpaid_default_{$key}_checkout_description", ''),
                 'type' => 'text',
             ),
 
             // Checkout order.
             "{$key}_ordering" => array(
                 'id'   => $key . '_ordering',
-                'name' => __( 'Priority', 'invoicing' ),
-                'std'  => apply_filters( "getpaid_default_{$key}_checkout_description", '' ),
+                'name' => __('Priority', 'invoicing'),
+                'std'  => apply_filters("getpaid_default_{$key}_checkout_description", ''),
                 'type' => 'number',
                 'step' => '1',
                 'min'  => '0',
                 'max'  => '100000',
-                'std'  => isset( $gateway['ordering'] ) ? $gateway['ordering'] : '10',
+                'std'  => isset($gateway['ordering']) ? $gateway['ordering'] : '10',
             ),
 
         );
 
         // Maybe remove the sandbox.
-        if ( ! getpaid_payment_gateway_supports( $key, 'sandbox' ) ) {
-            unset( $gateway_settings[ "{$key}_sandbox" ] );
+        if (!getpaid_payment_gateway_supports($key, 'sandbox')) {
+            unset($gateway_settings["{$key}_sandbox"]);
         }
 
-        $gateway_settings = apply_filters( 'wpinv_gateway_settings', $gateway_settings, $key, $gateway );
-        $gateway_settings = apply_filters( 'wpinv_gateway_settings_' . $key, $gateway_settings, $gateway );
+        $gateway_settings = apply_filters('wpinv_gateway_settings', $gateway_settings, $key, $gateway);
+        $gateway_settings = apply_filters('wpinv_gateway_settings_' . $key, $gateway_settings, $gateway);
 
-        $settings[ $key ] = $gateway_settings;
+        $settings[$key] = $gateway_settings;
     }
 
-    do_action( 'getpaid_after_gateway_settings', $settings );
+    do_action('getpaid_after_gateway_settings', $settings);
     return $settings;
 
 }
-add_filter( 'wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1 );
+add_filter('wpinv_settings_gateways', 'wpinv_settings_gateways', 10, 1);
 
-function wpinv_gateway_header_callback( $args ) {
-    echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr( $args['custom'] ) . '" />';
+function wpinv_gateway_header_callback($args) {
+    echo '<input type="hidden" id="wpinv_settings[save_gateway]" name="wpinv_settings[save_gateway]" value="' . esc_attr($args['custom']) . '" />';
 }
 
 /**
@@ -255,60 +255,60 @@ 
  * @return bool
  * @since 2.3.0
  */
-function getpaid_payment_gateway_supports( $gateway, $feature ) {
+function getpaid_payment_gateway_supports($gateway, $feature) {
 
     $supports = false;
 
-    $supports = apply_filters( "getpaid_{$gateway}_supports_{$feature}", false );
+    $supports = apply_filters("getpaid_{$gateway}_supports_{$feature}", false);
 
     // Backwards compatibility.
-    $supports = apply_filters( "wpinv_{$gateway}_supports_{$feature}", $supports );
-    $supports = apply_filters( "wpinv_{$gateway}_support_{$feature}", $supports );
+    $supports = apply_filters("wpinv_{$gateway}_supports_{$feature}", $supports);
+    $supports = apply_filters("wpinv_{$gateway}_support_{$feature}", $supports);
 
-    $supports = apply_filters( "getpaid_gateway_supports_{$feature}", $supports, $gateway );
-    $supports = apply_filters( 'getpaid_payment_gateway_supports', $supports, $feature, $gateway );
+    $supports = apply_filters("getpaid_gateway_supports_{$feature}", $supports, $gateway);
+    $supports = apply_filters('getpaid_payment_gateway_supports', $supports, $feature, $gateway);
 
     return $supports;
 }
 
-function wpinv_get_chosen_gateway( $invoice_id = 0 ) {
-	$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+function wpinv_get_chosen_gateway($invoice_id = 0) {
+	$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
     $chosen = false;
-    if ( $invoice_id > 0 && $invoice = wpinv_get_invoice( $invoice_id ) ) {
+    if ($invoice_id > 0 && $invoice = wpinv_get_invoice($invoice_id)) {
         $chosen = $invoice->get_gateway();
     }
 
-	$chosen   = isset( $_REQUEST['payment-mode'] ) ? sanitize_text_field( $_REQUEST['payment-mode'] ) : $chosen;
+	$chosen = isset($_REQUEST['payment-mode']) ? sanitize_text_field($_REQUEST['payment-mode']) : $chosen;
 
-	if ( false !== $chosen ) {
-		$chosen = preg_replace( '/[^a-zA-Z0-9-_]+/', '', $chosen );
+	if (false !== $chosen) {
+		$chosen = preg_replace('/[^a-zA-Z0-9-_]+/', '', $chosen);
 	}
 
-	if ( ! empty( $chosen ) ) {
-		$enabled_gateway = urldecode( $chosen );
-	} elseif ( ! empty( $invoice ) && (float)$invoice->get_subtotal() <= 0 ) {
+	if (!empty($chosen)) {
+		$enabled_gateway = urldecode($chosen);
+	} elseif (!empty($invoice) && (float) $invoice->get_subtotal() <= 0) {
 		$enabled_gateway = 'manual';
 	} else {
 		$enabled_gateway = wpinv_get_default_gateway();
 	}
 
-    if ( ! wpinv_is_gateway_active( $enabled_gateway ) && ! empty( $gateways ) ) {
-        if ( wpinv_is_gateway_active( wpinv_get_default_gateway() ) ) {
+    if (!wpinv_is_gateway_active($enabled_gateway) && !empty($gateways)) {
+        if (wpinv_is_gateway_active(wpinv_get_default_gateway())) {
             $enabled_gateway = wpinv_get_default_gateway();
         } else {
             $enabled_gateway = $gateways[0];
         }
 }
 
-	return apply_filters( 'wpinv_chosen_gateway', $enabled_gateway );
+	return apply_filters('wpinv_chosen_gateway', $enabled_gateway);
 }
 
-function wpinv_record_gateway_error( $title = '', $message = '' ) {
-    return wpinv_error_log( $message, $title );
+function wpinv_record_gateway_error($title = '', $message = '') {
+    return wpinv_error_log($message, $title);
 }
 
-function wpinv_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
+function wpinv_count_sales_by_gateway($gateway_id = 'paypal', $status = 'publish') {
 	$ret  = 0;
 	$args = array(
 		'meta_key'    => '_wpinv_gateway',
@@ -319,9 +319,9 @@ 
 		'fields'      => 'ids',
 	);
 
-	$payments = new WP_Query( $args );
+	$payments = new WP_Query($args);
 
-	if ( $payments ) {
+	if ($payments) {
 		$ret = $payments->post_count;
     }
 	return $ret;
@@ -330,11 +330,11 @@ 
 /**
  * Displays the ipn url field.
  */
-function wpinv_ipn_url_callback( $args ) {
-    $sanitize_id = esc_attr( wpinv_sanitize_key( $args['id'] ) );
+function wpinv_ipn_url_callback($args) {
+    $sanitize_id = esc_attr(wpinv_sanitize_key($args['id']));
 
-    echo '<input class="regular-text" type="text" ' . ( $args['readonly'] ? ' readonly' : '' ) . ' value="' . esc_attr( $args['std'] ) . '" name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" onClick="this.select()">';
-    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']">' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<input class="regular-text" type="text" ' . ($args['readonly'] ? ' readonly' : '') . ' value="' . esc_attr($args['std']) . '" name="wpinv_settings[' . esc_attr($sanitize_id) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" onClick="this.select()">';
+    echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']">' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
@@ -345,10 +345,10 @@ 
  *
  * @return bool
  */
-function wpinv_is_test_mode( $gateway = '' ) {
-    $sandbox  = empty( $gateway ) ? false : wpinv_get_option( "{$gateway}_sandbox", true );
-    $supports = getpaid_payment_gateway_supports( $gateway, 'sandbox' );
-    return apply_filters( 'wpinv_is_test_mode', $sandbox && $supports, $gateway );
+function wpinv_is_test_mode($gateway = '') {
+    $sandbox  = empty($gateway) ? false : wpinv_get_option("{$gateway}_sandbox", true);
+    $supports = getpaid_payment_gateway_supports($gateway, 'sandbox');
+    return apply_filters('wpinv_is_test_mode', $sandbox && $supports, $gateway);
 }
 
 /**
@@ -359,7 +359,7 @@ 
  *
  * @return string
  */
-function wpinv_get_ipn_url( $gateway = false, $args = array() ) {
+function wpinv_get_ipn_url($gateway = false, $args = array()) {
     $args = wp_parse_args(
         array(
             'wpi-listener' => 'IPN',
@@ -368,7 +368,7 @@ 
         $args
     );
 
-    return apply_filters( 'wpinv_ipn_url', add_query_arg( $args, home_url( 'index.php' ) ), $gateway, $args );
+    return apply_filters('wpinv_ipn_url', add_query_arg($args, home_url('index.php')), $gateway, $args);
 
 }
 
@@ -379,34 +379,34 @@ 
  *
  * @return string
  */
-function getpaid_get_non_query_string_ipn_url( $gateway ) {
-    $gateway = wpinv_sanitize_key( $gateway );
-    return home_url( "getpaid-ipn/$gateway" );
+function getpaid_get_non_query_string_ipn_url($gateway) {
+    $gateway = wpinv_sanitize_key($gateway);
+    return home_url("getpaid-ipn/$gateway");
 }
 
 
 /**
  * Retrieves request data with slashes removed slashes.
  */
-function wpinv_get_post_data( $method = 'request' ) {
+function wpinv_get_post_data($method = 'request') {
 
-    if ( $method == 'post' ) {
-        return wp_kses_post_deep( wp_unslash( $_POST ) );
+    if ($method == 'post') {
+        return wp_kses_post_deep(wp_unslash($_POST));
     }
 
-    if ( $method == 'get' ) {
-        return wp_kses_post_deep( wp_unslash( $_GET ) );
+    if ($method == 'get') {
+        return wp_kses_post_deep(wp_unslash($_GET));
     }
 
-    return wp_kses_post_deep( wp_unslash( $_REQUEST ) );
+    return wp_kses_post_deep(wp_unslash($_REQUEST));
 
 }
 
 /**
  * Checks if a given gateway supports subscription payments.
  */
-function wpinv_gateway_support_subscription( $gateway ) {
-    return getpaid_payment_gateway_supports( $gateway, 'subscription' );
+function wpinv_gateway_support_subscription($gateway) {
+    return getpaid_payment_gateway_supports($gateway, 'subscription');
 }
 
 /**
@@ -415,18 +415,18 @@ 
  * @param array $gateways an array of gateways.
  * @param GetPaid_Payment_Form $form payment form.
  */
-function wpinv_payment_gateways_on_cart( $gateways, $form ) {
+function wpinv_payment_gateways_on_cart($gateways, $form) {
 
-    if ( $form->is_recurring() ) {
+    if ($form->is_recurring()) {
 
-        foreach ( array_keys( $gateways ) as $gateway ) {
+        foreach (array_keys($gateways) as $gateway) {
 
-            if ( ! wpinv_gateway_support_subscription( $gateway ) ) {
-                unset( $gateways[ $gateway ] );
+            if (!wpinv_gateway_support_subscription($gateway)) {
+                unset($gateways[$gateway]);
             }
 }
 }
 
     return $gateways;
 }
-add_filter( 'getpaid_payment_form_gateways', 'wpinv_payment_gateways_on_cart', 10, 2 );
+add_filter('getpaid_payment_form_gateways', 'wpinv_payment_gateways_on_cart', 10, 2);

includes/data/countries.php

Indentation +252 added lines, -252 removed lines

@@ -12,256 +12,256 @@
 defined( 'ABSPATH' ) || exit;
 
 return array(
-	'US' => __( 'United States', 'invoicing' ),
-	'CA' => __( 'Canada', 'invoicing' ),
-	'GB' => __( 'United Kingdom', 'invoicing' ),
-	'AF' => __( 'Afghanistan', 'invoicing' ),
-	'AX' => __( 'Aland Islands', 'invoicing' ),
-	'AL' => __( 'Albania', 'invoicing' ),
-	'DZ' => __( 'Algeria', 'invoicing' ),
-	'AS' => __( 'American Samoa', 'invoicing' ),
-	'AD' => __( 'Andorra', 'invoicing' ),
-	'AO' => __( 'Angola', 'invoicing' ),
-	'AI' => __( 'Anguilla', 'invoicing' ),
-	'AQ' => __( 'Antarctica', 'invoicing' ),
-	'AG' => __( 'Antigua and Barbuda', 'invoicing' ),
-	'AR' => __( 'Argentina', 'invoicing' ),
-	'AM' => __( 'Armenia', 'invoicing' ),
-	'AW' => __( 'Aruba', 'invoicing' ),
-	'AU' => __( 'Australia', 'invoicing' ),
-	'AT' => __( 'Austria', 'invoicing' ),
-	'AZ' => __( 'Azerbaijan', 'invoicing' ),
-	'BS' => __( 'Bahamas', 'invoicing' ),
-	'BH' => __( 'Bahrain', 'invoicing' ),
-	'BD' => __( 'Bangladesh', 'invoicing' ),
-	'BB' => __( 'Barbados', 'invoicing' ),
-	'BY' => __( 'Belarus', 'invoicing' ),
-	'BE' => __( 'Belgium', 'invoicing' ),
-	'BZ' => __( 'Belize', 'invoicing' ),
-	'BJ' => __( 'Benin', 'invoicing' ),
-	'BM' => __( 'Bermuda', 'invoicing' ),
-	'BT' => __( 'Bhutan', 'invoicing' ),
-	'BO' => __( 'Bolivia', 'invoicing' ),
-	'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'invoicing' ),
-	'BA' => __( 'Bosnia and Herzegovina', 'invoicing' ),
-	'BW' => __( 'Botswana', 'invoicing' ),
-	'BV' => __( 'Bouvet Island', 'invoicing' ),
-	'BR' => __( 'Brazil', 'invoicing' ),
-	'IO' => __( 'British Indian Ocean Territory', 'invoicing' ),
-	'BN' => __( 'Brunei Darrussalam', 'invoicing' ),
-	'BG' => __( 'Bulgaria', 'invoicing' ),
-	'BF' => __( 'Burkina Faso', 'invoicing' ),
-	'BI' => __( 'Burundi', 'invoicing' ),
-	'KH' => __( 'Cambodia', 'invoicing' ),
-	'CM' => __( 'Cameroon', 'invoicing' ),
-	'CV' => __( 'Cape Verde', 'invoicing' ),
-	'KY' => __( 'Cayman Islands', 'invoicing' ),
-	'CF' => __( 'Central African Republic', 'invoicing' ),
-	'TD' => __( 'Chad', 'invoicing' ),
-	'CL' => __( 'Chile', 'invoicing' ),
-	'CN' => __( 'China', 'invoicing' ),
-	'CX' => __( 'Christmas Island', 'invoicing' ),
-	'CC' => __( 'Cocos Islands', 'invoicing' ),
-	'CO' => __( 'Colombia', 'invoicing' ),
-	'KM' => __( 'Comoros', 'invoicing' ),
-	'CD' => __( 'Congo, Democratic People\'s Republic', 'invoicing' ),
-	'CG' => __( 'Congo, Republic of', 'invoicing' ),
-	'CK' => __( 'Cook Islands', 'invoicing' ),
-	'CR' => __( 'Costa Rica', 'invoicing' ),
-	'CI' => __( 'Cote d\'Ivoire', 'invoicing' ),
-	'HR' => __( 'Croatia/Hrvatska', 'invoicing' ),
-	'CU' => __( 'Cuba', 'invoicing' ),
-	'CW' => __( 'CuraÇao', 'invoicing' ),
-	'CY' => __( 'Cyprus', 'invoicing' ),
-	'CZ' => __( 'Czech Republic', 'invoicing' ),
-	'DK' => __( 'Denmark', 'invoicing' ),
-	'DJ' => __( 'Djibouti', 'invoicing' ),
-	'DM' => __( 'Dominica', 'invoicing' ),
-	'DO' => __( 'Dominican Republic', 'invoicing' ),
-	'TP' => __( 'East Timor', 'invoicing' ),
-	'EC' => __( 'Ecuador', 'invoicing' ),
-	'EG' => __( 'Egypt', 'invoicing' ),
-	'GQ' => __( 'Equatorial Guinea', 'invoicing' ),
-	'SV' => __( 'El Salvador', 'invoicing' ),
-	'ER' => __( 'Eritrea', 'invoicing' ),
-	'EE' => __( 'Estonia', 'invoicing' ),
-	'ET' => __( 'Ethiopia', 'invoicing' ),
-	'FK' => __( 'Falkland Islands', 'invoicing' ),
-	'FO' => __( 'Faroe Islands', 'invoicing' ),
-	'FJ' => __( 'Fiji', 'invoicing' ),
-	'FI' => __( 'Finland', 'invoicing' ),
-	'FR' => __( 'France', 'invoicing' ),
-	'GF' => __( 'French Guiana', 'invoicing' ),
-	'PF' => __( 'French Polynesia', 'invoicing' ),
-	'TF' => __( 'French Southern Territories', 'invoicing' ),
-	'GA' => __( 'Gabon', 'invoicing' ),
-	'GM' => __( 'Gambia', 'invoicing' ),
-	'GE' => __( 'Georgia', 'invoicing' ),
-	'DE' => __( 'Germany', 'invoicing' ),
-	'GR' => __( 'Greece', 'invoicing' ),
-	'GH' => __( 'Ghana', 'invoicing' ),
-	'GI' => __( 'Gibraltar', 'invoicing' ),
-	'GL' => __( 'Greenland', 'invoicing' ),
-	'GD' => __( 'Grenada', 'invoicing' ),
-	'GP' => __( 'Guadeloupe', 'invoicing' ),
-	'GU' => __( 'Guam', 'invoicing' ),
-	'GT' => __( 'Guatemala', 'invoicing' ),
-	'GG' => __( 'Guernsey', 'invoicing' ),
-	'GN' => __( 'Guinea', 'invoicing' ),
-	'GW' => __( 'Guinea-Bissau', 'invoicing' ),
-	'GY' => __( 'Guyana', 'invoicing' ),
-	'HT' => __( 'Haiti', 'invoicing' ),
-	'HM' => __( 'Heard and McDonald Islands', 'invoicing' ),
-	'VA' => __( 'Holy See (City Vatican State)', 'invoicing' ),
-	'HN' => __( 'Honduras', 'invoicing' ),
-	'HK' => __( 'Hong Kong', 'invoicing' ),
-	'HU' => __( 'Hungary', 'invoicing' ),
-	'IS' => __( 'Iceland', 'invoicing' ),
-	'IN' => __( 'India', 'invoicing' ),
-	'ID' => __( 'Indonesia', 'invoicing' ),
-	'IR' => __( 'Iran', 'invoicing' ),
-	'IQ' => __( 'Iraq', 'invoicing' ),
-	'IE' => __( 'Ireland', 'invoicing' ),
-	'IM' => __( 'Isle of Man', 'invoicing' ),
-	'IL' => __( 'Israel', 'invoicing' ),
-	'IT' => __( 'Italy', 'invoicing' ),
-	'JM' => __( 'Jamaica', 'invoicing' ),
-	'JP' => __( 'Japan', 'invoicing' ),
-	'JE' => __( 'Jersey', 'invoicing' ),
-	'JO' => __( 'Jordan', 'invoicing' ),
-	'KZ' => __( 'Kazakhstan', 'invoicing' ),
-	'KE' => __( 'Kenya', 'invoicing' ),
-	'KI' => __( 'Kiribati', 'invoicing' ),
-	'KW' => __( 'Kuwait', 'invoicing' ),
-	'KG' => __( 'Kyrgyzstan', 'invoicing' ),
-	'LA' => __( 'Lao People\'s Democratic Republic', 'invoicing' ),
-	'LV' => __( 'Latvia', 'invoicing' ),
-	'LB' => __( 'Lebanon', 'invoicing' ),
-	'LS' => __( 'Lesotho', 'invoicing' ),
-	'LR' => __( 'Liberia', 'invoicing' ),
-	'LY' => __( 'Libyan Arab Jamahiriya', 'invoicing' ),
-	'LI' => __( 'Liechtenstein', 'invoicing' ),
-	'LT' => __( 'Lithuania', 'invoicing' ),
-	'LU' => __( 'Luxembourg', 'invoicing' ),
-	'MO' => __( 'Macau', 'invoicing' ),
-	'MK' => __( 'Macedonia', 'invoicing' ),
-	'MG' => __( 'Madagascar', 'invoicing' ),
-	'MW' => __( 'Malawi', 'invoicing' ),
-	'MY' => __( 'Malaysia', 'invoicing' ),
-	'MV' => __( 'Maldives', 'invoicing' ),
-	'ML' => __( 'Mali', 'invoicing' ),
-	'MT' => __( 'Malta', 'invoicing' ),
-	'MH' => __( 'Marshall Islands', 'invoicing' ),
-	'MQ' => __( 'Martinique', 'invoicing' ),
-	'MR' => __( 'Mauritania', 'invoicing' ),
-	'MU' => __( 'Mauritius', 'invoicing' ),
-	'YT' => __( 'Mayotte', 'invoicing' ),
-	'MX' => __( 'Mexico', 'invoicing' ),
-	'FM' => __( 'Micronesia', 'invoicing' ),
-	'MD' => __( 'Moldova, Republic of', 'invoicing' ),
-	'MC' => __( 'Monaco', 'invoicing' ),
-	'MN' => __( 'Mongolia', 'invoicing' ),
-	'ME' => __( 'Montenegro', 'invoicing' ),
-	'MS' => __( 'Montserrat', 'invoicing' ),
-	'MA' => __( 'Morocco', 'invoicing' ),
-	'MZ' => __( 'Mozambique', 'invoicing' ),
-	'MM' => __( 'Myanmar', 'invoicing' ),
-	'NA' => __( 'Namibia', 'invoicing' ),
-	'NR' => __( 'Nauru', 'invoicing' ),
-	'NP' => __( 'Nepal', 'invoicing' ),
-	'NL' => __( 'Netherlands', 'invoicing' ),
-	'AN' => __( 'Netherlands Antilles', 'invoicing' ),
-	'NC' => __( 'New Caledonia', 'invoicing' ),
-	'NZ' => __( 'New Zealand', 'invoicing' ),
-	'NI' => __( 'Nicaragua', 'invoicing' ),
-	'NE' => __( 'Niger', 'invoicing' ),
-	'NG' => __( 'Nigeria', 'invoicing' ),
-	'NU' => __( 'Niue', 'invoicing' ),
-	'NF' => __( 'Norfolk Island', 'invoicing' ),
-	'KP' => __( 'North Korea', 'invoicing' ),
-	'MP' => __( 'Northern Mariana Islands', 'invoicing' ),
-	'NO' => __( 'Norway', 'invoicing' ),
-	'OM' => __( 'Oman', 'invoicing' ),
-	'PK' => __( 'Pakistan', 'invoicing' ),
-	'PW' => __( 'Palau', 'invoicing' ),
-	'PS' => __( 'Palestinian Territories', 'invoicing' ),
-	'PA' => __( 'Panama', 'invoicing' ),
-	'PG' => __( 'Papua New Guinea', 'invoicing' ),
-	'PY' => __( 'Paraguay', 'invoicing' ),
-	'PE' => __( 'Peru', 'invoicing' ),
-	'PH' => __( 'Philippines', 'invoicing' ),
-	'PN' => __( 'Pitcairn Island', 'invoicing' ),
-	'PL' => __( 'Poland', 'invoicing' ),
-	'PT' => __( 'Portugal', 'invoicing' ),
-	'PR' => __( 'Puerto Rico', 'invoicing' ),
-	'QA' => __( 'Qatar', 'invoicing' ),
-	'XK' => __( 'Republic of Kosovo', 'invoicing' ),
-	'RE' => __( 'Reunion Island', 'invoicing' ),
-	'RO' => __( 'Romania', 'invoicing' ),
-	'RU' => __( 'Russian Federation', 'invoicing' ),
-	'RW' => __( 'Rwanda', 'invoicing' ),
-	'BL' => __( 'Saint Barthélemy', 'invoicing' ),
-	'SH' => __( 'Saint Helena', 'invoicing' ),
-	'KN' => __( 'Saint Kitts and Nevis', 'invoicing' ),
-	'LC' => __( 'Saint Lucia', 'invoicing' ),
-	'MF' => __( 'Saint Martin (French)', 'invoicing' ),
-	'SX' => __( 'Saint Martin (Dutch)', 'invoicing' ),
-	'PM' => __( 'Saint Pierre and Miquelon', 'invoicing' ),
-	'VC' => __( 'Saint Vincent and the Grenadines', 'invoicing' ),
-	'SM' => __( 'San Marino', 'invoicing' ),
-	'ST' => __( 'São Tomé and Príncipe', 'invoicing' ),
-	'SA' => __( 'Saudi Arabia', 'invoicing' ),
-	'SN' => __( 'Senegal', 'invoicing' ),
-	'RS' => __( 'Serbia', 'invoicing' ),
-	'SC' => __( 'Seychelles', 'invoicing' ),
-	'SL' => __( 'Sierra Leone', 'invoicing' ),
-	'SG' => __( 'Singapore', 'invoicing' ),
-	'SK' => __( 'Slovak Republic', 'invoicing' ),
-	'SI' => __( 'Slovenia', 'invoicing' ),
-	'SB' => __( 'Solomon Islands', 'invoicing' ),
-	'SO' => __( 'Somalia', 'invoicing' ),
-	'ZA' => __( 'South Africa', 'invoicing' ),
-	'GS' => __( 'South Georgia', 'invoicing' ),
-	'KR' => __( 'South Korea', 'invoicing' ),
-	'SS' => __( 'South Sudan', 'invoicing' ),
-	'ES' => __( 'Spain', 'invoicing' ),
-	'LK' => __( 'Sri Lanka', 'invoicing' ),
-	'SD' => __( 'Sudan', 'invoicing' ),
-	'SR' => __( 'Suriname', 'invoicing' ),
-	'SJ' => __( 'Svalbard and Jan Mayen Islands', 'invoicing' ),
-	'SZ' => __( 'Swaziland', 'invoicing' ),
-	'SE' => __( 'Sweden', 'invoicing' ),
-	'CH' => __( 'Switzerland', 'invoicing' ),
-	'SY' => __( 'Syrian Arab Republic', 'invoicing' ),
-	'TW' => __( 'Taiwan', 'invoicing' ),
-	'TJ' => __( 'Tajikistan', 'invoicing' ),
-	'TZ' => __( 'Tanzania', 'invoicing' ),
-	'TH' => __( 'Thailand', 'invoicing' ),
-	'TL' => __( 'Timor-Leste', 'invoicing' ),
-	'TG' => __( 'Togo', 'invoicing' ),
-	'TK' => __( 'Tokelau', 'invoicing' ),
-	'TO' => __( 'Tonga', 'invoicing' ),
-	'TT' => __( 'Trinidad and Tobago', 'invoicing' ),
-	'TN' => __( 'Tunisia', 'invoicing' ),
-	'TR' => __( 'Turkey', 'invoicing' ),
-	'TM' => __( 'Turkmenistan', 'invoicing' ),
-	'TC' => __( 'Turks and Caicos Islands', 'invoicing' ),
-	'TV' => __( 'Tuvalu', 'invoicing' ),
-	'UG' => __( 'Uganda', 'invoicing' ),
-	'UA' => __( 'Ukraine', 'invoicing' ),
-	'AE' => __( 'United Arab Emirates', 'invoicing' ),
-	'UY' => __( 'Uruguay', 'invoicing' ),
-	'UM' => __( 'US Minor Outlying Islands', 'invoicing' ),
-	'UZ' => __( 'Uzbekistan', 'invoicing' ),
-	'VU' => __( 'Vanuatu', 'invoicing' ),
-	'VE' => __( 'Venezuela', 'invoicing' ),
-	'VN' => __( 'Vietnam', 'invoicing' ),
-	'VG' => __( 'Virgin Islands (British)', 'invoicing' ),
-	'VI' => __( 'Virgin Islands (USA)', 'invoicing' ),
-	'WF' => __( 'Wallis and Futuna Islands', 'invoicing' ),
-	'EH' => __( 'Western Sahara', 'invoicing' ),
-	'WS' => __( 'Western Samoa', 'invoicing' ),
-	'YE' => __( 'Yemen', 'invoicing' ),
-	'ZM' => __( 'Zambia', 'invoicing' ),
-	'ZW' => __( 'Zimbabwe', 'invoicing' ),
+    'US' => __( 'United States', 'invoicing' ),
+    'CA' => __( 'Canada', 'invoicing' ),
+    'GB' => __( 'United Kingdom', 'invoicing' ),
+    'AF' => __( 'Afghanistan', 'invoicing' ),
+    'AX' => __( 'Aland Islands', 'invoicing' ),
+    'AL' => __( 'Albania', 'invoicing' ),
+    'DZ' => __( 'Algeria', 'invoicing' ),
+    'AS' => __( 'American Samoa', 'invoicing' ),
+    'AD' => __( 'Andorra', 'invoicing' ),
+    'AO' => __( 'Angola', 'invoicing' ),
+    'AI' => __( 'Anguilla', 'invoicing' ),
+    'AQ' => __( 'Antarctica', 'invoicing' ),
+    'AG' => __( 'Antigua and Barbuda', 'invoicing' ),
+    'AR' => __( 'Argentina', 'invoicing' ),
+    'AM' => __( 'Armenia', 'invoicing' ),
+    'AW' => __( 'Aruba', 'invoicing' ),
+    'AU' => __( 'Australia', 'invoicing' ),
+    'AT' => __( 'Austria', 'invoicing' ),
+    'AZ' => __( 'Azerbaijan', 'invoicing' ),
+    'BS' => __( 'Bahamas', 'invoicing' ),
+    'BH' => __( 'Bahrain', 'invoicing' ),
+    'BD' => __( 'Bangladesh', 'invoicing' ),
+    'BB' => __( 'Barbados', 'invoicing' ),
+    'BY' => __( 'Belarus', 'invoicing' ),
+    'BE' => __( 'Belgium', 'invoicing' ),
+    'BZ' => __( 'Belize', 'invoicing' ),
+    'BJ' => __( 'Benin', 'invoicing' ),
+    'BM' => __( 'Bermuda', 'invoicing' ),
+    'BT' => __( 'Bhutan', 'invoicing' ),
+    'BO' => __( 'Bolivia', 'invoicing' ),
+    'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'invoicing' ),
+    'BA' => __( 'Bosnia and Herzegovina', 'invoicing' ),
+    'BW' => __( 'Botswana', 'invoicing' ),
+    'BV' => __( 'Bouvet Island', 'invoicing' ),
+    'BR' => __( 'Brazil', 'invoicing' ),
+    'IO' => __( 'British Indian Ocean Territory', 'invoicing' ),
+    'BN' => __( 'Brunei Darrussalam', 'invoicing' ),
+    'BG' => __( 'Bulgaria', 'invoicing' ),
+    'BF' => __( 'Burkina Faso', 'invoicing' ),
+    'BI' => __( 'Burundi', 'invoicing' ),
+    'KH' => __( 'Cambodia', 'invoicing' ),
+    'CM' => __( 'Cameroon', 'invoicing' ),
+    'CV' => __( 'Cape Verde', 'invoicing' ),
+    'KY' => __( 'Cayman Islands', 'invoicing' ),
+    'CF' => __( 'Central African Republic', 'invoicing' ),
+    'TD' => __( 'Chad', 'invoicing' ),
+    'CL' => __( 'Chile', 'invoicing' ),
+    'CN' => __( 'China', 'invoicing' ),
+    'CX' => __( 'Christmas Island', 'invoicing' ),
+    'CC' => __( 'Cocos Islands', 'invoicing' ),
+    'CO' => __( 'Colombia', 'invoicing' ),
+    'KM' => __( 'Comoros', 'invoicing' ),
+    'CD' => __( 'Congo, Democratic People\'s Republic', 'invoicing' ),
+    'CG' => __( 'Congo, Republic of', 'invoicing' ),
+    'CK' => __( 'Cook Islands', 'invoicing' ),
+    'CR' => __( 'Costa Rica', 'invoicing' ),
+    'CI' => __( 'Cote d\'Ivoire', 'invoicing' ),
+    'HR' => __( 'Croatia/Hrvatska', 'invoicing' ),
+    'CU' => __( 'Cuba', 'invoicing' ),
+    'CW' => __( 'CuraÇao', 'invoicing' ),
+    'CY' => __( 'Cyprus', 'invoicing' ),
+    'CZ' => __( 'Czech Republic', 'invoicing' ),
+    'DK' => __( 'Denmark', 'invoicing' ),
+    'DJ' => __( 'Djibouti', 'invoicing' ),
+    'DM' => __( 'Dominica', 'invoicing' ),
+    'DO' => __( 'Dominican Republic', 'invoicing' ),
+    'TP' => __( 'East Timor', 'invoicing' ),
+    'EC' => __( 'Ecuador', 'invoicing' ),
+    'EG' => __( 'Egypt', 'invoicing' ),
+    'GQ' => __( 'Equatorial Guinea', 'invoicing' ),
+    'SV' => __( 'El Salvador', 'invoicing' ),
+    'ER' => __( 'Eritrea', 'invoicing' ),
+    'EE' => __( 'Estonia', 'invoicing' ),
+    'ET' => __( 'Ethiopia', 'invoicing' ),
+    'FK' => __( 'Falkland Islands', 'invoicing' ),
+    'FO' => __( 'Faroe Islands', 'invoicing' ),
+    'FJ' => __( 'Fiji', 'invoicing' ),
+    'FI' => __( 'Finland', 'invoicing' ),
+    'FR' => __( 'France', 'invoicing' ),
+    'GF' => __( 'French Guiana', 'invoicing' ),
+    'PF' => __( 'French Polynesia', 'invoicing' ),
+    'TF' => __( 'French Southern Territories', 'invoicing' ),
+    'GA' => __( 'Gabon', 'invoicing' ),
+    'GM' => __( 'Gambia', 'invoicing' ),
+    'GE' => __( 'Georgia', 'invoicing' ),
+    'DE' => __( 'Germany', 'invoicing' ),
+    'GR' => __( 'Greece', 'invoicing' ),
+    'GH' => __( 'Ghana', 'invoicing' ),
+    'GI' => __( 'Gibraltar', 'invoicing' ),
+    'GL' => __( 'Greenland', 'invoicing' ),
+    'GD' => __( 'Grenada', 'invoicing' ),
+    'GP' => __( 'Guadeloupe', 'invoicing' ),
+    'GU' => __( 'Guam', 'invoicing' ),
+    'GT' => __( 'Guatemala', 'invoicing' ),
+    'GG' => __( 'Guernsey', 'invoicing' ),
+    'GN' => __( 'Guinea', 'invoicing' ),
+    'GW' => __( 'Guinea-Bissau', 'invoicing' ),
+    'GY' => __( 'Guyana', 'invoicing' ),
+    'HT' => __( 'Haiti', 'invoicing' ),
+    'HM' => __( 'Heard and McDonald Islands', 'invoicing' ),
+    'VA' => __( 'Holy See (City Vatican State)', 'invoicing' ),
+    'HN' => __( 'Honduras', 'invoicing' ),
+    'HK' => __( 'Hong Kong', 'invoicing' ),
+    'HU' => __( 'Hungary', 'invoicing' ),
+    'IS' => __( 'Iceland', 'invoicing' ),
+    'IN' => __( 'India', 'invoicing' ),
+    'ID' => __( 'Indonesia', 'invoicing' ),
+    'IR' => __( 'Iran', 'invoicing' ),
+    'IQ' => __( 'Iraq', 'invoicing' ),
+    'IE' => __( 'Ireland', 'invoicing' ),
+    'IM' => __( 'Isle of Man', 'invoicing' ),
+    'IL' => __( 'Israel', 'invoicing' ),
+    'IT' => __( 'Italy', 'invoicing' ),
+    'JM' => __( 'Jamaica', 'invoicing' ),
+    'JP' => __( 'Japan', 'invoicing' ),
+    'JE' => __( 'Jersey', 'invoicing' ),
+    'JO' => __( 'Jordan', 'invoicing' ),
+    'KZ' => __( 'Kazakhstan', 'invoicing' ),
+    'KE' => __( 'Kenya', 'invoicing' ),
+    'KI' => __( 'Kiribati', 'invoicing' ),
+    'KW' => __( 'Kuwait', 'invoicing' ),
+    'KG' => __( 'Kyrgyzstan', 'invoicing' ),
+    'LA' => __( 'Lao People\'s Democratic Republic', 'invoicing' ),
+    'LV' => __( 'Latvia', 'invoicing' ),
+    'LB' => __( 'Lebanon', 'invoicing' ),
+    'LS' => __( 'Lesotho', 'invoicing' ),
+    'LR' => __( 'Liberia', 'invoicing' ),
+    'LY' => __( 'Libyan Arab Jamahiriya', 'invoicing' ),
+    'LI' => __( 'Liechtenstein', 'invoicing' ),
+    'LT' => __( 'Lithuania', 'invoicing' ),
+    'LU' => __( 'Luxembourg', 'invoicing' ),
+    'MO' => __( 'Macau', 'invoicing' ),
+    'MK' => __( 'Macedonia', 'invoicing' ),
+    'MG' => __( 'Madagascar', 'invoicing' ),
+    'MW' => __( 'Malawi', 'invoicing' ),
+    'MY' => __( 'Malaysia', 'invoicing' ),
+    'MV' => __( 'Maldives', 'invoicing' ),
+    'ML' => __( 'Mali', 'invoicing' ),
+    'MT' => __( 'Malta', 'invoicing' ),
+    'MH' => __( 'Marshall Islands', 'invoicing' ),
+    'MQ' => __( 'Martinique', 'invoicing' ),
+    'MR' => __( 'Mauritania', 'invoicing' ),
+    'MU' => __( 'Mauritius', 'invoicing' ),
+    'YT' => __( 'Mayotte', 'invoicing' ),
+    'MX' => __( 'Mexico', 'invoicing' ),
+    'FM' => __( 'Micronesia', 'invoicing' ),
+    'MD' => __( 'Moldova, Republic of', 'invoicing' ),
+    'MC' => __( 'Monaco', 'invoicing' ),
+    'MN' => __( 'Mongolia', 'invoicing' ),
+    'ME' => __( 'Montenegro', 'invoicing' ),
+    'MS' => __( 'Montserrat', 'invoicing' ),
+    'MA' => __( 'Morocco', 'invoicing' ),
+    'MZ' => __( 'Mozambique', 'invoicing' ),
+    'MM' => __( 'Myanmar', 'invoicing' ),
+    'NA' => __( 'Namibia', 'invoicing' ),
+    'NR' => __( 'Nauru', 'invoicing' ),
+    'NP' => __( 'Nepal', 'invoicing' ),
+    'NL' => __( 'Netherlands', 'invoicing' ),
+    'AN' => __( 'Netherlands Antilles', 'invoicing' ),
+    'NC' => __( 'New Caledonia', 'invoicing' ),
+    'NZ' => __( 'New Zealand', 'invoicing' ),
+    'NI' => __( 'Nicaragua', 'invoicing' ),
+    'NE' => __( 'Niger', 'invoicing' ),
+    'NG' => __( 'Nigeria', 'invoicing' ),
+    'NU' => __( 'Niue', 'invoicing' ),
+    'NF' => __( 'Norfolk Island', 'invoicing' ),
+    'KP' => __( 'North Korea', 'invoicing' ),
+    'MP' => __( 'Northern Mariana Islands', 'invoicing' ),
+    'NO' => __( 'Norway', 'invoicing' ),
+    'OM' => __( 'Oman', 'invoicing' ),
+    'PK' => __( 'Pakistan', 'invoicing' ),
+    'PW' => __( 'Palau', 'invoicing' ),
+    'PS' => __( 'Palestinian Territories', 'invoicing' ),
+    'PA' => __( 'Panama', 'invoicing' ),
+    'PG' => __( 'Papua New Guinea', 'invoicing' ),
+    'PY' => __( 'Paraguay', 'invoicing' ),
+    'PE' => __( 'Peru', 'invoicing' ),
+    'PH' => __( 'Philippines', 'invoicing' ),
+    'PN' => __( 'Pitcairn Island', 'invoicing' ),
+    'PL' => __( 'Poland', 'invoicing' ),
+    'PT' => __( 'Portugal', 'invoicing' ),
+    'PR' => __( 'Puerto Rico', 'invoicing' ),
+    'QA' => __( 'Qatar', 'invoicing' ),
+    'XK' => __( 'Republic of Kosovo', 'invoicing' ),
+    'RE' => __( 'Reunion Island', 'invoicing' ),
+    'RO' => __( 'Romania', 'invoicing' ),
+    'RU' => __( 'Russian Federation', 'invoicing' ),
+    'RW' => __( 'Rwanda', 'invoicing' ),
+    'BL' => __( 'Saint Barthélemy', 'invoicing' ),
+    'SH' => __( 'Saint Helena', 'invoicing' ),
+    'KN' => __( 'Saint Kitts and Nevis', 'invoicing' ),
+    'LC' => __( 'Saint Lucia', 'invoicing' ),
+    'MF' => __( 'Saint Martin (French)', 'invoicing' ),
+    'SX' => __( 'Saint Martin (Dutch)', 'invoicing' ),
+    'PM' => __( 'Saint Pierre and Miquelon', 'invoicing' ),
+    'VC' => __( 'Saint Vincent and the Grenadines', 'invoicing' ),
+    'SM' => __( 'San Marino', 'invoicing' ),
+    'ST' => __( 'São Tomé and Príncipe', 'invoicing' ),
+    'SA' => __( 'Saudi Arabia', 'invoicing' ),
+    'SN' => __( 'Senegal', 'invoicing' ),
+    'RS' => __( 'Serbia', 'invoicing' ),
+    'SC' => __( 'Seychelles', 'invoicing' ),
+    'SL' => __( 'Sierra Leone', 'invoicing' ),
+    'SG' => __( 'Singapore', 'invoicing' ),
+    'SK' => __( 'Slovak Republic', 'invoicing' ),
+    'SI' => __( 'Slovenia', 'invoicing' ),
+    'SB' => __( 'Solomon Islands', 'invoicing' ),
+    'SO' => __( 'Somalia', 'invoicing' ),
+    'ZA' => __( 'South Africa', 'invoicing' ),
+    'GS' => __( 'South Georgia', 'invoicing' ),
+    'KR' => __( 'South Korea', 'invoicing' ),
+    'SS' => __( 'South Sudan', 'invoicing' ),
+    'ES' => __( 'Spain', 'invoicing' ),
+    'LK' => __( 'Sri Lanka', 'invoicing' ),
+    'SD' => __( 'Sudan', 'invoicing' ),
+    'SR' => __( 'Suriname', 'invoicing' ),
+    'SJ' => __( 'Svalbard and Jan Mayen Islands', 'invoicing' ),
+    'SZ' => __( 'Swaziland', 'invoicing' ),
+    'SE' => __( 'Sweden', 'invoicing' ),
+    'CH' => __( 'Switzerland', 'invoicing' ),
+    'SY' => __( 'Syrian Arab Republic', 'invoicing' ),
+    'TW' => __( 'Taiwan', 'invoicing' ),
+    'TJ' => __( 'Tajikistan', 'invoicing' ),
+    'TZ' => __( 'Tanzania', 'invoicing' ),
+    'TH' => __( 'Thailand', 'invoicing' ),
+    'TL' => __( 'Timor-Leste', 'invoicing' ),
+    'TG' => __( 'Togo', 'invoicing' ),
+    'TK' => __( 'Tokelau', 'invoicing' ),
+    'TO' => __( 'Tonga', 'invoicing' ),
+    'TT' => __( 'Trinidad and Tobago', 'invoicing' ),
+    'TN' => __( 'Tunisia', 'invoicing' ),
+    'TR' => __( 'Turkey', 'invoicing' ),
+    'TM' => __( 'Turkmenistan', 'invoicing' ),
+    'TC' => __( 'Turks and Caicos Islands', 'invoicing' ),
+    'TV' => __( 'Tuvalu', 'invoicing' ),
+    'UG' => __( 'Uganda', 'invoicing' ),
+    'UA' => __( 'Ukraine', 'invoicing' ),
+    'AE' => __( 'United Arab Emirates', 'invoicing' ),
+    'UY' => __( 'Uruguay', 'invoicing' ),
+    'UM' => __( 'US Minor Outlying Islands', 'invoicing' ),
+    'UZ' => __( 'Uzbekistan', 'invoicing' ),
+    'VU' => __( 'Vanuatu', 'invoicing' ),
+    'VE' => __( 'Venezuela', 'invoicing' ),
+    'VN' => __( 'Vietnam', 'invoicing' ),
+    'VG' => __( 'Virgin Islands (British)', 'invoicing' ),
+    'VI' => __( 'Virgin Islands (USA)', 'invoicing' ),
+    'WF' => __( 'Wallis and Futuna Islands', 'invoicing' ),
+    'EH' => __( 'Western Sahara', 'invoicing' ),
+    'WS' => __( 'Western Samoa', 'invoicing' ),
+    'YE' => __( 'Yemen', 'invoicing' ),
+    'ZM' => __( 'Zambia', 'invoicing' ),
+    'ZW' => __( 'Zimbabwe', 'invoicing' ),
 );

Spacing +253 added lines, -253 removed lines

@@ -9,259 +9,259 @@
  * @version 1.0.14
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
-	'US' => __( 'United States', 'invoicing' ),
-	'CA' => __( 'Canada', 'invoicing' ),
-	'GB' => __( 'United Kingdom', 'invoicing' ),
-	'AF' => __( 'Afghanistan', 'invoicing' ),
-	'AX' => __( 'Aland Islands', 'invoicing' ),
-	'AL' => __( 'Albania', 'invoicing' ),
-	'DZ' => __( 'Algeria', 'invoicing' ),
-	'AS' => __( 'American Samoa', 'invoicing' ),
-	'AD' => __( 'Andorra', 'invoicing' ),
-	'AO' => __( 'Angola', 'invoicing' ),
-	'AI' => __( 'Anguilla', 'invoicing' ),
-	'AQ' => __( 'Antarctica', 'invoicing' ),
-	'AG' => __( 'Antigua and Barbuda', 'invoicing' ),
-	'AR' => __( 'Argentina', 'invoicing' ),
-	'AM' => __( 'Armenia', 'invoicing' ),
-	'AW' => __( 'Aruba', 'invoicing' ),
-	'AU' => __( 'Australia', 'invoicing' ),
-	'AT' => __( 'Austria', 'invoicing' ),
-	'AZ' => __( 'Azerbaijan', 'invoicing' ),
-	'BS' => __( 'Bahamas', 'invoicing' ),
-	'BH' => __( 'Bahrain', 'invoicing' ),
-	'BD' => __( 'Bangladesh', 'invoicing' ),
-	'BB' => __( 'Barbados', 'invoicing' ),
-	'BY' => __( 'Belarus', 'invoicing' ),
-	'BE' => __( 'Belgium', 'invoicing' ),
-	'BZ' => __( 'Belize', 'invoicing' ),
-	'BJ' => __( 'Benin', 'invoicing' ),
-	'BM' => __( 'Bermuda', 'invoicing' ),
-	'BT' => __( 'Bhutan', 'invoicing' ),
-	'BO' => __( 'Bolivia', 'invoicing' ),
-	'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'invoicing' ),
-	'BA' => __( 'Bosnia and Herzegovina', 'invoicing' ),
-	'BW' => __( 'Botswana', 'invoicing' ),
-	'BV' => __( 'Bouvet Island', 'invoicing' ),
-	'BR' => __( 'Brazil', 'invoicing' ),
-	'IO' => __( 'British Indian Ocean Territory', 'invoicing' ),
-	'BN' => __( 'Brunei Darrussalam', 'invoicing' ),
-	'BG' => __( 'Bulgaria', 'invoicing' ),
-	'BF' => __( 'Burkina Faso', 'invoicing' ),
-	'BI' => __( 'Burundi', 'invoicing' ),
-	'KH' => __( 'Cambodia', 'invoicing' ),
-	'CM' => __( 'Cameroon', 'invoicing' ),
-	'CV' => __( 'Cape Verde', 'invoicing' ),
-	'KY' => __( 'Cayman Islands', 'invoicing' ),
-	'CF' => __( 'Central African Republic', 'invoicing' ),
-	'TD' => __( 'Chad', 'invoicing' ),
-	'CL' => __( 'Chile', 'invoicing' ),
-	'CN' => __( 'China', 'invoicing' ),
-	'CX' => __( 'Christmas Island', 'invoicing' ),
-	'CC' => __( 'Cocos Islands', 'invoicing' ),
-	'CO' => __( 'Colombia', 'invoicing' ),
-	'KM' => __( 'Comoros', 'invoicing' ),
-	'CD' => __( 'Congo, Democratic People\'s Republic', 'invoicing' ),
-	'CG' => __( 'Congo, Republic of', 'invoicing' ),
-	'CK' => __( 'Cook Islands', 'invoicing' ),
-	'CR' => __( 'Costa Rica', 'invoicing' ),
-	'CI' => __( 'Cote d\'Ivoire', 'invoicing' ),
-	'HR' => __( 'Croatia/Hrvatska', 'invoicing' ),
-	'CU' => __( 'Cuba', 'invoicing' ),
-	'CW' => __( 'CuraÇao', 'invoicing' ),
-	'CY' => __( 'Cyprus', 'invoicing' ),
-	'CZ' => __( 'Czech Republic', 'invoicing' ),
-	'DK' => __( 'Denmark', 'invoicing' ),
-	'DJ' => __( 'Djibouti', 'invoicing' ),
-	'DM' => __( 'Dominica', 'invoicing' ),
-	'DO' => __( 'Dominican Republic', 'invoicing' ),
-	'TP' => __( 'East Timor', 'invoicing' ),
-	'EC' => __( 'Ecuador', 'invoicing' ),
-	'EG' => __( 'Egypt', 'invoicing' ),
-	'GQ' => __( 'Equatorial Guinea', 'invoicing' ),
-	'SV' => __( 'El Salvador', 'invoicing' ),
-	'ER' => __( 'Eritrea', 'invoicing' ),
-	'EE' => __( 'Estonia', 'invoicing' ),
-	'ET' => __( 'Ethiopia', 'invoicing' ),
-	'FK' => __( 'Falkland Islands', 'invoicing' ),
-	'FO' => __( 'Faroe Islands', 'invoicing' ),
-	'FJ' => __( 'Fiji', 'invoicing' ),
-	'FI' => __( 'Finland', 'invoicing' ),
-	'FR' => __( 'France', 'invoicing' ),
-	'GF' => __( 'French Guiana', 'invoicing' ),
-	'PF' => __( 'French Polynesia', 'invoicing' ),
-	'TF' => __( 'French Southern Territories', 'invoicing' ),
-	'GA' => __( 'Gabon', 'invoicing' ),
-	'GM' => __( 'Gambia', 'invoicing' ),
-	'GE' => __( 'Georgia', 'invoicing' ),
-	'DE' => __( 'Germany', 'invoicing' ),
-	'GR' => __( 'Greece', 'invoicing' ),
-	'GH' => __( 'Ghana', 'invoicing' ),
-	'GI' => __( 'Gibraltar', 'invoicing' ),
-	'GL' => __( 'Greenland', 'invoicing' ),
-	'GD' => __( 'Grenada', 'invoicing' ),
-	'GP' => __( 'Guadeloupe', 'invoicing' ),
-	'GU' => __( 'Guam', 'invoicing' ),
-	'GT' => __( 'Guatemala', 'invoicing' ),
-	'GG' => __( 'Guernsey', 'invoicing' ),
-	'GN' => __( 'Guinea', 'invoicing' ),
-	'GW' => __( 'Guinea-Bissau', 'invoicing' ),
-	'GY' => __( 'Guyana', 'invoicing' ),
-	'HT' => __( 'Haiti', 'invoicing' ),
-	'HM' => __( 'Heard and McDonald Islands', 'invoicing' ),
-	'VA' => __( 'Holy See (City Vatican State)', 'invoicing' ),
-	'HN' => __( 'Honduras', 'invoicing' ),
-	'HK' => __( 'Hong Kong', 'invoicing' ),
-	'HU' => __( 'Hungary', 'invoicing' ),
-	'IS' => __( 'Iceland', 'invoicing' ),
-	'IN' => __( 'India', 'invoicing' ),
-	'ID' => __( 'Indonesia', 'invoicing' ),
-	'IR' => __( 'Iran', 'invoicing' ),
-	'IQ' => __( 'Iraq', 'invoicing' ),
-	'IE' => __( 'Ireland', 'invoicing' ),
-	'IM' => __( 'Isle of Man', 'invoicing' ),
-	'IL' => __( 'Israel', 'invoicing' ),
-	'IT' => __( 'Italy', 'invoicing' ),
-	'JM' => __( 'Jamaica', 'invoicing' ),
-	'JP' => __( 'Japan', 'invoicing' ),
-	'JE' => __( 'Jersey', 'invoicing' ),
-	'JO' => __( 'Jordan', 'invoicing' ),
-	'KZ' => __( 'Kazakhstan', 'invoicing' ),
-	'KE' => __( 'Kenya', 'invoicing' ),
-	'KI' => __( 'Kiribati', 'invoicing' ),
-	'KW' => __( 'Kuwait', 'invoicing' ),
-	'KG' => __( 'Kyrgyzstan', 'invoicing' ),
-	'LA' => __( 'Lao People\'s Democratic Republic', 'invoicing' ),
-	'LV' => __( 'Latvia', 'invoicing' ),
-	'LB' => __( 'Lebanon', 'invoicing' ),
-	'LS' => __( 'Lesotho', 'invoicing' ),
-	'LR' => __( 'Liberia', 'invoicing' ),
-	'LY' => __( 'Libyan Arab Jamahiriya', 'invoicing' ),
-	'LI' => __( 'Liechtenstein', 'invoicing' ),
-	'LT' => __( 'Lithuania', 'invoicing' ),
-	'LU' => __( 'Luxembourg', 'invoicing' ),
-	'MO' => __( 'Macau', 'invoicing' ),
-	'MK' => __( 'Macedonia', 'invoicing' ),
-	'MG' => __( 'Madagascar', 'invoicing' ),
-	'MW' => __( 'Malawi', 'invoicing' ),
-	'MY' => __( 'Malaysia', 'invoicing' ),
-	'MV' => __( 'Maldives', 'invoicing' ),
-	'ML' => __( 'Mali', 'invoicing' ),
-	'MT' => __( 'Malta', 'invoicing' ),
-	'MH' => __( 'Marshall Islands', 'invoicing' ),
-	'MQ' => __( 'Martinique', 'invoicing' ),
-	'MR' => __( 'Mauritania', 'invoicing' ),
-	'MU' => __( 'Mauritius', 'invoicing' ),
-	'YT' => __( 'Mayotte', 'invoicing' ),
-	'MX' => __( 'Mexico', 'invoicing' ),
-	'FM' => __( 'Micronesia', 'invoicing' ),
-	'MD' => __( 'Moldova, Republic of', 'invoicing' ),
-	'MC' => __( 'Monaco', 'invoicing' ),
-	'MN' => __( 'Mongolia', 'invoicing' ),
-	'ME' => __( 'Montenegro', 'invoicing' ),
-	'MS' => __( 'Montserrat', 'invoicing' ),
-	'MA' => __( 'Morocco', 'invoicing' ),
-	'MZ' => __( 'Mozambique', 'invoicing' ),
-	'MM' => __( 'Myanmar', 'invoicing' ),
-	'NA' => __( 'Namibia', 'invoicing' ),
-	'NR' => __( 'Nauru', 'invoicing' ),
-	'NP' => __( 'Nepal', 'invoicing' ),
-	'NL' => __( 'Netherlands', 'invoicing' ),
-	'AN' => __( 'Netherlands Antilles', 'invoicing' ),
-	'NC' => __( 'New Caledonia', 'invoicing' ),
-	'NZ' => __( 'New Zealand', 'invoicing' ),
-	'NI' => __( 'Nicaragua', 'invoicing' ),
-	'NE' => __( 'Niger', 'invoicing' ),
-	'NG' => __( 'Nigeria', 'invoicing' ),
-	'NU' => __( 'Niue', 'invoicing' ),
-	'NF' => __( 'Norfolk Island', 'invoicing' ),
-	'KP' => __( 'North Korea', 'invoicing' ),
-	'MP' => __( 'Northern Mariana Islands', 'invoicing' ),
-	'NO' => __( 'Norway', 'invoicing' ),
-	'OM' => __( 'Oman', 'invoicing' ),
-	'PK' => __( 'Pakistan', 'invoicing' ),
-	'PW' => __( 'Palau', 'invoicing' ),
-	'PS' => __( 'Palestinian Territories', 'invoicing' ),
-	'PA' => __( 'Panama', 'invoicing' ),
-	'PG' => __( 'Papua New Guinea', 'invoicing' ),
-	'PY' => __( 'Paraguay', 'invoicing' ),
-	'PE' => __( 'Peru', 'invoicing' ),
-	'PH' => __( 'Philippines', 'invoicing' ),
-	'PN' => __( 'Pitcairn Island', 'invoicing' ),
-	'PL' => __( 'Poland', 'invoicing' ),
-	'PT' => __( 'Portugal', 'invoicing' ),
-	'PR' => __( 'Puerto Rico', 'invoicing' ),
-	'QA' => __( 'Qatar', 'invoicing' ),
-	'XK' => __( 'Republic of Kosovo', 'invoicing' ),
-	'RE' => __( 'Reunion Island', 'invoicing' ),
-	'RO' => __( 'Romania', 'invoicing' ),
-	'RU' => __( 'Russian Federation', 'invoicing' ),
-	'RW' => __( 'Rwanda', 'invoicing' ),
-	'BL' => __( 'Saint Barthélemy', 'invoicing' ),
-	'SH' => __( 'Saint Helena', 'invoicing' ),
-	'KN' => __( 'Saint Kitts and Nevis', 'invoicing' ),
-	'LC' => __( 'Saint Lucia', 'invoicing' ),
-	'MF' => __( 'Saint Martin (French)', 'invoicing' ),
-	'SX' => __( 'Saint Martin (Dutch)', 'invoicing' ),
-	'PM' => __( 'Saint Pierre and Miquelon', 'invoicing' ),
-	'VC' => __( 'Saint Vincent and the Grenadines', 'invoicing' ),
-	'SM' => __( 'San Marino', 'invoicing' ),
-	'ST' => __( 'São Tomé and Príncipe', 'invoicing' ),
-	'SA' => __( 'Saudi Arabia', 'invoicing' ),
-	'SN' => __( 'Senegal', 'invoicing' ),
-	'RS' => __( 'Serbia', 'invoicing' ),
-	'SC' => __( 'Seychelles', 'invoicing' ),
-	'SL' => __( 'Sierra Leone', 'invoicing' ),
-	'SG' => __( 'Singapore', 'invoicing' ),
-	'SK' => __( 'Slovak Republic', 'invoicing' ),
-	'SI' => __( 'Slovenia', 'invoicing' ),
-	'SB' => __( 'Solomon Islands', 'invoicing' ),
-	'SO' => __( 'Somalia', 'invoicing' ),
-	'ZA' => __( 'South Africa', 'invoicing' ),
-	'GS' => __( 'South Georgia', 'invoicing' ),
-	'KR' => __( 'South Korea', 'invoicing' ),
-	'SS' => __( 'South Sudan', 'invoicing' ),
-	'ES' => __( 'Spain', 'invoicing' ),
-	'LK' => __( 'Sri Lanka', 'invoicing' ),
-	'SD' => __( 'Sudan', 'invoicing' ),
-	'SR' => __( 'Suriname', 'invoicing' ),
-	'SJ' => __( 'Svalbard and Jan Mayen Islands', 'invoicing' ),
-	'SZ' => __( 'Swaziland', 'invoicing' ),
-	'SE' => __( 'Sweden', 'invoicing' ),
-	'CH' => __( 'Switzerland', 'invoicing' ),
-	'SY' => __( 'Syrian Arab Republic', 'invoicing' ),
-	'TW' => __( 'Taiwan', 'invoicing' ),
-	'TJ' => __( 'Tajikistan', 'invoicing' ),
-	'TZ' => __( 'Tanzania', 'invoicing' ),
-	'TH' => __( 'Thailand', 'invoicing' ),
-	'TL' => __( 'Timor-Leste', 'invoicing' ),
-	'TG' => __( 'Togo', 'invoicing' ),
-	'TK' => __( 'Tokelau', 'invoicing' ),
-	'TO' => __( 'Tonga', 'invoicing' ),
-	'TT' => __( 'Trinidad and Tobago', 'invoicing' ),
-	'TN' => __( 'Tunisia', 'invoicing' ),
-	'TR' => __( 'Turkey', 'invoicing' ),
-	'TM' => __( 'Turkmenistan', 'invoicing' ),
-	'TC' => __( 'Turks and Caicos Islands', 'invoicing' ),
-	'TV' => __( 'Tuvalu', 'invoicing' ),
-	'UG' => __( 'Uganda', 'invoicing' ),
-	'UA' => __( 'Ukraine', 'invoicing' ),
-	'AE' => __( 'United Arab Emirates', 'invoicing' ),
-	'UY' => __( 'Uruguay', 'invoicing' ),
-	'UM' => __( 'US Minor Outlying Islands', 'invoicing' ),
-	'UZ' => __( 'Uzbekistan', 'invoicing' ),
-	'VU' => __( 'Vanuatu', 'invoicing' ),
-	'VE' => __( 'Venezuela', 'invoicing' ),
-	'VN' => __( 'Vietnam', 'invoicing' ),
-	'VG' => __( 'Virgin Islands (British)', 'invoicing' ),
-	'VI' => __( 'Virgin Islands (USA)', 'invoicing' ),
-	'WF' => __( 'Wallis and Futuna Islands', 'invoicing' ),
-	'EH' => __( 'Western Sahara', 'invoicing' ),
-	'WS' => __( 'Western Samoa', 'invoicing' ),
-	'YE' => __( 'Yemen', 'invoicing' ),
-	'ZM' => __( 'Zambia', 'invoicing' ),
-	'ZW' => __( 'Zimbabwe', 'invoicing' ),
+	'US' => __('United States', 'invoicing'),
+	'CA' => __('Canada', 'invoicing'),
+	'GB' => __('United Kingdom', 'invoicing'),
+	'AF' => __('Afghanistan', 'invoicing'),
+	'AX' => __('Aland Islands', 'invoicing'),
+	'AL' => __('Albania', 'invoicing'),
+	'DZ' => __('Algeria', 'invoicing'),
+	'AS' => __('American Samoa', 'invoicing'),
+	'AD' => __('Andorra', 'invoicing'),
+	'AO' => __('Angola', 'invoicing'),
+	'AI' => __('Anguilla', 'invoicing'),
+	'AQ' => __('Antarctica', 'invoicing'),
+	'AG' => __('Antigua and Barbuda', 'invoicing'),
+	'AR' => __('Argentina', 'invoicing'),
+	'AM' => __('Armenia', 'invoicing'),
+	'AW' => __('Aruba', 'invoicing'),
+	'AU' => __('Australia', 'invoicing'),
+	'AT' => __('Austria', 'invoicing'),
+	'AZ' => __('Azerbaijan', 'invoicing'),
+	'BS' => __('Bahamas', 'invoicing'),
+	'BH' => __('Bahrain', 'invoicing'),
+	'BD' => __('Bangladesh', 'invoicing'),
+	'BB' => __('Barbados', 'invoicing'),
+	'BY' => __('Belarus', 'invoicing'),
+	'BE' => __('Belgium', 'invoicing'),
+	'BZ' => __('Belize', 'invoicing'),
+	'BJ' => __('Benin', 'invoicing'),
+	'BM' => __('Bermuda', 'invoicing'),
+	'BT' => __('Bhutan', 'invoicing'),
+	'BO' => __('Bolivia', 'invoicing'),
+	'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
+	'BA' => __('Bosnia and Herzegovina', 'invoicing'),
+	'BW' => __('Botswana', 'invoicing'),
+	'BV' => __('Bouvet Island', 'invoicing'),
+	'BR' => __('Brazil', 'invoicing'),
+	'IO' => __('British Indian Ocean Territory', 'invoicing'),
+	'BN' => __('Brunei Darrussalam', 'invoicing'),
+	'BG' => __('Bulgaria', 'invoicing'),
+	'BF' => __('Burkina Faso', 'invoicing'),
+	'BI' => __('Burundi', 'invoicing'),
+	'KH' => __('Cambodia', 'invoicing'),
+	'CM' => __('Cameroon', 'invoicing'),
+	'CV' => __('Cape Verde', 'invoicing'),
+	'KY' => __('Cayman Islands', 'invoicing'),
+	'CF' => __('Central African Republic', 'invoicing'),
+	'TD' => __('Chad', 'invoicing'),
+	'CL' => __('Chile', 'invoicing'),
+	'CN' => __('China', 'invoicing'),
+	'CX' => __('Christmas Island', 'invoicing'),
+	'CC' => __('Cocos Islands', 'invoicing'),
+	'CO' => __('Colombia', 'invoicing'),
+	'KM' => __('Comoros', 'invoicing'),
+	'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
+	'CG' => __('Congo, Republic of', 'invoicing'),
+	'CK' => __('Cook Islands', 'invoicing'),
+	'CR' => __('Costa Rica', 'invoicing'),
+	'CI' => __('Cote d\'Ivoire', 'invoicing'),
+	'HR' => __('Croatia/Hrvatska', 'invoicing'),
+	'CU' => __('Cuba', 'invoicing'),
+	'CW' => __('CuraÇao', 'invoicing'),
+	'CY' => __('Cyprus', 'invoicing'),
+	'CZ' => __('Czech Republic', 'invoicing'),
+	'DK' => __('Denmark', 'invoicing'),
+	'DJ' => __('Djibouti', 'invoicing'),
+	'DM' => __('Dominica', 'invoicing'),
+	'DO' => __('Dominican Republic', 'invoicing'),
+	'TP' => __('East Timor', 'invoicing'),
+	'EC' => __('Ecuador', 'invoicing'),
+	'EG' => __('Egypt', 'invoicing'),
+	'GQ' => __('Equatorial Guinea', 'invoicing'),
+	'SV' => __('El Salvador', 'invoicing'),
+	'ER' => __('Eritrea', 'invoicing'),
+	'EE' => __('Estonia', 'invoicing'),
+	'ET' => __('Ethiopia', 'invoicing'),
+	'FK' => __('Falkland Islands', 'invoicing'),
+	'FO' => __('Faroe Islands', 'invoicing'),
+	'FJ' => __('Fiji', 'invoicing'),
+	'FI' => __('Finland', 'invoicing'),
+	'FR' => __('France', 'invoicing'),
+	'GF' => __('French Guiana', 'invoicing'),
+	'PF' => __('French Polynesia', 'invoicing'),
+	'TF' => __('French Southern Territories', 'invoicing'),
+	'GA' => __('Gabon', 'invoicing'),
+	'GM' => __('Gambia', 'invoicing'),
+	'GE' => __('Georgia', 'invoicing'),
+	'DE' => __('Germany', 'invoicing'),
+	'GR' => __('Greece', 'invoicing'),
+	'GH' => __('Ghana', 'invoicing'),
+	'GI' => __('Gibraltar', 'invoicing'),
+	'GL' => __('Greenland', 'invoicing'),
+	'GD' => __('Grenada', 'invoicing'),
+	'GP' => __('Guadeloupe', 'invoicing'),
+	'GU' => __('Guam', 'invoicing'),
+	'GT' => __('Guatemala', 'invoicing'),
+	'GG' => __('Guernsey', 'invoicing'),
+	'GN' => __('Guinea', 'invoicing'),
+	'GW' => __('Guinea-Bissau', 'invoicing'),
+	'GY' => __('Guyana', 'invoicing'),
+	'HT' => __('Haiti', 'invoicing'),
+	'HM' => __('Heard and McDonald Islands', 'invoicing'),
+	'VA' => __('Holy See (City Vatican State)', 'invoicing'),
+	'HN' => __('Honduras', 'invoicing'),
+	'HK' => __('Hong Kong', 'invoicing'),
+	'HU' => __('Hungary', 'invoicing'),
+	'IS' => __('Iceland', 'invoicing'),
+	'IN' => __('India', 'invoicing'),
+	'ID' => __('Indonesia', 'invoicing'),
+	'IR' => __('Iran', 'invoicing'),
+	'IQ' => __('Iraq', 'invoicing'),
+	'IE' => __('Ireland', 'invoicing'),
+	'IM' => __('Isle of Man', 'invoicing'),
+	'IL' => __('Israel', 'invoicing'),
+	'IT' => __('Italy', 'invoicing'),
+	'JM' => __('Jamaica', 'invoicing'),
+	'JP' => __('Japan', 'invoicing'),
+	'JE' => __('Jersey', 'invoicing'),
+	'JO' => __('Jordan', 'invoicing'),
+	'KZ' => __('Kazakhstan', 'invoicing'),
+	'KE' => __('Kenya', 'invoicing'),
+	'KI' => __('Kiribati', 'invoicing'),
+	'KW' => __('Kuwait', 'invoicing'),
+	'KG' => __('Kyrgyzstan', 'invoicing'),
+	'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
+	'LV' => __('Latvia', 'invoicing'),
+	'LB' => __('Lebanon', 'invoicing'),
+	'LS' => __('Lesotho', 'invoicing'),
+	'LR' => __('Liberia', 'invoicing'),
+	'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
+	'LI' => __('Liechtenstein', 'invoicing'),
+	'LT' => __('Lithuania', 'invoicing'),
+	'LU' => __('Luxembourg', 'invoicing'),
+	'MO' => __('Macau', 'invoicing'),
+	'MK' => __('Macedonia', 'invoicing'),
+	'MG' => __('Madagascar', 'invoicing'),
+	'MW' => __('Malawi', 'invoicing'),
+	'MY' => __('Malaysia', 'invoicing'),
+	'MV' => __('Maldives', 'invoicing'),
+	'ML' => __('Mali', 'invoicing'),
+	'MT' => __('Malta', 'invoicing'),
+	'MH' => __('Marshall Islands', 'invoicing'),
+	'MQ' => __('Martinique', 'invoicing'),
+	'MR' => __('Mauritania', 'invoicing'),
+	'MU' => __('Mauritius', 'invoicing'),
+	'YT' => __('Mayotte', 'invoicing'),
+	'MX' => __('Mexico', 'invoicing'),
+	'FM' => __('Micronesia', 'invoicing'),
+	'MD' => __('Moldova, Republic of', 'invoicing'),
+	'MC' => __('Monaco', 'invoicing'),
+	'MN' => __('Mongolia', 'invoicing'),
+	'ME' => __('Montenegro', 'invoicing'),
+	'MS' => __('Montserrat', 'invoicing'),
+	'MA' => __('Morocco', 'invoicing'),
+	'MZ' => __('Mozambique', 'invoicing'),
+	'MM' => __('Myanmar', 'invoicing'),
+	'NA' => __('Namibia', 'invoicing'),
+	'NR' => __('Nauru', 'invoicing'),
+	'NP' => __('Nepal', 'invoicing'),
+	'NL' => __('Netherlands', 'invoicing'),
+	'AN' => __('Netherlands Antilles', 'invoicing'),
+	'NC' => __('New Caledonia', 'invoicing'),
+	'NZ' => __('New Zealand', 'invoicing'),
+	'NI' => __('Nicaragua', 'invoicing'),
+	'NE' => __('Niger', 'invoicing'),
+	'NG' => __('Nigeria', 'invoicing'),
+	'NU' => __('Niue', 'invoicing'),
+	'NF' => __('Norfolk Island', 'invoicing'),
+	'KP' => __('North Korea', 'invoicing'),
+	'MP' => __('Northern Mariana Islands', 'invoicing'),
+	'NO' => __('Norway', 'invoicing'),
+	'OM' => __('Oman', 'invoicing'),
+	'PK' => __('Pakistan', 'invoicing'),
+	'PW' => __('Palau', 'invoicing'),
+	'PS' => __('Palestinian Territories', 'invoicing'),
+	'PA' => __('Panama', 'invoicing'),
+	'PG' => __('Papua New Guinea', 'invoicing'),
+	'PY' => __('Paraguay', 'invoicing'),
+	'PE' => __('Peru', 'invoicing'),
+	'PH' => __('Philippines', 'invoicing'),
+	'PN' => __('Pitcairn Island', 'invoicing'),
+	'PL' => __('Poland', 'invoicing'),
+	'PT' => __('Portugal', 'invoicing'),
+	'PR' => __('Puerto Rico', 'invoicing'),
+	'QA' => __('Qatar', 'invoicing'),
+	'XK' => __('Republic of Kosovo', 'invoicing'),
+	'RE' => __('Reunion Island', 'invoicing'),
+	'RO' => __('Romania', 'invoicing'),
+	'RU' => __('Russian Federation', 'invoicing'),
+	'RW' => __('Rwanda', 'invoicing'),
+	'BL' => __('Saint Barthélemy', 'invoicing'),
+	'SH' => __('Saint Helena', 'invoicing'),
+	'KN' => __('Saint Kitts and Nevis', 'invoicing'),
+	'LC' => __('Saint Lucia', 'invoicing'),
+	'MF' => __('Saint Martin (French)', 'invoicing'),
+	'SX' => __('Saint Martin (Dutch)', 'invoicing'),
+	'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
+	'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
+	'SM' => __('San Marino', 'invoicing'),
+	'ST' => __('São Tomé and Príncipe', 'invoicing'),
+	'SA' => __('Saudi Arabia', 'invoicing'),
+	'SN' => __('Senegal', 'invoicing'),
+	'RS' => __('Serbia', 'invoicing'),
+	'SC' => __('Seychelles', 'invoicing'),
+	'SL' => __('Sierra Leone', 'invoicing'),
+	'SG' => __('Singapore', 'invoicing'),
+	'SK' => __('Slovak Republic', 'invoicing'),
+	'SI' => __('Slovenia', 'invoicing'),
+	'SB' => __('Solomon Islands', 'invoicing'),
+	'SO' => __('Somalia', 'invoicing'),
+	'ZA' => __('South Africa', 'invoicing'),
+	'GS' => __('South Georgia', 'invoicing'),
+	'KR' => __('South Korea', 'invoicing'),
+	'SS' => __('South Sudan', 'invoicing'),
+	'ES' => __('Spain', 'invoicing'),
+	'LK' => __('Sri Lanka', 'invoicing'),
+	'SD' => __('Sudan', 'invoicing'),
+	'SR' => __('Suriname', 'invoicing'),
+	'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
+	'SZ' => __('Swaziland', 'invoicing'),
+	'SE' => __('Sweden', 'invoicing'),
+	'CH' => __('Switzerland', 'invoicing'),
+	'SY' => __('Syrian Arab Republic', 'invoicing'),
+	'TW' => __('Taiwan', 'invoicing'),
+	'TJ' => __('Tajikistan', 'invoicing'),
+	'TZ' => __('Tanzania', 'invoicing'),
+	'TH' => __('Thailand', 'invoicing'),
+	'TL' => __('Timor-Leste', 'invoicing'),
+	'TG' => __('Togo', 'invoicing'),
+	'TK' => __('Tokelau', 'invoicing'),
+	'TO' => __('Tonga', 'invoicing'),
+	'TT' => __('Trinidad and Tobago', 'invoicing'),
+	'TN' => __('Tunisia', 'invoicing'),
+	'TR' => __('Turkey', 'invoicing'),
+	'TM' => __('Turkmenistan', 'invoicing'),
+	'TC' => __('Turks and Caicos Islands', 'invoicing'),
+	'TV' => __('Tuvalu', 'invoicing'),
+	'UG' => __('Uganda', 'invoicing'),
+	'UA' => __('Ukraine', 'invoicing'),
+	'AE' => __('United Arab Emirates', 'invoicing'),
+	'UY' => __('Uruguay', 'invoicing'),
+	'UM' => __('US Minor Outlying Islands', 'invoicing'),
+	'UZ' => __('Uzbekistan', 'invoicing'),
+	'VU' => __('Vanuatu', 'invoicing'),
+	'VE' => __('Venezuela', 'invoicing'),
+	'VN' => __('Vietnam', 'invoicing'),
+	'VG' => __('Virgin Islands (British)', 'invoicing'),
+	'VI' => __('Virgin Islands (USA)', 'invoicing'),
+	'WF' => __('Wallis and Futuna Islands', 'invoicing'),
+	'EH' => __('Western Sahara', 'invoicing'),
+	'WS' => __('Western Samoa', 'invoicing'),
+	'YE' => __('Yemen', 'invoicing'),
+	'ZM' => __('Zambia', 'invoicing'),
+	'ZW' => __('Zimbabwe', 'invoicing'),
 );