AyeCode / invoicing

includes/admin/class-getpaid-metaboxes.php

Indentation +236 added lines, -236 removed lines

@@ -12,273 +12,273 @@
  */
 class GetPaid_Metaboxes {
 
-	/**
-	 * Only save metaboxes once.
-	 *
-	 * @var boolean
-	 */
-	private static $saved_meta_boxes = false;
+    /**
+     * Only save metaboxes once.
+     *
+     * @var boolean
+     */
+    private static $saved_meta_boxes = false;
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
+     * Hook in methods.
+     */
+    public static function init() {
 
-		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+        // Register metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
 
-		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+        // Remove metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
 
-		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+        // Rename metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
 
-		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
-	}
+        // Save metaboxes.
+        add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+    }
 
-	/**
-	 * Register core metaboxes.
-	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+    /**
+     * Register core metaboxes.
+     */
+    public static function add_meta_boxes( $post_type, $post ) {
 
-		// For invoices...
-		self::add_invoice_meta_boxes( $post_type, $post );
+        // For invoices...
+        self::add_invoice_meta_boxes( $post_type, $post );
 
-		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type, $post );
+        // For payment forms.
+        self::add_payment_form_meta_boxes( $post_type, $post );
 
-		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+        // For invoice items.
+        self::add_item_meta_boxes( $post_type );
 
-		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
-		}
+        // For invoice discounts.
+        if ( $post_type == 'wpi_discount' ) {
+            add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+        }
 
-	}
+    }
 
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_payment_form_meta_boxes( $post_type, $post ) {
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_payment_form_meta_boxes( $post_type, $post ) {
 
-		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+        // For payment forms.
+        if ( $post_type == 'wpi_payment_form' ) {
 
-			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+            // Design payment form.
+            add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
 
-			// Payment form information.
-			if ( $post->ID != wpinv_get_default_payment_form() ) {
-				add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
-			}
+            // Payment form information.
+            if ( $post->ID != wpinv_get_default_payment_form() ) {
+                add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+            }
 }
 
-	}
-
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+    }
 
-		if ( $post_type == 'wpi_item' ) {
-
-			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
-
-			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
-			}
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_item_meta_boxes( $post_type ) {
 
-			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+        if ( $post_type == 'wpi_item' ) {
 
-		}
+            // Item details.
+            add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
 
-	}
+            // If taxes are enabled, register the tax metabox.
+            if ( wpinv_use_taxes() ) {
+                add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+            }
 
-	/**
-	 * Register invoice metaboxes.
-	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+            // Item info.
+            add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
 
-		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+        }
 
-			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+    }
 
-				add_meta_box(
-					'wpinv-mb-resend-invoice',
-					sprintf(
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
-					),
-					'GetPaid_Meta_Box_Resend_Invoice::output',
-					$post_type,
-					'side',
-					'low'
-				);
+    /**
+     * Register invoice metaboxes.
+     */
+    protected static function add_invoice_meta_boxes( $post_type, $post ) {
+
+        // For invoices...
+        if ( getpaid_is_invoice_post_type( $post_type ) ) {
+            $invoice = new WPInv_Invoice( $post );
+
+            // Resend invoice.
+            if ( ! $invoice->is_draft() ) {
+
+                add_meta_box(
+                    'wpinv-mb-resend-invoice',
+                    sprintf(
+                        __( 'Resend %s', 'invoicing' ),
+                        ucfirst( $invoice->get_invoice_quote_type() )
+                    ),
+                    'GetPaid_Meta_Box_Resend_Invoice::output',
+                    $post_type,
+                    'side',
+                    'low'
+                );
+
+            }
+
+            // Subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+            if ( ! empty( $subscriptions ) ) {
+
+                if ( is_array( $subscriptions ) ) {
+                    add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
+                } else {
+                    add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+                }
+
+                if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
+                    add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+                }
+}
 
-			}
+            // Invoice details.
+            add_meta_box(
+                'wpinv-details',
+                sprintf(
+                    __( '%s Details', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Details::output',
+                $post_type,
+                'side'
+            );
+
+            // Payment details.
+            add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+
+            // Billing details.
+            add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+
+            // Invoice items.
+            add_meta_box(
+                'wpinv-items',
+                sprintf(
+                    __( '%s Items', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Items::output',
+                $post_type,
+                'normal',
+                'high'
+            );
+
+            // Invoice notes.
+            add_meta_box(
+                'wpinv-notes',
+                sprintf(
+                    __( '%s Notes', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'WPInv_Meta_Box_Notes::output',
+                $post_type,
+                'side',
+                'low'
+            );
+
+            // Shipping Address.
+            if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
+                add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+            }
+
+            // Payment form information.
+            if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
+                add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+            }
+}
 
-			// Subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-			if ( ! empty( $subscriptions ) ) {
+    }
 
-				if ( is_array( $subscriptions ) ) {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
-				} else {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
-				}
+    /**
+     * Remove some metaboxes.
+     */
+    public static function remove_meta_boxes() {
+        remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+    }
 
-				if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
-					add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
-				}
-}
+    /**
+     * Rename other metaboxes.
+     */
+    public static function rename_meta_boxes() {
 
-			// Invoice details.
-			add_meta_box(
-				'wpinv-details',
-				sprintf(
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Details::output',
-				$post_type,
-				'side'
-			);
-
-			// Payment details.
-			add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
-
-			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
-
-			// Invoice items.
-			add_meta_box(
-				'wpinv-items',
-				sprintf(
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Items::output',
-				$post_type,
-				'normal',
-				'high'
-			);
-
-			// Invoice notes.
-			add_meta_box(
-				'wpinv-notes',
-				sprintf(
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'WPInv_Meta_Box_Notes::output',
-				$post_type,
-				'side',
-				'low'
-			);
-
-			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
-			}
-
-			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
-			}
-}
+    }
 
-	}
-
-	/**
-	 * Remove some metaboxes.
-	 */
-	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
-	}
-
-	/**
-	 * Rename other metaboxes.
-	 */
-	public static function rename_meta_boxes() {
-
-	}
-
-	/**
-	 * Check if we're saving, then trigger an action based on the post type.
-	 *
-	 * @param  int    $post_id Post ID.
-	 * @param  object $post Post object.
-	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_kses_post_deep( wp_unslash( $_POST ) );
-
-		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
-			return;
-		}
-
-		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
-			return;
-		}
-
-		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
-			return;
-		}
-
-		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
-			return;
-		}
-
-		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
-			return;
-		}
-
-		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return;
-		}
-
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
-
-			// We need this save event to run once to avoid potential endless loops.
-			self::$saved_meta_boxes = true;
-
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
-
-		}
-
-		// Ensure this is our post type.
-		$post_types_map = array(
-			'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
-			'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
-			'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
-		);
-
-		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
-			return;
-		}
-
-		// We need this save event to run once to avoid potential endless loops.
-		self::$saved_meta_boxes = true;
-
-		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
-
-	}
+    /**
+     * Check if we're saving, then trigger an action based on the post type.
+     *
+     * @param  int    $post_id Post ID.
+     * @param  object $post Post object.
+     */
+    public static function save_meta_boxes( $post_id, $post ) {
+        $post_id = absint( $post_id );
+        $data    = wp_kses_post_deep( wp_unslash( $_POST ) );
+
+        // Do not save for ajax requests.
+        if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+            return;
+        }
+
+        // $post_id and $post are required
+        if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+            return;
+        }
+
+        // Dont' save meta boxes for revisions or autosaves.
+        if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+            return;
+        }
+
+        // Check the nonce.
+        if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+            return;
+        }
+
+        // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
+        if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+            return;
+        }
+
+        // Check user has permission to edit.
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return;
+        }
+
+        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+
+            // We need this save event to run once to avoid potential endless loops.
+            self::$saved_meta_boxes = true;
+
+            return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
+
+        }
+
+        // Ensure this is our post type.
+        $post_types_map = array(
+            'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
+            'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
+            'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
+        );
+
+        // Is this our post type?
+        if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+            return;
+        }
+
+        // We need this save event to run once to avoid potential endless loops.
+        self::$saved_meta_boxes = true;
+
+        // Save the post.
+        $class = $post_types_map[ $post->post_type ];
+        $class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
+
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Metaboxes Admin Class
@@ -25,35 +25,35 @@ 
 	public static function init() {
 
 		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2);
 
 		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
 
 		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
 
 		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+		add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
 	}
 
 	/**
 	 * Register core metaboxes.
 	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+	public static function add_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		self::add_invoice_meta_boxes( $post_type, $post );
+		self::add_invoice_meta_boxes($post_type, $post);
 
 		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type, $post );
+		self::add_payment_form_meta_boxes($post_type, $post);
 
 		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+		self::add_item_meta_boxes($post_type);
 
 		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+		if ($post_type == 'wpi_discount') {
+			add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
 		}
 
 	}
@@ -61,17 +61,17 @@ 
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_payment_form_meta_boxes( $post_type, $post ) {
+	protected static function add_payment_form_meta_boxes($post_type, $post) {
 
 		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+		if ($post_type == 'wpi_payment_form') {
 
 			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+			add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
 
 			// Payment form information.
-			if ( $post->ID != wpinv_get_default_payment_form() ) {
-				add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+			if ($post->ID != wpinv_get_default_payment_form()) {
+				add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
 			}
 }
 
@@ -80,20 +80,20 @@ 
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+	protected static function add_item_meta_boxes($post_type) {
 
-		if ( $post_type == 'wpi_item' ) {
+		if ($post_type == 'wpi_item') {
 
 			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+			add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
 			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+			if (wpinv_use_taxes()) {
+				add_meta_box('wpinv_item_vat', __('Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
 			}
 
 			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+			add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
 
 		}
 
@@ -102,20 +102,20 @@ 
 	/**
 	 * Register invoice metaboxes.
 	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+	protected static function add_invoice_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+		if (getpaid_is_invoice_post_type($post_type)) {
+			$invoice = new WPInv_Invoice($post);
 
 			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
 				add_meta_box(
 					'wpinv-mb-resend-invoice',
 					sprintf(
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
+						__('Resend %s', 'invoicing'),
+						ucfirst($invoice->get_invoice_quote_type())
 					),
 					'GetPaid_Meta_Box_Resend_Invoice::output',
 					$post_type,
@@ -126,17 +126,17 @@ 
 			}
 
 			// Subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-			if ( ! empty( $subscriptions ) ) {
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
+			if (!empty($subscriptions)) {
 
-				if ( is_array( $subscriptions ) ) {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
+				if (is_array($subscriptions)) {
+					add_meta_box('wpinv-mb-subscriptions', __('Related Subscriptions', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced');
 				} else {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+					add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced');
 				}
 
-				if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
-					add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+				if (getpaid_count_subscription_invoices($invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id()) > 1) {
+					add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced');
 				}
 }
 
@@ -144,8 +144,8 @@ 
 			add_meta_box(
 				'wpinv-details',
 				sprintf(
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Details', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Details::output',
 				$post_type,
@@ -153,17 +153,17 @@ 
 			);
 
 			// Payment details.
-			add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+			add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default');
 
 			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+			add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high');
 
 			// Invoice items.
 			add_meta_box(
 				'wpinv-items',
 				sprintf(
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Items', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Items::output',
 				$post_type,
@@ -175,8 +175,8 @@ 
 			add_meta_box(
 				'wpinv-notes',
 				sprintf(
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Notes', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'WPInv_Meta_Box_Notes::output',
 				$post_type,
@@ -185,13 +185,13 @@ 
 			);
 
 			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'shipping_address', true)) {
+				add_meta_box('wpinv-invoice-shipping-details', __('Shipping Address', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high');
 			}
 
 			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'payment_form_data', true)) {
+				add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high');
 			}
 }
 
@@ -201,7 +201,7 @@ 
 	 * Remove some metaboxes.
 	 */
 	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+		remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 	}
 
 	/**
@@ -217,46 +217,46 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @param  object $post Post object.
 	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_kses_post_deep( wp_unslash( $_POST ) );
+	public static function save_meta_boxes($post_id, $post) {
+		$post_id = absint($post_id);
+		$data    = wp_kses_post_deep(wp_unslash($_POST));
 
 		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
 			return;
 		}
 
 		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+		if (empty($data['getpaid_meta_nonce']) || !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+		if (empty($data['post_ID']) || absint($data['post_ID']) !== $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			// We need this save event to run once to avoid potential endless loops.
 			self::$saved_meta_boxes = true;
 
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
+			return GetPaid_Meta_Box_Invoice_Address::save($post_id);
 
 		}
 
@@ -268,7 +268,7 @@ 
 		);
 
 		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+		if (!isset($post_types_map[$post->post_type])) {
 			return;
 		}
 
@@ -276,8 +276,8 @@ 
 		self::$saved_meta_boxes = true;
 
 		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
+		$class = $post_types_map[$post->post_type];
+		$class::save($post_id, wp_kses_post_deep($_POST), $post);
 
 	}
 

includes/admin/class-getpaid-admin-setup-wizard.php

Indentation +382 added lines, -382 removed lines

@@ -17,396 +17,396 @@
  */
 class GetPaid_Admin_Setup_Wizard {
 
-	/**
-	 * @var string Current Step
-	 */
-	protected $step = '';
-
-	/**
-	 * @var string|false Previous Step
-	 */
-	protected $previous_step = '';
-
-	/**
-	 * @var string|false Next Step
-	 */
-	protected $next_step = '';
-
-	/**
-	 * @var array All available steps for the setup wizard
-	 */
-	protected $steps = array();
-
-	/**
-	 * Class constructor.
-	 *
-	 * @since 2.4.0
-	 */
-	public function __construct() {
-
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
-			add_action( 'admin_menu', array( $this, 'add_menu' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
-		}
-
-	}
-
-	/**
-	 * Add admin menus/screens.
-	 *
-	 * @since 2.4.0
-	 */
-	public function add_menu() {
-		add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
-	}
-
-	/**
-	 * Sets up the setup wizard.
-	 *
-	 * @since 2.4.0
-	 */
-	public function setup_wizard() {
-
-		if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
-			$this->setup_globals();
-			$this->maybe_save_current_step();
-			$this->display_wizard();
-			exit;
-		}
-
-	}
-
-	/**
-	 * Sets up class variables.
-	 *
-	 * @since 2.4.0
-	 */
-	protected function setup_globals() {
-		$this->steps         = $this->get_setup_steps();
-		$this->step          = $this->get_current_step();
-		$this->previous_step = $this->get_previous_step();
-		$this->next_step     = $this->get_next_step();
-	}
-
-	/**
-	 * Saves the current step.
-	 *
-	 * @since 2.4.0
-	 */
-	protected function maybe_save_current_step() {
-		if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
-			call_user_func( $this->steps[ $this->step ]['handler'], $this );
-		}
-	}
-
-	/**
-	 * Returns the setup steps.
-	 *
-	 * @since 2.4.0
-	 * @return array
-	 */
-	protected function get_setup_steps() {
-
-		$steps = array(
-
-			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
-				'handler' => '',
-			),
-
-			'business_details' => array(
-				'name'    => __( 'Business Details', 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
-				'handler' => '',
-			),
-
-			'currency'         => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
-				'handler' => '',
-			),
-
-			'payments'         => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
-			),
-
-			'recommend'        => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
-				'handler' => '',
-			),
-
-			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
-				'handler' => '',
-			),
-
-		);
-
-		return apply_filters( 'getpaid_setup_wizard_steps', $steps );
-
-	}
-
-	/**
-	 * Returns the current step.
-	 *
-	 * @since 2.4.0
-	 * @return string
-	 */
-	protected function get_current_step() {
-		$step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
-		return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
-	}
-
-	/**
-	 * Returns the previous step.
-	 *
-	 * @since 2.4.0
-	 * @return string|false
-	 */
-	protected function get_previous_step() {
-
-		$previous = false;
-		$current  = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-			if ( $current === $step ) {
-				return $previous;
-			}
-
-			$previous = $step;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the next step.
-	 *
-	 * @since 2.4.0
-	 * @return string|false
-	 */
-	protected function get_next_step() {
-
-		$on_current = false;
-		$current    = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-
-			if ( $on_current ) {
-				return $step;
-			}
-
-			if ( $current === $step ) {
-				return $on_current = true;
-			}
+    /**
+     * @var string Current Step
+     */
+    protected $step = '';
+
+    /**
+     * @var string|false Previous Step
+     */
+    protected $previous_step = '';
+
+    /**
+     * @var string|false Next Step
+     */
+    protected $next_step = '';
+
+    /**
+     * @var array All available steps for the setup wizard
+     */
+    protected $steps = array();
+
+    /**
+     * Class constructor.
+     *
+     * @since 2.4.0
+     */
+    public function __construct() {
+
+        if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
+            add_action( 'admin_menu', array( $this, 'add_menu' ) );
+            add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+        }
+
+    }
+
+    /**
+     * Add admin menus/screens.
+     *
+     * @since 2.4.0
+     */
+    public function add_menu() {
+        add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
+    }
+
+    /**
+     * Sets up the setup wizard.
+     *
+     * @since 2.4.0
+     */
+    public function setup_wizard() {
+
+        if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
+            $this->setup_globals();
+            $this->maybe_save_current_step();
+            $this->display_wizard();
+            exit;
+        }
+
+    }
+
+    /**
+     * Sets up class variables.
+     *
+     * @since 2.4.0
+     */
+    protected function setup_globals() {
+        $this->steps         = $this->get_setup_steps();
+        $this->step          = $this->get_current_step();
+        $this->previous_step = $this->get_previous_step();
+        $this->next_step     = $this->get_next_step();
+    }
+
+    /**
+     * Saves the current step.
+     *
+     * @since 2.4.0
+     */
+    protected function maybe_save_current_step() {
+        if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
+            call_user_func( $this->steps[ $this->step ]['handler'], $this );
+        }
+    }
+
+    /**
+     * Returns the setup steps.
+     *
+     * @since 2.4.0
+     * @return array
+     */
+    protected function get_setup_steps() {
+
+        $steps = array(
+
+            'introduction'     => array(
+                'name'    => __( 'Introduction', 'invoicing' ),
+                'view'    => array( $this, 'setup_introduction' ),
+                'handler' => '',
+            ),
+
+            'business_details' => array(
+                'name'    => __( 'Business Details', 'invoicing' ),
+                'view'    => array( $this, 'setup_business' ),
+                'handler' => '',
+            ),
+
+            'currency'         => array(
+                'name'    => __( 'Currency', 'invoicing' ),
+                'view'    => array( $this, 'setup_currency' ),
+                'handler' => '',
+            ),
+
+            'payments'         => array(
+                'name'    => __( 'Payment Gateways', 'invoicing' ),
+                'view'    => array( $this, 'setup_payments' ),
+                'handler' => array( $this, 'setup_payments_save' ),
+            ),
+
+            'recommend'        => array(
+                'name'    => __( 'Recommend', 'invoicing' ),
+                'view'    => array( $this, 'setup_recommend' ),
+                'handler' => '',
+            ),
+
+            'next_steps'       => array(
+                'name'    => __( 'Get Paid', 'invoicing' ),
+                'view'    => array( $this, 'setup_ready' ),
+                'handler' => '',
+            ),
+
+        );
+
+        return apply_filters( 'getpaid_setup_wizard_steps', $steps );
+
+    }
+
+    /**
+     * Returns the current step.
+     *
+     * @since 2.4.0
+     * @return string
+     */
+    protected function get_current_step() {
+        $step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
+        return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
+    }
+
+    /**
+     * Returns the previous step.
+     *
+     * @since 2.4.0
+     * @return string|false
+     */
+    protected function get_previous_step() {
+
+        $previous = false;
+        $current  = $this->step;
+        foreach ( array_keys( $this->steps ) as $step ) {
+            if ( $current === $step ) {
+                return $previous;
+            }
+
+            $previous = $step;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the next step.
+     *
+     * @since 2.4.0
+     * @return string|false
+     */
+    protected function get_next_step() {
+
+        $on_current = false;
+        $current    = $this->step;
+        foreach ( array_keys( $this->steps ) as $step ) {
+
+            if ( $on_current ) {
+                return $step;
+            }
+
+            if ( $current === $step ) {
+                return $on_current = true;
+            }
 }
 
-		return false;
-	}
-
-	/**
-	 * Displays the setup wizard.
-	 *
-	 * @since 2.4.0
-	 */
-	public function display_wizard() {
-		$this->display_header();
-		$this->display_current_step();
-		$this->display_footer();
-	}
-
-	/**
-	 * Displays the Wizard Header.
-	 *
-	 * @since 2.0.0
-	 */
-	public function display_header() {
-		$steps     = $this->steps;
-		$current   = $this->step;
-		$next_step = $this->next_step;
-		array_shift( $steps );
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
-	}
-
-	/**
-	 * Displays the content for the current step.
-	 *
-	 * @since 2.4.0
-	 */
-	public function display_current_step() {
-		?>
+        return false;
+    }
+
+    /**
+     * Displays the setup wizard.
+     *
+     * @since 2.4.0
+     */
+    public function display_wizard() {
+        $this->display_header();
+        $this->display_current_step();
+        $this->display_footer();
+    }
+
+    /**
+     * Displays the Wizard Header.
+     *
+     * @since 2.0.0
+     */
+    public function display_header() {
+        $steps     = $this->steps;
+        $current   = $this->step;
+        $next_step = $this->next_step;
+        array_shift( $steps );
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
+    }
+
+    /**
+     * Displays the content for the current step.
+     *
+     * @since 2.4.0
+     */
+    public function display_current_step() {
+        ?>
 			<div class="gp-setup-content rowx mw-100 text-center mb-3">
 				<div class="col-12 col-md-5 m-auto">
 					<?php call_user_func( $this->steps[ $this->step ]['view'], $this ); ?>
 				</div>
 			</div>
 		<?php
-	}
-
-	/**
-	 * Setup Wizard Footer.
-	 *
-	 * @since 2.4.0
-	 */
-	public function display_footer() {
-
-		if ( isset( $_GET['step'] ) ) {
-			$next_url = esc_url( $this->get_next_step_link() );
-			$label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
-
-			echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
-		}
-
-		echo '</body></html>';
-	}
-
-	/**
-	 * Introduction step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_introduction() {
-		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
-	}
-
-	/**
-	 * Get the URL for the next step's screen.
-	 *
-	 * @param string step   slug (default: current step)
-	 *
-	 * @return string       URL for next step if a next step exists.
-	 *                      Admin URL if it's the last step.
-	 *                      Empty string on failure.
-	 * @since 3.0.0
-	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
-			$step = $this->step;
-		}
-
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
-			return admin_url();
-		}
-
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
-			return '';
-		}
-
-		return remove_query_arg( 'settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ) );
-	}
-
-	/**
-	 * Setup maps api.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_business() {
-		$next_url = $this->get_next_step_link();
-		$wizard   = $this;
-		$page     = 'wpinv_settings_general_main';
-		$section  = 'wpinv_settings_general_main';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
-	}
-
-	/**
-	 * Default Location settings.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_currency() {
-		$next_url = $this->get_next_step_link();
-		$wizard   = $this;
-		$page     = 'wpinv_settings_general_currency_section';
-		$section  = 'wpinv_settings_general_currency_section';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
-	}
-
-	/**
-	 * Installation of recommended plugins.
-	 *
-	 * @since 1.0.0
-	 */
-	public function setup_recommend() {
-		$next_url            = $this->get_next_step_link();
-		$recommended_plugins = self::get_recommend_wp_plugins();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
-	}
-
-	/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public static function get_recommend_wp_plugins() {
-		return array(
-			'ayecode-connect'  => array(
-				'file' => 'ayecode-connect/ayecode-connect.php',
-				'url'  => 'https://wordpress.org/plugins/ayecode-connect/',
-				'slug' => 'ayecode-connect',
-				'name' => 'AyeCode Connect',
-				'desc' => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
-			),
-			'invoicing-quotes' => array(
-				'file' => 'invoicing-quotes/wpinv-quote.php',
-				'url'  => 'https://wordpress.org/plugins/invoicing-quotes/',
-				'slug' => 'invoicing-quotes',
-				'name' => 'Customer Quotes',
-				'desc' => __( 'Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory' ),
-			),
-			'userswp'          => array(
-				'file' => 'userswp/userswp.php',
-				'url'  => 'https://wordpress.org/plugins/userswp/',
-				'slug' => 'userswp',
-				'name' => 'UsersWP',
-				'desc' => __( 'Frontend user login and registration as well as slick profile pages.', 'geodirectory' ),
-			),
-		);
-	}
-
-	/**
-	 * Dummy Data setup.
-	 *
-	 * @since 2.4.0
-	 */
-	public function setup_payments() {
-		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
-	}
-
-	/**
-	 * Dummy data save.
-	 *
-	 * This is done via ajax so we just pass onto the next step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_payments_save() {
-		check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
-		wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
-
-		if ( ! empty( $_POST['paypal-email'] ) ) {
-			wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
-			wpinv_update_option( 'paypal_active', 1 );
-			wpinv_update_option( 'paypal_sandbox', 0 );
-		}
-
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
-		exit;
-	}
-
-	/**
-	 * Final step.
-	 *
-	 * @since 2.0.0
-	 */
-	public function setup_ready() {
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
-	}
+    }
+
+    /**
+     * Setup Wizard Footer.
+     *
+     * @since 2.4.0
+     */
+    public function display_footer() {
+
+        if ( isset( $_GET['step'] ) ) {
+            $next_url = esc_url( $this->get_next_step_link() );
+            $label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
+
+            echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
+        }
+
+        echo '</body></html>';
+    }
+
+    /**
+     * Introduction step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_introduction() {
+        $next_url = $this->get_next_step_link();
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
+    }
+
+    /**
+     * Get the URL for the next step's screen.
+     *
+     * @param string step   slug (default: current step)
+     *
+     * @return string       URL for next step if a next step exists.
+     *                      Admin URL if it's the last step.
+     *                      Empty string on failure.
+     * @since 3.0.0
+     */
+    public function get_next_step_link( $step = '' ) {
+        if ( ! $step ) {
+            $step = $this->step;
+        }
+
+        $keys = array_keys( $this->steps );
+        if ( end( $keys ) === $step ) {
+            return admin_url();
+        }
+
+        $step_index = array_search( $step, $keys );
+        if ( false === $step_index ) {
+            return '';
+        }
+
+        return remove_query_arg( 'settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ) );
+    }
+
+    /**
+     * Setup maps api.
+     *
+     * @since 2.0.0
+     */
+    public function setup_business() {
+        $next_url = $this->get_next_step_link();
+        $wizard   = $this;
+        $page     = 'wpinv_settings_general_main';
+        $section  = 'wpinv_settings_general_main';
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+    }
+
+    /**
+     * Default Location settings.
+     *
+     * @since 2.0.0
+     */
+    public function setup_currency() {
+        $next_url = $this->get_next_step_link();
+        $wizard   = $this;
+        $page     = 'wpinv_settings_general_currency_section';
+        $section  = 'wpinv_settings_general_currency_section';
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+    }
+
+    /**
+     * Installation of recommended plugins.
+     *
+     * @since 1.0.0
+     */
+    public function setup_recommend() {
+        $next_url            = $this->get_next_step_link();
+        $recommended_plugins = self::get_recommend_wp_plugins();
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
+    }
+
+    /**
+     * A list of recommended wp.org plugins.
+     * @return array
+     */
+    public static function get_recommend_wp_plugins() {
+        return array(
+            'ayecode-connect'  => array(
+                'file' => 'ayecode-connect/ayecode-connect.php',
+                'url'  => 'https://wordpress.org/plugins/ayecode-connect/',
+                'slug' => 'ayecode-connect',
+                'name' => 'AyeCode Connect',
+                'desc' => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+            ),
+            'invoicing-quotes' => array(
+                'file' => 'invoicing-quotes/wpinv-quote.php',
+                'url'  => 'https://wordpress.org/plugins/invoicing-quotes/',
+                'slug' => 'invoicing-quotes',
+                'name' => 'Customer Quotes',
+                'desc' => __( 'Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory' ),
+            ),
+            'userswp'          => array(
+                'file' => 'userswp/userswp.php',
+                'url'  => 'https://wordpress.org/plugins/userswp/',
+                'slug' => 'userswp',
+                'name' => 'UsersWP',
+                'desc' => __( 'Frontend user login and registration as well as slick profile pages.', 'geodirectory' ),
+            ),
+        );
+    }
+
+    /**
+     * Dummy Data setup.
+     *
+     * @since 2.4.0
+     */
+    public function setup_payments() {
+        $next_url = $this->get_next_step_link();
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
+    }
+
+    /**
+     * Dummy data save.
+     *
+     * This is done via ajax so we just pass onto the next step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_payments_save() {
+        check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
+        wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
+
+        if ( ! empty( $_POST['paypal-email'] ) ) {
+            wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
+            wpinv_update_option( 'paypal_active', 1 );
+            wpinv_update_option( 'paypal_sandbox', 0 );
+        }
+
+        wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+        exit;
+    }
+
+    /**
+     * Final step.
+     *
+     * @since 2.0.0
+     */
+    public function setup_ready() {
+        include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
+    }
 
 }
 

Spacing +58 added lines, -58 removed lines

@@ -10,7 +10,7 @@ 
  * @version     2.4.0
  * @info        GetPaid Setup Wizard.
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Admin_Setup_Wizard class.
@@ -44,9 +44,9 @@ 
 	 */
 	public function __construct() {
 
-		if ( apply_filters( 'getpaid_enable_setup_wizard', true ) && wpinv_current_user_can_manage_invoicing() ) {
-			add_action( 'admin_menu', array( $this, 'add_menu' ) );
-			add_action( 'current_screen', array( $this, 'setup_wizard' ) );
+		if (apply_filters('getpaid_enable_setup_wizard', true) && wpinv_current_user_can_manage_invoicing()) {
+			add_action('admin_menu', array($this, 'add_menu'));
+			add_action('current_screen', array($this, 'setup_wizard'));
 		}
 
 	}
@@ -57,7 +57,7 @@ 
 	 * @since 2.4.0
 	 */
 	public function add_menu() {
-		add_dashboard_page( '', '', wpinv_get_capability(), 'gp-setup', '' );
+		add_dashboard_page('', '', wpinv_get_capability(), 'gp-setup', '');
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function setup_wizard() {
 
-		if ( isset( $_GET['page'] ) && 'gp-setup' === $_GET['page'] ) {
+		if (isset($_GET['page']) && 'gp-setup' === $_GET['page']) {
 			$this->setup_globals();
 			$this->maybe_save_current_step();
 			$this->display_wizard();
@@ -94,8 +94,8 @@ 
 	 * @since 2.4.0
 	 */
 	protected function maybe_save_current_step() {
-		if ( ! empty( $_POST['save_step'] ) && is_callable( $this->steps[ $this->step ]['handler'] ) ) {
-			call_user_func( $this->steps[ $this->step ]['handler'], $this );
+		if (!empty($_POST['save_step']) && is_callable($this->steps[$this->step]['handler'])) {
+			call_user_func($this->steps[$this->step]['handler'], $this);
 		}
 	}
 
@@ -110,44 +110,44 @@ 
 		$steps = array(
 
 			'introduction'     => array(
-				'name'    => __( 'Introduction', 'invoicing' ),
-				'view'    => array( $this, 'setup_introduction' ),
+				'name'    => __('Introduction', 'invoicing'),
+				'view'    => array($this, 'setup_introduction'),
 				'handler' => '',
 			),
 
 			'business_details' => array(
-				'name'    => __( 'Business Details', 'invoicing' ),
-				'view'    => array( $this, 'setup_business' ),
+				'name'    => __('Business Details', 'invoicing'),
+				'view'    => array($this, 'setup_business'),
 				'handler' => '',
 			),
 
 			'currency'         => array(
-				'name'    => __( 'Currency', 'invoicing' ),
-				'view'    => array( $this, 'setup_currency' ),
+				'name'    => __('Currency', 'invoicing'),
+				'view'    => array($this, 'setup_currency'),
 				'handler' => '',
 			),
 
 			'payments'         => array(
-				'name'    => __( 'Payment Gateways', 'invoicing' ),
-				'view'    => array( $this, 'setup_payments' ),
-				'handler' => array( $this, 'setup_payments_save' ),
+				'name'    => __('Payment Gateways', 'invoicing'),
+				'view'    => array($this, 'setup_payments'),
+				'handler' => array($this, 'setup_payments_save'),
 			),
 
 			'recommend'        => array(
-				'name'    => __( 'Recommend', 'invoicing' ),
-				'view'    => array( $this, 'setup_recommend' ),
+				'name'    => __('Recommend', 'invoicing'),
+				'view'    => array($this, 'setup_recommend'),
 				'handler' => '',
 			),
 
 			'next_steps'       => array(
-				'name'    => __( 'Get Paid', 'invoicing' ),
-				'view'    => array( $this, 'setup_ready' ),
+				'name'    => __('Get Paid', 'invoicing'),
+				'view'    => array($this, 'setup_ready'),
 				'handler' => '',
 			),
 
 		);
 
-		return apply_filters( 'getpaid_setup_wizard_steps', $steps );
+		return apply_filters('getpaid_setup_wizard_steps', $steps);
 
 	}
 
@@ -158,8 +158,8 @@ 
 	 * @return string
 	 */
 	protected function get_current_step() {
-		$step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : '';
-		return ! empty( $step ) && in_array( $step, array_keys( $this->steps ) ) ? $step : current( array_keys( $this->steps ) );
+		$step = isset($_GET['step']) ? sanitize_key($_GET['step']) : '';
+		return !empty($step) && in_array($step, array_keys($this->steps)) ? $step : current(array_keys($this->steps));
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 
 		$previous = false;
 		$current  = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
-			if ( $current === $step ) {
+		foreach (array_keys($this->steps) as $step) {
+			if ($current === $step) {
 				return $previous;
 			}
 
@@ -193,13 +193,13 @@ 
 
 		$on_current = false;
 		$current    = $this->step;
-		foreach ( array_keys( $this->steps ) as $step ) {
+		foreach (array_keys($this->steps) as $step) {
 
-			if ( $on_current ) {
+			if ($on_current) {
 				return $step;
 			}
 
-			if ( $current === $step ) {
+			if ($current === $step) {
 				return $on_current = true;
 			}
 }
@@ -227,8 +227,8 @@ 
 		$steps     = $this->steps;
 		$current   = $this->step;
 		$next_step = $this->next_step;
-		array_shift( $steps );
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-header.php';
+		array_shift($steps);
+		include plugin_dir_path(__FILE__) . 'views/wizard-header.php';
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 		?>
 			<div class="gp-setup-content rowx mw-100 text-center mb-3">
 				<div class="col-12 col-md-5 m-auto">
-					<?php call_user_func( $this->steps[ $this->step ]['view'], $this ); ?>
+					<?php call_user_func($this->steps[$this->step]['view'], $this); ?>
 				</div>
 			</div>
 		<?php
@@ -253,9 +253,9 @@ 
 	 */
 	public function display_footer() {
 
-		if ( isset( $_GET['step'] ) ) {
-			$next_url = esc_url( $this->get_next_step_link() );
-			$label    = $this->step == 'next_steps' ? __( 'Return to the WordPress Dashboard', 'invoicing' ) : __( 'Skip this step', 'invoicing' );
+		if (isset($_GET['step'])) {
+			$next_url = esc_url($this->get_next_step_link());
+			$label    = $this->step == 'next_steps' ? __('Return to the WordPress Dashboard', 'invoicing') : __('Skip this step', 'invoicing');
 
 			echo '<p class="gd-return-to-dashboard-wrap"> <a href="' . $next_url . '" class="gd-return-to-dashboard btn btn-link d-block text-muted">' . $label . '</a></p>';
 		}
@@ -270,7 +270,7 @@ 
 	 */
 	public function setup_introduction() {
 		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-introduction.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-introduction.php';
 	}
 
 	/**
@@ -283,22 +283,22 @@ 
 	 *                      Empty string on failure.
 	 * @since 3.0.0
 	 */
-	public function get_next_step_link( $step = '' ) {
-		if ( ! $step ) {
+	public function get_next_step_link($step = '') {
+		if (!$step) {
 			$step = $this->step;
 		}
 
-		$keys = array_keys( $this->steps );
-		if ( end( $keys ) === $step ) {
+		$keys = array_keys($this->steps);
+		if (end($keys) === $step) {
 			return admin_url();
 		}
 
-		$step_index = array_search( $step, $keys );
-		if ( false === $step_index ) {
+		$step_index = array_search($step, $keys);
+		if (false === $step_index) {
 			return '';
 		}
 
-		return remove_query_arg( 'settings-updated', add_query_arg( 'step', $keys[ $step_index + 1 ] ) );
+		return remove_query_arg('settings-updated', add_query_arg('step', $keys[$step_index + 1]));
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 		$wizard   = $this;
 		$page     = 'wpinv_settings_general_main';
 		$section  = 'wpinv_settings_general_main';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-settings.php';
 	}
 
 	/**
@@ -324,7 +324,7 @@ 
 		$wizard   = $this;
 		$page     = 'wpinv_settings_general_currency_section';
 		$section  = 'wpinv_settings_general_currency_section';
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-settings.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-settings.php';
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 	public function setup_recommend() {
 		$next_url            = $this->get_next_step_link();
 		$recommended_plugins = self::get_recommend_wp_plugins();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-plugins.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-plugins.php';
 	}
 
 	/**
@@ -349,21 +349,21 @@ 
 				'url'  => 'https://wordpress.org/plugins/ayecode-connect/',
 				'slug' => 'ayecode-connect',
 				'name' => 'AyeCode Connect',
-				'desc' => __( 'Documentation and Support from within your WordPress admin.', 'geodirectory' ),
+				'desc' => __('Documentation and Support from within your WordPress admin.', 'geodirectory'),
 			),
 			'invoicing-quotes' => array(
 				'file' => 'invoicing-quotes/wpinv-quote.php',
 				'url'  => 'https://wordpress.org/plugins/invoicing-quotes/',
 				'slug' => 'invoicing-quotes',
 				'name' => 'Customer Quotes',
-				'desc' => __( 'Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory' ),
+				'desc' => __('Create & Send Quotes to Customers and have them accept and pay.', 'geodirectory'),
 			),
 			'userswp'          => array(
 				'file' => 'userswp/userswp.php',
 				'url'  => 'https://wordpress.org/plugins/userswp/',
 				'slug' => 'userswp',
 				'name' => 'UsersWP',
-				'desc' => __( 'Frontend user login and registration as well as slick profile pages.', 'geodirectory' ),
+				'desc' => __('Frontend user login and registration as well as slick profile pages.', 'geodirectory'),
 			),
 		);
 	}
@@ -375,7 +375,7 @@ 
 	 */
 	public function setup_payments() {
 		$next_url = $this->get_next_step_link();
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-gateways.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-gateways.php';
 	}
 
 	/**
@@ -386,16 +386,16 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_payments_save() {
-		check_admin_referer( 'getpaid-setup-wizard', 'getpaid-setup-wizard' );
-		wpinv_update_option( 'manual_active', ! empty( $_POST['enable-manual-gateway'] ) );
+		check_admin_referer('getpaid-setup-wizard', 'getpaid-setup-wizard');
+		wpinv_update_option('manual_active', !empty($_POST['enable-manual-gateway']));
 
-		if ( ! empty( $_POST['paypal-email'] ) ) {
-			wpinv_update_option( 'paypal_email', sanitize_email( $_POST['paypal-email'] ) );
-			wpinv_update_option( 'paypal_active', 1 );
-			wpinv_update_option( 'paypal_sandbox', 0 );
+		if (!empty($_POST['paypal-email'])) {
+			wpinv_update_option('paypal_email', sanitize_email($_POST['paypal-email']));
+			wpinv_update_option('paypal_active', 1);
+			wpinv_update_option('paypal_sandbox', 0);
 		}
 
-		wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+		wp_redirect(esc_url_raw($this->get_next_step_link()));
 		exit;
 	}
 
@@ -405,7 +405,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function setup_ready() {
-		include plugin_dir_path( __FILE__ ) . 'views/wizard-thank-you.php';
+		include plugin_dir_path(__FILE__) . 'views/wizard-thank-you.php';
 	}
 
 }

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

Indentation +757 added lines, -757 removed lines

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

Spacing +234 added lines, -234 removed lines

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

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

Indentation +34 added lines, -34 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,22 +15,22 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Shipping_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
 
-		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+        // Retrieve shipping address.
+        $shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
 
-		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
-			return;
-		}
+        // Abort if it is invalid.
+        if ( ! is_array( $shipping_address ) ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="bsui">
 
@@ -68,31 +68,31 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Prepares a value.
-	 *
-	 * @param array $address
-	 * @param string $key
-	 * @return string
-	 */
-	public static function prepare_for_display( $address, $key ) {
+    /**
+     * Prepares a value.
+     *
+     * @param array $address
+     * @param string $key
+     * @return string
+     */
+    public static function prepare_for_display( $address, $key ) {
 
-		// Prepare the value.
-		$value = $address[ $key ];
+        // Prepare the value.
+        $value = $address[ $key ];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
-		}
+        if ( $key == 'country' ) {
+            $value = wpinv_country_name( $value );
+        }
 
-		if ( $key == 'state' ) {
-			$country = isset( $address['country'] ) ? $address['country'] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
-		}
+        if ( $key == 'state' ) {
+            $country = isset( $address['country'] ) ? $address['country'] : wpinv_get_default_country();
+            $value = wpinv_state_name( $value, $country );
+        }
 
-		return esc_html( $value );
+        return esc_html( $value );
 
-	}
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,13 +20,13 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+		$shipping_address = get_post_meta($post->ID, 'shipping_address', true);
 
 		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
+		if (!is_array($shipping_address)) {
 			return;
 		}
 
@@ -34,29 +34,29 @@ 
 
 		<div class="bsui">
 
-			<?php if ( ! empty( $shipping_address['method'] ) ) : ?>
+			<?php if (!empty($shipping_address['method'])) : ?>
 
 				<div class="form-group form-row" style="color: green;">
 					<div class="col">
-						<span style="font-weight: 600"><?php esc_html_e( 'Shipping Method', 'invoicing' ); ?>:</span>
+						<span style="font-weight: 600"><?php esc_html_e('Shipping Method', 'invoicing'); ?>:</span>
 					</div>
 					<div class="col">
-						<?php echo wp_kses_post( $shipping_address['method'] ); ?>
+						<?php echo wp_kses_post($shipping_address['method']); ?>
 					</div>
 				</div>
 
 			<?php endif; ?>
 
-			<?php foreach ( getpaid_user_address_fields() as $key => $label ) : ?>
+			<?php foreach (getpaid_user_address_fields() as $key => $label) : ?>
 
-					<?php if ( ! empty( $shipping_address[ $key ] ) ) : ?>
+					<?php if (!empty($shipping_address[$key])) : ?>
 
 						<div class="form-group form-row">
 							<div class="col">
-								<span style="font-weight: 600"><?php echo esc_html( $label ); ?>:</span>
+								<span style="font-weight: 600"><?php echo esc_html($label); ?>:</span>
 							</div>
 							<div class="col">
-								<?php echo self::prepare_for_display( $shipping_address, $key ); ?>
+								<?php echo self::prepare_for_display($shipping_address, $key); ?>
 							</div>
 						</div>
 
@@ -77,21 +77,21 @@ 
 	 * @param string $key
 	 * @return string
 	 */
-	public static function prepare_for_display( $address, $key ) {
+	public static function prepare_for_display($address, $key) {
 
 		// Prepare the value.
-		$value = $address[ $key ];
+		$value = $address[$key];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
+		if ($key == 'country') {
+			$value = wpinv_country_name($value);
 		}
 
-		if ( $key == 'state' ) {
-			$country = isset( $address['country'] ) ? $address['country'] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
+		if ($key == 'state') {
+			$country = isset($address['country']) ? $address['country'] : wpinv_get_default_country();
+			$value = wpinv_state_name($value, $country);
 		}
 
-		return esc_html( $value );
+		return esc_html($value);
 
 	}
 

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

Indentation +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -17,10 +17,10 @@ 
 class GetPaid_Meta_Box_Discount_Details {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Prepare the discount.
@@ -396,35 +396,35 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the discount.
         $discount = new WPInv_Discount( $post_id );
 
         // Load new data.
         $discount->set_props(
-			array(
-				'code'           => isset( $_POST['wpinv_discount_code'] ) ? wpinv_clean( $_POST['wpinv_discount_code'] ) : null,
-				'amount'         => isset( $_POST['wpinv_discount_amount'] ) ? floatval( $_POST['wpinv_discount_amount'] ) : null,
-				'start'          => isset( $_POST['wpinv_discount_start'] ) ? wpinv_clean( $_POST['wpinv_discount_start'] ) : null,
-				'expiration'     => isset( $_POST['wpinv_discount_expiration'] ) ? wpinv_clean( $_POST['wpinv_discount_expiration'] ) : null,
-				'is_single_use'  => ! empty( $_POST['wpinv_discount_single_use'] ),
+            array(
+                'code'           => isset( $_POST['wpinv_discount_code'] ) ? wpinv_clean( $_POST['wpinv_discount_code'] ) : null,
+                'amount'         => isset( $_POST['wpinv_discount_amount'] ) ? floatval( $_POST['wpinv_discount_amount'] ) : null,
+                'start'          => isset( $_POST['wpinv_discount_start'] ) ? wpinv_clean( $_POST['wpinv_discount_start'] ) : null,
+                'expiration'     => isset( $_POST['wpinv_discount_expiration'] ) ? wpinv_clean( $_POST['wpinv_discount_expiration'] ) : null,
+                'is_single_use'  => ! empty( $_POST['wpinv_discount_single_use'] ),
                 'type'           => isset( $_POST['wpinv_discount_type'] ) ? wpinv_clean( $_POST['wpinv_discount_type'] ) : null,
-				'is_recurring'   => ! empty( $_POST['wpinv_discount_recurring'] ),
-				'items'          => isset( $_POST['wpinv_discount_items'] ) ? wpinv_clean( $_POST['wpinv_discount_items'] ) : array(),
-				'excluded_items' => isset( $_POST['wpinv_discount_excluded_items'] ) ? wpinv_clean( $_POST['wpinv_discount_excluded_items'] ) : array(),
+                'is_recurring'   => ! empty( $_POST['wpinv_discount_recurring'] ),
+                'items'          => isset( $_POST['wpinv_discount_items'] ) ? wpinv_clean( $_POST['wpinv_discount_items'] ) : array(),
+                'excluded_items' => isset( $_POST['wpinv_discount_excluded_items'] ) ? wpinv_clean( $_POST['wpinv_discount_excluded_items'] ) : array(),
                 'required_items' => isset( $_POST['wpinv_discount_required_items'] ) ? wpinv_clean( $_POST['wpinv_discount_required_items'] ) : array(),
-				'max_uses'       => isset( $_POST['wpinv_discount_max_uses'] ) ? intval( $_POST['wpinv_discount_max_uses'] ) : null,
-				'min_total'      => isset( $_POST['wpinv_discount_min_total'] ) ? floatval( $_POST['wpinv_discount_min_total'] ) : null,
-				'max_total'      => isset( $_POST['wpinv_discount_max_total'] ) ? floatval( $_POST['wpinv_discount_max_total'] ) : null,
-			)
+                'max_uses'       => isset( $_POST['wpinv_discount_max_uses'] ) ? intval( $_POST['wpinv_discount_max_uses'] ) : null,
+                'min_total'      => isset( $_POST['wpinv_discount_min_total'] ) ? floatval( $_POST['wpinv_discount_min_total'] ) : null,
+                'max_total'      => isset( $_POST['wpinv_discount_max_total'] ) ? floatval( $_POST['wpinv_discount_max_total'] ) : null,
+            )
         );
 
-		$discount->save();
-		do_action( 'getpaid_discount_metabox_save', $post_id, $discount );
-	}
+        $discount->save();
+        do_action( 'getpaid_discount_metabox_save', $post_id, $discount );
+    }
 }

Spacing +104 added lines, -104 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,24 +21,24 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Prepare the discount.
-        $discount = new WPInv_Discount( $post );
+        $discount = new WPInv_Discount($post);
 
         // Nonce field.
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
-        do_action( 'wpinv_discount_form_top', $discount );
+        do_action('wpinv_discount_form_top', $discount);
 
         // Set the currency position.
         $position = wpinv_currency_position();
 
-        if ( $position == 'left_space' ) {
+        if ($position == 'left_space') {
             $position = 'left';
         }
 
-        if ( $position == 'right_space' ) {
+        if ($position == 'right_space') {
             $position = 'right';
         }
 
@@ -52,66 +52,66 @@ 
         </style>
         <div class='bsui' style='max-width: 600px;padding-top: 10px;'>
 
-            <?php do_action( 'wpinv_discount_form_first', $discount ); ?>
+            <?php do_action('wpinv_discount_form_first', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_code', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_code', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_code" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Discount Code', 'invoicing' ); ?>
+                    <?php esc_html_e('Discount Code', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="row">
                         <div class="col-sm-12 form-group">
-                            <input type="text" value="<?php echo esc_attr( $discount->get_code( 'edit' ) ); ?>" placeholder="SUMMER_SALE" name="wpinv_discount_code" id="wpinv_discount_code" style="width: 100%;" />
+                            <input type="text" value="<?php echo esc_attr($discount->get_code('edit')); ?>" placeholder="SUMMER_SALE" name="wpinv_discount_code" id="wpinv_discount_code" style="width: 100%;" />
                         </div>
                         <div class="col-sm-12">
                             <?php
-                                do_action( 'wpinv_discount_form_before_single_use', $discount );
+                                do_action('wpinv_discount_form_before_single_use', $discount);
 
                                 echo aui()->input(
                                     array(
                                         'id'      => 'wpinv_discount_single_use',
                                         'name'    => 'wpinv_discount_single_use',
                                         'type'    => 'checkbox',
-                                        'label'   => __( 'Each customer can only use this discount once', 'invoicing' ),
+                                        'label'   => __('Each customer can only use this discount once', 'invoicing'),
                                         'value'   => '1',
                                         'checked' => $discount->is_single_use(),
                                     )
                                 );
 
-                                do_action( 'wpinv_discount_form_single_use', $discount );
+                                do_action('wpinv_discount_form_single_use', $discount);
                             ?>
                         </div>
                         <div class="col-sm-12">
                             <?php
-                                do_action( 'wpinv_discount_form_before_recurring', $discount );
+                                do_action('wpinv_discount_form_before_recurring', $discount);
 
                                 echo aui()->input(
                                     array(
                                         'id'      => 'wpinv_discount_recurring',
                                         'name'    => 'wpinv_discount_recurring',
                                         'type'    => 'checkbox',
-                                        'label'   => __( 'Apply this discount to all recurring payments for subscriptions', 'invoicing' ),
+                                        'label'   => __('Apply this discount to all recurring payments for subscriptions', 'invoicing'),
                                         'value'   => '1',
                                         'checked' => $discount->is_recurring(),
                                     )
                                 );
 
-                                do_action( 'wpinv_discount_form_recurring', $discount );
+                                do_action('wpinv_discount_form_recurring', $discount);
                             ?>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Enter a discount code such as 10OFF.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Enter a discount code such as 10OFF.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_code', $discount ); ?>
+            <?php do_action('wpinv_discount_form_code', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_type', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_type', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_type" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Discount Type', 'invoicing' ); ?>
+                    <?php esc_html_e('Discount Type', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -119,9 +119,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_type',
                                 'name'             => 'wpinv_discount_type',
-                                'label'            => __( 'Discount Type', 'invoicing' ),
-                                'placeholder'      => __( 'Select Discount Type', 'invoicing' ),
-                                'value'            => $discount->get_type( 'edit' ),
+                                'label'            => __('Discount Type', 'invoicing'),
+                                'placeholder'      => __('Select Discount Type', 'invoicing'),
+                                'value'            => $discount->get_type('edit'),
                                 'select2'          => true,
                                 'data-allow-clear' => 'false',
                                 'options'          => wpinv_get_discount_types(),
@@ -130,19 +130,19 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Discount type.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Discount type.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_type', $discount ); ?>
+            <?php do_action('wpinv_discount_form_type', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_amount', $discount ); ?>
-            <div class="form-group row <?php echo esc_attr( $discount->get_type( 'edit' ) ); ?>" id="wpinv_discount_amount_wrap">
+            <?php do_action('wpinv_discount_form_before_amount', $discount); ?>
+            <div class="form-group row <?php echo esc_attr($discount->get_type('edit')); ?>" id="wpinv_discount_amount_wrap">
                 <label for="wpinv_discount_amount" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Discount Amount', 'invoicing' ); ?>
+                    <?php esc_html_e('Discount Amount', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="input-group input-group-sm">
-                        <?php if ( 'left' == $position ) : ?>
+                        <?php if ('left' == $position) : ?>
                             <div class="input-group-prepend left wpinv-if-flat">
                                 <span class="input-group-text">
                                     <?php echo wpinv_currency_symbol(); ?>
@@ -150,9 +150,9 @@ 
                             </div>
                         <?php endif; ?>
 
-                        <input type="text" name="wpinv_discount_amount" id="wpinv_discount_amount" value="<?php echo esc_attr( $discount->get_amount( 'edit' ) ); ?>" placeholder="0" class="form-control">
+                        <input type="text" name="wpinv_discount_amount" id="wpinv_discount_amount" value="<?php echo esc_attr($discount->get_amount('edit')); ?>" placeholder="0" class="form-control">
 
-                        <?php if ( 'right' == $position ) : ?>
+                        <?php if ('right' == $position) : ?>
                             <div class="input-group-prepend left wpinv-if-flat">
                                 <span class="input-group-text">
                                     <?php echo wpinv_currency_symbol(); ?>
@@ -165,15 +165,15 @@ 
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Enter the discount value. Ex: 10', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Enter the discount value. Ex: 10', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_amount', $discount ); ?>
+            <?php do_action('wpinv_discount_form_amount', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_items', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_items" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Items', 'invoicing' ); ?>
+                    <?php esc_html_e('Items', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -181,9 +181,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_items',
                                 'name'             => 'wpinv_discount_items[]',
-                                'label'            => __( 'Items', 'invoicing' ),
-                                'placeholder'      => __( 'Select Items', 'invoicing' ),
-                                'value'            => $discount->get_items( 'edit' ),
+                                'label'            => __('Items', 'invoicing'),
+                                'placeholder'      => __('Select Items', 'invoicing'),
+                                'value'            => $discount->get_items('edit'),
                                 'select2'          => true,
                                 'multiple'         => true,
                                 'data-allow-clear' => 'false',
@@ -193,15 +193,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Select the items that are allowed to use this discount or leave blank to use this discount all items.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Select the items that are allowed to use this discount or leave blank to use this discount all items.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_items', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_excluded_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_excluded_items', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_excluded_items" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Excluded Items', 'invoicing' ); ?>
+                    <?php esc_html_e('Excluded Items', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -209,9 +209,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_excluded_items',
                                 'name'             => 'wpinv_discount_excluded_items[]',
-                                'label'            => __( 'Excluded Items', 'invoicing' ),
-                                'placeholder'      => __( 'Select Items', 'invoicing' ),
-                                'value'            => $discount->get_excluded_items( 'edit' ),
+                                'label'            => __('Excluded Items', 'invoicing'),
+                                'placeholder'      => __('Select Items', 'invoicing'),
+                                'value'            => $discount->get_excluded_items('edit'),
                                 'select2'          => true,
                                 'multiple'         => true,
                                 'data-allow-clear' => 'false',
@@ -221,15 +221,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Select all the items that are not allowed to use this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Select all the items that are not allowed to use this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_excluded_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_excluded_items', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_required_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_required_items', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_required_items" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Required Items', 'invoicing' ); ?>
+                    <?php esc_html_e('Required Items', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -237,9 +237,9 @@ 
                             array(
                                 'id'               => 'wpinv_discount_required_items',
                                 'name'             => 'wpinv_discount_required_items[]',
-                                'label'            => __( 'Required Items', 'invoicing' ),
-                                'placeholder'      => __( 'Select Items', 'invoicing' ),
-                                'value'            => $discount->get_required_items( 'edit' ),
+                                'label'            => __('Required Items', 'invoicing'),
+                                'placeholder'      => __('Select Items', 'invoicing'),
+                                'value'            => $discount->get_required_items('edit'),
                                 'select2'          => true,
                                 'multiple'         => true,
                                 'data-allow-clear' => 'false',
@@ -249,15 +249,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Select all the items that are required to be in the cart before using this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Select all the items that are required to be in the cart before using this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_required_items', $discount ); ?>
+            <?php do_action('wpinv_discount_form_required_items', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_start', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_start', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_start" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Start Date', 'invoicing' ); ?>
+                    <?php esc_html_e('Start Date', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -266,10 +266,10 @@ 
                                 'type'             => 'datepicker',
                                 'id'               => 'wpinv_discount_start',
                                 'name'             => 'wpinv_discount_start',
-                                'label'            => __( 'Start Date', 'invoicing' ),
+                                'label'            => __('Start Date', 'invoicing'),
                                 'placeholder'      => 'YYYY-MM-DD 00:00',
                                 'class'            => 'form-control-sm',
-                                'value'            => $discount->get_start_date( 'edit' ),
+                                'value'            => $discount->get_start_date('edit'),
                                 'extra_attributes' => array(
                                     'data-enable-time' => 'true',
                                     'data-time_24hr'   => 'true',
@@ -280,15 +280,15 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('For no start date, leave blank. If entered, the discount can only be used after or on this date.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_start', $discount ); ?>
+            <?php do_action('wpinv_discount_form_start', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_expiration', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_expiration', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_expiration" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Expiration Date', 'invoicing' ); ?>
+                    <?php esc_html_e('Expiration Date', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <?php
@@ -297,10 +297,10 @@ 
                                 'type'             => 'datepicker',
                                 'id'               => 'wpinv_discount_expiration',
                                 'name'             => 'wpinv_discount_expiration',
-                                'label'            => __( 'Expiration Date', 'invoicing' ),
+                                'label'            => __('Expiration Date', 'invoicing'),
                                 'placeholder'      => 'YYYY-MM-DD 00:00',
                                 'class'            => 'form-control-sm',
-                                'value'            => $discount->get_end_date( 'edit' ),
+                                'value'            => $discount->get_end_date('edit'),
                                 'extra_attributes' => array(
                                     'data-enable-time' => 'true',
                                     'data-time_24hr'   => 'true',
@@ -313,27 +313,27 @@ 
                     ?>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the date after which the discount will expire.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the date after which the discount will expire.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_expiration', $discount ); ?>
+            <?php do_action('wpinv_discount_form_expiration', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_min_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_min_total', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_min_total" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Minimum Amount', 'invoicing' ); ?>
+                    <?php esc_html_e('Minimum Amount', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="input-group input-group-sm">
-                        <?php if ( 'left' == $position ) : ?>
+                        <?php if ('left' == $position) : ?>
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><?php echo wpinv_currency_symbol(); ?></span>
                             </div>
                         <?php endif; ?>
 
-                        <input type="text" name="wpinv_discount_min_total" id="wpinv_discount_min_total" value="<?php echo esc_attr( $discount->get_minimum_total( 'edit' ) ); ?>" placeholder="<?php esc_attr_e( 'No minimum', 'invoicing' ); ?>" class="form-control">
+                        <input type="text" name="wpinv_discount_min_total" id="wpinv_discount_min_total" value="<?php echo esc_attr($discount->get_minimum_total('edit')); ?>" placeholder="<?php esc_attr_e('No minimum', 'invoicing'); ?>" class="form-control">
 
-                        <?php if ( 'left' != $position ) : ?>
+                        <?php if ('left' != $position) : ?>
                             <div class="input-group-append">
                                 <span class="input-group-text"><?php echo wpinv_currency_symbol(); ?></span>
                             </div>
@@ -341,27 +341,27 @@ 
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the minimum amount (including taxes) required to use this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the minimum amount (including taxes) required to use this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_min_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_min_total', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_max_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_max_total', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_max_total" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Maximum Amount', 'invoicing' ); ?>
+                    <?php esc_html_e('Maximum Amount', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
                     <div class="input-group input-group-sm">
-                        <?php if ( 'left' == $position ) : ?>
+                        <?php if ('left' == $position) : ?>
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><?php echo wpinv_currency_symbol(); ?></span>
                             </div>
                         <?php endif; ?>
 
-                        <input type="text" name="wpinv_discount_max_total" id="wpinv_discount_max_total" value="<?php echo esc_attr( $discount->get_maximum_total( 'edit' ) ); ?>" placeholder="<?php esc_attr_e( 'No maximum', 'invoicing' ); ?>" class="form-control">
+                        <input type="text" name="wpinv_discount_max_total" id="wpinv_discount_max_total" value="<?php echo esc_attr($discount->get_maximum_total('edit')); ?>" placeholder="<?php esc_attr_e('No maximum', 'invoicing'); ?>" class="form-control">
 
-                        <?php if ( 'left' != $position ) : ?>
+                        <?php if ('left' != $position) : ?>
                             <div class="input-group-append">
                                 <span class="input-group-text"><?php echo wpinv_currency_symbol(); ?></span>
                             </div>
@@ -369,30 +369,30 @@ 
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the maximum amount (including taxes) allowed when using this discount.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the maximum amount (including taxes) allowed when using this discount.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_before_max_total', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_max_total', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_before_max_uses', $discount ); ?>
+            <?php do_action('wpinv_discount_form_before_max_uses', $discount); ?>
             <div class="form-group row">
                 <label for="wpinv_discount_max_uses" class="col-sm-3 col-form-label">
-                    <?php esc_html_e( 'Maximum Uses', 'invoicing' ); ?>
+                    <?php esc_html_e('Maximum Uses', 'invoicing'); ?>
                 </label>
                 <div class="col-sm-8">
-                    <input type="text" value="<?php echo esc_attr( $discount->get_max_uses( 'edit' ) ); ?>" placeholder="<?php esc_attr_e( 'Unlimited', 'invoicing' ); ?>" name="wpinv_discount_max_uses" id="wpinv_discount_max_uses" style="width: 100%;" />
+                    <input type="text" value="<?php echo esc_attr($discount->get_max_uses('edit')); ?>" placeholder="<?php esc_attr_e('Unlimited', 'invoicing'); ?>" name="wpinv_discount_max_uses" id="wpinv_discount_max_uses" style="width: 100%;" />
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
-                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e( 'Optionally set the maximum number of times that this discount code can be used.', 'invoicing' ); ?>"></span>
+                    <span class="wpi-help-tip dashicons dashicons-editor-help" title="<?php esc_attr_e('Optionally set the maximum number of times that this discount code can be used.', 'invoicing'); ?>"></span>
                 </div>
             </div>
-            <?php do_action( 'wpinv_discount_form_max_uses', $discount ); ?>
+            <?php do_action('wpinv_discount_form_max_uses', $discount); ?>
 
-            <?php do_action( 'wpinv_discount_form_last', $discount ); ?>
+            <?php do_action('wpinv_discount_form_last', $discount); ?>
 
         </div>
         <?php
-        do_action( 'wpinv_discount_form_bottom', $post );
+        do_action('wpinv_discount_form_bottom', $post);
     }
 
     /**
@@ -400,31 +400,31 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the discount.
-        $discount = new WPInv_Discount( $post_id );
+        $discount = new WPInv_Discount($post_id);
 
         // Load new data.
         $discount->set_props(
 			array(
-				'code'           => isset( $_POST['wpinv_discount_code'] ) ? wpinv_clean( $_POST['wpinv_discount_code'] ) : null,
-				'amount'         => isset( $_POST['wpinv_discount_amount'] ) ? floatval( $_POST['wpinv_discount_amount'] ) : null,
-				'start'          => isset( $_POST['wpinv_discount_start'] ) ? wpinv_clean( $_POST['wpinv_discount_start'] ) : null,
-				'expiration'     => isset( $_POST['wpinv_discount_expiration'] ) ? wpinv_clean( $_POST['wpinv_discount_expiration'] ) : null,
-				'is_single_use'  => ! empty( $_POST['wpinv_discount_single_use'] ),
-                'type'           => isset( $_POST['wpinv_discount_type'] ) ? wpinv_clean( $_POST['wpinv_discount_type'] ) : null,
-				'is_recurring'   => ! empty( $_POST['wpinv_discount_recurring'] ),
-				'items'          => isset( $_POST['wpinv_discount_items'] ) ? wpinv_clean( $_POST['wpinv_discount_items'] ) : array(),
-				'excluded_items' => isset( $_POST['wpinv_discount_excluded_items'] ) ? wpinv_clean( $_POST['wpinv_discount_excluded_items'] ) : array(),
-                'required_items' => isset( $_POST['wpinv_discount_required_items'] ) ? wpinv_clean( $_POST['wpinv_discount_required_items'] ) : array(),
-				'max_uses'       => isset( $_POST['wpinv_discount_max_uses'] ) ? intval( $_POST['wpinv_discount_max_uses'] ) : null,
-				'min_total'      => isset( $_POST['wpinv_discount_min_total'] ) ? floatval( $_POST['wpinv_discount_min_total'] ) : null,
-				'max_total'      => isset( $_POST['wpinv_discount_max_total'] ) ? floatval( $_POST['wpinv_discount_max_total'] ) : null,
+				'code'           => isset($_POST['wpinv_discount_code']) ? wpinv_clean($_POST['wpinv_discount_code']) : null,
+				'amount'         => isset($_POST['wpinv_discount_amount']) ? floatval($_POST['wpinv_discount_amount']) : null,
+				'start'          => isset($_POST['wpinv_discount_start']) ? wpinv_clean($_POST['wpinv_discount_start']) : null,
+				'expiration'     => isset($_POST['wpinv_discount_expiration']) ? wpinv_clean($_POST['wpinv_discount_expiration']) : null,
+				'is_single_use'  => !empty($_POST['wpinv_discount_single_use']),
+                'type'           => isset($_POST['wpinv_discount_type']) ? wpinv_clean($_POST['wpinv_discount_type']) : null,
+				'is_recurring'   => !empty($_POST['wpinv_discount_recurring']),
+				'items'          => isset($_POST['wpinv_discount_items']) ? wpinv_clean($_POST['wpinv_discount_items']) : array(),
+				'excluded_items' => isset($_POST['wpinv_discount_excluded_items']) ? wpinv_clean($_POST['wpinv_discount_excluded_items']) : array(),
+                'required_items' => isset($_POST['wpinv_discount_required_items']) ? wpinv_clean($_POST['wpinv_discount_required_items']) : array(),
+				'max_uses'       => isset($_POST['wpinv_discount_max_uses']) ? intval($_POST['wpinv_discount_max_uses']) : null,
+				'min_total'      => isset($_POST['wpinv_discount_min_total']) ? floatval($_POST['wpinv_discount_min_total']) : null,
+				'max_total'      => isset($_POST['wpinv_discount_max_total']) ? floatval($_POST['wpinv_discount_max_total']) : null,
 			)
         );
 
 		$discount->save();
-		do_action( 'getpaid_discount_metabox_save', $post_id, $discount );
+		do_action('getpaid_discount_metabox_save', $post_id, $discount);
 	}
 }

includes/admin/class-wpinv-customers-table.php

Indentation +362 added lines, -362 removed lines

@@ -11,7 +11,7 @@ 
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,369 +23,369 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 10;
-
-	/**
-	 * @var int Number of items
-	 * @since 1.0.19
-	 */
-	public $total = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct(
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 10;
+
+    /**
+     * @var int Number of items
+     * @since 1.0.19
+     */
+    public $total = 0;
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct(
             array(
-				'singular' => 'id',
-				'plural'   => 'ids',
-				'ajax'     => false,
+                'singular' => 'id',
+                'plural'   => 'ids',
+                'ajax'     => false,
             )
         );
 
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'name';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $item
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $item, $column_name ) {
-		$value = esc_html( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
-	}
-
-	/**
-	 * Displays the country column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_country( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
-		}
-		return esc_html( $country );
-	}
-
-	/**
-	 * Displays the state column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_state( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		$state   = $user->_wpinv_state;
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
-		}
-
-		return esc_html( $state );
-	}
-
-	/**
-	 * Displays the signup column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_signup( $user ) {
-		return getpaid_format_date_value( $user->user_registered );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_total( $user ) {
-		return wpinv_price( $this->column_total_raw( $user ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return float
-	 */
-	public function column_total_raw( $user ) {
-
-		$args = array(
-			'data'           => array(
-
-				'total' => array(
-					'type'     => 'invoice_data',
-					'function' => 'SUM',
-					'name'     => 'total_sales',
-				),
-
-			),
-			'where'          => array(
-
-				'author' => array(
-					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
-					'key'      => 'posts.post_author',
-					'operator' => '=',
-				),
-
-			),
-			'query_type'     => 'get_var',
-			'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
-		);
-
-		return wpinv_round_amount( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
-
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param WP_User $user
-	 *
-	 * @return string Column Name
-	 */
-	public function column_invoices( $user ) {
-
-		$args = array(
-			'data'           => array(
-
-				'ID' => array(
-					'type'     => 'post_data',
-					'function' => 'COUNT',
-					'name'     => 'count',
-					'distinct' => true,
-				),
-
-			),
-			'where'          => array(
-
-				'author' => array(
-					'type'     => 'post_data',
-					'value'    => absint( $user->ID ),
-					'key'      => 'posts.post_author',
-					'operator' => '=',
-				),
-
-			),
-			'query_type'     => 'get_var',
-			'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
-		);
-
-		return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
-
-	}
-
-	/**
-	 * Generates content for a single row of the table
-	 * @since 1.0.19
-	 *
-	 * @param int $item The user id.
-	 */
-	public function single_row( $item ) {
-		$item = get_user_by( 'id', $item );
-
-		if ( empty( $item ) ) {
-			return;
-		}
-
-		echo '<tr>';
-		$this->single_row_columns( $item );
-		echo '</tr>';
-	}
-
-	/**
-	 * Displays the customers name
-	 *
-	 * @param  WP_User $customer customer.
-	 * @return string
-	 */
-	public function column_name( $customer ) {
-
-		// Customer view URL.
-		$view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
-		$row_actions = $this->row_actions(
-			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
-			)
-		);
-
-		// Get user's address.
-		$address = wpinv_get_user_address( $customer->ID );
-
-		// Customer email address.
-		$email       = sanitize_email( $customer->user_email );
-
-		// Customer's avatar.
-		$avatar = esc_url( get_avatar_url( $email ) );
-		$avatar = "<img src='$avatar' height='32' width='32'/>";
-
-		// Customer's name.
-		$name   = esc_html( "{$address['first_name']} {$address['last_name']}" );
-
-		if ( ! empty( $name ) ) {
-			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
-		}
-
-		$email = "<div class='row-title'><a href='$view_url'>$email</a></div>";
-
-		return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
-
-	}
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @since 1.0.19
-	 * @return array $columns Array of all the list table columns
-	 */
-	public function get_columns() {
-
-		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total'    => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', 'invoicing' ),
-		);
-		return apply_filters( 'wpinv_customers_table_columns', $columns );
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Returns bulk actions.
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-		global $wpdb;
-
-		$post_types = '';
-
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$post_types .= $wpdb->prepare( 'post_type=%s OR ', $post_type );
-		}
-
-		$post_types = rtrim( $post_types, ' OR' );
-
-		// Maybe search.
-		if ( ! empty( $_POST['s'] ) ) {
-			$users = get_users(
-				array(
-					'search'         => '*' . sanitize_text_field( urldecode( $_POST['s'] ) ) . '*',
-					'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
-					'fields'         => 'ID',
-				)
-			);
-
-			$users      = implode( ', ', $users );
-			$post_types = "($post_types) AND ( post_author IN ( $users ) )";
-		}
-
-		// Users with invoices.
-    	$customers = $wpdb->get_col(
-			$wpdb->prepare(
-				"SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types LIMIT %d,%d",
-				$this->get_paged() * 10 - 10,
-				$this->per_page
-			)
-		);
-
-		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function prepare_items() {
-		$columns               = $this->get_columns();
-		$hidden                = array(); // No hidden columns
-		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->prepare_query();
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $this->total,
-				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total / $this->per_page ),
-			)
-		);
-
-	}
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'name';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $item
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $item, $column_name ) {
+        $value = esc_html( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
+        return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
+    }
+
+    /**
+     * Displays the country column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_country( $user ) {
+        $country = wpinv_sanitize_country( $user->_wpinv_country );
+        if ( $country ) {
+            $country = wpinv_country_name( $country );
+        }
+        return esc_html( $country );
+    }
+
+    /**
+     * Displays the state column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_state( $user ) {
+        $country = wpinv_sanitize_country( $user->_wpinv_country );
+        $state   = $user->_wpinv_state;
+        if ( $state ) {
+            $state = wpinv_state_name( $state, $country );
+        }
+
+        return esc_html( $state );
+    }
+
+    /**
+     * Displays the signup column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_signup( $user ) {
+        return getpaid_format_date_value( $user->user_registered );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_total( $user ) {
+        return wpinv_price( $this->column_total_raw( $user ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return float
+     */
+    public function column_total_raw( $user ) {
+
+        $args = array(
+            'data'           => array(
+
+                'total' => array(
+                    'type'     => 'invoice_data',
+                    'function' => 'SUM',
+                    'name'     => 'total_sales',
+                ),
+
+            ),
+            'where'          => array(
+
+                'author' => array(
+                    'type'     => 'post_data',
+                    'value'    => absint( $user->ID ),
+                    'key'      => 'posts.post_author',
+                    'operator' => '=',
+                ),
+
+            ),
+            'query_type'     => 'get_var',
+            'invoice_status' => array( 'wpi-renewal', 'wpi-processing', 'publish' ),
+        );
+
+        return wpinv_round_amount( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param WP_User $user
+     *
+     * @return string Column Name
+     */
+    public function column_invoices( $user ) {
+
+        $args = array(
+            'data'           => array(
+
+                'ID' => array(
+                    'type'     => 'post_data',
+                    'function' => 'COUNT',
+                    'name'     => 'count',
+                    'distinct' => true,
+                ),
+
+            ),
+            'where'          => array(
+
+                'author' => array(
+                    'type'     => 'post_data',
+                    'value'    => absint( $user->ID ),
+                    'key'      => 'posts.post_author',
+                    'operator' => '=',
+                ),
+
+            ),
+            'query_type'     => 'get_var',
+            'invoice_status' => array_keys( wpinv_get_invoice_statuses() ),
+        );
+
+        return absint( GetPaid_Reports_Helper::get_invoice_report_data( $args ) );
+
+    }
+
+    /**
+     * Generates content for a single row of the table
+     * @since 1.0.19
+     *
+     * @param int $item The user id.
+     */
+    public function single_row( $item ) {
+        $item = get_user_by( 'id', $item );
+
+        if ( empty( $item ) ) {
+            return;
+        }
+
+        echo '<tr>';
+        $this->single_row_columns( $item );
+        echo '</tr>';
+    }
+
+    /**
+     * Displays the customers name
+     *
+     * @param  WP_User $customer customer.
+     * @return string
+     */
+    public function column_name( $customer ) {
+
+        // Customer view URL.
+        $view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
+        $row_actions = $this->row_actions(
+            array(
+                'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+            )
+        );
+
+        // Get user's address.
+        $address = wpinv_get_user_address( $customer->ID );
+
+        // Customer email address.
+        $email       = sanitize_email( $customer->user_email );
+
+        // Customer's avatar.
+        $avatar = esc_url( get_avatar_url( $email ) );
+        $avatar = "<img src='$avatar' height='32' width='32'/>";
+
+        // Customer's name.
+        $name   = esc_html( "{$address['first_name']} {$address['last_name']}" );
+
+        if ( ! empty( $name ) ) {
+            $name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
+        }
+
+        $email = "<div class='row-title'><a href='$view_url'>$email</a></div>";
+
+        return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
+
+    }
+
+    /**
+     * Retrieve the table columns
+     *
+     * @since 1.0.19
+     * @return array $columns Array of all the list table columns
+     */
+    public function get_columns() {
+
+        $columns = array(
+            'name'     => __( 'Name', 'invoicing' ),
+            'country'  => __( 'Country', 'invoicing' ),
+            'state'    => __( 'State', 'invoicing' ),
+            'city'     => __( 'City', 'invoicing' ),
+            'zip'      => __( 'ZIP', 'invoicing' ),
+            'address'  => __( 'Address', 'invoicing' ),
+            'phone'    => __( 'Phone', 'invoicing' ),
+            'company'  => __( 'Company', 'invoicing' ),
+            'invoices' => __( 'Invoices', 'invoicing' ),
+            'total'    => __( 'Total Spend', 'invoicing' ),
+            'signup'   => __( 'Date created', 'invoicing' ),
+        );
+        return apply_filters( 'wpinv_customers_table_columns', $columns );
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Returns bulk actions.
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+        global $wpdb;
+
+        $post_types = '';
+
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $post_types .= $wpdb->prepare( 'post_type=%s OR ', $post_type );
+        }
+
+        $post_types = rtrim( $post_types, ' OR' );
+
+        // Maybe search.
+        if ( ! empty( $_POST['s'] ) ) {
+            $users = get_users(
+                array(
+                    'search'         => '*' . sanitize_text_field( urldecode( $_POST['s'] ) ) . '*',
+                    'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+                    'fields'         => 'ID',
+                )
+            );
+
+            $users      = implode( ', ', $users );
+            $post_types = "($post_types) AND ( post_author IN ( $users ) )";
+        }
+
+        // Users with invoices.
+        $customers = $wpdb->get_col(
+            $wpdb->prepare(
+                "SELECT DISTINCT( post_author ) FROM $wpdb->posts WHERE $post_types LIMIT %d,%d",
+                $this->get_paged() * 10 - 10,
+                $this->per_page
+            )
+        );
+
+        $this->items = $customers;
+        $this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function prepare_items() {
+        $columns               = $this->get_columns();
+        $hidden                = array(); // No hidden columns
+        $sortable              = $this->get_sortable_columns();
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+        $this->prepare_query();
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $this->total,
+                'per_page'    => $this->per_page,
+                'total_pages' => ceil( $this->total / $this->per_page ),
+            )
+        );
+
+    }
 }

Spacing +63 added lines, -63 removed lines

@@ -5,12 +5,12 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -76,9 +76,9 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		$value = esc_html( get_user_meta( $item->ID, '_wpinv_' . $column_name, true ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $item );
+	public function column_default($item, $column_name) {
+		$value = esc_html(get_user_meta($item->ID, '_wpinv_' . $column_name, true));
+		return apply_filters('wpinv_customers_table_column' . $column_name, $value, $item);
 	}
 
 	/**
@@ -90,12 +90,12 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_country( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
+	public function column_country($user) {
+		$country = wpinv_sanitize_country($user->_wpinv_country);
+		if ($country) {
+			$country = wpinv_country_name($country);
 		}
-		return esc_html( $country );
+		return esc_html($country);
 	}
 
 	/**
@@ -107,14 +107,14 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_state( $user ) {
-		$country = wpinv_sanitize_country( $user->_wpinv_country );
+	public function column_state($user) {
+		$country = wpinv_sanitize_country($user->_wpinv_country);
 		$state   = $user->_wpinv_state;
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
+		if ($state) {
+			$state = wpinv_state_name($state, $country);
 		}
 
-		return esc_html( $state );
+		return esc_html($state);
 	}
 
 	/**
@@ -126,8 +126,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_signup( $user ) {
-		return getpaid_format_date_value( $user->user_registered );
+	public function column_signup($user) {
+		return getpaid_format_date_value($user->user_registered);
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_total( $user ) {
-		return wpinv_price( $this->column_total_raw( $user ) );
+	public function column_total($user) {
+		return wpinv_price($this->column_total_raw($user));
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 *
 	 * @return float
 	 */
-	public function column_total_raw( $user ) {
+	public function column_total_raw($user) {
 
 		$args = array(
 			'data'           => array(
@@ -168,17 +168,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));
 
 	}
 
@@ -191,7 +191,7 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_invoices( $user ) {
+	public function column_invoices($user) {
 
 		$args = array(
 			'data'           => array(
@@ -208,17 +208,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));
 
 	}
 
@@ -228,15 +228,15 @@ 
 	 *
 	 * @param int $item The user id.
 	 */
-	public function single_row( $item ) {
-		$item = get_user_by( 'id', $item );
+	public function single_row($item) {
+		$item = get_user_by('id', $item);
 
-		if ( empty( $item ) ) {
+		if (empty($item)) {
 			return;
 		}
 
 		echo '<tr>';
-		$this->single_row_columns( $item );
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -246,30 +246,30 @@ 
 	 * @param  WP_User $customer customer.
 	 * @return string
 	 */
-	public function column_name( $customer ) {
+	public function column_name($customer) {
 
 		// Customer view URL.
-		$view_url    = esc_url( add_query_arg( 'user_id', $customer->ID, admin_url( 'user-edit.php' ) ) );
+		$view_url    = esc_url(add_query_arg('user_id', $customer->ID, admin_url('user-edit.php')));
 		$row_actions = $this->row_actions(
 			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __('Edit Details', 'invoicing') . '</a>',
 			)
 		);
 
 		// Get user's address.
-		$address = wpinv_get_user_address( $customer->ID );
+		$address = wpinv_get_user_address($customer->ID);
 
 		// Customer email address.
-		$email       = sanitize_email( $customer->user_email );
+		$email = sanitize_email($customer->user_email);
 
 		// Customer's avatar.
-		$avatar = esc_url( get_avatar_url( $email ) );
+		$avatar = esc_url(get_avatar_url($email));
 		$avatar = "<img src='$avatar' height='32' width='32'/>";
 
 		// Customer's name.
-		$name   = esc_html( "{$address['first_name']} {$address['last_name']}" );
+		$name   = esc_html("{$address['first_name']} {$address['last_name']}");
 
-		if ( ! empty( $name ) ) {
+		if (!empty($name)) {
 			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
 		}
 
@@ -288,19 +288,19 @@ 
 	public function get_columns() {
 
 		$columns = array(
-			'name'     => __( 'Name', 'invoicing' ),
-			'country'  => __( 'Country', 'invoicing' ),
-			'state'    => __( 'State', 'invoicing' ),
-			'city'     => __( 'City', 'invoicing' ),
-			'zip'      => __( 'ZIP', 'invoicing' ),
-			'address'  => __( 'Address', 'invoicing' ),
-			'phone'    => __( 'Phone', 'invoicing' ),
-			'company'  => __( 'Company', 'invoicing' ),
-			'invoices' => __( 'Invoices', 'invoicing' ),
-			'total'    => __( 'Total Spend', 'invoicing' ),
-			'signup'   => __( 'Date created', 'invoicing' ),
+			'name'     => __('Name', 'invoicing'),
+			'country'  => __('Country', 'invoicing'),
+			'state'    => __('State', 'invoicing'),
+			'city'     => __('City', 'invoicing'),
+			'zip'      => __('ZIP', 'invoicing'),
+			'address'  => __('Address', 'invoicing'),
+			'phone'    => __('Phone', 'invoicing'),
+			'company'  => __('Company', 'invoicing'),
+			'invoices' => __('Invoices', 'invoicing'),
+			'total'    => __('Total Spend', 'invoicing'),
+			'signup'   => __('Date created', 'invoicing'),
 		);
-		return apply_filters( 'wpinv_customers_table_columns', $columns );
+		return apply_filters('wpinv_customers_table_columns', $columns);
 
 	}
 
@@ -311,7 +311,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -332,23 +332,23 @@ 
 
 		$post_types = '';
 
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$post_types .= $wpdb->prepare( 'post_type=%s OR ', $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$post_types .= $wpdb->prepare('post_type=%s OR ', $post_type);
 		}
 
-		$post_types = rtrim( $post_types, ' OR' );
+		$post_types = rtrim($post_types, ' OR');
 
 		// Maybe search.
-		if ( ! empty( $_POST['s'] ) ) {
+		if (!empty($_POST['s'])) {
 			$users = get_users(
 				array(
-					'search'         => '*' . sanitize_text_field( urldecode( $_POST['s'] ) ) . '*',
-					'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+					'search'         => '*' . sanitize_text_field(urldecode($_POST['s'])) . '*',
+					'search_columns' => array('user_login', 'user_email', 'display_name'),
 					'fields'         => 'ID',
 				)
 			);
 
-			$users      = implode( ', ', $users );
+			$users      = implode(', ', $users);
 			$post_types = "($post_types) AND ( post_author IN ( $users ) )";
 		}
 
@@ -362,7 +362,7 @@ 
 		);
 
 		$this->items = $customers;
-		$this->total = (int) $wpdb->get_var( "SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types" );
+		$this->total = (int) $wpdb->get_var("SELECT COUNT( DISTINCT( post_author ) ) FROM $wpdb->posts WHERE $post_types");
 
 	}
 
@@ -376,14 +376,14 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->prepare_query();
 
 		$this->set_pagination_args(
 			array(
 				'total_items' => $this->total,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total / $this->per_page ),
+				'total_pages' => ceil($this->total / $this->per_page),
 			)
 		);
 

includes/admin/admin-pages.php

Indentation +16 added lines, -16 removed lines

@@ -57,8 +57,8 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+        $anchor = __( 'Deactivate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     } elseif ( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) ) {
@@ -73,8 +73,8 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+        $anchor = __( 'Activate', 'invoicing' );
+        $title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
@@ -91,8 +91,8 @@ 
             'getpaid-nonce'
         )
     );
-	$anchor = __( 'Delete', 'invoicing' );
-	$title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
+    $anchor = __( 'Delete', 'invoicing' );
+    $title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
     $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
@@ -118,13 +118,13 @@ 
             $types = wpinv_get_discount_types();
 
             foreach ( $types as $name => $type ) {
-			echo '<option value="' . esc_attr( $name ) . '"';
+            echo '<option value="' . esc_attr( $name ) . '"';
 
-			if ( isset( $_GET['discount_type'] ) ) {
-				selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
+            if ( isset( $_GET['discount_type'] ) ) {
+                selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
                 }
 
-			echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+            echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
             }
         ?>
     </select>
@@ -151,15 +151,15 @@ 
         // Filter vat rule type
         if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
             $meta_query[] = array(
-				'key'     => '_wpi_discount_type',
-				'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
-				'compare' => '=',
-			);
-			}
+                'key'     => '_wpi_discount_type',
+                'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
+                'compare' => '=',
+            );
+            }
 
         if ( ! empty( $meta_query ) ) {
             $vars['meta_query'] = $meta_query;
-			}
+            }
     }
 
     return $vars;

Spacing +78 added lines, -78 removed lines

@@ -1,51 +1,51 @@ 
 <?php
 // MUST have WordPress.
-if ( ! defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
-add_action( 'manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column' );
-function wpinv_discount_custom_column( $column ) {
+add_action('manage_wpi_discount_posts_custom_column', 'wpinv_discount_custom_column');
+function wpinv_discount_custom_column($column) {
     global $post;
 
-    $discount = new WPInv_Discount( $post );
+    $discount = new WPInv_Discount($post);
 
-    switch ( $column ) {
+    switch ($column) {
         case 'code':
-            echo esc_html( $discount->get_code() );
+            echo esc_html($discount->get_code());
             break;
         case 'amount':
-            echo wp_kses_post( $discount->get_formatted_amount() );
+            echo wp_kses_post($discount->get_formatted_amount());
             break;
         case 'usage':
-            echo wp_kses_post( $discount->get_usage() );
+            echo wp_kses_post($discount->get_usage());
             break;
         case 'start_date':
-            echo wp_kses_post( getpaid_format_date_value( $discount->get_start_date() ) );
+            echo wp_kses_post(getpaid_format_date_value($discount->get_start_date()));
             break;
         case 'expiry_date':
-            echo wp_kses_post( getpaid_format_date_value( $discount->get_expiration_date(), __( 'Never', 'invoicing' ) ) );
+            echo wp_kses_post(getpaid_format_date_value($discount->get_expiration_date(), __('Never', 'invoicing')));
             break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 90, 2 );
-function wpinv_post_row_actions( $actions, $post ) {
-    $post_type = ! empty( $post->post_type ) ? $post->post_type : '';
+add_filter('post_row_actions', 'wpinv_post_row_actions', 90, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
 
-    if ( $post_type == 'wpi_discount' ) {
-        $actions = wpinv_discount_row_actions( $post, $actions );
+    if ($post_type == 'wpi_discount') {
+        $actions = wpinv_discount_row_actions($post, $actions);
     }
 
     return $actions;
 }
 
-function wpinv_discount_row_actions( $discount, $row_actions ) {
-    $row_actions  = array();
-    $edit_link = get_edit_post_link( $discount->ID );
-    $row_actions['edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit', 'invoicing' ) . '</a>';
+function wpinv_discount_row_actions($discount, $row_actions) {
+    $row_actions = array();
+    $edit_link = get_edit_post_link($discount->ID);
+    $row_actions['edit'] = '<a href="' . esc_url($edit_link) . '">' . __('Edit', 'invoicing') . '</a>';
 
-    if ( in_array( strtolower( $discount->post_status ), array( 'publish' ) ) ) {
+    if (in_array(strtolower($discount->post_status), array('publish'))) {
 
         $url = wp_nonce_url(
             add_query_arg(
@@ -57,13 +57,13 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Deactivate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to deactivate this discount?', 'invoicing' );
+		$anchor = __('Deactivate', 'invoicing');
+		$title  = esc_attr__('Are you sure you want to deactivate this discount?', 'invoicing');
         $row_actions['deactivate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
-    } elseif ( in_array( strtolower( $discount->post_status ), array( 'pending', 'draft' ) ) ) {
+    } elseif (in_array(strtolower($discount->post_status), array('pending', 'draft'))) {
 
-        $url    = wp_nonce_url(
+        $url = wp_nonce_url(
             add_query_arg(
                 array(
                     'getpaid-admin-action' => 'activate_discount',
@@ -73,13 +73,13 @@ 
             'getpaid-nonce',
             'getpaid-nonce'
         );
-		$anchor = __( 'Activate', 'invoicing' );
-		$title  = esc_attr__( 'Are you sure you want to activate this discount?', 'invoicing' );
+		$anchor = __('Activate', 'invoicing');
+		$title  = esc_attr__('Are you sure you want to activate this discount?', 'invoicing');
         $row_actions['activate'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
     }
 
-    $url    = esc_url(
+    $url = esc_url(
         wp_nonce_url(
             add_query_arg(
                 array(
@@ -91,11 +91,11 @@ 
             'getpaid-nonce'
         )
     );
-	$anchor = __( 'Delete', 'invoicing' );
-	$title  = esc_attr__( 'Are you sure you want to delete this discount?', 'invoicing' );
+	$anchor = __('Delete', 'invoicing');
+	$title  = esc_attr__('Are you sure you want to delete this discount?', 'invoicing');
     $row_actions['delete'] = "<a href='$url' onclick='return confirm(\"$title\")'>$anchor</a>";
 
-    $row_actions = apply_filters( 'wpinv_discount_row_actions', $row_actions, $discount );
+    $row_actions = apply_filters('wpinv_discount_row_actions', $row_actions, $discount);
 
     return $row_actions;
 }
@@ -103,68 +103,68 @@ 
 function wpinv_restrict_manage_posts() {
     global $typenow;
 
-    if ( 'wpi_discount' == $typenow ) {
+    if ('wpi_discount' == $typenow) {
         wpinv_discount_filters();
     }
 }
-add_action( 'restrict_manage_posts', 'wpinv_restrict_manage_posts', 10 );
+add_action('restrict_manage_posts', 'wpinv_restrict_manage_posts', 10);
 
 function wpinv_discount_filters() {
 
     ?>
     <select name="discount_type" id="dropdown_wpinv_discount_type">
-        <option value=""><?php esc_html_e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php esc_html_e('Show all types', 'invoicing'); ?></option>
         <?php
             $types = wpinv_get_discount_types();
 
-            foreach ( $types as $name => $type ) {
-			echo '<option value="' . esc_attr( $name ) . '"';
+            foreach ($types as $name => $type) {
+			echo '<option value="' . esc_attr($name) . '"';
 
-			if ( isset( $_GET['discount_type'] ) ) {
-				selected( $name, sanitize_text_field( $_GET['discount_type'] ) );
+			if (isset($_GET['discount_type'])) {
+				selected($name, sanitize_text_field($_GET['discount_type']));
                 }
 
-			echo '>' . esc_html__( $type, 'invoicing' ) . '</option>';
+			echo '>' . esc_html__($type, 'invoicing') . '</option>';
             }
         ?>
     </select>
     <?php
 }
 
-function wpinv_request( $vars ) {
+function wpinv_request($vars) {
     global $typenow, $wp_post_statuses;
 
-    if ( getpaid_is_invoice_post_type( $typenow ) ) {
-        if ( ! isset( $vars['post_status'] ) ) {
-            $post_statuses = wpinv_get_invoice_statuses( false, false, $typenow );
+    if (getpaid_is_invoice_post_type($typenow)) {
+        if (!isset($vars['post_status'])) {
+            $post_statuses = wpinv_get_invoice_statuses(false, false, $typenow);
 
-            foreach ( $post_statuses as $status => $value ) {
-                if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
-                    unset( $post_statuses[ $status ] );
+            foreach ($post_statuses as $status => $value) {
+                if (isset($wp_post_statuses[$status]) && false === $wp_post_statuses[$status]->show_in_admin_all_list) {
+                    unset($post_statuses[$status]);
                 }
             }
 
-            $vars['post_status'] = array_keys( $post_statuses );
+            $vars['post_status'] = array_keys($post_statuses);
         }
-} elseif ( 'wpi_discount' == $typenow ) {
-        $meta_query = ! empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+} elseif ('wpi_discount' == $typenow) {
+        $meta_query = !empty($vars['meta_query']) ? $vars['meta_query'] : array();
         // Filter vat rule type
-        if ( isset( $_GET['discount_type'] ) && $_GET['discount_type'] !== '' ) {
+        if (isset($_GET['discount_type']) && $_GET['discount_type'] !== '') {
             $meta_query[] = array(
 				'key'     => '_wpi_discount_type',
-				'value'   => sanitize_key( urldecode( $_GET['discount_type'] ) ),
+				'value'   => sanitize_key(urldecode($_GET['discount_type'])),
 				'compare' => '=',
 			);
 			}
 
-        if ( ! empty( $meta_query ) ) {
+        if (!empty($meta_query)) {
             $vars['meta_query'] = $meta_query;
 			}
     }
 
     return $vars;
 }
-add_filter( 'request', 'wpinv_request' );
+add_filter('request', 'wpinv_request');
 
 /**
  * Create a page and store the ID in an option.
@@ -176,61 +176,61 @@ 
  * @param int $post_parent (default: 0) Parent for the new page
  * @return int page ID
  */
-function wpinv_create_page( $slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0 ) {
+function wpinv_create_page($slug, $option = '', $page_title = '', $page_content = '', $post_parent = 0) {
     global $wpdb;
 
-    $option_value = wpinv_get_option( $option );
+    $option_value = wpinv_get_option($option);
 
-    if ( ! empty( $option_value ) && ( $page_object = get_post( $option_value ) ) ) {
-        if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
+    if (!empty($option_value) && ($page_object = get_post($option_value))) {
+        if ('page' === $page_object->post_type && !in_array($page_object->post_status, array('pending', 'trash', 'future', 'auto-draft'))) {
             // Valid page is already in place
             return $page_object->ID;
         }
     }
 
-    if ( ! empty( $post_parent ) ) {
-        $page = get_page_by_path( $post_parent );
-        if ( $page ) {
+    if (!empty($post_parent)) {
+        $page = get_page_by_path($post_parent);
+        if ($page) {
             $post_parent = $page->ID;
         } else {
             $post_parent = '';
         }
     }
 
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug ) );
+        $valid_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' )  AND post_name = %s LIMIT 1;", $slug));
     }
 
-    $valid_page_found = apply_filters( 'wpinv_create_page_id', $valid_page_found, $slug, $page_content );
+    $valid_page_found = apply_filters('wpinv_create_page_id', $valid_page_found, $slug, $page_content);
 
-    if ( $valid_page_found ) {
-        if ( $option ) {
-            wpinv_update_option( $option, $valid_page_found );
+    if ($valid_page_found) {
+        if ($option) {
+            wpinv_update_option($option, $valid_page_found);
         }
         return $valid_page_found;
     }
 
     // Search for a matching valid trashed page
-    if ( strlen( $page_content ) > 0 ) {
+    if (strlen($page_content) > 0) {
         // Search for an existing page with the specified page content (typically a shortcode)
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%" ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_content LIKE %s LIMIT 1;", "%{$page_content}%"));
     } else {
         // Search for an existing page with the specified page slug
-        $trashed_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug ) );
+        $trashed_page_found = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = 'trash' AND post_name = %s LIMIT 1;", $slug));
     }
 
-    if ( $trashed_page_found ) {
+    if ($trashed_page_found) {
         $page_id   = $trashed_page_found;
         $page_data = array(
             'ID'          => $page_id,
             'post_status' => 'publish',
             'post_parent' => $post_parent,
         );
-        wp_update_post( $page_data );
+        wp_update_post($page_data);
     } else {
         $page_data = array(
             'post_status'    => 'publish',
@@ -242,11 +242,11 @@ 
             'post_parent'    => $post_parent,
             'comment_status' => 'closed',
         );
-        $page_id = wp_insert_post( $page_data );
+        $page_id = wp_insert_post($page_data);
     }
 
-    if ( $option ) {
-        wpinv_update_option( $option, (int) $page_id );
+    if ($option) {
+        wpinv_update_option($option, (int) $page_id);
     }
 
     return $page_id;
@@ -259,11 +259,11 @@ 
  *
  * @return array
  */
-function wpinv_add_aui_screens( $screen_ids ) {
+function wpinv_add_aui_screens($screen_ids) {
 
     // load on these pages if set
-    $screen_ids = array_merge( $screen_ids, wpinv_get_screen_ids() );
+    $screen_ids = array_merge($screen_ids, wpinv_get_screen_ids());
 
     return $screen_ids;
 }
-add_filter( 'aui_screen_ids', 'wpinv_add_aui_screens' );
+add_filter('aui_screen_ids', 'wpinv_add_aui_screens');

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

Indentation +11 added lines, -11 removed lines

@@ -24,14 +24,14 @@ 
     }
 
     /**
-	 * Highlights sub menus.
-	 */
-	public function set_admin_menu_class() {
-		global $current_screen, $parent_file, $submenu_file;
+     * Highlights sub menus.
+     */
+    public function set_admin_menu_class() {
+        global $current_screen, $parent_file, $submenu_file;
 
         if ( ! empty( $current_screen->id ) && in_array( $current_screen->id, array( 'wpi_discount', 'wpi_payment_form', 'wpi_invoice' ) ) ) {
-			$parent_file = 'wpinv';
-			$submenu_file = 'edit.php?post_type=' . $current_screen->id;
+            $parent_file = 'wpinv';
+            $submenu_file = 'edit.php?post_type=' . $current_screen->id;
         }
 
     }
@@ -165,8 +165,8 @@ 
                 foreach ( wpinv_get_settings_tabs() as $tab_id => $tab_name ) {
                     $tab_url = add_query_arg(
                         array(
-							'settings-updated' => false,
-							'tab'              => $tab_id,
+                            'settings-updated' => false,
+                            'tab'              => $tab_id,
                         ),
                         'admin.php?page=wpinv-settings'
                     );
@@ -193,9 +193,9 @@ 
                     $number++;
                     $tab_url = add_query_arg(
                         array(
-							'settings-updated' => false,
-							'tab'              => $active_tab,
-							'section'          => $section_id,
+                            'settings-updated' => false,
+                            'tab'              => $active_tab,
+                            'section'          => $section_id,
                         ),
                         admin_url( 'admin.php?page=wpinv-settings' )
                     );

Spacing +77 added lines, -77 removed lines

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

includes/class-wpinv-addons.php

Indentation +210 added lines, -210 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -15,92 +15,92 @@ 
 class WPInv_Admin_Addons extends Ayecode_Addons {
 
 
-	/**
-	 * Get the extensions page tabs.
-	 *
-	 * @return array of tabs.
-	 */
-	public function get_tabs() {
-		$tabs = array(
-			'addons'              => __( 'Addons', 'invoicing' ),
+    /**
+     * Get the extensions page tabs.
+     *
+     * @return array of tabs.
+     */
+    public function get_tabs() {
+        $tabs = array(
+            'addons'              => __( 'Addons', 'invoicing' ),
             'gateways'            => __( 'Payment Gateways', 'invoicing' ),
             'recommended_plugins' => __( 'Recommended plugins', 'invoicing' ),
             'membership'          => __( 'Membership', 'invoicing' ),
-		);
-
-		return $tabs;
-	}
-
-	/**
-	 * Get section content for the addons screen.
-	 *
-	 * @param  string $section_id
-	 *
-	 * @return array
-	 */
-	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' ) {
-			$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
-			//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 );
-
-				$raw_section = wp_safe_remote_get(
+        );
+
+        return $tabs;
+    }
+
+    /**
+     * Get section content for the addons screen.
+     *
+     * @param  string $section_id
+     *
+     * @return array
+     */
+    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' ) {
+            $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
+            //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 );
+
+                $raw_section = wp_safe_remote_get(
                     esc_url_raw( add_query_arg( $query_args, $api_url ) ),
                     array(
-						'user-agent' => 'Invoicing Addons Page',
-						'timeout'    => 15,
+                        '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 ) {
-
-			$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->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 );
-	}
-
-	/**
-	 * Outputs a button.
-	 *ccc
-	 * @param string $url
-	 * @param string $text
-	 * @param string $theme
-	 * @param string $plugin
-	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+        $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->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 );
+    }
+
+    /**
+     * Outputs a button.
+     *ccc
+     * @param string $url
+     * @param string $text
+     * @param string $theme
+     * @param string $plugin
+     */
+    public function output_button( $addon ) {
+        $current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -112,128 +112,128 @@ 
 //		$install_status = 'get';
 //		$onclick = '';
 
-		$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
-			'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 : '',
-			'onclick'        => '',
-			'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 ) ) {
-			include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
-			$status = install_plugin_install_status(
+        $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
+            '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 : '',
+            'onclick'        => '',
+            '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 ) ) {
+            include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
+            $status = install_plugin_install_status(
                 array(
-					'slug'    => $button_args['slug'],
-					'version' => '',
+                    'slug'    => $button_args['slug'],
+                    '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 ) {
-			include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
-			if ( ! empty( $addon->licensing->edd_slug ) ) {
+            $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'] ) ) {
+            $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['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 ) ) {
-				$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 ) ) {
-				$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'] );
-		}
-
-		// set if installed
-		if ( in_array( $button_args['install_status'], array( 'installed', 'latest_installed', 'update_available', 'newer_installed' ) ) ) {
-			$button_args['installed'] = true;
-		}
+            $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 ) ) {
+                $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'] );
+        }
+
+        // set if 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'] );
-			} else {
-				$button_args['active'] = self::is_theme_active( $addon );
-			}
-		}
-
-		// set button text and class
-		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' );
-
-			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 );
-				} else {
-					$button_args['url'] = '#';
-				}
-			}
+        // 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'] );
+            } else {
+                $button_args['active'] = self::is_theme_active( $addon );
+            }
+        }
+
+        // set button text and class
+        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' );
+
+            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 );
+                } else {
+                    $button_args['url'] = '#';
+                }
+            }
 } else {
-			if ( $button_args['type'] == 'recommended_plugins' ) {
-				$button_args['button_text'] = __( 'Install', 'invoicing' );
-					} else {
-				$button_args['button_text'] = __( 'Get it', 'invoicing' );
+            if ( $button_args['type'] == 'recommended_plugins' ) {
+                $button_args['button_text'] = __( 'Install', 'invoicing' );
+                    } else {
+                $button_args['button_text'] = __( 'Get it', 'invoicing' );
 
-				/*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
+                /*if($button_args['type'] == 'themes' && in_array($button_args['slug'],$wp_org_themes) ){
 			$button_args['button_text'] = __('Install','invoicing');
 			$button_args['url'] = self::get_theme_install_url($button_args['slug']);
 			$button_args['onclick'] = 'gd_set_button_installing(this);';
 				}*/
 
-					}
-		}
+                    }
+        }
 
-		// filter the button arguments
-		$button_args = apply_filters( 'edd_api_button_args', $button_args );
+        // filter the button arguments
+        $button_args = apply_filters( 'edd_api_button_args', $button_args );
 //		print_r($button_args);
-		// set price text
-		if ( isset( $button_args['price_text'] ) ) {
-			?>
+        // set price text
+        if ( isset( $button_args['price_text'] ) ) {
+            ?>
 			<a
 				target="_blank"
 				class="addons-price-text"
@@ -241,9 +241,9 @@ 
 				<?php echo esc_html( $button_args['price_text'] ); ?>
 			</a>
 			<?php
-		}
+        }
 
-		?>
+        ?>
 		<a
 			data-licence="<?php echo esc_attr( $button_args['license'] ); ?>"
 			data-licensing="<?php echo $button_args['licensing'] ? 1 : 0; ?>"
@@ -267,33 +267,33 @@ 
 		</a>
 		<?php
 
-	}
-
-
-	/**
-	 * Handles output of the addons page in admin.
-	 */
-	public function output() {
-		$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'] );
-		include_once WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php';
-	}
-
-	/**
-	 * A list of recommended wp.org plugins.
-	 * @return array
-	 */
-	public function get_recommend_wp_plugins() {
-		$plugins = array(
+    }
+
+
+    /**
+     * Handles output of the addons page in admin.
+     */
+    public function output() {
+        $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'] );
+        include_once WPINV_PLUGIN_DIR . '/includes/admin/html-admin-page-addons.php';
+    }
+
+    /**
+     * A list of recommended wp.org plugins.
+     * @return array
+     */
+    public function get_recommend_wp_plugins() {
+        $plugins = array(
             'invoicing-quotes' => array(
                 'url'       => 'https://wordpress.org/plugins/invoicing-quotes/',
                 'slug'      => 'invoicing-quotes',
-				'name'      => 'Quotes',
-				'thumbnail' => 'https://ps.w.org/invoicing-quotes/assets/banner-772x250.png',
+                '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' ),
             ),
             'geodirectory'     => array(
@@ -308,8 +308,8 @@ 
                 'name' => 'UsersWP',
                 'desc' => __( 'Allow frontend user login and registration as well as have slick profile pages.', 'invoicing' ),
             ),
-		);
+        );
 
-		return $plugins;
-	}
+        return $plugins;
+    }
 }

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,8 +99,8 @@ 
 	 * @param string $theme
 	 * @param string $plugin
 	 */
-	public function output_button( $addon ) {
-		$current_tab     = empty( $_GET['tab'] ) ? 'addons' : sanitize_title( $_GET['tab'] );
+	public function output_button($addon) {
+		$current_tab = empty($_GET['tab']) ? 'addons' : sanitize_title($_GET['tab']);
 //		$button_text = __('Free','invoicing');
 //		$licensing = false;
 //		$installed = false;
@@ -112,30 +112,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(
@@ -143,81 +143,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');
@@ -229,41 +229,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
 
@@ -277,9 +277,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';
 	}
 
@@ -294,19 +294,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'),
             ),
 		);