AyeCode / invoicing

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

Spacing +154 added lines, -154 removed lines

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

includes/invoice-functions.php

Spacing +344 added lines, -344 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
  
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves the current invoice.
@@ -14,15 +14,15 @@ 
 function getpaid_get_current_invoice_id() {
 
     // Ensure that we have an invoice key.
-    if ( empty( $_GET['invoice_key'] ) ) {
+    if (empty($_GET['invoice_key'])) {
         return 0;
     }
 
     // Retrieve an invoice using the key.
-    $invoice = new WPInv_Invoice( $_GET['invoice_key'] );
+    $invoice = new WPInv_Invoice($_GET['invoice_key']);
 
     // Compare the invoice key and the parsed key.
-    if ( $invoice->get_id() != 0 && $invoice->get_key() == $_GET['invoice_key'] ) {
+    if ($invoice->get_id() != 0 && $invoice->get_key() == $_GET['invoice_key']) {
         return $invoice->get_id();
     }
 
@@ -32,42 +32,42 @@ 
 /**
  * Checks if the current user cna view an invoice.
  */
-function wpinv_user_can_view_invoice( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_user_can_view_invoice($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if the invoice does not exist.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Don't allow trash, draft status
-    if ( $invoice->is_draft() ) {
+    if ($invoice->is_draft()) {
         return false;
     }
 
     // If users are not required to login to check out, compare the invoice keys.
-    if ( ! wpinv_require_login_to_checkout() && isset( $_GET['invoice_key'] ) && trim( $_GET['invoice_key'] ) == $invoice->get_key() ) {
+    if (!wpinv_require_login_to_checkout() && isset($_GET['invoice_key']) && trim($_GET['invoice_key']) == $invoice->get_key()) {
         return true;
     }
 
     // Always enable for admins..
-    if ( wpinv_current_user_can_manage_invoicing() || current_user_can( 'view_invoices', $invoice->get_id() ) ) { // Admin user
+    if (wpinv_current_user_can_manage_invoicing() || current_user_can('view_invoices', $invoice->get_id())) { // Admin user
         return true;
     }
 
     // Else, ensure that this is their invoice.
-    if ( is_user_logged_in() && $invoice->get_user_id() == get_current_user_id() ) {
+    if (is_user_logged_in() && $invoice->get_user_id() == get_current_user_id()) {
         return true;
     }
 
-    return apply_filters( 'wpinv_current_user_can_view_invoice', false, $invoice );
+    return apply_filters('wpinv_current_user_can_view_invoice', false, $invoice);
 }
 
 /**
  * Checks if the current user cna view an invoice receipt.
  */
-function wpinv_can_view_receipt( $invoice ) {
-	return (bool) apply_filters( 'wpinv_can_view_receipt', wpinv_user_can_view_invoice( $invoice ), $invoice );
+function wpinv_can_view_receipt($invoice) {
+	return (bool) apply_filters('wpinv_can_view_receipt', wpinv_user_can_view_invoice($invoice), $invoice);
 }
 
 /**
@@ -77,11 +77,11 @@ 
  */
 function getpaid_get_invoice_post_types() {
     $post_types = array(
-        'wpi_quote'   => __( 'Quote', 'invoicing' ),
-        'wpi_invoice' => __( 'Invoice', 'invoicing' ),
+        'wpi_quote'   => __('Quote', 'invoicing'),
+        'wpi_invoice' => __('Invoice', 'invoicing'),
     );
 
-    return apply_filters( 'getpaid_invoice_post_types', $post_types );
+    return apply_filters('getpaid_invoice_post_types', $post_types);
 }
 
 /**
@@ -90,8 +90,8 @@ 
  * 
  * @param string $post_type The post type to check for.
  */
-function getpaid_is_invoice_post_type( $post_type ) {
-    return ! empty( $post_type ) && array_key_exists( $post_type, getpaid_get_invoice_post_types() );
+function getpaid_is_invoice_post_type($post_type) {
+    return !empty($post_type) && array_key_exists($post_type, getpaid_get_invoice_post_types());
 }
 
 /**
@@ -101,9 +101,9 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_create_invoice( $data = array(), $deprecated = null, $wp_error = false ) {
-    $data[ 'invoice_id' ] = 0;
-    return wpinv_insert_invoice( $data, $wp_error );
+function wpinv_create_invoice($data = array(), $deprecated = null, $wp_error = false) {
+    $data['invoice_id'] = 0;
+    return wpinv_insert_invoice($data, $wp_error);
 }
 
 /**
@@ -113,36 +113,36 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_update_invoice( $data = array(), $wp_error = false ) {
+function wpinv_update_invoice($data = array(), $wp_error = false) {
 
     // Backwards compatibility.
-    if ( ! empty( $data['ID'] ) ) {
+    if (!empty($data['ID'])) {
         $data['invoice_id'] = $data['ID'];
     }
 
     // Do we have an invoice id?
-    if ( empty( $data['invoice_id'] ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', __( 'Invalid invoice ID.', 'invoicing' ) ) : 0;
+    if (empty($data['invoice_id'])) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', __('Invalid invoice ID.', 'invoicing')) : 0;
     }
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $data['invoice_id'] );
+    $invoice = wpinv_get_invoice($data['invoice_id']);
 
     // And abort if it does not exist.
-    if ( empty( $invoice ) ) {
-        return $wp_error ? new WP_Error( 'missing_invoice', __( 'Invoice not found.', 'invoicing' ) ) : 0;
+    if (empty($invoice)) {
+        return $wp_error ? new WP_Error('missing_invoice', __('Invoice not found.', 'invoicing')) : 0;
     }
 
     // Do not update totals for paid / refunded invoices.
-    if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+    if ($invoice->is_paid() || $invoice->is_refunded()) {
 
-        if ( ! empty( $data['items'] ) || ! empty( $data['cart_details'] ) ) {
-            return $wp_error ? new WP_Error( 'paid_invoice', __( 'You can not update cart items for invoices that have already been paid for.', 'invoicing' ) ) : 0;
+        if (!empty($data['items']) || !empty($data['cart_details'])) {
+            return $wp_error ? new WP_Error('paid_invoice', __('You can not update cart items for invoices that have already been paid for.', 'invoicing')) : 0;
         }
 
     }
 
-    return wpinv_insert_invoice( $data, $wp_error );
+    return wpinv_insert_invoice($data, $wp_error);
 
 }
 
@@ -153,34 +153,34 @@ 
  * @param  bool  $wp_error       Whether to return false or WP_Error on failure.
  * @return int|WP_Error|WPInv_Invoice The value 0 or WP_Error on failure. The WPInv_Invoice object on success.
  */
-function wpinv_insert_invoice( $data = array(), $wp_error = false ) {
+function wpinv_insert_invoice($data = array(), $wp_error = false) {
 
     // Ensure that we have invoice data.
-    if ( empty( $data ) ) {
+    if (empty($data)) {
         return false;
     }
 
     // The invoice id will be provided when updating an invoice.
-    $data['invoice_id'] = ! empty( $data['invoice_id'] ) ? (int) $data['invoice_id'] : false;
+    $data['invoice_id'] = !empty($data['invoice_id']) ? (int) $data['invoice_id'] : false;
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $data['invoice_id'] );
+    $invoice = new WPInv_Invoice($data['invoice_id']);
 
     // Do we have an error?
-    if ( ! empty( $invoice->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_invoice_id', $invoice->last_error ) : 0;
+    if (!empty($invoice->last_error)) {
+        return $wp_error ? new WP_Error('invalid_invoice_id', $invoice->last_error) : 0;
     }
 
     // Backwards compatibility (billing address).
-    if ( ! empty( $data['user_info'] ) ) {
+    if (!empty($data['user_info'])) {
 
-        foreach ( $data['user_info'] as $key => $value ) {
+        foreach ($data['user_info'] as $key => $value) {
 
-            if ( $key == 'discounts' ) {
+            if ($key == 'discounts') {
                 $value = (array) $value;
-                $data[ 'discount_code' ] = empty( $value ) ? null : $value[0];
+                $data['discount_code'] = empty($value) ? null : $value[0];
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
 
         }
@@ -188,30 +188,30 @@ 
     }
 
     // Backwards compatibility.
-    if ( ! empty( $data['payment_details'] ) ) {
+    if (!empty($data['payment_details'])) {
 
-        foreach ( $data['payment_details'] as $key => $value ) {
-            $data[ $key ] = $value;
+        foreach ($data['payment_details'] as $key => $value) {
+            $data[$key] = $value;
         }
 
     }
 
     // Set up the owner of the invoice.
-    $user_id = ! empty( $data['user_id'] ) ? wpinv_clean( $data['user_id'] ) : get_current_user_id();
+    $user_id = !empty($data['user_id']) ? wpinv_clean($data['user_id']) : get_current_user_id();
 
     // Make sure the user exists.
-    if ( ! get_userdata( $user_id ) ) {
-        return $wp_error ? new WP_Error( 'wpinv_invalid_user', __( 'There is no user with that ID.', 'invoicing' ) ) : 0;
+    if (!get_userdata($user_id)) {
+        return $wp_error ? new WP_Error('wpinv_invalid_user', __('There is no user with that ID.', 'invoicing')) : 0;
     }
 
-    $address = wpinv_get_user_address( $user_id );
+    $address = wpinv_get_user_address($user_id);
 
-    foreach ( $address as $key => $value ) {
+    foreach ($address as $key => $value) {
 
-        if ( $value == '' ) {
-            $address[ $key ] = null;
+        if ($value == '') {
+            $address[$key] = null;
         } else {
-            $address[ $key ] = wpinv_clean( $value );
+            $address[$key] = wpinv_clean($value);
         }
 
     }
@@ -222,103 +222,103 @@ 
         array(
 
             // Basic info.
-            'template'             => isset( $data['template'] ) ? wpinv_clean( $data['template'] ) : null,
-            'email_cc'             => isset( $data['email_cc'] ) ? wpinv_clean( $data['email_cc'] ) : null,
-            'date_created'         => isset( $data['created_date'] ) ? wpinv_clean( $data['created_date'] ) : null,
-            'due_date'             => isset( $data['due_date'] ) ? wpinv_clean( $data['due_date'] ) : null,
-            'date_completed'       => isset( $data['date_completed'] ) ? wpinv_clean( $data['date_completed'] ) : null,
-            'number'               => isset( $data['number'] ) ? wpinv_clean( $data['number'] ) : null,
-            'key'                  => isset( $data['key'] ) ? wpinv_clean( $data['key'] ) : null,
-            'status'               => isset( $data['status'] ) ? wpinv_clean( $data['status'] ) : null,
-            'post_type'            => isset( $data['post_type'] ) ? wpinv_clean( $data['post_type'] ) : null,
-            'user_ip'              => isset( $data['ip'] ) ? wpinv_clean( $data['ip'] ) : wpinv_get_ip(),
-            'parent_id'            => isset( $data['parent'] ) ? intval( $data['parent'] ) : null,
-            'mode'                 => isset( $data['mode'] ) ? wpinv_clean( $data['mode'] ) : null,
-            'description'          => isset( $data['description'] ) ? wp_kses_post( $data['description'] ) : null,
+            'template'             => isset($data['template']) ? wpinv_clean($data['template']) : null,
+            'email_cc'             => isset($data['email_cc']) ? wpinv_clean($data['email_cc']) : null,
+            'date_created'         => isset($data['created_date']) ? wpinv_clean($data['created_date']) : null,
+            'due_date'             => isset($data['due_date']) ? wpinv_clean($data['due_date']) : null,
+            'date_completed'       => isset($data['date_completed']) ? wpinv_clean($data['date_completed']) : null,
+            'number'               => isset($data['number']) ? wpinv_clean($data['number']) : null,
+            'key'                  => isset($data['key']) ? wpinv_clean($data['key']) : null,
+            'status'               => isset($data['status']) ? wpinv_clean($data['status']) : null,
+            'post_type'            => isset($data['post_type']) ? wpinv_clean($data['post_type']) : null,
+            'user_ip'              => isset($data['ip']) ? wpinv_clean($data['ip']) : wpinv_get_ip(),
+            'parent_id'            => isset($data['parent']) ? intval($data['parent']) : null,
+            'mode'                 => isset($data['mode']) ? wpinv_clean($data['mode']) : null,
+            'description'          => isset($data['description']) ? wp_kses_post($data['description']) : null,
 
             // Payment info.
-            'disable_taxes'        => ! empty( $data['disable_taxes'] ),
-            'currency'             => isset( $data['currency'] ) ? wpinv_clean( $data['currency'] ) : wpinv_get_currency(),
-            'gateway'              => isset( $data['gateway'] ) ? wpinv_clean( $data['gateway'] ) : null,
-            'transaction_id'       => isset( $data['transaction_id'] ) ? wpinv_clean( $data['transaction_id'] ) : null,
-            'discount_code'        => isset( $data['discount_code'] ) ? wpinv_clean( $data['discount_code'] ) : null,
-            'payment_form'         => isset( $data['payment_form'] ) ? intval( $data['payment_form'] ) : null,
-            'submission_id'        => isset( $data['submission_id'] ) ? wpinv_clean( $data['submission_id'] ) : null,
-            'subscription_id'      => isset( $data['subscription_id'] ) ? wpinv_clean( $data['subscription_id'] ) : null,
-            'is_viewed'            => isset( $data['is_viewed'] ) ? wpinv_clean( $data['is_viewed'] ) : null,
-            'fees'                 => isset( $data['fees'] ) ? wpinv_clean( $data['fees'] ) : null,
-            'discounts'            => isset( $data['discounts'] ) ? wpinv_clean( $data['discounts'] ) : null,
-            'taxes'                => isset( $data['taxes'] ) ? wpinv_clean( $data['taxes'] ) : null,
+            'disable_taxes'        => !empty($data['disable_taxes']),
+            'currency'             => isset($data['currency']) ? wpinv_clean($data['currency']) : wpinv_get_currency(),
+            'gateway'              => isset($data['gateway']) ? wpinv_clean($data['gateway']) : null,
+            'transaction_id'       => isset($data['transaction_id']) ? wpinv_clean($data['transaction_id']) : null,
+            'discount_code'        => isset($data['discount_code']) ? wpinv_clean($data['discount_code']) : null,
+            'payment_form'         => isset($data['payment_form']) ? intval($data['payment_form']) : null,
+            'submission_id'        => isset($data['submission_id']) ? wpinv_clean($data['submission_id']) : null,
+            'subscription_id'      => isset($data['subscription_id']) ? wpinv_clean($data['subscription_id']) : null,
+            'is_viewed'            => isset($data['is_viewed']) ? wpinv_clean($data['is_viewed']) : null,
+            'fees'                 => isset($data['fees']) ? wpinv_clean($data['fees']) : null,
+            'discounts'            => isset($data['discounts']) ? wpinv_clean($data['discounts']) : null,
+            'taxes'                => isset($data['taxes']) ? wpinv_clean($data['taxes']) : null,
             
 
             // Billing details.
             'user_id'              => $data['user_id'],
-            'first_name'           => isset( $data['first_name'] ) ? wpinv_clean( $data['first_name'] ) : $address['first_name'],
-            'last_name'            => isset( $data['last_name'] ) ? wpinv_clean( $data['last_name'] ) : $address['last_name'],
-            'address'              => isset( $data['address'] ) ? wpinv_clean( $data['address'] ) : $address['address'] ,
-            'vat_number'           => isset( $data['vat_number'] ) ? wpinv_clean( $data['vat_number'] ) : $address['vat_number'],
-            'company'              => isset( $data['company'] ) ? wpinv_clean( $data['company'] ) : $address['company'],
-            'zip'                  => isset( $data['zip'] ) ? wpinv_clean( $data['zip'] ) : $address['zip'],
-            'state'                => isset( $data['state'] ) ? wpinv_clean( $data['state'] ) : $address['state'],
-            'city'                 => isset( $data['city'] ) ? wpinv_clean( $data['city'] ) : $address['city'],
-            'country'              => isset( $data['country'] ) ? wpinv_clean( $data['country'] ) : $address['country'],
-            'phone'                => isset( $data['phone'] ) ? wpinv_clean( $data['phone'] ) : $address['phone'],
-            'address_confirmed'    => ! empty( $data['address_confirmed'] ),
+            'first_name'           => isset($data['first_name']) ? wpinv_clean($data['first_name']) : $address['first_name'],
+            'last_name'            => isset($data['last_name']) ? wpinv_clean($data['last_name']) : $address['last_name'],
+            'address'              => isset($data['address']) ? wpinv_clean($data['address']) : $address['address'],
+            'vat_number'           => isset($data['vat_number']) ? wpinv_clean($data['vat_number']) : $address['vat_number'],
+            'company'              => isset($data['company']) ? wpinv_clean($data['company']) : $address['company'],
+            'zip'                  => isset($data['zip']) ? wpinv_clean($data['zip']) : $address['zip'],
+            'state'                => isset($data['state']) ? wpinv_clean($data['state']) : $address['state'],
+            'city'                 => isset($data['city']) ? wpinv_clean($data['city']) : $address['city'],
+            'country'              => isset($data['country']) ? wpinv_clean($data['country']) : $address['country'],
+            'phone'                => isset($data['phone']) ? wpinv_clean($data['phone']) : $address['phone'],
+            'address_confirmed'    => !empty($data['address_confirmed']),
 
         )
 
     );
 
     // Backwards compatibililty.
-    if ( ! empty( $data['cart_details'] ) && is_array( $data['cart_details'] ) ) {
+    if (!empty($data['cart_details']) && is_array($data['cart_details'])) {
         $data['items'] = array();
 
-        foreach( $data['cart_details'] as $_item ) {
+        foreach ($data['cart_details'] as $_item) {
 
             // Ensure that we have an item id.
-            if ( empty(  $_item['id']  ) ) {
+            if (empty($_item['id'])) {
                 continue;
             }
 
             // Retrieve the item.
-            $item = new GetPaid_Form_Item(  $_item['id']  );
+            $item = new GetPaid_Form_Item($_item['id']);
 
             // Ensure that it is purchasable.
-            if ( ! $item->can_purchase() ) {
+            if (!$item->can_purchase()) {
                 continue;
             }
 
             // Set quantity.
-            if ( ! empty( $_item['quantity'] ) && is_numeric( $_item['quantity'] ) ) {
-                $item->set_quantity( $_item['quantity'] );
+            if (!empty($_item['quantity']) && is_numeric($_item['quantity'])) {
+                $item->set_quantity($_item['quantity']);
             }
 
             // Set price.
-            if ( isset( $_item['item_price'] ) ) {
-                $item->set_price( $_item['item_price'] );
+            if (isset($_item['item_price'])) {
+                $item->set_price($_item['item_price']);
             }
 
-            if ( isset( $_item['custom_price'] ) ) {
-                $item->set_price( $_item['custom_price'] );
+            if (isset($_item['custom_price'])) {
+                $item->set_price($_item['custom_price']);
             }
 
             // Set name.
-            if ( ! empty( $_item['name'] ) ) {
-                $item->set_name( $_item['name'] );
+            if (!empty($_item['name'])) {
+                $item->set_name($_item['name']);
             }
 
             // Set description.
-            if ( isset( $_item['description'] ) ) {
-                $item->set_custom_description( $_item['description'] );
+            if (isset($_item['description'])) {
+                $item->set_custom_description($_item['description']);
             }
 
             // Set meta.
-            if ( isset( $_item['meta'] ) && is_array( $_item['meta'] ) ) {
+            if (isset($_item['meta']) && is_array($_item['meta'])) {
 
-                $item->set_item_meta( $_item['meta'] );
+                $item->set_item_meta($_item['meta']);
 
-                if ( isset( $_item['meta']['description'] ) ) {
-                    $item->set_custom_description( $_item['meta']['description'] );
+                if (isset($_item['meta']['description'])) {
+                    $item->set_custom_description($_item['meta']['description']);
                 }
 
             }
@@ -329,14 +329,14 @@ 
     }
 
     // Add invoice items.
-    if ( ! empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    if (!empty($data['items']) && is_array($data['items'])) {
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        foreach ( $data['items'] as $item ) {
+        foreach ($data['items'] as $item) {
 
-            if ( is_object( $item ) && is_a( $item, 'GetPaid_Form_Item' ) && $item->can_purchase() ) {
-                $invoice->add_item( $item );
+            if (is_object($item) && is_a($item, 'GetPaid_Form_Item') && $item->can_purchase()) {
+                $invoice->add_item($item);
             }
 
         }
@@ -347,30 +347,30 @@ 
     $invoice->recalculate_total();
     $invoice->save();
 
-    if ( ! $invoice->get_id() ) {
-        return $wp_error ? new WP_Error( 'wpinv_insert_invoice_error', __( 'An error occured when saving your invoice.', 'invoicing' ) ) : 0;
+    if (!$invoice->get_id()) {
+        return $wp_error ? new WP_Error('wpinv_insert_invoice_error', __('An error occured when saving your invoice.', 'invoicing')) : 0;
     }
 
     // Add private note.
-    if ( ! empty( $data['private_note'] ) ) {
-        $invoice->add_note( $data['private_note'] );
+    if (!empty($data['private_note'])) {
+        $invoice->add_note($data['private_note']);
     }
 
     // User notes.
-    if ( !empty( $data['user_note'] ) ) {
-        $invoice->add_note( $data['user_note'], true );
+    if (!empty($data['user_note'])) {
+        $invoice->add_note($data['user_note'], true);
     }
 
     // Created via.
-    if ( isset( $data['created_via'] ) ) {
-        update_post_meta( $invoice->get_id(), 'wpinv_created_via', $data['created_via'] );
+    if (isset($data['created_via'])) {
+        update_post_meta($invoice->get_id(), 'wpinv_created_via', $data['created_via']);
     }
 
     // Backwards compatiblity.
-    if ( $invoice->is_quote() ) {
+    if ($invoice->is_quote()) {
 
-        if ( isset( $data['valid_until'] ) ) {
-            update_post_meta( $invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until'] );
+        if (isset($data['valid_until'])) {
+            update_post_meta($invoice->get_id(), 'wpinv_quote_valid_until', $data['valid_until']);
         }
         return $invoice;
 
@@ -385,18 +385,18 @@ 
  * @param $bool $deprecated
  * @return WPInv_Invoice|null
  */
-function wpinv_get_invoice( $invoice = 0, $deprecated = false ) {
+function wpinv_get_invoice($invoice = 0, $deprecated = false) {
 
     // If we are retrieving the invoice from the cart...
-    if ( $deprecated && empty( $invoice ) ) {
+    if ($deprecated && empty($invoice)) {
         $invoice = (int) getpaid_get_current_invoice_id();
     }
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Check if it exists.
-    if ( $invoice->get_id() != 0 ) {
+    if ($invoice->get_id() != 0) {
         return $invoice;
     }
 
@@ -409,15 +409,15 @@ 
  * @param array $args Args to search for.
  * @return WPInv_Invoice[]|int[]|object
  */
-function wpinv_get_invoices( $args ) {
+function wpinv_get_invoices($args) {
 
     // Prepare args.
     $args = wp_parse_args(
         $args,
         array(
-            'status'   => array_keys( wpinv_get_invoice_statuses() ),
+            'status'   => array_keys(wpinv_get_invoice_statuses()),
             'type'     => 'wpi_invoice',
-            'limit'    => get_option( 'posts_per_page' ),
+            'limit'    => get_option('posts_per_page'),
             'return'   => 'objects',
         )
     );
@@ -435,24 +435,24 @@ 
         'post__in'       => 'include',
     );
 
-    foreach ( $map_legacy as $to => $from ) {
-        if ( isset( $args[ $from ] ) ) {
-            $args[ $to ] = $args[ $from ];
-            unset( $args[ $from ] );
+    foreach ($map_legacy as $to => $from) {
+        if (isset($args[$from])) {
+            $args[$to] = $args[$from];
+            unset($args[$from]);
         }
     }
 
     // Backwards compatibility.
-    if ( ! empty( $args['email'] ) && empty( $args['user'] ) ) {
+    if (!empty($args['email']) && empty($args['user'])) {
         $args['user'] = $args['email'];
-        unset( $args['email'] );
+        unset($args['email']);
     }
 
     // Handle cases where the user is set as an email.
-    if ( ! empty( $args['author'] ) && is_email( $args['author'] ) ) {
-        $user = get_user_by( 'email', $args['user'] );
+    if (!empty($args['author']) && is_email($args['author'])) {
+        $user = get_user_by('email', $args['user']);
 
-        if ( $user ) {
+        if ($user) {
             $args['author'] = $user->user_email;
         }
 
@@ -463,31 +463,31 @@ 
 
     // Show all posts.
     $paginate = true;
-    if ( isset( $args['paginate'] ) ) {
+    if (isset($args['paginate'])) {
         
         $paginate = $args['paginate'];
-        $args['no_found_rows'] = empty( $args['paginate'] );
-        unset( $args['paginate'] );
+        $args['no_found_rows'] = empty($args['paginate']);
+        unset($args['paginate']);
 
     }
 
     // Whether to return objects or fields.
     $return = $args['return'];
-    unset( $args['return'] );
+    unset($args['return']);
 
     // Get invoices.
-    $invoices = new WP_Query( apply_filters( 'wpinv_get_invoices_args', $args ) );
+    $invoices = new WP_Query(apply_filters('wpinv_get_invoices_args', $args));
 
     // Prepare the results.
-    if ( 'objects' === $return ) {
-        $results = array_map( 'wpinv_get_invoice', $invoices->posts );
-    } elseif ( 'self' === $return ) {
+    if ('objects' === $return) {
+        $results = array_map('wpinv_get_invoice', $invoices->posts);
+    } elseif ('self' === $return) {
         return $invoices;
     } else {
         $results = $invoices->posts;
     }
 
-    if ( $paginate ) {
+    if ($paginate) {
         return (object) array(
             'invoices'      => $results,
             'total'         => $invoices->found_posts,
@@ -505,8 +505,8 @@ 
  * @param string $transaction_id The transaction id to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_transaction_id( $transaction_id ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $transaction_id, 'transaction_id' );
+function wpinv_get_id_by_transaction_id($transaction_id) {
+    return WPInv_Invoice::get_invoice_id_by_field($transaction_id, 'transaction_id');
 }
 
 /**
@@ -515,8 +515,8 @@ 
  * @param string $invoice_number The invoice number to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_id_by_invoice_number( $invoice_number ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_number, 'number' );
+function wpinv_get_id_by_invoice_number($invoice_number) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_number, 'number');
 }
 
 /**
@@ -525,8 +525,8 @@ 
  * @param string $invoice_key The invoice key to check.
  * @return int Invoice id on success or 0 on failure
  */
-function wpinv_get_invoice_id_by_key( $invoice_key ) {
-    return WPInv_Invoice::get_invoice_id_by_field( $invoice_key, 'key' );
+function wpinv_get_invoice_id_by_key($invoice_key) {
+    return WPInv_Invoice::get_invoice_id_by_field($invoice_key, 'key');
 }
 
 /**
@@ -536,19 +536,19 @@ 
  * @param string $type Optionally filter by type i.e customer|system
  * @return array|null
  */
-function wpinv_get_invoice_notes( $invoice = 0, $type = '' ) {
+function wpinv_get_invoice_notes($invoice = 0, $type = '') {
 
     // Prepare the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice);
+    if (empty($invoice)) {
         return NULL;
     }
 
     // Fetch notes.
-    $notes = getpaid_notes()->get_invoice_notes( $invoice->get_id(), $type );
+    $notes = getpaid_notes()->get_invoice_notes($invoice->get_id(), $type);
 
     // Filter the notes.
-    return apply_filters( 'wpinv_invoice_notes', $notes, $invoice->get_id(), $type );
+    return apply_filters('wpinv_invoice_notes', $notes, $invoice->get_id(), $type);
 }
 
 /**
@@ -556,10 +556,10 @@ 
  * 
  * @param string $post_type
  */
-function wpinv_get_user_invoices_columns( $post_type = 'wpi_invoice' ) {
+function wpinv_get_user_invoices_columns($post_type = 'wpi_invoice') {
 
-    $label   = getpaid_get_post_type_label( $post_type, false );
-    $label   = empty( $label ) ? __( 'Invoice', 'invoicing' ) : sanitize_text_field( $label );
+    $label   = getpaid_get_post_type_label($post_type, false);
+    $label   = empty($label) ? __('Invoice', 'invoicing') : sanitize_text_field($label);
     $columns = array(
 
             'invoice-number'  => array(
@@ -568,22 +568,22 @@ 
             ),
 
             'created-date'    => array(
-                'title' => __( 'Created Date', 'invoicing' ),
+                'title' => __('Created Date', 'invoicing'),
                 'class' => 'text-left'
             ),
 
             'payment-date'    => array(
-                'title' => __( 'Payment Date', 'invoicing' ),
+                'title' => __('Payment Date', 'invoicing'),
                 'class' => 'text-left'
             ),
 
             'invoice-status'  => array(
-                'title' => __( 'Status', 'invoicing' ),
+                'title' => __('Status', 'invoicing'),
                 'class' => 'text-center'
             ),
 
             'invoice-total'   => array(
-                'title' => __( 'Total', 'invoicing' ),
+                'title' => __('Total', 'invoicing'),
                 'class' => 'text-right'
             ),
 
@@ -594,7 +594,7 @@ 
 
         );
 
-    return apply_filters( 'wpinv_user_invoices_columns', $columns, $post_type );
+    return apply_filters('wpinv_user_invoices_columns', $columns, $post_type);
 }
 
 /**
@@ -604,59 +604,59 @@ 
 
     // Find the invoice.
     $invoice_id = getpaid_get_current_invoice_id();
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // Abort if non was found.
-    if ( empty( $invoice_id ) || $invoice->is_draft() ) {
+    if (empty($invoice_id) || $invoice->is_draft()) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'We could not find your invoice', 'invoicing' ),
+                'content' => __('We could not find your invoice', 'invoicing'),
             )
         );
 
     }
 
     // Can the user view this invoice?
-    if ( ! wpinv_can_view_receipt( $invoice_id ) ) {
+    if (!wpinv_can_view_receipt($invoice_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
-                'content' => __( 'You are not allowed to view this receipt', 'invoicing' ),
+                'content' => __('You are not allowed to view this receipt', 'invoicing'),
             )
         );
 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-receipt.php', compact( 'invoice' ) );
+    return wpinv_get_template_html('invoice-receipt.php', compact('invoice'));
 
 }
 
 /**
  * Displays the invoice history.
  */
-function getpaid_invoice_history( $user_id = 0, $post_type = 'wpi_invoice' ) {
+function getpaid_invoice_history($user_id = 0, $post_type = 'wpi_invoice') {
 
     // Ensure that we have a user id.
-    if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+    if (empty($user_id) || !is_numeric($user_id)) {
         $user_id = get_current_user_id();
     }
 
-    $label = getpaid_get_post_type_label( $post_type );
-    $label = empty( $label ) ? __( 'Invoices', 'invoicing' ) : sanitize_text_field( $label );
+    $label = getpaid_get_post_type_label($post_type);
+    $label = empty($label) ? __('Invoices', 'invoicing') : sanitize_text_field($label);
 
     // View user id.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
 
         return aui()->alert(
             array(
                 'type'    => 'warning',
                 'content' => sprintf(
-                    __( 'You must be logged in to view your %s.', 'invoicing' ),
-                    strtolower( $label )
+                    __('You must be logged in to view your %s.', 'invoicing'),
+                    strtolower($label)
                 )
             )
         );
@@ -667,23 +667,23 @@ 
     $invoices = wpinv_get_invoices(
 
         array(
-            'page'      => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+            'page'      => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
             'user'      => $user_id,
             'paginate'  => true,
             'type'      => $post_type,
-            'status'    => array_keys( wpinv_get_invoice_statuses( false, false, $post_type ) ),
+            'status'    => array_keys(wpinv_get_invoice_statuses(false, false, $post_type)),
         )
 
     );
 
-    if ( empty( $invoices->total ) ) {
+    if (empty($invoices->total)) {
 
         return aui()->alert(
             array(
                 'type'    => 'info',
                 'content' => sprintf(
-                    __( 'No %s found.', 'invoicing' ),
-                    strtolower( $label )
+                    __('No %s found.', 'invoicing'),
+                    strtolower($label)
                 )
             )
         );
@@ -691,38 +691,38 @@ 
     }
 
     // Load the template.
-    return wpinv_get_template_html( 'invoice-history.php', compact( 'invoices', 'post_type' ) );
+    return wpinv_get_template_html('invoice-history.php', compact('invoices', 'post_type'));
 
 }
 
 /**
  * Formats an invoice number given an invoice type.
  */
-function wpinv_format_invoice_number( $number, $type = '' ) {
+function wpinv_format_invoice_number($number, $type = '') {
 
     // Allow other plugins to overide this.
-    $check = apply_filters( 'wpinv_pre_format_invoice_number', null, $number, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_pre_format_invoice_number', null, $number, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure that we have a numeric number.
-    if ( ! is_numeric( $number ) ) {
+    if (!is_numeric($number)) {
         return $number;
     }
 
     // Format the number.
-    $padd             = absint( (int) wpinv_get_option( 'invoice_number_padd' ) );
-    $prefix           = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_prefix', 'INV-' ) );
-    $prefix           = sanitize_text_field( apply_filters( 'getpaid_invoice_type_prefix', $prefix, $type ) );
-    $postfix          = sanitize_text_field( (string) wpinv_get_option( 'invoice_number_postfix' ) );
-    $postfix          = sanitize_text_field( apply_filters( 'getpaid_invoice_type_postfix', $postfix, $type ) );
-    $formatted_number = zeroise( absint( $number ), $padd );
+    $padd             = absint((int) wpinv_get_option('invoice_number_padd'));
+    $prefix           = sanitize_text_field((string) wpinv_get_option('invoice_number_prefix', 'INV-'));
+    $prefix           = sanitize_text_field(apply_filters('getpaid_invoice_type_prefix', $prefix, $type));
+    $postfix          = sanitize_text_field((string) wpinv_get_option('invoice_number_postfix'));
+    $postfix          = sanitize_text_field(apply_filters('getpaid_invoice_type_postfix', $postfix, $type));
+    $formatted_number = zeroise(absint($number), $padd);
 
     // Add the prefix and post fix.
     $formatted_number = $prefix . $formatted_number . $postfix;
 
-    return apply_filters( 'wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd );
+    return apply_filters('wpinv_format_invoice_number', $formatted_number, $number, $prefix, $postfix, $padd);
 }
 
 /**
@@ -731,58 +731,58 @@ 
  * @param string $type.
  * @return int|null|bool
  */
-function wpinv_get_next_invoice_number( $type = '' ) {
+function wpinv_get_next_invoice_number($type = '') {
 
     // Allow plugins to overide this.
-    $check = apply_filters( 'wpinv_get_pre_next_invoice_number', null, $type );
-    if ( null !== $check ) {
+    $check = apply_filters('wpinv_get_pre_next_invoice_number', null, $type);
+    if (null !== $check) {
         return $check;
     }
 
     // Ensure sequential invoice numbers is active.
-    if ( ! wpinv_sequential_number_active() ) {
+    if (!wpinv_sequential_number_active()) {
         return false;
     }
 
     // Retrieve the current number and the start number.
-    $number = (int) get_option( 'wpinv_last_invoice_number', 0 );
-    $start  = absint( (int) wpinv_get_option( 'invoice_sequence_start', 1 ) );
+    $number = (int) get_option('wpinv_last_invoice_number', 0);
+    $start  = absint((int) wpinv_get_option('invoice_sequence_start', 1));
 
     // Ensure that we are starting at a positive integer.
-    $start  = max( $start, 1 );
+    $start  = max($start, 1);
 
     // If this is the first invoice, use the start number.
-    $number = max( $start, $number );
+    $number = max($start, $number);
 
     // Format the invoice number.
-    $formatted_number = wpinv_format_invoice_number( $number, $type );
+    $formatted_number = wpinv_format_invoice_number($number, $type);
 
     // Ensure that this number is unique.
-    $invoice_id = WPInv_Invoice::get_invoice_id_by_field( $formatted_number, 'number' );
+    $invoice_id = WPInv_Invoice::get_invoice_id_by_field($formatted_number, 'number');
 
     // We found a match. Nice.
-    if ( empty( $invoice_id ) ) {
-        update_option( 'wpinv_last_invoice_number', $number );
-        return apply_filters( 'wpinv_get_next_invoice_number', $number );
+    if (empty($invoice_id)) {
+        update_option('wpinv_last_invoice_number', $number);
+        return apply_filters('wpinv_get_next_invoice_number', $number);
     }
 
-    update_option( 'wpinv_last_invoice_number', $number + 1 );
-    return wpinv_get_next_invoice_number( $type );
+    update_option('wpinv_last_invoice_number', $number + 1);
+    return wpinv_get_next_invoice_number($type);
 
 }
 
 /**
  * The prefix used for invoice paths.
  */
-function wpinv_post_name_prefix( $post_type = 'wpi_invoice' ) {
-    return apply_filters( 'wpinv_post_name_prefix', 'inv-', $post_type );
+function wpinv_post_name_prefix($post_type = 'wpi_invoice') {
+    return apply_filters('wpinv_post_name_prefix', 'inv-', $post_type);
 }
 
-function wpinv_generate_post_name( $post_ID ) {
-    $prefix = wpinv_post_name_prefix( get_post_type( $post_ID ) );
-    $post_name = sanitize_title( $prefix . $post_ID );
+function wpinv_generate_post_name($post_ID) {
+    $prefix = wpinv_post_name_prefix(get_post_type($post_ID));
+    $post_name = sanitize_title($prefix . $post_ID);
 
-    return apply_filters( 'wpinv_generate_post_name', $post_name, $post_ID, $prefix );
+    return apply_filters('wpinv_generate_post_name', $post_name, $post_ID, $prefix);
 }
 
 /**
@@ -790,8 +790,8 @@ 
  * 
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function wpinv_is_invoice_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_is_invoice_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return (bool) $invoice->get_is_viewed();
 }
 
@@ -800,17 +800,17 @@ 
  * 
  * @param int|string|object|WPInv_Invoice|WPInv_Legacy_Invoice|WP_Post $invoice Invoice id, key, transaction id, number or object.
  */
-function getpaid_maybe_mark_invoice_as_viewed( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function getpaid_maybe_mark_invoice_as_viewed($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( get_current_user_id() == $invoice->get_user_id() && ! $invoice->get_is_viewed() ) {
-        $invoice->set_is_viewed( true );
+    if (get_current_user_id() == $invoice->get_user_id() && !$invoice->get_is_viewed()) {
+        $invoice->set_is_viewed(true);
         $invoice->save();
     }
 
 }
-add_action( 'wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed' );
-add_action( 'wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed' );
+add_action('wpinv_invoice_print_before_display', 'getpaid_maybe_mark_invoice_as_viewed');
+add_action('wpinv_before_receipt', 'getpaid_maybe_mark_invoice_as_viewed');
 
 /**
  * Processes an invoice refund.
@@ -819,27 +819,27 @@ 
  * @param array $status_transition
  * @todo: descrease customer/store earnings
  */
-function getpaid_maybe_process_refund( $invoice, $status_transition ) {
+function getpaid_maybe_process_refund($invoice, $status_transition) {
 
-    if ( empty( $status_transition['from'] ) || ! in_array( $status_transition['from'], array( 'publish', 'wpi-processing', 'wpi-renewal' ) ) ) {
+    if (empty($status_transition['from']) || !in_array($status_transition['from'], array('publish', 'wpi-processing', 'wpi-renewal'))) {
         return;
     }
 
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code)) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage( -1 );
         }
 
     }
 
-    do_action( 'wpinv_pre_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_refund_invoice', $invoice, $invoice->get_id() );
-    do_action( 'wpinv_post_refund_invoice', $invoice, $invoice->get_id() );
+    do_action('wpinv_pre_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_refund_invoice', $invoice, $invoice->get_id());
+    do_action('wpinv_post_refund_invoice', $invoice, $invoice->get_id());
 }
-add_action( 'getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2 );
+add_action('getpaid_invoice_status_wpi-refunded', 'getpaid_maybe_process_refund', 10, 2);
 
 
 /**
@@ -847,48 +847,48 @@ 
  *
  * @param int $invoice_id
  */
-function getpaid_process_invoice_payment( $invoice_id ) {
+function getpaid_process_invoice_payment($invoice_id) {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
     // We only want to do this once.
-    if ( 1 ==  get_post_meta( $invoice->get_id(), 'wpinv_processed_payment', true ) ) {
+    if (1 == get_post_meta($invoice->get_id(), 'wpinv_processed_payment', true)) {
         return;
     }
 
-    update_post_meta( $invoice->get_id(), 'wpinv_processed_payment', 1 );
+    update_post_meta($invoice->get_id(), 'wpinv_processed_payment', 1);
 
     // Fires when processing a payment.
-    do_action( 'getpaid_process_payment', $invoice );
+    do_action('getpaid_process_payment', $invoice);
 
     // Fire an action for each invoice item.
-    foreach( $invoice->get_items() as $item ) {
-        do_action( 'getpaid_process_item_payment', $item, $invoice );
+    foreach ($invoice->get_items() as $item) {
+        do_action('getpaid_process_item_payment', $item, $invoice);
     }
 
     // Increase discount usage.
     $discount_code = $invoice->get_discount_code();
-    if ( ! empty( $discount_code ) && ! $invoice->is_renewal() ) {
-        $discount = wpinv_get_discount_obj( $discount_code );
+    if (!empty($discount_code) && !$invoice->is_renewal()) {
+        $discount = wpinv_get_discount_obj($discount_code);
 
-        if ( $discount->exists() ) {
+        if ($discount->exists()) {
             $discount->increase_usage();
         }
 
     }
 
     // Record reverse vat.
-    if ( 'invoice' == $invoice->get_type() && wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+    if ('invoice' == $invoice->get_type() && wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
-        if ( wpinv_same_country_exempt_vat() && wpinv_is_base_country( $invoice->get_country() ) ) {
-            $invoice->add_note( __( 'VAT was reverse charged', 'invoicing' ), false, false, true );
+        if (wpinv_same_country_exempt_vat() && wpinv_is_base_country($invoice->get_country())) {
+            $invoice->add_note(__('VAT was reverse charged', 'invoicing'), false, false, true);
         }
 
     }
 
 }
-add_action( 'getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment' );
+add_action('getpaid_invoice_payment_status_changed', 'getpaid_process_invoice_payment');
 
 /**
  * Returns an array of invoice item columns
@@ -896,13 +896,13 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_item_columns( $invoice ) {
+function getpaid_invoice_item_columns($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
@@ -910,47 +910,47 @@ 
     $columns = apply_filters(
         'getpaid_invoice_item_columns',
         array(
-            'name'     => __( 'Item', 'invoicing' ),
-            'price'    => __( 'Price', 'invoicing' ),
-            'quantity' => __( 'Quantity', 'invoicing' ),
-            'subtotal' => __( 'Subtotal', 'invoicing' ),
+            'name'     => __('Item', 'invoicing'),
+            'price'    => __('Price', 'invoicing'),
+            'quantity' => __('Quantity', 'invoicing'),
+            'subtotal' => __('Subtotal', 'invoicing'),
         ),
         $invoice
     );
 
     // Quantities.
-    if ( isset( $columns[ 'quantity' ] ) ) {
+    if (isset($columns['quantity'])) {
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns[ 'quantity' ] = __( 'Hours', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['quantity'] = __('Hours', 'invoicing');
         }
 
-        if ( ! wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template() ) {
-            unset( $columns[ 'quantity' ] );
+        if (!wpinv_item_quantities_enabled() || 'amount' == $invoice->get_template()) {
+            unset($columns['quantity']);
         }
 
     }
 
 
     // Price.
-    if ( isset( $columns[ 'price' ] ) ) {
+    if (isset($columns['price'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            $columns[ 'price' ] = __( 'Amount', 'invoicing' );
+        if ('amount' == $invoice->get_template()) {
+            $columns['price'] = __('Amount', 'invoicing');
         }
 
-        if ( 'hours' == $invoice->get_template() ) {
-            $columns[ 'price' ] = __( 'Rate', 'invoicing' );
+        if ('hours' == $invoice->get_template()) {
+            $columns['price'] = __('Rate', 'invoicing');
         }
 
     }
 
 
     // Sub total.
-    if ( isset( $columns[ 'subtotal' ] ) ) {
+    if (isset($columns['subtotal'])) {
 
-        if ( 'amount' == $invoice->get_template() ) {
-            unset( $columns[ 'subtotal' ] );
+        if ('amount' == $invoice->get_template()) {
+            unset($columns['subtotal']);
         }
 
     }
@@ -964,30 +964,30 @@ 
  * @param int|WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_invoice_totals_rows( $invoice ) {
+function getpaid_invoice_totals_rows($invoice) {
 
     // Prepare the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Abort if there is no invoice.
-    if ( 0 == $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return array();
     }
 
     $totals = apply_filters(
         'getpaid_invoice_totals_rows',
         array(
-            'subtotal' => __( 'Subtotal', 'invoicing' ),
-            'tax'      => __( 'Tax', 'invoicing' ),
-            'fee'      => __( 'Fee', 'invoicing' ),
-            'discount' => __( 'Discount', 'invoicing' ),
-            'total'    => __( 'Total', 'invoicing' ),
+            'subtotal' => __('Subtotal', 'invoicing'),
+            'tax'      => __('Tax', 'invoicing'),
+            'fee'      => __('Fee', 'invoicing'),
+            'discount' => __('Discount', 'invoicing'),
+            'total'    => __('Total', 'invoicing'),
         ),
         $invoice
     );
 
-    if ( ( $invoice->get_disable_taxes() || ! wpinv_use_taxes() ) && isset( $totals['tax'] ) ) {
-        unset( $totals['tax'] );
+    if (($invoice->get_disable_taxes() || !wpinv_use_taxes()) && isset($totals['tax'])) {
+        unset($totals['tax']);
     }
 
     return $totals;
@@ -998,47 +998,47 @@ 
  * 
  * @param WPInv_Invoice $invoice
  */
-function getpaid_new_invoice( $invoice ) {
+function getpaid_new_invoice($invoice) {
 
-    if ( ! $invoice->get_status() ) {
+    if (!$invoice->get_status()) {
         return;
     }
 
     // Add an invoice created note.
     $invoice->add_note(
         sprintf(
-            __( '%s created with the status "%s".', 'invoicing' ),
-            ucfirst( $invoice->get_type() ),
-            wpinv_status_nicename( $invoice->get_status(), $invoice  )
+            __('%s created with the status "%s".', 'invoicing'),
+            ucfirst($invoice->get_type()),
+            wpinv_status_nicename($invoice->get_status(), $invoice)
         )
     );
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_new_invoice' );
+add_action('getpaid_new_invoice', 'getpaid_new_invoice');
 
 /**
  * This function updates invoice caches.
  * 
  * @param WPInv_Invoice $invoice
  */
-function getpaid_update_invoice_caches( $invoice ) {
+function getpaid_update_invoice_caches($invoice) {
 
     // Cache invoice number.
-    wp_cache_set( $invoice->get_number(), $invoice->get_id(), "getpaid_invoice_numbers_to_invoice_ids" );
+    wp_cache_set($invoice->get_number(), $invoice->get_id(), "getpaid_invoice_numbers_to_invoice_ids");
 
     // Cache invoice key.
-    wp_cache_set( $invoice->get_key(), $invoice->get_id(), "getpaid_invoice_keys_to_invoice_ids" );
+    wp_cache_set($invoice->get_key(), $invoice->get_id(), "getpaid_invoice_keys_to_invoice_ids");
 
     // (Maybe) cache transaction id.
     $transaction_id = $invoice->get_transaction_id();
 
-    if ( ! empty( $transaction_id ) ) {
-        wp_cache_set( $transaction_id, $invoice->get_id(), "getpaid_invoice_transaction_ids_to_invoice_ids" );
+    if (!empty($transaction_id)) {
+        wp_cache_set($transaction_id, $invoice->get_id(), "getpaid_invoice_transaction_ids_to_invoice_ids");
     }
 
 }
-add_action( 'getpaid_new_invoice', 'getpaid_update_invoice_caches', 5 );
-add_action( 'getpaid_update_invoice', 'getpaid_update_invoice_caches', 5 );
+add_action('getpaid_new_invoice', 'getpaid_update_invoice_caches', 5);
+add_action('getpaid_update_invoice', 'getpaid_update_invoice_caches', 5);
 
 /**
  * Duplicates an invoice.
@@ -1048,7 +1048,7 @@ 
  * @param  WPInv_Invoice $old_invoice The invoice to duplicate
  * @return WPInv_Invoice The new invoice.
  */
-function getpaid_duplicate_invoice( $old_invoice ) {
+function getpaid_duplicate_invoice($old_invoice) {
 
     // Create the new invoice.
     $invoice = new WPInv_Invoice();
@@ -1109,123 +1109,123 @@ 
  * @param WPInv_Invoice $invoice
  * @return array
  */
-function getpaid_get_invoice_meta( $invoice ) {
+function getpaid_get_invoice_meta($invoice) {
 
     // Load the invoice meta.
     $meta = array(
 
         'number' => array(
             'label' => sprintf(
-                __( '%s Number', 'invoicing' ),
-                ucfirst( $invoice->get_type() )
+                __('%s Number', 'invoicing'),
+                ucfirst($invoice->get_type())
             ),
-            'value' => sanitize_text_field( $invoice->get_number() ),
+            'value' => sanitize_text_field($invoice->get_number()),
         ),
 
         'status' => array(
             'label' => sprintf(
-                __( '%s Status', 'invoicing' ),
-                ucfirst( $invoice->get_type() )
+                __('%s Status', 'invoicing'),
+                ucfirst($invoice->get_type())
             ),
             'value' => $invoice->get_status_label_html(),
         ),
 
         'date' => array(
             'label' => sprintf(
-                __( '%s Date', 'invoicing' ),
-                ucfirst( $invoice->get_type() )
+                __('%s Date', 'invoicing'),
+                ucfirst($invoice->get_type())
             ),
-            'value' => getpaid_format_date( $invoice->get_created_date() ),
+            'value' => getpaid_format_date($invoice->get_created_date()),
         ),
 
         'date_paid' => array(
-            'label' => __( 'Paid On', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_completed_date() ),
+            'label' => __('Paid On', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_completed_date()),
         ),
 
         'gateway'   => array(
-            'label' => __( 'Payment Method', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_gateway_title() ),
+            'label' => __('Payment Method', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_gateway_title()),
         ),
 
         'transaction_id' => array(
-            'label' => __( 'Transaction ID', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_transaction_id() ),
+            'label' => __('Transaction ID', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_transaction_id()),
         ),
 
         'due_date'  => array(
-            'label' => __( 'Due Date', 'invoicing' ),
-            'value' => getpaid_format_date( $invoice->get_due_date() ),
+            'label' => __('Due Date', 'invoicing'),
+            'value' => getpaid_format_date($invoice->get_due_date()),
         ),
 
         'vat_number' => array(
-            'label' => __( 'VAT Number', 'invoicing' ),
-            'value' => sanitize_text_field( $invoice->get_vat_number() ),
+            'label' => __('VAT Number', 'invoicing'),
+            'value' => sanitize_text_field($invoice->get_vat_number()),
         ),
 
     );
 
     // If it is not paid, remove the date of payment.
-    if ( ! $invoice->is_paid() ) {
-        unset( $meta[ 'date_paid' ] );
-        unset( $meta[ 'transaction_id' ] );
+    if (!$invoice->is_paid()) {
+        unset($meta['date_paid']);
+        unset($meta['transaction_id']);
     }
 
-    if ( ! $invoice->is_paid() || 'none' == $invoice->get_gateway() ) {
-        unset( $meta[ 'gateway' ] );
+    if (!$invoice->is_paid() || 'none' == $invoice->get_gateway()) {
+        unset($meta['gateway']);
     }
 
     // Only display the due date if due dates are enabled.
-    if ( ! $invoice->needs_payment() || ! wpinv_get_option( 'overdue_active' ) ) {
-        unset( $meta[ 'due_date' ] );
+    if (!$invoice->needs_payment() || !wpinv_get_option('overdue_active')) {
+        unset($meta['due_date']);
     }
 
     // Only display the vat number if taxes are enabled.
-    if ( ! wpinv_use_taxes() ) {
-        unset( $meta[ 'vat_number' ] );
+    if (!wpinv_use_taxes()) {
+        unset($meta['vat_number']);
     }
 
-    if ( $invoice->is_recurring() ) {
+    if ($invoice->is_recurring()) {
 
         // Link to the parent invoice.
-        if ( $invoice->is_renewal() ) {
+        if ($invoice->is_renewal()) {
 
-            $meta[ 'parent' ] = array(
+            $meta['parent'] = array(
 
                 'label' => sprintf(
-                    __( 'Parent %s', 'invoicing' ),
-                    ucfirst( $invoice->get_type() )
+                    __('Parent %s', 'invoicing'),
+                    ucfirst($invoice->get_type())
                 ),
 
-                'value' => wpinv_invoice_link( $invoice->get_parent_id() ),
+                'value' => wpinv_invoice_link($invoice->get_parent_id()),
 
             );
 
         }
 
-        $subscription = wpinv_get_subscription( $invoice );
+        $subscription = wpinv_get_subscription($invoice);
 
-        if ( ! empty ( $subscription ) ) {
+        if (!empty ($subscription)) {
 
             // Display the renewal date.
-            if ( $subscription->is_active() && 'cancelled' != $subscription->get_status() ) {
+            if ($subscription->is_active() && 'cancelled' != $subscription->get_status()) {
 
-                $meta[ 'renewal_date' ] = array(
+                $meta['renewal_date'] = array(
 
-                    'label' => __( 'Renews On', 'invoicing' ),
-                    'value' => getpaid_format_date( $subscription->get_expiration() ),
+                    'label' => __('Renews On', 'invoicing'),
+                    'value' => getpaid_format_date($subscription->get_expiration()),
         
                 );
 
             }
 
-            if ( $invoice->is_parent() ) {
+            if ($invoice->is_parent()) {
 
                 // Display the recurring amount.
-                $meta[ 'recurring_total' ] = array(
+                $meta['recurring_total'] = array(
 
-                    'label' => __( 'Recurring Amount', 'invoicing' ),
-                    'value' => wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $invoice->get_currency() ),
+                    'label' => __('Recurring Amount', 'invoicing'),
+                    'value' => wpinv_price(wpinv_format_amount($subscription->get_recurring_amount()), $invoice->get_currency()),
         
                 );
 
@@ -1235,15 +1235,15 @@ 
     }
 
     // Add the invoice total to the meta.
-    $meta[ 'invoice_total' ] = array(
+    $meta['invoice_total'] = array(
 
-        'label' => __( 'Total Amount', 'invoicing' ),
-        'value' => wpinv_price( wpinv_format_amount( $invoice->get_total() ), $invoice->get_currency() ),
+        'label' => __('Total Amount', 'invoicing'),
+        'value' => wpinv_price(wpinv_format_amount($invoice->get_total()), $invoice->get_currency()),
 
     );
 
     // Provide a way for third party plugins to filter the meta.
-    $meta = apply_filters( 'getpaid_invoice_meta_data', $meta, $invoice );
+    $meta = apply_filters('getpaid_invoice_meta_data', $meta, $invoice);
 
     return $meta;
 

includes/class-wpinv-euvat.php

Indentation +12 added lines, -12 removed lines

@@ -55,27 +55,27 @@
     public static function vat_rates_settings() {}
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function vat_settings() {}
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function maxmind_folder() {}
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function geoip2_download_database() {}
 
     /**
-	 *
-	 * @deprecated
-	 */
+     *
+     * @deprecated
+     */
     public static function geoip2_download_file() {}
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * @deprecated
@@ -38,15 +38,15 @@ 
     /**
      * @deprecated
      */
-    public static function is_eu_state( $country_code ) {
-        return getpaid_is_eu_state( $country_code );
+    public static function is_eu_state($country_code) {
+        return getpaid_is_eu_state($country_code);
     }
 
     /**
      * @deprecated
      */
-    public static function is_gst_country( $country_code ) {
-        return getpaid_is_gst_country( $country_code );
+    public static function is_gst_country($country_code) {
+        return getpaid_is_gst_country($country_code);
     }
 
     /**

includes/class-wpinv.php

Indentation +455 added lines, -455 removed lines

@@ -14,485 +14,485 @@ 
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * @param array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 * 
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-
-		if ( class_exists( 'BuddyPress' ) ) {
-			add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
-		}
-
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-		add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load the translation of the plugin.
-	 *
-	 * @since 1.0
-	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
-		}
-
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
-
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
-
-		/**
-		 * Define language constants.
-		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-
-		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
-
-		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
-
-		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
-			// load the user class only on the users.php page
-			global $pagenow;
-			if($pagenow=='users.php'){
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/geolocation",
-			"$plugin_path/includes/reports",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
-
-		}
-
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-
-	}
-
-	public function enqueue_scripts() {
-		$suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-		wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-		wp_enqueue_style( 'wpinv_front_style' );
-
-		// Register scripts
-		wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
-
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
-
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		wp_enqueue_script( 'jquery-blockui' );
-
-		wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
-		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
-
-		wp_enqueue_script( 'wpinv-front-script' );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
-	}
-
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-	}
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * @param array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     * 
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+        $this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        add_action( 'init', array( $this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+
+        if ( class_exists( 'BuddyPress' ) ) {
+            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        }
+
+        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+        add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
+        add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load the translation of the plugin.
+     *
+     * @since 1.0
+     */
+    public function load_textdomain( $locale = NULL ) {
+        if ( empty( $locale ) ) {
+            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+        }
+
+        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+
+        unload_textdomain( 'invoicing' );
+        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
+        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+
+        /**
+         * Define language constants.
+         */
+        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+
+        // Start with the settings.
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+
+        // Packages/libraries.
+        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
+        require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+
+        // Load functions.
+        require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
+        require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+            // load the user class only on the users.php page
+            global $pagenow;
+            if($pagenow=='users.php'){
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+
+        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
 
-	/**
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
+
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/geolocation",
+            "$plugin_path/includes/reports",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
+
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
+
+        }
+
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = wpinv_clean( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+
+    }
+
+    public function enqueue_scripts() {
+        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
+        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
+        wp_enqueue_style( 'wpinv_front_style' );
+
+        // Register scripts
+        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        wp_enqueue_script( 'jquery-blockui' );
+
+        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+
+        wp_enqueue_script( 'wpinv-front-script' );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+    }
+
+    /**
      * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
 
-			$key = sanitize_key( $_REQUEST['getpaid-action'] );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $_REQUEST );
-			}
+            $key = sanitize_key( $_REQUEST['getpaid-action'] );
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $_REQUEST );
+            }
 
-			do_action( "getpaid_unauthenticated_action_$key", $_REQUEST );
+            do_action( "getpaid_unauthenticated_action_$key", $_REQUEST );
 
-		}
+        }
         
 
     }
 
-	public function pre_get_posts( $wp_query ) {
-
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		return $wp_query;
-	}
-
-	public function bp_invoicing_init() {
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		$widgets = apply_filters(
-			'getpaid_widget_classes',
-			array(
-				'WPInv_Checkout_Widget',
-				'WPInv_History_Widget',
-				'WPInv_Receipt_Widget',
-				'WPInv_Subscriptions_Widget',
-				'WPInv_Buy_Item_Widget',
-				'WPInv_Messages_Widget',
-				'WPInv_GetPaid_Widget'
-			)
-		);
-
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
-		}
+    public function pre_get_posts( $wp_query ) {
+
+        if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        return $wp_query;
+    }
+
+    public function bp_invoicing_init() {
+        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        $widgets = apply_filters(
+            'getpaid_widget_classes',
+            array(
+                'WPInv_Checkout_Widget',
+                'WPInv_History_Widget',
+                'WPInv_Receipt_Widget',
+                'WPInv_Subscriptions_Widget',
+                'WPInv_Buy_Item_Widget',
+                'WPInv_Messages_Widget',
+                'WPInv_GetPaid_Widget'
+            )
+        );
+
+        foreach ( $widgets as $widget ) {
+            register_widget( $widget );
+        }
 		
-	}
+    }
 
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
 
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
 
-		// Prepare our pages.
-		$our_pages = array();
+        // Prepare our pages.
+        $our_pages = array();
 
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
 
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
 
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
 
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
 
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
 
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+        return array_unique( $excluded_posts_ids );
 
-	}
+    }
 
-	public function wp_footer() {
-		echo '
+    public function wp_footer() {
+        echo '
 			<div class="bsui">
 				<div  id="getpaid-payment-modal" class="modal" tabindex="-1" role="dialog">
 					<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
@@ -508,6 +508,6 @@ 
 				</div>
 			</div>
 		';
-	}
+    }
 
 }

Spacing +161 added lines, -161 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -81,23 +81,23 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('session', new WPInv_Session_Handler());
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -105,8 +105,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -117,27 +117,27 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
 
-		if ( class_exists( 'BuddyPress' ) ) {
-			add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+		if (class_exists('BuddyPress')) {
+			add_action('bp_include', array(&$this, 'bp_invoicing_init'));
 		}
 
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
-		add_action( 'wp_footer', array( &$this, 'wp_footer' ) );
-		add_action( 'widgets_init', array( &$this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
+		add_action('wp_footer', array(&$this, 'wp_footer'));
+		add_action('widgets_init', array(&$this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -145,10 +145,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -158,21 +158,21 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function load_textdomain( $locale = NULL ) {
-		if ( empty( $locale ) ) {
-			$locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+	public function load_textdomain($locale = NULL) {
+		if (empty($locale)) {
+			$locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
 		}
 
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+		$locale = apply_filters('plugin_locale', $locale, 'invoicing');
 
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+		unload_textdomain('invoicing');
+		load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+		load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
 
 		/**
 		 * Define language constants.
 		 */
-		require_once( WPINV_PLUGIN_DIR . 'language.php' );
+		require_once(WPINV_PLUGIN_DIR . 'language.php');
 	}
 
 	/**
@@ -181,82 +181,82 @@ 
 	public function includes() {
 
 		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
 
 		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+		require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+		require_once(WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php');
 
 		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/invoice-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/subscription-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/error-functions.php');
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/getpaid.php');
+
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php');
 			// load the user class only on the users.php page
 			global $pagenow;
-			if($pagenow=='users.php'){
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+		if (defined('WP_CLI') && WP_CLI) {
+			require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
 	}
 
 	/**
@@ -267,21 +267,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -296,10 +296,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 
@@ -313,7 +313,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Load default gateways.
 		$gateways = apply_filters(
@@ -327,12 +327,12 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -342,55 +342,55 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
+		$gateway = wpinv_clean($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
 
 	public function enqueue_scripts() {
-		$suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css' );
-		wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version );
-		wp_enqueue_style( 'wpinv_front_style' );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/invoice-front.css');
+		wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), $version);
+		wp_enqueue_style('wpinv_front_style');
 
 		// Register scripts
-		wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-		wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  filemtime( WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js' ) );
+		wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+		wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), filemtime(WPINV_PLUGIN_DIR . 'assets/js/invoice-front.js'));
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
-		wp_enqueue_script( 'jquery-blockui' );
+		wp_enqueue_script('jquery-blockui');
 
-		wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all' );
-		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+		wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), WPINV_VERSION, 'all');
+		wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-		wp_enqueue_script( 'wpinv-front-script' );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		wp_enqueue_script('wpinv-front-script');
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'wpinv-front-script', 'wp-hooks' ),  $version, true );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('wpinv-front-script', 'wp-hooks'), $version, true);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 	}
 
@@ -402,31 +402,31 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key = sanitize_key( $_REQUEST['getpaid-action'] );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $_REQUEST );
+			$key = sanitize_key($_REQUEST['getpaid-action']);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $_REQUEST);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $_REQUEST );
+			do_action("getpaid_unauthenticated_action_$key", $_REQUEST);
 
 		}
         
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
 	}
 
 	public function bp_invoicing_init() {
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
 	}
 
 	/**
@@ -447,8 +447,8 @@ 
 			)
 		);
 
-		foreach ( $widgets as $widget ) {
-			register_widget( $widget );
+		foreach ($widgets as $widget) {
+			register_widget($widget);
 		}
 		
 	}
@@ -459,10 +459,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -470,24 +470,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 
@@ -498,7 +498,7 @@ 
 					<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
 						<div class="modal-content">
 							<div class="modal-body">
-								<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="' . esc_attr__( 'Close', 'invoicing' ) . '">
+								<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="' . esc_attr__('Close', 'invoicing') . '">
 									<i class="fa fa-times" aria-hidden="true"></i>
 								</button>
 								<div class="modal-body-wrapper"></div>

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

Indentation +192 added lines, -192 removed lines

@@ -12,210 +12,210 @@
  */
 class GetPaid_Payment_Form_Submission_Taxes {
 
-	/**
-	 * Submission taxes.
-	 * @var array
-	 */
-	public $taxes = array();
+    /**
+     * Submission taxes.
+     * @var array
+     */
+    public $taxes = array();
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Validate VAT number.
+        $this->validate_vat( $submission );
+
+        foreach ( $submission->get_items() as $item ) {
+            $this->process_item_tax( $item, $submission );
+        }
+
+        // Process any existing invoice taxes.
+        if ( $submission->has_invoice() ) {
+            $this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+        }
+
+    }
+
+    /**
+     * Maybe process tax.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_item_tax( $item, $submission ) {
+
+        $rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
+        $rates    = getpaid_filter_item_tax_rates( $item, $rates );
+        $taxes    = getpaid_calculate_item_taxes( $item->get_sub_total(), $rates );
+        $r_taxes  = getpaid_calculate_item_taxes( $item->get_recurring_sub_total(), $rates );
+
+        foreach ( $taxes as $name => $amount ) {
+            $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
+            $tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+
+            if ( ! isset( $this->taxes[ $name ] ) ) {
+                $this->taxes[ $name ] = $tax;
+                continue;
+            }
+
+            $this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
+            $this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+
+        }
+
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Validate VAT number.
-		$this->validate_vat( $submission );
-
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
-		}
-
-		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
-		}
-
-	}
-
-	/**
-	 * Maybe process tax.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_item_tax( $item, $submission ) {
-
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( $item->get_sub_total(), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( $item->get_recurring_sub_total(), $rates );
-
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
-
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
-				continue;
-			}
-
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
-
-		}
-
-	}
-
-	/**
-	 * Checks if the submission has a digital item.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_digital_item( $submission ) {
-
-		foreach ( $submission->get_items() as $item ) {
-
-			if ( 'digital' == $item->get_vat_rule() ) {
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if this is an eu store.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_store() {
-		return $this->is_eu_country( wpinv_get_default_country() );
-	}
-
-	/**
-	 * Checks if this is an eu country.
-	 *
-	 * @param string $country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
-	}
-
-	/**
-	 * Checks if this is an eu purchase.
-	 *
-	 * @param string $customer_country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_eu_transaction( $customer_country ) {
-		return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
-	}
-
-	/**
-	 * Retrieves the vat number.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_vat_number( $submission ) {
-
-		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! empty( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
-	}
-
-	/**
-	 * Retrieves the company.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_company( $submission ) {
-
-		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
-	}
-
-	/**
-	 * Checks if we require a VAT number.
-	 *
-	 * @param bool $ip_in_eu Whether the customer IP is from the EU
-	 * @param bool $country_in_eu Whether the customer country is from the EU
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
-
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
-		$is_eu       = $ip_in_eu || $country_in_eu;
-
-		return $prevent_b2c && $is_eu;
-	}
-
-	/**
-	 * Validate VAT data.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 */
-	public function validate_vat( $submission ) {
-
-		$in_eu = $this->is_eu_transaction( $submission->country );
-
-		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+     * Checks if the submission has a digital item.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_digital_item( $submission ) {
+
+        foreach ( $submission->get_items() as $item ) {
+
+            if ( 'digital' == $item->get_vat_rule() ) {
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if this is an eu store.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_store() {
+        return $this->is_eu_country( wpinv_get_default_country() );
+    }
+
+    /**
+     * Checks if this is an eu country.
+     *
+     * @param string $country
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_country( $country ) {
+        return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
+    }
+
+    /**
+     * Checks if this is an eu purchase.
+     *
+     * @param string $customer_country
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_eu_transaction( $customer_country ) {
+        return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
+    }
+
+    /**
+     * Retrieves the vat number.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_vat_number( $submission ) {
+
+        // Retrieve from the posted number.
+        $vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
+        if ( ! empty( $vat_number ) ) {
+            return wpinv_clean( $vat_number );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
+    }
+
+    /**
+     * Retrieves the company.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_company( $submission ) {
+
+        // Retrieve from the posted data.
+        $company = $submission->get_field( 'wpinv_company', 'billing' );
+        if ( ! empty( $company ) ) {
+            return wpinv_clean( $company );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
+    }
+
+    /**
+     * Checks if we require a VAT number.
+     *
+     * @param bool $ip_in_eu Whether the customer IP is from the EU
+     * @param bool $country_in_eu Whether the customer country is from the EU
+     * @since 1.0.19
+     * @return string
+     */
+    public function requires_vat( $ip_in_eu, $country_in_eu ) {
+
+        $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $prevent_b2c = ! empty( $prevent_b2c );
+        $is_eu       = $ip_in_eu || $country_in_eu;
+
+        return $prevent_b2c && $is_eu;
+    }
+
+    /**
+     * Validate VAT data.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     */
+    public function validate_vat( $submission ) {
+
+        $in_eu = $this->is_eu_transaction( $submission->country );
+
+        // Abort if we are not validating vat numbers.
+        if ( ! $in_eu ) {
             return;
-		}
+        }
 
-		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
-		$ip_country  = getpaid_get_ip_country();
+        // Prepare variables.
+        $vat_number  = $this->get_vat_number( $submission );
+        $ip_country  = getpaid_get_ip_country();
         $is_eu       = $this->is_eu_country( $submission->country );
         $is_ip_eu    = $this->is_eu_country( $ip_country );
 
-		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+        // If we're preventing business to consumer purchases,
+        if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
 
-			// Ensure that a vat number has been specified.
-			throw new Exception(
-				__( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
-			);
+            // Ensure that a vat number has been specified.
+            throw new Exception(
+                __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
+            );
 
-		}
+        }
 
-		// Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
-		if ( ! $in_eu ) {
+        // Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
+        if ( ! $in_eu ) {
             return;
-		}
+        }
 
-		if ( ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
-		}
+        if ( ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
+            throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
+        }
 
-	}
+    }
 
 }

Spacing +49 added lines, -49 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -23,18 +23,18 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+		if ($submission->has_invoice()) {
+			$this->taxes = array_replace($submission->get_invoice()->get_taxes(), $this->taxes);
 		}
 
 	}
@@ -46,24 +46,24 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( $item->get_sub_total(), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( $item->get_recurring_sub_total(), $rates );
+		$rates    = getpaid_get_item_tax_rates($item, $submission->country, $submission->state);
+		$rates    = getpaid_filter_item_tax_rates($item, $rates);
+		$taxes    = getpaid_calculate_item_taxes($item->get_sub_total(), $rates);
+		$r_taxes  = getpaid_calculate_item_taxes($item->get_recurring_sub_total(), $rates);
 
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+		foreach ($taxes as $name => $amount) {
+			$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+			$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
 
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
+			if (!isset($this->taxes[$name])) {
+				$this->taxes[$name] = $tax;
 				continue;
 			}
 
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+			$this->taxes[$name]['initial_tax']   += $tax['initial_tax'];
+			$this->taxes[$name]['recurring_tax'] += $tax['recurring_tax'];
 
 		}
 
@@ -76,11 +76,11 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function has_digital_item( $submission ) {
+	public function has_digital_item($submission) {
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				return true;
 			}
 
@@ -96,7 +96,7 @@ 
 	 * @return bool
 	 */
 	public function is_eu_store() {
-		return $this->is_eu_country( wpinv_get_default_country() );
+		return $this->is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -106,8 +106,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country ) || getpaid_is_gst_country( $country );
+	public function is_eu_country($country) {
+		return getpaid_is_eu_state($country) || getpaid_is_gst_country($country);
 	}
 
 	/**
@@ -117,8 +117,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is_eu_transaction( $customer_country ) {
-		return $this->is_eu_country( $customer_country ) && $this->is_eu_store();
+	public function is_eu_transaction($customer_country) {
+		return $this->is_eu_country($customer_country) && $this->is_eu_store();
 	}
 
 	/**
@@ -128,12 +128,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! empty( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number', 'billing');
+		if (!empty($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		// Retrieve from the invoice.
@@ -147,12 +147,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_company( $submission ) {
+	public function get_company($submission) {
 
 		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
+		$company = $submission->get_field('wpinv_company', 'billing');
+		if (!empty($company)) {
+			return wpinv_clean($company);
 		}
 
 		// Retrieve from the invoice.
@@ -167,10 +167,10 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
+	public function requires_vat($ip_in_eu, $country_in_eu) {
 
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
+		$prevent_b2c = !empty($prevent_b2c);
 		$is_eu       = $ip_in_eu || $country_in_eu;
 
 		return $prevent_b2c && $is_eu;
@@ -182,38 +182,38 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$in_eu = $this->is_eu_transaction( $submission->country );
+		$in_eu = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
+		$vat_number  = $this->get_vat_number($submission);
 		$ip_country  = getpaid_get_ip_country();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
 			throw new Exception(
-				__( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' )
+				__('Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing')
 			);
 
 		}
 
 		// Abort if we are not validating vat (vat number should exist, user should be in eu and business too).
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
-		if ( ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new Exception( __( 'Your VAT number is invalid', 'invoicing' ) );
+		if (!wpinv_validate_vat_number($vat_number, $submission->country)) {
+			throw new Exception(__('Your VAT number is invalid', 'invoicing'));
 		}
 
 	}

includes/data/eu-states.php

Indentation +28 added lines, -28 removed lines

@@ -9,32 +9,32 @@
 defined( 'ABSPATH' ) || exit;
 
 return array(
-	'AT',
-	'BE',
-	'BG',
-	'HR',
-	'CY',
-	'CZ',
-	'DK',
-	'EE',
-	'FI',
-	'FR',
-	'DE',
-	'GB',
-	'GR',
-	'HU',
-	'IE',
-	'IT',
-	'LV',
-	'LT',
-	'LU',
-	'MT',
-	'NL',
-	'PL',
-	'PT',
-	'RO',
-	'SK',
-	'SI',
-	'ES',
-	'SE'
+    'AT',
+    'BE',
+    'BG',
+    'HR',
+    'CY',
+    'CZ',
+    'DK',
+    'EE',
+    'FI',
+    'FR',
+    'DE',
+    'GB',
+    'GR',
+    'HU',
+    'IE',
+    'IT',
+    'LV',
+    'LT',
+    'LU',
+    'MT',
+    'NL',
+    'PL',
+    'PT',
+    'RO',
+    'SK',
+    'SI',
+    'ES',
+    'SE'
 );

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 	'AT',

includes/data/item-schema.php

Indentation +228 added lines, -228 removed lines

@@ -13,233 +13,233 @@
 
 return array(
 
-	'id'              => array(
-		'description' => __( 'Unique identifier for the item.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'parent_id'       => array(
-		'description' => __( 'Parent item ID.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'default'     => 0,
-	),
-
-	'status'          => array(
-		'description' => __( 'A named status for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'enum'        => array( 'draft', 'pending', 'publish' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'default'     => 'draft',
-	),
-
-	'version'         => array(
-		'description' => __( 'Plugin version when the item was created.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
-		'readonly'    => true,
-	),
-
-	'date_created'    => array(
-		'description' => __( "The date the item was created, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the item was created.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified'   => array(
-		'description' => __( "The date the item was last modified, in the site's timezone.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the item was last modified.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'name'			  => array(
-		'description' => __( "The item's name.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'required'    => true,
-	),
-
-	'description'     => array(
-		'description' => __( "The item's description.", 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'owner'           => array(
-		'description' => __( 'The owner of the item (user id).', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'price'           => array(
-		'description' => __( 'The price of the item.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'required'    => true,
-	),
-
-	'the_price'       => array(
-		'description' => __( 'The formatted price of the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'type'       => array(
-		'description' => __( 'The item type.', 'invoicing' ),
-		'type'        => 'string',
-		'enum'        => wpinv_item_types(),
-		'default'     => 'custom',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_rule'       => array(
-		'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
-		'type'        => 'string',
-		'enum'        => array_keys( getpaid_get_tax_rules() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'vat_class'       => array(
-		'description' => __( 'VAT class for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array_keys( getpaid_get_tax_classes() ),
-	),
-
-	'custom_id'       => array(
-		'description' => __( 'Custom id for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
+    'id'              => array(
+        'description' => __( 'Unique identifier for the item.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'parent_id'       => array(
+        'description' => __( 'Parent item ID.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'default'     => 0,
+    ),
+
+    'status'          => array(
+        'description' => __( 'A named status for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'enum'        => array( 'draft', 'pending', 'publish' ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'default'     => 'draft',
+    ),
+
+    'version'         => array(
+        'description' => __( 'Plugin version when the item was created.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit' ),
+        'readonly'    => true,
+    ),
+
+    'date_created'    => array(
+        'description' => __( "The date the item was created, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'date_created_gmt'    => array(
+        'description' => __( 'The GMT date the item was created.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified'   => array(
+        'description' => __( "The date the item was last modified, in the site's timezone.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'date_modified_gmt'    => array(
+        'description' => __( 'The GMT date the item was last modified.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'name'			  => array(
+        'description' => __( "The item's name.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'required'    => true,
+    ),
+
+    'description'     => array(
+        'description' => __( "The item's description.", 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'owner'           => array(
+        'description' => __( 'The owner of the item (user id).', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'price'           => array(
+        'description' => __( 'The price of the item.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'required'    => true,
+    ),
+
+    'the_price'       => array(
+        'description' => __( 'The formatted price of the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'type'       => array(
+        'description' => __( 'The item type.', 'invoicing' ),
+        'type'        => 'string',
+        'enum'        => wpinv_item_types(),
+        'default'     => 'custom',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_rule'       => array(
+        'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
+        'type'        => 'string',
+        'enum'        => array_keys( getpaid_get_tax_rules() ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'vat_class'       => array(
+        'description' => __( 'VAT class for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array_keys( getpaid_get_tax_classes() ),
+    ),
+
+    'custom_id'       => array(
+        'description' => __( 'Custom id for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
 	
-	'custom_name'       => array(
-		'description' => __( 'Custom name for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'custom_singular_name'       => array(
-		'description' => __( 'Custom singular name for the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_dynamic_pricing'     => array(
-		'description' => __( 'Whether or not customers can enter their own prices when checking out.', 'invoicing' ),
-		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'minimum_price'   => array(
-		'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_recurring'        => array(
-		'description' => __( 'Whether or not this is a subscription item.', 'invoicing' ),
-		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'initial_price'   => array(
-		'description' => __( 'The initial price of the item.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'the_initial_price'       => array(
-		'description' => __( 'The formatted initial price of the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'recurring_price' => array(
-		'description' => __( 'The recurring price of the item.', 'invoicing' ),
-		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'the_recurring_price'       => array(
-		'description' => __( 'The formatted recurring price of the item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'recurring_period'        => array(
-		'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'D', 'W', 'M', 'Y' ),
-	),
-
-	'recurring_interval'        => array(
-		'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'recurring_limit' => array(
-		'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'is_free_trial'   => array(
-		'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
-		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'trial_period'    => array(
-		'description' => __( 'The trial period.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'D', 'W', 'M', 'Y' ),
-	),
-
-	'trial_interval'  => array(
-		'description' => __( 'The trial interval.', 'invoicing' ),
-		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
-	),
-
-	'first_renewal_date'       => array(
-		'description' => __( 'The first renewal date in case the item was to be bought today.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
-
-	'edit_url'        => array(
-		'description' => __( 'The URL to edit an item.', 'invoicing' ),
-		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'readonly'    => true,
-	),
+    'custom_name'       => array(
+        'description' => __( 'Custom name for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'custom_singular_name'       => array(
+        'description' => __( 'Custom singular name for the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_dynamic_pricing'     => array(
+        'description' => __( 'Whether or not customers can enter their own prices when checking out.', 'invoicing' ),
+        'type'        => 'integer',
+        'enum'        => array( 0, 1 ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'minimum_price'   => array(
+        'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_recurring'        => array(
+        'description' => __( 'Whether or not this is a subscription item.', 'invoicing' ),
+        'type'        => 'integer',
+        'enum'        => array( 0, 1 ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'initial_price'   => array(
+        'description' => __( 'The initial price of the item.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'the_initial_price'       => array(
+        'description' => __( 'The formatted initial price of the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'recurring_price' => array(
+        'description' => __( 'The recurring price of the item.', 'invoicing' ),
+        'type'        => 'number',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'the_recurring_price'       => array(
+        'description' => __( 'The formatted recurring price of the item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'recurring_period'        => array(
+        'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array( 'D', 'W', 'M', 'Y' ),
+    ),
+
+    'recurring_interval'        => array(
+        'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'recurring_limit' => array(
+        'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'is_free_trial'   => array(
+        'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
+        'type'        => 'integer',
+        'enum'        => array( 0, 1 ),
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'trial_period'    => array(
+        'description' => __( 'The trial period.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'enum'        => array( 'D', 'W', 'M', 'Y' ),
+    ),
+
+    'trial_interval'  => array(
+        'description' => __( 'The trial interval.', 'invoicing' ),
+        'type'        => 'integer',
+        'context'     => array( 'view', 'edit', 'embed' ),
+    ),
+
+    'first_renewal_date'       => array(
+        'description' => __( 'The first renewal date in case the item was to be bought today.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
+
+    'edit_url'        => array(
+        'description' => __( 'The URL to edit an item.', 'invoicing' ),
+        'type'        => 'string',
+        'context'     => array( 'view', 'edit', 'embed' ),
+        'readonly'    => true,
+    ),
 );

Spacing +77 added lines, -77 removed lines

@@ -9,237 +9,237 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
 	'id'              => array(
-		'description' => __( 'Unique identifier for the item.', 'invoicing' ),
+		'description' => __('Unique identifier for the item.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'parent_id'       => array(
-		'description' => __( 'Parent item ID.', 'invoicing' ),
+		'description' => __('Parent item ID.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'default'     => 0,
 	),
 
 	'status'          => array(
-		'description' => __( 'A named status for the item.', 'invoicing' ),
+		'description' => __('A named status for the item.', 'invoicing'),
 		'type'        => 'string',
-		'enum'        => array( 'draft', 'pending', 'publish' ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array('draft', 'pending', 'publish'),
+		'context'     => array('view', 'edit', 'embed'),
 		'default'     => 'draft',
 	),
 
 	'version'         => array(
-		'description' => __( 'Plugin version when the item was created.', 'invoicing' ),
+		'description' => __('Plugin version when the item was created.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit' ),
+		'context'     => array('view', 'edit'),
 		'readonly'    => true,
 	),
 
 	'date_created'    => array(
-		'description' => __( "The date the item was created, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the item was created, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'date_created_gmt'    => array(
-		'description' => __( 'The GMT date the item was created.', 'invoicing' ),
+		'description' => __('The GMT date the item was created.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'date_modified'   => array(
-		'description' => __( "The date the item was last modified, in the site's timezone.", 'invoicing' ),
+		'description' => __("The date the item was last modified, in the site's timezone.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'date_modified_gmt'    => array(
-		'description' => __( 'The GMT date the item was last modified.', 'invoicing' ),
+		'description' => __('The GMT date the item was last modified.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'name'			  => array(
-		'description' => __( "The item's name.", 'invoicing' ),
+		'description' => __("The item's name.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'required'    => true,
 	),
 
 	'description'     => array(
-		'description' => __( "The item's description.", 'invoicing' ),
+		'description' => __("The item's description.", 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'owner'           => array(
-		'description' => __( 'The owner of the item (user id).', 'invoicing' ),
+		'description' => __('The owner of the item (user id).', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'price'           => array(
-		'description' => __( 'The price of the item.', 'invoicing' ),
+		'description' => __('The price of the item.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'required'    => true,
 	),
 
 	'the_price'       => array(
-		'description' => __( 'The formatted price of the item.', 'invoicing' ),
+		'description' => __('The formatted price of the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'type'       => array(
-		'description' => __( 'The item type.', 'invoicing' ),
+		'description' => __('The item type.', 'invoicing'),
 		'type'        => 'string',
 		'enum'        => wpinv_item_types(),
 		'default'     => 'custom',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'vat_rule'       => array(
-		'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
+		'description' => __('VAT rule applied to the item.', 'invoicing'),
 		'type'        => 'string',
-		'enum'        => array_keys( getpaid_get_tax_rules() ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array_keys(getpaid_get_tax_rules()),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'vat_class'       => array(
-		'description' => __( 'VAT class for the item.', 'invoicing' ),
+		'description' => __('VAT class for the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array_keys( getpaid_get_tax_classes() ),
+		'context'     => array('view', 'edit', 'embed'),
+		'enum'        => array_keys(getpaid_get_tax_classes()),
 	),
 
 	'custom_id'       => array(
-		'description' => __( 'Custom id for the item.', 'invoicing' ),
+		'description' => __('Custom id for the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 	
 	'custom_name'       => array(
-		'description' => __( 'Custom name for the item.', 'invoicing' ),
+		'description' => __('Custom name for the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'custom_singular_name'       => array(
-		'description' => __( 'Custom singular name for the item.', 'invoicing' ),
+		'description' => __('Custom singular name for the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'is_dynamic_pricing'     => array(
-		'description' => __( 'Whether or not customers can enter their own prices when checking out.', 'invoicing' ),
+		'description' => __('Whether or not customers can enter their own prices when checking out.', 'invoicing'),
 		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array(0, 1),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'minimum_price'   => array(
-		'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
+		'description' => __('For dynamic prices, this is the minimum price that a user can set.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'is_recurring'        => array(
-		'description' => __( 'Whether or not this is a subscription item.', 'invoicing' ),
+		'description' => __('Whether or not this is a subscription item.', 'invoicing'),
 		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array(0, 1),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'initial_price'   => array(
-		'description' => __( 'The initial price of the item.', 'invoicing' ),
+		'description' => __('The initial price of the item.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'the_initial_price'       => array(
-		'description' => __( 'The formatted initial price of the item.', 'invoicing' ),
+		'description' => __('The formatted initial price of the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'recurring_price' => array(
-		'description' => __( 'The recurring price of the item.', 'invoicing' ),
+		'description' => __('The recurring price of the item.', 'invoicing'),
 		'type'        => 'number',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'the_recurring_price'       => array(
-		'description' => __( 'The formatted recurring price of the item.', 'invoicing' ),
+		'description' => __('The formatted recurring price of the item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'recurring_period'        => array(
-		'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
+		'description' => __('The recurring period for a recurring item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'D', 'W', 'M', 'Y' ),
+		'context'     => array('view', 'edit', 'embed'),
+		'enum'        => array('D', 'W', 'M', 'Y'),
 	),
 
 	'recurring_interval'        => array(
-		'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
+		'description' => __('The recurring interval for a subscription item.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'recurring_limit' => array(
-		'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
+		'description' => __('The maximum number of renewals for a subscription item.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'is_free_trial'   => array(
-		'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
+		'description' => __('Whether the item has a free trial period.', 'invoicing'),
 		'type'        => 'integer',
-		'enum'        => array( 0, 1 ),
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'enum'        => array(0, 1),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'trial_period'    => array(
-		'description' => __( 'The trial period.', 'invoicing' ),
+		'description' => __('The trial period.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
-		'enum'        => array( 'D', 'W', 'M', 'Y' ),
+		'context'     => array('view', 'edit', 'embed'),
+		'enum'        => array('D', 'W', 'M', 'Y'),
 	),
 
 	'trial_interval'  => array(
-		'description' => __( 'The trial interval.', 'invoicing' ),
+		'description' => __('The trial interval.', 'invoicing'),
 		'type'        => 'integer',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 	),
 
 	'first_renewal_date'       => array(
-		'description' => __( 'The first renewal date in case the item was to be bought today.', 'invoicing' ),
+		'description' => __('The first renewal date in case the item was to be bought today.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 
 	'edit_url'        => array(
-		'description' => __( 'The URL to edit an item.', 'invoicing' ),
+		'description' => __('The URL to edit an item.', 'invoicing'),
 		'type'        => 'string',
-		'context'     => array( 'view', 'edit', 'embed' ),
+		'context'     => array('view', 'edit', 'embed'),
 		'readonly'    => true,
 	),
 );

includes/wpinv-tax-functions.php

Spacing +118 added lines, -118 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of eu states.
@@ -12,7 +12,7 @@ 
  * @return array
  */
 function getpaid_get_eu_states() {
-    return wpinv_get_data( 'eu-states' );
+    return wpinv_get_data('eu-states');
 }
 
 /**
@@ -20,8 +20,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_eu_state( $country ) {
-    return ! empty( $country ) && in_array( strtoupper( $country ), getpaid_get_eu_states() ) ? true : false;
+function getpaid_is_eu_state($country) {
+    return !empty($country) && in_array(strtoupper($country), getpaid_get_eu_states()) ? true : false;
 }
 
 /**
@@ -30,7 +30,7 @@ 
  * @return array
  */
 function getpaid_get_gst_states() {
-    return array( 'AU', 'NZ', 'CA', 'CN' );
+    return array('AU', 'NZ', 'CA', 'CN');
 }
 
 /**
@@ -38,8 +38,8 @@ 
  * 
  * @return bool
  */
-function getpaid_is_gst_country( $country ) {
-    return ! empty( $country ) && in_array( strtoupper( $country ), getpaid_get_gst_states() ) ? true : false;
+function getpaid_is_gst_country($country) {
+    return !empty($country) && in_array(strtoupper($country), getpaid_get_gst_states()) ? true : false;
 }
 
 /**
@@ -49,8 +49,8 @@ 
  */
 function wpinv_use_taxes() {
 
-    $ret = wpinv_get_option( 'enable_taxes', false );
-    return (bool) apply_filters( 'wpinv_use_taxes', ! empty( $ret ) );
+    $ret = wpinv_get_option('enable_taxes', false);
+    return (bool) apply_filters('wpinv_use_taxes', !empty($ret));
 
 }
 
@@ -60,7 +60,7 @@ 
  * @param WPInv_Invoice $invoice
  * @return bool
  */
-function wpinv_is_invoice_taxable( $invoice ) {
+function wpinv_is_invoice_taxable($invoice) {
     return $invoice->is_taxable();
 }
 
@@ -70,11 +70,11 @@ 
  * @param string $country
  * @return bool
  */
-function wpinv_is_country_taxable( $country ) {
-    $is_eu     = getpaid_is_eu_state( $country );
-    $is_exempt = $is_eu && $country == wpinv_is_base_country( $country ) && wpinv_same_country_exempt_vat();
+function wpinv_is_country_taxable($country) {
+    $is_eu     = getpaid_is_eu_state($country);
+    $is_exempt = $is_eu && $country == wpinv_is_base_country($country) && wpinv_same_country_exempt_vat();
 
-    return (bool) apply_filters( 'wpinv_is_country_taxable', ! $is_exempt, $country ); 
+    return (bool) apply_filters('wpinv_is_country_taxable', !$is_exempt, $country); 
 
 }
 
@@ -84,7 +84,7 @@ 
  * @param WPInv_Item|GetPaid_Form_Item $item
  * @return bool
  */
-function wpinv_is_item_taxable( $item ) {
+function wpinv_is_item_taxable($item) {
     return '_exempt' != $item->get_vat_rule();
 }
 
@@ -94,8 +94,8 @@ 
  * @return bool
  */
 function wpinv_use_store_address_as_tax_base() {
-    $use_base = wpinv_get_option( 'tax_base', 'billing' ) == 'base';
-    return (bool) apply_filters( 'wpinv_use_store_address_as_tax_base', $use_base );
+    $use_base = wpinv_get_option('tax_base', 'billing') == 'base';
+    return (bool) apply_filters('wpinv_use_store_address_as_tax_base', $use_base);
 }
 
 /**
@@ -104,8 +104,8 @@ 
  * @return bool
  */
 function wpinv_prices_include_tax() {
-    $is_inclusive = wpinv_get_option( 'prices_include_tax', 'no' ) == 'yes';
-    return (bool) apply_filters( 'wpinv_prices_include_tax', $is_inclusive );
+    $is_inclusive = wpinv_get_option('prices_include_tax', 'no') == 'yes';
+    return (bool) apply_filters('wpinv_prices_include_tax', $is_inclusive);
 }
 
 /**
@@ -114,8 +114,8 @@ 
  * @return bool
  */
 function wpinv_round_tax_per_tax_rate() {
-    $subtotal_rounding = wpinv_get_option( 'tax_subtotal_rounding', 1 );
-    return (bool) apply_filters( 'wpinv_round_tax_per_tax_rate', empty( $subtotal_rounding ) );
+    $subtotal_rounding = wpinv_get_option('tax_subtotal_rounding', 1);
+    return (bool) apply_filters('wpinv_round_tax_per_tax_rate', empty($subtotal_rounding));
 }
 
 /**
@@ -124,8 +124,8 @@ 
  * @return bool
  */
 function wpinv_display_individual_tax_rates() {
-    $individual = wpinv_get_option( 'tax_display_totals', 'single' ) == 'individual';
-    return (bool) apply_filters( 'wpinv_display_individual_tax_rates', $individual );
+    $individual = wpinv_get_option('tax_display_totals', 'single') == 'individual';
+    return (bool) apply_filters('wpinv_display_individual_tax_rates', $individual);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  * @return float
  */
 function wpinv_get_default_tax_rate() {
-    $rate = wpinv_get_option( 'tax_rate', false );
-    return (float) apply_filters( 'wpinv_get_default_tax_rate', floatval( $rate ) );
+    $rate = wpinv_get_option('tax_rate', false);
+    return (float) apply_filters('wpinv_get_default_tax_rate', floatval($rate));
 }
 
 /**
@@ -144,7 +144,7 @@ 
  * @return bool
  */
 function wpinv_same_country_exempt_vat() {
-    return 'no' == wpinv_get_option( 'vat_same_country_rule' );
+    return 'no' == wpinv_get_option('vat_same_country_rule');
 }
 
 /**
@@ -164,28 +164,28 @@ 
  * @param string $state
  * @return array
  */
-function getpaid_get_item_tax_rates( $item, $country = '', $state = '' ) {
+function getpaid_get_item_tax_rates($item, $country = '', $state = '') {
 
     // Abort if the item is not taxable.
-    if ( ! wpinv_is_item_taxable( $item ) ) {
+    if (!wpinv_is_item_taxable($item)) {
         return array();
     }
 
     // Maybe use the store address.
-    if ( wpinv_use_store_address_as_tax_base() ) {
+    if (wpinv_use_store_address_as_tax_base()) {
         $country = wpinv_get_default_country();
         $state   = wpinv_get_default_state();
     }
 
     // Retrieve tax rates.
-    $tax_rates = GetPaid_Tax::get_address_tax_rates( $country, $state );
+    $tax_rates = GetPaid_Tax::get_address_tax_rates($country, $state);
 
     // Fallback to the default tax rates if non were found.
-    if ( empty( $tax_rates ) ) {
+    if (empty($tax_rates)) {
         $tax_rates = GetPaid_Tax::get_default_tax_rates();
     }
 
-    return apply_filters( 'getpaid_get_item_tax_rates', $tax_rates, $item, $country, $state );
+    return apply_filters('getpaid_get_item_tax_rates', $tax_rates, $item, $country, $state);
 }
 
 /**
@@ -195,23 +195,23 @@ 
  * @param array $rates
  * @return array
  */
-function getpaid_filter_item_tax_rates( $item, $rates ) {
+function getpaid_filter_item_tax_rates($item, $rates) {
 
     $tax_class = $item->get_vat_class();
 
-    foreach ( $rates as $i => $rate ) {
+    foreach ($rates as $i => $rate) {
 
-        if ( $tax_class == '_reduced' ) {
-            $rates[ $i ]['rate'] = empty( $rate['reduced_rate'] ) ? 0 : $rate['reduced_rate'];
+        if ($tax_class == '_reduced') {
+            $rates[$i]['rate'] = empty($rate['reduced_rate']) ? 0 : $rate['reduced_rate'];
         }
 
-        if ( $tax_class == '_exempt' ) {
-            $rates[ $i ]['rate'] = 0;
+        if ($tax_class == '_exempt') {
+            $rates[$i]['rate'] = 0;
         }
 
     }
 
-    return apply_filters( 'getpaid_filter_item_tax_rates', $rates, $item );
+    return apply_filters('getpaid_filter_item_tax_rates', $rates, $item);
 }
 
 /**
@@ -221,12 +221,12 @@ 
  * @param array $rates
  * @return array
  */
-function getpaid_calculate_item_taxes( $amount, $rates ) {
+function getpaid_calculate_item_taxes($amount, $rates) {
 
     $is_inclusive = wpinv_prices_include_tax();
-    $taxes        = GetPaid_Tax::calc_tax( $amount, $rates, $is_inclusive );
+    $taxes        = GetPaid_Tax::calc_tax($amount, $rates, $is_inclusive);
 
-    return apply_filters( 'getpaid_calculate_taxes', $taxes, $amount, $rates );
+    return apply_filters('getpaid_calculate_taxes', $taxes, $amount, $rates);
 }
 
 /**
@@ -238,17 +238,17 @@ 
  * @param float $recurring_tax_amount
  * @return array
  */
-function getpaid_prepare_item_tax( $item, $tax_name, $tax_amount, $recurring_tax_amount ) {
+function getpaid_prepare_item_tax($item, $tax_name, $tax_amount, $recurring_tax_amount) {
 
-    $initial_tax   = $tax_amount;
+    $initial_tax = $tax_amount;
 	$recurring_tax = 0;
 
-    if ( $item->is_recurring() ) {
+    if ($item->is_recurring()) {
 		$recurring_tax = $recurring_tax_amount;
 	}
 
 	return array(
-		'name'          => sanitize_text_field( $tax_name ),
+		'name'          => sanitize_text_field($tax_name),
 		'initial_tax'   => $initial_tax,
 		'recurring_tax' => $recurring_tax,
     );
@@ -261,8 +261,8 @@ 
  * @param string $vat_number
  * @return string
  */
-function wpinv_sanitize_vat_number( $vat_number ) {
-    return str_replace( array(' ', '.', '-', '_', ',' ), '', strtoupper( trim( $vat_number ) ) );
+function wpinv_sanitize_vat_number($vat_number) {
+    return str_replace(array(' ', '.', '-', '_', ','), '', strtoupper(trim($vat_number)));
 }
 
 /**
@@ -271,22 +271,22 @@ 
  * @param string $vat_number
  * @return bool
  */
-function wpinv_regex_validate_vat_number( $vat_number ) {
+function wpinv_regex_validate_vat_number($vat_number) {
 
-    $country    = substr( $vat_number, 0, 2 );
-    $vatin      = substr( $vat_number, 2 );
-    $regexes    = wpinv_get_data( 'vat-number-regexes' );
+    $country    = substr($vat_number, 0, 2);
+    $vatin      = substr($vat_number, 2);
+    $regexes    = wpinv_get_data('vat-number-regexes');
 
-    if ( isset( $regexes[ $country ] ) ) {
+    if (isset($regexes[$country])) {
 
-        $regex = $regexes[ $country ];
+        $regex = $regexes[$country];
         $regex = '/^(?:' . $regex . ')$/';
-        return 1 === preg_match( $regex, $vatin );
+        return 1 === preg_match($regex, $vatin);
 
     }
 
     // Not an EU state, use filters to validate the number.
-    return apply_filters( 'wpinv_regex_validate_vat_number', true, $vat_number );
+    return apply_filters('wpinv_regex_validate_vat_number', true, $vat_number);
 }
 
 /**
@@ -295,29 +295,29 @@ 
  * @param string $vat_number
  * @return bool
  */
-function wpinv_vies_validate_vat_number( $vat_number ) {
+function wpinv_vies_validate_vat_number($vat_number) {
 
-    $country    = substr( $vat_number, 0, 2 );
-    $vatin      = substr( $vat_number, 2 );
+    $country    = substr($vat_number, 0, 2);
+    $vatin      = substr($vat_number, 2);
 
     $url        = add_query_arg(
         array(
-            'ms'  => urlencode( $country ),
-            'iso' => urlencode( $country ),
-            'vat' => urlencode( $vatin ),
+            'ms'  => urlencode($country),
+            'iso' => urlencode($country),
+            'vat' => urlencode($vatin),
         ),
         'http://ec.europa.eu/taxation_customs/vies/viesquer.do'
     );
 
-    $response   = wp_remote_get( $url );
-    $response   = wp_remote_retrieve_body( $response );
+    $response   = wp_remote_get($url);
+    $response   = wp_remote_retrieve_body($response);
 
     // Fallback gracefully if the VIES website is down.
-    if ( empty( $response ) ) {
+    if (empty($response)) {
         return true;
     }
 
-    return 1 !== preg_match( '/invalid VAT number/i', $response );
+    return 1 !== preg_match('/invalid VAT number/i', $response);
 
 }
 
@@ -328,23 +328,23 @@ 
  * @param string $country
  * @return bool
  */
-function wpinv_validate_vat_number( $vat_number, $country ) {
+function wpinv_validate_vat_number($vat_number, $country) {
 
     // Abort if we are not validating this.
-    if ( ! wpinv_should_validate_vat_number() || empty( $vat_number ) ) {
+    if (!wpinv_should_validate_vat_number() || empty($vat_number)) {
         return true;
     }
 
     // In case the vat number does not have a country code...
-    $vat_number = wpinv_sanitize_vat_number( $vat_number );
-    $_country   = substr( $vat_number, 0, 2 );
-    $_country   = $_country == wpinv_country_name( $_country );
+    $vat_number = wpinv_sanitize_vat_number($vat_number);
+    $_country   = substr($vat_number, 0, 2);
+    $_country   = $_country == wpinv_country_name($_country);
 
-    if ( $_country ) {
-        $vat_number = strtoupper( $country ) . $vat_number;
+    if ($_country) {
+        $vat_number = strtoupper($country) . $vat_number;
     }
 
-    return wpinv_regex_validate_vat_number( $vat_number ) && wpinv_vies_validate_vat_number( $vat_number );
+    return wpinv_regex_validate_vat_number($vat_number) && wpinv_vies_validate_vat_number($vat_number);
 }
 
 /**
@@ -353,40 +353,40 @@ 
  * @return bool
  */
 function wpinv_should_validate_vat_number() {
-    $validate = wpinv_get_option( 'validate_vat_number' );
-	return ! empty( $validate );
+    $validate = wpinv_get_option('validate_vat_number');
+	return !empty($validate);
 }
 
-function wpinv_sales_tax_for_year( $year = null ) {
-    return wpinv_price( wpinv_format_amount( wpinv_get_sales_tax_for_year( $year ) ) );
+function wpinv_sales_tax_for_year($year = null) {
+    return wpinv_price(wpinv_format_amount(wpinv_get_sales_tax_for_year($year)));
 }
 
-function wpinv_get_sales_tax_for_year( $year = null ) {
+function wpinv_get_sales_tax_for_year($year = null) {
     global $wpdb;
 
     // Start at zero
     $tax = 0;
 
-    if ( ! empty( $year ) ) {
+    if (!empty($year)) {
         $args = array(
             'post_type'      => 'wpi_invoice',
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'posts_per_page' => -1,
             'year'           => $year,
             'fields'         => 'ids'
         );
 
-        $payments    = get_posts( $args );
-        $payment_ids = implode( ',', $payments );
+        $payments    = get_posts($args);
+        $payment_ids = implode(',', $payments);
 
-        if ( count( $payments ) > 0 ) {
+        if (count($payments) > 0) {
             $sql = "SELECT SUM( meta_value ) FROM $wpdb->postmeta WHERE meta_key = '_wpinv_tax' AND post_id IN( $payment_ids )";
-            $tax = $wpdb->get_var( $sql );
+            $tax = $wpdb->get_var($sql);
         }
 
     }
 
-    return apply_filters( 'wpinv_get_sales_tax_for_year', $tax, $year );
+    return apply_filters('wpinv_get_sales_tax_for_year', $tax, $year);
 }
 
 function wpinv_is_cart_taxed() {
@@ -395,33 +395,33 @@ 
 
 function wpinv_prices_show_tax_on_checkout() {
     return false; // TODO
-    $ret = ( wpinv_get_option( 'checkout_include_tax', false ) == 'yes' && wpinv_use_taxes() );
+    $ret = (wpinv_get_option('checkout_include_tax', false) == 'yes' && wpinv_use_taxes());
 
-    return apply_filters( 'wpinv_taxes_on_prices_on_checkout', $ret );
+    return apply_filters('wpinv_taxes_on_prices_on_checkout', $ret);
 }
 
 function wpinv_display_tax_rate() {
-    $ret = wpinv_use_taxes() && wpinv_get_option( 'display_tax_rate', false );
+    $ret = wpinv_use_taxes() && wpinv_get_option('display_tax_rate', false);
 
-    return apply_filters( 'wpinv_display_tax_rate', $ret );
+    return apply_filters('wpinv_display_tax_rate', $ret);
 }
 
 function wpinv_cart_needs_tax_address_fields() {
-    if( !wpinv_is_cart_taxed() )
+    if (!wpinv_is_cart_taxed())
         return false;
 
-    return ! did_action( 'wpinv_after_cc_fields', 'wpinv_default_cc_address_fields' );
+    return !did_action('wpinv_after_cc_fields', 'wpinv_default_cc_address_fields');
 }
 
-function wpinv_item_is_tax_exclusive( $item_id = 0 ) {
-    $ret = (bool)get_post_meta( $item_id, '_wpinv_tax_exclusive', false );
-    return apply_filters( 'wpinv_is_tax_exclusive', $ret, $item_id );
+function wpinv_item_is_tax_exclusive($item_id = 0) {
+    $ret = (bool) get_post_meta($item_id, '_wpinv_tax_exclusive', false);
+    return apply_filters('wpinv_is_tax_exclusive', $ret, $item_id);
 }
 
-function wpinv_currency_decimal_filter( $decimals = 2 ) {
+function wpinv_currency_decimal_filter($decimals = 2) {
     $currency = wpinv_get_currency();
 
-    switch ( $currency ) {
+    switch ($currency) {
         case 'RIAL' :
         case 'JPY' :
         case 'TWD' :
@@ -430,13 +430,13 @@ 
             break;
     }
 
-    return apply_filters( 'wpinv_currency_decimal_count', $decimals, $currency );
+    return apply_filters('wpinv_currency_decimal_count', $decimals, $currency);
 }
 
 function wpinv_tax_amount() {
     $output = 0.00;
     
-    return apply_filters( 'wpinv_tax_amount', $output );
+    return apply_filters('wpinv_tax_amount', $output);
 }
 
 /**
@@ -444,25 +444,25 @@ 
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_rule( $vat_rule ) {
+function getpaid_filter_vat_rule($vat_rule) {
 
-    if ( empty( $vat_rule ) ) {        
+    if (empty($vat_rule)) {        
         return 'digital';
     }
 
     return $vat_rule;
 }
-add_filter( 'wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule' );
+add_filter('wpinv_get_item_vat_rule', 'getpaid_filter_vat_rule');
 
 /**
  * Filters the VAT class to ensure that each item has a VAT class.
  * 
  * @param string|bool|null $vat_rule
  */
-function getpaid_filter_vat_class( $vat_class ) {
-    return empty( $vat_class ) ? '_standard' : $vat_class;
+function getpaid_filter_vat_class($vat_class) {
+    return empty($vat_class) ? '_standard' : $vat_class;
 }
-add_filter( 'wpinv_get_item_vat_class', 'getpaid_filter_vat_class' );
+add_filter('wpinv_get_item_vat_class', 'getpaid_filter_vat_class');
 
 /**
  * Returns a list of all tax classes.
@@ -474,9 +474,9 @@ 
     return apply_filters(
         'getpaid_tax_classes',
         array(
-            '_standard' => __( 'Standard Tax Rate', 'invoicing' ),
-            '_reduced'  => __( 'Reduced Tax Rate', 'invoicing' ),
-            '_exempt'   => __( 'Tax Exempt', 'invoicing' ),
+            '_standard' => __('Standard Tax Rate', 'invoicing'),
+            '_reduced'  => __('Reduced Tax Rate', 'invoicing'),
+            '_exempt'   => __('Tax Exempt', 'invoicing'),
         )
     );
 
@@ -492,8 +492,8 @@ 
     return apply_filters(
         'getpaid_tax_rules',
         array(
-            'physical' => __( 'Physical Item', 'invoicing' ),
-            'digital'  => __( 'Digital Item', 'invoicing' ),
+            'physical' => __('Physical Item', 'invoicing'),
+            'digital'  => __('Digital Item', 'invoicing'),
         )
     );
 
@@ -505,15 +505,15 @@ 
  * @param string $tax_class
  * @return string
  */
-function getpaid_get_tax_class_label( $tax_class ) {
+function getpaid_get_tax_class_label($tax_class) {
 
     $classes = getpaid_get_tax_classes();
 
-    if ( isset( $classes[ $tax_class ] ) ) {
-        return sanitize_text_field( $classes[ $tax_class ] );
+    if (isset($classes[$tax_class])) {
+        return sanitize_text_field($classes[$tax_class]);
     }
 
-    return sanitize_text_field( $tax_class );
+    return sanitize_text_field($tax_class);
 
 }
 
@@ -523,14 +523,14 @@ 
  * @param string $tax_rule
  * @return string
  */
-function getpaid_get_tax_rule_label( $tax_rule ) {
+function getpaid_get_tax_rule_label($tax_rule) {
 
     $rules = getpaid_get_tax_rules();
 
-    if ( isset( $rules[ $tax_rule ] ) ) {
-        return sanitize_text_field( $rules[ $tax_rule ] );
+    if (isset($rules[$tax_rule])) {
+        return sanitize_text_field($rules[$tax_rule]);
     }
 
-    return sanitize_text_field( $tax_rule );
+    return sanitize_text_field($tax_rule);
 
 }