AyeCode / invoicing

includes/gateways/class-getpaid-paypal-gateway.php

Spacing +161 added lines, -161 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
+    protected $supports = array('subscription', 'sandbox', 'single_subscription_group');
 
     /**
 	 * Payment method order.
@@ -59,7 +59,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+	public $currencies = array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR');
 
     /**
 	 * URL to view a transaction.
@@ -80,17 +80,17 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'PayPal Standard', 'invoicing' );
-        $this->method_title         = __( 'PayPal Standard', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
-
-		add_filter( 'wpinv_subscription_cancel_url', array( $this, 'filter_cancel_subscription_url' ), 10, 2 );
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
-        add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
-		add_filter( 'getpaid_get_paypal_connect_url', array( $this, 'maybe_get_connect_url' ), 10, 2 );
-		add_action( 'getpaid_authenticated_admin_action_connect_paypal', array( $this, 'connect_paypal' ) );
-		add_action( 'wpinv_paypal_connect', array( $this, 'display_connect_buttons' ) );
+        $this->title                = __('PayPal Standard', 'invoicing');
+        $this->method_title         = __('PayPal Standard', 'invoicing');
+        $this->checkout_button_text = __('Proceed to PayPal', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
+
+		add_filter('wpinv_subscription_cancel_url', array($this, 'filter_cancel_subscription_url'), 10, 2);
+		add_filter('getpaid_paypal_args', array($this, 'process_subscription'), 10, 2);
+        add_filter('getpaid_paypal_sandbox_notice', array($this, 'sandbox_notice'));
+		add_filter('getpaid_get_paypal_connect_url', array($this, 'maybe_get_connect_url'), 10, 2);
+		add_action('getpaid_authenticated_admin_action_connect_paypal', array($this, 'connect_paypal'));
+		add_action('wpinv_paypal_connect', array($this, 'display_connect_buttons'));
 		parent::__construct();
     }
 
@@ -103,16 +103,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $paypal_redirect = $this->get_request_url( $invoice );
+        $paypal_redirect = $this->get_request_url($invoice);
 
         // Add a note about the request url.
         $invoice->add_note(
             sprintf(
-                __( 'Redirecting to PayPal: %s', 'invoicing' ),
-                esc_url( $paypal_redirect )
+                __('Redirecting to PayPal: %s', 'invoicing'),
+                esc_url($paypal_redirect)
             ),
             false,
             false,
@@ -120,7 +120,7 @@ 
         );
 
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
 
     }
@@ -131,21 +131,21 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
-        $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
+        $paypal_args = map_deep($this->get_paypal_args($invoice), 'urlencode');
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $paypal_args['bn'] = 'GetPaid_Subscribe_WPS_US';
         } else {
             $paypal_args['bn'] = 'GetPaid_ShoppingCart_WPS_US';
         }
 
-        return add_query_arg( $paypal_args, $this->endpoint );
+        return add_query_arg($paypal_args, $this->endpoint);
 
 	}
 
@@ -155,25 +155,25 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_paypal_args( $invoice ) {
+	protected function get_paypal_args($invoice) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+		$force_one_line_item = apply_filters('getpaid_paypal_force_one_line_item', true, $invoice);
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+		if ($invoice->is_recurring() || (wpinv_use_taxes() && wpinv_prices_include_tax())) {
 			$force_one_line_item = true;
 		}
 
 		$paypal_args = apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, $force_one_line_item)
 			),
 			$invoice
 		);
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+		return $this->fix_request_length($invoice, $paypal_args);
     }
 
     /**
@@ -182,9 +182,9 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_transaction_args( $invoice ) {
+	protected function get_transaction_args($invoice) {
 
-		$email = $this->is_sandbox( $invoice ) ? wpinv_get_option( 'paypal_sandbox_email', wpinv_get_option( 'paypal_email', '' ) ) : wpinv_get_option( 'paypal_email', '' );
+		$email = $this->is_sandbox($invoice) ? wpinv_get_option('paypal_sandbox_email', wpinv_get_option('paypal_email', '')) : wpinv_get_option('paypal_email', '');
 		return array(
             'cmd'           => '_cart',
             'business'      => $email,
@@ -195,16 +195,16 @@ 
             'rm'            => is_ssl() ? 2 : 1,
             'upload'        => 1,
             'currency_code' => $invoice->get_currency(), // https://developer.paypal.com/docs/nvp-soap-api/currency-codes/#paypal
-            'return'        => esc_url_raw( $this->get_return_url( $invoice ) ),
-            'cancel_return' => esc_url_raw( $invoice->get_checkout_payment_url() ),
-            'notify_url'    => getpaid_limit_length( $this->notify_url, 255 ),
-            'invoice'       => getpaid_limit_length( $invoice->get_number(), 127 ),
+            'return'        => esc_url_raw($this->get_return_url($invoice)),
+            'cancel_return' => esc_url_raw($invoice->get_checkout_payment_url()),
+            'notify_url'    => getpaid_limit_length($this->notify_url, 255),
+            'invoice'       => getpaid_limit_length($invoice->get_number(), 127),
             'custom'        => $invoice->get_id(),
-            'first_name'    => getpaid_limit_length( $invoice->get_first_name(), 32 ),
-            'last_name'     => getpaid_limit_length( $invoice->get_last_name(), 64 ),
-            'country'       => getpaid_limit_length( $invoice->get_country(), 2 ),
-            'email'         => getpaid_limit_length( $invoice->get_email(), 127 ),
-            'cbt'           => get_bloginfo( 'name' ),
+            'first_name'    => getpaid_limit_length($invoice->get_first_name(), 32),
+            'last_name'     => getpaid_limit_length($invoice->get_last_name(), 64),
+            'country'       => getpaid_limit_length($invoice->get_country(), 2),
+            'email'         => getpaid_limit_length($invoice->get_email(), 127),
+            'cbt'           => get_bloginfo('name'),
         );
 
     }
@@ -216,30 +216,30 @@ 
 	 * @param  bool     $force_one_line_item Create only one item for this invoice.
 	 * @return array
 	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+	protected function get_line_item_args($invoice, $force_one_line_item = false) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
-            return $this->get_line_item_args_single_item( $invoice );
+		if ($force_one_line_item) {
+            return $this->get_line_item_args_single_item($invoice);
         }
 
         // Send each line item individually.
         $line_item_args = array();
 
         // Prepare line items.
-        $this->prepare_line_items( $invoice );
+        $this->prepare_line_items($invoice);
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $line_item_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $line_item_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_tax(), 2);
         }
 
         // Add discount.
-        if ( $invoice->get_total_discount() > 0 ) {
-            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
+        if ($invoice->get_total_discount() > 0) {
+            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_discount(), 2);
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+		return array_merge($line_item_args, $this->get_line_items());
 
     }
 
@@ -249,11 +249,11 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_line_item_args_single_item( $invoice ) {
+	protected function get_line_item_args_single_item($invoice) {
 		$this->delete_line_items();
 
-        $item_name = wp_sprintf( __( 'Invoice %s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $item_name = wp_sprintf(__('Invoice %s', 'invoicing'), $invoice->get_number());
+		$this->add_line_item($item_name, 1, wpinv_round_amount((float) $invoice->get_total(), 2, true), $invoice->get_id());
 
 		return $this->get_line_items();
     }
@@ -277,19 +277,19 @@ 
 	 *
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 */
-	protected function prepare_line_items( $invoice ) {
+	protected function prepare_line_items($invoice) {
 		$this->delete_line_items();
 
 		// Items.
-		foreach ( $invoice->get_items() as $item ) {
+		foreach ($invoice->get_items() as $item) {
 			$amount   = $item->get_price();
 			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+			$this->add_line_item($item->get_raw_name(), $quantity, $amount, $item->get_id());
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
-            $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
+		foreach ($invoice->get_fees() as $fee => $data) {
+            $this->add_line_item($fee, 1, wpinv_sanitize_amount($data['initial_fee']));
         }
 
     }
@@ -302,20 +302,20 @@ 
 	 * @param  float  $amount Amount.
 	 * @param  string $item_number Item number.
 	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
+	protected function add_line_item($item_name, $quantity = 1, $amount = 0.0, $item_number = '') {
+		$index = (count($this->line_items) / 4) + 1;
 
 		/**
 		 * Prevent error "Things don't appear to be working at the moment. (https://www.sandbox.paypal.com/webapps/hermes/error)"
 		 */
-		$item_name = str_replace( "#", "", $item_name );
+		$item_name = str_replace("#", "", $item_name);
 
 		$item = apply_filters(
 			'getpaid_paypal_line_item',
 			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+				'item_name'   => html_entity_decode(getpaid_limit_length($item_name ? wp_strip_all_tags($item_name) : __('Item', 'invoicing'), 127), ENT_NOQUOTES, 'UTF-8'),
 				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+				'amount'      => wpinv_sanitize_amount((float) $amount, 2),
 				'item_number' => $item_number,
 			),
 			$item_name,
@@ -324,12 +324,12 @@ 
 			$item_number
 		);
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
-        $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items['item_name_' . $index] = getpaid_limit_length($item['item_name'], 127);
+        $this->line_items['quantity_' . $index] = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+		$this->line_items['amount_' . $index]      = $item['amount'] * $item['quantity'];
+		$this->line_items['item_number_' . $index] = getpaid_limit_length($item['item_number'], 127);
     }
 
     /**
@@ -341,19 +341,19 @@ 
 	 * @param array    $paypal_args Arguments sent to Paypal in the request.
 	 * @return array
 	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
+	protected function fix_request_length($invoice, $paypal_args) {
 		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
+		$query_candidate   = http_build_query($paypal_args, '', '&');
 
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+		if (strlen($this->endpoint . $query_candidate) <= $max_paypal_length) {
 			return $paypal_args;
 		}
 
 		return apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, true)
 			),
 			$invoice
 		);
@@ -366,10 +366,10 @@ 
 	 * @param  array $paypal_args PayPal args.
 	 * @param  WPInv_Invoice    $invoice Invoice object.
 	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+	public function process_subscription($paypal_args, $invoice) {
 
         // Make sure this is a subscription.
-        if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
+        if (!$invoice->is_recurring() || !$subscription = getpaid_get_invoice_subscription($invoice)) {
             return $paypal_args;
         }
 
@@ -377,23 +377,23 @@ 
         $paypal_args['cmd'] = '_xclick-subscriptions';
 
         // Subscription name.
-        $paypal_args['item_name'] = wp_sprintf( __( 'Invoice %s', 'invoicing' ), $invoice->get_number() );
+        $paypal_args['item_name'] = wp_sprintf(__('Invoice %s', 'invoicing'), $invoice->get_number());
 
         // Get subscription args.
-        $period                 = strtoupper( substr( $subscription->get_period(), 0, 1 ) );
+        $period                 = strtoupper(substr($subscription->get_period(), 0, 1));
         $interval               = (int) $subscription->get_frequency();
         $bill_times             = (int) $subscription->get_bill_times();
-        $initial_amount         = (float) wpinv_sanitize_amount( $invoice->get_initial_total(), 2 );
-        $recurring_amount       = (float) wpinv_sanitize_amount( $invoice->get_recurring_total(), 2 );
-        $subscription_item      = $invoice->get_recurring( true );
+        $initial_amount         = (float) wpinv_sanitize_amount($invoice->get_initial_total(), 2);
+        $recurring_amount       = (float) wpinv_sanitize_amount($invoice->get_recurring_total(), 2);
+        $subscription_item      = $invoice->get_recurring(true);
 
 		// Convert 365 days to 1 year.
-		if ( 'D' == $period && 365 == $interval ) {
+		if ('D' == $period && 365 == $interval) {
 			$period = 'Y';
 			$interval = 1;
 		}
 
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
@@ -403,28 +403,28 @@ 
 			// Trial period.
 			$paypal_args['t1'] = $subscription_item->get_trial_period();
 
-        } elseif ( $initial_amount != $recurring_amount ) {
+        } elseif ($initial_amount != $recurring_amount) {
 
             // No trial period, but initial amount includes a sign-up fee and/or other items, so charge it as a separate period.
 
-            if ( 1 == $bill_times ) {
+            if (1 == $bill_times) {
                 $param_number = 3;
             } else {
                 $param_number = 1;
             }
 
-            $paypal_args[ 'a' . $param_number ] = $initial_amount ? $initial_amount : 0;
+            $paypal_args['a' . $param_number] = $initial_amount ? $initial_amount : 0;
 
             // Sign Up interval
-            $paypal_args[ 'p' . $param_number ] = $interval;
+            $paypal_args['p' . $param_number] = $interval;
 
             // Sign Up unit of duration
-            $paypal_args[ 't' . $param_number ] = $period;
+            $paypal_args['t' . $param_number] = $period;
 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+		if (!isset($param_number) || 1 == $param_number) {
 
 			// Subscription price
 			$paypal_args['a3'] = $recurring_amount;
@@ -438,7 +438,7 @@ 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+		if (1 == $bill_times || ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial() && 2 == $bill_times)) {
 
 			// Non-recurring payments
 			$paypal_args['src'] = 0;
@@ -447,15 +447,15 @@ 
 
 			$paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+			if ($bill_times > 0) {
 
 				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+				if ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial()) {
 					$bill_times--;
 				}
 
                 // Make sure it's not over the max of 52
-                $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+                $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
 
 			}
         }
@@ -464,10 +464,10 @@ 
         $paypal_args['rm'] = 2;
 
         // Get rid of redudant items.
-        foreach ( array( 'item_name_1', 'quantity_1', 'amount_1', 'item_number_1' ) as $arg ) {
+        foreach (array('item_name_1', 'quantity_1', 'amount_1', 'item_number_1') as $arg) {
 
-            if ( isset( $paypal_args[ $arg ] ) ) {
-                unset( $paypal_args[ $arg ] );
+            if (isset($paypal_args[$arg])) {
+                unset($paypal_args[$arg]);
             }
 }
 
@@ -485,7 +485,7 @@ 
 	 * @return void
 	 */
 	public function verify_ipn() {
-        new GetPaid_Paypal_Gateway_IPN_Handler( $this );
+        new GetPaid_Paypal_Gateway_IPN_Handler($this);
     }
 
     /**
@@ -494,7 +494,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %1$sPayPal Sandbox Testing Guide%2$s for more details.', 'invoicing' ),
+			__('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %1$sPayPal Sandbox Testing Guide%2$s for more details.', 'invoicing'),
 			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
 			'</a>'
 		);
@@ -506,41 +506,41 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['paypal_active']['desc'] .= " ($currencies)";
-        $admin_settings['paypal_desc']['std']     = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+        $admin_settings['paypal_desc']['std']     = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
 
 		// Access tokens.
-		$live_email      = wpinv_get_option( 'paypal_email' );
-		$sandbox_email   = wpinv_get_option( 'paypal_sandbox_email' );
+		$live_email      = wpinv_get_option('paypal_email');
+		$sandbox_email   = wpinv_get_option('paypal_sandbox_email');
 
 		$admin_settings['paypal_connect'] = array(
 			'type' => 'hook',
 			'id'   => 'paypal_connect',
-			'name' => __( 'Connect to PayPal', 'invoicing' ),
+			'name' => __('Connect to PayPal', 'invoicing'),
 		);
 
         $admin_settings['paypal_email'] = array(
             'type'  => 'text',
 			'class' => 'live-auth-data',
             'id'    => 'paypal_email',
-            'name'  => __( 'Live Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your PayPal account.', 'invoicing' ),
+            'name'  => __('Live Email Address', 'invoicing'),
+            'desc'  => __('The email address of your PayPal account.', 'invoicing'),
         );
 
 		$admin_settings['paypal_sandbox_email'] = array(
             'type'  => 'text',
 			'class' => 'sandbox-auth-data',
             'id'    => 'paypal_sandbox_email',
-            'name'  => __( 'Sandbox Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your sandbox PayPal account.', 'invoicing' ),
-			'std'   => wpinv_get_option( 'paypal_email', '' ),
+            'name'  => __('Sandbox Email Address', 'invoicing'),
+            'desc'  => __('The email address of your sandbox PayPal account.', 'invoicing'),
+			'std'   => wpinv_get_option('paypal_email', ''),
         );
 
 		// Client ID and secret.
@@ -548,41 +548,41 @@ 
 			'type'  => 'text',
 			'class' => 'live-auth-data',
 			'id'    => 'paypal_client_id',
-			'name'  => __( 'Live Client ID', 'invoicing' ),
-			'desc'  => __( 'The client ID of your PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing' ),
+			'name'  => __('Live Client ID', 'invoicing'),
+			'desc'  => __('The client ID of your PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing'),
 		);
 
 		$admin_settings['paypal_sandbox_client_id'] = array(
 			'type'  => 'text',
 			'class' => 'sandbox-auth-data',
 			'id'    => 'paypal_sandbox_client_id',
-			'name'  => __( 'Sandbox Client ID', 'invoicing' ),
-			'desc'  => __( 'The client ID of your sandbox PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing' ),
-			'std'   => wpinv_get_option( 'paypal_client_id', '' ),
+			'name'  => __('Sandbox Client ID', 'invoicing'),
+			'desc'  => __('The client ID of your sandbox PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing'),
+			'std'   => wpinv_get_option('paypal_client_id', ''),
 		);
 
 		$admin_settings['paypal_secret'] = array(
 			'type'  => 'text',
 			'class' => 'live-auth-data',
 			'id'    => 'paypal_secret',
-			'name'  => __( 'Live Secret', 'invoicing' ),
-			'desc'  => __( 'The secret of your PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing' ),
+			'name'  => __('Live Secret', 'invoicing'),
+			'desc'  => __('The secret of your PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing'),
 		);
 
 		$admin_settings['paypal_sandbox_secret'] = array(
 			'type'  => 'text',
 			'class' => 'sandbox-auth-data',
 			'id'    => 'paypal_sandbox_secret',
-			'name'  => __( 'Sandbox Secret', 'invoicing' ),
-			'desc'  => __( 'The secret of your sandbox PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing' ),
+			'name'  => __('Sandbox Secret', 'invoicing'),
+			'desc'  => __('The secret of your sandbox PayPal account. You can retrieve this from your PayPal developer account.', 'invoicing'),
 		);
 
         $admin_settings['paypal_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'paypal_ipn_url',
-            'name'     => __( 'IPN Url', 'invoicing' ),
+            'name'     => __('IPN Url', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( "If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing' ) . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __("If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing') . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'readonly' => true,
         );
 
@@ -595,9 +595,9 @@ 
 	 * @param string $url
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function filter_cancel_subscription_url( $url, $subscription ) {
+	public function filter_cancel_subscription_url($url, $subscription) {
 
-		if ( $this->id !== $subscription->get_gateway() ) {
+		if ($this->id !== $subscription->get_gateway()) {
 			return $url;
 		}
 
@@ -605,16 +605,16 @@ 
 		$profile_id = $subscription->get_profile_id();
 
 		// Bail if no profile ID.
-		if ( empty( $profile_id ) ) {
+		if (empty($profile_id)) {
 			return $url;
 		}
 
 		$cancel_url = 'https://www.paypal.com/myaccount/autopay/connect/%s/cancel';
-		if ( $this->is_sandbox( $subscription->get_parent_payment() ) ) {
+		if ($this->is_sandbox($subscription->get_parent_payment())) {
 			$cancel_url = 'https://www.sandbox.paypal.com/myaccount/autopay/connect/%s/cancel';
 		}
 
-		return sprintf( $cancel_url, $profile_id );
+		return sprintf($cancel_url, $profile_id);
 	}
 
 	/**
@@ -624,8 +624,8 @@ 
      * @param array $data
      * @return string
 	 */
-	public static function maybe_get_connect_url( $url = '', $data = array() ) {
-		return self::get_connect_url( false, urldecode( $data['redirect'] ) );
+	public static function maybe_get_connect_url($url = '', $data = array()) {
+		return self::get_connect_url(false, urldecode($data['redirect']));
 	}
 
 	/**
@@ -636,25 +636,25 @@ 
 	 * @param string $redirect
      * @return string
 	 */
-	public static function get_connect_url( $is_sandbox, $redirect = '' ) {
+	public static function get_connect_url($is_sandbox, $redirect = '') {
 
         $redirect_url = add_query_arg(
             array(
                 'getpaid-admin-action' => 'connect_paypal',
                 'page'                 => 'wpinv-settings',
-                'live_mode'            => (int) empty( $is_sandbox ),
+                'live_mode'            => (int) empty($is_sandbox),
                 'tab'                  => 'gateways',
                 'section'              => 'paypal',
-                'getpaid-nonce'        => wp_create_nonce( 'getpaid-nonce' ),
-				'redirect'             => urlencode( $redirect ),
+                'getpaid-nonce'        => wp_create_nonce('getpaid-nonce'),
+				'redirect'             => urlencode($redirect),
             ),
-            admin_url( 'admin.php' )
+            admin_url('admin.php')
         );
 
         return add_query_arg(
             array(
-                'live_mode'    => (int) empty( $is_sandbox ),
-                'redirect_url' => urlencode( str_replace( '&amp;', '&', $redirect_url ) ),
+                'live_mode'    => (int) empty($is_sandbox),
+                'redirect_url' => urlencode(str_replace('&amp;', '&', $redirect_url)),
             ),
             'https://ayecode.io/oauth/paypal'
         );
@@ -670,10 +670,10 @@ 
 
         ?>
 			<div class="wpinv-paypal-connect-live">
-				<a class="button button-primary" href="<?php echo esc_url( self::get_connect_url( false ) ); ?>"><?php esc_html_e( 'Connect to PayPal', 'invoicing' ); ?></a>
+				<a class="button button-primary" href="<?php echo esc_url(self::get_connect_url(false)); ?>"><?php esc_html_e('Connect to PayPal', 'invoicing'); ?></a>
 			</div>
 			<div class="wpinv-paypal-connect-sandbox">
-				<a class="button button-primary" href="<?php echo esc_url( self::get_connect_url( true ) ); ?>"><?php esc_html_e( 'Connect to PayPal Sandbox', 'invoicing' ); ?></a>
+				<a class="button button-primary" href="<?php echo esc_url(self::get_connect_url(true)); ?>"><?php esc_html_e('Connect to PayPal Sandbox', 'invoicing'); ?></a>
 			</div>
 
             <script>
@@ -714,26 +714,26 @@ 
 	 * @param array $data Connection data.
 	 * @return void
 	 */
-	public function connect_paypal( $data ) {
+	public function connect_paypal($data) {
 
 		$sandbox      = $this->is_sandbox();
-		$data         = wp_unslash( $data );
-		$access_token = empty( $data['access_token'] ) ? '' : sanitize_text_field( $data['access_token'] );
+		$data         = wp_unslash($data);
+		$access_token = empty($data['access_token']) ? '' : sanitize_text_field($data['access_token']);
 
-		if ( isset( $data['live_mode'] ) ) {
-			$sandbox = empty( $data['live_mode'] );
+		if (isset($data['live_mode'])) {
+			$sandbox = empty($data['live_mode']);
 		}
 
-		wpinv_update_option( 'paypal_sandbox', (int) $sandbox );
-		wpinv_update_option( 'paypal_active', 1 );
+		wpinv_update_option('paypal_sandbox', (int) $sandbox);
+		wpinv_update_option('paypal_active', 1);
 
-		if ( ! empty( $data['error_description'] ) ) {
-			getpaid_admin()->show_error( wp_kses_post( urldecode( $data['error_description'] ) ) );
+		if (!empty($data['error_description'])) {
+			getpaid_admin()->show_error(wp_kses_post(urldecode($data['error_description'])));
 		} else {
 
 			// Retrieve the user info.
 			$user_info = wp_remote_get(
-				! $sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
+				!$sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
 				array(
 
 					'headers' => array(
@@ -744,33 +744,33 @@ 
 				)
 			);
 
-			if ( is_wp_error( $user_info ) ) {
-				getpaid_admin()->show_error( wp_kses_post( $user_info->get_error_message() ) );
+			if (is_wp_error($user_info)) {
+				getpaid_admin()->show_error(wp_kses_post($user_info->get_error_message()));
 			} else {
 
 				// Create application.
-				$user_info = json_decode( wp_remote_retrieve_body( $user_info ) );
+				$user_info = json_decode(wp_remote_retrieve_body($user_info));
 
-				if ( $sandbox ) {
-					wpinv_update_option( 'paypal_sandbox_email', sanitize_email( $user_info->emails[0]->value ) );
-					wpinv_update_option( 'paypal_sandbox_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-					set_transient( 'getpaid_paypal_sandbox_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-					getpaid_admin()->show_success( __( 'Successfully connected your PayPal sandbox account', 'invoicing' ) );
+				if ($sandbox) {
+					wpinv_update_option('paypal_sandbox_email', sanitize_email($user_info->emails[0]->value));
+					wpinv_update_option('paypal_sandbox_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+					set_transient('getpaid_paypal_sandbox_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+					getpaid_admin()->show_success(__('Successfully connected your PayPal sandbox account', 'invoicing'));
 				} else {
-					wpinv_update_option( 'paypal_email', sanitize_email( $user_info->emails[0]->value ) );
-					wpinv_update_option( 'paypal_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-					set_transient( 'getpaid_paypal_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-					getpaid_admin()->show_success( __( 'Successfully connected your PayPal account', 'invoicing' ) );
+					wpinv_update_option('paypal_email', sanitize_email($user_info->emails[0]->value));
+					wpinv_update_option('paypal_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+					set_transient('getpaid_paypal_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+					getpaid_admin()->show_success(__('Successfully connected your PayPal account', 'invoicing'));
 				}
 }
 }
 
-		$redirect = empty( $data['redirect'] ) ? admin_url( 'admin.php?page=wpinv-settings&tab=gateways&section=paypal' ) : urldecode( $data['redirect'] );
+		$redirect = empty($data['redirect']) ? admin_url('admin.php?page=wpinv-settings&tab=gateways&section=paypal') : urldecode($data['redirect']);
 
-		if ( isset( $data['step'] ) ) {
-			$redirect = add_query_arg( 'step', $data['step'], $redirect );
+		if (isset($data['step'])) {
+			$redirect = add_query_arg('step', $data['step'], $redirect);
 		}
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		exit;
 	}
 

includes/admin/html-admin-page-addons.php

Spacing +56 added lines, -56 removed lines

@@ -3,27 +3,27 @@ 
  * Admin View: Page - Addons
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 add_ThickBox();
 ?>
 <div class="wrap wpi_addons_wrap">
-	<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+	<h1><?php echo esc_html(get_admin_page_title()); ?></h1>
 
-	<?php if ( $tabs ) { ?>
+	<?php if ($tabs) { ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . esc_url( admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . esc_html( $label ) . '</a>';
+			foreach ($tabs as $name => $label) {
+				echo '<a href="' . esc_url(admin_url('admin.php?page=wpi-addons&tab=' . $name)) . '" class="nav-tab ' . ($current_tab == $name ? 'nav-tab-active' : '') . '">' . esc_html($label) . '</a>';
 			}
-			do_action( 'wpi_addons_tabs' );
+			do_action('wpi_addons_tabs');
 			?>
 		</nav>
 
 		<?php
 
-		if ( $current_tab == 'membership' ) {
+		if ($current_tab == 'membership') {
 
 			?>
 
@@ -32,42 +32,42 @@ 
 <!--
 				<h2>With our WPInvoicing Membership you get access to all our products!</h2>
 				<p><a class="button button-primary" href="https://wpinvoicing.com/downloads/membership/">View Memberships</a></p>-->
-				<?php if ( defined( 'WP_EASY_UPDATES_ACTIVE' ) ) { ?>
-					<h2><?php esc_html_e( 'Have a membership key?', 'invoicing' ); ?></h2>
+				<?php if (defined('WP_EASY_UPDATES_ACTIVE')) { ?>
+					<h2><?php esc_html_e('Have a membership key?', 'invoicing'); ?></h2>
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin( 'wpinvoicing.com', '1' );
-						echo $wpeu_admin->render_licence_actions( 'wpinvoicing.com', 'membership', array( 95, 106, 108, 12351 ) );
+						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com', '1');
+						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership', array(95, 106, 108, 12351));
 						?>
 					</p>
 				<?php } ?>
 
 				<div class="membership-cta-contet">
 					<div class="main-cta">
-							<h2><?php esc_html_e( 'Membership benefits Include:', 'invoicing' ); ?></h2>
+							<h2><?php esc_html_e('Membership benefits Include:', 'invoicing'); ?></h2>
 							<div class="feature-list">
 								<ul>
 									<?php
 									$addon_obj = new WPInv_Admin_Addons();
-									if ( $addons = $addon_obj->get_section_data( 'addons' ) ) {
-										foreach ( $addons as $addon ) {
-											echo '<li><i class="far fa-check-circle fa-sm"></i> ' . esc_html( $addon->info->title ) . '</li>';
+									if ($addons = $addon_obj->get_section_data('addons')) {
+										foreach ($addons as $addon) {
+											echo '<li><i class="far fa-check-circle fa-sm"></i> ' . esc_html($addon->info->title) . '</li>';
 										}
 									}
 									?>
 									</ul>
 
 									<div class="feature-cta">
-										<h3><?php esc_html_e( 'Membership Starts from', 'invoicing' ); ?></h3>
+										<h3><?php esc_html_e('Membership Starts from', 'invoicing'); ?></h3>
 										<h4>$99</h4>
-										<a href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php esc_attr_e( 'Buy Membership', 'invoicing' ); ?></a>
+										<a href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php esc_attr_e('Buy Membership', 'invoicing'); ?></a>
 									</div>
-									<h3><?php esc_html_e( 'Included Gateways:', 'invoicing' ); ?></h3>
+									<h3><?php esc_html_e('Included Gateways:', 'invoicing'); ?></h3>
 									<ul>
 										<?php
-										if ( $addons = $addon_obj->get_section_data( 'gateways' ) ) {
-											foreach ( $addons as $addon ) {
-												echo '<li><i class="far fa-check-circle fa-sm"></i> ' . esc_html( $addon->info->title ) . '</li>';
+										if ($addons = $addon_obj->get_section_data('gateways')) {
+											foreach ($addons as $addon) {
+												echo '<li><i class="far fa-check-circle fa-sm"></i> ' . esc_html($addon->info->title) . '</li>';
 											}
 										}
 										?>
@@ -81,7 +81,7 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . esc_url( plugins_url( 'images/t-image2.png', dirname( __FILE__ ) ) ) . '" > ';
+									echo '<img src="' . esc_url(plugins_url('images/t-image2.png', dirname(__FILE__))) . '" > ';
 								?>
 							</div>
 							<div class="t-content">
@@ -101,7 +101,7 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . esc_url( plugins_url( 'images/t-image1.png', dirname( __FILE__ ) ) ) . '" > ';
+									echo '<img src="' . esc_url(plugins_url('images/t-image1.png', dirname(__FILE__))) . '" > ';
 								?>
 							</div>
 							<div class="t-content">
@@ -117,8 +117,8 @@ 
 						</div>
 					</div>
 					<div class="member-footer">
-						<a class="footer-btn" href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php esc_html_e( 'Buy Membership', 'invoicing' ); ?></a>
-						<a class="footer-link" href="post-new.php?post_type=wpi_invoice"><?php esc_html_e( 'Create Invoice', 'invoicing' ); ?></a>
+						<a class="footer-btn" href="https://wpinvoicing.com/downloads/membership/" target="_blank"><?php esc_html_e('Buy Membership', 'invoicing'); ?></a>
+						<a class="footer-link" href="post-new.php?post_type=wpi_invoice"><?php esc_html_e('Create Invoice', 'invoicing'); ?></a>
 					</div>
 				</div>
 
@@ -129,63 +129,63 @@ 
 		} else {
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ( $addons = $addon_obj->get_section_data( $current_tab ) ) :
+			if ($addons = $addon_obj->get_section_data($current_tab)) :
 				//print_r($addons);
 				?>
 				<ul class="wpi-products">
                 <?php
-                foreach ( $addons as $addon ) :
-                        if ( 965 == $addon->info->id ) {
-continue;}// don't show quote add on
+                foreach ($addons as $addon) :
+                        if (965 == $addon->info->id) {
+continue; }// don't show quote add on
 						?>
                         <li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3>
                                     <?php
-										if ( ! empty( $addon->info->excerpt ) ) {
-										wpi_help_tip( $addon->info->excerpt, false, false, true );
+										if (!empty($addon->info->excerpt)) {
+										wpi_help_tip($addon->info->excerpt, false, false, true);
 										}
-										echo esc_html( $addon->info->title );
+										echo esc_html($addon->info->title);
                                         ?>
                                         </h3>
 								</div>
 
 								<span class="wpi-product-image">
-									<?php if ( ! empty( $addon->info->thumbnail ) ) : ?>
-										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
+									<?php if (!empty($addon->info->thumbnail)) : ?>
+										<img src="<?php echo esc_attr($addon->info->thumbnail); ?>"/>
 									<?php
                                     endif;
 
-									if ( 'stripe-payment-gateway' == $addon->info->slug ) {
+									if ('stripe-payment-gateway' == $addon->info->slug) {
 										$addon->info->slug = 'getpaid-stripe-payments';
 										$addon->info->link = 'https://wordpress.org/plugins/getpaid-stripe-payments/';
 									}
-                                    elseif( 'wallet' == $addon->info->slug ){
+                                    elseif ('wallet' == $addon->info->slug) {
 										$addon->info->slug = 'getpaid-wallet';
 										$addon->info->link = 'https://wordpress.org/plugins/getpaid-wallet/';
 									}
-                                    elseif( 'item-inventory' == $addon->info->slug ){
+                                    elseif ('item-inventory' == $addon->info->slug) {
 										$addon->info->slug = 'getpaid-item-inventory';
 										$addon->info->link = 'https://wordpress.org/plugins/getpaid-item-inventory/';
 									}
 
-									if ( isset( $addon->info->link ) && substr( $addon->info->link, 0, 21 ) === 'https://wordpress.org' ) {
-										echo '<a href="' . esc_url( admin_url( '/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug ) ) . '&width=770&height=660&TB_iframe=true" class="thickbox" >';
-										echo '<span class="wpi-product-info">' . esc_html__( 'More info', 'invoicing' ) . '</span>';
+									if (isset($addon->info->link) && substr($addon->info->link, 0, 21) === 'https://wordpress.org') {
+										echo '<a href="' . esc_url(admin_url('/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug)) . '&width=770&height=660&TB_iframe=true" class="thickbox" >';
+										echo '<span class="wpi-product-info">' . esc_html__('More info', 'invoicing') . '</span>';
 										echo '</a>';
-									} elseif ( isset( $addon->info->link ) && ( substr( $addon->info->link, 0, 23 ) === 'https://wpinvoicing.com' || substr( $addon->info->link, 0, 21 ) === 'https://wpgetpaid.com' ) ) {
-										if ( defined( 'WP_EASY_UPDATES_ACTIVE' ) ) {
-											$url = admin_url( '/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug . '&width=770&height=660&item_id=' . $addon->info->id . '&update_url=https://wpgetpaid.com&TB_iframe=true' );
+									} elseif (isset($addon->info->link) && (substr($addon->info->link, 0, 23) === 'https://wpinvoicing.com' || substr($addon->info->link, 0, 21) === 'https://wpgetpaid.com')) {
+										if (defined('WP_EASY_UPDATES_ACTIVE')) {
+											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug . '&width=770&height=660&item_id=' . $addon->info->id . '&update_url=https://wpgetpaid.com&TB_iframe=true');
 										} else {
 											// if installed show activation link
-											if ( isset( $installed_plugins['wp-easy-updates/external-updates.php'] ) ) {
+											if (isset($installed_plugins['wp-easy-updates/external-updates.php'])) {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
 											} else {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}
-										echo '<a href="' . esc_url( $url ) . '" class="thickbox">';
-										echo '<span class="wpi-product-info">' . esc_html__( 'More info', 'invoicing' ) . '</span>';
+										echo '<a href="' . esc_url($url) . '" class="thickbox">';
+										echo '<span class="wpi-product-info">' . esc_html__('More info', 'invoicing') . '</span>';
 										echo '</a>';
 									}
 
@@ -196,7 +196,7 @@ 
 
 								<span class="wpi-product-button">
 									<?php
-                                    $addon_obj->output_button( $addon );
+                                    $addon_obj->output_button($addon);
 									?>
 								</span>
 
@@ -210,21 +210,21 @@ 
 
 	<div class="clearfix" ></div>
 
-	<?php if ( $current_tab == 'addons' ) { ?>
-	<p><?php printf(  esc_attr__( 'All of our Addons can be found on wpGetPaid.com here: %sInvoicing Addons%s', 'invoicing' ), '<a href="https://wpinvoicing.com/downloads/category/addons/">','</a>' ); ?></p>
-	<?php } if ( $current_tab == 'gateways' ) { ?>
-    <p><?php printf( esc_attr__( 'All of our Payment Gateways can be found on wpGetPaid.com here: %sGetPaid Payment Gateways %s', 'invoicing' ), '<a href="https://wpinvoicing.com/downloads/category/gateways/">','</a>'  ); ?></p>
+	<?php if ($current_tab == 'addons') { ?>
+	<p><?php printf(esc_attr__('All of our Addons can be found on wpGetPaid.com here: %sInvoicing Addons%s', 'invoicing'), '<a href="https://wpinvoicing.com/downloads/category/addons/">', '</a>'); ?></p>
+	<?php } if ($current_tab == 'gateways') { ?>
+    <p><?php printf(esc_attr__('All of our Payment Gateways can be found on wpGetPaid.com here: %sGetPaid Payment Gateways %s', 'invoicing'), '<a href="https://wpinvoicing.com/downloads/category/gateways/">', '</a>'); ?></p>
     <?php } ?>
 
-	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php echo wp_kses_post(  sprintf( __( "The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.", 'invoicing' ), wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php' ), 'activate-plugin_wp-easy-updates/external-updates.php' ) ) ); ?></span></div>
-	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php echo wp_kses_post( sprintf( __( "The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.", 'invoicing' ), admin_url( 'plugin-install.php?tab=upload&wpeu-install=true' ) ) ); ?></span></div>
+	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php echo wp_kses_post(sprintf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.", 'invoicing'), wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php'))); ?></span></div>
+	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php echo wp_kses_post(sprintf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.", 'invoicing'), admin_url('plugin-install.php?tab=upload&wpeu-install=true'))); ?></span></div>
 	<div id="wpeu-licence-popup" style="display:none;">
 		<span class="wpi-notification noti-white">
-			<h3 class="wpeu-licence-title"><?php esc_html_e( 'Licence key', 'invoicing' ); ?></h3>
-			<input class="wpeu-licence-key" type="text" placeholder="<?php esc_attr_e( 'Enter your licence key', 'invoicing' ); ?>"> <button class="button-primary wpeu-licence-popup-button" ><?php esc_html_e( 'Install', 'invoicing' ); ?></button>
+			<h3 class="wpeu-licence-title"><?php esc_html_e('Licence key', 'invoicing'); ?></h3>
+			<input class="wpeu-licence-key" type="text" placeholder="<?php esc_attr_e('Enter your licence key', 'invoicing'); ?>"> <button class="button-primary wpeu-licence-popup-button" ><?php esc_html_e('Install', 'invoicing'); ?></button>
 			<br>
 			<?php
-			printf( esc_html__( '%1$sFind your licence key here%2$s OR %3$sBuy one here%4$s', 'invoicing' ), '<a href="https://wpinvoicing.com/your-account/" target="_blank">', '</a>', '<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">', '</a>' );
+			printf(esc_html__('%1$sFind your licence key here%2$s OR %3$sBuy one here%4$s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">', '</a>', '<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">', '</a>');
 			?>
 		</span>
 	</div>

includes/class-wpinv-addons.php

Spacing +98 added lines, -98 removed lines

@@ -5,7 +5,7 @@ 
  * All Invoicing extensions screen related functions can be found here.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,10 +22,10 @@ 
 	 */
 	public function get_tabs() {
 		$tabs = array(
-			'addons'              => __( 'Addons', 'invoicing' ),
-            'gateways'            => __( 'Payment Gateways', 'invoicing' ),
-            'recommended_plugins' => __( 'Recommended plugins', 'invoicing' ),
-            'membership'          => __( 'Membership', 'invoicing' ),
+			'addons'              => __('Addons', 'invoicing'),
+            'gateways'            => __('Payment Gateways', 'invoicing'),
+            'recommended_plugins' => __('Recommended plugins', 'invoicing'),
+            'membership'          => __('Membership', 'invoicing'),
 		);
 
 		return $tabs;
@@ -38,57 +38,57 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_section_data( $section_id ) {
-		$section      = self::get_tab( $section_id );
+	public function get_section_data($section_id) {
+		$section      = self::get_tab($section_id);
 		$api_url = 'https://wpinvoicing.com/edd-api/v2/products/';
 		$section_data = new stdClass();
 
-		if ( $section_id == 'recommended_plugins' ) {
+		if ($section_id == 'recommended_plugins') {
 			$section_data->products = self::get_recommend_wp_plugins_edd_formatted();
-		} elseif ( ! empty( $section ) ) {
-			if ( false === ( $section_data = get_transient( 'wpi_addons_section_' . $section_id ) ) ) { //@todo restore after testing
+		} elseif (!empty($section)) {
+			if (false === ($section_data = get_transient('wpi_addons_section_' . $section_id))) { //@todo restore after testing
 			//if ( 1==1) {
 
 				$query_args = array(
 					'category' => $section_id,
 					'number'   => 100,
 				);
-				$query_args = apply_filters( 'wpeu_edd_api_query_args', $query_args, $api_url, $section_id );
+				$query_args = apply_filters('wpeu_edd_api_query_args', $query_args, $api_url, $section_id);
 
 				$raw_section = wp_safe_remote_get(
-                    esc_url_raw( add_query_arg( $query_args, $api_url ) ),
+                    esc_url_raw(add_query_arg($query_args, $api_url)),
                     array(
 						'user-agent' => 'Invoicing Addons Page',
 						'timeout'    => 15,
                     )
                 );
 
-				if ( ! is_wp_error( $raw_section ) ) {
-					$section_data = json_decode( wp_remote_retrieve_body( $raw_section ) );
+				if (!is_wp_error($raw_section)) {
+					$section_data = json_decode(wp_remote_retrieve_body($raw_section));
 
-					if ( ! empty( $section_data->products ) ) {
-						set_transient( 'wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS );
+					if (!empty($section_data->products)) {
+						set_transient('wpi_addons_section_' . $section_id, $section_data, DAY_IN_SECONDS);
 					}
 				}
 			}
 }
 
-		$products = isset( $section_data->products ) ? $section_data->products : array();
-		if ( 'addons' == $section_id ) {
+		$products = isset($section_data->products) ? $section_data->products : array();
+		if ('addons' == $section_id) {
 
 			$quotes = new stdClass();
 			$quotes->info = new stdClass();
 			$quotes->info->id = '';
 			$quotes->info->slug = 'invoicing-quotes';
-			$quotes->info->title = __( 'Quotes', 'invoicing' );
-			$quotes->info->excerpt = __( 'Create quotes and estimates', 'invoicing' );
+			$quotes->info->title = __('Quotes', 'invoicing');
+			$quotes->info->excerpt = __('Create quotes and estimates', 'invoicing');
 			$quotes->info->link = 'https://wordpress.org/plugins/invoicing-quotes/';
 			$quotes->info->thumbnail = WPINV_PLUGIN_URL . 'assets/images/Quotes-1-768x384.png';
 
 			$products[] = $quotes;
 		}
 
-		return apply_filters( 'wpi_addons_section_data', $products, $section_id );
+		return apply_filters('wpi_addons_section_data', $products, $section_id);
 	}
 
 	/**
@@ -99,10 +99,10 @@ 
 	 * @param string $theme
 	 * @param string $plugin
 	 */
-	public function output_button( $addon ) {
+	public function output_button($addon) {
 
 //        print_r($addon);
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+		$current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -114,30 +114,30 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$wp_org_themes = array( 'supreme-directory', 'directory-starter' );
+		$wp_org_themes = array('supreme-directory', 'directory-starter');
 
 		$button_args = array(
 			'type'           => ($current_tab == 'addons' || $current_tab == 'gateways') ? 'addons' : $current_tab,
-			'id'             => isset( $addon->info->id ) ? absint( $addon->info->id ) : '',
-			'title'          => isset( $addon->info->title ) ? $addon->info->title : '',
-			'button_text'    => __( 'Free', 'invoicing' ),
-			'price_text'     => __( 'Free', 'invoicing' ),
-			'link'           => isset( $addon->info->link ) ? $addon->info->link : '', // link to product
-			'url'            => isset( $addon->info->link ) ? $addon->info->link : '', // button url
+			'id'             => isset($addon->info->id) ? absint($addon->info->id) : '',
+			'title'          => isset($addon->info->title) ? $addon->info->title : '',
+			'button_text'    => __('Free', 'invoicing'),
+			'price_text'     => __('Free', 'invoicing'),
+			'link'           => isset($addon->info->link) ? $addon->info->link : '', // link to product
+			'url'            => isset($addon->info->link) ? $addon->info->link : '', // button url
 			'class'          => 'button-primary',
 			'install_status' => 'get',
 			'installed'      => false,
 			'price'          => '',
-			'licensing'      => isset( $addon->licensing->enabled ) && $addon->licensing->enabled ? true : false,
-			'license'        => isset( $addon->licensing->license ) && $addon->licensing->license ? $addon->licensing->license : '',
+			'licensing'      => isset($addon->licensing->enabled) && $addon->licensing->enabled ? true : false,
+			'license'        => isset($addon->licensing->license) && $addon->licensing->license ? $addon->licensing->license : '',
 			'onclick'        => '',
-			'slug'           => isset( $addon->info->slug ) ? $addon->info->slug : '',
+			'slug'           => isset($addon->info->slug) ? $addon->info->slug : '',
 			'active'         => false,
 			'file'           => '',
 			'update_url'     => '',
 		);
 
-		if ( 'invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ( $current_tab == 'recommended_plugins' && isset( $addon->info->slug ) && $addon->info->slug ) ) {
+		if ('invoicing-quotes' == $addon->info->slug || 'getpaid-stripe-payments' == $addon->info->slug || ($current_tab == 'recommended_plugins' && isset($addon->info->slug) && $addon->info->slug)) {
 			include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
 			$status = install_plugin_install_status(
                 array(
@@ -145,81 +145,81 @@ 
 					'version' => '',
                 )
             );
-			$button_args['install_status'] = isset( $status['status'] ) ? $status['status'] : 'install';
-			$button_args['file'] = isset( $status['file'] ) ? $status['file'] : '';
-		} elseif ( ($current_tab == 'addons' || $current_tab == 'gateways') && isset( $addon->info->id ) && $addon->info->id ) {
+			$button_args['install_status'] = isset($status['status']) ? $status['status'] : 'install';
+			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
+		} elseif (($current_tab == 'addons' || $current_tab == 'gateways') && isset($addon->info->id) && $addon->info->id) {
 			include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
-			if ( ! empty( $addon->licensing->edd_slug ) ) {
-$button_args['slug'] = $addon->licensing->edd_slug;}
-			$status = self::install_plugin_install_status( $addon );
-			$button_args['file'] = isset( $status['file'] ) ? $status['file'] : '';
-			if ( isset( $status['status'] ) ) {
-$button_args['install_status'] = $status['status'];}
+			if (!empty($addon->licensing->edd_slug)) {
+$button_args['slug'] = $addon->licensing->edd_slug; }
+			$status = self::install_plugin_install_status($addon);
+			$button_args['file'] = isset($status['file']) ? $status['file'] : '';
+			if (isset($status['status'])) {
+$button_args['install_status'] = $status['status']; }
 			$button_args['update_url'] = 'https://wpinvoicing.com';
-		} elseif ( $current_tab == 'themes' && isset( $addon->info->id ) && $addon->info->id ) {
-			if ( ! empty( $addon->licensing->edd_slug ) ) {
-$button_args['slug'] = $addon->licensing->edd_slug;}
-			$button_args['installed'] = self::is_theme_installed( $addon );
-			if ( ! in_array( $button_args['slug'], $wp_org_themes ) ) {
+		} elseif ($current_tab == 'themes' && isset($addon->info->id) && $addon->info->id) {
+			if (!empty($addon->licensing->edd_slug)) {
+$button_args['slug'] = $addon->licensing->edd_slug; }
+			$button_args['installed'] = self::is_theme_installed($addon);
+			if (!in_array($button_args['slug'], $wp_org_themes)) {
 				$button_args['update_url'] = 'https://wpinvoicing.com';
 			}
 		}
 
 		// set price
-		if ( isset( $addon->pricing ) && ! empty( $addon->pricing ) ) {
-			if ( is_object( $addon->pricing ) ) {
-				$prices = (array)$addon->pricing;
-				$button_args['price'] = reset( $prices );
-			} elseif ( isset( $addon->pricing ) ) {
+		if (isset($addon->pricing) && !empty($addon->pricing)) {
+			if (is_object($addon->pricing)) {
+				$prices = (array) $addon->pricing;
+				$button_args['price'] = reset($prices);
+			} elseif (isset($addon->pricing)) {
 				$button_args['price'] = $addon->pricing;
 			}
 		}
 
 		// set price text
-		if ( $button_args['price'] && $button_args['price'] != '0.00' ) {
-			$button_args['price_text'] = sprintf( __( 'From: $%d', 'invoicing' ), $button_args['price'] );
+		if ($button_args['price'] && $button_args['price'] != '0.00') {
+			$button_args['price_text'] = sprintf(__('From: $%d', 'invoicing'), $button_args['price']);
 		}
 
 		// set if installed
-		if ( in_array( $button_args['install_status'], array( 'installed', 'latest_installed', 'update_available', 'newer_installed' ) ) ) {
+		if (in_array($button_args['install_status'], array('installed', 'latest_installed', 'update_available', 'newer_installed'))) {
 			$button_args['installed'] = true;
 		}
 
 //		print_r($button_args);
 		// set if active
-		if ( $button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes') ) {
-			if ( $button_args['type'] != 'themes' ) {
-				$button_args['active'] = is_plugin_active( $button_args['file'] );
+		if ($button_args['installed'] && ($button_args['file'] || $button_args['type'] == 'themes')) {
+			if ($button_args['type'] != 'themes') {
+				$button_args['active'] = is_plugin_active($button_args['file']);
 			} else {
-				$button_args['active'] = self::is_theme_active( $addon );
+				$button_args['active'] = self::is_theme_active($addon);
 			}
 		}
 
 		// set button text and class
-		if ( $button_args['active'] ) {
-			$button_args['button_text'] = __( 'Active', 'invoicing' );
+		if ($button_args['active']) {
+			$button_args['button_text'] = __('Active', 'invoicing');
 			$button_args['class'] = ' button-secondary disabled ';
-		} elseif ( $button_args['installed'] ) {
-			$button_args['button_text'] = __( 'Activate', 'invoicing' );
+		} elseif ($button_args['installed']) {
+			$button_args['button_text'] = __('Activate', 'invoicing');
 
-			if ( $button_args['type'] != 'themes' ) {
-				if ( current_user_can( 'manage_options' ) ) {
-					$button_args['url'] = wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=' . $button_args['file'] ), 'activate-plugin_' . $button_args['file'] );
+			if ($button_args['type'] != 'themes') {
+				if (current_user_can('manage_options')) {
+					$button_args['url'] = wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $button_args['file']), 'activate-plugin_' . $button_args['file']);
 				} else {
 					$button_args['url'] = '#';
 				}
 			} else {
-				if ( current_user_can( 'switch_themes' ) ) {
-					$button_args['url'] = self::get_theme_activation_url( $addon );
+				if (current_user_can('switch_themes')) {
+					$button_args['url'] = self::get_theme_activation_url($addon);
 				} else {
 					$button_args['url'] = '#';
 				}
 			}
         } else {
-			if ( $button_args['type'] == 'recommended_plugins' ) {
-				$button_args['button_text'] = __( 'Install', 'invoicing' );
+			if ($button_args['type'] == 'recommended_plugins') {
+				$button_args['button_text'] = __('Install', 'invoicing');
 					} else {
-				$button_args['button_text'] = __( 'Get it', 'invoicing' );
+				$button_args['button_text'] = __('Get it', 'invoicing');
 
 				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 			$button_args['button_text'] = __('Install','invoicing');
@@ -231,41 +231,41 @@ 
 		}
 
 		// filter the button arguments
-		$button_args = apply_filters( 'edd_api_button_args', $button_args );
+		$button_args = apply_filters('edd_api_button_args', $button_args);
 //		print_r($button_args);
 		// set price text
-		if ( isset( $button_args['price_text'] ) ) {
+		if (isset($button_args['price_text'])) {
 			?>
 			<a
 				target="_blank"
 				class="addons-price-text"
-				href="<?php echo esc_url( $button_args['link'] ); ?>">
-				<?php echo esc_html( $button_args['price_text'] ); ?>
+				href="<?php echo esc_url($button_args['link']); ?>">
+				<?php echo esc_html($button_args['price_text']); ?>
 			</a>
 			<?php
 		}
 
 		?>
 		<a
-			data-licence="<?php echo esc_attr( $button_args['license'] ); ?>"
+			data-licence="<?php echo esc_attr($button_args['license']); ?>"
 			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
-			data-title="<?php echo esc_attr( $button_args['title'] ); ?>"
-			data-type="<?php echo esc_attr( $button_args['type'] ); ?>"
-			data-text-error-message="<?php esc_attr_e( 'Something went wrong!', 'invoicing' ); ?>"
-			data-text-activate="<?php esc_attr_e( 'Activate', 'invoicing' ); ?>"
-			data-text-activating="<?php esc_attr_e( 'Activating', 'invoicing' ); ?>"
-			data-text-deactivate="<?php esc_attr_e( 'Deactivate', 'invoicing' ); ?>"
-			data-text-installed="<?php esc_attr_e( 'Installed', 'invoicing' ); ?>"
-			data-text-install="<?php esc_attr_e( 'Install', 'invoicing' ); ?>"
-			data-text-installing="<?php esc_attr_e( 'Installing', 'invoicing' ); ?>"
-			data-text-error="<?php esc_attr_e( 'Error', 'invoicing' ); ?>"
+			data-title="<?php echo esc_attr($button_args['title']); ?>"
+			data-type="<?php echo esc_attr($button_args['type']); ?>"
+			data-text-error-message="<?php esc_attr_e('Something went wrong!', 'invoicing'); ?>"
+			data-text-activate="<?php esc_attr_e('Activate', 'invoicing'); ?>"
+			data-text-activating="<?php esc_attr_e('Activating', 'invoicing'); ?>"
+			data-text-deactivate="<?php esc_attr_e('Deactivate', 'invoicing'); ?>"
+			data-text-installed="<?php esc_attr_e('Installed', 'invoicing'); ?>"
+			data-text-install="<?php esc_attr_e('Install', 'invoicing'); ?>"
+			data-text-installing="<?php esc_attr_e('Installing', 'invoicing'); ?>"
+			data-text-error="<?php esc_attr_e('Error', 'invoicing'); ?>"
 			<?php
-            if ( ! empty( $button_args['onclick'] ) ) {
-echo " onclick='" . esc_attr( $button_args['onclick'] ) . "' ";}
+            if (!empty($button_args['onclick'])) {
+echo " onclick='" . esc_attr($button_args['onclick']) . "' "; }
 ?>
-			class="addons-button  <?php echo esc_attr( $button_args['class'] ); ?>"
-			href="<?php echo esc_url( $button_args['url'] ); ?>">
-			<?php echo esc_html( $button_args['button_text'] ); ?>
+			class="addons-button  <?php echo esc_attr($button_args['class']); ?>"
+			href="<?php echo esc_url($button_args['url']); ?>">
+			<?php echo esc_html($button_args['button_text']); ?>
 		</a>
 		<?php
 
@@ -279,9 +279,9 @@ 
 		$tabs            = self::get_tabs();
 		$sections        = self::get_sections();
 		$theme           = wp_get_theme();
-		$section_keys    = array_keys( $sections );
-		$current_section = isset( $_GET['section'] ) ? sanitize_text_field( $_GET['section'] ) : current( $section_keys );
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+		$section_keys    = array_keys($sections);
+		$current_section = isset($_GET['section']) ? sanitize_text_field($_GET['section']) : current($section_keys);
+		$current_tab     = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 		include_once WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php';
 	}
 
@@ -296,19 +296,19 @@ 
                 'slug'      => 'invoicing-quotes',
 				'name'      => 'Quotes',
 				'thumbnail' => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
-                'desc'      => __( 'Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing' ),
+                'desc'      => __('Allows you to create quotes, send them to clients and convert them to Invoices when accepted by the customer.', 'invoicing'),
             ),
             'geodirectory'     => array(
                 'url'  => 'https://wordpress.org/plugins/geodirectory/',
                 'slug' => 'geodirectory',
                 'name' => 'GeoDirectory',
-                'desc' => __( 'Turn any WordPress theme into a global business directory portal.', 'invoicing' ),
+                'desc' => __('Turn any WordPress theme into a global business directory portal.', 'invoicing'),
             ),
             'userswp'          => array(
                 'url'  => 'https://wordpress.org/plugins/userswp/',
                 'slug' => 'userswp',
                 'name' => 'UsersWP',
-                'desc' => __( 'Allow frontend user login and registration as well as have slick profile pages.', 'invoicing' ),
+                'desc' => __('Allow frontend user login and registration as well as have slick profile pages.', 'invoicing'),
             ),
 		);
 

vendor/ayecode/wp-ayecode-ui/includes/class-aui.php

Spacing +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -35,7 +35,7 @@ 
 	 * @return AUI|null
 	 */
 	public static function instance() {
-		if ( self::$instance == null ) {
+		if (self::$instance == null) {
 			self::$instance = new AUI();
 		}
 
@@ -48,10 +48,10 @@ 
 	 * @since 1.0.0
 	 */
 	private function __construct() {
-		if ( function_exists( "__autoload" ) ) {
-			spl_autoload_register( "__autoload" );
+		if (function_exists("__autoload")) {
+			spl_autoload_register("__autoload");
 		}
-		spl_autoload_register( array( $this, 'autoload' ) );
+		spl_autoload_register(array($this, 'autoload'));
 
 		// load options
 		self::$options = get_option('aui_options');
@@ -64,11 +64,11 @@ 
 	 *
 	 * @param $classname
 	 */
-	private function autoload( $classname ) {
-		$class     = str_replace( '_', '-', strtolower( $classname ) );
-		$file_path = trailingslashit( dirname( __FILE__ ) ) . "components/class-" . $class . '.php';
-		if ( $file_path && is_readable( $file_path ) ) {
-			include_once( $file_path );
+	private function autoload($classname) {
+		$class     = str_replace('_', '-', strtolower($classname));
+		$file_path = trailingslashit(dirname(__FILE__)) . "components/class-" . $class . '.php';
+		if ($file_path && is_readable($file_path)) {
+			include_once($file_path);
 		}
 	}
 
@@ -79,34 +79,34 @@ 
 	 *
 	 * @return string|void
 	 */
-	public function get_option( $option ){
+	public function get_option($option) {
 		$result = isset(self::$options[$option]) ? esc_attr(self::$options[$option]) : '';
 
-		if ( ! $result && $option) {
-			if( $option == 'color_primary' ){
+		if (!$result && $option) {
+			if ($option == 'color_primary') {
 				$result = AUI_PRIMARY_COLOR;
-			}elseif( $option == 'color_secondary' ){
+			}elseif ($option == 'color_secondary') {
 				$result = AUI_SECONDARY_COLOR;
 			}
 		}
 		return $result;
 	}
 
-	public function render( $items = array(), $echo = false ) {
+	public function render($items = array(), $echo = false) {
 		$output = '';
 
-		if ( ! empty( $items ) ) {
-			foreach ( $items as $args ) {
-				$render = isset( $args['render'] ) ? $args['render'] : '';
-				if ( $render && method_exists( __CLASS__, $render ) ) {
-					$output .= $this->$render( $args );
+		if (!empty($items)) {
+			foreach ($items as $args) {
+				$render = isset($args['render']) ? $args['render'] : '';
+				if ($render && method_exists(__CLASS__, $render)) {
+					$output .= $this->$render($args);
 				}
 			}
 		}
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 
@@ -122,12 +122,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function alert( $args = array(), $echo = false ) {
-		$output = AUI_Component_Alert::get( $args );
+	public function alert($args = array(), $echo = false) {
+		$output = AUI_Component_Alert::get($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -142,12 +142,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function input( $args = array(), $echo = false ) {
-		$output = AUI_Component_Input::input( $args );
+	public function input($args = array(), $echo = false) {
+		$output = AUI_Component_Input::input($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -162,12 +162,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function textarea( $args = array(), $echo = false ) {
-		$output = AUI_Component_Input::textarea( $args );
+	public function textarea($args = array(), $echo = false) {
+		$output = AUI_Component_Input::textarea($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -182,12 +182,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function button( $args = array(), $echo = false ) {
-		$output = AUI_Component_Button::get( $args );
+	public function button($args = array(), $echo = false) {
+		$output = AUI_Component_Button::get($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -202,26 +202,26 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function badge( $args = array(), $echo = false ) {
+	public function badge($args = array(), $echo = false) {
 		$defaults = array(
 			'class' => 'badge badge-primary align-middle',
 		);
 
 		// maybe set type.
-		if ( empty( $args['href'] ) ) {
+		if (empty($args['href'])) {
 			$defaults['type'] = 'badge';
 		}
 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$output = AUI_Component_Button::get( $args );
+		$output = AUI_Component_Button::get($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -236,12 +236,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function dropdown( $args = array(), $echo = false ) {
-		$output = AUI_Component_Dropdown::get( $args );
+	public function dropdown($args = array(), $echo = false) {
+		$output = AUI_Component_Dropdown::get($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -256,12 +256,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function select( $args = array(), $echo = false ) {
-		$output = AUI_Component_Input::select( $args );
+	public function select($args = array(), $echo = false) {
+		$output = AUI_Component_Input::select($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -276,12 +276,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function radio( $args = array(), $echo = false ) {
-		$output = AUI_Component_Input::radio( $args );
+	public function radio($args = array(), $echo = false) {
+		$output = AUI_Component_Input::radio($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}
@@ -296,12 +296,12 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public function pagination( $args = array(), $echo = false ) {
-		$output = AUI_Component_Pagination::get( $args );
+	public function pagination($args = array(), $echo = false) {
+		$output = AUI_Component_Pagination::get($args);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		}else{
+		} else {
 			return $output;
 		}
 	}

vendor/ayecode/wp-ayecode-ui/includes/inc/bs5-js.php

Spacing +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
     function aui_init_flatpickr(){
         if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
             $aui_doing_init_flatpickr = true;
-			<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
+			<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
             jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
         }
         $aui_doing_init_flatpickr = false;
@@ -1013,7 +1013,7 @@ 
 
 	<?php
 	// FSE tweaks.
-	if(!empty($_REQUEST['postType'])){ ?>
+	if (!empty($_REQUEST['postType'])) { ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

vendor/ayecode/wp-ayecode-ui/includes/inc/bs4-js.php

Spacing +2 added lines, -2 removed lines

@@ -242,7 +242,7 @@ 
     function aui_init_flatpickr(){
         if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
             $aui_doing_init_flatpickr = true;
-			<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
+			<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
             jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
         }
         $aui_doing_init_flatpickr = false;
@@ -971,7 +971,7 @@ 
 
 	<?php
 	// FSE tweaks.
-	if(!empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template'){ ?>
+	if (!empty($_REQUEST['postType']) && $_REQUEST['postType'] == 'wp_template') { ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

includes/user-functions.php

Spacing +152 added lines, -152 removed lines

@@ -6,7 +6,7 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Queries the customers database.
@@ -17,26 +17,26 @@ 
  *
  * @return int|array|GetPaid_Customer[]|GetPaid_Customers_Query
  */
-function getpaid_get_customers( $args = array(), $return = 'results' ) {
+function getpaid_get_customers($args = array(), $return = 'results') {
 
 	// Do not retrieve all fields if we just want the count.
-	if ( 'count' === $return ) {
+	if ('count' === $return) {
 		$args['fields'] = 'id';
 		$args['number'] = 1;
 	}
 
 	// Do not count all matches if we just want the results.
-	if ( 'results' === $return ) {
+	if ('results' === $return) {
 		$args['count_total'] = false;
 	}
 
-	$query = new GetPaid_Customers_Query( $args );
+	$query = new GetPaid_Customers_Query($args);
 
-	if ( 'results' === $return ) {
+	if ('results' === $return) {
 		return $query->get_results();
 	}
 
-	if ( 'count' === $return ) {
+	if ('count' === $return) {
 		return $query->get_total();
 	}
 
@@ -49,19 +49,19 @@ 
  * @param int|string|object|GetPaid_Customer $customer customer id, email or object.
  * @return GetPaid_Customer|null
  */
-function getpaid_get_customer( $customer ) {
+function getpaid_get_customer($customer) {
 
-    if ( empty( $customer ) ) {
+    if (empty($customer)) {
         return null;
     }
 
     // Retrieve the customer.
-    if ( ! is_a( $customer, 'GetPaid_Customer' ) ) {
-        $customer = new GetPaid_Customer( $customer );
+    if (!is_a($customer, 'GetPaid_Customer')) {
+        $customer = new GetPaid_Customer($customer);
     }
 
     // Check if it exists.
-    if ( $customer->exists() ) {
+    if ($customer->exists()) {
         return $customer;
     }
 
@@ -74,9 +74,9 @@ 
  * @return GetPaid_Customer|null
  * @since 1.0.0
  */
-function getpaid_get_customer_by_user_id( $user_id ) {
+function getpaid_get_customer_by_user_id($user_id) {
     return getpaid_get_customer(
-        GetPaid_Customer::get_customer_id_by( $user_id, 'user_id' )
+        GetPaid_Customer::get_customer_id_by($user_id, 'user_id')
     );
 }
 
@@ -88,13 +88,13 @@ 
  * @param array $args
  * @see wp_dropdown_users
  */
-function wpinv_dropdown_users( $args = '' ) {
+function wpinv_dropdown_users($args = '') {
 
-    if ( is_array( $args ) && ! empty( $args['show'] ) && 'display_name_with_email' == $args['show'] ) {
+    if (is_array($args) && !empty($args['show']) && 'display_name_with_email' == $args['show']) {
         $args['show'] = 'display_name_with_login';
     }
 
-    return wp_dropdown_users( $args );
+    return wp_dropdown_users($args);
 }
 
 /**
@@ -104,9 +104,9 @@ 
  * @return string capability to check against
  * @param string $capalibilty Optional. The alternative capability to check against.
  */
-function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
+function wpinv_get_capability($capalibilty = 'manage_invoicing') {
 
-	if ( current_user_can( 'manage_options' ) ) {
+	if (current_user_can('manage_options')) {
 		return 'manage_options';
 	};
 
@@ -120,7 +120,7 @@ 
  * @return bool
  */
 function wpinv_current_user_can_manage_invoicing() {
-    return current_user_can( wpinv_get_capability() );
+    return current_user_can(wpinv_get_capability());
 }
 
 /**
@@ -132,10 +132,10 @@ 
  * @param mixed  $args    Optional further parameters, typically starting with an object.
  * @return bool Whether the current user has the given capability.
  */
-function wpinv_current_user_can( $capability, $args = array() ) {
+function wpinv_current_user_can($capability, $args = array()) {
 	$can = wpinv_current_user_can_manage_invoicing();
 
-	return apply_filters( 'getpaid_current_user_can', $can, $capability, $args );
+	return apply_filters('getpaid_current_user_can', $can, $capability, $args);
 }
 
 /**
@@ -144,19 +144,19 @@ 
  * @since 1.0.19
  * @return int|WP_Error
  */
-function wpinv_create_user( $email, $prefix = '' ) {
+function wpinv_create_user($email, $prefix = '') {
 
     // Prepare user values.
-    $prefix = preg_replace( '/\s+/', '', $prefix );
-    $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
+    $prefix = preg_replace('/\s+/', '', $prefix);
+    $prefix = empty($prefix) ? $email : $prefix;
+	$args = array(
+		'user_login' => wpinv_generate_user_name($prefix),
 		'user_pass'  => wp_generate_password(),
 		'user_email' => $email,
         'role'       => 'subscriber',
     );
 
-    return wp_insert_user( $args );
+    return wp_insert_user($args);
 
 }
 
@@ -166,26 +166,26 @@ 
  * @since 1.0.19
  * @return bool|WP_User
  */
-function wpinv_generate_user_name( $prefix = '' ) {
+function wpinv_generate_user_name($prefix = '') {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
-    $prefix = trim( $prefix, '.' );
+	$prefix = strtok($prefix, '@');
+    $prefix = trim($prefix, '.');
 
 	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+	$prefix = sanitize_user($prefix, true);
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
+	if (empty($prefix) || in_array(strtolower($prefix), array_map('strtolower', $illegal_logins), true)) {
+		$prefix = 'gtp_' . zeroise(wp_rand(0, 9999), 4);
 	}
 
     $username = $prefix;
     $postfix  = 2;
 
-    while ( username_exists( $username ) ) {
+    while (username_exists($username)) {
         $username = "{$prefix}{$postfix}";
-        $postfix ++;
+        $postfix++;
     }
 
     return $username;
@@ -202,31 +202,31 @@ 
     $tabs = array(
 
         'gp-invoices'      => array(
-            'label'   => __( 'Invoices', 'invoicing' ), // Name of the tab.
+            'label'   => __('Invoices', 'invoicing'), // Name of the tab.
             'content' => '[wpinv_history]', // Content of the tab. Or specify "callback" to provide a callback instead.
             'icon'    => 'fas fa-file-invoice', // Shown on some profile plugins.
         ),
 
         'gp-subscriptions' => array(
-            'label'   => __( 'Subscriptions', 'invoicing' ),
+            'label'   => __('Subscriptions', 'invoicing'),
             'content' => '[wpinv_subscriptions]',
             'icon'    => 'fas fa-redo',
         ),
 
         'gp-edit-address'  => array(
-            'label'    => __( 'Billing Address', 'invoicing' ),
+            'label'    => __('Billing Address', 'invoicing'),
             'callback' => 'getpaid_display_address_edit_tab',
             'icon'     => 'fas fa-credit-card',
         ),
 
     );
 
-    $tabs = apply_filters( 'getpaid_user_content_tabs', $tabs );
+    $tabs = apply_filters('getpaid_user_content_tabs', $tabs);
 
     // Make sure address editing is last on the list.
-    if ( isset( $tabs['gp-edit-address'] ) ) {
+    if (isset($tabs['gp-edit-address'])) {
         $address = $tabs['gp-edit-address'];
-        unset( $tabs['gp-edit-address'] );
+        unset($tabs['gp-edit-address']);
         $tabs['gp-edit-address'] = $address;
     }
 
@@ -240,19 +240,19 @@ 
  * @param array $tab
  * @return array
  */
-function getpaid_prepare_user_content_tab( $tab ) {
+function getpaid_prepare_user_content_tab($tab) {
 
-    if ( ! empty( $tab['callback'] ) ) {
-        return call_user_func( $tab['callback'] );
+    if (!empty($tab['callback'])) {
+        return call_user_func($tab['callback']);
     }
 
-    if ( ! empty( $tab['content'] ) ) {
-        return convert_smilies( capital_P_dangit( wp_filter_content_tags( do_shortcode( shortcode_unautop( wpautop( wptexturize( do_blocks( $tab['content'] ) ) ) ) ) ) ) );
+    if (!empty($tab['content'])) {
+        return convert_smilies(capital_P_dangit(wp_filter_content_tags(do_shortcode(shortcode_unautop(wpautop(wptexturize(do_blocks($tab['content']))))))));
     }
 
     $notice = aui()->alert(
         array(
-            'content' => __( 'This tab has no content or content callback.', 'invoicing' ),
+            'content' => __('This tab has no content or content callback.', 'invoicing'),
             'type'    => 'error',
         )
     );
@@ -268,14 +268,14 @@ 
  * @param string $default
  * @return array
  */
-function getpaid_get_tab_url( $tab, $default ) {
+function getpaid_get_tab_url($tab, $default) {
     global $getpaid_tab_url;
 
-    if ( empty( $getpaid_tab_url ) ) {
+    if (empty($getpaid_tab_url)) {
         return $default;
     }
 
-    return sprintf( $getpaid_tab_url, $tab );
+    return sprintf($getpaid_tab_url, $tab);
 
 }
 
@@ -287,21 +287,21 @@ 
  */
 function getpaid_display_address_edit_tab() {
 
-    if ( 0 === get_current_user_id() ) {
+    if (0 === get_current_user_id()) {
         return '<div class="bsui">' . aui()->alert(
             array(
                 'type'        => 'error',
-                'content'     => __( 'Your must be logged in to view this section', 'invoicing' ),
+                'content'     => __('Your must be logged in to view this section', 'invoicing'),
                 'dismissible' => false,
             )
         ) . '</div>';
     }
 
-    $customer = getpaid_get_customer_by_user_id( get_current_user_id() );
+    $customer = getpaid_get_customer_by_user_id(get_current_user_id());
 
-    if ( empty( $customer ) ) {
-        $customer = new GetPaid_Customer( 0 );
-        $customer->clone_user( get_current_user_id() );
+    if (empty($customer)) {
+        $customer = new GetPaid_Customer(0);
+        $customer->clone_user(get_current_user_id());
         $customer->save();
     }
 
@@ -313,21 +313,21 @@ 
 
                 <?php
 
-                    foreach ( getpaid_user_address_fields() as $key => $label ) {
+                    foreach (getpaid_user_address_fields() as $key => $label) {
 
-                        $value = $customer->get( $key );
+                        $value = $customer->get($key);
 
 					// Display the country.
-					if ( 'country' == $key ) {
+					if ('country' == $key) {
 
 						aui()->select(
 							array(
 								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( $value ),
+								'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+								'id'          => 'wpinv-' . sanitize_html_class($key),
+								'value'       => sanitize_text_field($value),
 								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
+								'label'       => wp_kses_post($label),
 								'label_type'  => 'vertical',
 								'class'       => 'getpaid-address-field',
                             ),
@@ -337,17 +337,17 @@ 
 					}
 
 					// Display the state.
-					elseif ( 'state' == $key ) {
+					elseif ('state' == $key) {
 
 						getpaid_get_states_select_markup(
-                            $customer->get( 'country' ),
+                            $customer->get('country'),
 							$value,
 							$label,
 							$label,
 							'',
 							false,
 							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+							'getpaid_address[' . esc_attr($key) . ']',
                             true
 						);
 
@@ -355,13 +355,13 @@ 
 
 						aui()->input(
                             array(
-                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'name'        => 'getpaid_address[' . esc_attr($key) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class($key),
                                 'placeholder' => $label,
-                                'label'       => wp_kses_post( $label ),
+                                'label'       => wp_kses_post($label),
                                 'label_type'  => 'vertical',
                                 'type'        => 'text',
-                                'value'       => sanitize_text_field( $value ),
+                                'value'       => sanitize_text_field($value),
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
@@ -375,32 +375,32 @@ 
                             'name'        => 'getpaid_address[email_cc]',
                             'id'          => 'wpinv-email_cc',
                             'placeholder' => 'email1@example.com, email2@example.com',
-                            'label'       => __( 'Other email addresses', 'invoicing' ),
+                            'label'       => __('Other email addresses', 'invoicing'),
                             'label_type'  => 'vertical',
                             'type'        => 'text',
-                            'value'       => sanitize_text_field( $customer->get( 'email_cc' ) ),
+                            'value'       => sanitize_text_field($customer->get('email_cc')),
                             'class'       => 'getpaid-address-field',
-                            'help_text'   => __( 'Optionally provide other email addresses where we should send payment notifications', 'invoicing' ),
+                            'help_text'   => __('Optionally provide other email addresses where we should send payment notifications', 'invoicing'),
                         ),
                         true
                     );
 
-                    do_action( 'getpaid_display_address_edit_tab' );
+                    do_action('getpaid_display_address_edit_tab');
 
                     aui()->input(
                         array(
                             'name'      => 'getpaid_profile_edit_submit_button',
                             'id'        => 'getpaid_profile_edit_submit_button',
-                            'value'     => __( 'Save Address', 'invoicing' ),
-                            'help_text' => __( 'New invoices will use this address as the billing address.', 'invoicing' ),
+                            'value'     => __('Save Address', 'invoicing'),
+                            'help_text' => __('New invoices will use this address as the billing address.', 'invoicing'),
                             'type'      => 'submit',
                             'class'     => 'btn btn-primary btn-block submit-button',
                         ),
                         true
                     );
 
-                    wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' );
-                    getpaid_hidden_field( 'getpaid-action', 'edit_billing_details' );
+                    wp_nonce_field('getpaid-nonce', 'getpaid-nonce');
+                    getpaid_hidden_field('getpaid-action', 'edit_billing_details');
                 ?>
 
             </form>
@@ -410,7 +410,7 @@ 
 
     return ob_get_clean();
 }
-add_shortcode( 'getpaid_edit_address', 'getpaid_display_address_edit_tab' );
+add_shortcode('getpaid_edit_address', 'getpaid_display_address_edit_tab');
 
 /**
  * Saves the billing address edit tab.
@@ -418,35 +418,35 @@ 
  * @since 2.1.4
  * @param array $data
  */
-function getpaid_save_address_edit_tab( $data ) {
+function getpaid_save_address_edit_tab($data) {
 
-    if ( empty( $data['getpaid_address'] ) || ! is_array( $data['getpaid_address'] ) ) {
+    if (empty($data['getpaid_address']) || !is_array($data['getpaid_address'])) {
         return;
     }
 
     $data     = $data['getpaid_address'];
-    $customer = getpaid_get_customer_by_user_id( get_current_user_id() );
+    $customer = getpaid_get_customer_by_user_id(get_current_user_id());
 
-    if ( empty( $customer ) ) {
-        $customer = new GetPaid_Customer( 0 );
-        $customer->clone_user( get_current_user_id() );
+    if (empty($customer)) {
+        $customer = new GetPaid_Customer(0);
+        $customer->clone_user(get_current_user_id());
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( isset( $data[ $field ] ) ) {
-            $customer->set( $field, sanitize_text_field( $data[ $field ] ) );
+        if (isset($data[$field])) {
+            $customer->set($field, sanitize_text_field($data[$field]));
         }
     }
 
-    if ( isset( $data['email_cc'] ) ) {
-        $customer->set( 'email_cc', sanitize_text_field( $data['email_cc'] ) );
+    if (isset($data['email_cc'])) {
+        $customer->set('email_cc', sanitize_text_field($data['email_cc']));
     }
 
     $customer->save();
-    wpinv_set_error( 'address_updated' );
+    wpinv_set_error('address_updated');
 }
-add_action( 'getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab' );
+add_action('getpaid_authenticated_action_edit_billing_details', 'getpaid_save_address_edit_tab');
 
 
 /*
@@ -464,27 +464,27 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_filter_userswp_account_tabs( $tabs ) {
+function getpaid_filter_userswp_account_tabs($tabs) {
 
     // Abort if the integration is inactive.
-    if ( ! getpaid_is_userswp_integration_active() ) {
+    if (!getpaid_is_userswp_integration_active()) {
         return $tabs;
     }
 
-    $new_tabs   = array();
+    $new_tabs = array();
 
-    foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+    foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
-        $new_tabs[ $slug ] = array(
+        $new_tabs[$slug] = array(
             'title' => $tab['label'],
             'icon'  => $tab['icon'],
         );
 
     }
 
-    return array_merge( $tabs, $new_tabs );
+    return array_merge($tabs, $new_tabs);
 }
-add_filter( 'uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs' );
+add_filter('uwp_account_available_tabs', 'getpaid_filter_userswp_account_tabs');
 
 /**
  * Display our UsersWP account tabs.
@@ -493,21 +493,21 @@ 
  * @param  array $tabs
  * @return array
  */
-function getpaid_display_userswp_account_tabs( $tab ) {
+function getpaid_display_userswp_account_tabs($tab) {
     global $getpaid_tab_url;
 
     $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        $getpaid_tab_url = add_query_arg( 'type', '%s', uwp_get_account_page_url() );
-        echo wp_kses( getpaid_prepare_user_content_tab( $our_tabs[ $tab ] ), getpaid_allowed_html() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        $getpaid_tab_url = add_query_arg('type', '%s', uwp_get_account_page_url());
+        echo wp_kses(getpaid_prepare_user_content_tab($our_tabs[$tab]), getpaid_allowed_html());
     }
 
 }
-add_action( 'uwp_account_form_display', 'getpaid_display_userswp_account_tabs' );
+add_action('uwp_account_form_display', 'getpaid_display_userswp_account_tabs');
 
 function getpaid_allowed_html() {
-    $allowed_html = wp_kses_allowed_html( 'post' );
+    $allowed_html = wp_kses_allowed_html('post');
 
 	// form fields
     $allowed_html['form'] = array(
@@ -578,17 +578,17 @@ 
  * @param  string $tab   Current tab.
  * @return string Title.
  */
-function getpaid_filter_userswp_account_title( $title, $tab ) {
+function getpaid_filter_userswp_account_title($title, $tab) {
 
-    $our_tabs   = getpaid_get_user_content_tabs();
+    $our_tabs = getpaid_get_user_content_tabs();
 
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return $our_tabs[ $tab ]['label'];
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return $our_tabs[$tab]['label'];
     }
 
     return $title;
 }
-add_filter( 'uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2 );
+add_filter('uwp_account_page_title', 'getpaid_filter_userswp_account_title', 10, 2);
 
 /**
  * Registers the UsersWP integration settings.
@@ -597,26 +597,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_userswp_settings( $settings ) {
+function getpaid_register_userswp_settings($settings) {
 
-    if ( defined( 'USERSWP_PLUGIN_FILE' ) ) {
+    if (defined('USERSWP_PLUGIN_FILE')) {
 
         $settings[] = array(
 
             'id'       => 'userswp',
-            'label'    => __( 'UsersWP', 'invoicing' ),
+            'label'    => __('UsersWP', 'invoicing'),
             'settings' => array(
 
                 'userswp_settings' => array(
                     'id'   => 'userswp_settings',
-                    'name' => '<h3>' . __( 'UsersWP', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('UsersWP', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_userswp'   => array(
                     'id'   => 'enable_userswp',
-                    'name' => __( 'Enable Integration', 'invoicing' ),
-                    'desc' => __( 'Display GetPaid items on UsersWP account page.', 'invoicing' ),
+                    'name' => __('Enable Integration', 'invoicing'),
+                    'desc' => __('Display GetPaid items on UsersWP account page.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
@@ -629,7 +629,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_userswp_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_userswp_settings');
 
 /**
  * Ovewrites the invoices history page to UsersWP.
@@ -637,18 +637,18 @@ 
  * @since  2.3.1
  * @return bool
  */
-function getpaid_userswp_overwrite_invoice_history_page( $url, $post_type ) {
+function getpaid_userswp_overwrite_invoice_history_page($url, $post_type) {
 
     $our_tabs = getpaid_get_user_content_tabs();
     $tab      = "gp-{$post_type}s";
-    if ( getpaid_is_userswp_integration_active() && isset( $our_tabs[ $tab ] ) ) {
-        return add_query_arg( 'type', $tab, uwp_get_account_page_url() );
+    if (getpaid_is_userswp_integration_active() && isset($our_tabs[$tab])) {
+        return add_query_arg('type', $tab, uwp_get_account_page_url());
     }
 
     return $url;
 
 }
-add_filter( 'wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2 );
+add_filter('wpinv_get_history_page_uri', 'getpaid_userswp_overwrite_invoice_history_page', 10, 2);
 
 /**
  * Checks if the integration is enabled.
@@ -657,8 +657,8 @@ 
  * @return bool
  */
 function getpaid_is_userswp_integration_active() {
-    $enabled = wpinv_get_option( 'enable_userswp', 1 );
-    return defined( 'USERSWP_PLUGIN_FILE' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_userswp', 1);
+    return defined('USERSWP_PLUGIN_FILE') && !empty($enabled);
 }
 
 /*
@@ -676,26 +676,26 @@ 
  * @param  array $settings An array of integration settings.
  * @return array
  */
-function getpaid_register_buddypress_settings( $settings ) {
+function getpaid_register_buddypress_settings($settings) {
 
-    if ( class_exists( 'BuddyPress' ) ) {
+    if (class_exists('BuddyPress')) {
 
         $settings[] = array(
 
             'id'       => 'buddypress',
-            'label'    => __( 'BuddyPress', 'invoicing' ),
+            'label'    => __('BuddyPress', 'invoicing'),
             'settings' => array(
 
                 'buddypress_settings' => array(
                     'id'   => 'buddypress_settings',
-                    'name' => '<h3>' . __( 'BuddyPress', 'invoicing' ) . '</h3>',
+                    'name' => '<h3>' . __('BuddyPress', 'invoicing') . '</h3>',
                     'type' => 'header',
                 ),
 
                 'enable_buddypress'   => array(
                     'id'   => 'enable_buddypress',
-                    'name' => __( 'Enable Integration', 'invoicing' ),
-                    'desc' => __( 'Display GetPaid items on BuddyPress account pages.', 'invoicing' ),
+                    'name' => __('Enable Integration', 'invoicing'),
+                    'desc' => __('Display GetPaid items on BuddyPress account pages.', 'invoicing'),
                     'type' => 'checkbox',
                     'std'  => 1,
                 ),
@@ -708,7 +708,7 @@ 
 
     return $settings;
 }
-add_filter( 'getpaid_integration_settings', 'getpaid_register_buddypress_settings' );
+add_filter('getpaid_integration_settings', 'getpaid_register_buddypress_settings');
 
 /**
  * Checks if the integration is enabled.
@@ -717,8 +717,8 @@ 
  * @return bool
  */
 function getpaid_is_buddypress_integration_active() {
-    $enabled = wpinv_get_option( 'enable_buddypress', 1 );
-    return class_exists( 'BuddyPress' ) && ! empty( $enabled );
+    $enabled = wpinv_get_option('enable_buddypress', 1);
+    return class_exists('BuddyPress') && !empty($enabled);
 }
 
 /**
@@ -729,13 +729,13 @@ 
  */
 function getpaid_setup_buddypress_integration() {
 
-    if ( getpaid_is_buddypress_integration_active() ) {
+    if (getpaid_is_buddypress_integration_active()) {
         require_once WPINV_PLUGIN_DIR . 'includes/class-bp-getpaid-component.php';
         buddypress()->getpaid = new BP_GetPaid_Component();
     }
 
 }
-add_action( 'bp_setup_components', 'getpaid_setup_buddypress_integration' );
+add_action('bp_setup_components', 'getpaid_setup_buddypress_integration');
 
 /**
  * Checks if a given user has purchased a given item.
@@ -744,10 +744,10 @@ 
  * @param int $item_id The item id.
  * @return int The IDs of users who purchased the item.
  */
-function getpaid_user_ids_who_purchased_item( $item_id ) {
+function getpaid_user_ids_who_purchased_item($item_id) {
     global $wpdb;
 
-    if ( empty( $item_id ) ) {
+    if (empty($item_id)) {
         return false;
     }
 
@@ -760,7 +760,7 @@ 
         )
     );
 
-    return wp_parse_id_list( $ids );
+    return wp_parse_id_list($ids);
 }
 
 /**
@@ -769,10 +769,10 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_has_user_purchased_item( $user_id, $item_id ) {
+function getpaid_has_user_purchased_item($user_id, $item_id) {
     global $wpdb;
 
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return false;
     }
 
@@ -787,7 +787,7 @@ 
         )
     );
 
-    return ! empty( $count );
+    return !empty($count);
 }
 
 /**
@@ -796,7 +796,7 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_get_user_total_spend( $user_id ) {
+function getpaid_get_user_total_spend($user_id) {
     $args = array(
         'data'           => array(
 
@@ -811,17 +811,17 @@ 
 
             'author' => array(
                 'type'     => 'post_data',
-                'value'    => absint( $user_id ),
+                'value'    => absint($user_id),
                 'key'      => 'posts.post_author',
                 'operator' => '=',
             ),
 
         ),
         'query_type'     => 'get_var',
-        'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
+        'invoice_status' => array('wpi-renewal', 'wpi-processing', 'publish'),
     );
 
-    return wpinv_round_amount( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+    return wpinv_round_amount(GetPaid_Reports_Helper::get_invoice_report_data($args));
 }
 
 /**
@@ -830,7 +830,7 @@ 
  * @since 2.6.17
  * @param int $user_id The user id.
  */
-function getpaid_count_user_invoices( $user_id ) {
+function getpaid_count_user_invoices($user_id) {
     $args = array(
         'data'           => array(
 
@@ -846,17 +846,17 @@ 
 
             'author' => array(
                 'type'     => 'post_data',
-                'value'    => absint( $user_id ),
+                'value'    => absint($user_id),
                 'key'      => 'posts.post_author',
                 'operator' => '=',
             ),
 
         ),
         'query_type'     => 'get_var',
-        'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
+        'invoice_status' => array_keys(wpinv_get_invoice_statuses()),
     );
 
-    return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+    return absint(GetPaid_Reports_Helper::get_invoice_report_data($args));
 }
 
 /**
@@ -869,7 +869,7 @@ 
  *                           Default null, for no reassignment.
  * @param WP_User  $user     WP_User object of the user to delete.
  */
-function getpaid_delete_user_data( $user_id, $reassign, $user ) {
+function getpaid_delete_user_data($user_id, $reassign, $user) {
 	global $wpdb;
 
 	// Delete customer data.
@@ -880,4 +880,4 @@ 
 		)
 	);
 }
-add_action( 'delete_user', 'getpaid_delete_user_data', 10, 3 );
\ No newline at end of file
+add_action('delete_user', 'getpaid_delete_user_data', 10, 3);
\ No newline at end of file

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-items.php

Spacing +171 added lines, -171 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -16,62 +16,62 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Items {
 
-    public static function get_columns( $invoice ) {
+    public static function get_columns($invoice) {
         $use_taxes = $invoice->is_taxable() && wpinv_use_taxes();
         $columns   = array(
-            'id'     => __( 'ID', 'invoicing' ),
-            'title'  => __( 'Item', 'invoicing' ),
+            'id'     => __('ID', 'invoicing'),
+            'title'  => __('Item', 'invoicing'),
             'price'  => sprintf(
                 '<span class="getpaid-hide-if-hours getpaid-hide-if-quantity">%s</span>
                 <span class="getpaid-hide-if-hours hide-if-amount">%s</span>
                 <span class="getpaid-hide-if-quantity hide-if-amount">%s</span>',
-                __( 'Amount', 'invoicing' ),
-                __( 'Price', 'invoicing' ),
-                __( 'Rate', 'invoicing' )
+                __('Amount', 'invoicing'),
+                __('Price', 'invoicing'),
+                __('Rate', 'invoicing')
             ),
             'qty'    => sprintf(
                 '<span class="getpaid-hide-if-hours">%s</span><span class="getpaid-hide-if-quantity">%s</span>',
-                __( 'Quantity', 'invoicing' ),
-                __( 'Hours', 'invoicing' )
+                __('Quantity', 'invoicing'),
+                __('Hours', 'invoicing')
             ),
-            'total'  => __( 'Total', 'invoicing' ),
+            'total'  => __('Total', 'invoicing'),
             'tax'    => $invoice->get_item_tax_name(),
             'action' => '',
         );
 
-        if ( ! $use_taxes ) {
-            unset( $columns['tax'] );
+        if (!$use_taxes) {
+            unset($columns['tax']);
         }
 
         return $columns;
     }
 
-    public static function output( $post, $invoice = false ) {
+    public static function output($post, $invoice = false) {
 
-        if ( apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) {
-            return self::output2( $post );
+        if (apply_filters('getpaid_use_new_invoice_items_metabox', false)) {
+            return self::output2($post);
         }
 
-        $post_id    = ! empty( $post->ID ) ? $post->ID : 0;
-        $invoice    = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice( $post_id );
+        $post_id    = !empty($post->ID) ? $post->ID : 0;
+        $invoice    = $invoice instanceof WPInv_Invoice ? $invoice : new WPInv_Invoice($post_id);
         $use_taxes  = $invoice->is_taxable() && wpinv_use_taxes();
-        $item_types = apply_filters( 'wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post );
-        $columns    = self::get_columns( $invoice );
-        $cols       = count( $columns );
+        $item_types = apply_filters('wpinv_item_types_for_quick_add_item', wpinv_get_item_types(), $post);
+        $columns    = self::get_columns($invoice);
+        $cols       = count($columns);
         $class      = '';
 
-        unset( $item_types['adv'] );
-        unset( $item_types['package'] );
+        unset($item_types['adv']);
+        unset($item_types['package']);
 
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
             $class .= ' wpinv-paid';
         }
 
-        if ( $invoice->is_refunded() ) {
+        if ($invoice->is_refunded()) {
             $class .= ' wpinv-refunded';
         }
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $class .= ' wpi-recurring';
         }
 
@@ -87,26 +87,26 @@ 
 		);
     ?>
 
-        <div class="wpinv-items-wrap<?php echo esc_attr( $class ); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr( $invoice->get_status() ); ?>">
+        <div class="wpinv-items-wrap<?php echo esc_attr($class); ?>" id="wpinv_items_wrap" data-status="<?php echo esc_attr($invoice->get_status()); ?>">
             <table id="wpinv_items" class="wpinv-items" cellspacing="0" cellpadding="0">
 
                 <thead>
                     <tr>
-                        <?php foreach ( $columns as $key => $label ) : ?>
+                        <?php foreach ($columns as $key => $label) : ?>
                             <th class="
                             <?php
-                            echo esc_attr( $key );
+                            echo esc_attr($key);
 							echo 'total' == $key || 'qty' == $key ? ' hide-if-amount' : '';
 							?>
-							"><?php echo wp_kses_post( $label ); ?></th>
+							"><?php echo wp_kses_post($label); ?></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
 
                 <tbody class="wpinv-line-items">
                     <?php
-                        foreach ( $invoice->get_items() as $int => $item ) {
-						self::output_row( $columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd' );
+                        foreach ($invoice->get_items() as $int => $item) {
+						self::output_row($columns, $item, $invoice, $int % 2 == 0 ? 'even' : 'odd');
                         }
                     ?>
                 </tbody>
@@ -123,7 +123,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
+                                                        <input type="text" style="width: 100%" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="wpinv-quick-item-name" name="_wpinv_quick[name]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -131,8 +131,8 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-price">
                                                     <span class="input-text-wrap">
-                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e( 'Item Price', 'invoicing' ); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
-                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e( 'Item Quantity', 'invoicing' ); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
+                                                    <input type="text" style="width: 200px" placeholder="<?php esc_attr_e('Item Price', 'invoicing'); ?>" class="wpinv-quick-item-price" name="_wpinv_quick[price]">
+                                                        &times; <input type="text" style="width: 140px" placeholder="<?php esc_attr_e('Item Quantity', 'invoicing'); ?>" class="wpinv-quick-item-qty" name="_wpinv_quick[qty]">
                                                     </span>
                                                 </label>
                                             </div>
@@ -140,7 +140,7 @@ 
                                             <div class="wp-clearfix">
                                                 <label class="wpi-item-name">
                                                     <span class="input-text-wrap">
-                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e( 'Item Description', 'invoicing' ); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
+                                                        <textarea rows="4" style="width: 100%" placeholder="<?php esc_attr_e('Item Description', 'invoicing'); ?>" class="wpinv-quick-item-description" name="_wpinv_quick[description]"></textarea>
                                                     </span>
                                                 </label>
                                             </div>
@@ -165,7 +165,7 @@ 
                                                 </label>
                                             </div>
 
-                                            <?php if ( $use_taxes ) : ?>
+                                            <?php if ($use_taxes) : ?>
                                                 <div class="wp-clearfix">
                                                     <label class="wpi-vat-rule">
                                                         <span class="input-text-wrap">
@@ -173,7 +173,7 @@ 
                                                                 wpinv_html_select(
                                                                     array(
 																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Rule', 'invoicing' ) ),
+																			array('' => __('Select VAT Rule', 'invoicing')),
 																			getpaid_get_tax_rules()
 																		),
 																		'name'             => '_wpinv_quick[vat_rule]',
@@ -195,7 +195,7 @@ 
                                                                 wpinv_html_select(
                                                                     array(
 																		'options'          => array_merge(
-																			array( '' => __( 'Select VAT Class', 'invoicing' ) ),
+																			array('' => __('Select VAT Class', 'invoicing')),
 																			getpaid_get_tax_classes()
 																		),
 																		'name'             => '_wpinv_quick[vat_class]',
@@ -219,7 +219,7 @@ 
                                                             'type'    => 'checkbox',
                                                             'name'    => '_wpinv_quick[one-time]',
                                                             'id'      => '_wpinv_quick-one-time',
-                                                            'label'   => __( "One time item (won't be saved to regular items list)", 'invoicing' ),
+                                                            'label'   => __("One time item (won't be saved to regular items list)", 'invoicing'),
                                                             'value'   => 1,
                                                             'no_wrap' => true,
                                                             'checked' => false,
@@ -243,39 +243,39 @@ 
                         </td>
                     </tr>
                     <tr class="totals">
-                        <td colspan="<?php echo ( (int) $cols - 4 ); ?>"></td>
+                        <td colspan="<?php echo ((int) $cols - 4); ?>"></td>
                         <td colspan="4">
                             <table cellspacing="0" cellpadding="0">
                                 <tr class="subtotal">
-                                    <td class="name"><?php esc_html_e( 'Sub Total:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Sub Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <tr class="discount">
-                                    <td class="name"><?php esc_html_e( 'Discount:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Discount:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
-                                <?php if ( $use_taxes ) : ?>
-                                <?php if ( is_array( $taxes = $invoice->get_taxes() ) && wpinv_display_individual_tax_rates() ) { ?>
-                                <?php foreach ( $taxes as $tax_key => $tax_item ) { ?>
+                                <?php if ($use_taxes) : ?>
+                                <?php if (is_array($taxes = $invoice->get_taxes()) && wpinv_display_individual_tax_rates()) { ?>
+                                <?php foreach ($taxes as $tax_key => $tax_item) { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php echo esc_html( $invoice->get_tax_item_name( $tax_key, $tax_item, ':' ) ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_tax_item_amount( $tax_key, $tax_item ), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php echo esc_html($invoice->get_tax_item_name($tax_key, $tax_item, ':')); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_tax_item_amount($tax_key, $tax_item), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <?php } else { ?>
                                 <tr class="tax">
-                                    <td class="name"><?php esc_html_e( 'Tax:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Tax:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                                 <?php } ?>
                                 <?php endif; ?>
                                 <tr class="total">
-                                    <td class="name"><?php esc_html_e( 'Total:', 'invoicing' ); ?></td>
-                                    <td class="total"><?php wpinv_the_price( $invoice->get_total(), $invoice->get_currency() ); ?></td>
+                                    <td class="name"><?php esc_html_e('Total:', 'invoicing'); ?></td>
+                                    <td class="total"><?php wpinv_the_price($invoice->get_total(), $invoice->get_currency()); ?></td>
                                     <td class="action"></td>
                                 </tr>
                             </table>
@@ -291,18 +291,18 @@ 
                      <div class="modal-dialog modal-dialog-centered" role="document">
                         <div class="modal-content">
                             <div class="modal-header">
-                                <h5 class="modal-title" id="getpaid-refund-invoice-modal-label"><?php esc_html_e( 'Refund Payment', 'invoicing' ); ?></h5>
-                                <button type="button" class="close btn-close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                    <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                <h5 class="modal-title" id="getpaid-refund-invoice-modal-label"><?php esc_html_e('Refund Payment', 'invoicing'); ?></h5>
+                                <button type="button" class="close btn-close" data-bs-dismiss="modal" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                    <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                         <span aria-hidden="true">×</span>
                                     <?php endif; ?>
                                 </button>
                             </div>
                             <div class="modal-body">
 								<p>
-									<?php esc_html_e( 'Are you sure you want to refund this payment?', 'invoicing' ); ?>
+									<?php esc_html_e('Are you sure you want to refund this payment?', 'invoicing'); ?>
 								</p>
-								<?php if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) ) : ?>
+								<?php if (getpaid_payment_gateway_supports($invoice->get_gateway(), 'refunds')) : ?>
 									<?php
 										aui()->input(
 											array(
@@ -311,7 +311,7 @@ 
 												'id'    => 'getpaid_refund_remote',
 												'label' => sprintf(
 													'Refund payment in %s',
-													wpinv_get_gateway_admin_label( $invoice->get_gateway() )
+													wpinv_get_gateway_admin_label($invoice->get_gateway())
 												),
 												'value' => 1,
 												'class' => 'getpaid-refund-field',
@@ -321,14 +321,14 @@ 
 									?>
 								<?php endif; ?>
 
-								<?php if ( getpaid_get_invoice_subscriptions( $invoice ) ) : ?>
+								<?php if (getpaid_get_invoice_subscriptions($invoice)) : ?>
 									<?php
 										aui()->input(
 											array(
 												'type'  => 'checkbox',
 												'name'  => 'getpaid_cancel_subscription',
 												'id'    => 'getpaid_cancel_subscription',
-												'label' => __( 'Cancel subscription', 'invoicing' ),
+												'label' => __('Cancel subscription', 'invoicing'),
 												'value' => 1,
 												'class' => 'getpaid-refund-field',
 											),
@@ -338,12 +338,12 @@ 
 								<?php endif; ?>
                             </div>
                             <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary getpaid-cancel" data-bs-dismiss="modal" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
+                                <button type="button" class="btn btn-secondary getpaid-cancel" data-bs-dismiss="modal" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
                                 <a
-									href="<?php echo esc_url_raw( $refund_url ); ?>"
-									data-href="<?php echo esc_url_raw( $refund_url ); ?>"
+									href="<?php echo esc_url_raw($refund_url); ?>"
+									data-href="<?php echo esc_url_raw($refund_url); ?>"
 									class="btn btn-primary getpaid-refund-payment-button"
-								><?php esc_html_e( 'Refund', 'invoicing' ); ?></a>
+								><?php esc_html_e('Refund', 'invoicing'); ?></a>
 								<script>
 									// Update the refund URL when the user changes the refund options.
 									jQuery( function( $ ) {
@@ -369,13 +369,13 @@ 
 
             <div class="wpinv-actions">
                 <?php
-                    if ( $invoice->is_paid() ) {
+                    if ($invoice->is_paid()) {
 
 						printf(
 							'<span class="bsui"><button type="button" class="button button-primary" data-toggle="modal" data-bs-toggle="modal" data-bs-target="#getpaid-refund-invoice-modal" data-target="#getpaid-refund-invoice-modal">%s</button></span>',
-							esc_html__( 'Refund', 'invoicing' )
+							esc_html__('Refund', 'invoicing')
 						);
-                    } elseif ( ! $invoice->is_refunded() ) {
+                    } elseif (!$invoice->is_refunded()) {
 						wpinv_item_dropdown(
 							array(
 								'name'           => 'wpinv_invoice_item',
@@ -385,66 +385,66 @@ 
 							)
 						);
 
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf( esc_html__( 'Add item to %s', 'invoicing' ), esc_html( $invoice->get_label() ) ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__( 'Create new item', 'invoicing' ) . '</button>';
-						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__( 'Recalculate Totals', 'invoicing' ) . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-add-item">' . sprintf(esc_html__('Add item to %s', 'invoicing'), esc_html($invoice->get_label())) . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary" id="wpinv-new-item">' . esc_html__('Create new item', 'invoicing') . '</button>';
+						echo '&nbsp;' . '<button type="button" class="button button-primary wpinv-flr" id="wpinv-recalc-totals">' . esc_html__('Recalculate Totals', 'invoicing') . '</button>';
 
                     }
                 ?>
-                <?php do_action( 'wpinv_invoice_items_actions', $invoice ); ?>
+                <?php do_action('wpinv_invoice_items_actions', $invoice); ?>
             </div>
         </div>
         <?php
     }
 
-    public static function output_row( $columns, $item, $invoice, $class = 'even' ) {
+    public static function output_row($columns, $item, $invoice, $class = 'even') {
 
     ?>
-        <tr class="item item-<?php echo esc_attr( $class ); ?>" data-item-id="<?php echo esc_attr( $item->get_id() ); ?>">
-            <?php foreach ( array_keys( $columns ) as $column ) : ?>
+        <tr class="item item-<?php echo esc_attr($class); ?>" data-item-id="<?php echo esc_attr($item->get_id()); ?>">
+            <?php foreach (array_keys($columns) as $column) : ?>
                 <td class="
 					<?php
-						echo esc_attr( $column );
+						echo esc_attr($column);
 						echo 'total' == $column || 'qty' == $column ? ' hide-if-amount' : '';
 					?>
 				">
                     <?php
-                        switch ( $column ) {
+                        switch ($column) {
 						case 'id':
 							echo (int) $item->get_id();
 							break;
 						case 'title':
 							printf(
 								'<a href="%s" target="_blank">%s</a>',
-								esc_url( get_edit_post_link( $item->get_id() ) ),
-								esc_html( $item->get_raw_name() )
+								esc_url(get_edit_post_link($item->get_id())),
+								esc_html($item->get_raw_name())
 							);
 
-							$summary = apply_filters( 'getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice );
-							if ( $summary !== '' ) {
+							$summary = apply_filters('getpaid_admin_invoice_line_item_summary', $item->get_description(), $item, $invoice);
+							if ($summary !== '') {
 								printf(
 									'<span class="meta">%s</span>',
-									wp_kses_post( wpautop( $summary ) )
+									wp_kses_post(wpautop($summary))
 								);
 							}
 
 							printf(
 								'<input type="hidden" value="%s" name="getpaid_items[%s][name]" class="getpaid-recalculate-prices-on-change" />',
-								esc_attr( $item->get_raw_name() ),
+								esc_attr($item->get_raw_name()),
 								(int) $item->get_id()
 							);
 
 							printf(
 								'<textarea style="display: none;" name="getpaid_items[%s][description]" class="getpaid-recalculate-prices-on-change">%s</textarea>',
 								(int) $item->get_id(),
-								esc_attr( $item->get_description() )
+								esc_attr($item->get_description())
 							);
 
 							break;
 						case 'price':
 							printf(
 								'<input type="text" value="%s" name="getpaid_items[%s][price]" style="width: 100px;" class="getpaid-admin-invoice-item-price getpaid-recalculate-prices-on-change" />',
-								esc_attr( getpaid_unstandardize_amount( $item->get_price() ) ),
+								esc_attr(getpaid_unstandardize_amount($item->get_price())),
 								(int) $item->get_id()
 							);
 
@@ -452,26 +452,26 @@ 
 						case 'qty':
 							printf(
 								'<input type="text" style="width: 100px;" value="%s" name="getpaid_items[%s][quantity]" class="getpaid-admin-invoice-item-quantity getpaid-recalculate-prices-on-change" />',
-								floatval( $item->get_quantity() ),
+								floatval($item->get_quantity()),
 								(int) $item->get_id()
 							);
 
 							break;
 						case 'total':
-							wpinv_the_price( $item->get_sub_total(), $invoice->get_currency() );
+							wpinv_the_price($item->get_sub_total(), $invoice->get_currency());
 
 							break;
 						case 'tax':
-							echo floatval( wpinv_round_amount( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+							echo floatval(wpinv_round_amount(getpaid_get_invoice_tax_rate($invoice, $item), 2)) . '%';
 
 							break;
 						case 'action':
-							if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+							if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 								echo '<i class="fa fa-trash wpinv-item-remove"></i>';
                                 }
 							break;
                         }
-                        do_action( 'getpaid_admin_edit_invoice_item_' . $column, $item, $invoice );
+                        do_action('getpaid_admin_edit_invoice_item_' . $column, $item, $invoice);
                     ?>
                 </td>
             <?php endforeach; ?>
@@ -484,10 +484,10 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output2( $post ) {
+    public static function output2($post) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Invoice items.
         $items = $invoice->get_items();
@@ -495,28 +495,28 @@ 
         $totals = array(
 
             'subtotal' => array(
-                'label' => __( 'Items Subtotal', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() ),
+                'label' => __('Items Subtotal', 'invoicing'),
+                'value' => wpinv_price($invoice->get_subtotal(), $invoice->get_currency()),
             ),
 
             'discount' => array(
-                'label' => __( 'Total Discount', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
+                'label' => __('Total Discount', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
             ),
 
             'tax'      => array(
-                'label' => __( 'Total Tax', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() ),
+                'label' => __('Total Tax', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_tax(), $invoice->get_currency()),
             ),
 
             'total'    => array(
-                'label' => __( 'Invoice Total', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+                'label' => __('Invoice Total', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
             ),
         );
 
-        if ( ! wpinv_use_taxes() ) {
-            unset( $totals['tax'] );
+        if (!wpinv_use_taxes()) {
+            unset($totals['tax']);
         }
 
         $item_args = array(
@@ -524,7 +524,7 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
+            'post_status'    => array('publish'),
             'meta_query'     => array(
                 array(
                     'key'     => '_wpinv_type',
@@ -552,10 +552,10 @@ 
             }
         </style>
 
-                <div class="bsui getpaid-invoice-items-inner <?php echo empty( $items ) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
+                <div class="bsui getpaid-invoice-items-inner <?php echo empty($items) ? 'no-items' : 'has-items'; ?> <?php echo $invoice->is_paid() || $invoice->is_refunded() ? 'not-editable' : 'editable'; ?>" style="margin-top: 1.5rem; padding: 0 12px 12px;">
 
-                    <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
-                        <?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+                    <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
+                        <?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
                         <div class="row">
                             <div class="col-12 col-sm-6">
@@ -564,15 +564,15 @@ 
                                         array(
                                             'id'          => 'wpinv_template',
                                             'name'        => 'wpinv_template',
-                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label'       => __('Template', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'placeholder' => __('Choose a template', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'value'       => $invoice->get_template('edit'),
                                             'options'     => array(
-                                                'quantity' => __( 'Quantity', 'invoicing' ),
-                                                'hours'    => __( 'Hours', 'invoicing' ),
-                                                'amount'   => __( 'Amount Only', 'invoicing' ),
+                                                'quantity' => __('Quantity', 'invoicing'),
+                                                'hours'    => __('Hours', 'invoicing'),
+                                                'amount'   => __('Amount Only', 'invoicing'),
                                             ),
                                             'data-allow-clear' => 'false',
                                             'select2'     => true,
@@ -589,11 +589,11 @@ 
                                         array(
                                             'id'          => 'wpinv_currency',
                                             'name'        => 'wpinv_currency',
-                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label'       => __('Currency', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'placeholder' => __('Select Invoice Currency', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'value'       => $invoice->get_currency('edit'),
                                             'required'    => false,
                                             'data-allow-clear' => 'false',
                                             'select2'     => true,
@@ -606,24 +606,24 @@ 
                             </div>
                         </div>
 
-                        <?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+                        <?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
                     <?php endif; ?>
 
                     <table cellpadding="0" cellspacing="0" class="getpaid_invoice_items">
                         <thead>
                             <tr>
-                                <th class="getpaid-item" colspan="2"><?php esc_html_e( 'Item', 'invoicing' ); ?></th>
+                                <th class="getpaid-item" colspan="2"><?php esc_html_e('Item', 'invoicing'); ?></th>
                                 <th class="getpaid-quantity hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Hours', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Quantity', 'invoicing'); ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Hours', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-price hide-if-amount text-right">
-                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Rate', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Rate', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-item-subtotal text-right">
-                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                    <span class="hide-if-amount"><?php esc_html_e( 'Total', 'invoicing' ); ?></span>
+                                    <span class="getpaid-hide-if-hours getpaid-hide-if-quantity"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                    <span class="hide-if-amount"><?php esc_html_e('Total', 'invoicing'); ?></span>
                                 </th>
                                 <th class="getpaid-item-actions hide-if-not-editable" width="70px">&nbsp;</th>
                             </tr>
@@ -631,8 +631,8 @@ 
 		                <tbody class="getpaid_invoice_line_items">
                             <tr class="hide-if-has-items hide-if-not-editable">
                                 <td colspan="2" class="pt-4 pb-4">
-                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e( 'Add Existing Items', 'invoicing' ); ?></button>
-                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e( 'Create New Item', 'invoicing' ); ?></button>
+                                    <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e('Add Existing Items', 'invoicing'); ?></button>
+                                    <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e('Create New Item', 'invoicing'); ?></button>
                                 </td>
                                 <td class="hide-if-amount">&nbsp;</th>
                                 <td class="hide-if-amount">&nbsp;</th>
@@ -664,11 +664,11 @@ 
                             <div class="col-12 col-sm-6 offset-sm-6">
                                 <table class="getpaid-invoice-totals text-right w-100">
                                     <tbody>
-                                        <?php foreach ( apply_filters( 'getpaid_invoice_subtotal_rows', $totals, $invoice ) as $key => $data ) : ?>
-                                            <tr class="getpaid-totals-<?php echo esc_attr( $key ); ?>">
-                                                <td class="label"><?php echo esc_html( $data['label'] ); ?>:</td>
+                                        <?php foreach (apply_filters('getpaid_invoice_subtotal_rows', $totals, $invoice) as $key => $data) : ?>
+                                            <tr class="getpaid-totals-<?php echo esc_attr($key); ?>">
+                                                <td class="label"><?php echo esc_html($data['label']); ?>:</td>
                                                 <td width="1%"></td>
-                                                <td class="value"><?php echo wp_kses_post( $data['value'] ); ?></td>
+                                                <td class="value"><?php echo wp_kses_post($data['value']); ?></td>
                                             </tr>
                                         <?php endforeach; ?>
                                     </tbody>
@@ -681,18 +681,18 @@ 
                     <div class="getpaid-invoice-item-actions hide-if-no-items hide-if-not-editable">
                         <div class="row">
                             <div class="text-left col-12 col-sm-8">
-                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e( 'Add Existing Item', 'invoicing' ); ?></button>
-                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e( 'Create New Item', 'invoicing' ); ?></button>
-                                <?php do_action( 'getpaid-invoice-items-actions', $invoice ); ?>
+                                <button type="button" class="button button-primary add-invoice-item" data-toggle="modal" data-target="#getpaid-add-items-to-invoice"><?php esc_html_e('Add Existing Item', 'invoicing'); ?></button>
+                                <button type="button" class="button button-secondary create-invoice-item" data-toggle="modal" data-target="#getpaid-create-invoice-item"><?php esc_html_e('Create New Item', 'invoicing'); ?></button>
+                                <?php do_action('getpaid-invoice-items-actions', $invoice); ?>
                             </div>
                             <div class="text-right col-12 col-sm-4">
-                                <button type="button" class="button button-primary recalculate-totals-button"><?php esc_html_e( 'Recalculate Totals', 'invoicing' ); ?></button>
+                                <button type="button" class="button button-primary recalculate-totals-button"><?php esc_html_e('Recalculate Totals', 'invoicing'); ?></button>
                             </div>
                         </div>
                     </div>
 
                     <div class="getpaid-invoice-item-actions hide-if-editable">
-                        <p class="description m-2 text-right text-muted"><?php esc_html_e( 'This invoice is no longer editable', 'invoicing' ); ?></p>
+                        <p class="description m-2 text-right text-muted"><?php esc_html_e('This invoice is no longer editable', 'invoicing'); ?></p>
                     </div>
 
                     <!-- Add items to an invoice -->
@@ -700,9 +700,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php esc_html_e( 'Add Item(s)', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-add-item-to-invoice-label"><?php esc_html_e('Add Item(s)', 'invoicing'); ?></h5>
+                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -711,10 +711,10 @@ 
                                     <table class="widefat">
                                         <thead>
                                             <tr>
-                                                <th class="pl-0 text-left"><?php esc_html_e( 'Item', 'invoicing' ); ?></th>
+                                                <th class="pl-0 text-left"><?php esc_html_e('Item', 'invoicing'); ?></th>
                                                 <th class="pr-0 text-right hide-if-amount">
-                                                    <span class="getpaid-hide-if-hours"><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
-                                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e( 'Hours', 'invoicing' ); ?></span>
+                                                    <span class="getpaid-hide-if-hours"><?php esc_html_e('Quantity', 'invoicing'); ?></span>
+                                                    <span class="getpaid-hide-if-quantity"><?php esc_html_e('Hours', 'invoicing'); ?></span>
                                                 </th>
                                             </tr>
                                         </thead>
@@ -722,9 +722,9 @@ 
 								            <tr>
 									            <td class="pl-0 text-left">
                                                     <select class="regular-text getpaid-add-invoice-item-select">
-                                                        <option value="" selected="selected" disabled><?php esc_html_e( 'Select an item…', 'invoicing' ); ?></option>
-                                                        <?php foreach ( get_posts( $item_args ) as $item ) : ?>
-                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo esc_html( $item->post_title ); ?></option>
+                                                        <option value="" selected="selected" disabled><?php esc_html_e('Select an item…', 'invoicing'); ?></option>
+                                                        <?php foreach (get_posts($item_args) as $item) : ?>
+                                                        <option value="<?php echo (int) $item->ID; ?>"><?php echo esc_html($item->post_title); ?></option>
                                                         <?php endforeach; ?>
                                                     </select>
                                                 </td>
@@ -736,8 +736,8 @@ 
 						            </table>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php esc_html_e( 'Add', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-add" data-dismiss="modal"><?php esc_html_e('Add', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -748,9 +748,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php esc_html_e( 'Create Item', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-create-invoice-item-label"><?php esc_html_e('Create Item', 'invoicing'); ?></h5>
+                                    <button type="button" class="close btn-close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -759,27 +759,27 @@ 
                                     <div class="getpaid-create-item-div">
                                         <input type="hidden" name="id" value="new" class="form-control form-control-sm item-id">
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php esc_html_e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php echo esc_attr( wpinv_sanitize_amount( 0 ) ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php echo esc_attr(wpinv_sanitize_amount(0)); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group mb-3 w-100 hide-if-amount">
-                                            <span><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php esc_html_e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php esc_html_e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e( 'Create', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e('Create', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -790,9 +790,9 @@ 
                         <div class="modal-dialog modal-dialog-centered" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php esc_html_e( 'Edit Item', 'invoicing' ); ?></h5>
-                                    <button type="button" class="close close" data-dismiss="modal" aria-label="<?php esc_html_e( 'Close', 'invoicing' ); ?>">
-                                        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+                                    <h5 class="modal-title" id="getpaid-edit-invoice-item-label"><?php esc_html_e('Edit Item', 'invoicing'); ?></h5>
+                                    <button type="button" class="close close" data-dismiss="modal" aria-label="<?php esc_html_e('Close', 'invoicing'); ?>">
+                                        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                                             <span aria-hidden="true">×</span>
                                         <?php endif; ?>
                                     </button>
@@ -801,27 +801,27 @@ 
                                     <div class="getpaid-edit-item-div">
                                         <input type="hidden" name="id" class="form-control form-control-sm item-id">
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Name', 'invoicing' ); ?></span>
-                                            <input type="text" name="name" placeholder="<?php esc_attr_e( 'Item Name', 'invoicing' ); ?>" class="form-control form-control-sm item-name">
+                                            <span><?php esc_html_e('Name', 'invoicing'); ?></span>
+                                            <input type="text" name="name" placeholder="<?php esc_attr_e('Item Name', 'invoicing'); ?>" class="form-control form-control-sm item-name">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e( 'Amount', 'invoicing' ); ?></span>
-                                            <span class="hide-if-amount"><?php esc_html_e( 'Price', 'invoicing' ); ?></span>
-                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount( 0 ); ?>" class="form-control form-control-sm item-price">
+                                            <span class="getpaid-hide-if-hours getpaid-hide-if-quantity item-price"><?php esc_html_e('Amount', 'invoicing'); ?></span>
+                                            <span class="hide-if-amount"><?php esc_html_e('Price', 'invoicing'); ?></span>
+                                            <input type="text" name="price" placeholder="<?php wpinv_sanitize_amount(0); ?>" class="form-control form-control-sm item-price">
                                         </label>
                                         <label class="form-group mb-3 w-100 hide-if-amount">
-                                            <span><?php esc_html_e( 'Quantity', 'invoicing' ); ?></span>
+                                            <span><?php esc_html_e('Quantity', 'invoicing'); ?></span>
                                             <input type="text" name="quantity" placeholder="1" class="form-control form-control-sm item-quantity">
                                         </label>
                                         <label class="form-group mb-3 w-100">
-                                            <span><?php esc_html_e( 'Item Description', 'invoicing' ); ?></span>
-                                            <textarea name="description" placeholder="<?php esc_attr_e( 'Enter a description for this item', 'invoicing' ); ?>" class="form-control item-description"></textarea>
+                                            <span><?php esc_html_e('Item Description', 'invoicing'); ?></span>
+                                            <textarea name="description" placeholder="<?php esc_attr_e('Enter a description for this item', 'invoicing'); ?>" class="form-control item-description"></textarea>
                                         </label>
                                     </div>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e( 'Cancel', 'invoicing' ); ?></button>
-                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e( 'Save', 'invoicing' ); ?></button>
+                                    <button type="button" class="btn btn-secondary getpaid-cancel" data-dismiss="modal"><?php esc_html_e('Cancel', 'invoicing'); ?></button>
+                                    <button type="button" class="btn btn-primary getpaid-save" data-dismiss="modal"><?php esc_html_e('Save', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>

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

Spacing +60 added lines, -60 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -29,24 +29,24 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		if ( $this->skip_taxes ) {
+		if ($this->skip_taxes) {
 			return;
 		}
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$invoice = $submission->get_invoice();
-			$invoice = $this->refresh_totals( $invoice, $submission );
+			$invoice = $this->refresh_totals($invoice, $submission);
 
-			$this->taxes = array_replace( $invoice->get_taxes(), $this->taxes );
+			$this->taxes = array_replace($invoice->get_taxes(), $this->taxes);
 		}
 	}
 
@@ -57,26 +57,26 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+		$rates    = getpaid_get_item_tax_rates($item, $submission->country, $submission->state);
+		$rates    = getpaid_filter_item_tax_rates($item, $rates);
+		$taxes    = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, false), $rates);
+		$r_taxes  = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, true), $rates);
 
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+		foreach ($taxes as $name => $amount) {
+			$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+			$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
 
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
+			$item->item_tax += wpinv_sanitize_amount($tax['initial_tax']);
 
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
+			if (!isset($this->taxes[$name])) {
+				$this->taxes[$name] = $tax;
 				continue;
 			}
 
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+			$this->taxes[$name]['initial_tax']   += $tax['initial_tax'];
+			$this->taxes[$name]['recurring_tax'] += $tax['recurring_tax'];
 
 		}
 
@@ -89,11 +89,11 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function has_digital_item( $submission ) {
+	public function has_digital_item($submission) {
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				return true;
 			}
 }
@@ -108,7 +108,7 @@ 
 	 * @return bool
 	 */
 	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
+		return self::is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
+	public static function is_eu_country($country) {
+		return getpaid_is_eu_state($country);
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
+	public static function is_eu_transaction($customer_country) {
+		return self::is_eu_country($customer_country) && self::is_eu_store();
 	}
 
 	/**
@@ -140,12 +140,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number', 'billing');
+		if (!is_null($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
@@ -158,12 +158,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_company( $submission ) {
+	public function get_company($submission) {
 
 		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
+		$company = $submission->get_field('wpinv_company', 'billing');
+		if (!empty($company)) {
+			return wpinv_clean($company);
 		}
 
 		// Retrieve from the invoice.
@@ -178,10 +178,10 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
+	public function requires_vat($ip_in_eu, $country_in_eu) {
 
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
+		$prevent_b2c = !empty($prevent_b2c);
 		$is_eu       = $ip_in_eu || $country_in_eu;
 
 		return $prevent_b2c && $is_eu;
@@ -193,43 +193,43 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$in_eu = $this->is_eu_transaction( $submission->country );
+		$in_eu = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
+		$vat_number  = $this->get_vat_number($submission);
 		$ip_country  = getpaid_get_ip_country();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+		if ($submission->is_initial_fetch() && empty($vat_number)) {
 			return;
 		}
 
 		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
+			throw new GetPaid_Payment_Exception('.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __('Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing'));
 
 		}
 
-		if ( empty( $vat_number ) ) {
+		if (empty($vat_number)) {
 			return;
 		}
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
+		if (wpinv_should_validate_vat_number() && !wpinv_validate_vat_number($vat_number, $submission->country)) {
+			throw new GetPaid_Payment_Exception('.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __('Your VAT number is invalid', 'invoicing'));
 		}
 
-		if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+		if (wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option('vat_same_country_rule', 'vat_too')) {
 			return;
 		}
 
@@ -245,19 +245,19 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Payment form submission object.
 	 * @return object Invoice object.
 	 */
-	public function refresh_totals( $invoice, $submission ) {
-		if ( ! ( ! empty( $_POST['action'] ) && ( $_POST['action'] == 'wpinv_payment_form_refresh_prices' || $_POST['action'] == 'wpinv_payment_form' ) && isset( $_POST['billing']['wpinv_country'] ) ) ) {
+	public function refresh_totals($invoice, $submission) {
+		if (!(!empty($_POST['action']) && ($_POST['action'] == 'wpinv_payment_form_refresh_prices' || $_POST['action'] == 'wpinv_payment_form') && isset($_POST['billing']['wpinv_country']))) {
 			return $invoice;
 		}
 
-		if ( ! ( ! $invoice->is_paid() && ! $invoice->is_refunded() && ! $invoice->is_held() ) ) {
+		if (!(!$invoice->is_paid() && !$invoice->is_refunded() && !$invoice->is_held())) {
 			return $invoice;
 		}
 
 		// Maybe check the country, state.
-		if ( $submission->country != $invoice->get_country() || $submission->state != $invoice->get_state() ) {
-			$invoice->set_country( sanitize_text_field( $submission->country ) );
-			$invoice->set_state( sanitize_text_field( $submission->state ) );
+		if ($submission->country != $invoice->get_country() || $submission->state != $invoice->get_state()) {
+			$invoice->set_country(sanitize_text_field($submission->country));
+			$invoice->set_state(sanitize_text_field($submission->state));
 
 			// Recalculate totals.
 			$invoice->recalculate_total();