AyeCode / invoicing

includes/payments/class-getpaid-checkout.php

Indentation +256 added lines, -256 removed lines

@@ -12,180 +12,180 @@ 
  */
 class GetPaid_Checkout {
 
-	/**
-	 * @var GetPaid_Payment_Form_Submission
-	 */
-	protected $payment_form_submission;
-
-	/**
-	 * Class constructor.
-	 * 
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-		$this->payment_form_submission = $submission;
-	}
-
-	/**
-	 * Processes the checkout.
-	 *
-	 */
-	public function process_checkout() {
-
-		// Validate the submission.
-		$this->validate_submission();
-
-		// Prepare the invoice.
-		$items      = $this->get_submission_items();
-		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
-		$prepared   = $this->prepare_submission_data_for_saving();
-
-		$this->prepare_billing_info( $invoice );
-
-		$shipping   = $this->prepare_shipping_info( $invoice );
-
-		// Save the invoice.
-		$invoice->set_is_viewed( true );
-		$invoice->recalculate_total();
+    /**
+     * @var GetPaid_Payment_Form_Submission
+     */
+    protected $payment_form_submission;
+
+    /**
+     * Class constructor.
+     * 
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+        $this->payment_form_submission = $submission;
+    }
+
+    /**
+     * Processes the checkout.
+     *
+     */
+    public function process_checkout() {
+
+        // Validate the submission.
+        $this->validate_submission();
+
+        // Prepare the invoice.
+        $items      = $this->get_submission_items();
+        $invoice    = $this->get_submission_invoice();
+        $invoice    = $this->process_submission_invoice( $invoice, $items );
+        $prepared   = $this->prepare_submission_data_for_saving();
+
+        $this->prepare_billing_info( $invoice );
+
+        $shipping   = $this->prepare_shipping_info( $invoice );
+
+        // Save the invoice.
+        $invoice->set_is_viewed( true );
+        $invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+        do_action( 'getpaid_checkout_invoice_updated', $invoice );
 
-		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
-	}
+        // Send to the gateway.
+        $this->post_process_submission( $invoice, $prepared, $shipping );
+    }
 
-	/**
-	 * Validates the submission.
-	 *
-	 */
-	protected function validate_submission() {
+    /**
+     * Validates the submission.
+     *
+     */
+    protected function validate_submission() {
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
 
-		// Do we have an error?
+        // Do we have an error?
         if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+            wp_send_json_error( $submission->last_error );
         }
 
-		// We need a billing email.
+        // We need a billing email.
         if ( ! $submission->has_billing_email() ) {
             wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
-		}
+        }
 
-		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
-		}
+        // Non-recurring gateways should not be allowed to process recurring invoices.
+        if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+        }
 
-		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
-		}
+        // Ensure the gateway is active.
+        if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
+            wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
 
-		return $invoice;
-	}
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->set_created_via( 'payment_form' );
+            return $invoice;
+        }
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+        $invoice = $submission->get_invoice();
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+        return $invoice;
+    }
+
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
+
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
+
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $data['wpi-gateway'] );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $data['wpi-gateway'] );
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+        $address_confirmed = $submission->get_field( 'confirm-address' );
+        $invoice->set_address_confirmed( ! empty( $address_confirmed ) );
 
-		if ( $submission->has_discount_code() ) {
+        if ( $submission->has_discount_code() ) {
             $invoice->set_discount_code( $submission->get_discount_code() );
-		}
-
-		getpaid_maybe_add_default_address( $invoice );
-		return $invoice;
-	}
-
-	/**
-	 * Retrieves the submission's customer.
-	 *
-	 * @return int The customer id.
-	 */
-	protected function get_submission_customer() {
-		$submission = $this->payment_form_submission;
-
-		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
-			return $submission->get_invoice()->get_user_id();
-		}
-
-		// (Maybe) create the user.
+        }
+
+        getpaid_maybe_add_default_address( $invoice );
+        return $invoice;
+    }
+
+    /**
+     * Retrieves the submission's customer.
+     *
+     * @return int The customer id.
+     */
+    protected function get_submission_customer() {
+        $submission = $this->payment_form_submission;
+
+        // If this is an existing invoice...
+        if ( $submission->has_invoice() ) {
+            return $submission->get_invoice()->get_user_id();
+        }
+
+        // (Maybe) create the user.
         $user = get_current_user_id();
 
         if ( empty( $user ) ) {
@@ -195,11 +195,11 @@ 
         if ( empty( $user ) ) {
             $user = wpinv_create_user( $submission->get_billing_email() );
 
-			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
-			}
+            // (Maybe) send new user notification.
+            $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+            if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
+                wp_send_new_user_notifications( $user, 'user' );
+            }
 
         }
 
@@ -209,31 +209,31 @@ 
 
         if ( is_numeric( $user ) ) {
             return $user;
-		}
+        }
 
-		return $user->ID;
+        return $user->ID;
 
-	}
+    }
 
-	/**
+    /**
      * Prepares submission data for saving to the database.
      *
-	 * @return array
+     * @return array
      */
     public function prepare_submission_data_for_saving() {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Prepared submission details.
+        // Prepared submission details.
         $prepared = array();
 
         // Raw submission details.
-		$data     = $submission->get_data();
+        $data     = $submission->get_data();
 
-		// Loop through the submitted details.
+        // Loop through the submitted details.
         foreach ( $submission->get_payment_form()->get_elements() as $field ) {
 
-			// Skip premade fields.
+            // Skip premade fields.
             if ( ! empty( $field['premade'] ) || $field['type'] == 'address' ) {
                 continue;
             }
@@ -251,176 +251,176 @@ 
                     $label = $field['label'];
                 }
 
-				$prepared[ wpinv_clean( $label ) ] = wp_kses_post( $data[ $field['id'] ] );
+                $prepared[ wpinv_clean( $label ) ] = wp_kses_post( $data[ $field['id'] ] );
 
             }
 
-		}
+        }
 
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
+    /**
      * Retrieves address details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
-	 * @param string $type
+     * @return array
+     * @param WPInv_Invoice $invoice
+     * @param string $type
      */
     public function prepare_address_details( $invoice, $type = 'billing' ) {
 
-		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
-		$address  = array();
-		$prepared = array();
+        $data     = $this->payment_form_submission->get_data();
+        $type     = sanitize_key( $type );
+        $address  = array();
+        $prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
-		}
+        if ( ! empty( $data[ $type ] ) ) {
+            $address = $data[ $type ];
+        }
 
-		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
-		}
+        // Clean address details.
+        foreach ( $address as $key => $value ) {
+            $key             = sanitize_key( $key );
+            $key             = str_replace( 'wpinv_', '', $key );
+            $value           = wpinv_clean( $value );
+            $prepared[ $key] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+        }
 
-		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+        // Filter address details.
+        $prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
 
-		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+        // Remove non-whitelisted values.
+        return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the billing details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_billing_info( &$invoice ) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+        $billing_address = $this->prepare_address_details( $invoice, 'billing' );
 
-		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+        // Update the invoice with the billing details.
+        $invoice->set_props( $billing_address );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the shipping details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_shipping_info( $invoice ) {
 
-		$data = $this->payment_form_submission->get_data();
+        $data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
-		}
+        if ( empty( $data['same-shipping-address'] ) ) {
+            return $this->prepare_address_details( $invoice, 'shipping' );
+        }
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+        return $this->prepare_address_details( $invoice, 'billing' );
 
-	}
+    }
 
-	/**
-	 * Confirms the submission is valid and send users to the gateway.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param array $prepared_payment_form_data
-	 * @param array $shipping
-	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+    /**
+     * Confirms the submission is valid and send users to the gateway.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param array $prepared_payment_form_data
+     * @param array $shipping
+     */
+    protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
 
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         if ( ! $invoice->exists() ) {
             wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
         }
 
-		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
+        // Save payment form data.
+        $prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
         if ( ! empty( $prepared_payment_form_data ) ) {
             update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data );
-		}
+        }
 
-		// Save payment form data.
+        // Save payment form data.
         if ( ! empty( $shipping ) ) {
             update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		$this->process_payment( $invoice );
+        $this->process_payment( $invoice );
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+        wpinv_send_back_to_checkout( $invoice );
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $this->process_free_payment( $invoice );
+        }
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
-	 * Marks the invoice as paid in case the checkout is free.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_free_payment( $invoice ) {
+    /**
+     * Marks the invoice as paid in case the checkout is free.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_free_payment( $invoice ) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        $invoice->set_gateway( 'none' );
+        $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+        $invoice->mark_paid();
+        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */

Spacing +108 added lines, -108 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Checkout Class.
@@ -22,7 +22,7 @@ 
 	 * 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 		$this->payment_form_submission = $submission;
 	}
 
@@ -38,22 +38,22 @@ 
 		// Prepare the invoice.
 		$items      = $this->get_submission_items();
 		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
+		$invoice    = $this->process_submission_invoice($invoice, $items);
 		$prepared   = $this->prepare_submission_data_for_saving();
 
-		$this->prepare_billing_info( $invoice );
+		$this->prepare_billing_info($invoice);
 
-		$shipping   = $this->prepare_shipping_info( $invoice );
+		$shipping = $this->prepare_shipping_info($invoice);
 
 		// Save the invoice.
-		$invoice->set_is_viewed( true );
+		$invoice->set_is_viewed(true);
 		$invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+		do_action('getpaid_checkout_invoice_updated', $invoice);
 
 		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
+		$this->post_process_submission($invoice, $prepared, $shipping);
 	}
 
 	/**
@@ -66,34 +66,34 @@ 
 		$data       = $submission->get_data();
 
 		// Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+        if (!empty($submission->last_error)) {
+			wp_send_json_error($submission->last_error);
         }
 
 		// We need a billing email.
-        if ( ! $submission->has_billing_email() ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email()) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
 		}
 
 		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && $submission->has_recurring && !wpinv_gateway_support_subscription($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway does not support subscription payments.', 'invoicing'));
 		}
 
 		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wpinv_set_error( 'invalid_gateway', __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wpinv_set_error('invalid_gateway', __('The selected payment gateway is not active', 'invoicing'));
 		}
 
 		// Clear any existing errors.
 		wpinv_clear_errors();
 
 		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+		do_action('getpaid_checkout_error_checks', $submission);
 
 		// Do we have any errors?
-        if ( wpinv_get_errors() ) {
-            wp_send_json_error( getpaid_get_errors_html() );
+        if (wpinv_get_errors()) {
+            wp_send_json_error(getpaid_get_errors_html());
 		}
 
 	}
@@ -108,8 +108,8 @@ 
 		$items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
-        if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
-            wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
+        if (empty($items) && !$this->payment_form_submission->has_fees()) {
+            wp_send_json_error(__('Please provide at least one item or amount.', 'invoicing'));
 		}
 
 		return $items;
@@ -123,17 +123,17 @@ 
 	protected function get_submission_invoice() {
 		$submission = $this->payment_form_submission;
 
-		if ( ! $submission->has_invoice() ) {
+		if (!$submission->has_invoice()) {
 			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
+			$invoice->set_created_via('payment_form');
 			return $invoice;
         }
 
 		$invoice = $submission->get_invoice();
 
 		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+		if ($invoice->is_paid() || $invoice->is_refunded()) {
+			wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
 		}
 
 		return $invoice;
@@ -146,29 +146,29 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+	protected function process_submission_invoice($invoice, $items) {
 
 		$submission = $this->payment_form_submission;
 		$data       = $submission->get_data();
 
 		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $data['wpi-gateway'] );
-
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
-
-		if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+		$invoice->set_email(sanitize_email($submission->get_billing_email()));
+		$invoice->set_user_id($this->get_submission_customer());
+		$invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+		$invoice->set_discounts($submission->get_discounts());
+		$invoice->set_gateway($data['wpi-gateway']);
+
+		$address_confirmed = $submission->get_field('confirm-address');
+		$invoice->set_address_confirmed(!empty($address_confirmed));
+
+		if ($submission->has_discount_code()) {
+            $invoice->set_discount_code($submission->get_discount_code());
 		}
 
-		getpaid_maybe_add_default_address( $invoice );
+		getpaid_maybe_add_default_address($invoice);
 		return $invoice;
 	}
 
@@ -181,33 +181,33 @@ 
 		$submission = $this->payment_form_submission;
 
 		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			return $submission->get_invoice()->get_user_id();
 		}
 
 		// (Maybe) create the user.
         $user = get_current_user_id();
 
-        if ( empty( $user ) ) {
-            $user = get_user_by( 'email', $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = get_user_by('email', $submission->get_billing_email());
         }
 
-        if ( empty( $user ) ) {
-            $user = wpinv_create_user( $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = wpinv_create_user($submission->get_billing_email());
 
 			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
+			$should_send_notification = wpinv_get_option('disable_new_user_emails');
+			if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
+				wp_send_new_user_notifications($user, 'user');
 			}
 
         }
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
+        if (is_numeric($user)) {
             return $user;
 		}
 
@@ -228,30 +228,30 @@ 
         $prepared = array();
 
         // Raw submission details.
-		$data     = $submission->get_data();
+		$data = $submission->get_data();
 
 		// Loop through the submitted details.
-        foreach ( $submission->get_payment_form()->get_elements() as $field ) {
+        foreach ($submission->get_payment_form()->get_elements() as $field) {
 
 			// Skip premade fields.
-            if ( ! empty( $field['premade'] ) || $field['type'] == 'address' ) {
+            if (!empty($field['premade']) || $field['type'] == 'address') {
                 continue;
             }
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
             }
 
             // Handle misc fields.
-            if ( isset( $data[ $field['id'] ] ) ) {
+            if (isset($data[$field['id']])) {
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-				$prepared[ wpinv_clean( $label ) ] = wp_kses_post( $data[ $field['id'] ] );
+				$prepared[wpinv_clean($label)] = wp_kses_post($data[$field['id']]);
 
             }
 
@@ -268,30 +268,30 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $type
      */
-    public function prepare_address_details( $invoice, $type = 'billing' ) {
+    public function prepare_address_details($invoice, $type = 'billing') {
 
 		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
+		$type     = sanitize_key($type);
 		$address  = array();
 		$prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
+		if (!empty($data[$type])) {
+			$address = $data[$type];
 		}
 
 		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+		foreach ($address as $key => $value) {
+			$key             = sanitize_key($key);
+			$key             = str_replace('wpinv_', '', $key);
+			$value           = wpinv_clean($value);
+			$prepared[$key] = apply_filters("getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice);
 		}
 
 		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+		$prepared = apply_filters("getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice);
 
 		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+		return array_filter($prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY);
 
 	}
 
@@ -301,12 +301,12 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_billing_info( &$invoice ) {
+    protected function prepare_billing_info(&$invoice) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+		$billing_address = $this->prepare_address_details($invoice, 'billing');
 
 		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+		$invoice->set_props($billing_address);
 
 	}
 
@@ -316,15 +316,15 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_shipping_info( $invoice ) {
+    protected function prepare_shipping_info($invoice) {
 
 		$data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
+		if (empty($data['same-shipping-address'])) {
+			return $this->prepare_address_details($invoice, 'shipping');
 		}
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+		return $this->prepare_address_details($invoice, 'billing');
 
 	}
 
@@ -335,31 +335,31 @@ 
 	 * @param array $prepared_payment_form_data
 	 * @param array $shipping
 	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+	protected function post_process_submission($invoice, $prepared_payment_form_data, $shipping) {
 
 		// Ensure the invoice exists.
-        if ( ! $invoice->exists() ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
+        if (!$invoice->exists()) {
+            wp_send_json_error(__('An error occured while saving your invoice. Please try again.', 'invoicing'));
         }
 
 		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
-        if ( ! empty( $prepared_payment_form_data ) ) {
-            update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data );
+		$prepared_payment_form_data = apply_filters('getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice);
+        if (!empty($prepared_payment_form_data)) {
+            update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data);
 		}
 
 		// Save payment form data.
-        if ( ! empty( $shipping ) ) {
-            update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
+        if (!empty($shipping)) {
+            update_post_meta($invoice->get_id(), 'shipping_address', $shipping);
 		}
 
 		// Backwards compatibility.
-        add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
+        add_filter('wp_redirect', array($this, 'send_redirect_response'));
 
-		$this->process_payment( $invoice );
+		$this->process_payment($invoice);
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+		wpinv_send_back_to_checkout($invoice);
 
 	}
 
@@ -368,41 +368,41 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
+		if ($invoice->is_free()) {
+			$this->process_free_payment($invoice);
 		}
 
 		$submission = $this->payment_form_submission;
 
 		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+		do_action('getpaid_checkout_before_gateway', $invoice, $submission);
 
 		// Allow the sumission data to be modified before it is sent to the gateway.
 		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+		$submission_gateway = apply_filters('getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice);
+		$submission_data    = apply_filters('getpaid_gateway_submission_data', $submission_data, $submission, $invoice);
 
 		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+		if (!apply_filters("getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency())) {
+			wpinv_set_error('invalid_currency', __('The chosen payment gateway does not support this currency', 'invoicing'));
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+		do_action("getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission);
 
 		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+		wpinv_send_to_gateway($submission_gateway, $invoice);
 
 	}
 
@@ -411,12 +411,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_free_payment( $invoice ) {
+	protected function process_free_payment($invoice) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+		$invoice->set_gateway('none');
+		$invoice->add_note(__("This is a free invoice and won't be sent to the payment gateway", 'invoicing'), false, false, true);
 		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+		wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
 	}
 
@@ -424,9 +424,9 @@ 
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = urlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = urlencode($url);
+        wp_send_json_success($url);
     }
 
 }

includes/admin/class-wpinv-admin-menus.php

Indentation +6 added lines, -6 removed lines

@@ -24,14 +24,14 @@
     }
 
     /**
-	 * Highlights sub menus.
-	 */
-	public function set_admin_menu_class() {
-		global $current_screen, $parent_file, $submenu_file;
+     * Highlights sub menus.
+     */
+    public function set_admin_menu_class() {
+        global $current_screen, $parent_file, $submenu_file;
 
         if ( ! empty( $current_screen->id ) && in_array( $current_screen->id , array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
-			$parent_file = 'wpinv';
-			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
+            $parent_file = 'wpinv';
+            $submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
 
     }

Spacing +83 added lines, -83 removed lines

@@ -3,7 +3,7 @@ 
  * Setup menus in WP admin.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WC_Admin_Menus Class.
@@ -13,14 +13,14 @@ 
      * Hook in tabs.
      */
     public function __construct() {
-        add_action( 'admin_head', array( $this, 'set_admin_menu_class' ) );
-        add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-        add_action( 'admin_menu', array( $this, 'add_customers_menu' ), 18 );
-        add_action( 'admin_menu', array( $this, 'add_subscriptions_menu' ), 40 );
-        add_action( 'admin_menu', array( $this, 'add_addons_menu' ), 100 );
-        add_action( 'admin_menu', array( $this, 'add_settings_menu' ), 60 );
-        add_action( 'admin_menu', array( $this, 'remove_admin_submenus' ), 10 );
-        add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) );
+        add_action('admin_head', array($this, 'set_admin_menu_class'));
+        add_action('admin_menu', array($this, 'admin_menu'), 10);
+        add_action('admin_menu', array($this, 'add_customers_menu'), 18);
+        add_action('admin_menu', array($this, 'add_subscriptions_menu'), 40);
+        add_action('admin_menu', array($this, 'add_addons_menu'), 100);
+        add_action('admin_menu', array($this, 'add_settings_menu'), 60);
+        add_action('admin_menu', array($this, 'remove_admin_submenus'), 10);
+        add_action('admin_head-nav-menus.php', array($this, 'add_nav_menu_meta_boxes'));
     }
 
     /**
@@ -29,7 +29,7 @@ 
 	public function set_admin_menu_class() {
 		global $current_screen, $parent_file, $submenu_file;
 
-        if ( ! empty( $current_screen->id ) && in_array( $current_screen->id , array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
+        if (!empty($current_screen->id) && in_array($current_screen->id, array('wpi_discount', 'wpi_payment_form', 'wpi_invoice'))) {
 			$parent_file = 'wpinv';
 			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
@@ -38,14 +38,14 @@ 
 
     public function admin_menu() {
 
-        $capability = apply_filters( 'invoicing_capability', wpinv_get_capability() );
+        $capability = apply_filters('invoicing_capability', wpinv_get_capability());
         add_menu_page(
-            __( 'GetPaid', 'invoicing' ),
-            __( 'GetPaid', 'invoicing' ),
+            __('GetPaid', 'invoicing'),
+            __('GetPaid', 'invoicing'),
             $capability,
             'wpinv',
             null,
-            'data:image/svg+xml;base64,' . base64_encode( file_get_contents( WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg' ) ),
+            'data:image/svg+xml;base64,' . base64_encode(file_get_contents(WPINV_PLUGIN_DIR . 'assets/images/GetPaid.svg')),
             '54.123460'
         );
 
@@ -57,11 +57,11 @@ 
     public function add_customers_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Customers', 'invoicing' ),
-            __( 'Customers', 'invoicing' ),
+            __('Customers', 'invoicing'),
+            __('Customers', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-customers',
-            array( $this, 'customers_page' )
+            array($this, 'customers_page')
         );
     }
 
@@ -71,8 +71,8 @@ 
     public function add_subscriptions_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Subscriptions', 'invoicing' ),
-            __( 'Subscriptions', 'invoicing' ),
+            __('Subscriptions', 'invoicing'),
+            __('Subscriptions', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-subscriptions',
             'wpinv_subscriptions_page'
@@ -83,7 +83,7 @@ 
      * Displays the customers page.
      */
     public function customers_page() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-customers-table.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-customers-table.php');
         ?>
         <div class="wrap wpi-customers-wrap">
             <style>
@@ -91,12 +91,12 @@ 
                     width: 30%;
                 }
             </style>
-            <h1><?php echo esc_html( __( 'Customers', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Customers', 'invoicing')); ?></h1>
             <form method="post">
             <?php
                 $table = new WPInv_Customers_Table();
                 $table->prepare_items();
-                $table->search_box( __( 'Search Customers', 'invoicing' ), 'search-customers' );
+                $table->search_box(__('Search Customers', 'invoicing'), 'search-customers');
                 $table->display();
             ?>
             </form>
@@ -110,16 +110,16 @@ 
     public function add_settings_menu() {
         add_submenu_page(
             'wpinv',
-            __( 'Invoice Settings', 'invoicing' ),
-            __( 'Settings', 'invoicing' ),
-            apply_filters( 'invoicing_capability', wpinv_get_capability() ),
+            __('Invoice Settings', 'invoicing'),
+            __('Settings', 'invoicing'),
+            apply_filters('invoicing_capability', wpinv_get_capability()),
             'wpinv-settings',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
     }
 
-    public function add_addons_menu(){
-        if ( !apply_filters( 'wpi_show_addons_page', true ) ) {
+    public function add_addons_menu() {
+        if (!apply_filters('wpi_show_addons_page', true)) {
             return;
         }
 
@@ -129,80 +129,80 @@ 
             __('Extensions', 'invoicing'),
             'manage_options',
             'wpi-addons',
-            array( $this, 'addons_page' )
+            array($this, 'addons_page')
         );
     }
 
-    public function addons_page(){
+    public function addons_page() {
         $addon_obj = new WPInv_Admin_Addons();
         $addon_obj->output();
     }
 
     function options_page() {
-        $page       = isset( $_GET['page'] )                ? strtolower( $_GET['page'] )               : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        if ( $page !== 'wpinv-settings' ) {
+        if ($page !== 'wpinv-settings') {
             return;
         }
 
         $settings_tabs = wpinv_get_settings_tabs();
         $settings_tabs = empty($settings_tabs) ? array() : $settings_tabs;
-        $active_tab    = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $settings_tabs ) ? sanitize_text_field( $_GET['tab'] ) : 'general';
-        $sections      = wpinv_get_settings_tab_sections( $active_tab );
+        $active_tab    = isset($_GET['tab']) && array_key_exists($_GET['tab'], $settings_tabs) ? sanitize_text_field($_GET['tab']) : 'general';
+        $sections      = wpinv_get_settings_tab_sections($active_tab);
         $key           = 'main';
 
-        if ( is_array( $sections ) ) {
-            $key = key( $sections );
+        if (is_array($sections)) {
+            $key = key($sections);
         }
 
         add_thickbox();
 
-        $registered_sections = wpinv_get_settings_tab_sections( $active_tab );
-        $section             = isset( $_GET['section'] ) && ! empty( $registered_sections ) && array_key_exists( $_GET['section'], $registered_sections ) ? $_GET['section'] : $key;
+        $registered_sections = wpinv_get_settings_tab_sections($active_tab);
+        $section             = isset($_GET['section']) && !empty($registered_sections) && array_key_exists($_GET['section'], $registered_sections) ? $_GET['section'] : $key;
         ob_start();
         ?>
         <div class="wrap">
             <h1 class="nav-tab-wrapper">
                 <?php
-                foreach( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
-                    $tab_url = add_query_arg( array(
+                foreach (wpinv_get_settings_tabs() as $tab_id => $tab_name) {
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $tab_id,
-                    ) );
+                    ));
 
                     // Remove the section from the tabs so we always end up at the main section
-                    $tab_url = remove_query_arg( 'section', $tab_url );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    $tab_url = remove_query_arg('section', $tab_url);
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
 
                     $active = $active_tab == $tab_id ? ' nav-tab-active' : '';
 
-                    echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';
-                    echo esc_html( $tab_name );
+                    echo '<a href="' . esc_url($tab_url) . '" title="' . esc_attr($tab_name) . '" class="nav-tab' . $active . '">';
+                    echo esc_html($tab_name);
                     echo '</a>';
                 }
                 ?>
             </h1>
             <?php
-            $number_of_sections = count( $sections );
+            $number_of_sections = count($sections);
             $number = 0;
-            if ( $number_of_sections > 1 ) {
+            if ($number_of_sections > 1) {
                 echo '<div><ul class="subsubsub">';
-                foreach( $sections as $section_id => $section_name ) {
+                foreach ($sections as $section_id => $section_name) {
                     echo '<li>';
                     $number++;
-                    $tab_url = add_query_arg( array(
+                    $tab_url = add_query_arg(array(
                         'settings-updated' => false,
                         'tab' => $active_tab,
                         'section' => $section_id
-                    ) );
-                    $tab_url = remove_query_arg( 'wpi_sub', $tab_url );
+                    ));
+                    $tab_url = remove_query_arg('wpi_sub', $tab_url);
                     $class = '';
-                    if ( $section == $section_id ) {
+                    if ($section == $section_id) {
                         $class = 'current';
                     }
-                    echo '<a class="' . $class . '" href="' . esc_url( $tab_url ) . '">' . $section_name . '</a>';
+                    echo '<a class="' . $class . '" href="' . esc_url($tab_url) . '">' . $section_name . '</a>';
 
-                    if ( $number != $number_of_sections ) {
+                    if ($number != $number_of_sections) {
                         echo ' | ';
                     }
                     echo '</li>';
@@ -214,20 +214,20 @@ 
                 <form method="post" action="options.php">
                     <table class="form-table">
                         <?php
-                        settings_fields( 'wpinv_settings' );
+                        settings_fields('wpinv_settings');
 
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_top', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_top', $active_tab);
                         }
 
-                        do_action( 'wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_settings_sections( 'wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section );
-                        do_action( 'getpaid_settings_tab_bottom', $active_tab, $section );
+                        do_action('wpinv_settings_tab_top_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_settings_sections('wpinv_settings_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('wpinv_settings_tab_bottom_' . $active_tab . '_' . $section, $active_tab, $section);
+                        do_action('getpaid_settings_tab_bottom', $active_tab, $section);
 
                         // For backwards compatibility
-                        if ( 'main' === $section ) {
-                            do_action( 'wpinv_settings_tab_bottom', $active_tab );
+                        if ('main' === $section) {
+                            do_action('wpinv_settings_tab_bottom', $active_tab);
                         }
                         ?>
                     </table>
@@ -241,7 +241,7 @@ 
     }
 
     public function remove_admin_submenus() {
-        remove_submenu_page( 'edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice' );
+        remove_submenu_page('edit.php?post_type=wpi_invoice', 'post-new.php?post_type=wpi_invoice');
     }
 
     /**
@@ -251,8 +251,8 @@ 
 
         add_meta_box(
             'wpinv_endpoints_nav_link',
-            __( 'GetPaid endpoints', 'invoicing' ),
-            array( $this, 'nav_menu_links' ),
+            __('GetPaid endpoints', 'invoicing'),
+            array($this, 'nav_menu_links'),
             'nav-menus',
             'side',
             'low'
@@ -267,12 +267,12 @@ 
         $endpoints = $this->get_menu_items();
         ?>
         <div id="invoicing-endpoints" class="posttypediv">
-            <?php if ( ! empty( $endpoints['pages'] ) ) : ?>
+            <?php if (!empty($endpoints['pages'])) : ?>
                 <div id="tabs-panel-invoicing-endpoints" class="tabs-panel tabs-panel-active">
                     <ul id="invoicing-endpoints-checklist" class="categorychecklist form-no-clear">
                         <?php
-                            $walker = new Walker_Nav_Menu_Checklist( array() );
-                            echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $endpoints['pages'] ), 0, (object) array( 'walker' => $walker ) );
+                            $walker = new Walker_Nav_Menu_Checklist(array());
+                            echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $endpoints['pages']), 0, (object) array('walker' => $walker));
                         ?>
                     </ul>
                 </div>
@@ -281,11 +281,11 @@ 
             <p class="button-controls wp-clearfix" data-items-type="invoicing-endpoints">
                 <span class="list-controls hide-if-no-js">
                     <input type="checkbox" id="invoicing-endpoints-tab" class="select-all">
-                    <label for="invoicing-endpoints-tab"><?php _e( 'Select all', 'invoicing' ); ?></label>
+                    <label for="invoicing-endpoints-tab"><?php _e('Select all', 'invoicing'); ?></label>
                 </span>
 
                 <span class="add-to-menu">
-                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to menu', 'invoicing' ); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
+                    <input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to menu', 'invoicing'); ?>" name="add-invoicing-endpoints-item" id="submit-invoicing-endpoints">
                     <span class="spinner"></span>
                 </span>
             </p>
@@ -298,35 +298,35 @@ 
      *
      * @return array.
      */
-    public function get_menu_items(){
+    public function get_menu_items() {
         $items = array();
 
         $pages = array(
             array(
-                'id'    => wpinv_get_option( 'invoice_history_page' ),
-                'label' => __( 'My Invoices', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_history_page'),
+                'label' => __('My Invoices', 'invoicing'),
             ),
             array(
-                'id'    => wpinv_get_option( 'invoice_subscription_page' ),
-                'label' => __( 'My Subscriptions', 'invoicing' ),
+                'id'    => wpinv_get_option('invoice_subscription_page'),
+                'label' => __('My Subscriptions', 'invoicing'),
             )
         );
 
-        foreach ( apply_filters( 'getpaid_menu_pages', $pages ) as $page ) {
+        foreach (apply_filters('getpaid_menu_pages', $pages) as $page) {
 
-            if ( (int) $page['id'] > 0 ) {
+            if ((int) $page['id'] > 0) {
 
                 $item                   = new stdClass();
                 $item->object_id        = (int) $page['id'];
                 $item->db_id            = 0;
-                $item->object           =  'page';
+                $item->object           = 'page';
                 $item->menu_item_parent = 0;
                 $item->type             = 'post_type';
-                $item->title            = sanitize_text_field( $page['label'] );
-                $item->url              = get_permalink( (int) $page['id'] );
+                $item->title            = sanitize_text_field($page['label']);
+                $item->url              = get_permalink((int) $page['id']);
                 $item->target           = '';
                 $item->attr_title       = '';
-                $item->classes          = array( 'wpinv-menu-item' );
+                $item->classes          = array('wpinv-menu-item');
                 $item->xfn              = '';
 
                 $items['pages'][]       = $item;
@@ -335,7 +335,7 @@ 
 
         }
 
-        return apply_filters( 'wpinv_menu_items', $items );
+        return apply_filters('wpinv_menu_items', $items);
     }
 
 }

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

Indentation +61 added lines, -61 removed lines

@@ -12,79 +12,79 @@
  */
 class GetPaid_Payment_Form_Submission_Items {
 
-	/**
-	 * Submission items.
-	 * @var GetPaid_Form_Item[]
-	 */
-	public $items = array();
-
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		$data         = $submission->get_data();
-		$payment_form = $submission->get_payment_form();
-
-		// Prepare the selected items.
-		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
-		}
-
-		// For default forms, ensure that an item has been set.
-		if ( $payment_form->is_default() && ( ! $submission->has_invoice() || 'payment_form' == $submission->get_invoice()->get_created_via() ) && isset( $data['getpaid-form-items'] ) ) {
-			$form_items = wpinv_clean( $data['getpaid-form-items'] );
-			$payment_form->set_items( getpaid_convert_items_to_array( $form_items ) );
-		}
+     * Submission items.
+     * @var GetPaid_Form_Item[]
+     */
+    public $items = array();
 
-		// Process each individual item.
-		foreach ( $payment_form->get_items() as $item ) {
-			$this->process_item( $item, $selected_items );
-		}
-
-	}
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        $data         = $submission->get_data();
+        $payment_form = $submission->get_payment_form();
+
+        // Prepare the selected items.
+        $selected_items = array();
+        if ( ! empty( $data['getpaid-items'] ) ) {
+            $selected_items = wpinv_clean( $data['getpaid-items'] );
+        }
+
+        // For default forms, ensure that an item has been set.
+        if ( $payment_form->is_default() && ( ! $submission->has_invoice() || 'payment_form' == $submission->get_invoice()->get_created_via() ) && isset( $data['getpaid-form-items'] ) ) {
+            $form_items = wpinv_clean( $data['getpaid-form-items'] );
+            $payment_form->set_items( getpaid_convert_items_to_array( $form_items ) );
+        }
+
+        // Process each individual item.
+        foreach ( $payment_form->get_items() as $item ) {
+            $this->process_item( $item, $selected_items );
+        }
+
+    }
 
-	/**
-	 * Process a single item.
-	 *
-	 * @param GetPaid_Form_Item $item
-	 * @param array $selected_items
-	 */
-	public function process_item( $item, $selected_items ) {
+    /**
+     * Process a single item.
+     *
+     * @param GetPaid_Form_Item $item
+     * @param array $selected_items
+     */
+    public function process_item( $item, $selected_items ) {
 
-		// Abort if this is an optional item and it has not been selected.
-		if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
-			return;
-		}
+        // Abort if this is an optional item and it has not been selected.
+        if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+            return;
+        }
 
-		// (maybe) let customers change the quantities and prices.
-		if ( isset( $selected_items[ $item->get_id() ] ) ) {
+        // (maybe) let customers change the quantities and prices.
+        if ( isset( $selected_items[ $item->get_id() ] ) ) {
 
-			// Maybe change the quantities.
-			if ( $item->allows_quantities() ) {
-				$item->set_quantity( (float) $selected_items[ $item->get_id() ]['quantity'] );
-			}
+            // Maybe change the quantities.
+            if ( $item->allows_quantities() ) {
+                $item->set_quantity( (float) $selected_items[ $item->get_id() ]['quantity'] );
+            }
 
-			// Maybe change the price.
-			if ( $item->user_can_set_their_price() ) {
-				$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+            // Maybe change the price.
+            if ( $item->user_can_set_their_price() ) {
+                $price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
 
-				if ( $item->get_minimum_price() > $price ) {
-					throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), wpinv_sanitize_amount( $item->get_minimum_price() ) ) );
-				}
+                if ( $item->get_minimum_price() > $price ) {
+                    throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), wpinv_sanitize_amount( $item->get_minimum_price() ) ) );
+                }
 
-				$item->set_price( $price );
+                $item->set_price( $price );
 
-			}
+            }
 
-		}
+        }
 
-		// Save the item.
-		$this->items[] = $item;
+        // Save the item.
+        $this->items[] = $item;
 
-	}
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission itemss class
@@ -23,26 +23,26 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
 
 		// Prepare the selected items.
 		$selected_items = array();
-		if ( ! empty( $data['getpaid-items'] ) ) {
-			$selected_items = wpinv_clean( $data['getpaid-items'] );
+		if (!empty($data['getpaid-items'])) {
+			$selected_items = wpinv_clean($data['getpaid-items']);
 		}
 
 		// For default forms, ensure that an item has been set.
-		if ( $payment_form->is_default() && ( ! $submission->has_invoice() || 'payment_form' == $submission->get_invoice()->get_created_via() ) && isset( $data['getpaid-form-items'] ) ) {
-			$form_items = wpinv_clean( $data['getpaid-form-items'] );
-			$payment_form->set_items( getpaid_convert_items_to_array( $form_items ) );
+		if ($payment_form->is_default() && (!$submission->has_invoice() || 'payment_form' == $submission->get_invoice()->get_created_via()) && isset($data['getpaid-form-items'])) {
+			$form_items = wpinv_clean($data['getpaid-form-items']);
+			$payment_form->set_items(getpaid_convert_items_to_array($form_items));
 		}
 
 		// Process each individual item.
-		foreach ( $payment_form->get_items() as $item ) {
-			$this->process_item( $item, $selected_items );
+		foreach ($payment_form->get_items() as $item) {
+			$this->process_item($item, $selected_items);
 		}
 
 	}
@@ -53,30 +53,30 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param array $selected_items
 	 */
-	public function process_item( $item, $selected_items ) {
+	public function process_item($item, $selected_items) {
 
 		// Abort if this is an optional item and it has not been selected.
-		if ( ! $item->is_required() && ! isset( $selected_items[ $item->get_id() ] ) ) {
+		if (!$item->is_required() && !isset($selected_items[$item->get_id()])) {
 			return;
 		}
 
 		// (maybe) let customers change the quantities and prices.
-		if ( isset( $selected_items[ $item->get_id() ] ) ) {
+		if (isset($selected_items[$item->get_id()])) {
 
 			// Maybe change the quantities.
-			if ( $item->allows_quantities() ) {
-				$item->set_quantity( (float) $selected_items[ $item->get_id() ]['quantity'] );
+			if ($item->allows_quantities()) {
+				$item->set_quantity((float) $selected_items[$item->get_id()]['quantity']);
 			}
 
 			// Maybe change the price.
-			if ( $item->user_can_set_their_price() ) {
-				$price = (float) wpinv_sanitize_amount( $selected_items[ $item->get_id() ]['price'] );
+			if ($item->user_can_set_their_price()) {
+				$price = (float) wpinv_sanitize_amount($selected_items[$item->get_id()]['price']);
 
-				if ( $item->get_minimum_price() > $price ) {
-					throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), wpinv_sanitize_amount( $item->get_minimum_price() ) ) );
+				if ($item->get_minimum_price() > $price) {
+					throw new Exception(sprintf(__('The minimum allowed amount is %s', 'invoicing'), wpinv_sanitize_amount($item->get_minimum_price())));
 				}
 
-				$item->set_price( $price );
+				$item->set_price($price);
 
 			}
 

includes/admin/meta-boxes/class-getpaid-meta-box-item-details.php

Indentation +27 added lines, -27 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -17,10 +17,10 @@ 
 class GetPaid_Meta_Box_Item_Details {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Prepare the item.
@@ -270,35 +270,35 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the item.
         $item = new WPInv_Item( $post_id );
 
         // Load new data.
         $item->set_props(
-			array(
-				'price'                => isset( $_POST['wpinv_item_price'] ) ? (float) $_POST['wpinv_item_price'] : null,
-				'vat_rule'             => isset( $_POST['wpinv_vat_rules'] ) ? wpinv_clean( $_POST['wpinv_vat_rules'] ) : null,
-				'vat_class'            => isset( $_POST['wpinv_vat_class'] ) ? wpinv_clean( $_POST['wpinv_vat_class'] ) : null,
-				'type'                 => isset( $_POST['wpinv_item_type'] ) ? wpinv_clean( $_POST['wpinv_item_type'] ) : null,
-				'is_dynamic_pricing'   => isset( $_POST['wpinv_name_your_price'] ),
+            array(
+                'price'                => isset( $_POST['wpinv_item_price'] ) ? (float) $_POST['wpinv_item_price'] : null,
+                'vat_rule'             => isset( $_POST['wpinv_vat_rules'] ) ? wpinv_clean( $_POST['wpinv_vat_rules'] ) : null,
+                'vat_class'            => isset( $_POST['wpinv_vat_class'] ) ? wpinv_clean( $_POST['wpinv_vat_class'] ) : null,
+                'type'                 => isset( $_POST['wpinv_item_type'] ) ? wpinv_clean( $_POST['wpinv_item_type'] ) : null,
+                'is_dynamic_pricing'   => isset( $_POST['wpinv_name_your_price'] ),
                 'minimum_price'        => isset( $_POST['wpinv_minimum_price'] ) ? (float) $_POST['wpinv_minimum_price'] : null,
-				'is_recurring'         => isset( $_POST['wpinv_is_recurring'] ),
-				'recurring_period'     => isset( $_POST['wpinv_recurring_period'] ) ? wpinv_clean( $_POST['wpinv_recurring_period'] ) : null,
-				'recurring_interval'   => isset( $_POST['wpinv_recurring_interval'] ) ? (int) $_POST['wpinv_recurring_interval'] : 1,
-				'recurring_limit'      => isset( $_POST['wpinv_recurring_limit'] ) ? (int) $_POST['wpinv_recurring_limit'] : null,
-				'is_free_trial'        => isset( $_POST['wpinv_trial_interval'] ) ? ( 0 != (int) $_POST['wpinv_trial_interval'] ) : null,
-				'trial_period'         => isset( $_POST['wpinv_trial_period'] ) ? wpinv_clean( $_POST['wpinv_trial_period'] ) : null,
-				'trial_interval'       => isset( $_POST['wpinv_trial_interval'] ) ? (int) $_POST['wpinv_trial_interval'] : null,
-			)
+                'is_recurring'         => isset( $_POST['wpinv_is_recurring'] ),
+                'recurring_period'     => isset( $_POST['wpinv_recurring_period'] ) ? wpinv_clean( $_POST['wpinv_recurring_period'] ) : null,
+                'recurring_interval'   => isset( $_POST['wpinv_recurring_interval'] ) ? (int) $_POST['wpinv_recurring_interval'] : 1,
+                'recurring_limit'      => isset( $_POST['wpinv_recurring_limit'] ) ? (int) $_POST['wpinv_recurring_limit'] : null,
+                'is_free_trial'        => isset( $_POST['wpinv_trial_interval'] ) ? ( 0 != (int) $_POST['wpinv_trial_interval'] ) : null,
+                'trial_period'         => isset( $_POST['wpinv_trial_period'] ) ? wpinv_clean( $_POST['wpinv_trial_period'] ) : null,
+                'trial_interval'       => isset( $_POST['wpinv_trial_interval'] ) ? (int) $_POST['wpinv_trial_interval'] : null,
+            )
         );
 
-		$item->save();
-		do_action( 'getpaid_item_metabox_save', $post_id, $item );
-	}
+        $item->save();
+        do_action( 'getpaid_item_metabox_save', $post_id, $item );
+    }
 }

Spacing +73 added lines, -73 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,27 +21,27 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Prepare the item.
-        $item = new WPInv_Item( $post );
+        $item = new WPInv_Item($post);
 
         // Nonce field.
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
         // Set the currency position.
         $position = wpinv_currency_position();
 
-        if ( $position == 'left_space' ) {
+        if ($position == 'left_space') {
             $position = 'left';
         }
 
-        if ( $position == 'right_space' ) {
+        if ($position == 'right_space') {
             $position = 'right';
         }
 
         ?>
-        <input type="hidden" id="_wpi_current_type" value="<?php echo esc_attr( $item->get_type( 'edit' ) ); ?>" />
+        <input type="hidden" id="_wpi_current_type" value="<?php echo esc_attr($item->get_type('edit')); ?>" />
         <style>
             #poststuff .input-group-text,
             #poststuff .form-control {
@@ -55,21 +55,21 @@ 
         </style>
         <div class='bsui' style='max-width: 600px;padding-top: 10px;'>
 
-            <?php do_action( 'wpinv_item_details_metabox_before_price', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox_before_price', $item); ?>
             <div class="form-group row">
-                <label class="col-sm-3 col-form-label" for="wpinv_item_price"><span><?php _e( 'Item Price', 'invoicing' )?></span></label>
+                <label class="col-sm-3 col-form-label" for="wpinv_item_price"><span><?php _e('Item Price', 'invoicing')?></span></label>
                 <div class="col-sm-8">
                     <div class="row">
                         <div class="col-sm-4 getpaid-price-input">
                             <div class="input-group input-group-sm">
-                                <?php if( 'left' == $position ) : ?>
+                                <?php if ('left' == $position) : ?>
                                 <div class="input-group-prepend">
                                     <span class="input-group-text" id="wpinv_item_price_symbol"><?php echo wpinv_currency_symbol(); ?></span>
                                 </div>
                                 <?php endif; ?>
-                                <input type="text" name="wpinv_item_price" id="wpinv_item_price" value="<?php echo esc_attr( $item->get_price( 'edit' ) ); ?>" placeholder="<?php echo esc_attr( wpinv_sanitize_amount( 0 ) ); ?>" class="form-control">
+                                <input type="text" name="wpinv_item_price" id="wpinv_item_price" value="<?php echo esc_attr($item->get_price('edit')); ?>" placeholder="<?php echo esc_attr(wpinv_sanitize_amount(0)); ?>" class="form-control">
 
-                                <?php if( 'left' != $position ) : ?>
+                                <?php if ('left' != $position) : ?>
                                 <div class="input-group-append">
                                     <span class="input-group-text" id="wpinv_item_price_symbol"><?php echo wpinv_currency_symbol(); ?></span>
                                 </div>
@@ -79,10 +79,10 @@ 
                         </div>
                         <div class="col-sm-4 wpinv_show_if_recurring">
                             <?php
-                                _e( 'every' );
+                                _e('every');
                                 echo "&nbsp;";
                             ?>
-                            <input type="number" style="max-width: 60px;" value="<?php echo esc_attr( $item->get_recurring_interval( 'edit' ) ); ?>" placeholder="1" name="wpinv_recurring_interval" id="wpinv_recurring_interval" />
+                            <input type="number" style="max-width: 60px;" value="<?php echo esc_attr($item->get_recurring_interval('edit')); ?>" placeholder="1" name="wpinv_recurring_interval" id="wpinv_recurring_interval" />
                         </div>
                         <div class="col-sm-4 wpinv_show_if_recurring">
                             <?php
@@ -90,16 +90,16 @@ 
                                     array(
                                         'id'               => 'wpinv_recurring_period',
                                         'name'             => 'wpinv_recurring_period',
-                                        'label'            => __( 'Period', 'invoicing' ),
-                                        'placeholder'      => __( 'Select Period', 'invoicing' ),
-                                        'value'            => $item->get_recurring_period( 'edit' ),
+                                        'label'            => __('Period', 'invoicing'),
+                                        'placeholder'      => __('Select Period', 'invoicing'),
+                                        'value'            => $item->get_recurring_period('edit'),
                                         'select2'          => true,
                                         'data-allow-clear' => 'false',
                                         'options'     => array(
-                                            'D'  => __( 'day(s)', 'invoicing' ),
-                                            'W'  => __( 'week(s)', 'invoicing' ),
-                                            'M'  => __( 'month(s)', 'invoicing' ),
-                                            'Y'  => __( 'year(s)', 'invoicing' ),
+                                            'D'  => __('day(s)', 'invoicing'),
+                                            'W'  => __('week(s)', 'invoicing'),
+                                            'M'  => __('month(s)', 'invoicing'),
+                                            'Y'  => __('year(s)', 'invoicing'),
                                         )
                                     )
                                 );
@@ -111,9 +111,9 @@ 
                             <?php
 
                                 // Dynamic pricing.
-                                if( $item->supports_dynamic_pricing() ) {
+                                if ($item->supports_dynamic_pricing()) {
 
-                                    do_action( 'wpinv_item_details_metabox_before_dynamic_pricing_checkbox', $item );
+                                    do_action('wpinv_item_details_metabox_before_dynamic_pricing_checkbox', $item);
 
                                     // NYP toggle.
                                     echo aui()->input(
@@ -121,31 +121,31 @@ 
                                             'id'          => 'wpinv_name_your_price',
                                             'name'        => 'wpinv_name_your_price',
                                             'type'        => 'checkbox',
-                                            'label'       => apply_filters( 'wpinv_name_your_price_toggle_text', __( 'Let customers name their price', 'invoicing' ) ),
+                                            'label'       => apply_filters('wpinv_name_your_price_toggle_text', __('Let customers name their price', 'invoicing')),
                                             'value'       => '1',
                                             'checked'     => $item->user_can_set_their_price(),
                                             'no_wrap'     => true,
                                         )
                                     );
 
-                                    do_action( 'wpinv_item_details_metabox_dynamic_pricing_checkbox', $item );
+                                    do_action('wpinv_item_details_metabox_dynamic_pricing_checkbox', $item);
 
                                 }
 
                                 // Subscriptions.
-                                do_action( 'wpinv_item_details_metabox_before_subscription_checkbox', $item );
+                                do_action('wpinv_item_details_metabox_before_subscription_checkbox', $item);
                                 echo aui()->input(
                                     array(
                                         'id'          => 'wpinv_is_recurring',
                                         'name'        => 'wpinv_is_recurring',
                                         'type'        => 'checkbox',
-                                        'label'       => apply_filters( 'wpinv_is_recurring_toggle_text', __( 'Charge customers a recurring amount for this item', 'invoicing' ) ),
+                                        'label'       => apply_filters('wpinv_is_recurring_toggle_text', __('Charge customers a recurring amount for this item', 'invoicing')),
                                         'value'       => '1',
                                         'checked'     => $item->is_recurring(),
                                         'no_wrap'     => true,
                                     )
                                 );
-                                do_action( 'wpinv_item_details_metabox_subscription_checkbox', $item );
+                                do_action('wpinv_item_details_metabox_subscription_checkbox', $item);
 
                             ?>
                             <div class="wpinv_show_if_recurring">
@@ -155,30 +155,30 @@ 
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help wpinv_show_if_recurring" title="<?php esc_attr_e( 'Set the subscription price, billing interval and period.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help wpinv_show_if_recurring" title="<?php esc_attr_e('Set the subscription price, billing interval and period.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_item_details_metabox_after_price', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox_after_price', $item); ?>
 
-            <?php if( $item->supports_dynamic_pricing() ) : ?>
-                <?php do_action( 'wpinv_item_details_metabox_before_minimum_price', $item ); ?>
+            <?php if ($item->supports_dynamic_pricing()) : ?>
+                <?php do_action('wpinv_item_details_metabox_before_minimum_price', $item); ?>
                 <div class="wpinv_show_if_dynamic wpinv_minimum_price">
 
                     <div class="form-group row">
                         <label for="wpinv_minimum_price" class="col-sm-3 col-form-label">
-                            <?php _e( 'Minimum Price', 'invoicing' );?>
+                            <?php _e('Minimum Price', 'invoicing'); ?>
                         </label>
                         <div class="col-sm-8">
                             <div class="input-group input-group-sm">
-                                <?php if( 'left' == $position ) : ?>
+                                <?php if ('left' == $position) : ?>
                                     <div class="input-group-prepend">
                                         <span class="input-group-text" id="wpinv_item_minimum_price_symbol"><?php echo wpinv_currency_symbol(); ?></span>
                                     </div>
                                 <?php endif; ?>
 
-                                <input type="text" name="wpinv_minimum_price" id="wpinv_minimum_price" value="<?php echo esc_attr( $item->get_minimum_price( 'edit' ) ); ?>" placeholder="<?php echo esc_attr( wpinv_sanitize_amount( 0 ) ); ?>" class="form-control">
+                                <input type="text" name="wpinv_minimum_price" id="wpinv_minimum_price" value="<?php echo esc_attr($item->get_minimum_price('edit')); ?>" placeholder="<?php echo esc_attr(wpinv_sanitize_amount(0)); ?>" class="form-control">
 
-                                <?php if( 'left' != $position ) : ?>
+                                <?php if ('left' != $position) : ?>
                                     <div class="input-group-append">
                                         <span class="input-group-text" id="wpinv_item_minimum_price_symbol"><?php echo wpinv_currency_symbol(); ?></span>
                                     </div>
@@ -187,45 +187,45 @@ 
                         </div>
 
                         <div class="col-sm-1 pt-2 pl-0">
-                            <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Enter the minimum amount that users are allowed to set', 'invoicing' ); ?>"></span>
+                            <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Enter the minimum amount that users are allowed to set', 'invoicing'); ?>"></span>
                         </div>
                     </div>
 
                 </div>
-                <?php do_action( 'wpinv_item_details_metabox_minimum_price', $item ); ?>
+                <?php do_action('wpinv_item_details_metabox_minimum_price', $item); ?>
             <?php endif; ?>
 
-            <?php do_action( 'wpinv_item_details_metabox_before_maximum_renewals', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox_before_maximum_renewals', $item); ?>
             <div class="wpinv_show_if_recurring wpinv_maximum_renewals">
 
                 <div class="form-group row">
                     <label for="wpinv_recurring_limit" class="col-sm-3 col-form-label">
-                        <?php _e( 'Maximum Renewals', 'invoicing' );?>
+                        <?php _e('Maximum Renewals', 'invoicing'); ?>
                     </label>
                     <div class="col-sm-8">
-                        <input type="number" value="<?php echo esc_attr( $item->get_recurring_limit( 'edit' ) ); ?>" placeholder="0" name="wpinv_recurring_limit" id="wpinv_recurring_limit" style="width: 100%;" />
+                        <input type="number" value="<?php echo esc_attr($item->get_recurring_limit('edit')); ?>" placeholder="0" name="wpinv_recurring_limit" id="wpinv_recurring_limit" style="width: 100%;" />
                     </div>
                     <div class="col-sm-1 pt-2 pl-0">
-                        <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Leave empty if you want the subscription to renew until it is cancelled.', 'invoicing' ); ?>"></span>
+                        <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Leave empty if you want the subscription to renew until it is cancelled.', 'invoicing'); ?>"></span>
                     </div>
                 </div>
 
             </div>
-            <?php do_action( 'wpinv_item_details_metabox_maximum_renewals', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox_maximum_renewals', $item); ?>
 
-            <?php do_action( 'wpinv_item_details_metabox_before_free_trial', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox_before_free_trial', $item); ?>
             <div class="wpinv_show_if_recurring wpinv_free_trial">
 
                 <div class="form-group row">
-                    <label class="col-sm-3 col-form-label" for="wpinv_trial_interval"><?php _e( 'Free Trial', 'invoicing' )?></label>
+                    <label class="col-sm-3 col-form-label" for="wpinv_trial_interval"><?php _e('Free Trial', 'invoicing')?></label>
 
                     <div class="col-sm-8">
                         <div class="row">
                             <div class="col-sm-6">
-                                <?php $value = $item->has_free_trial() ? $item->get_trial_interval( 'edit' ) : 0;?>
+                                <?php $value = $item->has_free_trial() ? $item->get_trial_interval('edit') : 0; ?>
 
                                 <div>
-                                    <input type="number" name="wpinv_trial_interval" style="width: 100%;" placeholder="0" id="wpinv_trial_interval" value="<?php echo esc_attr( $value ); ?>" >
+                                    <input type="number" name="wpinv_trial_interval" style="width: 100%;" placeholder="0" id="wpinv_trial_interval" value="<?php echo esc_attr($value); ?>" >
                                 </div>
                             </div>
                             <div class="col-sm-6">
@@ -234,17 +234,17 @@ 
                                         array(
                                             'id'               => 'wpinv_trial_period',
                                             'name'             => 'wpinv_trial_period',
-                                            'label'            => __( 'Trial Period', 'invoicing' ),
-                                            'placeholder'      => __( 'Trial Period', 'invoicing' ),
-                                            'value'            => $item->get_trial_period( 'edit' ),
+                                            'label'            => __('Trial Period', 'invoicing'),
+                                            'placeholder'      => __('Trial Period', 'invoicing'),
+                                            'value'            => $item->get_trial_period('edit'),
                                             'select2'          => true,
                                             'data-allow-clear' => 'false',
                                             'no_wrap'          => true,
                                             'options'          => array(
-                                                'D'  => __( 'day(s)', 'invoicing' ),
-                                                'W'  => __( 'week(s)', 'invoicing' ),
-                                                'M'  => __( 'month(s)', 'invoicing' ),
-                                                'Y'  => __( 'year(s)', 'invoicing' ),
+                                                'D'  => __('day(s)', 'invoicing'),
+                                                'W'  => __('week(s)', 'invoicing'),
+                                                'M'  => __('month(s)', 'invoicing'),
+                                                'Y'  => __('year(s)', 'invoicing'),
                                             )
                                         )
                                     );
@@ -255,15 +255,15 @@ 
                     </div>
 
                     <div class="col-sm-1 pt-2 pl-0">
-                        <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'An optional period of time to wait before charging the first recurring payment.', 'invoicing' ); ?>"></span>
+                        <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('An optional period of time to wait before charging the first recurring payment.', 'invoicing'); ?>"></span>
                     </div>
 
                 </div>
 
             </div>
-            <?php do_action( 'wpinv_item_details_metabox__free_trial', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox__free_trial', $item); ?>
 
-            <?php do_action( 'wpinv_item_details_metabox_item_details', $item ); ?>
+            <?php do_action('wpinv_item_details_metabox_item_details', $item); ?>
         </div>
         <?php
 
@@ -274,31 +274,31 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the item.
-        $item = new WPInv_Item( $post_id );
+        $item = new WPInv_Item($post_id);
 
         // Load new data.
         $item->set_props(
 			array(
-				'price'                => isset( $_POST['wpinv_item_price'] ) ? (float) $_POST['wpinv_item_price'] : null,
-				'vat_rule'             => isset( $_POST['wpinv_vat_rules'] ) ? wpinv_clean( $_POST['wpinv_vat_rules'] ) : null,
-				'vat_class'            => isset( $_POST['wpinv_vat_class'] ) ? wpinv_clean( $_POST['wpinv_vat_class'] ) : null,
-				'type'                 => isset( $_POST['wpinv_item_type'] ) ? wpinv_clean( $_POST['wpinv_item_type'] ) : null,
-				'is_dynamic_pricing'   => isset( $_POST['wpinv_name_your_price'] ),
-                'minimum_price'        => isset( $_POST['wpinv_minimum_price'] ) ? (float) $_POST['wpinv_minimum_price'] : null,
-				'is_recurring'         => isset( $_POST['wpinv_is_recurring'] ),
-				'recurring_period'     => isset( $_POST['wpinv_recurring_period'] ) ? wpinv_clean( $_POST['wpinv_recurring_period'] ) : null,
-				'recurring_interval'   => isset( $_POST['wpinv_recurring_interval'] ) ? (int) $_POST['wpinv_recurring_interval'] : 1,
-				'recurring_limit'      => isset( $_POST['wpinv_recurring_limit'] ) ? (int) $_POST['wpinv_recurring_limit'] : null,
-				'is_free_trial'        => isset( $_POST['wpinv_trial_interval'] ) ? ( 0 != (int) $_POST['wpinv_trial_interval'] ) : null,
-				'trial_period'         => isset( $_POST['wpinv_trial_period'] ) ? wpinv_clean( $_POST['wpinv_trial_period'] ) : null,
-				'trial_interval'       => isset( $_POST['wpinv_trial_interval'] ) ? (int) $_POST['wpinv_trial_interval'] : null,
+				'price'                => isset($_POST['wpinv_item_price']) ? (float) $_POST['wpinv_item_price'] : null,
+				'vat_rule'             => isset($_POST['wpinv_vat_rules']) ? wpinv_clean($_POST['wpinv_vat_rules']) : null,
+				'vat_class'            => isset($_POST['wpinv_vat_class']) ? wpinv_clean($_POST['wpinv_vat_class']) : null,
+				'type'                 => isset($_POST['wpinv_item_type']) ? wpinv_clean($_POST['wpinv_item_type']) : null,
+				'is_dynamic_pricing'   => isset($_POST['wpinv_name_your_price']),
+                'minimum_price'        => isset($_POST['wpinv_minimum_price']) ? (float) $_POST['wpinv_minimum_price'] : null,
+				'is_recurring'         => isset($_POST['wpinv_is_recurring']),
+				'recurring_period'     => isset($_POST['wpinv_recurring_period']) ? wpinv_clean($_POST['wpinv_recurring_period']) : null,
+				'recurring_interval'   => isset($_POST['wpinv_recurring_interval']) ? (int) $_POST['wpinv_recurring_interval'] : 1,
+				'recurring_limit'      => isset($_POST['wpinv_recurring_limit']) ? (int) $_POST['wpinv_recurring_limit'] : null,
+				'is_free_trial'        => isset($_POST['wpinv_trial_interval']) ? (0 != (int) $_POST['wpinv_trial_interval']) : null,
+				'trial_period'         => isset($_POST['wpinv_trial_period']) ? wpinv_clean($_POST['wpinv_trial_period']) : null,
+				'trial_interval'       => isset($_POST['wpinv_trial_interval']) ? (int) $_POST['wpinv_trial_interval'] : null,
 			)
         );
 
 		$item->save();
-		do_action( 'getpaid_item_metabox_save', $post_id, $item );
+		do_action('getpaid_item_metabox_save', $post_id, $item);
 	}
 }

includes/admin/class-getpaid-post-types-admin.php

Indentation +653 added lines, -653 removed lines

@@ -13,648 +13,648 @@ 
 class GetPaid_Post_Types_Admin {
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Init metaboxes.
-		GetPaid_Metaboxes::init();
-
-		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
-
-		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
-
-		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-
-		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
-
-		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
-
-		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
-
-		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
-
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
-	}
-
-	/**
-	 * Post updated messages.
-	 */
-	public static function post_updated_messages( $messages ) {
-		global $post;
-
-		$messages['wpi_discount'] = array(
-			0   => '',
-			1   => __( 'Discount updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Discount updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Discount updated.', 'invoicing' ),
-			7   => __( 'Discount saved.', 'invoicing' ),
-			8   => __( 'Discount submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Discount draft updated.', 'invoicing' ),
-		);
-
-		$messages['wpi_payment_form'] = array(
-			0   => '',
-			1   => __( 'Payment Form updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Payment Form updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Payment Form updated.', 'invoicing' ),
-			7   => __( 'Payment Form saved.', 'invoicing' ),
-			8   => __( 'Payment Form submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Payment Form draft updated.', 'invoicing' ),
-		);
-
-		return $messages;
-
-	}
-
-	/**
-	 * Post row actions.
-	 */
-	public static function post_row_actions( $actions, $post ) {
-
-		$post = get_post( $post );
-
-		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
-			unset( $actions['trash'] );
-			unset( $actions['inline hide-if-no-js'] );
-		}
-
-		return $actions;
-	}
-
-	/**
+     * Hook in methods.
+     */
+    public static function init() {
+
+        // Init metaboxes.
+        GetPaid_Metaboxes::init();
+
+        // Filter the post updated messages.
+        add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+
+        // Filter post actions.
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+
+        // Invoice table columns.
+        add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
+        add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
+
+        // Items table columns.
+        add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
+        add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
+        add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
+        add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
+        add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
+        add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+
+        // Payment forms columns.
+        add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
+        add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+
+        // Discount table columns.
+        add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
+        add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+
+        // Deleting posts.
+        add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+
+        add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+    }
+
+    /**
+     * Post updated messages.
+     */
+    public static function post_updated_messages( $messages ) {
+        global $post;
+
+        $messages['wpi_discount'] = array(
+            0   => '',
+            1   => __( 'Discount updated.', 'invoicing' ),
+            2   => __( 'Custom field updated.', 'invoicing' ),
+            3   => __( 'Custom field deleted.', 'invoicing' ),
+            4   => __( 'Discount updated.', 'invoicing' ),
+            5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6   => __( 'Discount updated.', 'invoicing' ),
+            7   => __( 'Discount saved.', 'invoicing' ),
+            8   => __( 'Discount submitted.', 'invoicing' ),
+            9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10  => __( 'Discount draft updated.', 'invoicing' ),
+        );
+
+        $messages['wpi_payment_form'] = array(
+            0   => '',
+            1   => __( 'Payment Form updated.', 'invoicing' ),
+            2   => __( 'Custom field updated.', 'invoicing' ),
+            3   => __( 'Custom field deleted.', 'invoicing' ),
+            4   => __( 'Payment Form updated.', 'invoicing' ),
+            5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6   => __( 'Payment Form updated.', 'invoicing' ),
+            7   => __( 'Payment Form saved.', 'invoicing' ),
+            8   => __( 'Payment Form submitted.', 'invoicing' ),
+            9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10  => __( 'Payment Form draft updated.', 'invoicing' ),
+        );
+
+        return $messages;
+
+    }
+
+    /**
+     * Post row actions.
+     */
+    public static function post_row_actions( $actions, $post ) {
+
+        $post = get_post( $post );
+
+        // We do not want to edit the default payment form.
+        if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
+            unset( $actions['trash'] );
+            unset( $actions['inline hide-if-no-js'] );
+        }
+
+        return $actions;
+    }
+
+    /**
      * Remove bulk edit option from admin side quote listing
      *
      * @since    1.0.0
      * @param array $actions post actions
-	 * @param WP_Post $post
+     * @param WP_Post $post
      * @return array $actions actions without edit option
      */
     public static function filter_invoice_row_actions( $actions, $post ) {
 
         if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
-
-			$actions['edit'] =  sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
-			);
-
-			if ( ! $invoice->is_draft() ) {
-
-				$actions['view'] =  sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
-					sprintf(
-						esc_html( __( 'View %s', 'invoicing' ) ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
-					)
-				);
-
-				$actions['send'] =  sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url(
-						wp_nonce_url(
-							add_query_arg(
-								array(
-									'getpaid-admin-action' => 'send_invoice',
-									'invoice_id'           => $invoice->get_id()
-								)
-							),
-							'getpaid-nonce',
-							'getpaid-nonce'
-						)
-					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
-				);
-
-			}
+            $actions = array();
+            $invoice = new WPInv_Invoice( $post );
+
+            $actions['edit'] =  sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                esc_html( __( 'Edit', 'invoicing' ) )
+            );
+
+            if ( ! $invoice->is_draft() ) {
+
+                $actions['view'] =  sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( $invoice->get_view_url() ),
+                    sprintf(
+                        esc_html( __( 'View %s', 'invoicing' ) ),
+                        getpaid_get_post_type_label( $invoice->get_post_type(), false )
+                    )
+                );
+
+                $actions['send'] =  sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url(
+                        wp_nonce_url(
+                            add_query_arg(
+                                array(
+                                    'getpaid-admin-action' => 'send_invoice',
+                                    'invoice_id'           => $invoice->get_id()
+                                )
+                            ),
+                            'getpaid-nonce',
+                            'getpaid-nonce'
+                        )
+                    ),
+                    esc_html( __( 'Send to Customer', 'invoicing' ) )
+                );
+
+            }
 
         }
 
         return $actions;
-	}
-
-	/**
-	 * Returns an array of invoice table columns.
-	 */
-	public static function invoice_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'number'            => __( 'Invoice', 'invoicing' ),
-			'customer'          => __( 'Customer', 'invoicing' ),
-			'invoice_date'      => __( 'Created', 'invoicing' ),
-			'payment_date'      => __( 'Completed', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'recurring'         => __( 'Recurring', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
-	}
-
-	/**
-	 * Displays invoice table columns.
-	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
-
-		$invoice = new WPInv_Invoice( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'invoice_date' :
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = getpaid_format_date_value( $date_time, "&mdash;", true );
-				echo "<span title='$date_time'>$date</span>";
-				break;
-
-			case 'payment_date' :
-
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = getpaid_format_date_value( $date_time, "&mdash;", true );
-					echo "<span title='$date_time'>$date</span>";
-				} else {
-					echo "&mdash;";
-				}
+    }
+
+    /**
+     * Returns an array of invoice table columns.
+     */
+    public static function invoice_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'number'            => __( 'Invoice', 'invoicing' ),
+            'customer'          => __( 'Customer', 'invoicing' ),
+            'invoice_date'      => __( 'Created', 'invoicing' ),
+            'payment_date'      => __( 'Completed', 'invoicing' ),
+            'amount'            => __( 'Amount', 'invoicing' ),
+            'recurring'         => __( 'Recurring', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_invoice_table_columns', $columns );
+    }
+
+    /**
+     * Displays invoice table columns.
+     */
+    public static function display_invoice_columns( $column_name, $post_id ) {
+
+        $invoice = new WPInv_Invoice( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'invoice_date' :
+                $date_time = esc_attr( $invoice->get_created_date() );
+                $date      = getpaid_format_date_value( $date_time, "&mdash;", true );
+                echo "<span title='$date_time'>$date</span>";
+                break;
+
+            case 'payment_date' :
+
+                if ( $invoice->is_paid() ) {
+                    $date_time = esc_attr( $invoice->get_completed_date() );
+                    $date      = getpaid_format_date_value( $date_time, "&mdash;", true );
+                    echo "<span title='$date_time'>$date</span>";
+                } else {
+                    echo "&mdash;";
+                }
 				
-				break;
+                break;
 
-			case 'amount' :
+            case 'amount' :
 
-				$amount = $invoice->get_total();
-				$formated_amount = wpinv_price( $amount, $invoice->get_currency() );
+                $amount = $invoice->get_total();
+                $formated_amount = wpinv_price( $amount, $invoice->get_currency() );
 
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( 0, $invoice->get_currency() );
-					echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
-				} else {
+                if ( $invoice->is_refunded() ) {
+                    $refunded_amount = wpinv_price( 0, $invoice->get_currency() );
+                    echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
+                } else {
 
-					$discount = $invoice->get_total_discount();
+                    $discount = $invoice->get_total_discount();
 
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
-						echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
-					} else {
-						echo $formated_amount;
-					}
+                    if ( ! empty( $discount ) ) {
+                        $new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
+                        echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
+                    } else {
+                        echo $formated_amount;
+                    }
 
-				}
+                }
 
-				break;
+                break;
 
-			case 'status' :
-				$status       = sanitize_text_field( $invoice->get_status() );
-				$status_label = sanitize_text_field( $invoice->get_status_nicename() );
+            case 'status' :
+                $status       = sanitize_text_field( $invoice->get_status() );
+                $status_label = sanitize_text_field( $invoice->get_status_nicename() );
 
-				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = sanitize_text_field( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), $gateway );
+                // If it is paid, show the gateway title.
+                if ( $invoice->is_paid() ) {
+                    $gateway = sanitize_text_field( $invoice->get_gateway_title() );
+                    $gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), $gateway );
 
-					echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
-				} else {
-					echo "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>";
-				}
+                    echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
+                } else {
+                    echo "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>";
+                }
 
-				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+                // If it is not paid, display the overdue and view status.
+                if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
 
-					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
-					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
-					}
+                    // Invoice view status.
+                    if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+                    } else {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
+                    }
 
-					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
-						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+                    // Display the overview status.
+                    if ( wpinv_get_option( 'overdue_active' ) ) {
+                        $due_date = $invoice->get_due_date();
+                        $fomatted = getpaid_format_date( $due_date );
 
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
-							echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
-						}
-					}
+                        if ( ! empty( $fomatted ) ) {
+                            $date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
+                            echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
+                        }
+                    }
 
-				}
+                }
 
-				break;
+                break;
 
-			case 'recurring':
+            case 'recurring':
 
-				if ( $invoice->is_recurring() ) {
-					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
-				} else {
-					echo '<i class="fa fa-times" style="color:#616161;"></i>';
-				}
-				break;
+                if ( $invoice->is_recurring() ) {
+                    echo '<i class="fa fa-check" style="color:#43850a;"></i>';
+                } else {
+                    echo '<i class="fa fa-times" style="color:#616161;"></i>';
+                }
+                break;
 
-			case 'number' :
+            case 'number' :
 
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = sanitize_text_field( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+                $edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
+                $invoice_number  = sanitize_text_field( $invoice->get_number() );
+                $invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
 
-				echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
+                echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
 
-				break;
+                break;
 
-			case 'customer' :
+            case 'customer' :
 	
-				$customer_name = $invoice->get_user_full_name();
+                $customer_name = $invoice->get_user_full_name();
 	
-				if ( empty( $customer_name ) ) {
-					$customer_name = $invoice->get_email();
-				}
+                if ( empty( $customer_name ) ) {
+                    $customer_name = $invoice->get_email();
+                }
 	
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
-					echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
-				} else {
-					echo '<div>&mdash;</div>';
-				}
+                if ( ! empty( $customer_name ) ) {
+                    $customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
+                    $view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+                    echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
+                } else {
+                    echo '<div>&mdash;</div>';
+                }
 
-				break;
+                break;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Returns an array of payment forms table columns.
-	 */
-	public static function payment_form_columns( $columns ) {
+    /**
+     * Returns an array of payment forms table columns.
+     */
+    public static function payment_form_columns( $columns ) {
 
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-			'earnings'          => __( 'Revenue', 'invoicing' ),
-			'refunds'           => __( 'Refunded', 'invoicing' ),
-			'items'             => __( 'Items', 'invoicing' ),
-			'date'              => __( 'Date', 'invoicing' ),
-		);
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'shortcode'         => __( 'Shortcode', 'invoicing' ),
+            'earnings'          => __( 'Revenue', 'invoicing' ),
+            'refunds'           => __( 'Refunded', 'invoicing' ),
+            'items'             => __( 'Items', 'invoicing' ),
+            'date'              => __( 'Date', 'invoicing' ),
+        );
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+        return apply_filters( 'wpi_payment_form_table_columns', $columns );
 
-	}
+    }
 
-	/**
-	 * Displays payment form table columns.
-	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+    /**
+     * Displays payment form table columns.
+     */
+    public static function display_payment_form_columns( $column_name, $post_id ) {
 
-		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+        // Retrieve the payment form.
+        $form = new GetPaid_Payment_Form( $post_id );
 
-		switch ( $column_name ) {
+        switch ( $column_name ) {
 
-			case 'earnings' :
-				echo wpinv_price( $form->get_earned() );
-				break;
+            case 'earnings' :
+                echo wpinv_price( $form->get_earned() );
+                break;
 
-			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
-				break;
+            case 'refunds' :
+                echo wpinv_price( $form->get_refunded() );
+                break;
 
-			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
-				break;
+            case 'refunds' :
+                echo wpinv_price( $form->get_refunded() );
+                break;
 
-			case 'shortcode' :
+            case 'shortcode' :
 
-				if ( $form->is_default() ) {
-					echo '&mdash;';
-				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
-				}
+                if ( $form->is_default() ) {
+                    echo '&mdash;';
+                } else {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+                }
 
-				break;
+                break;
 
-			case 'items' :
+            case 'items' :
 
-				$items = $form->get_items();
+                $items = $form->get_items();
 
-				if ( $form->is_default() || empty( $items ) ) {
-					echo '&mdash;';
-					return;
-				}
+                if ( $form->is_default() || empty( $items ) ) {
+                    echo '&mdash;';
+                    return;
+                }
 
-				$_items = array();
+                $_items = array();
 
-				foreach ( $items as $item ) {
-					$url = $item->get_edit_url();
+                foreach ( $items as $item ) {
+                    $url = $item->get_edit_url();
 
-					if ( empty( $url ) ) {
-						$_items[] = sanitize_text_field( $item->get_name() );
-					} else {
-						$_items[] = sprintf(
-							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							sanitize_text_field( $item->get_name() )
-						);
-					}
+                    if ( empty( $url ) ) {
+                        $_items[] = sanitize_text_field( $item->get_name() );
+                    } else {
+                        $_items[] = sprintf(
+                            '<a href="%s">%s</a>',
+                            esc_url( $url ),
+                            sanitize_text_field( $item->get_name() )
+                        );
+                    }
 
-				}
+                }
 
-				echo implode( '<br>', $_items );
+                echo implode( '<br>', $_items );
 
-				break;
+                break;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+    /**
+     * Filters post states.
+     */
+    public static function filter_payment_form_state( $post_states, $post ) {
 
-		if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
-			$post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
-		}
+        if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
+            $post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
+        }
 	
-		return $post_states;
-
-	}
-
-	/**
-	 * Returns an array of coupon table columns.
-	 */
-	public static function discount_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'code'              => __( 'Code', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'usage'             => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_discount_table_columns', $columns );
-	}
-
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_discount_state( $post_states, $post ) {
-
-		if ( 'wpi_discount' == $post->post_type ) {
-
-			$discount = new WPInv_Discount( $post );
-
-			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
-
-			if ( $status != 'publish' ) {
-				return array(
-					'discount_status' => wpinv_discount_status( $status ),
-				);
-			}
-
-			return array();
-
-		}
-
-		return $post_states;
-
-	}
-
-	/**
-	 * Returns an array of items table columns.
-	 */
-	public static function item_columns( $columns ) {
-
-		$columns = array(
-			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'price'             => __( 'Price', 'invoicing' ),
-			'vat_rule'          => __( 'VAT rule', 'invoicing' ),
-			'vat_class'         => __( 'VAT class', 'invoicing' ),
-			'type'              => __( 'Type', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-		);
-
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
-		}
-
-		return apply_filters( 'wpi_item_table_columns', $columns );
-	}
-
-	/**
-	 * Returns an array of sortable items table columns.
-	 */
-	public static function sortable_item_columns( $columns ) {
-
-		return array_merge(
-			$columns,
-			array(
-				'price'     => 'price',
-				'vat_rule'  => 'vat_rule',
-				'vat_class' => 'vat_class',
-				'type'      => 'type',
-			)
-		);
-
-	}
-
-	/**
-	 * Displays items table columns.
-	 */
-	public static function display_item_columns( $column_name, $post_id ) {
+        return $post_states;
+
+    }
+
+    /**
+     * Returns an array of coupon table columns.
+     */
+    public static function discount_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'code'              => __( 'Code', 'invoicing' ),
+            'amount'            => __( 'Amount', 'invoicing' ),
+            'usage'             => __( 'Usage / Limit', 'invoicing' ),
+            'start_date'        => __( 'Start Date', 'invoicing' ),
+            'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_discount_table_columns', $columns );
+    }
+
+    /**
+     * Filters post states.
+     */
+    public static function filter_discount_state( $post_states, $post ) {
+
+        if ( 'wpi_discount' == $post->post_type ) {
+
+            $discount = new WPInv_Discount( $post );
+
+            $status = $discount->is_expired() ? 'expired' : $discount->get_status();
+
+            if ( $status != 'publish' ) {
+                return array(
+                    'discount_status' => wpinv_discount_status( $status ),
+                );
+            }
+
+            return array();
+
+        }
+
+        return $post_states;
+
+    }
+
+    /**
+     * Returns an array of items table columns.
+     */
+    public static function item_columns( $columns ) {
+
+        $columns = array(
+            'cb'                => $columns['cb'],
+            'title'             => __( 'Name', 'invoicing' ),
+            'price'             => __( 'Price', 'invoicing' ),
+            'vat_rule'          => __( 'VAT rule', 'invoicing' ),
+            'vat_class'         => __( 'VAT class', 'invoicing' ),
+            'type'              => __( 'Type', 'invoicing' ),
+            'shortcode'         => __( 'Shortcode', 'invoicing' ),
+        );
+
+        if ( ! wpinv_use_taxes() ) {
+            unset( $columns['vat_rule'] );
+            unset( $columns['vat_class'] );
+        }
+
+        return apply_filters( 'wpi_item_table_columns', $columns );
+    }
+
+    /**
+     * Returns an array of sortable items table columns.
+     */
+    public static function sortable_item_columns( $columns ) {
+
+        return array_merge(
+            $columns,
+            array(
+                'price'     => 'price',
+                'vat_rule'  => 'vat_rule',
+                'vat_class' => 'vat_class',
+                'type'      => 'type',
+            )
+        );
+
+    }
+
+    /**
+     * Displays items table columns.
+     */
+    public static function display_item_columns( $column_name, $post_id ) {
  
-		$item = new WPInv_Item( $post_id );
+        $item = new WPInv_Item( $post_id );
 
-		switch ( $column_name ) {
+        switch ( $column_name ) {
 
-			case 'price' :
+            case 'price' :
 
-				if ( ! $item->is_recurring() ) {
-					echo $item->get_the_price();
-					break;
-				}
+                if ( ! $item->is_recurring() ) {
+                    echo $item->get_the_price();
+                    break;
+                }
 
-				$price = wp_sprintf(
-					__( '%s / %s', 'invoicing' ),
-					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
-				);
+                $price = wp_sprintf(
+                    __( '%s / %s', 'invoicing' ),
+                    $item->get_the_price(),
+                    getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+                );
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
-					echo $price;
-					break;
-				}
+                if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+                    echo $price;
+                    break;
+                }
 
-				echo $item->get_the_initial_price();
+                echo $item->get_the_initial_price();
 
-				echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
-				break;
+                echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
+                break;
 
-			case 'vat_rule' :
-				echo getpaid_get_tax_rule_label( $item->get_vat_rule() );
-				break;
+            case 'vat_rule' :
+                echo getpaid_get_tax_rule_label( $item->get_vat_rule() );
+                break;
 
-			case 'vat_class' :
-				echo getpaid_get_tax_class_label( $item->get_vat_class() );
-				break;
+            case 'vat_class' :
+                echo getpaid_get_tax_class_label( $item->get_vat_class() );
+                break;
 
-			case 'shortcode' :
-				echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
-				break;
+            case 'shortcode' :
+                echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+                break;
 
-			case 'type' :
-				echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
-				break;
+            case 'type' :
+                echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
+                break;
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Lets users filter items using taxes.
-	 */
-	public static function add_item_filters( $post_type ) {
+    /**
+     * Lets users filter items using taxes.
+     */
+    public static function add_item_filters( $post_type ) {
 
-		// Abort if we're not dealing with items.
-		if ( $post_type != 'wpi_item' ) {
-			return;
-		}
+        // Abort if we're not dealing with items.
+        if ( $post_type != 'wpi_item' ) {
+            return;
+        }
 
-		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
+        // Filter by vat rules.
+        if ( wpinv_use_taxes() ) {
 	
-			// Sanitize selected vat rule.
-			$vat_rule   = '';
-			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) {
-				$vat_rule   =  $_GET['vat_rule'];
-			}
-
-			// Filter by VAT rule.
-			echo wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All VAT rules', 'invoicing' )
-						),
-						$vat_rules
-					),
-					'name'             => 'vat_rule',
-					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-			// Filter by VAT class.
+            // Sanitize selected vat rule.
+            $vat_rule   = '';
+            $vat_rules  = getpaid_get_tax_rules();
+            if ( isset( $_GET['vat_rule'] ) ) {
+                $vat_rule   =  $_GET['vat_rule'];
+            }
+
+            // Filter by VAT rule.
+            echo wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All VAT rules', 'invoicing' )
+                        ),
+                        $vat_rules
+                    ),
+                    'name'             => 'vat_rule',
+                    'id'               => 'vat_rule',
+                    'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+            // Filter by VAT class.
 	
-			// Sanitize selected vat rule.
-			$vat_class   = '';
-			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {
-				$vat_class   =  $_GET['vat_class'];
-			}
-
-			echo wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All VAT classes', 'invoicing' )
-						),
-						$vat_classes
-					),
-					'name'             => 'vat_class',
-					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-		}
-
-		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {
-			$type   =  $_GET['type'];
-		}
-
-		echo wpinv_html_select(
-			array(
-				'options'          => array_merge(
-					array(
-						'' => __( 'All item types', 'invoicing' )
-					),
-					wpinv_get_item_types()
-				),
-				'name'             => 'type',
-				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
-				'show_option_all'  => false,
-				'show_option_none' => false,
-			)
-		);
-
-	}
-
-	/**
-	 * Filters the item query.
-	 */
-	public static function filter_item_query( $query ) {
-
-		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ){ 
-			return $query;
-		}
-
-		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' != $query->query['post_type'] ){
-			return $query;
-		}
-
-		if ( empty( $query->query_vars['meta_query'] ) ) {
-			$query->query_vars['meta_query'] = array();
-		}
-
-		// Filter vat rule type
+            // Sanitize selected vat rule.
+            $vat_class   = '';
+            $vat_classes = getpaid_get_tax_classes();
+            if ( isset( $_GET['vat_class'] ) ) {
+                $vat_class   =  $_GET['vat_class'];
+            }
+
+            echo wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All VAT classes', 'invoicing' )
+                        ),
+                        $vat_classes
+                    ),
+                    'name'             => 'vat_class',
+                    'id'               => 'vat_class',
+                    'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+        }
+
+        // Filter by item type.
+        $type   = '';
+        if ( isset( $_GET['type'] ) ) {
+            $type   =  $_GET['type'];
+        }
+
+        echo wpinv_html_select(
+            array(
+                'options'          => array_merge(
+                    array(
+                        '' => __( 'All item types', 'invoicing' )
+                    ),
+                    wpinv_get_item_types()
+                ),
+                'name'             => 'type',
+                'id'               => 'type',
+                'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
+                'show_option_all'  => false,
+                'show_option_none' => false,
+            )
+        );
+
+    }
+
+    /**
+     * Filters the item query.
+     */
+    public static function filter_item_query( $query ) {
+
+        // modify the query only if it admin and main query.
+        if ( ! ( is_admin() && $query->is_main_query() ) ){ 
+            return $query;
+        }
+
+        // we want to modify the query for our items.
+        if ( empty( $query->query['post_type'] ) || 'wpi_item' != $query->query['post_type'] ){
+            return $query;
+        }
+
+        if ( empty( $query->query_vars['meta_query'] ) ) {
+            $query->query_vars['meta_query'] = array();
+        }
+
+        // Filter vat rule type
         if ( ! empty( $_GET['vat_rule'] ) ) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
@@ -679,97 +679,97 @@ 
                 'value'   => sanitize_text_field( $_GET['type'] ),
                 'compare' => '='
             );
-		}
-
-	}
-
-	/**
-	 * Reorders items.
-	 */
-	public static function reorder_items( $vars ) {
-		global $typenow;
-
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
-			return $vars;
-		}
-
-		// By item type.
-		if ( 'type' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_type',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By vat class.
-		if ( 'vat_class' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_class',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By vat rule.
-		if ( 'vat_rule' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_rule',
-					'orderby'  => 'meta_value'
-				)
-			);
-		}
-
-		// By price.
-		if ( 'price' == $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_price',
-					'orderby'  => 'meta_value_num'
-				)
-			);
-		}
-
-		return $vars;
-
-	}
-
-	/**
-	 * Fired when deleting a post.
-	 */
-	public static function delete_post( $post_id ) {
-
-		switch ( get_post_type( $post_id ) ) {
-
-			case 'wpi_item' :
-				do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
-				break;
-
-			case 'wpi_payment_form' :
-				do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
-				break;
-
-			case 'wpi_discount' :
-				do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
-				break;
-
-			case 'wpi_invoice' :
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( "getpaid_before_delete_invoice", $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
-				break;
-		}
-	}
-
-	/**
+        }
+
+    }
+
+    /**
+     * Reorders items.
+     */
+    public static function reorder_items( $vars ) {
+        global $typenow;
+
+        if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+            return $vars;
+        }
+
+        // By item type.
+        if ( 'type' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_type',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By vat class.
+        if ( 'vat_class' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_class',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By vat rule.
+        if ( 'vat_rule' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_rule',
+                    'orderby'  => 'meta_value'
+                )
+            );
+        }
+
+        // By price.
+        if ( 'price' == $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_price',
+                    'orderby'  => 'meta_value_num'
+                )
+            );
+        }
+
+        return $vars;
+
+    }
+
+    /**
+     * Fired when deleting a post.
+     */
+    public static function delete_post( $post_id ) {
+
+        switch ( get_post_type( $post_id ) ) {
+
+            case 'wpi_item' :
+                do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
+                break;
+
+            case 'wpi_payment_form' :
+                do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
+                break;
+
+            case 'wpi_discount' :
+                do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
+                break;
+
+            case 'wpi_invoice' :
+                $invoice = new WPInv_Invoice( $post_id );
+                do_action( "getpaid_before_delete_invoice", $invoice );
+                $invoice->get_data_store()->delete_items( $invoice );
+                $invoice->get_data_store()->delete_special_fields( $invoice );
+                break;
+        }
+    }
+
+    /**
      * Add a post display state for special GetPaid pages in the page list table.
      *
      * @param array   $post_states An array of post display states.
@@ -783,22 +783,22 @@ 
             $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+        foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
-				$post_states["getpaid_{$post_type}_history_page"] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
-					$label
-				);
-			}
+            if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
+                $post_states["getpaid_{$post_type}_history_page"] = sprintf(
+                    __( 'GetPaid %s History Page', 'invoicing' ),
+                    $label
+                );
+            }
 
-		}
+        }
 		
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
             $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
             $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
         }
 

Spacing +216 added lines, -216 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Admin Class
@@ -21,72 +21,72 @@ 
 		GetPaid_Metaboxes::init();
 
 		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+		add_filter('post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages');
 
 		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2);
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2);
 
 		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
+		add_filter('manage_wpi_invoice_posts_columns', array(__CLASS__, 'invoice_columns'), 100);
+		add_action('manage_wpi_invoice_posts_custom_column', array(__CLASS__, 'display_invoice_columns'), 10, 2);
 
 		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+		add_filter('manage_wpi_item_posts_columns', array(__CLASS__, 'item_columns'), 100);
+		add_filter('manage_edit-wpi_item_sortable_columns', array(__CLASS__, 'sortable_item_columns'), 20);
+		add_action('manage_wpi_item_posts_custom_column', array(__CLASS__, 'display_item_columns'), 10, 2);
+		add_action('restrict_manage_posts', array(__CLASS__, 'add_item_filters'), 100);
+		add_action('parse_query', array(__CLASS__, 'filter_item_query'), 100);
+		add_action('request', array(__CLASS__, 'reorder_items'), 100);
 
 		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+		add_filter('manage_wpi_payment_form_posts_columns', array(__CLASS__, 'payment_form_columns'), 100);
+		add_action('manage_wpi_payment_form_posts_custom_column', array(__CLASS__, 'display_payment_form_columns'), 10, 2);
+		add_filter('display_post_states', array(__CLASS__, 'filter_payment_form_state'), 10, 2);
 
 		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+		add_filter('manage_wpi_discount_posts_columns', array(__CLASS__, 'discount_columns'), 100);
+		add_filter('bulk_actions-edit-wpi_discount', '__return_empty_array', 100);
 
 		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+		add_action('delete_post', array(__CLASS__, 'delete_post'));
+		add_filter('display_post_states', array(__CLASS__, 'filter_discount_state'), 10, 2);
 
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+		add_filter('display_post_states', array(__CLASS__, 'add_display_post_states'), 10, 2);
 	}
 
 	/**
 	 * Post updated messages.
 	 */
-	public static function post_updated_messages( $messages ) {
+	public static function post_updated_messages($messages) {
 		global $post;
 
 		$messages['wpi_discount'] = array(
 			0   => '',
-			1   => __( 'Discount updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Discount updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Discount updated.', 'invoicing' ),
-			7   => __( 'Discount saved.', 'invoicing' ),
-			8   => __( 'Discount submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Discount draft updated.', 'invoicing' ),
+			1   => __('Discount updated.', 'invoicing'),
+			2   => __('Custom field updated.', 'invoicing'),
+			3   => __('Custom field deleted.', 'invoicing'),
+			4   => __('Discount updated.', 'invoicing'),
+			5   => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6   => __('Discount updated.', 'invoicing'),
+			7   => __('Discount saved.', 'invoicing'),
+			8   => __('Discount submitted.', 'invoicing'),
+			9   => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10  => __('Discount draft updated.', 'invoicing'),
 		);
 
 		$messages['wpi_payment_form'] = array(
 			0   => '',
-			1   => __( 'Payment Form updated.', 'invoicing' ),
-			2   => __( 'Custom field updated.', 'invoicing' ),
-			3   => __( 'Custom field deleted.', 'invoicing' ),
-			4   => __( 'Payment Form updated.', 'invoicing' ),
-			5   => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6   => __( 'Payment Form updated.', 'invoicing' ),
-			7   => __( 'Payment Form saved.', 'invoicing' ),
-			8   => __( 'Payment Form submitted.', 'invoicing' ),
-			9   => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10  => __( 'Payment Form draft updated.', 'invoicing' ),
+			1   => __('Payment Form updated.', 'invoicing'),
+			2   => __('Custom field updated.', 'invoicing'),
+			3   => __('Custom field deleted.', 'invoicing'),
+			4   => __('Payment Form updated.', 'invoicing'),
+			5   => isset($_GET['revision']) ? wp_sprintf(__('Payment Form restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6   => __('Payment Form updated.', 'invoicing'),
+			7   => __('Payment Form saved.', 'invoicing'),
+			8   => __('Payment Form submitted.', 'invoicing'),
+			9   => wp_sprintf(__('Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10  => __('Payment Form draft updated.', 'invoicing'),
 		);
 
 		return $messages;
@@ -96,14 +96,14 @@ 
 	/**
 	 * Post row actions.
 	 */
-	public static function post_row_actions( $actions, $post ) {
+	public static function post_row_actions($actions, $post) {
 
-		$post = get_post( $post );
+		$post = get_post($post);
 
 		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form() ) {
-			unset( $actions['trash'] );
-			unset( $actions['inline hide-if-no-js'] );
+		if ('wpi_payment_form' == $post->post_type && $post->ID == wpinv_get_default_payment_form()) {
+			unset($actions['trash']);
+			unset($actions['inline hide-if-no-js']);
 		}
 
 		return $actions;
@@ -117,31 +117,31 @@ 
 	 * @param WP_Post $post
      * @return array $actions actions without edit option
      */
-    public static function filter_invoice_row_actions( $actions, $post ) {
+    public static function filter_invoice_row_actions($actions, $post) {
 
-        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
+			$invoice = new WPInv_Invoice($post);
 
-			$actions['edit'] =  sprintf(
+			$actions['edit'] = sprintf(
 				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
+				esc_url(get_edit_post_link($invoice->get_id())),
+				esc_html(__('Edit', 'invoicing'))
 			);
 
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
-				$actions['view'] =  sprintf(
+				$actions['view'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
+					esc_url($invoice->get_view_url()),
 					sprintf(
-						esc_html( __( 'View %s', 'invoicing' ) ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
+						esc_html(__('View %s', 'invoicing')),
+						getpaid_get_post_type_label($invoice->get_post_type(), false)
 					)
 				);
 
-				$actions['send'] =  sprintf(
+				$actions['send'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
 					esc_url(
 						wp_nonce_url(
@@ -155,7 +155,7 @@ 
 							'getpaid-nonce'
 						)
 					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
+					esc_html(__('Send to Customer', 'invoicing'))
 				);
 
 			}
@@ -168,42 +168,42 @@ 
 	/**
 	 * Returns an array of invoice table columns.
 	 */
-	public static function invoice_columns( $columns ) {
+	public static function invoice_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'number'            => __( 'Invoice', 'invoicing' ),
-			'customer'          => __( 'Customer', 'invoicing' ),
-			'invoice_date'      => __( 'Created', 'invoicing' ),
-			'payment_date'      => __( 'Completed', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'recurring'         => __( 'Recurring', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
+			'number'            => __('Invoice', 'invoicing'),
+			'customer'          => __('Customer', 'invoicing'),
+			'invoice_date'      => __('Created', 'invoicing'),
+			'payment_date'      => __('Completed', 'invoicing'),
+			'amount'            => __('Amount', 'invoicing'),
+			'recurring'         => __('Recurring', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
+		return apply_filters('wpi_invoice_table_columns', $columns);
 	}
 
 	/**
 	 * Displays invoice table columns.
 	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
+	public static function display_invoice_columns($column_name, $post_id) {
 
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'invoice_date' :
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = getpaid_format_date_value( $date_time, "&mdash;", true );
+				$date_time = esc_attr($invoice->get_created_date());
+				$date      = getpaid_format_date_value($date_time, "&mdash;", true);
 				echo "<span title='$date_time'>$date</span>";
 				break;
 
 			case 'payment_date' :
 
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = getpaid_format_date_value( $date_time, "&mdash;", true );
+				if ($invoice->is_paid()) {
+					$date_time = esc_attr($invoice->get_completed_date());
+					$date      = getpaid_format_date_value($date_time, "&mdash;", true);
 					echo "<span title='$date_time'>$date</span>";
 				} else {
 					echo "&mdash;";
@@ -214,17 +214,17 @@ 
 			case 'amount' :
 
 				$amount = $invoice->get_total();
-				$formated_amount = wpinv_price( $amount, $invoice->get_currency() );
+				$formated_amount = wpinv_price($amount, $invoice->get_currency());
 
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( 0, $invoice->get_currency() );
+				if ($invoice->is_refunded()) {
+					$refunded_amount = wpinv_price(0, $invoice->get_currency());
 					echo "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>";
 				} else {
 
 					$discount = $invoice->get_total_discount();
 
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
+					if (!empty($discount)) {
+						$new_amount = wpinv_price($amount + $discount, $invoice->get_currency());
 						echo "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>";
 					} else {
 						echo $formated_amount;
@@ -235,13 +235,13 @@ 
 				break;
 
 			case 'status' :
-				$status       = sanitize_text_field( $invoice->get_status() );
-				$status_label = sanitize_text_field( $invoice->get_status_nicename() );
+				$status       = sanitize_text_field($invoice->get_status());
+				$status_label = sanitize_text_field($invoice->get_status_nicename());
 
 				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = sanitize_text_field( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), $gateway );
+				if ($invoice->is_paid()) {
+					$gateway = sanitize_text_field($invoice->get_gateway_title());
+					$gateway = wp_sprintf(esc_attr__('Paid via %s', 'invoicing'), $gateway);
 
 					echo "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>";
 				} else {
@@ -249,22 +249,22 @@ 
 				}
 
 				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+				if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
 					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="'. esc_attr__( 'Viewed by Customer', 'invoicing' ).'"></i>';
+					if (wpinv_is_invoice_viewed($invoice->get_id())) {
+						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__('Viewed by Customer', 'invoicing') . '"></i>';
 					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="'. esc_attr__( 'Not Viewed by Customer', 'invoicing' ).'"></i>';
+						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__('Not Viewed by Customer', 'invoicing') . '"></i>';
 					}
 
 					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
+					if (wpinv_get_option('overdue_active')) {
 						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+						$fomatted = getpaid_format_date($due_date);
 
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf( __( 'Due %s', 'invoicing' ), $fomatted );
+						if (!empty($fomatted)) {
+							$date = wp_sprintf(__('Due %s', 'invoicing'), $fomatted);
 							echo "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>";
 						}
 					}
@@ -275,7 +275,7 @@ 
 
 			case 'recurring':
 
-				if ( $invoice->is_recurring() ) {
+				if ($invoice->is_recurring()) {
 					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
 				} else {
 					echo '<i class="fa fa-times" style="color:#616161;"></i>';
@@ -284,9 +284,9 @@ 
 
 			case 'number' :
 
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = sanitize_text_field( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+				$edit_link       = esc_url(get_edit_post_link($invoice->get_id()));
+				$invoice_number  = sanitize_text_field($invoice->get_number());
+				$invoice_details = esc_attr__('View Invoice Details', 'invoicing');
 
 				echo "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>";
 
@@ -296,13 +296,13 @@ 
 	
 				$customer_name = $invoice->get_user_full_name();
 	
-				if ( empty( $customer_name ) ) {
+				if (empty($customer_name)) {
 					$customer_name = $invoice->get_email();
 				}
 	
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+				if (!empty($customer_name)) {
+					$customer_details = esc_attr__('View Customer Details', 'invoicing');
+					$view_link        = esc_url(add_query_arg('user_id', $invoice->get_user_id(), admin_url('user-edit.php')));
 					echo "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>";
 				} else {
 					echo '<div>&mdash;</div>';
@@ -317,50 +317,50 @@ 
 	/**
 	 * Returns an array of payment forms table columns.
 	 */
-	public static function payment_form_columns( $columns ) {
+	public static function payment_form_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
-			'earnings'          => __( 'Revenue', 'invoicing' ),
-			'refunds'           => __( 'Refunded', 'invoicing' ),
-			'items'             => __( 'Items', 'invoicing' ),
-			'date'              => __( 'Date', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'shortcode'         => __('Shortcode', 'invoicing'),
+			'earnings'          => __('Revenue', 'invoicing'),
+			'refunds'           => __('Refunded', 'invoicing'),
+			'items'             => __('Items', 'invoicing'),
+			'date'              => __('Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+		return apply_filters('wpi_payment_form_table_columns', $columns);
 
 	}
 
 	/**
 	 * Displays payment form table columns.
 	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+	public static function display_payment_form_columns($column_name, $post_id) {
 
 		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+		$form = new GetPaid_Payment_Form($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'earnings' :
-				echo wpinv_price( $form->get_earned() );
+				echo wpinv_price($form->get_earned());
 				break;
 
 			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
+				echo wpinv_price($form->get_refunded());
 				break;
 
 			case 'refunds' :
-				echo wpinv_price( $form->get_refunded() );
+				echo wpinv_price($form->get_refunded());
 				break;
 
 			case 'shortcode' :
 
-				if ( $form->is_default() ) {
+				if ($form->is_default()) {
 					echo '&mdash;';
 				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr($form->get_id()) . ']" style="width: 100%;" readonly/>';
 				}
 
 				break;
@@ -369,29 +369,29 @@ 
 
 				$items = $form->get_items();
 
-				if ( $form->is_default() || empty( $items ) ) {
+				if ($form->is_default() || empty($items)) {
 					echo '&mdash;';
 					return;
 				}
 
 				$_items = array();
 
-				foreach ( $items as $item ) {
+				foreach ($items as $item) {
 					$url = $item->get_edit_url();
 
-					if ( empty( $url ) ) {
-						$_items[] = sanitize_text_field( $item->get_name() );
+					if (empty($url)) {
+						$_items[] = sanitize_text_field($item->get_name());
 					} else {
 						$_items[] = sprintf(
 							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							sanitize_text_field( $item->get_name() )
+							esc_url($url),
+							sanitize_text_field($item->get_name())
 						);
 					}
 
 				}
 
-				echo implode( '<br>', $_items );
+				echo implode('<br>', $_items);
 
 				break;
 
@@ -402,10 +402,10 @@ 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+	public static function filter_payment_form_state($post_states, $post) {
 
-		if ( 'wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID ) {
-			$post_states[ 'default_form' ] = __( 'Default Payment Form', 'invoicing' );
+		if ('wpi_payment_form' == $post->post_type && wpinv_get_default_payment_form() == $post->ID) {
+			$post_states['default_form'] = __('Default Payment Form', 'invoicing');
 		}
 	
 		return $post_states;
@@ -415,35 +415,35 @@ 
 	/**
 	 * Returns an array of coupon table columns.
 	 */
-	public static function discount_columns( $columns ) {
+	public static function discount_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'code'              => __( 'Code', 'invoicing' ),
-			'amount'            => __( 'Amount', 'invoicing' ),
-			'usage'             => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'        => __( 'Start Date', 'invoicing' ),
-			'expiry_date'       => __( 'Expiry Date', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'code'              => __('Code', 'invoicing'),
+			'amount'            => __('Amount', 'invoicing'),
+			'usage'             => __('Usage / Limit', 'invoicing'),
+			'start_date'        => __('Start Date', 'invoicing'),
+			'expiry_date'       => __('Expiry Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
+		return apply_filters('wpi_discount_table_columns', $columns);
 	}
 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_discount_state( $post_states, $post ) {
+	public static function filter_discount_state($post_states, $post) {
 
-		if ( 'wpi_discount' == $post->post_type ) {
+		if ('wpi_discount' == $post->post_type) {
 
-			$discount = new WPInv_Discount( $post );
+			$discount = new WPInv_Discount($post);
 
 			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-			if ( $status != 'publish' ) {
+			if ($status != 'publish') {
 				return array(
-					'discount_status' => wpinv_discount_status( $status ),
+					'discount_status' => wpinv_discount_status($status),
 				);
 			}
 
@@ -458,30 +458,30 @@ 
 	/**
 	 * Returns an array of items table columns.
 	 */
-	public static function item_columns( $columns ) {
+	public static function item_columns($columns) {
 
 		$columns = array(
 			'cb'                => $columns['cb'],
-			'title'             => __( 'Name', 'invoicing' ),
-			'price'             => __( 'Price', 'invoicing' ),
-			'vat_rule'          => __( 'VAT rule', 'invoicing' ),
-			'vat_class'         => __( 'VAT class', 'invoicing' ),
-			'type'              => __( 'Type', 'invoicing' ),
-			'shortcode'         => __( 'Shortcode', 'invoicing' ),
+			'title'             => __('Name', 'invoicing'),
+			'price'             => __('Price', 'invoicing'),
+			'vat_rule'          => __('VAT rule', 'invoicing'),
+			'vat_class'         => __('VAT class', 'invoicing'),
+			'type'              => __('Type', 'invoicing'),
+			'shortcode'         => __('Shortcode', 'invoicing'),
 		);
 
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
+		if (!wpinv_use_taxes()) {
+			unset($columns['vat_rule']);
+			unset($columns['vat_class']);
 		}
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
+		return apply_filters('wpi_item_table_columns', $columns);
 	}
 
 	/**
 	 * Returns an array of sortable items table columns.
 	 */
-	public static function sortable_item_columns( $columns ) {
+	public static function sortable_item_columns($columns) {
 
 		return array_merge(
 			$columns,
@@ -498,49 +498,49 @@ 
 	/**
 	 * Displays items table columns.
 	 */
-	public static function display_item_columns( $column_name, $post_id ) {
+	public static function display_item_columns($column_name, $post_id) {
  
-		$item = new WPInv_Item( $post_id );
+		$item = new WPInv_Item($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'price' :
 
-				if ( ! $item->is_recurring() ) {
+				if (!$item->is_recurring()) {
 					echo $item->get_the_price();
 					break;
 				}
 
 				$price = wp_sprintf(
-					__( '%s / %s', 'invoicing' ),
+					__('%s / %s', 'invoicing'),
 					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+					getpaid_get_subscription_period_label($item->get_recurring_period(), $item->get_recurring_interval(), '')
 				);
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+				if ($item->get_the_price() == $item->get_the_initial_price()) {
 					echo $price;
 					break;
 				}
 
 				echo $item->get_the_initial_price();
 
-				echo '<span class="meta">' . wp_sprintf( __( 'then %s', 'invoicing' ), $price )  .'</span>';
+				echo '<span class="meta">' . wp_sprintf(__('then %s', 'invoicing'), $price) . '</span>';
 				break;
 
 			case 'vat_rule' :
-				echo getpaid_get_tax_rule_label( $item->get_vat_rule() );
+				echo getpaid_get_tax_rule_label($item->get_vat_rule());
 				break;
 
 			case 'vat_class' :
-				echo getpaid_get_tax_class_label( $item->get_vat_class() );
+				echo getpaid_get_tax_class_label($item->get_vat_class());
 				break;
 
 			case 'shortcode' :
-				echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+				echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr($item->get_id()) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
 				break;
 
 			case 'type' :
-				echo wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
+				echo wpinv_item_type($item->get_id()) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>';
 				break;
 
 		}
@@ -550,21 +550,21 @@ 
 	/**
 	 * Lets users filter items using taxes.
 	 */
-	public static function add_item_filters( $post_type ) {
+	public static function add_item_filters($post_type) {
 
 		// Abort if we're not dealing with items.
-		if ( $post_type != 'wpi_item' ) {
+		if ($post_type != 'wpi_item') {
 			return;
 		}
 
 		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
+		if (wpinv_use_taxes()) {
 	
 			// Sanitize selected vat rule.
 			$vat_rule   = '';
 			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) {
-				$vat_rule   =  $_GET['vat_rule'];
+			if (isset($_GET['vat_rule'])) {
+				$vat_rule = $_GET['vat_rule'];
 			}
 
 			// Filter by VAT rule.
@@ -572,13 +572,13 @@ 
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All VAT rules', 'invoicing' )
+							'' => __('All VAT rules', 'invoicing')
 						),
 						$vat_rules
 					),
 					'name'             => 'vat_rule',
 					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ) ) ? $vat_rule : '',
+					'selected'         => in_array($vat_rule, array_keys($vat_rules)) ? $vat_rule : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 				)
@@ -589,21 +589,21 @@ 
 			// Sanitize selected vat rule.
 			$vat_class   = '';
 			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {
-				$vat_class   =  $_GET['vat_class'];
+			if (isset($_GET['vat_class'])) {
+				$vat_class = $_GET['vat_class'];
 			}
 
 			echo wpinv_html_select(
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All VAT classes', 'invoicing' )
+							'' => __('All VAT classes', 'invoicing')
 						),
 						$vat_classes
 					),
 					'name'             => 'vat_class',
 					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ) ) ? $vat_class : '',
+					'selected'         => in_array($vat_class, array_keys($vat_classes)) ? $vat_class : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 				)
@@ -612,22 +612,22 @@ 
 		}
 
 		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {
-			$type   =  $_GET['type'];
+		$type = '';
+		if (isset($_GET['type'])) {
+			$type = $_GET['type'];
 		}
 
 		echo wpinv_html_select(
 			array(
 				'options'          => array_merge(
 					array(
-						'' => __( 'All item types', 'invoicing' )
+						'' => __('All item types', 'invoicing')
 					),
 					wpinv_get_item_types()
 				),
 				'name'             => 'type',
 				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types() ) ? $type : '',
+				'selected'         => in_array($type, wpinv_item_types()) ? $type : '',
 				'show_option_all'  => false,
 				'show_option_none' => false,
 			)
@@ -638,45 +638,45 @@ 
 	/**
 	 * Filters the item query.
 	 */
-	public static function filter_item_query( $query ) {
+	public static function filter_item_query($query) {
 
 		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ){ 
+		if (!(is_admin() && $query->is_main_query())) { 
 			return $query;
 		}
 
 		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' != $query->query['post_type'] ){
+		if (empty($query->query['post_type']) || 'wpi_item' != $query->query['post_type']) {
 			return $query;
 		}
 
-		if ( empty( $query->query_vars['meta_query'] ) ) {
+		if (empty($query->query_vars['meta_query'])) {
 			$query->query_vars['meta_query'] = array();
 		}
 
 		// Filter vat rule type
-        if ( ! empty( $_GET['vat_rule'] ) ) {
+        if (!empty($_GET['vat_rule'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
-                'value'   => sanitize_text_field( $_GET['vat_rule'] ),
+                'value'   => sanitize_text_field($_GET['vat_rule']),
                 'compare' => '='
             );
         }
 
         // Filter vat class
-        if ( ! empty( $_GET['vat_class'] ) ) {
+        if (!empty($_GET['vat_class'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_class',
-                'value'   => sanitize_text_field( $_GET['vat_class'] ),
+                'value'   => sanitize_text_field($_GET['vat_class']),
                 'compare' => '='
             );
         }
 
         // Filter item type
-        if ( ! empty( $_GET['type'] ) ) {
+        if (!empty($_GET['type'])) {
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_type',
-                'value'   => sanitize_text_field( $_GET['type'] ),
+                'value'   => sanitize_text_field($_GET['type']),
                 'compare' => '='
             );
 		}
@@ -686,15 +686,15 @@ 
 	/**
 	 * Reorders items.
 	 */
-	public static function reorder_items( $vars ) {
+	public static function reorder_items($vars) {
 		global $typenow;
 
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+		if ('wpi_item' !== $typenow || empty($vars['orderby'])) {
 			return $vars;
 		}
 
 		// By item type.
-		if ( 'type' == $vars['orderby'] ) {
+		if ('type' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -705,7 +705,7 @@ 
 		}
 
 		// By vat class.
-		if ( 'vat_class' == $vars['orderby'] ) {
+		if ('vat_class' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -716,7 +716,7 @@ 
 		}
 
 		// By vat rule.
-		if ( 'vat_rule' == $vars['orderby'] ) {
+		if ('vat_rule' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -727,7 +727,7 @@ 
 		}
 
 		// By price.
-		if ( 'price' == $vars['orderby'] ) {
+		if ('price' == $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -744,27 +744,27 @@ 
 	/**
 	 * Fired when deleting a post.
 	 */
-	public static function delete_post( $post_id ) {
+	public static function delete_post($post_id) {
 
-		switch ( get_post_type( $post_id ) ) {
+		switch (get_post_type($post_id)) {
 
 			case 'wpi_item' :
-				do_action( "getpaid_before_delete_item", new WPInv_Item( $post_id ) );
+				do_action("getpaid_before_delete_item", new WPInv_Item($post_id));
 				break;
 
 			case 'wpi_payment_form' :
-				do_action( "getpaid_before_delete_payment_form", new GetPaid_Payment_Form( $post_id ) );
+				do_action("getpaid_before_delete_payment_form", new GetPaid_Payment_Form($post_id));
 				break;
 
 			case 'wpi_discount' :
-				do_action( "getpaid_before_delete_discount", new WPInv_Discount( $post_id ) );
+				do_action("getpaid_before_delete_discount", new WPInv_Discount($post_id));
 				break;
 
 			case 'wpi_invoice' :
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( "getpaid_before_delete_invoice", $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
+				$invoice = new WPInv_Invoice($post_id);
+				do_action("getpaid_before_delete_invoice", $invoice);
+				$invoice->get_data_store()->delete_items($invoice);
+				$invoice->get_data_store()->delete_special_fields($invoice);
 				break;
 		}
 	}
@@ -777,29 +777,29 @@ 
      *
      * @return mixed
      */
-    public static function add_display_post_states( $post_states, $post ) {
+    public static function add_display_post_states($post_states, $post) {
 
-        if ( wpinv_get_option( 'success_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
+        if (wpinv_get_option('success_page', 0) == $post->ID) {
+            $post_states['getpaid_success_page'] = __('GetPaid Receipt Page', 'invoicing');
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+		foreach (getpaid_get_invoice_post_types() as $post_type => $label) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
+			if (wpinv_get_option("{$post_type}_history_page", 0) == $post->ID) {
 				$post_states["getpaid_{$post_type}_history_page"] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
+					__('GetPaid %s History Page', 'invoicing'),
 					$label
 				);
 			}
 
 		}
 		
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
+		if (wpinv_get_option('invoice_subscription_page', 0) == $post->ID) {
+            $post_states['getpaid_invoice_subscription_page'] = __('GetPaid Subscription Page', 'invoicing');
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
+		if (wpinv_get_option('checkout_page', 0) == $post->ID) {
+            $post_states['getpaid_checkout_page'] = __('GetPaid Checkout Page', 'invoicing');
         }
 
         return $post_states;

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

Indentation +261 added lines, -261 removed lines

@@ -12,288 +12,288 @@
  */
 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";
-			} else if ( $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,
-		);
-
-		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 );
-		}
-
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
-
-	}
-
-	/**
-	 * Adds items to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_items( $submission ) {
-
-		// Add items.
-		$items = array();
+        );
+
+        $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";
+            } else if ( $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,
+        );
 
         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();
+            $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 );
+        }
 
-		$this->response = array_merge(
-			$this->response,
-			array( 'items' => $items )
-		);
+        $this->response = array_merge( $this->response, array( 'texts' => $texts ) );
 
-	}
+    }
 
-	/**
-	 * Adds fees to a response for submission refresh prices.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function add_fees( $submission ) {
+    /**
+     * Adds items to a response for submission refresh prices.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function add_items( $submission ) {
 
-		$fees = array();
+        // 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() );
+        }
+
+        $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 ) {
+
+        $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 ] );
-				}
-
-			}
-
-		}
-
-		$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
-				)
-			)
-		);
-
-	}
+            $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
+                )
+            )
+        );
+
+    }
 
 }

Spacing +79 added lines, -79 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,24 +23,24 @@ 
 	 *
 	 * @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 @@ 
 	 *
 	 * @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 @@ 
 	 *
 	 * @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";
-			} else if ( $main_item ) {
+			} else if ($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
 				);
 			}
@@ -142,14 +142,14 @@ 
 			'.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 );
+			$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);
 		}
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -158,19 +158,19 @@ 
 	 *
 	 * @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 ) {
+        foreach ($submission->get_items() as $item) {
 			$item_id           = $item->get_id();
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'items' => $items )
+			array('items' => $items)
 		);
 
 	}
@@ -180,17 +180,17 @@ 
 	 *
 	 * @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)
 		);
 
 	}
@@ -200,17 +200,17 @@ 
 	 *
 	 * @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)
 		);
 
 	}
@@ -220,24 +220,24 @@ 
 	 *
 	 * @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'] );
+        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)
 		);
 
 	}
@@ -247,29 +247,29 @@ 
 	 *
 	 * @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)
 		);
 
 	}
@@ -279,7 +279,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,

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

Spacing +18 added lines, -18 removed lines

@@ -7,45 +7,45 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Button Text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Button Text', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
-        <small class="form-text text-muted"><?php _e( '%price% will be replaced by the total payable amount', 'invoicing' ); ?></small>
+        <small class="form-text text-muted"><?php _e('%price% will be replaced by the total payable amount', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Free Checkout Text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Free Checkout Text', 'invoicing'); ?></span>
         <input v-model='active_form_element.free' class='form-control' type="text"/>
-        <small class="form-text text-muted"><?php _e( 'The text to display if the total payable amount is zero', 'invoicing' ); ?></small>
+        <small class="form-text text-muted"><?php _e('The text to display if the total payable amount is zero', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group'>
     <label class="d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php _e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php _e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group'>
-    <label :for="active_form_element.id + '_edit_type'"><?php esc_html_e( 'Button Type', 'invoicing' ) ?></label>
+    <label :for="active_form_element.id + '_edit_type'"><?php esc_html_e('Button Type', 'invoicing') ?></label>
     <select class='form-control custom-select' :id="active_form_element.id + '_edit_type'" v-model='active_form_element.class'>
-        <option value='btn-primary'><?php esc_html_e( 'Primary', 'invoicing' ); ?></option>
-        <option value='btn-secondary'><?php esc_html_e( 'Secondary', 'invoicing' ); ?></option>
-        <option value='btn-success'><?php esc_html_e( 'Success', 'invoicing' ); ?></option>
-        <option value='btn-danger'><?php esc_html_e( 'Danger', 'invoicing' ); ?></option>
-        <option value='btn-warning'><?php esc_html_e( 'Warning', 'invoicing' ); ?></option>
-        <option value='btn-info'><?php esc_html_e( 'Info', 'invoicing' ); ?></option>
-        <option value='btn-light'><?php esc_html_e( 'Light', 'invoicing' ); ?></option>
-        <option value='btn-dark'><?php esc_html_e( 'Dark', 'invoicing' ); ?></option>
-        <option value='btn-link'><?php esc_html_e( 'Link', 'invoicing' ); ?></option>
+        <option value='btn-primary'><?php esc_html_e('Primary', 'invoicing'); ?></option>
+        <option value='btn-secondary'><?php esc_html_e('Secondary', 'invoicing'); ?></option>
+        <option value='btn-success'><?php esc_html_e('Success', 'invoicing'); ?></option>
+        <option value='btn-danger'><?php esc_html_e('Danger', 'invoicing'); ?></option>
+        <option value='btn-warning'><?php esc_html_e('Warning', 'invoicing'); ?></option>
+        <option value='btn-info'><?php esc_html_e('Info', 'invoicing'); ?></option>
+        <option value='btn-light'><?php esc_html_e('Light', 'invoicing'); ?></option>
+        <option value='btn-dark'><?php esc_html_e('Dark', 'invoicing'); ?></option>
+        <option value='btn-link'><?php esc_html_e('Link', 'invoicing'); ?></option>
     </select>
 </div>

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

Spacing +8 added lines, -8 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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