Inspection of "modals don't load on bs5" - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 7a26f0...499ba9 )

by Brian

created 2022-11-23 07:40 UTC

Status

Indentation +50 added lines, -50 removed lines patch added patch discarded remove patch

@@ -15,31 +15,31 @@  discard block
 block discarded – undo
 abstract class GetPaid_Authorize_Net_Legacy_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
     }
 
     /**
-	 * Returns the API URL.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @return string
-	 */
-	public function get_api_url( $invoice ) {
+     * Returns the API URL.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @return string
+     */
+    public function get_api_url( $invoice ) {
         return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
     }
 
     /**
-	 * Communicates with authorize.net
-	 *
-	 *
-	 * @param array $post Data to post.
+     * Communicates with authorize.net
+     *
+     *
+     * @param array $post Data to post.
      * @param WPInv_Invoice $invoice Invoice.
-	 * @return stdClass|WP_Error
-	 */
+     * @return stdClass|WP_Error
+     */
     public function post( $post, $invoice ) {
 
         $url      = $this->get_api_url( $invoice );
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Returns the API authentication params.
-	 *
-	 *
-	 * @return array
-	 */
-	public function get_auth_params() {
+     * Returns the API authentication params.
+     *
+     *
+     * @return array
+     */
+    public function get_auth_params() {
 
         return array(
             'name'           => $this->get_option( 'login_id' ),
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Cancels a subscription remotely
-	 *
-	 *
-	 * @param WPInv_Subscription $subscription Subscription.
+     * Cancels a subscription remotely
+     *
+     *
+     * @param WPInv_Subscription $subscription Subscription.
      * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function cancel_subscription( $subscription, $invoice ) {
+     */
+    public function cancel_subscription( $subscription, $invoice ) {
 
         // Backwards compatibility. New version do not use authorize.net subscriptions.
         $this->post(
@@ -126,17 +126,17 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Processes ipns.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
 
         $this->maybe_process_old_ipn();
 
         // Validate the IPN.
         if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
+            wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
         }
 
         // Event type.
@@ -175,24 +175,24 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Validates IPN invoices.
-	 *
+     * Validates IPN invoices.
+     *
      * @param WPInv_Invoice $invoice
      * @param object $payload
-	 * @return void
-	 */
-	public function validate_ipn_invoice( $invoice, $payload ) {
+     * @return void
+     */
+    public function validate_ipn_invoice( $invoice, $payload ) {
         if ( ! $invoice->exists() || $payload->id != $invoice->get_transaction_id() ) {
             exit;
         }
     }
 
     /**
-	 * Process subscriptio IPNS.
-	 *
-	 * @return void
-	 */
-	public function maybe_process_old_ipn() {
+     * Process subscriptio IPNS.
+     *
+     * @return void
+     */
+    public function maybe_process_old_ipn() {
 
         $data = wp_kses_post_deep( wp_unslash( $_POST ) );
 
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Validates the old IPN signature.
+     * Validates the old IPN signature.
      *
      * @param array $posted
-	 */
-	public function validate_old_ipn_signature( $posted ) {
+     */
+    public function validate_old_ipn_signature( $posted ) {
 
         $signature = $this->get_option( 'signature_key' );
         if ( ! empty( $signature ) ) {
@@ -256,9 +256,9 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Check Authorize.NET IPN validity.
-	 */
-	public function validate_ipn() {
+     * Check Authorize.NET IPN validity.
+     */
+    public function validate_ipn() {
 
         wpinv_error_log( 'Validating Authorize.NET IPN response' );
 

Please login to merge, or discard this patch.

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Legacy Payment Gateway class.
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_api_url( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
+	public function get_api_url($invoice) {
+        return $this->is_sandbox($invoice) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
     }
 
     /**
@@ -40,48 +40,48 @@  discard block
 block discarded – undo
      * @param WPInv_Invoice $invoice Invoice.
 	 * @return stdClass|WP_Error
 	 */
-    public function post( $post, $invoice ) {
+    public function post($post, $invoice) {
 
-        $url      = $this->get_api_url( $invoice );
+        $url      = $this->get_api_url($invoice);
         $response = wp_remote_post(
             $url,
             array(
                 'headers' => array(
                     'Content-Type' => 'application/json; charset=utf-8',
                 ),
-                'body'    => json_encode( $post ),
+                'body'    => json_encode($post),
                 'method'  => 'POST',
             )
         );
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return $response;
         }
 
-        $response = wp_unslash( wp_remote_retrieve_body( $response ) );
-        $response = preg_replace( '/\xEF\xBB\xBF/', '', $response ); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
-        $response = json_decode( $response );
+        $response = wp_unslash(wp_remote_retrieve_body($response));
+        $response = preg_replace('/\xEF\xBB\xBF/', '', $response); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
+        $response = json_decode($response);
 
-        if ( empty( $response ) ) {
-            return new WP_Error( 'invalid_reponse', __( 'Invalid gateway response', 'invoicing' ) );
+        if (empty($response)) {
+            return new WP_Error('invalid_reponse', __('Invalid gateway response', 'invoicing'));
         }
 
-        if ( $response->messages->resultCode == 'Error' ) {
+        if ($response->messages->resultCode == 'Error') {
 
-            if ( $this->is_sandbox( $invoice ) ) {
-                wpinv_error_log( $response );
+            if ($this->is_sandbox($invoice)) {
+                wpinv_error_log($response);
             }
 
-            if ( $response->messages->message[0]->code == 'E00039' && ! empty( $response->customerProfileId ) && ! empty( $response->customerPaymentProfileId ) ) {
-                return new WP_Error( 'dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId );
+            if ($response->messages->message[0]->code == 'E00039' && !empty($response->customerProfileId) && !empty($response->customerPaymentProfileId)) {
+                return new WP_Error('dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId);
             }
 
-            if ( ! empty( $response->transactionResponse ) && ! empty( $response->transactionResponse->errors ) ) {
+            if (!empty($response->transactionResponse) && !empty($response->transactionResponse->errors)) {
                 $error = $response->transactionResponse->errors[0];
-                return new WP_Error( $error->errorCode, $error->errorText );
+                return new WP_Error($error->errorCode, $error->errorText);
             }
 
-            return new WP_Error( $response->messages->message[0]->code, $response->messages->message[0]->text );
+            return new WP_Error($response->messages->message[0]->code, $response->messages->message[0]->text);
         }
 
         return $response;
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
 	public function get_auth_params() {
 
         return array(
-            'name'           => $this->get_option( 'login_id' ),
-            'transactionKey' => $this->get_option( 'transaction_key' ),
+            'name'           => $this->get_option('login_id'),
+            'transactionKey' => $this->get_option('transaction_key'),
         );
 
     }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
 	 * @param WPInv_Subscription $subscription Subscription.
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function cancel_subscription( $subscription, $invoice ) {
+	public function cancel_subscription($subscription, $invoice) {
 
         // Backwards compatibility. New version do not use authorize.net subscriptions.
         $this->post(
@@ -135,38 +135,38 @@  discard block
 block discarded – undo
         $this->maybe_process_old_ipn();
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Event type.
-        $posted = json_decode( file_get_contents( 'php://input' ) );
-        if ( empty( $posted ) ) {
-            wp_die( 'Invalid JSON', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        $posted = json_decode(file_get_contents('php://input'));
+        if (empty($posted)) {
+            wp_die('Invalid JSON', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Process the IPN.
-        $posted = (object) wp_unslash( $posted );
+        $posted = (object) wp_unslash($posted);
 
         // Process refunds.
-        if ( 'net.authorize.payment.refund.created' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->merchantReferenceId );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
+        if ('net.authorize.payment.refund.created' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->merchantReferenceId);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
             $invoice->refund();
         }
 
         // Held funds approved.
-        if ( 'net.authorize.payment.fraud.approved' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->mark_paid( false, __( 'Payment released', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.approved' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->mark_paid(false, __('Payment released', 'invoicing'));
         }
 
         // Held funds declined.
-        if ( 'net.authorize.payment.fraud.declined' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->set_status( 'wpi-failed', __( 'Payment declined', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.declined' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->set_status('wpi-failed', __('Payment declined', 'invoicing'));
             $invoice->save();
         }
 
@@ -181,8 +181,8 @@  discard block
 block discarded – undo
      * @param object $payload
 	 * @return void
 	 */
-	public function validate_ipn_invoice( $invoice, $payload ) {
-        if ( ! $invoice->exists() || $payload->id != $invoice->get_transaction_id() ) {
+	public function validate_ipn_invoice($invoice, $payload) {
+        if (!$invoice->exists() || $payload->id != $invoice->get_transaction_id()) {
             exit;
         }
     }
@@ -194,32 +194,32 @@  discard block
 block discarded – undo
 	 */
 	public function maybe_process_old_ipn() {
 
-        $data = wp_kses_post_deep( wp_unslash( $_POST ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST));
 
         // Only process subscriptions subscriptions.
-        if ( empty( $data['x_subscription_id'] ) ) {
+        if (empty($data['x_subscription_id'])) {
             return;
         }
 
         // Check validity.
-        $this->validate_old_ipn_signature( $data );
+        $this->validate_old_ipn_signature($data);
 
         // Fetch the associated subscription.
-        $subscription_id = WPInv_Subscription::get_subscription_id_by_field( $data['x_subscription_id'] );
-        $subscription    = new WPInv_Subscription( $subscription_id );
+        $subscription_id = WPInv_Subscription::get_subscription_id_by_field($data['x_subscription_id']);
+        $subscription    = new WPInv_Subscription($subscription_id);
 
         // Abort if it is missing or completed.
-        if ( ! $subscription->get_id() || $subscription->has_status( 'completed' ) ) {
+        if (!$subscription->get_id() || $subscription->has_status('completed')) {
             return;
         }
 
         // Payment status.
-        if ( 1 == $data['x_response_code'] ) {
+        if (1 == $data['x_response_code']) {
 
             // Renew the subscription.
             $subscription->add_payment(
                 array(
-                    'transaction_id' => sanitize_text_field( $data['x_trans_id'] ),
+                    'transaction_id' => sanitize_text_field($data['x_trans_id']),
                     'gateway'        => $this->id,
                 )
             );
@@ -238,17 +238,17 @@  discard block
 block discarded – undo
      *
      * @param array $posted
 	 */
-	public function validate_old_ipn_signature( $posted ) {
+	public function validate_old_ipn_signature($posted) {
 
-        $signature = $this->get_option( 'signature_key' );
-        if ( ! empty( $signature ) ) {
-            $login_id  = $this->get_option( 'login_id' );
-            $trans_id  = wpinv_clean( $_POST['x_trans_id'] );
-            $amount    = wpinv_clean( $_POST['x_amount'] );
-            $hash      = hash_hmac( 'sha512', "^$login_id^$trans_id^$amount^", hex2bin( $signature ) );
+        $signature = $this->get_option('signature_key');
+        if (!empty($signature)) {
+            $login_id  = $this->get_option('login_id');
+            $trans_id  = wpinv_clean($_POST['x_trans_id']);
+            $amount    = wpinv_clean($_POST['x_amount']);
+            $hash      = hash_hmac('sha512', "^$login_id^$trans_id^$amount^", hex2bin($signature));
 
-            if ( ! hash_equals( $hash, $posted['x_SHA2_Hash'] ) ) {
-                wpinv_error_log( $posted['x_SHA2_Hash'], "Invalid signature. Expected $hash" );
+            if (!hash_equals($hash, $posted['x_SHA2_Hash'])) {
+                wpinv_error_log($posted['x_SHA2_Hash'], "Invalid signature. Expected $hash");
                 exit;
             }
 }
@@ -260,28 +260,28 @@  discard block
 block discarded – undo
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Authorize.NET IPN response' );
+        wpinv_error_log('Validating Authorize.NET IPN response');
 
-        if ( empty( $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
+        if (empty($_SERVER['HTTP_X_ANET_SIGNATURE'])) {
             return false;
         }
 
-        $signature = $this->get_option( 'signature_key' );
+        $signature = $this->get_option('signature_key');
 
-        if ( empty( $signature ) ) {
-            wpinv_error_log( 'Error: You have not set a signature key' );
+        if (empty($signature)) {
+            wpinv_error_log('Error: You have not set a signature key');
             return false;
         }
 
-        $hash  = hash_hmac( 'sha512', file_get_contents( 'php://input' ), hex2bin( $signature ) );
+        $hash = hash_hmac('sha512', file_get_contents('php://input'), hex2bin($signature));
 
-        if ( hash_equals( $hash, $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
-            wpinv_error_log( 'Successfully validated the IPN' );
+        if (hash_equals($hash, $_SERVER['HTTP_X_ANET_SIGNATURE'])) {
+            wpinv_error_log('Successfully validated the IPN');
             return true;
         }
 
-        wpinv_error_log( 'IPN hash is not valid' );
-        wpinv_error_log( $_SERVER['HTTP_X_ANET_SIGNATURE'] );
+        wpinv_error_log('IPN hash is not valid');
+        wpinv_error_log($_SERVER['HTTP_X_ANET_SIGNATURE']);
         return false;
 
     }

Please login to merge, or discard this patch.

includes/gateways/class-getpaid-worldpay-gateway.php 2 patches

Indentation +94 added lines, -94 removed lines patch added patch discarded remove patch

@@ -13,65 +13,65 @@  discard block
 block discarded – undo
 class GetPaid_Worldpay_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'worldpay';
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 5;
 
     /**
-	 * Endpoint for requests from Worldpay.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to Worldpay.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from Worldpay.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to Worldpay.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'sandbox' );
 
     /**
-	 * Currencies this gateway is allowed for.
-	 *
-	 * @var array
-	 */
-	public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
+     * Currencies this gateway is allowed for.
+     *
+     * @var array
+     */
+    public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://www.{sandbox}paypal.com/activity/payment/%s';
 
     /**
-	 * URL to view a subscription.
-	 *
-	 * @var string
-	 */
-	public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
+     * URL to view a subscription.
+     *
+     * @var string
+     */
+    public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->method_title         = __( 'Worldpay', 'invoicing' );
         $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Get redirect url.
         $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
@@ -128,31 +128,31 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Get the Worldpay request URL for an invoice.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return string
-	 */
-	public function get_request_url( $invoice ) {
+     * Get the Worldpay request URL for an invoice.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return string
+     */
+    public function get_request_url( $invoice ) {
 
         // Endpoint for this request
-		$this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+        $this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
 
         return $this->endpoint;
 
-	}
+    }
 
     /**
-	 * Get Worldpay Args for passing to Worldpay.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_worldpay_args( $invoice ) {
-
-		return apply_filters(
-			'getpaid_worldpay_args',
-			array(
+     * Get Worldpay Args for passing to Worldpay.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    protected function get_worldpay_args( $invoice ) {
+
+        return apply_filters(
+            'getpaid_worldpay_args',
+            array(
                 'amount'         => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
                 'cartId'         => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
                 'currency'       => wpinv_clean( $invoice->get_currency() ), // mandatory
@@ -177,18 +177,18 @@  discard block
 block discarded – undo
                 'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
                 'compName'       => wpinv_clean( $invoice->get_company() ),
             ),
-			$invoice
-		);
+            $invoice
+        );
 
     }
 
     /**
-	 * Secures worldpay args with an md5 hash.
-	 *
-	 * @param  array $args Gateway args.
-	 * @return array
-	 */
-	public function hash_args( $args ) {
+     * Secures worldpay args with an md5 hash.
+     *
+     * @param  array $args Gateway args.
+     * @return array
+     */
+    public function hash_args( $args ) {
 
         $md5_secret = $this->get_option( 'md5_secret' );
 
@@ -204,16 +204,16 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
 
         // Validate the IPN.
         if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
-		}
+            wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        }
 
         // Process the IPN.
         $posted  = wp_kses_post_deep( wp_unslash( $_POST ) );
@@ -229,8 +229,8 @@  discard block
 block discarded – undo
                 $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
             }
 
-             // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
+                // Update the ip address.
+                if ( ! empty( $posted['ipAddress'] ) ) {
                 $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
             }
 
@@ -257,9 +257,9 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Check Worldpay IPN validity.
-	 */
-	public function validate_ipn() {
+     * Check Worldpay IPN validity.
+     */
+    public function validate_ipn() {
 
         wpinv_error_log( 'Validating Worldpay IPN response' );
 
@@ -305,11 +305,11 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
             'readonly' => true,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +86 added lines, -86 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Worldpay Payment Gateway class.
@@ -45,14 +45,14 @@  discard block
 block discarded – undo
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'sandbox' );
+    protected $supports = array('sandbox');
 
     /**
 	 * Currencies this gateway is allowed for.
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
+	public $currencies = array('AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR');
 
     /**
 	 * URL to view a transaction.
@@ -73,13 +73,13 @@  discard block
 block discarded – undo
 	 */
 	public function __construct() {
 
-        $this->method_title         = __( 'Worldpay', 'invoicing' );
-        $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to Worldpay', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->method_title         = __('Worldpay', 'invoicing');
+        $this->title                = __('Worldpay - Credit Card / Debit Card', 'invoicing');
+        $this->checkout_button_text = __('Proceed to Worldpay', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-        add_filter( 'wpinv_gateway_description', array( $this, 'sandbox_notice' ), 10, 2 );
-        add_filter( 'getpaid_worldpay_args', array( $this, 'hash_args' ) );
+        add_filter('wpinv_gateway_description', array($this, 'sandbox_notice'), 10, 2);
+        add_filter('getpaid_worldpay_args', array($this, 'hash_args'));
 
         parent::__construct();
     }
@@ -93,24 +93,24 @@  discard block
 block discarded – undo
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
+        $worldpay_redirect = esc_url($this->get_request_url($invoice));
 
         // Get submission args.
-        $worldpay_args     = $this->get_worldpay_args( $invoice );
+        $worldpay_args     = $this->get_worldpay_args($invoice);
 
         $form = "<form action='$worldpay_redirect' name='wpi_worldpay_form' method='POST'>";
 
-        foreach ( $worldpay_args as $key => $value ) {
+        foreach ($worldpay_args as $key => $value) {
 
-            if ( false === $value || '' === trim( $value ) ) {
+            if (false === $value || '' === trim($value)) {
                 continue;
             }
 
-            $value = esc_attr( $value );
-            $key   = wpinv_clean( $key );
+            $value = esc_attr($value);
+            $key   = wpinv_clean($key);
             $form .= "<input type='hidden' name='$key' value='$value'>";
         }
 
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
 
         return $this->endpoint;
 
@@ -148,34 +148,34 @@  discard block
 block discarded – undo
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_worldpay_args( $invoice ) {
+	protected function get_worldpay_args($invoice) {
 
 		return apply_filters(
 			'getpaid_worldpay_args',
 			array(
-                'amount'         => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
-                'cartId'         => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
-                'currency'       => wpinv_clean( $invoice->get_currency() ), // mandatory
-                'instId'         => wpinv_clean( $this->get_option( 'instId', '' ) ), // mandatory
-                'testMode'       => $this->is_sandbox( $invoice ) ? 100 : 0, // mandatory
-                'name'           => wpinv_clean( $invoice->get_full_name() ),
-                'address'        => wpinv_clean( $invoice->get_address() ),
-                'postcode'       => wpinv_clean( $invoice->get_zip() ),
-                'tel'            => wpinv_clean( $invoice->get_phone() ),
-                'email'          => sanitize_email( $invoice->get_email() ),
-                'country'        => wpinv_clean( $invoice->get_country() ),
-                'desc'           => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_description' => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_callback'    => esc_url_raw( $this->notify_url ),
-                'resultfile'     => esc_url_raw( $this->get_return_url( $invoice ) ),
-                'MC_key'         => wpinv_clean( $invoice->get_key() ),
+                'amount'         => wpinv_sanitize_amount($invoice->get_total()), // mandatory
+                'cartId'         => wpinv_clean($invoice->get_number()), // mandatory reference for the item purchased
+                'currency'       => wpinv_clean($invoice->get_currency()), // mandatory
+                'instId'         => wpinv_clean($this->get_option('instId', '')), // mandatory
+                'testMode'       => $this->is_sandbox($invoice) ? 100 : 0, // mandatory
+                'name'           => wpinv_clean($invoice->get_full_name()),
+                'address'        => wpinv_clean($invoice->get_address()),
+                'postcode'       => wpinv_clean($invoice->get_zip()),
+                'tel'            => wpinv_clean($invoice->get_phone()),
+                'email'          => sanitize_email($invoice->get_email()),
+                'country'        => wpinv_clean($invoice->get_country()),
+                'desc'           => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_description' => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_callback'    => esc_url_raw($this->notify_url),
+                'resultfile'     => esc_url_raw($this->get_return_url($invoice)),
+                'MC_key'         => wpinv_clean($invoice->get_key()),
                 'MC_invoice_id'  => $invoice->get_id(),
-                'address1'       => wpinv_clean( $invoice->get_address() ),
-                'town'           => wpinv_clean( $invoice->get_city() ),
-                'region'         => wpinv_clean( $invoice->get_state() ),
-                'amountString'   => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
-                'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
-                'compName'       => wpinv_clean( $invoice->get_company() ),
+                'address1'       => wpinv_clean($invoice->get_address()),
+                'town'           => wpinv_clean($invoice->get_city()),
+                'region'         => wpinv_clean($invoice->get_state()),
+                'amountString'   => wpinv_price($invoice->get_total(), $invoice->get_currency()),
+                'countryString'  => wpinv_clean(wpinv_country_name($invoice->get_country())),
+                'compName'       => wpinv_clean($invoice->get_company()),
             ),
 			$invoice
 		);
@@ -188,17 +188,17 @@  discard block
 block discarded – undo
 	 * @param  array $args Gateway args.
 	 * @return array
 	 */
-	public function hash_args( $args ) {
+	public function hash_args($args) {
 
-        $md5_secret = $this->get_option( 'md5_secret' );
+        $md5_secret = $this->get_option('md5_secret');
 
         // Abort if there is no secret.
-        if ( empty( $md5_secret ) ) {
+        if (empty($md5_secret)) {
             return $args;
         }
 
         // Hash the args.
-        $args['signature'] = md5( "$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}" );
+        $args['signature'] = md5("$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}");
 
         return $args;
     }
@@ -211,43 +211,43 @@  discard block
 block discarded – undo
 	public function verify_ipn() {
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Worldpay IPN Request Failure', 'Worldpay IPN', array('response' => 500));
 		}
 
         // Process the IPN.
-        $posted  = wp_kses_post_deep( wp_unslash( $_POST ) );
-        $invoice = wpinv_get_invoice( $posted['MC_invoice_id'] );
+        $posted  = wp_kses_post_deep(wp_unslash($_POST));
+        $invoice = wpinv_get_invoice($posted['MC_invoice_id']);
 
-        if ( $invoice && $this->id == $invoice->get_gateway() ) {
+        if ($invoice && $this->id == $invoice->get_gateway()) {
 
-            wpinv_error_log( 'Found invoice #' . $invoice->get_number() );
-            wpinv_error_log( 'Payment status:' . $posted['transStatus'] );
+            wpinv_error_log('Found invoice #' . $invoice->get_number());
+            wpinv_error_log('Payment status:' . $posted['transStatus']);
 
             // Update the transaction id.
-            if ( ! empty( $posted['transId'] ) ) {
-                $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
+            if (!empty($posted['transId'])) {
+                $invoice->set_transaction_id(wpinv_clean($posted['transId']));
             }
 
              // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
-                $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
+             if (!empty($posted['ipAddress'])) {
+                $invoice->set_ip(wpinv_clean($posted['ipAddress']));
             }
 
-            if ( $posted['transStatus'] == 'Y' ) {
-                $invoice->set_completed_date( date( 'Y-m-d H:i:s', $posted['transTime'] ) );
+            if ($posted['transStatus'] == 'Y') {
+                $invoice->set_completed_date(date('Y-m-d H:i:s', $posted['transTime']));
                 $invoice->mark_paid();
                 return;
             }
 
-            if ( $posted['transStatus'] == 'C' ) {
-                $invoice->set_status( 'wpi-failed' );
-                $invoice->add_note( __( 'Payment transaction failed while processing Worldpay payment.', 'invoicing' ), false, false, true );
+            if ($posted['transStatus'] == 'C') {
+                $invoice->set_status('wpi-failed');
+                $invoice->add_note(__('Payment transaction failed while processing Worldpay payment.', 'invoicing'), false, false, true);
                 $invoice->save();
                 return;
             }
 
-            wpinv_error_log( 'Aborting, Invalid transaction status:' . $posted['transStatus'] );
+            wpinv_error_log('Aborting, Invalid transaction status:' . $posted['transStatus']);
             $invoice->save();
 
         }
@@ -261,27 +261,27 @@  discard block
 block discarded – undo
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Worldpay IPN response' );
+        wpinv_error_log('Validating Worldpay IPN response');
 
-        $data = wp_kses_post_deep( wp_unslash( $_POST ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST));
 
         // Verify installation.
-        if ( empty( $data['instId'] ) || $data['instId'] != wpinv_clean( $this->get_option( 'instId', '' ) ) ) {
-            wpinv_error_log( 'Received invalid installation ID from Worldpay IPN' );
+        if (empty($data['instId']) || $data['instId'] != wpinv_clean($this->get_option('instId', ''))) {
+            wpinv_error_log('Received invalid installation ID from Worldpay IPN');
             return false;
         }
 
         // Verify invoice.
-        if ( empty( $data['cartId'] ) || ! wpinv_get_id_by_invoice_number( $data['cartId'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (empty($data['cartId']) || !wpinv_get_id_by_invoice_number($data['cartId'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
 
         // (maybe) verify password.
-        $password = $this->get_option( 'callback_password' );
+        $password = $this->get_option('callback_password');
 
-        if ( ! empty( $password ) && ( empty( $data['callbackPW'] ) || $password != $data['callbackPW'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (!empty($password) && (empty($data['callbackPW']) || $password != $data['callbackPW'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
 
@@ -292,10 +292,10 @@  discard block
 block discarded – undo
     /**
      * Displays a notice on the checkout page if sandbox is enabled.
      */
-    public function sandbox_notice( $description, $gateway ) {
-        if ( 'worldpay' == $gateway && wpinv_is_test_mode( 'worldpay' ) ) {
+    public function sandbox_notice($description, $gateway) {
+        if ('worldpay' == $gateway && wpinv_is_test_mode('worldpay')) {
             $description .= '<br>' . sprintf(
-                __( 'SANDBOX ENABLED. See the %1$sWorldpay Sandbox Testing Guide%2$s for more details.', 'invoicing' ),
+                __('SANDBOX ENABLED. See the %1$sWorldpay Sandbox Testing Guide%2$s for more details.', 'invoicing'),
                 '<a href="https://developer.worldpay.com/docs/wpg/directintegration/abouttesting">',
                 '</a>'
             );
@@ -309,43 +309,43 @@  discard block
 block discarded – undo
 	 *
 	 * @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['worldpay_active']['desc'] = $admin_settings['worldpay_active']['desc'] . " ($currencies)";
-        $admin_settings['worldpay_desc']['std']    = __( 'Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing' );
+        $admin_settings['worldpay_desc']['std']    = __('Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing');
 
         $admin_settings['worldpay_instId'] = array(
             'type' => 'text',
             'id'   => 'worldpay_instId',
-            'name' => __( 'Installation Id', 'invoicing' ),
-            'desc' => __( 'Your installation id. Ex: 211616', 'invoicing' ),
+            'name' => __('Installation Id', 'invoicing'),
+            'desc' => __('Your installation id. Ex: 211616', 'invoicing'),
         );
 
         $admin_settings['worldpay_md5_secret'] = array(
             'type' => 'text',
             'id'   => 'worldpay_md5_secret',
-            'name' => __( 'MD5 secret', 'invoicing' ),
-            'desc' => __( 'Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing' ) . '<code>instId:amount:currency:cartId</code>',
+            'name' => __('MD5 secret', 'invoicing'),
+            'desc' => __('Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing') . '<code>instId:amount:currency:cartId</code>',
         );
 
         $admin_settings['worldpay_callbackPW'] = array(
             'type' => 'text',
             'id'   => 'worldpay_callbackPW',
-            'name' => __( 'Payment Response password', 'invoicing' ),
-            'desc' => __( 'Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing' ),
+            'name' => __('Payment Response password', 'invoicing'),
+            'desc' => __('Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing'),
         );
 
         $admin_settings['worldpay_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'worldpay_ipn_url',
-            'name'     => __( 'Payment Response URL', 'invoicing' ),
+            'name'     => __('Payment Response URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing' ),
+            'desc'     => __('Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing'),
             'custom'   => 'worldpay',
             'readonly' => true,
         );

Please login to merge, or discard this patch.

includes/class-wpinv-subscriptions-db.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The Subscriptions DB Class
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
             'transaction_id'    => '',
             'parent_payment_id' => 0,
             'product_id'        => 0,
-            'created'           => date( 'Y-m-d H:i:s' ),
-            'expiration'        => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
+            'expiration'        => date('Y-m-d H:i:s'),
             'trial_period'      => '',
             'status'            => '',
             'profile_id'        => '',
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
      * @access  public
      * @since   1.0.0
      */
-    public function get_subscriptions( $args = array() ) {
-        return getpaid_get_subscriptions( $args );
+    public function get_subscriptions($args = array()) {
+        return getpaid_get_subscriptions($args);
     }
 
     /**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
      * @access  public
      * @since   1.0.0
      */
-    public function count( $args = array() ) {
-        return getpaid_get_subscriptions( $args, 'count' );
+    public function count($args = array()) {
+        return getpaid_get_subscriptions($args, 'count');
     }
 
     /**
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
         KEY customer_and_status ( customer_id, status)
         ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_db_version', $this->version );
+        update_option($this->table_name . '_db_version', $this->version);
     }
 
 }

Please login to merge, or discard this patch.

includes/payments/class-getpaid-payment-form-submission.php 2 patches

Indentation +861 added lines, -861 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,199 +10,199 @@  discard block
 block discarded – undo
 class GetPaid_Payment_Form_Submission {
 
     /**
-	 * Submission ID
-	 *
-	 * @var string
-	 */
-	public $id = null;
-
-	/**
-	 * The raw submission data.
-	 *
-	 * @var array
-	 */
-	protected $data = null;
-
-	/**
-	 * Submission totals
-	 *
-	 * @var array
-	 */
-	protected $totals = array(
-
-		'subtotal' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'discount' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'fees'     => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'taxes'    => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'shipping' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-	);
-
-	/**
-	 * Sets the associated payment form.
-	 *
-	 * @var GetPaid_Payment_Form
-	 */
+     * Submission ID
+     *
+     * @var string
+     */
+    public $id = null;
+
+    /**
+     * The raw submission data.
+     *
+     * @var array
+     */
+    protected $data = null;
+
+    /**
+     * Submission totals
+     *
+     * @var array
+     */
+    protected $totals = array(
+
+        'subtotal' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'discount' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'fees'     => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'taxes'    => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'shipping' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+    );
+
+    /**
+     * Sets the associated payment form.
+     *
+     * @var GetPaid_Payment_Form
+     */
     protected $payment_form = null;
 
     /**
-	 * The country for the submission.
-	 *
-	 * @var string
-	 */
-	public $country = null;
-
-    /**
-	 * The state for the submission.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $state = null;
-
-	/**
-	 * The invoice associated with the submission.
-	 *
-	 * @var WPInv_Invoice
-	 */
-	protected $invoice = null;
-
-	/**
-	 * The recurring item for the submission.
-	 *
-	 * @var int
-	 */
-	public $has_recurring = 0;
-
-	/**
-	 * An array of fees for the submission.
-	 *
-	 * @var array
-	 */
-	protected $fees = array();
-
-	/**
-	 * An array of discounts for the submission.
-	 *
-	 * @var array
-	 */
-	protected $discounts = array();
-
-	/**
-	 * An array of taxes for the submission.
-	 *
-	 * @var array
-	 */
-	protected $taxes = array();
-
-	/**
-	 * An array of items for the submission.
-	 *
-	 * @var GetPaid_Form_Item[]
-	 */
-	protected $items = array();
-
-	/**
-	 * The last error.
-	 *
-	 * @var string
-	 */
-	public $last_error = null;
-
-	/**
-	 * The last error code.
-	 *
-	 * @var string
-	 */
-	public $last_error_code = null;
-
-    /**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-
-		// Set the state and country to the default state and country.
-		$this->country = wpinv_default_billing_country();
-		$this->state   = wpinv_get_default_state();
-
-		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
-		}
-
-	}
-
-	/**
-	 * Loads submission data.
-	 *
-	 * @param array $data
-	 */
-	public function load_data( $data ) {
-
-		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
-
-		// Cache it...
-		$this->data = $data;
-
-		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
-
-		// Finally, process the submission.
-		try {
-
-			// Each process is passed an instance of the class (with reference)
-			// and should throw an Exception whenever it encounters one.
-			$processors = apply_filters(
-				'getpaid_payment_form_submission_processors',
-				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
-				),
-				$this
-			);
-
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
-			}
+     * The country for the submission.
+     *
+     * @var string
+     */
+    public $country = null;
+
+    /**
+     * The state for the submission.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $state = null;
+
+    /**
+     * The invoice associated with the submission.
+     *
+     * @var WPInv_Invoice
+     */
+    protected $invoice = null;
+
+    /**
+     * The recurring item for the submission.
+     *
+     * @var int
+     */
+    public $has_recurring = 0;
+
+    /**
+     * An array of fees for the submission.
+     *
+     * @var array
+     */
+    protected $fees = array();
+
+    /**
+     * An array of discounts for the submission.
+     *
+     * @var array
+     */
+    protected $discounts = array();
+
+    /**
+     * An array of taxes for the submission.
+     *
+     * @var array
+     */
+    protected $taxes = array();
+
+    /**
+     * An array of items for the submission.
+     *
+     * @var GetPaid_Form_Item[]
+     */
+    protected $items = array();
+
+    /**
+     * The last error.
+     *
+     * @var string
+     */
+    public $last_error = null;
+
+    /**
+     * The last error code.
+     *
+     * @var string
+     */
+    public $last_error_code = null;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+
+        // Set the state and country to the default state and country.
+        $this->country = wpinv_default_billing_country();
+        $this->state   = wpinv_get_default_state();
+
+        // Do we have an actual submission?
+        if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
+            $this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+        }
+
+    }
+
+    /**
+     * Loads submission data.
+     *
+     * @param array $data
+     */
+    public function load_data( $data ) {
+
+        // Allow plugins to filter the data.
+        $data       = apply_filters( 'getpaid_submission_data', $data, $this );
+
+        // Cache it...
+        $this->data = $data;
+
+        // Then generate a unique id from the data.
+        $this->id   = md5( wp_json_encode( $data ) );
+
+        // Finally, process the submission.
+        try {
+
+            // Each process is passed an instance of the class (with reference)
+            // and should throw an Exception whenever it encounters one.
+            $processors = apply_filters(
+                'getpaid_payment_form_submission_processors',
+                array(
+                    array( $this, 'process_payment_form' ),
+                    array( $this, 'process_invoice' ),
+                    array( $this, 'process_fees' ),
+                    array( $this, 'process_items' ),
+                    array( $this, 'process_discount' ),
+                    array( $this, 'process_taxes' ),
+                ),
+                $this
+            );
+
+            foreach ( $processors as $processor ) {
+                call_user_func_array( $processor, array( &$this ) );
+            }
 } catch ( GetPaid_Payment_Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getCode();
-		}
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getErrorCode();
+        } catch ( Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getCode();
+        }
 
-		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+        // Fired when we are done processing a submission.
+        do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
 
-	}
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Payment Forms.
 	|--------------------------------------------------------------------------
@@ -211,39 +211,39 @@  discard block
 block discarded – undo
 	| submission has an active payment form etc.
     */
 
-	/**
-	 * Prepares the submission's payment form.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_payment_form() {
+    /**
+     * Prepares the submission's payment form.
+     *
+     * @since 1.0.19
+     */
+    public function process_payment_form() {
 
-		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
-		}
+        // Every submission needs an active payment form.
+        if ( empty( $this->data['form_id'] ) ) {
+            throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+        }
 
-		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+        // Fetch the payment form.
+        $this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
-		}
+        if ( ! $this->payment_form->is_active() ) {
+            throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+        }
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
-	}
+        do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+    }
 
     /**
-	 * Returns the payment form.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Payment_Form
-	 */
-	public function get_payment_form() {
-		return $this->payment_form;
-	}
+     * Returns the payment form.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Payment_Form
+     */
+    public function get_payment_form() {
+        return $this->payment_form;
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Invoices.
 	|--------------------------------------------------------------------------
@@ -252,84 +252,84 @@  discard block
 block discarded – undo
 	| might be for an existing invoice.
 	*/
 
-	/**
-	 * Prepares the submission's invoice.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_invoice() {
+    /**
+     * Prepares the submission's invoice.
+     *
+     * @since 1.0.19
+     */
+    public function process_invoice() {
 
-		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
-			return;
-		}
+        // Abort if there is no invoice.
+        if ( empty( $this->data['invoice_id'] ) ) {
+            return;
+        }
 
-		// If the submission is for an existing invoice, ensure that it exists
-		// and that it is not paid for.
-		$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+        // If the submission is for an existing invoice, ensure that it exists
+        // and that it is not paid for.
+        $invoice = wpinv_get_invoice( $this->data['invoice_id'] );
 
         if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
-		}
-
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
-		}
-
-		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
-
-			$items    = array();
-			$item_ids = array();
-
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
-
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
-
-			$this->payment_form->set_items( $items );
-
-		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
-		}
-
-		$this->country = $invoice->get_country();
-		$this->state   = $invoice->get_state();
-		$this->invoice = $invoice;
-
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
-	}
-
-	/**
-	 * Returns the associated invoice.
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
-	public function get_invoice() {
-		return $this->invoice;
-	}
-
-	/**
-	 * Checks whether there is an invoice associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_invoice() {
-		return ! empty( $this->invoice );
-	}
-
-	/*
+            throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        }
+
+        if ( $invoice->is_paid() ) {
+            throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+        }
+
+        $this->payment_form->invoice = $invoice;
+        if ( ! $this->payment_form->is_default() ) {
+
+            $items    = array();
+            $item_ids = array();
+
+            foreach ( $invoice->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
+
+            foreach ( $this->payment_form->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
+
+            $this->payment_form->set_items( $items );
+
+        } else {
+            $this->payment_form->set_items( $invoice->get_items() );
+        }
+
+        $this->country = $invoice->get_country();
+        $this->state   = $invoice->get_state();
+        $this->invoice = $invoice;
+
+        do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+    }
+
+    /**
+     * Returns the associated invoice.
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
+    public function get_invoice() {
+        return $this->invoice;
+    }
+
+    /**
+     * Checks whether there is an invoice associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_invoice() {
+        return ! empty( $this->invoice );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Items.
 	|--------------------------------------------------------------------------
@@ -338,129 +338,129 @@  discard block
 block discarded – undo
 	| recurring item. But can have an unlimited number of non-recurring items.
 	*/
 
-	/**
-	 * Prepares the submission's items.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_items() {
-
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
-
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
-	}
-
-	/**
-	 * Adds an item to the submission.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function add_item( $item ) {
-
-		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
-			return;
-		}
-
-		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
-			$this->has_recurring = $item->get_id();
-		}
-
-		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
-		$this->totals['subtotal']['initial']   += $item->get_sub_total();
-		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
-
-	}
-
-	/**
-	 * Removes a specific item.
-	 *
-	 * You should not call this method after the discounts and taxes
-	 * have been calculated.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_item( $item_id ) {
-
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
-
-			if ( $this->items[ $item_id ]->is_recurring() ) {
-				$this->has_recurring = 0;
-			}
-
-			unset( $this->items[ $item_id ] );
-		}
-
-	}
-
-	/**
-	 * Returns the subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
-		}
-
-		return $this->totals['subtotal']['initial'];
-	}
-
-	/**
-	 * Returns the recurring subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
-		}
-
-		return $this->totals['subtotal']['recurring'];
-	}
-
-	/**
-	 * Returns all items.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items() {
-		return $this->items;
-	}
-
-	/**
-	 * Checks if there's a single subscription group in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/**
-	 * Checks if there are multipe subscription groups in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/*
+    /**
+     * Prepares the submission's items.
+     *
+     * @since 1.0.19
+     */
+    public function process_items() {
+
+        $processor = new GetPaid_Payment_Form_Submission_Items( $this );
+
+        foreach ( $processor->items as $item ) {
+            $this->add_item( $item );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+    }
+
+    /**
+     * Adds an item to the submission.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     */
+    public function add_item( $item ) {
+
+        // Make sure that it is available for purchase.
+        if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+            return;
+        }
+
+        // Each submission can only contain one recurring item.
+        if ( $item->is_recurring() ) {
+            $this->has_recurring = $item->get_id();
+        }
+
+        // Update the items and totals.
+        $this->items[ $item->get_id() ]         = $item;
+        $this->totals['subtotal']['initial']   += $item->get_sub_total();
+        $this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
+
+    }
+
+    /**
+     * Removes a specific item.
+     *
+     * You should not call this method after the discounts and taxes
+     * have been calculated.
+     *
+     * @since 1.0.19
+     */
+    public function remove_item( $item_id ) {
+
+        if ( isset( $this->items[ $item_id ] ) ) {
+            $this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
+            $this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+
+            if ( $this->items[ $item_id ]->is_recurring() ) {
+                $this->has_recurring = 0;
+            }
+
+            unset( $this->items[ $item_id ] );
+        }
+
+    }
+
+    /**
+     * Returns the subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
+        }
+
+        return $this->totals['subtotal']['initial'];
+    }
+
+    /**
+     * Returns the recurring subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
+        }
+
+        return $this->totals['subtotal']['recurring'];
+    }
+
+    /**
+     * Returns all items.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items() {
+        return $this->items;
+    }
+
+    /**
+     * Checks if there's a single subscription group in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_subscription_group() {
+        return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /**
+     * Checks if there are multipe subscription groups in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_multiple_subscription_groups() {
+        return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Taxes
 	|--------------------------------------------------------------------------
@@ -469,128 +469,128 @@  discard block
 block discarded – undo
 	| or only one-time.
     */
 
-	/**
-	 * Prepares the submission's taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_taxes() {
-
-		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
-			return;
-		}
-
-		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
-			$this->country = $country;
-		}
-
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
-			$this->state = $state;
-		}
-
-		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
-		}
-
-		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
-			return;
-		}
-
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
-
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
-	}
-
-	/**
-	 * Adds a tax to the submission.
-	 *
-	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
-	 * @since 1.0.19
-	 */
-	public function add_tax( $tax ) {
-
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
-		}
-
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
-
-	}
-
-	/**
-	 * Removes a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_tax( $tax_name ) {
-
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
-		}
-
-	}
-
-	/**
-	 * Whether or not we'll use taxes for the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function use_taxes() {
-
-		$use_taxes = wpinv_use_taxes();
-
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
-			$use_taxes = false;
-		}
-
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
-
-	}
-
-	/**
-	 * Returns the tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_tax() {
-		return $this->totals['taxes']['initial'];
-	}
-
-	/**
-	 * Returns the recurring tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_tax() {
-		return $this->totals['taxes']['recurring'];
-	}
-
-	/**
-	 * Returns all taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_taxes() {
-		return $this->taxes;
-	}
-
-	/*
+    /**
+     * Prepares the submission's taxes.
+     *
+     * @since 1.0.19
+     */
+    public function process_taxes() {
+
+        // Abort if we're not using taxes.
+        if ( ! $this->use_taxes() ) {
+            return;
+        }
+
+        // If a custom country && state has been passed in, use it to calculate taxes.
+        $country = $this->get_field( 'wpinv_country', 'billing' );
+        if ( ! empty( $country ) ) {
+            $this->country = $country;
+        }
+
+        $state = $this->get_field( 'wpinv_state', 'billing' );
+        if ( ! empty( $state ) ) {
+            $this->state = $state;
+        }
+
+        // Confirm if the provided country and the ip country are similar.
+        $address_confirmed = $this->get_field( 'confirm-address' );
+        if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
+            throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+        }
+
+        // Abort if the country is not taxable.
+        if ( ! wpinv_is_country_taxable( $this->country ) ) {
+            return;
+        }
+
+        $processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+
+        foreach ( $processor->taxes as $tax ) {
+            $this->add_tax( $tax );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+    }
+
+    /**
+     * Adds a tax to the submission.
+     *
+     * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
+     * @since 1.0.19
+     */
+    public function add_tax( $tax ) {
+
+        if ( wpinv_round_tax_per_tax_rate() ) {
+            $tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
+            $tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+        }
+
+        $this->taxes[ $tax['name'] ]         = $tax;
+        $this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
+        $this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+
+    }
+
+    /**
+     * Removes a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function remove_tax( $tax_name ) {
+
+        if ( isset( $this->taxes[ $tax_name ] ) ) {
+            $this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
+            $this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
+            unset( $this->taxes[ $tax_name ] );
+        }
+
+    }
+
+    /**
+     * Whether or not we'll use taxes for the submission.
+     *
+     * @since 1.0.19
+     */
+    public function use_taxes() {
+
+        $use_taxes = wpinv_use_taxes();
+
+        if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+            $use_taxes = false;
+        }
+
+        return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+
+    }
+
+    /**
+     * Returns the tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_tax() {
+        return $this->totals['taxes']['initial'];
+    }
+
+    /**
+     * Returns the recurring tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_tax() {
+        return $this->totals['taxes']['recurring'];
+    }
+
+    /**
+     * Returns all taxes.
+     *
+     * @since 1.0.19
+     */
+    public function get_taxes() {
+        return $this->taxes;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Discounts
 	|--------------------------------------------------------------------------
@@ -599,99 +599,99 @@  discard block
 block discarded – undo
 	| or only one-time. They also do not have to come from a discount code.
     */
 
-	/**
-	 * Prepares the submission's discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_discount() {
-
-		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
-		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
-
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
-	}
-
-	/**
-	 * Adds a discount to the submission.
-	 *
-	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
-	 * @since 1.0.19
-	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
-	}
-
-	/**
-	 * Removes a discount from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_discount( $name ) {
-
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
-		}
-
-	}
-
-	/**
-	 * Checks whether there is a discount code associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
-	}
-
-	/**
-	 * Returns the discount code.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_discount_code() {
-		return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
-	}
-
-	/**
-	 * Returns the discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discount() {
-		return $this->totals['discount']['initial'];
-	}
-
-	/**
-	 * Returns the recurring discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_discount() {
-		return $this->totals['discount']['recurring'];
-	}
-
-	/**
-	 * Returns all discounts.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discounts() {
-		return $this->discounts;
-	}
-
-	/*
+    /**
+     * Prepares the submission's discount.
+     *
+     * @since 1.0.19
+     */
+    public function process_discount() {
+
+        $initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
+        $recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
+        $processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+
+        foreach ( $processor->discounts as $discount ) {
+            $this->add_discount( $discount );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+    }
+
+    /**
+     * Adds a discount to the submission.
+     *
+     * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
+     * @since 1.0.19
+     */
+    public function add_discount( $discount ) {
+        $this->discounts[ $discount['name'] ]   = $discount;
+        $this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
+        $this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+    }
+
+    /**
+     * Removes a discount from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_discount( $name ) {
+
+        if ( isset( $this->discounts[ $name ] ) ) {
+            $this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
+            $this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
+            unset( $this->discounts[ $name ] );
+        }
+
+    }
+
+    /**
+     * Checks whether there is a discount code associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_discount_code() {
+        return ! empty( $this->discounts['discount_code'] );
+    }
+
+    /**
+     * Returns the discount code.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_discount_code() {
+        return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
+    }
+
+    /**
+     * Returns the discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_discount() {
+        return $this->totals['discount']['initial'];
+    }
+
+    /**
+     * Returns the recurring discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_discount() {
+        return $this->totals['discount']['recurring'];
+    }
+
+    /**
+     * Returns all discounts.
+     *
+     * @since 1.0.19
+     */
+    public function get_discounts() {
+        return $this->discounts;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Fees
 	|--------------------------------------------------------------------------
@@ -701,100 +701,100 @@  discard block
 block discarded – undo
 	| fees.
     */
 
-	/**
-	 * Prepares the submission's fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_fees() {
-
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
-
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
-	}
-
-	/**
-	 * Adds a fee to the submission.
-	 *
-	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
-	 * @since 1.0.19
-	 */
-	public function add_fee( $fee ) {
-
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-			return;
-		}
-
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-
-	}
-
-	/**
-	 * Removes a fee from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_fee( $name ) {
-
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
-		}
-
-		if ( 'shipping' == $name ) {
-			$this->totals['shipping']['initial']   = 0;
-			$this->totals['shipping']['recurring'] = 0;
-		}
-
-	}
-
-	/**
-	 * Returns the fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fee() {
-		return $this->totals['fees']['initial'];
-	}
-
-	/**
-	 * Returns the recurring fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_fee() {
-		return $this->totals['fees']['recurring'];
-	}
-
-	/**
-	 * Returns all fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fees() {
-		return $this->fees;
-	}
-
-	/**
-	 * Checks if there are any fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_fees() {
-		return count( $this->fees ) !== 0;
-	}
-
-	/*
+    /**
+     * Prepares the submission's fees.
+     *
+     * @since 1.0.19
+     */
+    public function process_fees() {
+
+        $fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+
+        foreach ( $fees_processor->fees as $fee ) {
+            $this->add_fee( $fee );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+    }
+
+    /**
+     * Adds a fee to the submission.
+     *
+     * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
+     * @since 1.0.19
+     */
+    public function add_fee( $fee ) {
+
+        if ( $fee['name'] == 'shipping' ) {
+            $this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+            $this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+            return;
+        }
+
+        $this->fees[ $fee['name'] ]         = $fee;
+        $this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+        $this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+
+    }
+
+    /**
+     * Removes a fee from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_fee( $name ) {
+
+        if ( isset( $this->fees[ $name ] ) ) {
+            $this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
+            $this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
+            unset( $this->fees[ $name ] );
+        }
+
+        if ( 'shipping' == $name ) {
+            $this->totals['shipping']['initial']   = 0;
+            $this->totals['shipping']['recurring'] = 0;
+        }
+
+    }
+
+    /**
+     * Returns the fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fee() {
+        return $this->totals['fees']['initial'];
+    }
+
+    /**
+     * Returns the recurring fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_fee() {
+        return $this->totals['fees']['recurring'];
+    }
+
+    /**
+     * Returns all fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fees() {
+        return $this->fees;
+    }
+
+    /**
+     * Checks if there are any fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_fees() {
+        return count( $this->fees ) !== 0;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| MISC
 	|--------------------------------------------------------------------------
@@ -802,147 +802,147 @@  discard block
 block discarded – undo
 	| Extra submission functions.
     */
 
-	/**
-	 * Returns the shipping amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_shipping() {
-		return $this->totals['shipping']['initial'];
-	}
-
-	/**
-	 * Returns the recurring shipping.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_shipping() {
-		return $this->totals['shipping']['recurring'];
-	}
-
-	/**
-	 * Checks if there are any shipping fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
-	}
-
-	/**
-	 * Checks if this is the initial fetch.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function is_initial_fetch() {
-		return empty( $this->data['initial_state'] );
-	}
-
-	/**
-	 * Returns the total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total() {
-		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Returns the recurring total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_total() {
-		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Whether payment details should be collected for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function should_collect_payment_details() {
-		$initial   = $this->get_total();
-		$recurring = $this->get_recurring_total();
-
-		if ( $this->has_recurring == 0 ) {
-			$recurring = 0;
-		}
-
-		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
-	}
-
-	/**
-	 * Returns the billing email of the user.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
-	}
-
-	/**
-	 * Checks if the submitter has a billing email.
-	 *
-	 * @since 1.0.19
-	 */
-	public function has_billing_email() {
-		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
-	}
-
-	/**
-	 * Returns the appropriate currency for the submission.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_currency() {
-		return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
-    }
-
-    /**
-	 * Returns the raw submission data.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Returns a field from the submission data
-	 *
-	 * @param string $field
-	 * @since 1.0.19
-	 * @return mixed|null
-	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
-	}
-
-	/**
-	 * Checks if a required field is set.
-	 *
-	 * @since 1.0.19
-	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
-	}
-
-	/**
-	 * Formats an amount
-	 *
-	 * @since 1.0.19
-	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
-	}
+    /**
+     * Returns the shipping amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_shipping() {
+        return $this->totals['shipping']['initial'];
+    }
+
+    /**
+     * Returns the recurring shipping.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_shipping() {
+        return $this->totals['shipping']['recurring'];
+    }
+
+    /**
+     * Checks if there are any shipping fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_shipping() {
+        return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+    }
+
+    /**
+     * Checks if this is the initial fetch.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function is_initial_fetch() {
+        return empty( $this->data['initial_state'] );
+    }
+
+    /**
+     * Returns the total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_total() {
+        $total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Returns the recurring total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_total() {
+        $total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Whether payment details should be collected for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function should_collect_payment_details() {
+        $initial   = $this->get_total();
+        $recurring = $this->get_recurring_total();
+
+        if ( $this->has_recurring == 0 ) {
+            $recurring = 0;
+        }
+
+        $collect = $initial > 0 || $recurring > 0;
+        return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
+    }
+
+    /**
+     * Returns the billing email of the user.
+     *
+     * @since 1.0.19
+     */
+    public function get_billing_email() {
+        return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
+    }
+
+    /**
+     * Checks if the submitter has a billing email.
+     *
+     * @since 1.0.19
+     */
+    public function has_billing_email() {
+        $billing_email = $this->get_billing_email();
+        return ! empty( $billing_email ) && is_email( $billing_email );
+    }
+
+    /**
+     * Returns the appropriate currency for the submission.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_currency() {
+        return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
+    }
+
+    /**
+     * Returns the raw submission data.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return $this->data;
+    }
+
+    /**
+     * Returns a field from the submission data
+     *
+     * @param string $field
+     * @since 1.0.19
+     * @return mixed|null
+     */
+    public function get_field( $field, $sub_array_key = null ) {
+        return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+    }
+
+    /**
+     * Checks if a required field is set.
+     *
+     * @since 1.0.19
+     */
+    public function is_required_field_set( $field ) {
+        return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+    }
+
+    /**
+     * Formats an amount
+     *
+     * @since 1.0.19
+     */
+    public function format_amount( $amount ) {
+        return wpinv_price( $amount, $this->get_currency() );
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +129 added lines, -129 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
 		$this->state   = wpinv_get_default_state();
 
 		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+		if (isset($_POST['getpaid_payment_form_submission'])) {
+			$this->load_data(wp_kses_post_deep(wp_unslash($_POST)));
 		}
 
 	}
@@ -157,16 +157,16 @@  discard block
 block discarded – undo
 	 *
 	 * @param array $data
 	 */
-	public function load_data( $data ) {
+	public function load_data($data) {
 
 		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
+		$data       = apply_filters('getpaid_submission_data', $data, $this);
 
 		// Cache it...
 		$this->data = $data;
 
 		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
+		$this->id   = md5(wp_json_encode($data));
 
 		// Finally, process the submission.
 		try {
@@ -176,29 +176,29 @@  discard block
 block discarded – undo
 			$processors = apply_filters(
 				'getpaid_payment_form_submission_processors',
 				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
+					array($this, 'process_payment_form'),
+					array($this, 'process_invoice'),
+					array($this, 'process_fees'),
+					array($this, 'process_items'),
+					array($this, 'process_discount'),
+					array($this, 'process_taxes'),
 				),
 				$this
 			);
 
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
+			foreach ($processors as $processor) {
+				call_user_func_array($processor, array(&$this));
 			}
-} catch ( GetPaid_Payment_Exception $e ) {
+} catch (GetPaid_Payment_Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getCode();
 		}
 
 		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+		do_action_ref_array('getpaid_process_submission', array(&$this));
 
 	}
 
@@ -219,18 +219,18 @@  discard block
 block discarded – undo
 	public function process_payment_form() {
 
 		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+		if (empty($this->data['form_id'])) {
+			throw new Exception(__('Missing payment form', 'invoicing'));
 		}
 
 		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+		$this->payment_form = new GetPaid_Payment_Form($this->data['form_id']);
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+		if (!$this->payment_form->is_active()) {
+			throw new Exception(__('Payment form not active', 'invoicing'));
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_payment_form', array(&$this));
 	}
 
     /**
@@ -260,53 +260,53 @@  discard block
 block discarded – undo
 	public function process_invoice() {
 
 		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
+		if (empty($this->data['invoice_id'])) {
 			return;
 		}
 
 		// If the submission is for an existing invoice, ensure that it exists
 		// and that it is not paid for.
-		$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+		$invoice = wpinv_get_invoice($this->data['invoice_id']);
 
-        if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        if (empty($invoice)) {
+			throw new Exception(__('Invalid invoice', 'invoicing'));
 		}
 
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+		if ($invoice->is_paid()) {
+			throw new Exception(__('This invoice is already paid for.', 'invoicing'));
 		}
 
 		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
+		if (!$this->payment_form->is_default()) {
 
 			$items    = array();
 			$item_ids = array();
 
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($invoice->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($this->payment_form->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 
-			$this->payment_form->set_items( $items );
+			$this->payment_form->set_items($items);
 
 		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
+			$this->payment_form->set_items($invoice->get_items());
 		}
 
 		$this->country = $invoice->get_country();
 		$this->state   = $invoice->get_state();
 		$this->invoice = $invoice;
 
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_invoice', array(&$this));
 	}
 
 	/**
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_invoice() {
-		return ! empty( $this->invoice );
+		return !empty($this->invoice);
 	}
 
 	/*
@@ -345,13 +345,13 @@  discard block
 block discarded – undo
 	 */
 	public function process_items() {
 
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Items($this);
 
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
+		foreach ($processor->items as $item) {
+			$this->add_item($item);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_items', array(&$this));
 	}
 
 	/**
@@ -360,20 +360,20 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function add_item( $item ) {
+	public function add_item($item) {
 
 		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+		if (!$item->can_purchase() || isset($this->items[$item->get_id()])) {
 			return;
 		}
 
 		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 			$this->has_recurring = $item->get_id();
 		}
 
 		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
+		$this->items[$item->get_id()]         = $item;
 		$this->totals['subtotal']['initial']   += $item->get_sub_total();
 		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
 
@@ -387,17 +387,17 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_item( $item_id ) {
+	public function remove_item($item_id) {
 
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+		if (isset($this->items[$item_id])) {
+			$this->totals['subtotal']['initial']   -= $this->items[$item_id]->get_sub_total();
+			$this->totals['subtotal']['recurring'] -= $this->items[$item_id]->get_recurring_sub_total();
 
-			if ( $this->items[ $item_id ]->is_recurring() ) {
+			if ($this->items[$item_id]->is_recurring()) {
 				$this->has_recurring = 0;
 			}
 
-			unset( $this->items[ $item_id ] );
+			unset($this->items[$item_id]);
 		}
 
 	}
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
 		}
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_recurring_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
 		}
 
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && getpaid_should_group_subscriptions($this) && 1 == count(getpaid_get_subscription_groups($this));
 	}
 
 	/**
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && 1 < count(getpaid_get_subscription_groups($this));
 	}
 
 	/*
@@ -477,39 +477,39 @@  discard block
 block discarded – undo
 	public function process_taxes() {
 
 		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
+		if (!$this->use_taxes()) {
 			return;
 		}
 
 		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
+		$country = $this->get_field('wpinv_country', 'billing');
+		if (!empty($country)) {
 			$this->country = $country;
 		}
 
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
+		$state = $this->get_field('wpinv_state', 'billing');
+		if (!empty($state)) {
 			$this->state = $state;
 		}
 
 		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+		$address_confirmed = $this->get_field('confirm-address');
+		if (isset($_POST['billing']['country']) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty($address_confirmed)) {
+			throw new Exception(__('The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing'));
 		}
 
 		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
+		if (!wpinv_is_country_taxable($this->country)) {
 			return;
 		}
 
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Taxes($this);
 
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
+		foreach ($processor->taxes as $tax) {
+			$this->add_tax($tax);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_taxes', array(&$this));
 	}
 
 	/**
@@ -518,16 +518,16 @@  discard block
 block discarded – undo
 	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
 	 * @since 1.0.19
 	 */
-	public function add_tax( $tax ) {
+	public function add_tax($tax) {
 
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+		if (wpinv_round_tax_per_tax_rate()) {
+			$tax['initial_tax']   = wpinv_round_amount($tax['initial_tax']);
+			$tax['recurring_tax'] = wpinv_round_amount($tax['recurring_tax']);
 		}
 
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+		$this->taxes[$tax['name']]         = $tax;
+		$this->totals['taxes']['initial']   += wpinv_sanitize_amount($tax['initial_tax']);
+		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount($tax['recurring_tax']);
 
 	}
 
@@ -536,12 +536,12 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_tax( $tax_name ) {
+	public function remove_tax($tax_name) {
 
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
+		if (isset($this->taxes[$tax_name])) {
+			$this->totals['taxes']['initial']   -= $this->taxes[$tax_name]['initial_tax'];
+			$this->totals['taxes']['recurring'] -= $this->taxes[$tax_name]['recurring_tax'];
+			unset($this->taxes[$tax_name]);
 		}
 
 	}
@@ -555,11 +555,11 @@  discard block
 block discarded – undo
 
 		$use_taxes = wpinv_use_taxes();
 
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+		if ($this->has_invoice() && !$this->invoice->is_taxable()) {
 			$use_taxes = false;
 		}
 
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+		return apply_filters('getpaid_submission_use_taxes', $use_taxes, $this);
 
 	}
 
@@ -608,13 +608,13 @@  discard block
 block discarded – undo
 
 		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
 		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+		$processor        = new GetPaid_Payment_Form_Submission_Discount($this, $initial_total, $recurring_total);
 
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
+		foreach ($processor->discounts as $discount) {
+			$this->add_discount($discount);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_discounts', array(&$this));
 	}
 
 	/**
@@ -623,10 +623,10 @@  discard block
 block discarded – undo
 	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
 	 * @since 1.0.19
 	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+	public function add_discount($discount) {
+		$this->discounts[$discount['name']]   = $discount;
+		$this->totals['discount']['initial']   += wpinv_sanitize_amount($discount['initial_discount']);
+		$this->totals['discount']['recurring'] += wpinv_sanitize_amount($discount['recurring_discount']);
 	}
 
 	/**
@@ -634,12 +634,12 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_discount( $name ) {
+	public function remove_discount($name) {
 
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
+		if (isset($this->discounts[$name])) {
+			$this->totals['discount']['initial']   -= $this->discounts[$name]['initial_discount'];
+			$this->totals['discount']['recurring'] -= $this->discounts[$name]['recurring_discount'];
+			unset($this->discounts[$name]);
 		}
 
 	}
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
+		return !empty($this->discounts['discount_code']);
 	}
 
 	/**
@@ -708,13 +708,13 @@  discard block
 block discarded – undo
 	 */
 	public function process_fees() {
 
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+		$fees_processor = new GetPaid_Payment_Form_Submission_Fees($this);
 
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
+		foreach ($fees_processor->fees as $fee) {
+			$this->add_fee($fee);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_fees', array(&$this));
 	}
 
 	/**
@@ -723,17 +723,17 @@  discard block
 block discarded – undo
 	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
 	 * @since 1.0.19
 	 */
-	public function add_fee( $fee ) {
+	public function add_fee($fee) {
 
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		if ($fee['name'] == 'shipping') {
+			$this->totals['shipping']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 			return;
 		}
 
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		$this->fees[$fee['name']]         = $fee;
+		$this->totals['fees']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+		$this->totals['fees']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 
 	}
 
@@ -742,15 +742,15 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_fee( $name ) {
+	public function remove_fee($name) {
 
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
+		if (isset($this->fees[$name])) {
+			$this->totals['fees']['initial']   -= $this->fees[$name]['initial_fee'];
+			$this->totals['fees']['recurring'] -= $this->fees[$name]['recurring_fee'];
+			unset($this->fees[$name]);
 		}
 
-		if ( 'shipping' == $name ) {
+		if ('shipping' == $name) {
 			$this->totals['shipping']['initial']   = 0;
 			$this->totals['shipping']['recurring'] = 0;
 		}
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function has_fees() {
-		return count( $this->fees ) !== 0;
+		return count($this->fees) !== 0;
 	}
 
 	/*
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+		return apply_filters('getpaid_payment_form_has_shipping', false, $this);
 	}
 
 	/**
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function is_initial_fetch() {
-		return empty( $this->data['initial_state'] );
+		return empty($this->data['initial_state']);
 	}
 
 	/**
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_total() {
 		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
 	 */
 	public function get_recurring_total() {
 		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -869,12 +869,12 @@  discard block
 block discarded – undo
 		$initial   = $this->get_total();
 		$recurring = $this->get_recurring_total();
 
-		if ( $this->has_recurring == 0 ) {
+		if ($this->has_recurring == 0) {
 			$recurring = 0;
 		}
 
 		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
+		return apply_filters('getpaid_submission_should_collect_payment_details', $collect, $this);
 	}
 
 	/**
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 */
 	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
+		return apply_filters('getpaid_get_submission_billing_email', $this->get_field('billing_email'), $this);
 	}
 
 	/**
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
 	 */
 	public function has_billing_email() {
 		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
+		return !empty($billing_email) && is_email($billing_email);
 	}
 
 	/**
@@ -923,8 +923,8 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return mixed|null
 	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+	public function get_field($field, $sub_array_key = null) {
+		return getpaid_get_array_field($this->data, $field, $sub_array_key);
 	}
 
 	/**
@@ -932,8 +932,8 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+	public function is_required_field_set($field) {
+		return empty($field['required']) || !empty($this->data[$field['id']]);
 	}
 
 	/**
@@ -941,8 +941,8 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0.19
 	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
+	public function format_amount($amount) {
+		return wpinv_price($amount, $this->get_currency());
 	}
 
 }

Please login to merge, or discard this patch.

includes/payments/class-getpaid-form-item.php 2 patches

Indentation +359 added lines, -359 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,67 +10,67 @@  discard block
 block discarded – undo
 class GetPaid_Form_Item  extends WPInv_Item {
 
     /**
-	 * Stores a custom description for the item.
-	 *
-	 * @var string
-	 */
-	protected $custom_description = null;
-
-	/**
-	 * Stores the item quantity.
-	 *
-	 * @var float
-	 */
-	protected $quantity = 1;
-
-	/**
-	 * Stores the item meta.
-	 *
-	 * @var array
-	 */
-	protected $meta = array();
-
-	/**
-	 * Is this item required?
-	 *
-	 * @var int
-	 */
-	protected $is_required = true;
-
-	/**
-	 * Are quantities allowed?
-	 *
-	 * @var int
-	 */
-	protected $allow_quantities = false;
-
-	/**
-	 * Associated invoice.
-	 *
-	 * @var int
-	 */
-	public $invoice_id = 0;
-
-	/**
-	 * Item discount.
-	 *
-	 * @var float
-	 */
-	public $item_discount = 0;
-
-	/**
-	 * Recurring item discount.
-	 *
-	 * @var float
-	 */
-	public $recurring_item_discount = 0;
-
-	/**
-	 * Item tax.
-	 *
-	 * @var float
-	 */
-	public $item_tax = 0;
+     * Stores a custom description for the item.
+     *
+     * @var string
+     */
+    protected $custom_description = null;
+
+    /**
+     * Stores the item quantity.
+     *
+     * @var float
+     */
+    protected $quantity = 1;
+
+    /**
+     * Stores the item meta.
+     *
+     * @var array
+     */
+    protected $meta = array();
+
+    /**
+     * Is this item required?
+     *
+     * @var int
+     */
+    protected $is_required = true;
+
+    /**
+     * Are quantities allowed?
+     *
+     * @var int
+     */
+    protected $allow_quantities = false;
+
+    /**
+     * Associated invoice.
+     *
+     * @var int
+     */
+    public $invoice_id = 0;
+
+    /**
+     * Item discount.
+     *
+     * @var float
+     */
+    public $item_discount = 0;
+
+    /**
+     * Recurring item discount.
+     *
+     * @var float
+     */
+    public $recurring_item_discount = 0;
+
+    /**
+     * Item tax.
+     *
+     * @var float
+     */
+    public $item_tax = 0;
 
     /*
 	|--------------------------------------------------------------------------
@@ -88,230 +88,230 @@  discard block
 block discarded – undo
     */
 
     /**
-	 * Get the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		$name = parent::get_name( $context );
-		return $name . wpinv_get_item_suffix( $this );
-	}
-
-	/**
-	 * Get the item name without a suffix.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_raw_name( $context = 'view' ) {
-		return parent::get_name( $context );
-	}
-
-	/**
-	 * Get the item description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_description( $context = 'view' ) {
-
-		if ( isset( $this->custom_description ) ) {
-			return $this->custom_description;
-		}
-
-		return parent::get_description( $context );
-	}
-
-	/**
-	 * Returns the sub total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_sub_total( $context = 'view' ) {
-		return $this->get_quantity( $context ) * $this->get_initial_price( $context );
-	}
-
-	/**
-	 * Returns the recurring sub total.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_recurring_sub_total( $context = 'view' ) {
-
-		if ( $this->is_recurring() ) {
-			return $this->get_quantity( $context ) * $this->get_price( $context );
-		}
-
-		return 0;
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function get_qantity( $context = 'view' ) {
-		return $this->get_quantity( $context );
-	}
-
-	/**
-	 * Get the item quantity.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_quantity( $context = 'view' ) {
-		$quantity = (float) $this->quantity;
-
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
-		}
-
-		return $quantity;
-
-	}
-
-	/**
-	 * Get the item meta data.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return meta
-	 */
-	public function get_item_meta( $context = 'view' ) {
-		$meta = $this->meta;
-
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
-		}
-
-		return $meta;
-
-	}
-
-	/**
-	 * Returns whether or not customers can update the item quantity.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_allow_quantities( $context = 'view' ) {
-		$allow_quantities = (bool) $this->allow_quantities;
-
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
-		}
-
-		return $allow_quantities;
-
-	}
-
-	/**
-	 * Returns whether or not the item is required.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_is_required( $context = 'view' ) {
-		$is_required = (bool) $this->is_required;
-
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
-		}
-
-		return $is_required;
-
-	}
-
-	/**
-	 * Prepares form data for use.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function prepare_data_for_use( $required = null ) {
-
-		$required = is_null( $required ) ? $this->is_required() : $required;
-		return array(
-			'title'            => strip_tags( $this->get_name() ),
-			'id'               => $this->get_id(),
-			'price'            => $this->get_price(),
-			'recurring'        => $this->is_recurring(),
-			'description'      => $this->get_description(),
-			'allow_quantities' => $this->allows_quantities(),
-			'required'         => $required,
-		);
-
-	}
-
-	/**
-	 * Prepares form data for ajax use.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
-
-		$description = getpaid_item_recurring_price_help_text( $this, $currency );
-
-		if ( $description ) {
-			$description = "<div class='getpaid-subscription-help-text'>$description</div>";
-		}
-
-		$price    = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
-		$subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
-		return array(
-			'id'     => $this->get_id(),
-			'texts'  => array(
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ) . $description,
-				'item-quantity'    => floatval( $this->get_quantity() ),
-				'item-price'       => wpinv_price( $price, $currency ),
-				'item-total'       => wpinv_price( $subtotal, $currency ),
-			),
-			'inputs' => array(
-				'item-id'          => $this->get_id(),
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ),
-				'item-quantity'    => floatval( $this->get_quantity() ),
-				'item-price'       => $price,
-			),
-		);
-
-	}
-
-	/**
-	 * Prepares form data for saving (cart_details).
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function prepare_data_for_saving() {
-
-		return array(
-			'post_id'          => $this->invoice_id,
-			'item_id'          => $this->get_id(),
-			'item_name'        => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
-			'item_description' => $this->get_description( 'edit' ),
-			'tax'              => $this->item_tax,
-			'item_price'       => $this->get_price( 'edit' ),
-			'quantity'         => (float) $this->get_quantity( 'edit' ),
-			'discount'         => $this->item_discount,
-			'subtotal'         => $this->get_sub_total( 'edit' ),
-			'price'            => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
-			'meta'             => $this->get_item_meta( 'edit' ),
-		);
-
-	}
+     * Get the item name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        $name = parent::get_name( $context );
+        return $name . wpinv_get_item_suffix( $this );
+    }
+
+    /**
+     * Get the item name without a suffix.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_raw_name( $context = 'view' ) {
+        return parent::get_name( $context );
+    }
+
+    /**
+     * Get the item description.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_description( $context = 'view' ) {
+
+        if ( isset( $this->custom_description ) ) {
+            return $this->custom_description;
+        }
+
+        return parent::get_description( $context );
+    }
+
+    /**
+     * Returns the sub total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_sub_total( $context = 'view' ) {
+        return $this->get_quantity( $context ) * $this->get_initial_price( $context );
+    }
+
+    /**
+     * Returns the recurring sub total.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_recurring_sub_total( $context = 'view' ) {
+
+        if ( $this->is_recurring() ) {
+            return $this->get_quantity( $context ) * $this->get_price( $context );
+        }
+
+        return 0;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function get_qantity( $context = 'view' ) {
+        return $this->get_quantity( $context );
+    }
+
+    /**
+     * Get the item quantity.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_quantity( $context = 'view' ) {
+        $quantity = (float) $this->quantity;
+
+        if ( 'view' == $context ) {
+            return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
+        }
+
+        return $quantity;
+
+    }
+
+    /**
+     * Get the item meta data.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return meta
+     */
+    public function get_item_meta( $context = 'view' ) {
+        $meta = $this->meta;
+
+        if ( 'view' == $context ) {
+            return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
+        }
+
+        return $meta;
+
+    }
+
+    /**
+     * Returns whether or not customers can update the item quantity.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_allow_quantities( $context = 'view' ) {
+        $allow_quantities = (bool) $this->allow_quantities;
+
+        if ( 'view' == $context ) {
+            return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
+        }
+
+        return $allow_quantities;
+
+    }
+
+    /**
+     * Returns whether or not the item is required.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_is_required( $context = 'view' ) {
+        $is_required = (bool) $this->is_required;
+
+        if ( 'view' == $context ) {
+            return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
+        }
+
+        return $is_required;
+
+    }
+
+    /**
+     * Prepares form data for use.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function prepare_data_for_use( $required = null ) {
+
+        $required = is_null( $required ) ? $this->is_required() : $required;
+        return array(
+            'title'            => strip_tags( $this->get_name() ),
+            'id'               => $this->get_id(),
+            'price'            => $this->get_price(),
+            'recurring'        => $this->is_recurring(),
+            'description'      => $this->get_description(),
+            'allow_quantities' => $this->allows_quantities(),
+            'required'         => $required,
+        );
+
+    }
+
+    /**
+     * Prepares form data for ajax use.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
+
+        $description = getpaid_item_recurring_price_help_text( $this, $currency );
+
+        if ( $description ) {
+            $description = "<div class='getpaid-subscription-help-text'>$description</div>";
+        }
+
+        $price    = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
+        $subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
+        return array(
+            'id'     => $this->get_id(),
+            'texts'  => array(
+                'item-name'        => sanitize_text_field( $this->get_name() ),
+                'item-description' => wp_kses_post( $this->get_description() ) . $description,
+                'item-quantity'    => floatval( $this->get_quantity() ),
+                'item-price'       => wpinv_price( $price, $currency ),
+                'item-total'       => wpinv_price( $subtotal, $currency ),
+            ),
+            'inputs' => array(
+                'item-id'          => $this->get_id(),
+                'item-name'        => sanitize_text_field( $this->get_name() ),
+                'item-description' => wp_kses_post( $this->get_description() ),
+                'item-quantity'    => floatval( $this->get_quantity() ),
+                'item-price'       => $price,
+            ),
+        );
+
+    }
+
+    /**
+     * Prepares form data for saving (cart_details).
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function prepare_data_for_saving() {
+
+        return array(
+            'post_id'          => $this->invoice_id,
+            'item_id'          => $this->get_id(),
+            'item_name'        => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
+            'item_description' => $this->get_description( 'edit' ),
+            'tax'              => $this->item_tax,
+            'item_price'       => $this->get_price( 'edit' ),
+            'quantity'         => (float) $this->get_quantity( 'edit' ),
+            'discount'         => $this->item_discount,
+            'subtotal'         => $this->get_sub_total( 'edit' ),
+            'price'            => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
+            'meta'             => $this->get_item_meta( 'edit' ),
+        );
+
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -323,70 +323,70 @@  discard block
 block discarded – undo
 	| object.
     */
 
-	/**
-	 * Set the item qantity.
-	 *
-	 * @since 1.0.19
-	 * @param  float $quantity The item quantity.
-	 */
-	public function set_quantity( $quantity ) {
-
-		if ( ! is_numeric( $quantity ) ) {
-			$quantity = 1;
-		}
-
-		$this->quantity = (float) $quantity;
-
-	}
-
-	/**
-	 * Set the item meta data.
-	 *
-	 * @since 1.0.19
-	 * @param  array $meta The item meta data.
-	 */
-	public function set_item_meta( $meta ) {
-		$this->meta = maybe_unserialize( $meta );
-	}
-
-	/**
-	 * Set whether or not the quantities are allowed.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $allow_quantities
-	 */
-	public function set_allow_quantities( $allow_quantities ) {
-		$this->allow_quantities = (bool) $allow_quantities;
-	}
-
-	/**
-	 * Set whether or not the item is required.
-	 *
-	 * @since 1.0.19
-	 * @param  bool $is_required
-	 */
-	public function set_is_required( $is_required ) {
-		$this->is_required = (bool) $is_required;
-	}
-
-	/**
-	 * Sets the custom item description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $description
-	 */
-	public function set_custom_description( $description ) {
-		$this->custom_description = $description;
-	}
+    /**
+     * Set the item qantity.
+     *
+     * @since 1.0.19
+     * @param  float $quantity The item quantity.
+     */
+    public function set_quantity( $quantity ) {
+
+        if ( ! is_numeric( $quantity ) ) {
+            $quantity = 1;
+        }
+
+        $this->quantity = (float) $quantity;
+
+    }
+
+    /**
+     * Set the item meta data.
+     *
+     * @since 1.0.19
+     * @param  array $meta The item meta data.
+     */
+    public function set_item_meta( $meta ) {
+        $this->meta = maybe_unserialize( $meta );
+    }
+
+    /**
+     * Set whether or not the quantities are allowed.
+     *
+     * @since 1.0.19
+     * @param  bool $allow_quantities
+     */
+    public function set_allow_quantities( $allow_quantities ) {
+        $this->allow_quantities = (bool) $allow_quantities;
+    }
+
+    /**
+     * Set whether or not the item is required.
+     *
+     * @since 1.0.19
+     * @param  bool $is_required
+     */
+    public function set_is_required( $is_required ) {
+        $this->is_required = (bool) $is_required;
+    }
+
+    /**
+     * Sets the custom item description.
+     *
+     * @since 1.0.19
+     * @param  string $description
+     */
+    public function set_custom_description( $description ) {
+        $this->custom_description = $description;
+    }
 
     /**
      * We do not want to save items to the database.
      *
-	 * @return int item id
+     * @return int item id
      */
     public function save( $data = array() ) {
         return $this->get_id();
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -398,23 +398,23 @@  discard block
 block discarded – undo
 	*/
 
     /**
-	 * Checks whether the item has enabled dynamic pricing.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function is_required() {
+     * Checks whether the item has enabled dynamic pricing.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function is_required() {
         return (bool) $this->get_is_required();
-	}
-
-	/**
-	 * Checks whether users can edit the quantities.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function allows_quantities() {
+    }
+
+    /**
+     * Checks whether users can edit the quantities.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function allows_quantities() {
         return (bool) $this->get_allow_quantities();
-	}
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-		$name = parent::get_name( $context );
-		return $name . wpinv_get_item_suffix( $this );
+	public function get_name($context = 'view') {
+		$name = parent::get_name($context);
+		return $name . wpinv_get_item_suffix($this);
 	}
 
 	/**
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_raw_name( $context = 'view' ) {
-		return parent::get_name( $context );
+	public function get_raw_name($context = 'view') {
+		return parent::get_name($context);
 	}
 
 	/**
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_description( $context = 'view' ) {
+	public function get_description($context = 'view') {
 
-		if ( isset( $this->custom_description ) ) {
+		if (isset($this->custom_description)) {
 			return $this->custom_description;
 		}
 
-		return parent::get_description( $context );
+		return parent::get_description($context);
 	}
 
 	/**
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_sub_total( $context = 'view' ) {
-		return $this->get_quantity( $context ) * $this->get_initial_price( $context );
+	public function get_sub_total($context = 'view') {
+		return $this->get_quantity($context) * $this->get_initial_price($context);
 	}
 
 	/**
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_recurring_sub_total( $context = 'view' ) {
+	public function get_recurring_sub_total($context = 'view') {
 
-		if ( $this->is_recurring() ) {
-			return $this->get_quantity( $context ) * $this->get_price( $context );
+		if ($this->is_recurring()) {
+			return $this->get_quantity($context) * $this->get_price($context);
 		}
 
 		return 0;
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
 	/**
 	 * @deprecated
 	 */
-	public function get_qantity( $context = 'view' ) {
-		return $this->get_quantity( $context );
+	public function get_qantity($context = 'view') {
+		return $this->get_quantity($context);
 	}
 
 	/**
@@ -167,11 +167,11 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_quantity( $context = 'view' ) {
+	public function get_quantity($context = 'view') {
 		$quantity = (float) $this->quantity;
 
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
+		if ('view' == $context) {
+			return apply_filters('getpaid_payment_form_item_quantity', $quantity, $this);
 		}
 
 		return $quantity;
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return meta
 	 */
-	public function get_item_meta( $context = 'view' ) {
+	public function get_item_meta($context = 'view') {
 		$meta = $this->meta;
 
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
+		if ('view' == $context) {
+			return apply_filters('getpaid_payment_form_item_meta', $meta, $this);
 		}
 
 		return $meta;
@@ -203,11 +203,11 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_allow_quantities( $context = 'view' ) {
+	public function get_allow_quantities($context = 'view') {
 		$allow_quantities = (bool) $this->allow_quantities;
 
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
+		if ('view' == $context) {
+			return apply_filters('getpaid_payment_form_item_allow_quantities', $allow_quantities, $this);
 		}
 
 		return $allow_quantities;
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
 	 * @param  string $context View or edit context.
 	 * @return bool
 	 */
-	public function get_is_required( $context = 'view' ) {
+	public function get_is_required($context = 'view') {
 		$is_required = (bool) $this->is_required;
 
-		if ( 'view' == $context ) {
-			return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
+		if ('view' == $context) {
+			return apply_filters('getpaid_payment_form_item_is_required', $is_required, $this);
 		}
 
 		return $is_required;
@@ -238,11 +238,11 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function prepare_data_for_use( $required = null ) {
+	public function prepare_data_for_use($required = null) {
 
-		$required = is_null( $required ) ? $this->is_required() : $required;
+		$required = is_null($required) ? $this->is_required() : $required;
 		return array(
-			'title'            => strip_tags( $this->get_name() ),
+			'title'            => strip_tags($this->get_name()),
 			'id'               => $this->get_id(),
 			'price'            => $this->get_price(),
 			'recurring'        => $this->is_recurring(),
@@ -259,30 +259,30 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
+	public function prepare_data_for_invoice_edit_ajax($currency = '', $is_renewal = false) {
 
-		$description = getpaid_item_recurring_price_help_text( $this, $currency );
+		$description = getpaid_item_recurring_price_help_text($this, $currency);
 
-		if ( $description ) {
+		if ($description) {
 			$description = "<div class='getpaid-subscription-help-text'>$description</div>";
 		}
 
-		$price    = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
-		$subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
+		$price    = !$is_renewal ? $this->get_price() : $this->get_recurring_price();
+		$subtotal = !$is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
 		return array(
 			'id'     => $this->get_id(),
 			'texts'  => array(
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ) . $description,
-				'item-quantity'    => floatval( $this->get_quantity() ),
-				'item-price'       => wpinv_price( $price, $currency ),
-				'item-total'       => wpinv_price( $subtotal, $currency ),
+				'item-name'        => sanitize_text_field($this->get_name()),
+				'item-description' => wp_kses_post($this->get_description()) . $description,
+				'item-quantity'    => floatval($this->get_quantity()),
+				'item-price'       => wpinv_price($price, $currency),
+				'item-total'       => wpinv_price($subtotal, $currency),
 			),
 			'inputs' => array(
 				'item-id'          => $this->get_id(),
-				'item-name'        => sanitize_text_field( $this->get_name() ),
-				'item-description' => wp_kses_post( $this->get_description() ),
-				'item-quantity'    => floatval( $this->get_quantity() ),
+				'item-name'        => sanitize_text_field($this->get_name()),
+				'item-description' => wp_kses_post($this->get_description()),
+				'item-quantity'    => floatval($this->get_quantity()),
 				'item-price'       => $price,
 			),
 		);
@@ -300,15 +300,15 @@  discard block
 block discarded – undo
 		return array(
 			'post_id'          => $this->invoice_id,
 			'item_id'          => $this->get_id(),
-			'item_name'        => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
-			'item_description' => $this->get_description( 'edit' ),
+			'item_name'        => sanitize_text_field($this->get_raw_name('edit')),
+			'item_description' => $this->get_description('edit'),
 			'tax'              => $this->item_tax,
-			'item_price'       => $this->get_price( 'edit' ),
-			'quantity'         => (float) $this->get_quantity( 'edit' ),
+			'item_price'       => $this->get_price('edit'),
+			'quantity'         => (float) $this->get_quantity('edit'),
 			'discount'         => $this->item_discount,
-			'subtotal'         => $this->get_sub_total( 'edit' ),
-			'price'            => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
-			'meta'             => $this->get_item_meta( 'edit' ),
+			'subtotal'         => $this->get_sub_total('edit'),
+			'price'            => $this->get_sub_total('edit') + $this->item_tax - $this->item_discount,
+			'meta'             => $this->get_item_meta('edit'),
 		);
 
 	}
@@ -329,9 +329,9 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param  float $quantity The item quantity.
 	 */
-	public function set_quantity( $quantity ) {
+	public function set_quantity($quantity) {
 
-		if ( ! is_numeric( $quantity ) ) {
+		if (!is_numeric($quantity)) {
 			$quantity = 1;
 		}
 
@@ -345,8 +345,8 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param  array $meta The item meta data.
 	 */
-	public function set_item_meta( $meta ) {
-		$this->meta = maybe_unserialize( $meta );
+	public function set_item_meta($meta) {
+		$this->meta = maybe_unserialize($meta);
 	}
 
 	/**
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param  bool $allow_quantities
 	 */
-	public function set_allow_quantities( $allow_quantities ) {
+	public function set_allow_quantities($allow_quantities) {
 		$this->allow_quantities = (bool) $allow_quantities;
 	}
 
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param  bool $is_required
 	 */
-	public function set_is_required( $is_required ) {
+	public function set_is_required($is_required) {
 		$this->is_required = (bool) $is_required;
 	}
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @param  string $description
 	 */
-	public function set_custom_description( $description ) {
+	public function set_custom_description($description) {
 		$this->custom_description = $description;
 	}
 
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
      *
 	 * @return int item id
      */
-    public function save( $data = array() ) {
+    public function save($data = array()) {
         return $this->get_id();
 	}
 

Please login to merge, or discard this patch.

includes/payments/class-getpaid-payment-form-submission-discount.php 2 patches

Indentation +159 added lines, -159 removed lines patch added patch discarded remove patch

@@ -12,167 +12,167 @@
 block discarded – undo
  */
 class GetPaid_Payment_Form_Submission_Discount {
 
-	/**
-	 * Submission discounts.
-	 * @var array
-	 */
-	public $discounts = array();
+    /**
+     * Submission discounts.
+     * @var array
+     */
+    public $discounts = array();
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param float                           $initial_total
+     * @param float                           $recurring_total
+     */
+    public function __construct( $submission, $initial_total, $recurring_total ) {
+
+        // Process any existing invoice discounts.
+        if ( $submission->has_invoice() ) {
+            $this->discounts = $submission->get_invoice()->get_discounts();
+        }
+
+        // Do we have a discount?
+        $discount = $submission->get_field( 'discount' );
+
+        if ( empty( $discount ) ) {
+
+            if ( isset( $this->discounts['discount_code'] ) ) {
+                unset( $this->discounts['discount_code'] );
+            }
+
+            return;
+        }
+
+        // Processes the discount code.
+        $amount = max( $initial_total, $recurring_total );
+        $this->process_discount( $submission, $discount, $amount );
+
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param float                           $initial_total
-	 * @param float                           $recurring_total
-	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
-
-		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
-			$this->discounts = $submission->get_invoice()->get_discounts();
-		}
-
-		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
-
-		if ( empty( $discount ) ) {
-
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
-			}
-
-			return;
-		}
-
-		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
-
-	}
-
-	/**
-	 * Processes a submission discount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param string                          $discount
-	 * @param float                           $amount
-	 */
-	public function process_discount( $submission, $discount, $amount ) {
-
-		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
-
-		// Ensure it is active.
+     * Processes a submission discount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param string                          $discount
+     * @param float                           $amount
+     */
+    public function process_discount( $submission, $discount, $amount ) {
+
+        // Fetch the discount.
+        $discount = new WPInv_Discount( $discount );
+
+        // Ensure it is active.
         if ( ! $this->is_discount_active( $discount ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'Invalid or expired discount code', 'invoicing' ) );
-		}
-
-		// Required items.
-		if ( ! $discount->is_required_items_met( array_keys( $submission->get_items() ) ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You are not allowed to use this discount code.', 'invoicing' ) );
-		}
-
-		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'This discount code has been used up', 'invoicing' ) );
-		}
-
-		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
-
-		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
-
-		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
-	}
-
-	/**
-	 * Validates a single use discount.
-	 *
-	 * @param WPInv_Discount                  $discount
-	 * @return bool
-	 */
-	public function is_discount_active( $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
-	}
-
-	/**
-	 * Returns a user's id or email.
-	 *
-	 * @param string $email
-	 * @return int|string|false
-	 */
-	public function get_user_id_or_email( $email ) {
-
-		if ( is_user_logged_in() ) {
-			return get_current_user_id();
-		}
-
-		return empty( $email ) ? false : sanitize_email( $email );
-	}
-
-	/**
-	 * Validates a single use discount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount                  $discount
-	 */
-	public function validate_single_use_discount( $submission, $discount ) {
-
-		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
-			return;
-		}
-
-		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
-
-		if ( empty( $user ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
-		}
-
-		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You have already used this discount', 'invoicing' ) );
-		}
-
-	}
-
-	/**
-	 * Validates the discount's amount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount         $discount
-	 * @param float                  $amount
-	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
-
-		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
-		}
-
-		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
-		}
-
-	}
-
-	/**
-	 * Calculates the discount code's amount.
-	 *
-	 * Ensure that the discount exists and has been validated before calling this method.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount                  $discount
-	 * @return array
-	 */
-	public function calculate_discount( $submission, $discount ) {
-		return getpaid_calculate_invoice_discount( $submission, $discount );
-	}
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'Invalid or expired discount code', 'invoicing' ) );
+        }
+
+        // Required items.
+        if ( ! $discount->is_required_items_met( array_keys( $submission->get_items() ) ) ) {
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You are not allowed to use this discount code.', 'invoicing' ) );
+        }
+
+        // Exceeded limit.
+        if ( $discount->has_exceeded_limit() ) {
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'This discount code has been used up', 'invoicing' ) );
+        }
+
+        // Validate usages.
+        $this->validate_single_use_discount( $submission, $discount );
+
+        // Validate amount.
+        $this->validate_discount_amount( $submission, $discount, $amount );
+
+        // Save the discount.
+        $this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+    }
+
+    /**
+     * Validates a single use discount.
+     *
+     * @param WPInv_Discount                  $discount
+     * @return bool
+     */
+    public function is_discount_active( $discount ) {
+        return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+    }
+
+    /**
+     * Returns a user's id or email.
+     *
+     * @param string $email
+     * @return int|string|false
+     */
+    public function get_user_id_or_email( $email ) {
+
+        if ( is_user_logged_in() ) {
+            return get_current_user_id();
+        }
+
+        return empty( $email ) ? false : sanitize_email( $email );
+    }
+
+    /**
+     * Validates a single use discount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount                  $discount
+     */
+    public function validate_single_use_discount( $submission, $discount ) {
+
+        // Abort if it is not a single use discount.
+        if ( ! $discount->is_single_use() ) {
+            return;
+        }
+
+        // Ensure there is a valid billing email.
+        $user = $this->get_user_id_or_email( $submission->get_billing_email() );
+
+        if ( empty( $user ) ) {
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+        }
+
+        // Has the user used this discount code before?
+        if ( ! $discount->is_valid_for_user( $user ) ) {
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You have already used this discount', 'invoicing' ) );
+        }
+
+    }
+
+    /**
+     * Validates the discount's amount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount         $discount
+     * @param float                  $amount
+     */
+    public function validate_discount_amount( $submission, $discount, $amount ) {
+
+        // Validate minimum amount.
+        if ( ! $discount->is_minimum_amount_met( $amount ) ) {
+            $min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+        }
+
+        // Validate the maximum amount.
+        if ( ! $discount->is_maximum_amount_met( $amount ) ) {
+            $max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
+            throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+        }
+
+    }
+
+    /**
+     * Calculates the discount code's amount.
+     *
+     * Ensure that the discount exists and has been validated before calling this method.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount                  $discount
+     * @return array
+     */
+    public function calculate_discount( $submission, $discount ) {
+        return getpaid_calculate_invoice_discount( $submission, $discount );
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission discount class
@@ -25,28 +25,28 @@  discard block
 block discarded – undo
 	 * @param float                           $initial_total
 	 * @param float                           $recurring_total
 	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
+	public function __construct($submission, $initial_total, $recurring_total) {
 
 		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->discounts = $submission->get_invoice()->get_discounts();
 		}
 
 		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
+		$discount = $submission->get_field('discount');
 
-		if ( empty( $discount ) ) {
+		if (empty($discount)) {
 
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
+			if (isset($this->discounts['discount_code'])) {
+				unset($this->discounts['discount_code']);
 			}
 
 			return;
 		}
 
 		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
+		$amount = max($initial_total, $recurring_total);
+		$this->process_discount($submission, $discount, $amount);
 
 	}
 
@@ -57,34 +57,34 @@  discard block
 block discarded – undo
 	 * @param string                          $discount
 	 * @param float                           $amount
 	 */
-	public function process_discount( $submission, $discount, $amount ) {
+	public function process_discount($submission, $discount, $amount) {
 
 		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
+		$discount = new WPInv_Discount($discount);
 
 		// Ensure it is active.
-        if ( ! $this->is_discount_active( $discount ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'Invalid or expired discount code', 'invoicing' ) );
+        if (!$this->is_discount_active($discount)) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('Invalid or expired discount code', 'invoicing'));
 		}
 
 		// Required items.
-		if ( ! $discount->is_required_items_met( array_keys( $submission->get_items() ) ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You are not allowed to use this discount code.', 'invoicing' ) );
+		if (!$discount->is_required_items_met(array_keys($submission->get_items()))) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('You are not allowed to use this discount code.', 'invoicing'));
 		}
 
 		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'This discount code has been used up', 'invoicing' ) );
+		if ($discount->has_exceeded_limit()) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('This discount code has been used up', 'invoicing'));
 		}
 
 		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
+		$this->validate_single_use_discount($submission, $discount);
 
 		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
+		$this->validate_discount_amount($submission, $discount, $amount);
 
 		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+		$this->discounts['discount_code'] = $this->calculate_discount($submission, $discount);
 	}
 
 	/**
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
 	 * @param WPInv_Discount                  $discount
 	 * @return bool
 	 */
-	public function is_discount_active( $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+	public function is_discount_active($discount) {
+		return $discount->exists() && $discount->is_active() && $discount->has_started() && !$discount->is_expired();
 	}
 
 	/**
@@ -103,13 +103,13 @@  discard block
 block discarded – undo
 	 * @param string $email
 	 * @return int|string|false
 	 */
-	public function get_user_id_or_email( $email ) {
+	public function get_user_id_or_email($email) {
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return get_current_user_id();
 		}
 
-		return empty( $email ) ? false : sanitize_email( $email );
+		return empty($email) ? false : sanitize_email($email);
 	}
 
 	/**
@@ -118,23 +118,23 @@  discard block
 block discarded – undo
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @param WPInv_Discount                  $discount
 	 */
-	public function validate_single_use_discount( $submission, $discount ) {
+	public function validate_single_use_discount($submission, $discount) {
 
 		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
+		if (!$discount->is_single_use()) {
 			return;
 		}
 
 		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
+		$user = $this->get_user_id_or_email($submission->get_billing_email());
 
-		if ( empty( $user ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+		if (empty($user)) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('You need to either log in or enter your billing email before applying this discount', 'invoicing'));
 		}
 
 		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You have already used this discount', 'invoicing' ) );
+		if (!$discount->is_valid_for_user($user)) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('You have already used this discount', 'invoicing'));
 		}
 
 	}
@@ -146,18 +146,18 @@  discard block
 block discarded – undo
 	 * @param WPInv_Discount         $discount
 	 * @param float                  $amount
 	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
+	public function validate_discount_amount($submission, $discount, $amount) {
 
 		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+		if (!$discount->is_minimum_amount_met($amount)) {
+			$min = wpinv_price($discount->get_minimum_total(), $submission->get_currency());
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf(__('The minimum total for using this discount is %s', 'invoicing'), $min));
 		}
 
 		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+		if (!$discount->is_maximum_amount_met($amount)) {
+			$max = wpinv_price($discount->get_maximum_total(), $submission->get_currency());
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf(__('The maximum total for using this discount is %s', 'invoicing'), $max));
 		}
 
 	}
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
 	 * @param WPInv_Discount                  $discount
 	 * @return array
 	 */
-	public function calculate_discount( $submission, $discount ) {
-		return getpaid_calculate_invoice_discount( $submission, $discount );
+	public function calculate_discount($submission, $discount) {
+		return getpaid_calculate_invoice_discount($submission, $discount);
 	}
 
 }

Please login to merge, or discard this patch.

includes/payments/class-getpaid-payment-form-submission-fees.php 2 patches

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

@@ -12,113 +12,113 @@
 block discarded – undo
  */
 class GetPaid_Payment_Form_Submission_Fees {
 
-	/**
-	 * The fee validation error.
-	 * @var string
-	 */
-	public $fee_error;
-
-	/**
-	 * Submission fees.
-	 * @var array
-	 */
-	public $fees = array();
+    /**
+     * The fee validation error.
+     * @var string
+     */
+    public $fee_error;
+
+    /**
+     * Submission fees.
+     * @var array
+     */
+    public $fees = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
-			$this->fees = $submission->get_invoice()->get_fees();
-		}
-
-		// Process price fields.
-		$data         = $submission->get_data();
-		$payment_form = $submission->get_payment_form();
-
-		foreach ( $payment_form->get_elements() as $element ) {
-
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
-			}
-
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
-			}
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Process any existing invoice fees.
+        if ( $submission->has_invoice() ) {
+            $this->fees = $submission->get_invoice()->get_fees();
+        }
+
+        // Process price fields.
+        $data         = $submission->get_data();
+        $payment_form = $submission->get_payment_form();
+
+        foreach ( $payment_form->get_elements() as $element ) {
+
+            if ( 'price_input' == $element['type'] ) {
+                $this->process_price_input( $element, $data, $submission );
+            }
+
+            if ( 'price_select' == $element['type'] ) {
+                $this->process_price_select( $element, $data );
+            }
 }
 
-	}
-
-	/**
-	 * Process a price input field.
-	 *
-	 * @param array $element
-	 * @param array $data
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_price_input( $element, $data, $submission ) {
-
-		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
-			return;
-		}
-
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
-
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
-		}
-
-		$this->fees[ $element['label'] ] = array(
-			'name'          => $element['label'],
-			'initial_fee'   => $amount,
-			'recurring_fee' => 0,
-		);
-
-	}
-
-	/**
-	 * Process a price select field.
-	 *
-	 * @param array $element
-	 * @param array $data
-	 */
-	public function process_price_select( $element, $data ) {
-
-		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
-			return;
-		}
-
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
-		$total      = 0;
-		$sub_labels = array();
-
-		foreach ( $selected as $price ) {
-
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
-			}
-
-			$price = explode( '|', $price );
-
-			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
-		}
-
-		$this->fees[ $element['label'] ] = array(
-			'name'          => $element['label'],
-			'initial_fee'   => $total,
-			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
-		);
-
-	}
+    }
+
+    /**
+     * Process a price input field.
+     *
+     * @param array $element
+     * @param array $data
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_price_input( $element, $data, $submission ) {
+
+        // Abort if not passed.
+        if ( empty( $data[ $element['id'] ] ) ) {
+            return;
+        }
+
+        $amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
+        $minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+
+        if ( $amount < $minimum ) {
+            throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+        }
+
+        $this->fees[ $element['label'] ] = array(
+            'name'          => $element['label'],
+            'initial_fee'   => $amount,
+            'recurring_fee' => 0,
+        );
+
+    }
+
+    /**
+     * Process a price select field.
+     *
+     * @param array $element
+     * @param array $data
+     */
+    public function process_price_select( $element, $data ) {
+
+        // Abort if not passed.
+        if ( empty( $data[ $element['id'] ] ) ) {
+            return;
+        }
+
+        $options    = getpaid_convert_price_string_to_options( $element['options'] );
+        $selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+        $total      = 0;
+        $sub_labels = array();
+
+        foreach ( $selected as $price ) {
+
+            if ( ! isset( $options[ $price ] ) ) {
+                throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+            }
+
+            $price = explode( '|', $price );
+
+            $sub_labels[] = $price[0];
+            $total += (float) wpinv_sanitize_amount( $price[1] );
+        }
+
+        $this->fees[ $element['label'] ] = array(
+            'name'          => $element['label'],
+            'initial_fee'   => $total,
+            'recurring_fee' => 0,
+            'description'   => implode( ', ', $sub_labels ),
+        );
+
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission fees class
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->fees = $submission->get_invoice()->get_fees();
 		}
 
@@ -40,14 +40,14 @@  discard block
 block discarded – undo
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
 
-		foreach ( $payment_form->get_elements() as $element ) {
+		foreach ($payment_form->get_elements() as $element) {
 
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
+			if ('price_input' == $element['type']) {
+				$this->process_price_input($element, $data, $submission);
 			}
 
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
+			if ('price_select' == $element['type']) {
+				$this->process_price_select($element, $data);
 			}
 }
 
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
 	 * @param array $data
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_price_input( $element, $data, $submission ) {
+	public function process_price_input($element, $data, $submission) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+		$amount  = (float) wpinv_sanitize_amount($data[$element['id']]);
+		$minimum = empty($element['minimum']) ? 0 : (float) wpinv_sanitize_amount($element['minimum']);
 
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+		if ($amount < $minimum) {
+			throw new Exception(sprintf(__('The minimum allowed amount is %s', 'invoicing'), getpaid_unstandardize_amount($minimum, $submission->get_currency())));
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $amount,
 			'recurring_fee' => 0,
@@ -88,35 +88,35 @@  discard block
 block discarded – undo
 	 * @param array $element
 	 * @param array $data
 	 */
-	public function process_price_select( $element, $data ) {
+	public function process_price_select($element, $data) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+		$options    = getpaid_convert_price_string_to_options($element['options']);
+		$selected   = array_filter(array_map('trim', explode(',', $data[$element['id']])));
 		$total      = 0;
 		$sub_labels = array();
 
-		foreach ( $selected as $price ) {
+		foreach ($selected as $price) {
 
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+			if (!isset($options[$price])) {
+				throw new Exception(__('You have selected an invalid amount', 'invoicing'));
 			}
 
-			$price = explode( '|', $price );
+			$price = explode('|', $price);
 
 			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
+			$total += (float) wpinv_sanitize_amount($price[1]);
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $total,
 			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
+			'description'   => implode(', ', $sub_labels),
 		);
 
 	}

Please login to merge, or discard this patch.

includes/payments/class-getpaid-payment-form-submission-refresh-prices.php 2 patches

Indentation +252 added lines, -252 removed lines patch added patch discarded remove patch

@@ -12,290 +12,290 @@
 block discarded – undo
  */
 class GetPaid_Payment_Form_Submission_Refresh_Prices {
 
-	/**
-	 * Contains the response for refreshing prices.
-	 * @var array
-	 */
-	public $response = array();
+    /**
+     * Contains the response for refreshing prices.
+     * @var array
+     */
+    public $response = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		$this->response = array(
-			'submission_id'                    => $submission->id,
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        $this->response = array(
+            'submission_id'                    => $submission->id,
             'has_recurring'                    => $submission->has_recurring,
-			'has_subscription_group'           => $submission->has_subscription_group(),
-			'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
+            'has_subscription_group'           => $submission->has_subscription_group(),
+            'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
             'is_free'                          => ! $submission->should_collect_payment_details(),
-		);
-
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-		$this->add_data( $submission );
-
-	}
-
-	/**
-	 * Adds totals to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_totals( $submission ) {
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-
-				'totals'      => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
-				),
-
-				'recurring'   => array(
-					'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'     => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'      => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'    => $submission->format_amount( $submission->get_recurring_total() ),
-				),
-
-				'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
-				'currency'    => $submission->get_currency(),
-
-			)
-		);
-
-	}
-
-	/**
-	 * Adds texts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_texts( $submission ) {
-
-		$payable = $submission->format_amount( $submission->get_total() );
-		$groups  = getpaid_get_subscription_groups( $submission );
-
-		if ( $submission->has_recurring && 2 > count( $groups ) ) {
-
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-			$main_item = reset( $groups );
-
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
-				$payable = "$payable / $period";
-			} elseif ( $main_item ) {
-
-				$main_item = reset( $main_item );
-
-				// Calculate the next renewal date.
-				$_period      = $main_item->get_recurring_period( true );
-				$_interval    = $main_item->get_recurring_interval();
-
-				// If the subscription item has a trial period...
-				if ( $main_item->has_free_trial() ) {
-					$_period   = $main_item->get_trial_period( true );
-					$_interval = $main_item->get_trial_interval();
-				}
-
-				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
-					$period
-				);
-
-				$payable .= sprintf(
-					'<small class="text-muted form-text">%s</small>',
-					sprintf(
-						__( 'First renewal on %s', 'invoicing' ),
-						getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
-					)
-				);
-
-			} else {
-				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
-					$period
-				);
-			}
-}
+        );
 
-		$texts = array(
-			'.getpaid-checkout-total-payable' => $payable,
-		);
+        $this->add_totals( $submission );
+        $this->add_texts( $submission );
+        $this->add_items( $submission );
+        $this->add_fees( $submission );
+        $this->add_discounts( $submission );
+        $this->add_taxes( $submission );
+        $this->add_gateways( $submission );
+        $this->add_data( $submission );
 
-		foreach ( $submission->get_items() as $item ) {
-			$item_id                                               = $item->get_id();
-			$initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
-			$recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
-			$texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
-			$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+    }
+
+    /**
+     * Adds totals to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_totals( $submission ) {
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+
+                'totals'      => array(
+                    'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
+                    'discount'  => $submission->format_amount( $submission->get_discount() ),
+                    'fees'      => $submission->format_amount( $submission->get_fee() ),
+                    'tax'       => $submission->format_amount( $submission->get_tax() ),
+                    'total'     => $submission->format_amount( $submission->get_total() ),
+                    'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+                ),
+
+                'recurring'   => array(
+                    'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
+                    'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
+                    'fees'     => $submission->format_amount( $submission->get_recurring_fee() ),
+                    'tax'      => $submission->format_amount( $submission->get_recurring_tax() ),
+                    'total'    => $submission->format_amount( $submission->get_recurring_total() ),
+                ),
+
+                'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
+                'currency'    => $submission->get_currency(),
+
+            )
+        );
+
+    }
 
-			if ( $item->get_quantity() == 1 ) {
-				$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
-			}
+    /**
+     * Adds texts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_texts( $submission ) {
+
+        $payable = $submission->format_amount( $submission->get_total() );
+        $groups  = getpaid_get_subscription_groups( $submission );
+
+        if ( $submission->has_recurring && 2 > count( $groups ) ) {
+
+            $recurring = new WPInv_Item( $submission->has_recurring );
+            $period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
+            $main_item = reset( $groups );
+
+            if ( $submission->get_total() == $submission->get_recurring_total() ) {
+                $payable = "$payable / $period";
+            } elseif ( $main_item ) {
+
+                $main_item = reset( $main_item );
+
+                // Calculate the next renewal date.
+                $_period      = $main_item->get_recurring_period( true );
+                $_interval    = $main_item->get_recurring_interval();
+
+                // If the subscription item has a trial period...
+                if ( $main_item->has_free_trial() ) {
+                    $_period   = $main_item->get_trial_period( true );
+                    $_interval = $main_item->get_trial_interval();
+                }
+
+                $payable = sprintf(
+                    __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
+                    $submission->format_amount( $submission->get_total() ),
+                    $submission->format_amount( $submission->get_recurring_total() ),
+                    $period
+                );
+
+                $payable .= sprintf(
+                    '<small class="text-muted form-text">%s</small>',
+                    sprintf(
+                        __( 'First renewal on %s', 'invoicing' ),
+                        getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
+                    )
+                );
+
+            } else {
+                $payable = sprintf(
+                    __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
+                    $submission->format_amount( $submission->get_total() ),
+                    $submission->format_amount( $submission->get_recurring_total() ),
+                    $period
+                );
+            }
 }
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+        $texts = array(
+            '.getpaid-checkout-total-payable' => $payable,
+        );
 
-	}
+        foreach ( $submission->get_items() as $item ) {
+            $item_id                                               = $item->get_id();
+            $initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
+            $recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
+            $texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
+            $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+
+            if ( $item->get_quantity() == 1 ) {
+                $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
+            }
+}
 
-	/**
-	 * Adds items to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_items( $submission ) {
+        $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
 
-		// Add items.
-		$items = array();
+    }
+
+    /**
+     * Adds items to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_items( $submission ) {
+
+        // Add items.
+        $items = array();
 
         foreach ( $submission->get_items() as $item ) {
-			$item_id           = $item->get_id();
-			$items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
-		}
+            $item_id           = $item->get_id();
+            $items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'items' => $items )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'items' => $items )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds fees to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_fees( $submission ) {
+    /**
+     * Adds fees to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_fees( $submission ) {
 
-		$fees = array();
+        $fees = array();
 
         foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
-		}
+            $fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'fees' => $fees )
-		);
+        $this->response = array_merge(
+            $this->response,
+            array( 'fees' => $fees )
+        );
 
-	}
+    }
 
-	/**
-	 * Adds discounts to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_discounts( $submission ) {
+    /**
+     * Adds discounts to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_discounts( $submission ) {
 
-		$discounts = array();
+        $discounts = array();
 
         foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
-		}
-
-		$this->response = array_merge(
-			$this->response,
-			array( 'discounts' => $discounts )
-		);
+            $discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
+        }
 
-	}
+        $this->response = array_merge(
+            $this->response,
+            array( 'discounts' => $discounts )
+        );
 
-	/**
-	 * Adds taxes to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_taxes( $submission ) {
+    }
 
-		$taxes  = array();
-		$markup = '';
+    /**
+     * Adds taxes to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_taxes( $submission ) {
+
+        $taxes  = array();
+        $markup = '';
         foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
-			$taxes[ $name ]  = $amount;
-			$markup       .= "<small class='form-text'>$name : $amount</small>";
-		}
-
-		if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
-			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
-		}
-
-		$this->response = array_merge(
-			$this->response,
-			array( 'taxes' => $taxes )
-		);
-
-	}
-
-	/**
-	 * Adds gateways to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_gateways( $submission ) {
-
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-
-		if ( $this->response['has_recurring'] ) {
-
-			foreach ( $gateways as $i => $gateway ) {
-
-				if (
-					! getpaid_payment_gateway_supports( $gateway, 'subscription' )
-					|| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
-					|| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
-					unset( $gateways[ $i ] );
-				}
+            $name          = sanitize_text_field( $name );
+            $amount        = $submission->format_amount( $data['initial_tax'] );
+            $taxes[ $name ]  = $amount;
+            $markup       .= "<small class='form-text'>$name : $amount</small>";
+        }
+
+        if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
+            $this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
+        }
+
+        $this->response = array_merge(
+            $this->response,
+            array( 'taxes' => $taxes )
+        );
+
+    }
+
+    /**
+     * Adds gateways to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_gateways( $submission ) {
+
+        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+
+        if ( $this->response['has_recurring'] ) {
+
+            foreach ( $gateways as $i => $gateway ) {
+
+                if (
+                    ! getpaid_payment_gateway_supports( $gateway, 'subscription' )
+                    || ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
+                    || ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
+                    unset( $gateways[ $i ] );
+                }
 }
 }
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
-		$this->response = array_merge(
-			$this->response,
-			array( 'gateways' => $gateways )
-		);
-
-	}
-
-	/**
-	 * Adds data to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_data( $submission ) {
-
-		$this->response = array_merge(
-			$this->response,
-			array(
-				'js_data' => apply_filters(
-					'getpaid_submission_js_data',
-					array(
-						'is_recurring' => $this->response['has_recurring'],
-					),
-					$submission
-				),
-			)
-		);
-
-	}
+        $gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+        $this->response = array_merge(
+            $this->response,
+            array( 'gateways' => $gateways )
+        );
+
+    }
+
+    /**
+     * Adds data to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_data( $submission ) {
+
+        $this->response = array_merge(
+            $this->response,
+            array(
+                'js_data' => apply_filters(
+                    'getpaid_submission_js_data',
+                    array(
+                        'is_recurring' => $this->response['has_recurring'],
+                    ),
+                    $submission
+                ),
+            )
+        );
+
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +84 added lines, -84 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,24 +23,24 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$this->response = array(
 			'submission_id'                    => $submission->id,
             'has_recurring'                    => $submission->has_recurring,
 			'has_subscription_group'           => $submission->has_subscription_group(),
 			'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
-            'is_free'                          => ! $submission->should_collect_payment_details(),
+            'is_free'                          => !$submission->should_collect_payment_details(),
 		);
 
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-		$this->add_data( $submission );
+		$this->add_totals($submission);
+		$this->add_texts($submission);
+		$this->add_items($submission);
+		$this->add_fees($submission);
+		$this->add_discounts($submission);
+		$this->add_taxes($submission);
+		$this->add_gateways($submission);
+		$this->add_data($submission);
 
 	}
 
@@ -49,30 +49,30 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_totals( $submission ) {
+	public function add_totals($submission) {
 
 		$this->response = array_merge(
 			$this->response,
 			array(
 
 				'totals'      => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+					'subtotal'  => $submission->format_amount($submission->get_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_discount()),
+					'fees'      => $submission->format_amount($submission->get_fee()),
+					'tax'       => $submission->format_amount($submission->get_tax()),
+					'total'     => $submission->format_amount($submission->get_total()),
+					'raw_total' => html_entity_decode(sanitize_text_field($submission->format_amount($submission->get_total())), ENT_QUOTES),
 				),
 
 				'recurring'   => array(
-					'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'     => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'      => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'    => $submission->format_amount( $submission->get_recurring_total() ),
+					'subtotal' => $submission->format_amount($submission->get_recurring_subtotal()),
+					'discount' => $submission->format_amount($submission->get_recurring_discount()),
+					'fees'     => $submission->format_amount($submission->get_recurring_fee()),
+					'tax'      => $submission->format_amount($submission->get_recurring_tax()),
+					'total'    => $submission->format_amount($submission->get_recurring_total()),
 				),
 
-				'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
+				'initial_amt' => wpinv_round_amount($submission->get_total(), null, true),
 				'currency'    => $submission->get_currency(),
 
 			)
@@ -85,53 +85,53 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
-		$groups  = getpaid_get_subscription_groups( $submission );
+		$payable = $submission->format_amount($submission->get_total());
+		$groups  = getpaid_get_subscription_groups($submission);
 
-		if ( $submission->has_recurring && 2 > count( $groups ) ) {
+		if ($submission->has_recurring && 2 > count($groups)) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-			$main_item = reset( $groups );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
+			$main_item = reset($groups);
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
-			} elseif ( $main_item ) {
+			} elseif ($main_item) {
 
-				$main_item = reset( $main_item );
+				$main_item = reset($main_item);
 
 				// Calculate the next renewal date.
-				$_period      = $main_item->get_recurring_period( true );
+				$_period      = $main_item->get_recurring_period(true);
 				$_interval    = $main_item->get_recurring_interval();
 
 				// If the subscription item has a trial period...
-				if ( $main_item->has_free_trial() ) {
-					$_period   = $main_item->get_trial_period( true );
+				if ($main_item->has_free_trial()) {
+					$_period   = $main_item->get_trial_period(true);
 					$_interval = $main_item->get_trial_interval();
 				}
 
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 
 				$payable .= sprintf(
 					'<small class="text-muted form-text">%s</small>',
 					sprintf(
-						__( 'First renewal on %s', 'invoicing' ),
-						getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
+						__('First renewal on %s', 'invoicing'),
+						getpaid_format_date(date('Y-m-d H:i:s', strtotime("+$_interval $_period", current_time('timestamp'))))
 					)
 				);
 
 			} else {
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 			}
@@ -141,19 +141,19 @@  discard block
 block discarded – undo
 			'.getpaid-checkout-total-payable' => $payable,
 		);
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 			$item_id                                               = $item->get_id();
-			$initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
-			$recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
-			$texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
-			$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+			$initial_price                                         = $submission->format_amount($item->get_sub_total() - $item->item_discount);
+			$recurring_price                                       = $submission->format_amount($item->get_recurring_sub_total() - $item->recurring_item_discount);
+			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text($item, $submission->get_currency(), $initial_price, $recurring_price);
+			$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = sprintf(__('Subtotal: %s', 'invoicing'), $submission->format_amount($item->get_sub_total()));
 
-			if ( $item->get_quantity() == 1 ) {
-				$texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
+			if ($item->get_quantity() == 1) {
+				$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = '';
 			}
 }
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -162,19 +162,19 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_items( $submission ) {
+	public function add_items($submission) {
 
 		// Add items.
 		$items = array();
 
-        foreach ( $submission->get_items() as $item ) {
-			$item_id           = $item->get_id();
-			$items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
+        foreach ($submission->get_items() as $item) {
+			$item_id = $item->get_id();
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'items' => $items )
+			array('items' => $items)
 		);
 
 	}
@@ -184,17 +184,17 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_fees( $submission ) {
+	public function add_fees($submission) {
 
 		$fees = array();
 
-        foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
+        foreach ($submission->get_fees() as $name => $data) {
+			$fees[$name] = $submission->format_amount($data['initial_fee']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'fees' => $fees )
+			array('fees' => $fees)
 		);
 
 	}
@@ -204,17 +204,17 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_discounts( $submission ) {
+	public function add_discounts($submission) {
 
 		$discounts = array();
 
-        foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
+        foreach ($submission->get_discounts() as $name => $data) {
+			$discounts[$name] = $submission->format_amount($data['initial_discount']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'discounts' => $discounts )
+			array('discounts' => $discounts)
 		);
 
 	}
@@ -224,24 +224,24 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_taxes( $submission ) {
+	public function add_taxes($submission) {
 
 		$taxes  = array();
 		$markup = '';
-        foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
-			$taxes[ $name ]  = $amount;
+        foreach ($submission->get_taxes() as $name => $data) {
+			$name          = sanitize_text_field($name);
+			$amount        = $submission->format_amount($data['initial_tax']);
+			$taxes[$name] = $amount;
 			$markup       .= "<small class='form-text'>$name : $amount</small>";
 		}
 
-		if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
+		if (wpinv_display_individual_tax_rates() && !empty($taxes)) {
 			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}
@@ -251,27 +251,27 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_gateways( $submission ) {
+	public function add_gateways($submission) {
 
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+		$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
-		if ( $this->response['has_recurring'] ) {
+		if ($this->response['has_recurring']) {
 
-			foreach ( $gateways as $i => $gateway ) {
+			foreach ($gateways as $i => $gateway) {
 
 				if (
-					! getpaid_payment_gateway_supports( $gateway, 'subscription' )
-					|| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
-					|| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
-					unset( $gateways[ $i ] );
+					!getpaid_payment_gateway_supports($gateway, 'subscription')
+					|| ($this->response['has_subscription_group'] && !getpaid_payment_gateway_supports($gateway, 'single_subscription_group'))
+					|| ($this->response['has_multiple_subscription_groups'] && !getpaid_payment_gateway_supports($gateway, 'multiple_subscription_groups')) ) {
+					unset($gateways[$i]);
 				}
 }
 }
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+		$gateways = apply_filters('getpaid_submission_gateways', $gateways, $submission);
 		$this->response = array_merge(
 			$this->response,
-			array( 'gateways' => $gateways )
+			array('gateways' => $gateways)
 		);
 
 	}
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,

Please login to merge, or discard this patch.

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

Indentation +206 added lines, -206 removed lines patch added patch discarded remove patch

@@ -12,227 +12,227 @@
 block discarded – undo
  */
 class GetPaid_Payment_Form_Submission_Taxes {
 
-	/**
-	 * Submission taxes.
-	 * @var array
-	 */
-	public $taxes = array();
-
-	/**
-	 * Whether or not we should skip the taxes.
-	 * @var bool
-	 */
-	protected $skip_taxes = false;
+    /**
+     * Submission taxes.
+     * @var array
+     */
+    public $taxes = array();
+
+    /**
+     * Whether or not we should skip the taxes.
+     * @var bool
+     */
+    protected $skip_taxes = false;
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Validate VAT number.
+        $this->validate_vat( $submission );
+
+        if ( $this->skip_taxes ) {
+            return;
+        }
+
+        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( getpaid_get_taxable_amount( $item, false ), $rates );
+        $r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+
+        foreach ( $taxes as $name => $amount ) {
+            $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
+            $tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+
+            $item->item_tax += wpinv_sanitize_amount( $tax['initial_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'];
+
+        }
+
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Validate VAT number.
-		$this->validate_vat( $submission );
-
-		if ( $this->skip_taxes ) {
-			return;
-		}
-
-		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( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
-
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
-
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_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'];
-
-		}
-
-	}
-
-	/**
-	 * 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;
-			}
+     * 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 static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
-	}
-
-	/**
-	 * Checks if this is an eu country.
-	 *
-	 * @param string $country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
-	}
-
-	/**
-	 * Checks if this is an eu purchase.
-	 *
-	 * @param string $customer_country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
-	}
-
-	/**
-	 * 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 ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
-		}
-
-		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 false;
+    }
+
+    /**
+     * Checks if this is an eu store.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_store() {
+        return self::is_eu_country( wpinv_get_default_country() );
+    }
+
+    /**
+     * Checks if this is an eu country.
+     *
+     * @param string $country
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_country( $country ) {
+        return getpaid_is_eu_state( $country );
+    }
+
+    /**
+     * Checks if this is an eu purchase.
+     *
+     * @param string $customer_country
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_transaction( $customer_country ) {
+        return self::is_eu_country( $customer_country ) && self::is_eu_store();
+    }
+
+    /**
+     * 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 ( ! is_null( $vat_number ) ) {
+            return wpinv_clean( $vat_number );
+        }
+
+        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 );
 
-		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
-			return;
-		}
+        // Maybe abort early for initial fetches.
+        if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+            return;
+        }
 
-		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+        // If 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 GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( '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 GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
 
-		}
+        }
 
-		if ( empty( $vat_number ) ) {
-			return;
-		}
+        if ( empty( $vat_number ) ) {
+            return;
+        }
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
-		}
+        if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
+            throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
+        }
 
-		if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
-			return;
-		}
+        if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+            return;
+        }
 
-		$this->skip_taxes = true;
-	}
+        $this->skip_taxes = true;
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +53 added lines, -53 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -29,22 +29,22 @@  discard block
 block discarded – undo
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		if ( $this->skip_taxes ) {
+		if ($this->skip_taxes) {
 			return;
 		}
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+		if ($submission->has_invoice()) {
+			$this->taxes = array_replace($submission->get_invoice()->get_taxes(), $this->taxes);
 		}
 
 	}
@@ -56,26 +56,26 @@  discard block
 block discarded – undo
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+		$rates    = getpaid_get_item_tax_rates($item, $submission->country, $submission->state);
+		$rates    = getpaid_filter_item_tax_rates($item, $rates);
+		$taxes    = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, false), $rates);
+		$r_taxes  = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, true), $rates);
 
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+		foreach ($taxes as $name => $amount) {
+			$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+			$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
 
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
+			$item->item_tax += wpinv_sanitize_amount($tax['initial_tax']);
 
-			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'];
 
 		}
 
@@ -88,11 +88,11 @@  discard block
 block discarded – undo
 	 * @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;
 			}
 }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
+		return self::is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
+	public static function is_eu_country($country) {
+		return getpaid_is_eu_state($country);
 	}
 
 	/**
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
+	public static function is_eu_transaction($customer_country) {
+		return self::is_eu_country($customer_country) && self::is_eu_store();
 	}
 
 	/**
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number', 'billing');
+		if (!is_null($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
 	 * @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.
@@ -177,10 +177,10 @@  discard block
 block discarded – undo
 	 * @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;
@@ -192,43 +192,43 @@  discard block
 block discarded – undo
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$in_eu = $this->is_eu_transaction( $submission->country );
+		$in_eu = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
+		$vat_number  = $this->get_vat_number($submission);
 		$ip_country  = getpaid_get_ip_country();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+		if ($submission->is_initial_fetch() && empty($vat_number)) {
 			return;
 		}
 
 		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
+			throw new GetPaid_Payment_Exception('.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __('Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing'));
 
 		}
 
-		if ( empty( $vat_number ) ) {
+		if (empty($vat_number)) {
 			return;
 		}
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
+		if (wpinv_should_validate_vat_number() && !wpinv_validate_vat_number($vat_number, $submission->country)) {
+			throw new GetPaid_Payment_Exception('.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __('Your VAT number is invalid', 'invoicing'));
 		}
 
-		if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+		if (wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option('vat_same_country_rule', 'vat_too')) {
 			return;
 		}
 

Please login to merge, or discard this patch.

		@@ -15,31 +15,31 @@ discard block
		block discarded – undo
15	15	abstract class GetPaid_Authorize_Net_Legacy_Gateway extends GetPaid_Payment_Gateway {
16	16
17	17	/**
18		- * Class constructor.
19		- */
20		- public function __construct() {
	18	+ * Class constructor.
	19	+ */
	20	+ public function __construct() {
21	21	parent::__construct();
22	22	}
23	23
24	24	/**
25		- * Returns the API URL.
26		- *
27		- *
28		- * @param WPInv_Invoice $invoice Invoice.
29		- * @return string
30		- */
31		- public function get_api_url( $invoice ) {
	25	+ * Returns the API URL.
	26	+ *
	27	+ *
	28	+ * @param WPInv_Invoice $invoice Invoice.
	29	+ * @return string
	30	+ */
	31	+ public function get_api_url( $invoice ) {
32	32	return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
33	33	}
34	34
35	35	/**
36		- * Communicates with authorize.net
37		- *
38		- *
39		- * @param array $post Data to post.
	36	+ * Communicates with authorize.net
	37	+ *
	38	+ *
	39	+ * @param array $post Data to post.
40	40	* @param WPInv_Invoice $invoice Invoice.
41		- * @return stdClass\|WP_Error
42		- */
	41	+ * @return stdClass\|WP_Error
	42	+ */
43	43	public function post( $post, $invoice ) {
44	44
45	45	$url = $this->get_api_url( $invoice );
		@@ -89,12 +89,12 @@ discard block
		block discarded – undo
89	89	}
90	90
91	91	/**
92		- * Returns the API authentication params.
93		- *
94		- *
95		- * @return array
96		- */
97		- public function get_auth_params() {
	92	+ * Returns the API authentication params.
	93	+ *
	94	+ *
	95	+ * @return array
	96	+ */
	97	+ public function get_auth_params() {
98	98
99	99	return array(
100	100	'name' => $this->get_option( 'login_id' ),
		@@ -104,13 +104,13 @@ discard block
		block discarded – undo
104	104	}
105	105
106	106	/**
107		- * Cancels a subscription remotely
108		- *
109		- *
110		- * @param WPInv_Subscription $subscription Subscription.
	107	+ * Cancels a subscription remotely
	108	+ *
	109	+ *
	110	+ * @param WPInv_Subscription $subscription Subscription.
111	111	* @param WPInv_Invoice $invoice Invoice.
112		- */
113		- public function cancel_subscription( $subscription, $invoice ) {
	112	+ */
	113	+ public function cancel_subscription( $subscription, $invoice ) {
114	114
115	115	// Backwards compatibility. New version do not use authorize.net subscriptions.
116	116	$this->post(
		@@ -126,17 +126,17 @@ discard block
		block discarded – undo
126	126	}
127	127
128	128	/**
129		- * Processes ipns.
130		- *
131		- * @return void
132		- */
133		- public function verify_ipn() {
	129	+ * Processes ipns.
	130	+ *
	131	+ * @return void
	132	+ */
	133	+ public function verify_ipn() {
134	134
135	135	$this->maybe_process_old_ipn();
136	136
137	137	// Validate the IPN.
138	138	if ( empty( $_POST ) \|\| ! $this->validate_ipn() ) {
139		- wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
	139	+ wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
140	140	}
141	141
142	142	// Event type.
		@@ -175,24 +175,24 @@ discard block
		block discarded – undo
175	175	}
176	176
177	177	/**
178		- * Validates IPN invoices.
179		- *
	178	+ * Validates IPN invoices.
	179	+ *
180	180	* @param WPInv_Invoice $invoice
181	181	* @param object $payload
182		- * @return void
183		- */
184		- public function validate_ipn_invoice( $invoice, $payload ) {
	182	+ * @return void
	183	+ */
	184	+ public function validate_ipn_invoice( $invoice, $payload ) {
185	185	if ( ! $invoice->exists() \|\| $payload->id != $invoice->get_transaction_id() ) {
186	186	exit;
187	187	}
188	188	}
189	189
190	190	/**
191		- * Process subscriptio IPNS.
192		- *
193		- * @return void
194		- */
195		- public function maybe_process_old_ipn() {
	191	+ * Process subscriptio IPNS.
	192	+ *
	193	+ * @return void
	194	+ */
	195	+ public function maybe_process_old_ipn() {
196	196
197	197	$data = wp_kses_post_deep( wp_unslash( $_POST ) );
198	198
		@@ -234,11 +234,11 @@ discard block
		block discarded – undo
234	234	}
235	235
236	236	/**
237		- * Validates the old IPN signature.
	237	+ * Validates the old IPN signature.
238	238	*
239	239	* @param array $posted
240		- */
241		- public function validate_old_ipn_signature( $posted ) {
	240	+ */
	241	+ public function validate_old_ipn_signature( $posted ) {
242	242
243	243	$signature = $this->get_option( 'signature_key' );
244	244	if ( ! empty( $signature ) ) {
		@@ -256,9 +256,9 @@ discard block
		block discarded – undo
256	256	}
257	257
258	258	/**
259		- * Check Authorize.NET IPN validity.
260		- */
261		- public function validate_ipn() {
	259	+ * Check Authorize.NET IPN validity.
	260	+ */
	261	+ public function validate_ipn() {
262	262
263	263	wpinv_error_log( 'Validating Authorize.NET IPN response' );
264	264

		@@ -4,7 +4,7 @@ discard block
		block discarded – undo
4	4	*
5	5	*/
6	6
7		-defined( 'ABSPATH' ) \|\| exit;
	7	+defined('ABSPATH') \|\| exit;
8	8
9	9	/**
10	10	* Authorize.net Legacy Payment Gateway class.
		@@ -28,8 +28,8 @@ discard block
		block discarded – undo
28	28	* @param WPInv_Invoice $invoice Invoice.
29	29	* @return string
30	30	*/
31		- public function get_api_url( $invoice ) {
32		- return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
	31	+ public function get_api_url($invoice) {
	32	+ return $this->is_sandbox($invoice) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
33	33	}
34	34
35	35	/**
		@@ -40,48 +40,48 @@ discard block
		block discarded – undo
40	40	* @param WPInv_Invoice $invoice Invoice.
41	41	* @return stdClass\|WP_Error
42	42	*/
43		- public function post( $post, $invoice ) {
	43	+ public function post($post, $invoice) {
44	44
45		- $url = $this->get_api_url( $invoice );
	45	+ $url = $this->get_api_url($invoice);
46	46	$response = wp_remote_post(
47	47	$url,
48	48	array(
49	49	'headers' => array(
50	50	'Content-Type' => 'application/json; charset=utf-8',
51	51	),
52		- 'body' => json_encode( $post ),
	52	+ 'body' => json_encode($post),
53	53	'method' => 'POST',
54	54	)
55	55	);
56	56
57		- if ( is_wp_error( $response ) ) {
	57	+ if (is_wp_error($response)) {
58	58	return $response;
59	59	}
60	60
61		- $response = wp_unslash( wp_remote_retrieve_body( $response ) );
62		- $response = preg_replace( '/\xEF\xBB\xBF/', '', $response ); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
63		- $response = json_decode( $response );
	61	+ $response = wp_unslash(wp_remote_retrieve_body($response));
	62	+ $response = preg_replace('/\xEF\xBB\xBF/', '', $response); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
	63	+ $response = json_decode($response);
64	64
65		- if ( empty( $response ) ) {
66		- return new WP_Error( 'invalid_reponse', __( 'Invalid gateway response', 'invoicing' ) );
	65	+ if (empty($response)) {
	66	+ return new WP_Error('invalid_reponse', __('Invalid gateway response', 'invoicing'));
67	67	}
68	68
69		- if ( $response->messages->resultCode == 'Error' ) {
	69	+ if ($response->messages->resultCode == 'Error') {
70	70
71		- if ( $this->is_sandbox( $invoice ) ) {
72		- wpinv_error_log( $response );
	71	+ if ($this->is_sandbox($invoice)) {
	72	+ wpinv_error_log($response);
73	73	}
74	74
75		- if ( $response->messages->message[0]->code == 'E00039' && ! empty( $response->customerProfileId ) && ! empty( $response->customerPaymentProfileId ) ) {
76		- return new WP_Error( 'dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId );
	75	+ if ($response->messages->message[0]->code == 'E00039' && !empty($response->customerProfileId) && !empty($response->customerPaymentProfileId)) {
	76	+ return new WP_Error('dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId);
77	77	}
78	78
79		- if ( ! empty( $response->transactionResponse ) && ! empty( $response->transactionResponse->errors ) ) {
	79	+ if (!empty($response->transactionResponse) && !empty($response->transactionResponse->errors)) {
80	80	$error = $response->transactionResponse->errors[0];
81		- return new WP_Error( $error->errorCode, $error->errorText );
	81	+ return new WP_Error($error->errorCode, $error->errorText);
82	82	}
83	83
84		- return new WP_Error( $response->messages->message[0]->code, $response->messages->message[0]->text );
	84	+ return new WP_Error($response->messages->message[0]->code, $response->messages->message[0]->text);
85	85	}
86	86
87	87	return $response;
		@@ -97,8 +97,8 @@ discard block
		block discarded – undo
97	97	public function get_auth_params() {
98	98
99	99	return array(
100		- 'name' => $this->get_option( 'login_id' ),
101		- 'transactionKey' => $this->get_option( 'transaction_key' ),
	100	+ 'name' => $this->get_option('login_id'),
	101	+ 'transactionKey' => $this->get_option('transaction_key'),
102	102	);
103	103
104	104	}
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	* @param WPInv_Subscription $subscription Subscription.
111	111	* @param WPInv_Invoice $invoice Invoice.
112	112	*/
113		- public function cancel_subscription( $subscription, $invoice ) {
	113	+ public function cancel_subscription($subscription, $invoice) {
114	114
115	115	// Backwards compatibility. New version do not use authorize.net subscriptions.
116	116	$this->post(
		@@ -135,38 +135,38 @@ discard block
		block discarded – undo
135	135	$this->maybe_process_old_ipn();
136	136
137	137	// Validate the IPN.
138		- if ( empty( $_POST ) \|\| ! $this->validate_ipn() ) {
139		- wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
	138	+ if (empty($_POST) \|\| !$this->validate_ipn()) {
	139	+ wp_die('Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array('response' => 200));
140	140	}
141	141
142	142	// Event type.
143		- $posted = json_decode( file_get_contents( 'php://input' ) );
144		- if ( empty( $posted ) ) {
145		- wp_die( 'Invalid JSON', 'Authorize.NET IPN', array( 'response' => 200 ) );
	143	+ $posted = json_decode(file_get_contents('php://input'));
	144	+ if (empty($posted)) {
	145	+ wp_die('Invalid JSON', 'Authorize.NET IPN', array('response' => 200));
146	146	}
147	147
148	148	// Process the IPN.
149		- $posted = (object) wp_unslash( $posted );
	149	+ $posted = (object) wp_unslash($posted);
150	150
151	151	// Process refunds.
152		- if ( 'net.authorize.payment.refund.created' == $posted->eventType ) {
153		- $invoice = new WPInv_Invoice( $posted->payload->merchantReferenceId );
154		- $this->validate_ipn_invoice( $invoice, $posted->payload );
	152	+ if ('net.authorize.payment.refund.created' == $posted->eventType) {
	153	+ $invoice = new WPInv_Invoice($posted->payload->merchantReferenceId);
	154	+ $this->validate_ipn_invoice($invoice, $posted->payload);
155	155	$invoice->refund();
156	156	}
157	157
158	158	// Held funds approved.
159		- if ( 'net.authorize.payment.fraud.approved' == $posted->eventType ) {
160		- $invoice = new WPInv_Invoice( $posted->payload->id );
161		- $this->validate_ipn_invoice( $invoice, $posted->payload );
162		- $invoice->mark_paid( false, __( 'Payment released', 'invoicing' ) );
	159	+ if ('net.authorize.payment.fraud.approved' == $posted->eventType) {
	160	+ $invoice = new WPInv_Invoice($posted->payload->id);
	161	+ $this->validate_ipn_invoice($invoice, $posted->payload);
	162	+ $invoice->mark_paid(false, __('Payment released', 'invoicing'));
163	163	}
164	164
165	165	// Held funds declined.
166		- if ( 'net.authorize.payment.fraud.declined' == $posted->eventType ) {
167		- $invoice = new WPInv_Invoice( $posted->payload->id );
168		- $this->validate_ipn_invoice( $invoice, $posted->payload );
169		- $invoice->set_status( 'wpi-failed', __( 'Payment declined', 'invoicing' ) );
	166	+ if ('net.authorize.payment.fraud.declined' == $posted->eventType) {
	167	+ $invoice = new WPInv_Invoice($posted->payload->id);
	168	+ $this->validate_ipn_invoice($invoice, $posted->payload);
	169	+ $invoice->set_status('wpi-failed', __('Payment declined', 'invoicing'));
170	170	$invoice->save();
171	171	}
172	172
		@@ -181,8 +181,8 @@ discard block
		block discarded – undo
181	181	* @param object $payload
182	182	* @return void
183	183	*/
184		- public function validate_ipn_invoice( $invoice, $payload ) {
185		- if ( ! $invoice->exists() \|\| $payload->id != $invoice->get_transaction_id() ) {
	184	+ public function validate_ipn_invoice($invoice, $payload) {
	185	+ if (!$invoice->exists() \|\| $payload->id != $invoice->get_transaction_id()) {
186	186	exit;
187	187	}
188	188	}
		@@ -194,32 +194,32 @@ discard block
		block discarded – undo
194	194	*/
195	195	public function maybe_process_old_ipn() {
196	196
197		- $data = wp_kses_post_deep( wp_unslash( $_POST ) );
	197	+ $data = wp_kses_post_deep(wp_unslash($_POST));
198	198
199	199	// Only process subscriptions subscriptions.
200		- if ( empty( $data['x_subscription_id'] ) ) {
	200	+ if (empty($data['x_subscription_id'])) {
201	201	return;
202	202	}
203	203
204	204	// Check validity.
205		- $this->validate_old_ipn_signature( $data );
	205	+ $this->validate_old_ipn_signature($data);
206	206
207	207	// Fetch the associated subscription.
208		- $subscription_id = WPInv_Subscription::get_subscription_id_by_field( $data['x_subscription_id'] );
209		- $subscription = new WPInv_Subscription( $subscription_id );
	208	+ $subscription_id = WPInv_Subscription::get_subscription_id_by_field($data['x_subscription_id']);
	209	+ $subscription = new WPInv_Subscription($subscription_id);
210	210
211	211	// Abort if it is missing or completed.
212		- if ( ! $subscription->get_id() \|\| $subscription->has_status( 'completed' ) ) {
	212	+ if (!$subscription->get_id() \|\| $subscription->has_status('completed')) {
213	213	return;
214	214	}
215	215
216	216	// Payment status.
217		- if ( 1 == $data['x_response_code'] ) {
	217	+ if (1 == $data['x_response_code']) {
218	218
219	219	// Renew the subscription.
220	220	$subscription->add_payment(
221	221	array(
222		- 'transaction_id' => sanitize_text_field( $data['x_trans_id'] ),
	222	+ 'transaction_id' => sanitize_text_field($data['x_trans_id']),
223	223	'gateway' => $this->id,
224	224	)
225	225	);
		@@ -238,17 +238,17 @@ discard block
		block discarded – undo
238	238	*
239	239	* @param array $posted
240	240	*/
241		- public function validate_old_ipn_signature( $posted ) {
	241	+ public function validate_old_ipn_signature($posted) {
242	242
243		- $signature = $this->get_option( 'signature_key' );
244		- if ( ! empty( $signature ) ) {
245		- $login_id = $this->get_option( 'login_id' );
246		- $trans_id = wpinv_clean( $_POST['x_trans_id'] );
247		- $amount = wpinv_clean( $_POST['x_amount'] );
248		- $hash = hash_hmac( 'sha512', "^$login_id^$trans_id^$amount^", hex2bin( $signature ) );
	243	+ $signature = $this->get_option('signature_key');
	244	+ if (!empty($signature)) {
	245	+ $login_id = $this->get_option('login_id');
	246	+ $trans_id = wpinv_clean($_POST['x_trans_id']);
	247	+ $amount = wpinv_clean($_POST['x_amount']);
	248	+ $hash = hash_hmac('sha512', "^$login_id^$trans_id^$amount^", hex2bin($signature));
249	249
250		- if ( ! hash_equals( $hash, $posted['x_SHA2_Hash'] ) ) {
251		- wpinv_error_log( $posted['x_SHA2_Hash'], "Invalid signature. Expected $hash" );
	250	+ if (!hash_equals($hash, $posted['x_SHA2_Hash'])) {
	251	+ wpinv_error_log($posted['x_SHA2_Hash'], "Invalid signature. Expected $hash");
252	252	exit;
253	253	}
254	254	}
		@@ -260,28 +260,28 @@ discard block
		block discarded – undo
260	260	*/
261	261	public function validate_ipn() {
262	262
263		- wpinv_error_log( 'Validating Authorize.NET IPN response' );
	263	+ wpinv_error_log('Validating Authorize.NET IPN response');
264	264
265		- if ( empty( $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
	265	+ if (empty($_SERVER['HTTP_X_ANET_SIGNATURE'])) {
266	266	return false;
267	267	}
268	268
269		- $signature = $this->get_option( 'signature_key' );
	269	+ $signature = $this->get_option('signature_key');
270	270
271		- if ( empty( $signature ) ) {
272		- wpinv_error_log( 'Error: You have not set a signature key' );
	271	+ if (empty($signature)) {
	272	+ wpinv_error_log('Error: You have not set a signature key');
273	273	return false;
274	274	}
275	275
276		- $hash = hash_hmac( 'sha512', file_get_contents( 'php://input' ), hex2bin( $signature ) );
	276	+ $hash = hash_hmac('sha512', file_get_contents('php://input'), hex2bin($signature));
277	277
278		- if ( hash_equals( $hash, $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
279		- wpinv_error_log( 'Successfully validated the IPN' );
	278	+ if (hash_equals($hash, $_SERVER['HTTP_X_ANET_SIGNATURE'])) {
	279	+ wpinv_error_log('Successfully validated the IPN');
280	280	return true;
281	281	}
282	282
283		- wpinv_error_log( 'IPN hash is not valid' );
284		- wpinv_error_log( $_SERVER['HTTP_X_ANET_SIGNATURE'] );
	283	+ wpinv_error_log('IPN hash is not valid');
	284	+ wpinv_error_log($_SERVER['HTTP_X_ANET_SIGNATURE']);
285	285	return false;
286	286
287	287	}

		@@ -13,65 +13,65 @@ discard block
		block discarded – undo
13	13	class GetPaid_Worldpay_Gateway extends GetPaid_Payment_Gateway {
14	14
15	15	/**
16		- * Payment method id.
17		- *
18		- * @var string
19		- */
	16	+ * Payment method id.
	17	+ *
	18	+ * @var string
	19	+ */
20	20	public $id = 'worldpay';
21	21
22	22	/**
23		- * Payment method order.
24		- *
25		- * @var int
26		- */
	23	+ * Payment method order.
	24	+ *
	25	+ * @var int
	26	+ */
27	27	public $order = 5;
28	28
29	29	/**
30		- * Endpoint for requests from Worldpay.
31		- *
32		- * @var string
33		- */
34		- protected $notify_url;
35		-
36		- /**
37		- * Endpoint for requests to Worldpay.
38		- *
39		- * @var string
40		- */
	30	+ * Endpoint for requests from Worldpay.
	31	+ *
	32	+ * @var string
	33	+ */
	34	+ protected $notify_url;
	35	+
	36	+ /**
	37	+ * Endpoint for requests to Worldpay.
	38	+ *
	39	+ * @var string
	40	+ */
41	41	protected $endpoint;
42	42
43	43	/**
44		- * An array of features that this gateway supports.
45		- *
46		- * @var array
47		- */
	44	+ * An array of features that this gateway supports.
	45	+ *
	46	+ * @var array
	47	+ */
48	48	protected $supports = array( 'sandbox' );
49	49
50	50	/**
51		- * Currencies this gateway is allowed for.
52		- *
53		- * @var array
54		- */
55		- public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
	51	+ * Currencies this gateway is allowed for.
	52	+ *
	53	+ * @var array
	54	+ */
	55	+ public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
56	56
57	57	/**
58		- * URL to view a transaction.
59		- *
60		- * @var string
61		- */
	58	+ * URL to view a transaction.
	59	+ *
	60	+ * @var string
	61	+ */
62	62	public $view_transaction_url = 'https://www.{sandbox}paypal.com/activity/payment/%s';
63	63
64	64	/**
65		- * URL to view a subscription.
66		- *
67		- * @var string
68		- */
69		- public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
	65	+ * URL to view a subscription.
	66	+ *
	67	+ * @var string
	68	+ */
	69	+ public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
70	70
71	71	/**
72		- * Class constructor.
73		- */
74		- public function __construct() {
	72	+ * Class constructor.
	73	+ */
	74	+ public function __construct() {
75	75
76	76	$this->method_title = __( 'Worldpay', 'invoicing' );
77	77	$this->title = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
		@@ -85,15 +85,15 @@ discard block
		block discarded – undo
85	85	}
86	86
87	87	/**
88		- * Process Payment.
89		- *
90		- *
91		- * @param WPInv_Invoice $invoice Invoice.
92		- * @param array $submission_data Posted checkout fields.
93		- * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
94		- * @return array
95		- */
96		- public function process_payment( $invoice, $submission_data, $submission ) {
	88	+ * Process Payment.
	89	+ *
	90	+ *
	91	+ * @param WPInv_Invoice $invoice Invoice.
	92	+ * @param array $submission_data Posted checkout fields.
	93	+ * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
	94	+ * @return array
	95	+ */
	96	+ public function process_payment( $invoice, $submission_data, $submission ) {
97	97
98	98	// Get redirect url.
99	99	$worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
		@@ -128,31 +128,31 @@ discard block
		block discarded – undo
128	128	}
129	129
130	130	/**
131		- * Get the Worldpay request URL for an invoice.
132		- *
133		- * @param WPInv_Invoice $invoice Invoice object.
134		- * @return string
135		- */
136		- public function get_request_url( $invoice ) {
	131	+ * Get the Worldpay request URL for an invoice.
	132	+ *
	133	+ * @param WPInv_Invoice $invoice Invoice object.
	134	+ * @return string
	135	+ */
	136	+ public function get_request_url( $invoice ) {
137	137
138	138	// Endpoint for this request
139		- $this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
	139	+ $this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
140	140
141	141	return $this->endpoint;
142	142
143		- }
	143	+ }
144	144
145	145	/**
146		- * Get Worldpay Args for passing to Worldpay.
147		- *
148		- * @param WPInv_Invoice $invoice Invoice object.
149		- * @return array
150		- */
151		- protected function get_worldpay_args( $invoice ) {
152		-
153		- return apply_filters(
154		- 'getpaid_worldpay_args',
155		- array(
	146	+ * Get Worldpay Args for passing to Worldpay.
	147	+ *
	148	+ * @param WPInv_Invoice $invoice Invoice object.
	149	+ * @return array
	150	+ */
	151	+ protected function get_worldpay_args( $invoice ) {
	152	+
	153	+ return apply_filters(
	154	+ 'getpaid_worldpay_args',
	155	+ array(
156	156	'amount' => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
157	157	'cartId' => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
158	158	'currency' => wpinv_clean( $invoice->get_currency() ), // mandatory
		@@ -177,18 +177,18 @@ discard block
		block discarded – undo
177	177	'countryString' => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
178	178	'compName' => wpinv_clean( $invoice->get_company() ),
179	179	),
180		- $invoice
181		- );
	180	+ $invoice
	181	+ );
182	182
183	183	}
184	184
185	185	/**
186		- * Secures worldpay args with an md5 hash.
187		- *
188		- * @param array $args Gateway args.
189		- * @return array
190		- */
191		- public function hash_args( $args ) {
	186	+ * Secures worldpay args with an md5 hash.
	187	+ *
	188	+ * @param array $args Gateway args.
	189	+ * @return array
	190	+ */
	191	+ public function hash_args( $args ) {
192	192
193	193	$md5_secret = $this->get_option( 'md5_secret' );
194	194
		@@ -204,16 +204,16 @@ discard block
		block discarded – undo
204	204	}
205	205
206	206	/**
207		- * Processes ipns and marks payments as complete.
208		- *
209		- * @return void
210		- */
211		- public function verify_ipn() {
	207	+ * Processes ipns and marks payments as complete.
	208	+ *
	209	+ * @return void
	210	+ */
	211	+ public function verify_ipn() {
212	212
213	213	// Validate the IPN.
214	214	if ( empty( $_POST ) \|\| ! $this->validate_ipn() ) {
215		- wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
216		- }
	215	+ wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
	216	+ }
217	217
218	218	// Process the IPN.
219	219	$posted = wp_kses_post_deep( wp_unslash( $_POST ) );
		@@ -229,8 +229,8 @@ discard block
		block discarded – undo
229	229	$invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
230	230	}
231	231
232		- // Update the ip address.
233		- if ( ! empty( $posted['ipAddress'] ) ) {
	232	+ // Update the ip address.
	233	+ if ( ! empty( $posted['ipAddress'] ) ) {
234	234	$invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
235	235	}
236	236
		@@ -257,9 +257,9 @@ discard block
		block discarded – undo
257	257	}
258	258
259	259	/**
260		- * Check Worldpay IPN validity.
261		- */
262		- public function validate_ipn() {
	260	+ * Check Worldpay IPN validity.
	261	+ */
	262	+ public function validate_ipn() {
263	263
264	264	wpinv_error_log( 'Validating Worldpay IPN response' );
265	265
		@@ -305,11 +305,11 @@ discard block
		block discarded – undo
305	305	}
306	306
307	307	/**
308		- * Filters the gateway settings.
309		- *
310		- * @param array $admin_settings
311		- */
312		- public function admin_settings( $admin_settings ) {
	308	+ * Filters the gateway settings.
	309	+ *
	310	+ * @param array $admin_settings
	311	+ */
	312	+ public function admin_settings( $admin_settings ) {
313	313
314	314	$currencies = sprintf(
315	315	__( 'Supported Currencies: %s', 'invoicing' ),
		@@ -350,7 +350,7 @@ discard block
		block discarded – undo
350	350	'readonly' => true,
351	351	);
352	352
353		- return $admin_settings;
354		- }
	353	+ return $admin_settings;
	354	+ }
355	355
356	356	}

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2	if ( ! defined( 'ABSPATH' ) ) {
3		- exit;
	3	+ exit;
4	4	}
5	5
6	6	/**
		@@ -10,67 +10,67 @@ discard block
		block discarded – undo
10	10	class GetPaid_Form_Item extends WPInv_Item {
11	11
12	12	/**
13		- * Stores a custom description for the item.
14		- *
15		- * @var string
16		- */
17		- protected $custom_description = null;
18		-
19		- /**
20		- * Stores the item quantity.
21		- *
22		- * @var float
23		- */
24		- protected $quantity = 1;
25		-
26		- /**
27		- * Stores the item meta.
28		- *
29		- * @var array
30		- */
31		- protected $meta = array();
32		-
33		- /**
34		- * Is this item required?
35		- *
36		- * @var int
37		- */
38		- protected $is_required = true;
39		-
40		- /**
41		- * Are quantities allowed?
42		- *
43		- * @var int
44		- */
45		- protected $allow_quantities = false;
46		-
47		- /**
48		- * Associated invoice.
49		- *
50		- * @var int
51		- */
52		- public $invoice_id = 0;
53		-
54		- /**
55		- * Item discount.
56		- *
57		- * @var float
58		- */
59		- public $item_discount = 0;
60		-
61		- /**
62		- * Recurring item discount.
63		- *
64		- * @var float
65		- */
66		- public $recurring_item_discount = 0;
67		-
68		- /**
69		- * Item tax.
70		- *
71		- * @var float
72		- */
73		- public $item_tax = 0;
	13	+ * Stores a custom description for the item.
	14	+ *
	15	+ * @var string
	16	+ */
	17	+ protected $custom_description = null;
	18	+
	19	+ /**
	20	+ * Stores the item quantity.
	21	+ *
	22	+ * @var float
	23	+ */
	24	+ protected $quantity = 1;
	25	+
	26	+ /**
	27	+ * Stores the item meta.
	28	+ *
	29	+ * @var array
	30	+ */
	31	+ protected $meta = array();
	32	+
	33	+ /**
	34	+ * Is this item required?
	35	+ *
	36	+ * @var int
	37	+ */
	38	+ protected $is_required = true;
	39	+
	40	+ /**
	41	+ * Are quantities allowed?
	42	+ *
	43	+ * @var int
	44	+ */
	45	+ protected $allow_quantities = false;
	46	+
	47	+ /**
	48	+ * Associated invoice.
	49	+ *
	50	+ * @var int
	51	+ */
	52	+ public $invoice_id = 0;
	53	+
	54	+ /**
	55	+ * Item discount.
	56	+ *
	57	+ * @var float
	58	+ */
	59	+ public $item_discount = 0;
	60	+
	61	+ /**
	62	+ * Recurring item discount.
	63	+ *
	64	+ * @var float
	65	+ */
	66	+ public $recurring_item_discount = 0;
	67	+
	68	+ /**
	69	+ * Item tax.
	70	+ *
	71	+ * @var float
	72	+ */
	73	+ public $item_tax = 0;
74	74
75	75	/*
76	76	\|--------------------------------------------------------------------------
		@@ -88,230 +88,230 @@ discard block
		block discarded – undo
88	88	*/
89	89
90	90	/**
91		- * Get the item name.
92		- *
93		- * @since 1.0.19
94		- * @param string $context View or edit context.
95		- * @return string
96		- */
97		- public function get_name( $context = 'view' ) {
98		- $name = parent::get_name( $context );
99		- return $name . wpinv_get_item_suffix( $this );
100		- }
101		-
102		- /**
103		- * Get the item name without a suffix.
104		- *
105		- * @since 1.0.19
106		- * @param string $context View or edit context.
107		- * @return string
108		- */
109		- public function get_raw_name( $context = 'view' ) {
110		- return parent::get_name( $context );
111		- }
112		-
113		- /**
114		- * Get the item description.
115		- *
116		- * @since 1.0.19
117		- * @param string $context View or edit context.
118		- * @return string
119		- */
120		- public function get_description( $context = 'view' ) {
121		-
122		- if ( isset( $this->custom_description ) ) {
123		- return $this->custom_description;
124		- }
125		-
126		- return parent::get_description( $context );
127		- }
128		-
129		- /**
130		- * Returns the sub total.
131		- *
132		- * @since 1.0.19
133		- * @param string $context View or edit context.
134		- * @return float
135		- */
136		- public function get_sub_total( $context = 'view' ) {
137		- return $this->get_quantity( $context ) * $this->get_initial_price( $context );
138		- }
139		-
140		- /**
141		- * Returns the recurring sub total.
142		- *
143		- * @since 1.0.19
144		- * @param string $context View or edit context.
145		- * @return float
146		- */
147		- public function get_recurring_sub_total( $context = 'view' ) {
148		-
149		- if ( $this->is_recurring() ) {
150		- return $this->get_quantity( $context ) * $this->get_price( $context );
151		- }
152		-
153		- return 0;
154		- }
155		-
156		- /**
157		- * @deprecated
158		- */
159		- public function get_qantity( $context = 'view' ) {
160		- return $this->get_quantity( $context );
161		- }
162		-
163		- /**
164		- * Get the item quantity.
165		- *
166		- * @since 1.0.19
167		- * @param string $context View or edit context.
168		- * @return float
169		- */
170		- public function get_quantity( $context = 'view' ) {
171		- $quantity = (float) $this->quantity;
172		-
173		- if ( 'view' == $context ) {
174		- return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
175		- }
176		-
177		- return $quantity;
178		-
179		- }
180		-
181		- /**
182		- * Get the item meta data.
183		- *
184		- * @since 1.0.19
185		- * @param string $context View or edit context.
186		- * @return meta
187		- */
188		- public function get_item_meta( $context = 'view' ) {
189		- $meta = $this->meta;
190		-
191		- if ( 'view' == $context ) {
192		- return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
193		- }
194		-
195		- return $meta;
196		-
197		- }
198		-
199		- /**
200		- * Returns whether or not customers can update the item quantity.
201		- *
202		- * @since 1.0.19
203		- * @param string $context View or edit context.
204		- * @return bool
205		- */
206		- public function get_allow_quantities( $context = 'view' ) {
207		- $allow_quantities = (bool) $this->allow_quantities;
208		-
209		- if ( 'view' == $context ) {
210		- return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
211		- }
212		-
213		- return $allow_quantities;
214		-
215		- }
216		-
217		- /**
218		- * Returns whether or not the item is required.
219		- *
220		- * @since 1.0.19
221		- * @param string $context View or edit context.
222		- * @return bool
223		- */
224		- public function get_is_required( $context = 'view' ) {
225		- $is_required = (bool) $this->is_required;
226		-
227		- if ( 'view' == $context ) {
228		- return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
229		- }
230		-
231		- return $is_required;
232		-
233		- }
234		-
235		- /**
236		- * Prepares form data for use.
237		- *
238		- * @since 1.0.19
239		- * @return array
240		- */
241		- public function prepare_data_for_use( $required = null ) {
242		-
243		- $required = is_null( $required ) ? $this->is_required() : $required;
244		- return array(
245		- 'title' => strip_tags( $this->get_name() ),
246		- 'id' => $this->get_id(),
247		- 'price' => $this->get_price(),
248		- 'recurring' => $this->is_recurring(),
249		- 'description' => $this->get_description(),
250		- 'allow_quantities' => $this->allows_quantities(),
251		- 'required' => $required,
252		- );
253		-
254		- }
255		-
256		- /**
257		- * Prepares form data for ajax use.
258		- *
259		- * @since 1.0.19
260		- * @return array
261		- */
262		- public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
263		-
264		- $description = getpaid_item_recurring_price_help_text( $this, $currency );
265		-
266		- if ( $description ) {
267		- $description = "<div class='getpaid-subscription-help-text'>$description</div>";
268		- }
269		-
270		- $price = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
271		- $subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
272		- return array(
273		- 'id' => $this->get_id(),
274		- 'texts' => array(
275		- 'item-name' => sanitize_text_field( $this->get_name() ),
276		- 'item-description' => wp_kses_post( $this->get_description() ) . $description,
277		- 'item-quantity' => floatval( $this->get_quantity() ),
278		- 'item-price' => wpinv_price( $price, $currency ),
279		- 'item-total' => wpinv_price( $subtotal, $currency ),
280		- ),
281		- 'inputs' => array(
282		- 'item-id' => $this->get_id(),
283		- 'item-name' => sanitize_text_field( $this->get_name() ),
284		- 'item-description' => wp_kses_post( $this->get_description() ),
285		- 'item-quantity' => floatval( $this->get_quantity() ),
286		- 'item-price' => $price,
287		- ),
288		- );
289		-
290		- }
291		-
292		- /**
293		- * Prepares form data for saving (cart_details).
294		- *
295		- * @since 1.0.19
296		- * @return array
297		- */
298		- public function prepare_data_for_saving() {
299		-
300		- return array(
301		- 'post_id' => $this->invoice_id,
302		- 'item_id' => $this->get_id(),
303		- 'item_name' => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
304		- 'item_description' => $this->get_description( 'edit' ),
305		- 'tax' => $this->item_tax,
306		- 'item_price' => $this->get_price( 'edit' ),
307		- 'quantity' => (float) $this->get_quantity( 'edit' ),
308		- 'discount' => $this->item_discount,
309		- 'subtotal' => $this->get_sub_total( 'edit' ),
310		- 'price' => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
311		- 'meta' => $this->get_item_meta( 'edit' ),
312		- );
313		-
314		- }
	91	+ * Get the item name.
	92	+ *
	93	+ * @since 1.0.19
	94	+ * @param string $context View or edit context.
	95	+ * @return string
	96	+ */
	97	+ public function get_name( $context = 'view' ) {
	98	+ $name = parent::get_name( $context );
	99	+ return $name . wpinv_get_item_suffix( $this );
	100	+ }
	101	+
	102	+ /**
	103	+ * Get the item name without a suffix.
	104	+ *
	105	+ * @since 1.0.19
	106	+ * @param string $context View or edit context.
	107	+ * @return string
	108	+ */
	109	+ public function get_raw_name( $context = 'view' ) {
	110	+ return parent::get_name( $context );
	111	+ }
	112	+
	113	+ /**
	114	+ * Get the item description.
	115	+ *
	116	+ * @since 1.0.19
	117	+ * @param string $context View or edit context.
	118	+ * @return string
	119	+ */
	120	+ public function get_description( $context = 'view' ) {
	121	+
	122	+ if ( isset( $this->custom_description ) ) {
	123	+ return $this->custom_description;
	124	+ }
	125	+
	126	+ return parent::get_description( $context );
	127	+ }
	128	+
	129	+ /**
	130	+ * Returns the sub total.
	131	+ *
	132	+ * @since 1.0.19
	133	+ * @param string $context View or edit context.
	134	+ * @return float
	135	+ */
	136	+ public function get_sub_total( $context = 'view' ) {
	137	+ return $this->get_quantity( $context ) * $this->get_initial_price( $context );
	138	+ }
	139	+
	140	+ /**
	141	+ * Returns the recurring sub total.
	142	+ *
	143	+ * @since 1.0.19
	144	+ * @param string $context View or edit context.
	145	+ * @return float
	146	+ */
	147	+ public function get_recurring_sub_total( $context = 'view' ) {
	148	+
	149	+ if ( $this->is_recurring() ) {
	150	+ return $this->get_quantity( $context ) * $this->get_price( $context );
	151	+ }
	152	+
	153	+ return 0;
	154	+ }
	155	+
	156	+ /**
	157	+ * @deprecated
	158	+ */
	159	+ public function get_qantity( $context = 'view' ) {
	160	+ return $this->get_quantity( $context );
	161	+ }
	162	+
	163	+ /**
	164	+ * Get the item quantity.
	165	+ *
	166	+ * @since 1.0.19
	167	+ * @param string $context View or edit context.
	168	+ * @return float
	169	+ */
	170	+ public function get_quantity( $context = 'view' ) {
	171	+ $quantity = (float) $this->quantity;
	172	+
	173	+ if ( 'view' == $context ) {
	174	+ return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
	175	+ }
	176	+
	177	+ return $quantity;
	178	+
	179	+ }
	180	+
	181	+ /**
	182	+ * Get the item meta data.
	183	+ *
	184	+ * @since 1.0.19
	185	+ * @param string $context View or edit context.
	186	+ * @return meta
	187	+ */
	188	+ public function get_item_meta( $context = 'view' ) {
	189	+ $meta = $this->meta;
	190	+
	191	+ if ( 'view' == $context ) {
	192	+ return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
	193	+ }
	194	+
	195	+ return $meta;
	196	+
	197	+ }
	198	+
	199	+ /**
	200	+ * Returns whether or not customers can update the item quantity.
	201	+ *
	202	+ * @since 1.0.19
	203	+ * @param string $context View or edit context.
	204	+ * @return bool
	205	+ */
	206	+ public function get_allow_quantities( $context = 'view' ) {
	207	+ $allow_quantities = (bool) $this->allow_quantities;
	208	+
	209	+ if ( 'view' == $context ) {
	210	+ return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
	211	+ }
	212	+
	213	+ return $allow_quantities;
	214	+
	215	+ }
	216	+
	217	+ /**
	218	+ * Returns whether or not the item is required.
	219	+ *
	220	+ * @since 1.0.19
	221	+ * @param string $context View or edit context.
	222	+ * @return bool
	223	+ */
	224	+ public function get_is_required( $context = 'view' ) {
	225	+ $is_required = (bool) $this->is_required;
	226	+
	227	+ if ( 'view' == $context ) {
	228	+ return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
	229	+ }
	230	+
	231	+ return $is_required;
	232	+
	233	+ }
	234	+
	235	+ /**
	236	+ * Prepares form data for use.
	237	+ *
	238	+ * @since 1.0.19
	239	+ * @return array
	240	+ */
	241	+ public function prepare_data_for_use( $required = null ) {
	242	+
	243	+ $required = is_null( $required ) ? $this->is_required() : $required;
	244	+ return array(
	245	+ 'title' => strip_tags( $this->get_name() ),
	246	+ 'id' => $this->get_id(),
	247	+ 'price' => $this->get_price(),
	248	+ 'recurring' => $this->is_recurring(),
	249	+ 'description' => $this->get_description(),
	250	+ 'allow_quantities' => $this->allows_quantities(),
	251	+ 'required' => $required,
	252	+ );
	253	+
	254	+ }
	255	+
	256	+ /**
	257	+ * Prepares form data for ajax use.
	258	+ *
	259	+ * @since 1.0.19
	260	+ * @return array
	261	+ */
	262	+ public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
	263	+
	264	+ $description = getpaid_item_recurring_price_help_text( $this, $currency );
	265	+
	266	+ if ( $description ) {
	267	+ $description = "<div class='getpaid-subscription-help-text'>$description</div>";
	268	+ }
	269	+
	270	+ $price = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
	271	+ $subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
	272	+ return array(
	273	+ 'id' => $this->get_id(),
	274	+ 'texts' => array(
	275	+ 'item-name' => sanitize_text_field( $this->get_name() ),
	276	+ 'item-description' => wp_kses_post( $this->get_description() ) . $description,
	277	+ 'item-quantity' => floatval( $this->get_quantity() ),
	278	+ 'item-price' => wpinv_price( $price, $currency ),
	279	+ 'item-total' => wpinv_price( $subtotal, $currency ),
	280	+ ),
	281	+ 'inputs' => array(
	282	+ 'item-id' => $this->get_id(),
	283	+ 'item-name' => sanitize_text_field( $this->get_name() ),
	284	+ 'item-description' => wp_kses_post( $this->get_description() ),
	285	+ 'item-quantity' => floatval( $this->get_quantity() ),
	286	+ 'item-price' => $price,
	287	+ ),
	288	+ );
	289	+
	290	+ }
	291	+
	292	+ /**
	293	+ * Prepares form data for saving (cart_details).
	294	+ *
	295	+ * @since 1.0.19
	296	+ * @return array
	297	+ */
	298	+ public function prepare_data_for_saving() {
	299	+
	300	+ return array(
	301	+ 'post_id' => $this->invoice_id,
	302	+ 'item_id' => $this->get_id(),
	303	+ 'item_name' => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
	304	+ 'item_description' => $this->get_description( 'edit' ),
	305	+ 'tax' => $this->item_tax,
	306	+ 'item_price' => $this->get_price( 'edit' ),
	307	+ 'quantity' => (float) $this->get_quantity( 'edit' ),
	308	+ 'discount' => $this->item_discount,
	309	+ 'subtotal' => $this->get_sub_total( 'edit' ),
	310	+ 'price' => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
	311	+ 'meta' => $this->get_item_meta( 'edit' ),
	312	+ );
	313	+
	314	+ }
315	315
316	316	/*
317	317	\|--------------------------------------------------------------------------
		@@ -323,70 +323,70 @@ discard block
		block discarded – undo
323	323	\| object.
324	324	*/
325	325
326		- /**
327		- * Set the item qantity.
328		- *
329		- * @since 1.0.19
330		- * @param float $quantity The item quantity.
331		- */
332		- public function set_quantity( $quantity ) {
333		-
334		- if ( ! is_numeric( $quantity ) ) {
335		- $quantity = 1;
336		- }
337		-
338		- $this->quantity = (float) $quantity;
339		-
340		- }
341		-
342		- /**
343		- * Set the item meta data.
344		- *
345		- * @since 1.0.19
346		- * @param array $meta The item meta data.
347		- */
348		- public function set_item_meta( $meta ) {
349		- $this->meta = maybe_unserialize( $meta );
350		- }
351		-
352		- /**
353		- * Set whether or not the quantities are allowed.
354		- *
355		- * @since 1.0.19
356		- * @param bool $allow_quantities
357		- */
358		- public function set_allow_quantities( $allow_quantities ) {
359		- $this->allow_quantities = (bool) $allow_quantities;
360		- }
361		-
362		- /**
363		- * Set whether or not the item is required.
364		- *
365		- * @since 1.0.19
366		- * @param bool $is_required
367		- */
368		- public function set_is_required( $is_required ) {
369		- $this->is_required = (bool) $is_required;
370		- }
371		-
372		- /**
373		- * Sets the custom item description.
374		- *
375		- * @since 1.0.19
376		- * @param string $description
377		- */
378		- public function set_custom_description( $description ) {
379		- $this->custom_description = $description;
380		- }
	326	+ /**
	327	+ * Set the item qantity.
	328	+ *
	329	+ * @since 1.0.19
	330	+ * @param float $quantity The item quantity.
	331	+ */
	332	+ public function set_quantity( $quantity ) {
	333	+
	334	+ if ( ! is_numeric( $quantity ) ) {
	335	+ $quantity = 1;
	336	+ }
	337	+
	338	+ $this->quantity = (float) $quantity;
	339	+
	340	+ }
	341	+
	342	+ /**
	343	+ * Set the item meta data.
	344	+ *
	345	+ * @since 1.0.19
	346	+ * @param array $meta The item meta data.
	347	+ */
	348	+ public function set_item_meta( $meta ) {
	349	+ $this->meta = maybe_unserialize( $meta );
	350	+ }
	351	+
	352	+ /**
	353	+ * Set whether or not the quantities are allowed.
	354	+ *
	355	+ * @since 1.0.19
	356	+ * @param bool $allow_quantities
	357	+ */
	358	+ public function set_allow_quantities( $allow_quantities ) {
	359	+ $this->allow_quantities = (bool) $allow_quantities;
	360	+ }
	361	+
	362	+ /**
	363	+ * Set whether or not the item is required.
	364	+ *
	365	+ * @since 1.0.19
	366	+ * @param bool $is_required
	367	+ */
	368	+ public function set_is_required( $is_required ) {
	369	+ $this->is_required = (bool) $is_required;
	370	+ }
	371	+
	372	+ /**
	373	+ * Sets the custom item description.
	374	+ *
	375	+ * @since 1.0.19
	376	+ * @param string $description
	377	+ */
	378	+ public function set_custom_description( $description ) {
	379	+ $this->custom_description = $description;
	380	+ }
381	381
382	382	/**
383	383	* We do not want to save items to the database.
384	384	*
385		- * @return int item id
	385	+ * @return int item id
386	386	*/
387	387	public function save( $data = array() ) {
388	388	return $this->get_id();
389		- }
	389	+ }
390	390
391	391	/*
392	392	\|--------------------------------------------------------------------------
		@@ -398,23 +398,23 @@ discard block
		block discarded – undo
398	398	*/
399	399
400	400	/**
401		- * Checks whether the item has enabled dynamic pricing.
402		- *
403		- * @since 1.0.19
404		- * @return bool
405		- */
406		- public function is_required() {
	401	+ * Checks whether the item has enabled dynamic pricing.
	402	+ *
	403	+ * @since 1.0.19
	404	+ * @return bool
	405	+ */
	406	+ public function is_required() {
407	407	return (bool) $this->get_is_required();
408		- }
409		-
410		- /**
411		- * Checks whether users can edit the quantities.
412		- *
413		- * @since 1.0.19
414		- * @return bool
415		- */
416		- public function allows_quantities() {
	408	+ }
	409	+
	410	+ /**
	411	+ * Checks whether users can edit the quantities.
	412	+ *
	413	+ * @since 1.0.19
	414	+ * @return bool
	415	+ */
	416	+ public function allows_quantities() {
417	417	return (bool) $this->get_allow_quantities();
418		- }
	418	+ }
419	419
420	420	}

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) {
	2	+if (!defined('ABSPATH')) {
3	3	exit;
4	4	}
5	5
		@@ -94,9 +94,9 @@ discard block
		block discarded – undo
94	94	* @param string $context View or edit context.
95	95	* @return string
96	96	*/
97		- public function get_name( $context = 'view' ) {
98		- $name = parent::get_name( $context );
99		- return $name . wpinv_get_item_suffix( $this );
	97	+ public function get_name($context = 'view') {
	98	+ $name = parent::get_name($context);
	99	+ return $name . wpinv_get_item_suffix($this);
100	100	}
101	101
102	102	/**
		@@ -106,8 +106,8 @@ discard block
		block discarded – undo
106	106	* @param string $context View or edit context.
107	107	* @return string
108	108	*/
109		- public function get_raw_name( $context = 'view' ) {
110		- return parent::get_name( $context );
	109	+ public function get_raw_name($context = 'view') {
	110	+ return parent::get_name($context);
111	111	}
112	112
113	113	/**
		@@ -117,13 +117,13 @@ discard block
		block discarded – undo
117	117	* @param string $context View or edit context.
118	118	* @return string
119	119	*/
120		- public function get_description( $context = 'view' ) {
	120	+ public function get_description($context = 'view') {
121	121
122		- if ( isset( $this->custom_description ) ) {
	122	+ if (isset($this->custom_description)) {
123	123	return $this->custom_description;
124	124	}
125	125
126		- return parent::get_description( $context );
	126	+ return parent::get_description($context);
127	127	}
128	128
129	129	/**
		@@ -133,8 +133,8 @@ discard block
		block discarded – undo
133	133	* @param string $context View or edit context.
134	134	* @return float
135	135	*/
136		- public function get_sub_total( $context = 'view' ) {
137		- return $this->get_quantity( $context ) * $this->get_initial_price( $context );
	136	+ public function get_sub_total($context = 'view') {
	137	+ return $this->get_quantity($context) * $this->get_initial_price($context);
138	138	}
139	139
140	140	/**
		@@ -144,10 +144,10 @@ discard block
		block discarded – undo
144	144	* @param string $context View or edit context.
145	145	* @return float
146	146	*/
147		- public function get_recurring_sub_total( $context = 'view' ) {
	147	+ public function get_recurring_sub_total($context = 'view') {
148	148
149		- if ( $this->is_recurring() ) {
150		- return $this->get_quantity( $context ) * $this->get_price( $context );
	149	+ if ($this->is_recurring()) {
	150	+ return $this->get_quantity($context) * $this->get_price($context);
151	151	}
152	152
153	153	return 0;
		@@ -156,8 +156,8 @@ discard block
		block discarded – undo
156	156	/**
157	157	* @deprecated
158	158	*/
159		- public function get_qantity( $context = 'view' ) {
160		- return $this->get_quantity( $context );
	159	+ public function get_qantity($context = 'view') {
	160	+ return $this->get_quantity($context);
161	161	}
162	162
163	163	/**
		@@ -167,11 +167,11 @@ discard block
		block discarded – undo
167	167	* @param string $context View or edit context.
168	168	* @return float
169	169	*/
170		- public function get_quantity( $context = 'view' ) {
	170	+ public function get_quantity($context = 'view') {
171	171	$quantity = (float) $this->quantity;
172	172
173		- if ( 'view' == $context ) {
174		- return apply_filters( 'getpaid_payment_form_item_quantity', $quantity, $this );
	173	+ if ('view' == $context) {
	174	+ return apply_filters('getpaid_payment_form_item_quantity', $quantity, $this);
175	175	}
176	176
177	177	return $quantity;
		@@ -185,11 +185,11 @@ discard block
		block discarded – undo
185	185	* @param string $context View or edit context.
186	186	* @return meta
187	187	*/
188		- public function get_item_meta( $context = 'view' ) {
	188	+ public function get_item_meta($context = 'view') {
189	189	$meta = $this->meta;
190	190
191		- if ( 'view' == $context ) {
192		- return apply_filters( 'getpaid_payment_form_item_meta', $meta, $this );
	191	+ if ('view' == $context) {
	192	+ return apply_filters('getpaid_payment_form_item_meta', $meta, $this);
193	193	}
194	194
195	195	return $meta;
		@@ -203,11 +203,11 @@ discard block
		block discarded – undo
203	203	* @param string $context View or edit context.
204	204	* @return bool
205	205	*/
206		- public function get_allow_quantities( $context = 'view' ) {
	206	+ public function get_allow_quantities($context = 'view') {
207	207	$allow_quantities = (bool) $this->allow_quantities;
208	208
209		- if ( 'view' == $context ) {
210		- return apply_filters( 'getpaid_payment_form_item_allow_quantities', $allow_quantities, $this );
	209	+ if ('view' == $context) {
	210	+ return apply_filters('getpaid_payment_form_item_allow_quantities', $allow_quantities, $this);
211	211	}
212	212
213	213	return $allow_quantities;
		@@ -221,11 +221,11 @@ discard block
		block discarded – undo
221	221	* @param string $context View or edit context.
222	222	* @return bool
223	223	*/
224		- public function get_is_required( $context = 'view' ) {
	224	+ public function get_is_required($context = 'view') {
225	225	$is_required = (bool) $this->is_required;
226	226
227		- if ( 'view' == $context ) {
228		- return apply_filters( 'getpaid_payment_form_item_is_required', $is_required, $this );
	227	+ if ('view' == $context) {
	228	+ return apply_filters('getpaid_payment_form_item_is_required', $is_required, $this);
229	229	}
230	230
231	231	return $is_required;
		@@ -238,11 +238,11 @@ discard block
		block discarded – undo
238	238	* @since 1.0.19
239	239	* @return array
240	240	*/
241		- public function prepare_data_for_use( $required = null ) {
	241	+ public function prepare_data_for_use($required = null) {
242	242
243		- $required = is_null( $required ) ? $this->is_required() : $required;
	243	+ $required = is_null($required) ? $this->is_required() : $required;
244	244	return array(
245		- 'title' => strip_tags( $this->get_name() ),
	245	+ 'title' => strip_tags($this->get_name()),
246	246	'id' => $this->get_id(),
247	247	'price' => $this->get_price(),
248	248	'recurring' => $this->is_recurring(),
		@@ -259,30 +259,30 @@ discard block
		block discarded – undo
259	259	* @since 1.0.19
260	260	* @return array
261	261	*/
262		- public function prepare_data_for_invoice_edit_ajax( $currency = '', $is_renewal = false ) {
	262	+ public function prepare_data_for_invoice_edit_ajax($currency = '', $is_renewal = false) {
263	263
264		- $description = getpaid_item_recurring_price_help_text( $this, $currency );
	264	+ $description = getpaid_item_recurring_price_help_text($this, $currency);
265	265
266		- if ( $description ) {
	266	+ if ($description) {
267	267	$description = "<div class='getpaid-subscription-help-text'>$description</div>";
268	268	}
269	269
270		- $price = ! $is_renewal ? $this->get_price() : $this->get_recurring_price();
271		- $subtotal = ! $is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
	270	+ $price = !$is_renewal ? $this->get_price() : $this->get_recurring_price();
	271	+ $subtotal = !$is_renewal ? $this->get_sub_total() : $this->get_recurring_sub_total();
272	272	return array(
273	273	'id' => $this->get_id(),
274	274	'texts' => array(
275		- 'item-name' => sanitize_text_field( $this->get_name() ),
276		- 'item-description' => wp_kses_post( $this->get_description() ) . $description,
277		- 'item-quantity' => floatval( $this->get_quantity() ),
278		- 'item-price' => wpinv_price( $price, $currency ),
279		- 'item-total' => wpinv_price( $subtotal, $currency ),
	275	+ 'item-name' => sanitize_text_field($this->get_name()),
	276	+ 'item-description' => wp_kses_post($this->get_description()) . $description,
	277	+ 'item-quantity' => floatval($this->get_quantity()),
	278	+ 'item-price' => wpinv_price($price, $currency),
	279	+ 'item-total' => wpinv_price($subtotal, $currency),
280	280	),
281	281	'inputs' => array(
282	282	'item-id' => $this->get_id(),
283		- 'item-name' => sanitize_text_field( $this->get_name() ),
284		- 'item-description' => wp_kses_post( $this->get_description() ),
285		- 'item-quantity' => floatval( $this->get_quantity() ),
	283	+ 'item-name' => sanitize_text_field($this->get_name()),
	284	+ 'item-description' => wp_kses_post($this->get_description()),
	285	+ 'item-quantity' => floatval($this->get_quantity()),
286	286	'item-price' => $price,
287	287	),
288	288	);
		@@ -300,15 +300,15 @@ discard block
		block discarded – undo
300	300	return array(
301	301	'post_id' => $this->invoice_id,
302	302	'item_id' => $this->get_id(),
303		- 'item_name' => sanitize_text_field( $this->get_raw_name( 'edit' ) ),
304		- 'item_description' => $this->get_description( 'edit' ),
	303	+ 'item_name' => sanitize_text_field($this->get_raw_name('edit')),
	304	+ 'item_description' => $this->get_description('edit'),
305	305	'tax' => $this->item_tax,
306		- 'item_price' => $this->get_price( 'edit' ),
307		- 'quantity' => (float) $this->get_quantity( 'edit' ),
	306	+ 'item_price' => $this->get_price('edit'),
	307	+ 'quantity' => (float) $this->get_quantity('edit'),
308	308	'discount' => $this->item_discount,
309		- 'subtotal' => $this->get_sub_total( 'edit' ),
310		- 'price' => $this->get_sub_total( 'edit' ) + $this->item_tax - $this->item_discount,
311		- 'meta' => $this->get_item_meta( 'edit' ),
	309	+ 'subtotal' => $this->get_sub_total('edit'),
	310	+ 'price' => $this->get_sub_total('edit') + $this->item_tax - $this->item_discount,
	311	+ 'meta' => $this->get_item_meta('edit'),
312	312	);
313	313
314	314	}
		@@ -329,9 +329,9 @@ discard block
		block discarded – undo
329	329	* @since 1.0.19
330	330	* @param float $quantity The item quantity.
331	331	*/
332		- public function set_quantity( $quantity ) {
	332	+ public function set_quantity($quantity) {
333	333
334		- if ( ! is_numeric( $quantity ) ) {
	334	+ if (!is_numeric($quantity)) {
335	335	$quantity = 1;
336	336	}
337	337
		@@ -345,8 +345,8 @@ discard block
		block discarded – undo
345	345	* @since 1.0.19
346	346	* @param array $meta The item meta data.
347	347	*/
348		- public function set_item_meta( $meta ) {
349		- $this->meta = maybe_unserialize( $meta );
	348	+ public function set_item_meta($meta) {
	349	+ $this->meta = maybe_unserialize($meta);
350	350	}
351	351
352	352	/**
		@@ -355,7 +355,7 @@ discard block
		block discarded – undo
355	355	* @since 1.0.19
356	356	* @param bool $allow_quantities
357	357	*/
358		- public function set_allow_quantities( $allow_quantities ) {
	358	+ public function set_allow_quantities($allow_quantities) {
359	359	$this->allow_quantities = (bool) $allow_quantities;
360	360	}
361	361
		@@ -365,7 +365,7 @@ discard block
		block discarded – undo
365	365	* @since 1.0.19
366	366	* @param bool $is_required
367	367	*/
368		- public function set_is_required( $is_required ) {
	368	+ public function set_is_required($is_required) {
369	369	$this->is_required = (bool) $is_required;
370	370	}
371	371
		@@ -375,7 +375,7 @@ discard block
		block discarded – undo
375	375	* @since 1.0.19
376	376	* @param string $description
377	377	*/
378		- public function set_custom_description( $description ) {
	378	+ public function set_custom_description($description) {
379	379	$this->custom_description = $description;
380	380	}
381	381
		@@ -384,7 +384,7 @@ discard block
		block discarded – undo
384	384	*
385	385	* @return int item id
386	386	*/
387		- public function save( $data = array() ) {
	387	+ public function save($data = array()) {
388	388	return $this->get_id();
389	389	}
390	390

		@@ -12,167 +12,167 @@
		block discarded – undo
12	12	*/
13	13	class GetPaid_Payment_Form_Submission_Discount {
14	14
15		- /**
16		- * Submission discounts.
17		- * @var array
18		- */
19		- public $discounts = array();
	15	+ /**
	16	+ * Submission discounts.
	17	+ * @var array
	18	+ */
	19	+ public $discounts = array();
	20	+
	21	+ /**
	22	+ * Class constructor
	23	+ *
	24	+ * @param GetPaid_Payment_Form_Submission $submission
	25	+ * @param float $initial_total
	26	+ * @param float $recurring_total
	27	+ */
	28	+ public function __construct( $submission, $initial_total, $recurring_total ) {
	29	+
	30	+ // Process any existing invoice discounts.
	31	+ if ( $submission->has_invoice() ) {
	32	+ $this->discounts = $submission->get_invoice()->get_discounts();
	33	+ }
	34	+
	35	+ // Do we have a discount?
	36	+ $discount = $submission->get_field( 'discount' );
	37	+
	38	+ if ( empty( $discount ) ) {
	39	+
	40	+ if ( isset( $this->discounts['discount_code'] ) ) {
	41	+ unset( $this->discounts['discount_code'] );
	42	+ }
	43	+
	44	+ return;
	45	+ }
	46	+
	47	+ // Processes the discount code.
	48	+ $amount = max( $initial_total, $recurring_total );
	49	+ $this->process_discount( $submission, $discount, $amount );
	50	+
	51	+ }
20	52
21	53	/**
22		- * Class constructor
23		- *
24		- * @param GetPaid_Payment_Form_Submission $submission
25		- * @param float $initial_total
26		- * @param float $recurring_total
27		- */
28		- public function __construct( $submission, $initial_total, $recurring_total ) {
29		-
30		- // Process any existing invoice discounts.
31		- if ( $submission->has_invoice() ) {
32		- $this->discounts = $submission->get_invoice()->get_discounts();
33		- }
34		-
35		- // Do we have a discount?
36		- $discount = $submission->get_field( 'discount' );
37		-
38		- if ( empty( $discount ) ) {
39		-
40		- if ( isset( $this->discounts['discount_code'] ) ) {
41		- unset( $this->discounts['discount_code'] );
42		- }
43		-
44		- return;
45		- }
46		-
47		- // Processes the discount code.
48		- $amount = max( $initial_total, $recurring_total );
49		- $this->process_discount( $submission, $discount, $amount );
50		-
51		- }
52		-
53		- /**
54		- * Processes a submission discount.
55		- *
56		- * @param GetPaid_Payment_Form_Submission $submission
57		- * @param string $discount
58		- * @param float $amount
59		- */
60		- public function process_discount( $submission, $discount, $amount ) {
61		-
62		- // Fetch the discount.
63		- $discount = new WPInv_Discount( $discount );
64		-
65		- // Ensure it is active.
	54	+ * Processes a submission discount.
	55	+ *
	56	+ * @param GetPaid_Payment_Form_Submission $submission
	57	+ * @param string $discount
	58	+ * @param float $amount
	59	+ */
	60	+ public function process_discount( $submission, $discount, $amount ) {
	61	+
	62	+ // Fetch the discount.
	63	+ $discount = new WPInv_Discount( $discount );
	64	+
	65	+ // Ensure it is active.
66	66	if ( ! $this->is_discount_active( $discount ) ) {
67		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'Invalid or expired discount code', 'invoicing' ) );
68		- }
69		-
70		- // Required items.
71		- if ( ! $discount->is_required_items_met( array_keys( $submission->get_items() ) ) ) {
72		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You are not allowed to use this discount code.', 'invoicing' ) );
73		- }
74		-
75		- // Exceeded limit.
76		- if ( $discount->has_exceeded_limit() ) {
77		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'This discount code has been used up', 'invoicing' ) );
78		- }
79		-
80		- // Validate usages.
81		- $this->validate_single_use_discount( $submission, $discount );
82		-
83		- // Validate amount.
84		- $this->validate_discount_amount( $submission, $discount, $amount );
85		-
86		- // Save the discount.
87		- $this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
88		- }
89		-
90		- /**
91		- * Validates a single use discount.
92		- *
93		- * @param WPInv_Discount $discount
94		- * @return bool
95		- */
96		- public function is_discount_active( $discount ) {
97		- return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
98		- }
99		-
100		- /**
101		- * Returns a user's id or email.
102		- *
103		- * @param string $email
104		- * @return int\|string\|false
105		- */
106		- public function get_user_id_or_email( $email ) {
107		-
108		- if ( is_user_logged_in() ) {
109		- return get_current_user_id();
110		- }
111		-
112		- return empty( $email ) ? false : sanitize_email( $email );
113		- }
114		-
115		- /**
116		- * Validates a single use discount.
117		- *
118		- * @param GetPaid_Payment_Form_Submission $submission
119		- * @param WPInv_Discount $discount
120		- */
121		- public function validate_single_use_discount( $submission, $discount ) {
122		-
123		- // Abort if it is not a single use discount.
124		- if ( ! $discount->is_single_use() ) {
125		- return;
126		- }
127		-
128		- // Ensure there is a valid billing email.
129		- $user = $this->get_user_id_or_email( $submission->get_billing_email() );
130		-
131		- if ( empty( $user ) ) {
132		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
133		- }
134		-
135		- // Has the user used this discount code before?
136		- if ( ! $discount->is_valid_for_user( $user ) ) {
137		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You have already used this discount', 'invoicing' ) );
138		- }
139		-
140		- }
141		-
142		- /**
143		- * Validates the discount's amount.
144		- *
145		- * @param GetPaid_Payment_Form_Submission $submission
146		- * @param WPInv_Discount $discount
147		- * @param float $amount
148		- */
149		- public function validate_discount_amount( $submission, $discount, $amount ) {
150		-
151		- // Validate minimum amount.
152		- if ( ! $discount->is_minimum_amount_met( $amount ) ) {
153		- $min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
154		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
155		- }
156		-
157		- // Validate the maximum amount.
158		- if ( ! $discount->is_maximum_amount_met( $amount ) ) {
159		- $max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
160		- throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
161		- }
162		-
163		- }
164		-
165		- /**
166		- * Calculates the discount code's amount.
167		- *
168		- * Ensure that the discount exists and has been validated before calling this method.
169		- *
170		- * @param GetPaid_Payment_Form_Submission $submission
171		- * @param WPInv_Discount $discount
172		- * @return array
173		- */
174		- public function calculate_discount( $submission, $discount ) {
175		- return getpaid_calculate_invoice_discount( $submission, $discount );
176		- }
	67	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'Invalid or expired discount code', 'invoicing' ) );
	68	+ }
	69	+
	70	+ // Required items.
	71	+ if ( ! $discount->is_required_items_met( array_keys( $submission->get_items() ) ) ) {
	72	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You are not allowed to use this discount code.', 'invoicing' ) );
	73	+ }
	74	+
	75	+ // Exceeded limit.
	76	+ if ( $discount->has_exceeded_limit() ) {
	77	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'This discount code has been used up', 'invoicing' ) );
	78	+ }
	79	+
	80	+ // Validate usages.
	81	+ $this->validate_single_use_discount( $submission, $discount );
	82	+
	83	+ // Validate amount.
	84	+ $this->validate_discount_amount( $submission, $discount, $amount );
	85	+
	86	+ // Save the discount.
	87	+ $this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
	88	+ }
	89	+
	90	+ /**
	91	+ * Validates a single use discount.
	92	+ *
	93	+ * @param WPInv_Discount $discount
	94	+ * @return bool
	95	+ */
	96	+ public function is_discount_active( $discount ) {
	97	+ return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
	98	+ }
	99	+
	100	+ /**
	101	+ * Returns a user's id or email.
	102	+ *
	103	+ * @param string $email
	104	+ * @return int\|string\|false
	105	+ */
	106	+ public function get_user_id_or_email( $email ) {
	107	+
	108	+ if ( is_user_logged_in() ) {
	109	+ return get_current_user_id();
	110	+ }
	111	+
	112	+ return empty( $email ) ? false : sanitize_email( $email );
	113	+ }
	114	+
	115	+ /**
	116	+ * Validates a single use discount.
	117	+ *
	118	+ * @param GetPaid_Payment_Form_Submission $submission
	119	+ * @param WPInv_Discount $discount
	120	+ */
	121	+ public function validate_single_use_discount( $submission, $discount ) {
	122	+
	123	+ // Abort if it is not a single use discount.
	124	+ if ( ! $discount->is_single_use() ) {
	125	+ return;
	126	+ }
	127	+
	128	+ // Ensure there is a valid billing email.
	129	+ $user = $this->get_user_id_or_email( $submission->get_billing_email() );
	130	+
	131	+ if ( empty( $user ) ) {
	132	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
	133	+ }
	134	+
	135	+ // Has the user used this discount code before?
	136	+ if ( ! $discount->is_valid_for_user( $user ) ) {
	137	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You have already used this discount', 'invoicing' ) );
	138	+ }
	139	+
	140	+ }
	141	+
	142	+ /**
	143	+ * Validates the discount's amount.
	144	+ *
	145	+ * @param GetPaid_Payment_Form_Submission $submission
	146	+ * @param WPInv_Discount $discount
	147	+ * @param float $amount
	148	+ */
	149	+ public function validate_discount_amount( $submission, $discount, $amount ) {
	150	+
	151	+ // Validate minimum amount.
	152	+ if ( ! $discount->is_minimum_amount_met( $amount ) ) {
	153	+ $min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
	154	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
	155	+ }
	156	+
	157	+ // Validate the maximum amount.
	158	+ if ( ! $discount->is_maximum_amount_met( $amount ) ) {
	159	+ $max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
	160	+ throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
	161	+ }
	162	+
	163	+ }
	164	+
	165	+ /**
	166	+ * Calculates the discount code's amount.
	167	+ *
	168	+ * Ensure that the discount exists and has been validated before calling this method.
	169	+ *
	170	+ * @param GetPaid_Payment_Form_Submission $submission
	171	+ * @param WPInv_Discount $discount
	172	+ * @return array
	173	+ */
	174	+ public function calculate_discount( $submission, $discount ) {
	175	+ return getpaid_calculate_invoice_discount( $submission, $discount );
	176	+ }
177	177
178	178	}

		@@ -12,113 +12,113 @@
		block discarded – undo
12	12	*/
13	13	class GetPaid_Payment_Form_Submission_Fees {
14	14
15		- /**
16		- * The fee validation error.
17		- * @var string
18		- */
19		- public $fee_error;
20		-
21		- /**
22		- * Submission fees.
23		- * @var array
24		- */
25		- public $fees = array();
	15	+ /**
	16	+ * The fee validation error.
	17	+ * @var string
	18	+ */
	19	+ public $fee_error;
	20	+
	21	+ /**
	22	+ * Submission fees.
	23	+ * @var array
	24	+ */
	25	+ public $fees = array();
26	26
27	27	/**
28		- * Class constructor
29		- *
30		- * @param GetPaid_Payment_Form_Submission $submission
31		- */
32		- public function __construct( $submission ) {
33		-
34		- // Process any existing invoice fees.
35		- if ( $submission->has_invoice() ) {
36		- $this->fees = $submission->get_invoice()->get_fees();
37		- }
38		-
39		- // Process price fields.
40		- $data = $submission->get_data();
41		- $payment_form = $submission->get_payment_form();
42		-
43		- foreach ( $payment_form->get_elements() as $element ) {
44		-
45		- if ( 'price_input' == $element['type'] ) {
46		- $this->process_price_input( $element, $data, $submission );
47		- }
48		-
49		- if ( 'price_select' == $element['type'] ) {
50		- $this->process_price_select( $element, $data );
51		- }
	28	+ * Class constructor
	29	+ *
	30	+ * @param GetPaid_Payment_Form_Submission $submission
	31	+ */
	32	+ public function __construct( $submission ) {
	33	+
	34	+ // Process any existing invoice fees.
	35	+ if ( $submission->has_invoice() ) {
	36	+ $this->fees = $submission->get_invoice()->get_fees();
	37	+ }
	38	+
	39	+ // Process price fields.
	40	+ $data = $submission->get_data();
	41	+ $payment_form = $submission->get_payment_form();
	42	+
	43	+ foreach ( $payment_form->get_elements() as $element ) {
	44	+
	45	+ if ( 'price_input' == $element['type'] ) {
	46	+ $this->process_price_input( $element, $data, $submission );
	47	+ }
	48	+
	49	+ if ( 'price_select' == $element['type'] ) {
	50	+ $this->process_price_select( $element, $data );
	51	+ }
52	52	}
53	53
54		- }
55		-
56		- /**
57		- * Process a price input field.
58		- *
59		- * @param array $element
60		- * @param array $data
61		- * @param GetPaid_Payment_Form_Submission $submission
62		- */
63		- public function process_price_input( $element, $data, $submission ) {
64		-
65		- // Abort if not passed.
66		- if ( empty( $data[ $element['id'] ] ) ) {
67		- return;
68		- }
69		-
70		- $amount = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
71		- $minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
72		-
73		- if ( $amount < $minimum ) {
74		- throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
75		- }
76		-
77		- $this->fees[ $element['label'] ] = array(
78		- 'name' => $element['label'],
79		- 'initial_fee' => $amount,
80		- 'recurring_fee' => 0,
81		- );
82		-
83		- }
84		-
85		- /**
86		- * Process a price select field.
87		- *
88		- * @param array $element
89		- * @param array $data
90		- */
91		- public function process_price_select( $element, $data ) {
92		-
93		- // Abort if not passed.
94		- if ( empty( $data[ $element['id'] ] ) ) {
95		- return;
96		- }
97		-
98		- $options = getpaid_convert_price_string_to_options( $element['options'] );
99		- $selected = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
100		- $total = 0;
101		- $sub_labels = array();
102		-
103		- foreach ( $selected as $price ) {
104		-
105		- if ( ! isset( $options[ $price ] ) ) {
106		- throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
107		- }
108		-
109		- $price = explode( '\|', $price );
110		-
111		- $sub_labels[] = $price[0];
112		- $total += (float) wpinv_sanitize_amount( $price[1] );
113		- }
114		-
115		- $this->fees[ $element['label'] ] = array(
116		- 'name' => $element['label'],
117		- 'initial_fee' => $total,
118		- 'recurring_fee' => 0,
119		- 'description' => implode( ', ', $sub_labels ),
120		- );
121		-
122		- }
	54	+ }
	55	+
	56	+ /**
	57	+ * Process a price input field.
	58	+ *
	59	+ * @param array $element
	60	+ * @param array $data
	61	+ * @param GetPaid_Payment_Form_Submission $submission
	62	+ */
	63	+ public function process_price_input( $element, $data, $submission ) {
	64	+
	65	+ // Abort if not passed.
	66	+ if ( empty( $data[ $element['id'] ] ) ) {
	67	+ return;
	68	+ }
	69	+
	70	+ $amount = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
	71	+ $minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
	72	+
	73	+ if ( $amount < $minimum ) {
	74	+ throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
	75	+ }
	76	+
	77	+ $this->fees[ $element['label'] ] = array(
	78	+ 'name' => $element['label'],
	79	+ 'initial_fee' => $amount,
	80	+ 'recurring_fee' => 0,
	81	+ );
	82	+
	83	+ }
	84	+
	85	+ /**
	86	+ * Process a price select field.
	87	+ *
	88	+ * @param array $element
	89	+ * @param array $data
	90	+ */
	91	+ public function process_price_select( $element, $data ) {
	92	+
	93	+ // Abort if not passed.
	94	+ if ( empty( $data[ $element['id'] ] ) ) {
	95	+ return;
	96	+ }
	97	+
	98	+ $options = getpaid_convert_price_string_to_options( $element['options'] );
	99	+ $selected = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
	100	+ $total = 0;
	101	+ $sub_labels = array();
	102	+
	103	+ foreach ( $selected as $price ) {
	104	+
	105	+ if ( ! isset( $options[ $price ] ) ) {
	106	+ throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
	107	+ }
	108	+
	109	+ $price = explode( '\|', $price );
	110	+
	111	+ $sub_labels[] = $price[0];
	112	+ $total += (float) wpinv_sanitize_amount( $price[1] );
	113	+ }
	114	+
	115	+ $this->fees[ $element['label'] ] = array(
	116	+ 'name' => $element['label'],
	117	+ 'initial_fee' => $total,
	118	+ 'recurring_fee' => 0,
	119	+ 'description' => implode( ', ', $sub_labels ),
	120	+ );
	121	+
	122	+ }
123	123
124	124	}

		@@ -12,290 +12,290 @@
		block discarded – undo
12	12	*/
13	13	class GetPaid_Payment_Form_Submission_Refresh_Prices {
14	14
15		- /**
16		- * Contains the response for refreshing prices.
17		- * @var array
18		- */
19		- public $response = array();
	15	+ /**
	16	+ * Contains the response for refreshing prices.
	17	+ * @var array
	18	+ */
	19	+ public $response = array();
20	20
21	21	/**
22		- * Class constructor
23		- *
24		- * @param GetPaid_Payment_Form_Submission $submission
25		- */
26		- public function __construct( $submission ) {
27		-
28		- $this->response = array(
29		- 'submission_id' => $submission->id,
	22	+ * Class constructor
	23	+ *
	24	+ * @param GetPaid_Payment_Form_Submission $submission
	25	+ */
	26	+ public function __construct( $submission ) {
	27	+
	28	+ $this->response = array(
	29	+ 'submission_id' => $submission->id,
30	30	'has_recurring' => $submission->has_recurring,
31		- 'has_subscription_group' => $submission->has_subscription_group(),
32		- 'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
	31	+ 'has_subscription_group' => $submission->has_subscription_group(),
	32	+ 'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
33	33	'is_free' => ! $submission->should_collect_payment_details(),
34		- );
35		-
36		- $this->add_totals( $submission );
37		- $this->add_texts( $submission );
38		- $this->add_items( $submission );
39		- $this->add_fees( $submission );
40		- $this->add_discounts( $submission );
41		- $this->add_taxes( $submission );
42		- $this->add_gateways( $submission );
43		- $this->add_data( $submission );
44		-
45		- }
46		-
47		- /**
48		- * Adds totals to a response for submission refresh prices.
49		- *
50		- * @param GetPaid_Payment_Form_Submission $submission
51		- */
52		- public function add_totals( $submission ) {
53		-
54		- $this->response = array_merge(
55		- $this->response,
56		- array(
57		-
58		- 'totals' => array(
59		- 'subtotal' => $submission->format_amount( $submission->get_subtotal() ),
60		- 'discount' => $submission->format_amount( $submission->get_discount() ),
61		- 'fees' => $submission->format_amount( $submission->get_fee() ),
62		- 'tax' => $submission->format_amount( $submission->get_tax() ),
63		- 'total' => $submission->format_amount( $submission->get_total() ),
64		- 'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
65		- ),
66		-
67		- 'recurring' => array(
68		- 'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
69		- 'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
70		- 'fees' => $submission->format_amount( $submission->get_recurring_fee() ),
71		- 'tax' => $submission->format_amount( $submission->get_recurring_tax() ),
72		- 'total' => $submission->format_amount( $submission->get_recurring_total() ),
73		- ),
74		-
75		- 'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
76		- 'currency' => $submission->get_currency(),
77		-
78		- )
79		- );
80		-
81		- }
82		-
83		- /**
84		- * Adds texts to a response for submission refresh prices.
85		- *
86		- * @param GetPaid_Payment_Form_Submission $submission
87		- */
88		- public function add_texts( $submission ) {
89		-
90		- $payable = $submission->format_amount( $submission->get_total() );
91		- $groups = getpaid_get_subscription_groups( $submission );
92		-
93		- if ( $submission->has_recurring && 2 > count( $groups ) ) {
94		-
95		- $recurring = new WPInv_Item( $submission->has_recurring );
96		- $period = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
97		- $main_item = reset( $groups );
98		-
99		- if ( $submission->get_total() == $submission->get_recurring_total() ) {
100		- $payable = "$payable / $period";
101		- } elseif ( $main_item ) {
102		-
103		- $main_item = reset( $main_item );
104		-
105		- // Calculate the next renewal date.
106		- $_period = $main_item->get_recurring_period( true );
107		- $_interval = $main_item->get_recurring_interval();
108		-
109		- // If the subscription item has a trial period...
110		- if ( $main_item->has_free_trial() ) {
111		- $_period = $main_item->get_trial_period( true );
112		- $_interval = $main_item->get_trial_interval();
113		- }
114		-
115		- $payable = sprintf(
116		- __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
117		- $submission->format_amount( $submission->get_total() ),
118		- $submission->format_amount( $submission->get_recurring_total() ),
119		- $period
120		- );
121		-
122		- $payable .= sprintf(
123		- '<small class="text-muted form-text">%s</small>',
124		- sprintf(
125		- __( 'First renewal on %s', 'invoicing' ),
126		- getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
127		- )
128		- );
129		-
130		- } else {
131		- $payable = sprintf(
132		- __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
133		- $submission->format_amount( $submission->get_total() ),
134		- $submission->format_amount( $submission->get_recurring_total() ),
135		- $period
136		- );
137		- }
138		-}
	34	+ );
139	35
140		- $texts = array(
141		- '.getpaid-checkout-total-payable' => $payable,
142		- );
	36	+ $this->add_totals( $submission );
	37	+ $this->add_texts( $submission );
	38	+ $this->add_items( $submission );
	39	+ $this->add_fees( $submission );
	40	+ $this->add_discounts( $submission );
	41	+ $this->add_taxes( $submission );
	42	+ $this->add_gateways( $submission );
	43	+ $this->add_data( $submission );
143	44
144		- foreach ( $submission->get_items() as $item ) {
145		- $item_id = $item->get_id();
146		- $initial_price = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
147		- $recurring_price = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
148		- $texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
149		- $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
	45	+ }
	46	+
	47	+ /**
	48	+ * Adds totals to a response for submission refresh prices.
	49	+ *
	50	+ * @param GetPaid_Payment_Form_Submission $submission
	51	+ */
	52	+ public function add_totals( $submission ) {
	53	+
	54	+ $this->response = array_merge(
	55	+ $this->response,
	56	+ array(
	57	+
	58	+ 'totals' => array(
	59	+ 'subtotal' => $submission->format_amount( $submission->get_subtotal() ),
	60	+ 'discount' => $submission->format_amount( $submission->get_discount() ),
	61	+ 'fees' => $submission->format_amount( $submission->get_fee() ),
	62	+ 'tax' => $submission->format_amount( $submission->get_tax() ),
	63	+ 'total' => $submission->format_amount( $submission->get_total() ),
	64	+ 'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
	65	+ ),
	66	+
	67	+ 'recurring' => array(
	68	+ 'subtotal' => $submission->format_amount( $submission->get_recurring_subtotal() ),
	69	+ 'discount' => $submission->format_amount( $submission->get_recurring_discount() ),
	70	+ 'fees' => $submission->format_amount( $submission->get_recurring_fee() ),
	71	+ 'tax' => $submission->format_amount( $submission->get_recurring_tax() ),
	72	+ 'total' => $submission->format_amount( $submission->get_recurring_total() ),
	73	+ ),
	74	+
	75	+ 'initial_amt' => wpinv_round_amount( $submission->get_total(), null, true ),
	76	+ 'currency' => $submission->get_currency(),
	77	+
	78	+ )
	79	+ );
	80	+
	81	+ }
150	82
151		- if ( $item->get_quantity() == 1 ) {
152		- $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
153		- }
	83	+ /**
	84	+ * Adds texts to a response for submission refresh prices.
	85	+ *
	86	+ * @param GetPaid_Payment_Form_Submission $submission
	87	+ */
	88	+ public function add_texts( $submission ) {
	89	+
	90	+ $payable = $submission->format_amount( $submission->get_total() );
	91	+ $groups = getpaid_get_subscription_groups( $submission );
	92	+
	93	+ if ( $submission->has_recurring && 2 > count( $groups ) ) {
	94	+
	95	+ $recurring = new WPInv_Item( $submission->has_recurring );
	96	+ $period = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
	97	+ $main_item = reset( $groups );
	98	+
	99	+ if ( $submission->get_total() == $submission->get_recurring_total() ) {
	100	+ $payable = "$payable / $period";
	101	+ } elseif ( $main_item ) {
	102	+
	103	+ $main_item = reset( $main_item );
	104	+
	105	+ // Calculate the next renewal date.
	106	+ $_period = $main_item->get_recurring_period( true );
	107	+ $_interval = $main_item->get_recurring_interval();
	108	+
	109	+ // If the subscription item has a trial period...
	110	+ if ( $main_item->has_free_trial() ) {
	111	+ $_period = $main_item->get_trial_period( true );
	112	+ $_interval = $main_item->get_trial_interval();
	113	+ }
	114	+
	115	+ $payable = sprintf(
	116	+ __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
	117	+ $submission->format_amount( $submission->get_total() ),
	118	+ $submission->format_amount( $submission->get_recurring_total() ),
	119	+ $period
	120	+ );
	121	+
	122	+ $payable .= sprintf(
	123	+ '<small class="text-muted form-text">%s</small>',
	124	+ sprintf(
	125	+ __( 'First renewal on %s', 'invoicing' ),
	126	+ getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
	127	+ )
	128	+ );
	129	+
	130	+ } else {
	131	+ $payable = sprintf(
	132	+ __( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
	133	+ $submission->format_amount( $submission->get_total() ),
	134	+ $submission->format_amount( $submission->get_recurring_total() ),
	135	+ $period
	136	+ );
	137	+ }
154	138	}
155	139
156		- $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
	140	+ $texts = array(
	141	+ '.getpaid-checkout-total-payable' => $payable,
	142	+ );
157	143
158		- }
	144	+ foreach ( $submission->get_items() as $item ) {
	145	+ $item_id = $item->get_id();
	146	+ $initial_price = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
	147	+ $recurring_price = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
	148	+ $texts[ ".item-$item_id .getpaid-form-item-price-desc" ] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
	149	+ $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
	150	+
	151	+ if ( $item->get_quantity() == 1 ) {
	152	+ $texts[ ".item-$item_id .getpaid-mobile-item-subtotal" ] = '';
	153	+ }
	154	+}
159	155
160		- /**
161		- * Adds items to a response for submission refresh prices.
162		- *
163		- * @param GetPaid_Payment_Form_Submission $submission
164		- */
165		- public function add_items( $submission ) {
	156	+ $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
166	157
167		- // Add items.
168		- $items = array();
	158	+ }
	159	+
	160	+ /**
	161	+ * Adds items to a response for submission refresh prices.
	162	+ *
	163	+ * @param GetPaid_Payment_Form_Submission $submission
	164	+ */
	165	+ public function add_items( $submission ) {
	166	+
	167	+ // Add items.
	168	+ $items = array();
169	169
170	170	foreach ( $submission->get_items() as $item ) {
171		- $item_id = $item->get_id();
172		- $items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
173		- }
	171	+ $item_id = $item->get_id();
	172	+ $items[ "$item_id" ] = $submission->format_amount( $item->get_sub_total() );
	173	+ }
174	174
175		- $this->response = array_merge(
176		- $this->response,
177		- array( 'items' => $items )
178		- );
	175	+ $this->response = array_merge(
	176	+ $this->response,
	177	+ array( 'items' => $items )
	178	+ );
179	179
180		- }
	180	+ }
181	181
182		- /**
183		- * Adds fees to a response for submission refresh prices.
184		- *
185		- * @param GetPaid_Payment_Form_Submission $submission
186		- */
187		- public function add_fees( $submission ) {
	182	+ /**
	183	+ * Adds fees to a response for submission refresh prices.
	184	+ *
	185	+ * @param GetPaid_Payment_Form_Submission $submission
	186	+ */
	187	+ public function add_fees( $submission ) {
188	188
189		- $fees = array();
	189	+ $fees = array();
190	190
191	191	foreach ( $submission->get_fees() as $name => $data ) {
192		- $fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
193		- }
	192	+ $fees[ $name ] = $submission->format_amount( $data['initial_fee'] );
	193	+ }
194	194
195		- $this->response = array_merge(
196		- $this->response,
197		- array( 'fees' => $fees )
198		- );
	195	+ $this->response = array_merge(
	196	+ $this->response,
	197	+ array( 'fees' => $fees )
	198	+ );
199	199
200		- }
	200	+ }
201	201
202		- /**
203		- * Adds discounts to a response for submission refresh prices.
204		- *
205		- * @param GetPaid_Payment_Form_Submission $submission
206		- */
207		- public function add_discounts( $submission ) {
	202	+ /**
	203	+ * Adds discounts to a response for submission refresh prices.
	204	+ *
	205	+ * @param GetPaid_Payment_Form_Submission $submission
	206	+ */
	207	+ public function add_discounts( $submission ) {
208	208
209		- $discounts = array();
	209	+ $discounts = array();
210	210
211	211	foreach ( $submission->get_discounts() as $name => $data ) {
212		- $discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
213		- }
214		-
215		- $this->response = array_merge(
216		- $this->response,
217		- array( 'discounts' => $discounts )
218		- );
	212	+ $discounts[ $name ] = $submission->format_amount( $data['initial_discount'] );
	213	+ }
219	214
220		- }
	215	+ $this->response = array_merge(
	216	+ $this->response,
	217	+ array( 'discounts' => $discounts )
	218	+ );
221	219
222		- /**
223		- * Adds taxes to a response for submission refresh prices.
224		- *
225		- * @param GetPaid_Payment_Form_Submission $submission
226		- */
227		- public function add_taxes( $submission ) {
	220	+ }
228	221
229		- $taxes = array();
230		- $markup = '';
	222	+ /**
	223	+ * Adds taxes to a response for submission refresh prices.
	224	+ *
	225	+ * @param GetPaid_Payment_Form_Submission $submission
	226	+ */
	227	+ public function add_taxes( $submission ) {
	228	+
	229	+ $taxes = array();
	230	+ $markup = '';
231	231	foreach ( $submission->get_taxes() as $name => $data ) {
232		- $name = sanitize_text_field( $name );
233		- $amount = $submission->format_amount( $data['initial_tax'] );
234		- $taxes[ $name ] = $amount;
235		- $markup .= "<small class='form-text'>$name : $amount</small>";
236		- }
237		-
238		- if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
239		- $this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
240		- }
241		-
242		- $this->response = array_merge(
243		- $this->response,
244		- array( 'taxes' => $taxes )
245		- );
246		-
247		- }
248		-
249		- /**
250		- * Adds gateways to a response for submission refresh prices.
251		- *
252		- * @param GetPaid_Payment_Form_Submission $submission
253		- */
254		- public function add_gateways( $submission ) {
255		-
256		- $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
257		-
258		- if ( $this->response['has_recurring'] ) {
259		-
260		- foreach ( $gateways as $i => $gateway ) {
261		-
262		- if (
263		- ! getpaid_payment_gateway_supports( $gateway, 'subscription' )
264		- \|\| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
265		- \|\| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
266		- unset( $gateways[ $i ] );
267		- }
	232	+ $name = sanitize_text_field( $name );
	233	+ $amount = $submission->format_amount( $data['initial_tax'] );
	234	+ $taxes[ $name ] = $amount;
	235	+ $markup .= "<small class='form-text'>$name : $amount</small>";
	236	+ }
	237	+
	238	+ if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
	239	+ $this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
	240	+ }
	241	+
	242	+ $this->response = array_merge(
	243	+ $this->response,
	244	+ array( 'taxes' => $taxes )
	245	+ );
	246	+
	247	+ }
	248	+
	249	+ /**
	250	+ * Adds gateways to a response for submission refresh prices.
	251	+ *
	252	+ * @param GetPaid_Payment_Form_Submission $submission
	253	+ */
	254	+ public function add_gateways( $submission ) {
	255	+
	256	+ $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
	257	+
	258	+ if ( $this->response['has_recurring'] ) {
	259	+
	260	+ foreach ( $gateways as $i => $gateway ) {
	261	+
	262	+ if (
	263	+ ! getpaid_payment_gateway_supports( $gateway, 'subscription' )
	264	+ \|\| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
	265	+ \|\| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
	266	+ unset( $gateways[ $i ] );
	267	+ }
268	268	}
269	269	}
270	270
271		- $gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
272		- $this->response = array_merge(
273		- $this->response,
274		- array( 'gateways' => $gateways )
275		- );
276		-
277		- }
278		-
279		- /**
280		- * Adds data to a response for submission refresh prices.
281		- *
282		- * @param GetPaid_Payment_Form_Submission $submission
283		- */
284		- public function add_data( $submission ) {
285		-
286		- $this->response = array_merge(
287		- $this->response,
288		- array(
289		- 'js_data' => apply_filters(
290		- 'getpaid_submission_js_data',
291		- array(
292		- 'is_recurring' => $this->response['has_recurring'],
293		- ),
294		- $submission
295		- ),
296		- )
297		- );
298		-
299		- }
	271	+ $gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
	272	+ $this->response = array_merge(
	273	+ $this->response,
	274	+ array( 'gateways' => $gateways )
	275	+ );
	276	+
	277	+ }
	278	+
	279	+ /**
	280	+ * Adds data to a response for submission refresh prices.
	281	+ *
	282	+ * @param GetPaid_Payment_Form_Submission $submission
	283	+ */
	284	+ public function add_data( $submission ) {
	285	+
	286	+ $this->response = array_merge(
	287	+ $this->response,
	288	+ array(
	289	+ 'js_data' => apply_filters(
	290	+ 'getpaid_submission_js_data',
	291	+ array(
	292	+ 'is_recurring' => $this->response['has_recurring'],
	293	+ ),
	294	+ $submission
	295	+ ),
	296	+ )
	297	+ );
	298	+
	299	+ }
300	300
301	301	}

		@@ -12,227 +12,227 @@
		block discarded – undo
12	12	*/
13	13	class GetPaid_Payment_Form_Submission_Taxes {
14	14
15		- /**
16		- * Submission taxes.
17		- * @var array
18		- */
19		- public $taxes = array();
20		-
21		- /**
22		- * Whether or not we should skip the taxes.
23		- * @var bool
24		- */
25		- protected $skip_taxes = false;
	15	+ /**
	16	+ * Submission taxes.
	17	+ * @var array
	18	+ */
	19	+ public $taxes = array();
	20	+
	21	+ /**
	22	+ * Whether or not we should skip the taxes.
	23	+ * @var bool
	24	+ */
	25	+ protected $skip_taxes = false;
	26	+
	27	+ /**
	28	+ * Class constructor
	29	+ *
	30	+ * @param GetPaid_Payment_Form_Submission $submission
	31	+ */
	32	+ public function __construct( $submission ) {
	33	+
	34	+ // Validate VAT number.
	35	+ $this->validate_vat( $submission );
	36	+
	37	+ if ( $this->skip_taxes ) {
	38	+ return;
	39	+ }
	40	+
	41	+ foreach ( $submission->get_items() as $item ) {
	42	+ $this->process_item_tax( $item, $submission );
	43	+ }
	44	+
	45	+ // Process any existing invoice taxes.
	46	+ if ( $submission->has_invoice() ) {
	47	+ $this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
	48	+ }
	49	+
	50	+ }
	51	+
	52	+ /**
	53	+ * Maybe process tax.
	54	+ *
	55	+ * @since 1.0.19
	56	+ * @param GetPaid_Form_Item $item
	57	+ * @param GetPaid_Payment_Form_Submission $submission
	58	+ */
	59	+ public function process_item_tax( $item, $submission ) {
	60	+
	61	+ $rates = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
	62	+ $rates = getpaid_filter_item_tax_rates( $item, $rates );
	63	+ $taxes = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
	64	+ $r_taxes = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
	65	+
	66	+ foreach ( $taxes as $name => $amount ) {
	67	+ $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
	68	+ $tax = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
	69	+
	70	+ $item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
	71	+
	72	+ if ( ! isset( $this->taxes[ $name ] ) ) {
	73	+ $this->taxes[ $name ] = $tax;
	74	+ continue;
	75	+ }
	76	+
	77	+ $this->taxes[ $name ]['initial_tax'] += $tax['initial_tax'];
	78	+ $this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
	79	+
	80	+ }
	81	+
	82	+ }
26	83
27	84	/**
28		- * Class constructor
29		- *
30		- * @param GetPaid_Payment_Form_Submission $submission
31		- */
32		- public function __construct( $submission ) {
33		-
34		- // Validate VAT number.
35		- $this->validate_vat( $submission );
36		-
37		- if ( $this->skip_taxes ) {
38		- return;
39		- }
40		-
41		- foreach ( $submission->get_items() as $item ) {
42		- $this->process_item_tax( $item, $submission );
43		- }
44		-
45		- // Process any existing invoice taxes.
46		- if ( $submission->has_invoice() ) {
47		- $this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
48		- }
49		-
50		- }
51		-
52		- /**
53		- * Maybe process tax.
54		- *
55		- * @since 1.0.19
56		- * @param GetPaid_Form_Item $item
57		- * @param GetPaid_Payment_Form_Submission $submission
58		- */
59		- public function process_item_tax( $item, $submission ) {
60		-
61		- $rates = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
62		- $rates = getpaid_filter_item_tax_rates( $item, $rates );
63		- $taxes = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
64		- $r_taxes = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
65		-
66		- foreach ( $taxes as $name => $amount ) {
67		- $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
68		- $tax = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
69		-
70		- $item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
71		-
72		- if ( ! isset( $this->taxes[ $name ] ) ) {
73		- $this->taxes[ $name ] = $tax;
74		- continue;
75		- }
76		-
77		- $this->taxes[ $name ]['initial_tax'] += $tax['initial_tax'];
78		- $this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
79		-
80		- }
81		-
82		- }
83		-
84		- /**
85		- * Checks if the submission has a digital item.
86		- *
87		- * @param GetPaid_Payment_Form_Submission $submission
88		- * @since 1.0.19
89		- * @return bool
90		- */
91		- public function has_digital_item( $submission ) {
92		-
93		- foreach ( $submission->get_items() as $item ) {
94		-
95		- if ( 'digital' == $item->get_vat_rule() ) {
96		- return true;
97		- }
	85	+ * Checks if the submission has a digital item.
	86	+ *
	87	+ * @param GetPaid_Payment_Form_Submission $submission
	88	+ * @since 1.0.19
	89	+ * @return bool
	90	+ */
	91	+ public function has_digital_item( $submission ) {
	92	+
	93	+ foreach ( $submission->get_items() as $item ) {
	94	+
	95	+ if ( 'digital' == $item->get_vat_rule() ) {
	96	+ return true;
	97	+ }
98	98	}
99	99
100		- return false;
101		- }
102		-
103		- /**
104		- * Checks if this is an eu store.
105		- *
106		- * @since 1.0.19
107		- * @return bool
108		- */
109		- public static function is_eu_store() {
110		- return self::is_eu_country( wpinv_get_default_country() );
111		- }
112		-
113		- /**
114		- * Checks if this is an eu country.
115		- *
116		- * @param string $country
117		- * @since 1.0.19
118		- * @return bool
119		- */
120		- public static function is_eu_country( $country ) {
121		- return getpaid_is_eu_state( $country );
122		- }
123		-
124		- /**
125		- * Checks if this is an eu purchase.
126		- *
127		- * @param string $customer_country
128		- * @since 1.0.19
129		- * @return bool
130		- */
131		- public static function is_eu_transaction( $customer_country ) {
132		- return self::is_eu_country( $customer_country ) && self::is_eu_store();
133		- }
134		-
135		- /**
136		- * Retrieves the vat number.
137		- *
138		- * @param GetPaid_Payment_Form_Submission $submission
139		- * @since 1.0.19
140		- * @return string
141		- */
142		- public function get_vat_number( $submission ) {
143		-
144		- // Retrieve from the posted number.
145		- $vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
146		- if ( ! is_null( $vat_number ) ) {
147		- return wpinv_clean( $vat_number );
148		- }
149		-
150		- return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
151		- }
152		-
153		- /**
154		- * Retrieves the company.
155		- *
156		- * @param GetPaid_Payment_Form_Submission $submission
157		- * @since 1.0.19
158		- * @return string
159		- */
160		- public function get_company( $submission ) {
161		-
162		- // Retrieve from the posted data.
163		- $company = $submission->get_field( 'wpinv_company', 'billing' );
164		- if ( ! empty( $company ) ) {
165		- return wpinv_clean( $company );
166		- }
167		-
168		- // Retrieve from the invoice.
169		- return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
170		- }
171		-
172		- /**
173		- * Checks if we require a VAT number.
174		- *
175		- * @param bool $ip_in_eu Whether the customer IP is from the EU
176		- * @param bool $country_in_eu Whether the customer country is from the EU
177		- * @since 1.0.19
178		- * @return string
179		- */
180		- public function requires_vat( $ip_in_eu, $country_in_eu ) {
181		-
182		- $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
183		- $prevent_b2c = ! empty( $prevent_b2c );
184		- $is_eu = $ip_in_eu \|\| $country_in_eu;
185		-
186		- return $prevent_b2c && $is_eu;
187		- }
188		-
189		- /**
190		- * Validate VAT data.
191		- *
192		- * @param GetPaid_Payment_Form_Submission $submission
193		- * @since 1.0.19
194		- */
195		- public function validate_vat( $submission ) {
196		-
197		- $in_eu = $this->is_eu_transaction( $submission->country );
198		-
199		- // Abort if we are not validating vat numbers.
200		- if ( ! $in_eu ) {
	100	+ return false;
	101	+ }
	102	+
	103	+ /**
	104	+ * Checks if this is an eu store.
	105	+ *
	106	+ * @since 1.0.19
	107	+ * @return bool
	108	+ */
	109	+ public static function is_eu_store() {
	110	+ return self::is_eu_country( wpinv_get_default_country() );
	111	+ }
	112	+
	113	+ /**
	114	+ * Checks if this is an eu country.
	115	+ *
	116	+ * @param string $country
	117	+ * @since 1.0.19
	118	+ * @return bool
	119	+ */
	120	+ public static function is_eu_country( $country ) {
	121	+ return getpaid_is_eu_state( $country );
	122	+ }
	123	+
	124	+ /**
	125	+ * Checks if this is an eu purchase.
	126	+ *
	127	+ * @param string $customer_country
	128	+ * @since 1.0.19
	129	+ * @return bool
	130	+ */
	131	+ public static function is_eu_transaction( $customer_country ) {
	132	+ return self::is_eu_country( $customer_country ) && self::is_eu_store();
	133	+ }
	134	+
	135	+ /**
	136	+ * Retrieves the vat number.
	137	+ *
	138	+ * @param GetPaid_Payment_Form_Submission $submission
	139	+ * @since 1.0.19
	140	+ * @return string
	141	+ */
	142	+ public function get_vat_number( $submission ) {
	143	+
	144	+ // Retrieve from the posted number.
	145	+ $vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
	146	+ if ( ! is_null( $vat_number ) ) {
	147	+ return wpinv_clean( $vat_number );
	148	+ }
	149	+
	150	+ return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
	151	+ }
	152	+
	153	+ /**
	154	+ * Retrieves the company.
	155	+ *
	156	+ * @param GetPaid_Payment_Form_Submission $submission
	157	+ * @since 1.0.19
	158	+ * @return string
	159	+ */
	160	+ public function get_company( $submission ) {
	161	+
	162	+ // Retrieve from the posted data.
	163	+ $company = $submission->get_field( 'wpinv_company', 'billing' );
	164	+ if ( ! empty( $company ) ) {
	165	+ return wpinv_clean( $company );
	166	+ }
	167	+
	168	+ // Retrieve from the invoice.
	169	+ return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
	170	+ }
	171	+
	172	+ /**
	173	+ * Checks if we require a VAT number.
	174	+ *
	175	+ * @param bool $ip_in_eu Whether the customer IP is from the EU
	176	+ * @param bool $country_in_eu Whether the customer country is from the EU
	177	+ * @since 1.0.19
	178	+ * @return string
	179	+ */
	180	+ public function requires_vat( $ip_in_eu, $country_in_eu ) {
	181	+
	182	+ $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
	183	+ $prevent_b2c = ! empty( $prevent_b2c );
	184	+ $is_eu = $ip_in_eu \|\| $country_in_eu;
	185	+
	186	+ return $prevent_b2c && $is_eu;
	187	+ }
	188	+
	189	+ /**
	190	+ * Validate VAT data.
	191	+ *
	192	+ * @param GetPaid_Payment_Form_Submission $submission
	193	+ * @since 1.0.19
	194	+ */
	195	+ public function validate_vat( $submission ) {
	196	+
	197	+ $in_eu = $this->is_eu_transaction( $submission->country );
	198	+
	199	+ // Abort if we are not validating vat numbers.
	200	+ if ( ! $in_eu ) {
201	201	return;
202		- }
	202	+ }
203	203
204		- // Prepare variables.
205		- $vat_number = $this->get_vat_number( $submission );
206		- $ip_country = getpaid_get_ip_country();
	204	+ // Prepare variables.
	205	+ $vat_number = $this->get_vat_number( $submission );
	206	+ $ip_country = getpaid_get_ip_country();
207	207	$is_eu = $this->is_eu_country( $submission->country );
208	208	$is_ip_eu = $this->is_eu_country( $ip_country );
209	209
210		- // Maybe abort early for initial fetches.
211		- if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
212		- return;
213		- }
	210	+ // Maybe abort early for initial fetches.
	211	+ if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
	212	+ return;
	213	+ }
214	214
215		- // If we're preventing business to consumer purchases,
216		- if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
	215	+ // If we're preventing business to consumer purchases,
	216	+ if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
217	217
218		- // Ensure that a vat number has been specified.
219		- throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
	218	+ // Ensure that a vat number has been specified.
	219	+ throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
220	220
221		- }
	221	+ }
222	222
223		- if ( empty( $vat_number ) ) {
224		- return;
225		- }
	223	+ if ( empty( $vat_number ) ) {
	224	+ return;
	225	+ }
226	226
227		- if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
228		- throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
229		- }
	227	+ if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
	228	+ throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
	229	+ }
230	230
231		- if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
232		- return;
233		- }
	231	+ if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
	232	+ return;
	233	+ }
234	234
235		- $this->skip_taxes = true;
236		- }
	235	+ $this->skip_taxes = true;
	236	+ }
237	237
238	238	}

AyeCode / invoicing

Push — master ( 7a26f0...499ba9 )

Status

Category

Indentation +50 added lines, -50 removed lines patch added patch discarded remove patch

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch

Indentation +94 added lines, -94 removed lines patch added patch discarded remove patch

Spacing +86 added lines, -86 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +861 added lines, -861 removed lines patch added patch discarded remove patch

Spacing +129 added lines, -129 removed lines patch added patch discarded remove patch

Indentation +359 added lines, -359 removed lines patch added patch discarded remove patch

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

Indentation +159 added lines, -159 removed lines patch added patch discarded remove patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

Indentation +252 added lines, -252 removed lines patch added patch discarded remove patch

Spacing +84 added lines, -84 removed lines patch added patch discarded remove patch

Indentation +206 added lines, -206 removed lines patch added patch discarded remove patch

Spacing +53 added lines, -53 removed lines patch added patch discarded remove patch