AyeCode / invoicing

includes/admin/wpinv-admin-functions.php

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 }
 
 function wpinv_admin_messages() {
-	settings_errors( 'wpinv-notices' );
+    settings_errors( 'wpinv-notices' );
 }
 add_action( 'admin_notices', 'wpinv_admin_messages' );
 

Spacing +43 added lines, -43 removed lines

@@ -7,65 +7,65 @@ 
  */
  
 // 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__));
 }
 
-function wpinv_bulk_actions( $actions ) {
-    if ( isset( $actions['edit'] ) ) {
-        unset( $actions['edit'] );
+function wpinv_bulk_actions($actions) {
+    if (isset($actions['edit'])) {
+        unset($actions['edit']);
     }
 
     return $actions;
 }
-add_filter( 'bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions' );
-add_filter( 'bulk_actions-edit-wpi_item', 'wpinv_bulk_actions' );
+add_filter('bulk_actions-edit-wpi_invoice', 'wpinv_bulk_actions');
+add_filter('bulk_actions-edit-wpi_item', 'wpinv_bulk_actions');
 
-function wpinv_admin_post_id( $id = 0 ) {
+function wpinv_admin_post_id($id = 0) {
     global $post;
 
-    if ( isset( $id ) && ! empty( $id ) ) {
-        return (int)$id;
-    } else if ( get_the_ID() ) {
+    if (isset($id) && !empty($id)) {
+        return (int) $id;
+    } else if (get_the_ID()) {
         return (int) get_the_ID();
-    } else if ( isset( $post->ID ) && !empty( $post->ID ) ) {
+    } else if (isset($post->ID) && !empty($post->ID)) {
         return (int) $post->ID;
-    } else if ( isset( $_GET['post'] ) && !empty( $_GET['post'] ) ) {
+    } else if (isset($_GET['post']) && !empty($_GET['post'])) {
         return (int) $_GET['post'];
-    } else if ( isset( $_GET['id'] ) && !empty( $_GET['id'] ) ) {
+    } else if (isset($_GET['id']) && !empty($_GET['id'])) {
         return (int) $_GET['id'];
-    } else if ( isset( $_POST['id'] ) && !empty( $_POST['id'] ) ) {
+    } else if (isset($_POST['id']) && !empty($_POST['id'])) {
         return (int) $_POST['id'];
     } 
 
     return null;
 }
     
-function wpinv_admin_post_type( $id = 0 ) {
-    if ( !$id ) {
+function wpinv_admin_post_type($id = 0) {
+    if (!$id) {
         $id = wpinv_admin_post_id();
     }
     
-    $type = get_post_type( $id );
+    $type = get_post_type($id);
     
-    if ( !$type ) {
-        $type = isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) ? $_GET['post_type'] : null;
+    if (!$type) {
+        $type = isset($_GET['post_type']) && !empty($_GET['post_type']) ? $_GET['post_type'] : null;
     }
     
-    return apply_filters( 'wpinv_admin_post_type', $type, $id );
+    return apply_filters('wpinv_admin_post_type', $type, $id);
 }
 
 function wpinv_admin_messages() {
-	settings_errors( 'wpinv-notices' );
+	settings_errors('wpinv-notices');
 }
-add_action( 'admin_notices', 'wpinv_admin_messages' );
+add_action('admin_notices', 'wpinv_admin_messages');
 
-add_action( 'admin_init', 'wpinv_show_test_payment_gateway_notice' );
-function wpinv_show_test_payment_gateway_notice(){
-    add_action( 'admin_notices', 'wpinv_test_payment_gateway_messages' );
+add_action('admin_init', 'wpinv_show_test_payment_gateway_notice');
+function wpinv_show_test_payment_gateway_notice() {
+    add_action('admin_notices', 'wpinv_test_payment_gateway_messages');
 }
 
-function wpinv_test_payment_gateway_messages(){
+function wpinv_test_payment_gateway_messages() {
     $gateways = wpinv_get_enabled_payment_gateways();
     $name = array(); $test_gateways = '';
     if ($gateways) {
@@ -76,9 +76,9 @@ 
         }
         $test_gateways = implode(', ', $name);
     }
-    if(isset($test_gateways) && !empty($test_gateways)){
+    if (isset($test_gateways) && !empty($test_gateways)) {
         $link = admin_url('admin.php?page=wpinv-settings&tab=gateways');
-        $notice = wp_sprintf( __('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link );
+        $notice = wp_sprintf(__('<strong>Important:</strong> Payment Gateway(s) %s are in testing mode and will not receive real payments. Go to <a href="%s"> Gateway Settings</a>.', 'invoicing'), $test_gateways, $link);
         ?>
         <div class="notice notice-warning is-dismissible">
             <p><?php echo $notice; ?></p>
@@ -87,16 +87,16 @@ 
     }
 }
 
-function wpinv_send_invoice_after_save( $invoice ) {
-    if ( empty( $_POST['wpi_save_send'] ) ) {
+function wpinv_send_invoice_after_save($invoice) {
+    if (empty($_POST['wpi_save_send'])) {
         return;
     }
     
-    if ( !empty( $invoice->ID ) && !empty( $invoice->post_type ) && 'wpi_invoice' == $invoice->post_type ) {
-        wpinv_user_invoice_notification( $invoice->ID );
+    if (!empty($invoice->ID) && !empty($invoice->post_type) && 'wpi_invoice' == $invoice->post_type) {
+        wpinv_user_invoice_notification($invoice->ID);
     }
 }
-add_action( 'wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1 );
+add_action('wpinv_invoice_metabox_saved', 'wpinv_send_invoice_after_save', 100, 1);
 
 
 add_action('admin_init', 'admin_init_example_type');
@@ -107,7 +107,7 @@ 
 function admin_init_example_type() {
     global $typenow;
 
-    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote' ) {
+    if ($typenow === 'wpi_invoice' || $typenow === 'wpi_quote') {
         add_filter('posts_search', 'posts_search_example_type', 10, 2);
     }
 }
@@ -122,9 +122,9 @@ 
     global $wpdb;
 
     if ($query->is_main_query() && !empty($query->query['s'])) {
-        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql( $query->query['s'] ) . "%' )";
-        if ( ! empty( $search ) ) {
-            $search = preg_replace( '/^ AND /', '', $search );
+        $conditions_str = "{$wpdb->posts}.post_author IN ( SELECT ID FROM {$wpdb->users} WHERE user_email LIKE '%" . esc_sql($query->query['s']) . "%' )";
+        if (!empty($search)) {
+            $search = preg_replace('/^ AND /', '', $search);
             $search = " AND ( {$search} OR ( {$conditions_str} ) )";
         } else {
             $search = " AND ( {$conditions_str} )";
@@ -134,9 +134,9 @@ 
     return $search;
 }
 
-add_action( 'admin_init', 'wpinv_reset_invoice_count' );
-function wpinv_reset_invoice_count(){
-    if(isset($_GET['reset_invoice_count']) && 1 == $_GET['reset_invoice_count'] && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
+add_action('admin_init', 'wpinv_reset_invoice_count');
+function wpinv_reset_invoice_count() {
+    if (isset($_GET['reset_invoice_count']) && 1 == $_GET['reset_invoice_count'] && isset($_GET['_nonce']) && wp_verify_nonce($_GET['_nonce'], 'reset_invoice_count')) {
         wpinv_update_option('invoice_sequence_start', 1);
         delete_option('wpinv_last_invoice_number');
         $url = add_query_arg(array('reset_invoice_done' => 1));
@@ -147,8 +147,8 @@ 
 }
 
 add_action('admin_notices', 'wpinv_invoice_count_reset_message');
-function wpinv_invoice_count_reset_message(){
-    if(isset($_GET['reset_invoice_done']) && 1 == $_GET['reset_invoice_done']) {
+function wpinv_invoice_count_reset_message() {
+    if (isset($_GET['reset_invoice_done']) && 1 == $_GET['reset_invoice_done']) {
         $notice = __('Invoice number sequence reset successfully.', 'invoicing');
         ?>
         <div class="notice notice-success is-dismissible">

includes/admin/class-getpaid-admin.php

Indentation +222 added lines, -222 removed lines

@@ -14,62 +14,62 @@ 
 class GetPaid_Admin {
 
     /**
-	 * Local path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_path;
-
-	/**
-	 * Web path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
+     * Local path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_path;
+
+    /**
+     * Web path to this plugins admin directory
+     *
+     * @var         string
+     */
     public $admin_url;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct(){
+     * Class constructor.
+     */
+    public function __construct(){
 
         $this->admin_path  = plugin_dir_path( __FILE__ );
         $this->admin_url   = plugins_url( '/', __FILE__ );
 
         if ( is_admin() ) {
-			$this->init_admin_hooks();
+            $this->init_admin_hooks();
         }
 
     }
 
     /**
-	 * Init action and filter hooks
-	 *
-	 */
-	private function init_admin_hooks() {
+     * Init action and filter hooks
+     *
+     */
+    private function init_admin_hooks() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
         add_action( 'admin_init', array( $this, 'activation_redirect') );
         add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
+        do_action( 'getpaid_init_admin_hooks', $this );
 
     }
 
     /**
-	 * Register admin scripts
-	 *
-	 */
-	public function enqeue_scripts() {
+     * Register admin scripts
+     *
+     */
+    public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
-		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
+        $page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
@@ -93,30 +93,30 @@ 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+        if ( 'wpi_payment_form' == $page && $editing ) {
             $this->load_payment_form_scripts();
         }
 
         if ( $page == 'wpinv-subscriptions' ) {
-			wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-			wp_enqueue_script( 'wpinv-sub-admin-script' );
-		}
+            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
+            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        }
 
-		if ( $page == 'wpinv-reports' ) {
-			wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
-		}
+        if ( $page == 'wpinv-reports' ) {
+            wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+        }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
-		}
+        if ( $page == 'wpinv-subscriptions' ) {
+            wp_enqueue_script( 'postbox' );
+        }
 
     }
 
     /**
-	 * Returns admin js translations.
-	 *
-	 */
-	protected function get_admin_i18() {
+     * Returns admin js translations.
+     *
+     */
+    protected function get_admin_i18() {
         global $post;
 
         $i18n = array(
@@ -152,50 +152,50 @@ 
             'searching'                 => __( 'Searching', 'invoicing' ),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$invoice              = new WPInv_Invoice( $post );
-			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_type() )
-			);
+            $invoice              = new WPInv_Invoice( $post );
+            $i18n['save_invoice'] = sprintf(
+                __( 'Save %s', 'invoicing' ),
+                ucfirst( $invoice->get_type() )
+            );
 
-			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_type() )
-			);
+            $i18n['invoice_description'] = sprintf(
+                __( '%s Description', 'invoicing' ),
+                ucfirst( $invoice->get_type() )
+            );
 
-		}
-		return $i18n;
+        }
+        return $i18n;
     }
 
     /**
-	 * Loads payment form js.
-	 *
-	 */
-	protected function load_payment_form_scripts() {
+     * Loads payment form js.
+     *
+     */
+    protected function load_payment_form_scripts() {
         global $post;
 
         wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
+        wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
+        wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
 
-		wp_localize_script(
+        wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
-				'currency'      => wpinv_currency_symbol(),
-				'position'      => wpinv_currency_position(),
-				'decimals'      => (int) wpinv_decimals(),
-				'thousands_sep' => wpinv_thousands_separator(),
-				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
-				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
+                'elements'      => wpinv_get_data( 'payment-form-elements' ),
+                'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+                'currency'      => wpinv_currency_symbol(),
+                'position'      => wpinv_currency_position(),
+                'decimals'      => (int) wpinv_decimals(),
+                'thousands_sep' => wpinv_thousands_separator(),
+                'decimals_sep'  => wpinv_decimal_separator(),
+                'form_items'    => gepaid_get_form_items( $post->ID ),
+                'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
@@ -204,20 +204,20 @@ 
     }
 
     /**
-	 * Add our classes to admin pages.
+     * Add our classes to admin pages.
      *
      * @param string $classes
      * @return string
-	 *
-	 */
+     *
+     */
     public function admin_body_class( $classes ) {
-		global $pagenow, $post, $current_screen;
+        global $pagenow, $post, $current_screen;
 
 
         $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         if ( false !== stripos( $page, 'wpi' ) ) {
@@ -226,29 +226,29 @@ 
 
         if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
             $classes .= ' wpinv-cpt wpinv';
-		}
+        }
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+        if ( getpaid_is_invoice_post_type( $page ) ) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
-		return $classes;
+        return $classes;
     }
 
     /**
-	 * Maybe show the AyeCode Connect Notice.
-	 */
-	public function init_ayecode_connect_helper(){
+     * Maybe show the AyeCode Connect Notice.
+     */
+    public function init_ayecode_connect_helper(){
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+                'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
+                'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
+                'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
+                'connect_button'    => __("Connect Site","invoicing"),
+                'connecting_button'    => __("Connecting...","invoicing"),
+                'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
+                'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
             ),
             array( 'wpi-addons' )
         );
@@ -260,21 +260,21 @@ 
      */
     public function activation_redirect() {
 
-		// Bail if no activation redirect.
-		if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
-			return;
-		}
+        // Bail if no activation redirect.
+        if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
+            return;
+        }
 
-		// Delete the redirect transient.
-		delete_transient( '_wpinv_activation_redirect' );
+        // Delete the redirect transient.
+        delete_transient( '_wpinv_activation_redirect' );
 
-		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-			return;
-		}
+        // Bail if activating from network, or bulk
+        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+            return;
+        }
 
-		wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
-		exit;
+        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        exit;
     }
 
     /**
@@ -289,150 +289,150 @@ 
 
     }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 * 
-	 * @param array $args
+     * 
+     * @param array $args
      */
     public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
     /**
-	 * Returns an array of admin notices.
-	 *
-	 * @since       1.0.19
+     * Returns an array of admin notices.
+     *
+     * @since       1.0.19
      * @return array
-	 */
-	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
+     */
+    public function get_notices() {
+        $notices = get_option( 'wpinv_admin_notices' );
         return is_array( $notices ) ? $notices : array();
-	}
-
-	/**
-	 * Clears all admin notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
-	}
-
-	/**
-	 * Saves a new admin notice
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function save_notice( $type, $message ) {
-		$notices = $this->get_notices();
-
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
-		}
-
-		$notices[ $type ][] = $message;
-
-		update_option( 'wpinv_admin_notices', $notices );
-	}
-
-	/**
-	 * Displays a success notice
-	 *
-	 * @param       string $msg The message to qeue.
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
-	}
-
-	/**
-	 * Displays a error notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
-	}
-
-	/**
-	 * Displays a warning notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
-	}
-
-	/**
-	 * Displays a info notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
-	}
-
-	/**
-	 * Show notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_notices() {
+    }
+
+    /**
+     * Clears all admin notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function clear_notices() {
+        delete_option( 'wpinv_admin_notices' );
+    }
+
+    /**
+     * Saves a new admin notice
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function save_notice( $type, $message ) {
+        $notices = $this->get_notices();
+
+        if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
+            $notices[ $type ] = array();
+        }
+
+        $notices[ $type ][] = $message;
+
+        update_option( 'wpinv_admin_notices', $notices );
+    }
+
+    /**
+     * Displays a success notice
+     *
+     * @param       string $msg The message to qeue.
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_success( $msg ) {
+        $this->save_notice( 'success', $msg );
+    }
+
+    /**
+     * Displays a error notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_error( $msg ) {
+        $this->save_notice( 'error', $msg );
+    }
+
+    /**
+     * Displays a warning notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_warning( $msg ) {
+        $this->save_notice( 'warning', $msg );
+    }
+
+    /**
+     * Displays a info notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_info( $msg ) {
+        $this->save_notice( 'info', $msg );
+    }
+
+    /**
+     * Show notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_notices() {
 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+        foreach ( $notices as $type => $messages ) {
 
-			if ( ! is_array( $messages ) ) {
-				continue;
-			}
+            if ( ! is_array( $messages ) ) {
+                continue;
+            }
 
             $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
+            foreach ( $messages as $message ) {
                 $message = wp_kses_post( $message );
-				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
+                echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 
         }
 
-	}
+    }
 
 }

Spacing +129 added lines, -129 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main admin class.
@@ -30,12 +30,12 @@ 
     /**
 	 * Class constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 
-        $this->admin_path  = plugin_dir_path( __FILE__ );
-        $this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->admin_path  = plugin_dir_path(__FILE__);
+        $this->admin_url   = plugins_url('/', __FILE__);
 
-        if ( is_admin() ) {
+        if (is_admin()) {
 			$this->init_admin_hooks();
         }
 
@@ -46,15 +46,15 @@ 
 	 *
 	 */
 	private function init_admin_hooks() {
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ) );
-        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
-        add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
-        add_action( 'admin_init', array( $this, 'activation_redirect') );
-        add_action( 'admin_init', array( $this, 'maybe_do_admin_action') );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action('admin_enqueue_scripts', array($this, 'enqeue_scripts'));
+        add_filter('admin_body_class', array($this, 'admin_body_class'));
+        add_action('admin_init', array($this, 'init_ayecode_connect_helper'));
+        add_action('admin_init', array($this, 'activation_redirect'));
+        add_action('admin_init', array($this, 'maybe_do_admin_action'));
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('getpaid_authenticated_admin_action_send_invoice', array($this, 'send_customer_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice_reminder', array($this, 'send_customer_payment_reminder'));
+		do_action('getpaid_init_admin_hooks', $this);
 
     }
 
@@ -65,49 +65,49 @@ 
 	public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? $_GET['page'] : '';
+		$page    = isset($_GET['page']) ? $_GET['page'] : '';
 		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( false !== stripos( $page, 'wpi' ) ) {
+        if (false !== stripos($page, 'wpi')) {
 
             // Styles.
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-            wp_enqueue_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array( 'wp-color-picker' ), $version );
-            wp_enqueue_style( 'select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all' );
-            wp_enqueue_style( 'wp_enqueue_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-            wp_enqueue_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui.min.css', array(), '1.8.16' );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+            wp_enqueue_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array('wp-color-picker'), $version);
+            wp_enqueue_style('select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all');
+            wp_enqueue_style('wp_enqueue_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+            wp_enqueue_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui.min.css', array(), '1.8.16');
 
             // Scripts.
-            wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '4.0.13', true );
-            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array( 'jquery' ), WPINV_VERSION );
+            wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '4.0.13', true);
+            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array('jquery'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-            wp_enqueue_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip', 'wp-color-picker', 'jquery-ui-datepicker' ),  $version );
-            wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', apply_filters( 'wpinv_admin_js_localize', $this->get_admin_i18() ) );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+            wp_enqueue_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip', 'wp-color-picker', 'jquery-ui-datepicker'), $version);
+            wp_localize_script('wpinv-admin-script', 'WPInv_Admin', apply_filters('wpinv_admin_js_localize', $this->get_admin_i18()));
 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+		if ('wpi_payment_form' == $page && $editing) {
             $this->load_payment_form_scripts();
         }
 
-        if ( $page == 'wpinv-subscriptions' ) {
-			wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-			wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+			wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+			wp_enqueue_script('wpinv-sub-admin-script');
 		}
 
-		if ( $page == 'wpinv-reports' ) {
-			wp_enqueue_script( 'jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array( 'jquery' ), '0.7' );
+		if ($page == 'wpinv-reports') {
+			wp_enqueue_script('jquery-flot', WPINV_PLUGIN_URL . 'assets/js/jquery.flot.min.js', array('jquery'), '0.7');
 		}
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
+		if ($page == 'wpinv-subscriptions') {
+			wp_enqueue_script('postbox');
 		}
 
     }
@@ -120,13 +120,13 @@ 
         global $post;
 
         $i18n = array(
-            'ajax_url'                  => admin_url( 'admin-ajax.php' ),
-            'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-            'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-            'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
-            'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
-            'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
-            'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
+            'ajax_url'                  => admin_url('admin-ajax.php'),
+            'post_ID'                   => isset($post->ID) ? $post->ID : '',
+            'wpinv_nonce'               => wp_create_nonce('wpinv-nonce'),
+            'add_invoice_note_nonce'    => wp_create_nonce('add-invoice-note'),
+            'delete_invoice_note_nonce' => wp_create_nonce('delete-invoice-note'),
+            'invoice_item_nonce'        => wp_create_nonce('invoice-item'),
+            'billing_details_nonce'     => wp_create_nonce('get-billing-details'),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
             'currency_symbol'           => wpinv_currency_symbol(),
@@ -134,35 +134,35 @@ 
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
             'decimals'                  => wpinv_decimals(),
-            'save_invoice'              => __( 'Save Invoice', 'invoicing' ),
-            'status_publish'            => wpinv_status_nicename( 'publish' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'delete_tax_rate'           => __( 'Are you sure you wish to delete this tax rate?', 'invoicing' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'FillBillingDetails'        => __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' ),
-            'confirmCalcTotals'         => __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' ),
-            'AreYouSure'                => __( 'Are you sure?', 'invoicing' ),
-            'errDeleteItem'             => __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' ),
-            'delete_subscription'       => __( 'Are you sure you want to delete this subscription?', 'invoicing' ),
-            'action_edit'               => __( 'Edit', 'invoicing' ),
-            'action_cancel'             => __( 'Cancel', 'invoicing' ),
-            'item_description'          => __( 'Item Description', 'invoicing' ),
-            'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
-            'discount_description'      => __( 'Discount Description', 'invoicing' ),
-            'searching'                 => __( 'Searching', 'invoicing' ),
+            'save_invoice'              => __('Save Invoice', 'invoicing'),
+            'status_publish'            => wpinv_status_nicename('publish'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'delete_tax_rate'           => __('Are you sure you wish to delete this tax rate?', 'invoicing'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'FillBillingDetails'        => __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'),
+            'confirmCalcTotals'         => __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing'),
+            'AreYouSure'                => __('Are you sure?', 'invoicing'),
+            'errDeleteItem'             => __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'),
+            'delete_subscription'       => __('Are you sure you want to delete this subscription?', 'invoicing'),
+            'action_edit'               => __('Edit', 'invoicing'),
+            'action_cancel'             => __('Cancel', 'invoicing'),
+            'item_description'          => __('Item Description', 'invoicing'),
+            'invoice_description'       => __('Invoice Description', 'invoicing'),
+            'discount_description'      => __('Discount Description', 'invoicing'),
+            'searching'                 => __('Searching', 'invoicing'),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (!empty($post) && getpaid_is_invoice_post_type($post->post_type)) {
 
-			$invoice              = new WPInv_Invoice( $post );
+			$invoice              = new WPInv_Invoice($post);
 			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_type() )
+				__('Save %s', 'invoicing'),
+				ucfirst($invoice->get_type())
 			);
 
 			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_type() )
+				__('%s Description', 'invoicing'),
+				ucfirst($invoice->get_type())
 			);
 
 		}
@@ -176,30 +176,30 @@ 
 	protected function load_payment_form_scripts() {
         global $post;
 
-        wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.js', array(), WPINV_VERSION);
+		wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+		wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js' );
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array( 'wpinv-admin-script', 'vue_draggable' ),  $version );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin-payment-forms.js');
+		wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.js', array('wpinv-admin-script', 'vue_draggable'), $version);
 
 		wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+				'elements'      => wpinv_get_data('payment-form-elements'),
+				'form_elements' => getpaid_get_payment_form_elements($post->ID),
 				'currency'      => wpinv_currency_symbol(),
 				'position'      => wpinv_currency_position(),
 				'decimals'      => (int) wpinv_decimals(),
 				'thousands_sep' => wpinv_thousands_separator(),
 				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
+				'form_items'    => gepaid_get_form_items($post->ID),
 				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
-        wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+        wp_enqueue_script('wpinv-admin-payment-form-script');
 
     }
 
@@ -210,25 +210,25 @@ 
      * @return string
 	 *
 	 */
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
 		global $pagenow, $post, $current_screen;
 
 
-        $page = isset( $_GET['page'] ) ? $_GET['page'] : '';
+        $page = isset($_GET['page']) ? $_GET['page'] : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
-        if ( false !== stripos( $page, 'wpi' ) ) {
-            $classes .= ' wpi-' . sanitize_key( $page );
+        if (false !== stripos($page, 'wpi')) {
+            $classes .= ' wpi-' . sanitize_key($page);
         }
 
-        if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
+        if (in_array($page, wpinv_parse_list('wpi_invoice wpi_payment_form wpi_quote'))) {
             $classes .= ' wpinv-cpt wpinv';
 		}
 		
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+		if (getpaid_is_invoice_post_type($page)) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
@@ -238,19 +238,19 @@ 
     /**
 	 * Maybe show the AyeCode Connect Notice.
 	 */
-	public function init_ayecode_connect_helper(){
+	public function init_ayecode_connect_helper() {
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title' => __("WP Invoicing - an AyeCode product!","invoicing"),
-				'connect_external'  => __( "Please confirm you wish to connect your site?","invoicing" ),
-				'connect'           => sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s","invoicing" ),"<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>","</a>" ),
-				'connect_button'    => __("Connect Site","invoicing"),
-				'connecting_button'    => __("Connecting...","invoicing"),
-				'error_localhost'   => __( "This service will only work with a live domain, not a localhost.","invoicing" ),
-				'error'             => __( "Something went wrong, please refresh and try again.","invoicing" ),
+				'connect_title' => __("WP Invoicing - an AyeCode product!", "invoicing"),
+				'connect_external'  => __("Please confirm you wish to connect your site?", "invoicing"),
+				'connect'           => sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", "invoicing"), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+				'connect_button'    => __("Connect Site", "invoicing"),
+				'connecting_button'    => __("Connecting...", "invoicing"),
+				'error_localhost'   => __("This service will only work with a live domain, not a localhost.", "invoicing"),
+				'error'             => __("Something went wrong, please refresh and try again.", "invoicing"),
             ),
-            array( 'wpi-addons' )
+            array('wpi-addons')
         );
 
     }
@@ -261,19 +261,19 @@ 
     public function activation_redirect() {
 
 		// Bail if no activation redirect.
-		if ( ! get_transient( '_wpinv_activation_redirect' ) || wp_doing_ajax() ) {
+		if (!get_transient('_wpinv_activation_redirect') || wp_doing_ajax()) {
 			return;
 		}
 
 		// Delete the redirect transient.
-		delete_transient( '_wpinv_activation_redirect' );
+		delete_transient('_wpinv_activation_redirect');
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-		wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+		wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
 		exit;
     }
 
@@ -282,9 +282,9 @@ 
      */
     public function maybe_do_admin_action() {
 
-        if ( wpinv_current_user_can_manage_invoicing() && isset( $_REQUEST['getpaid-admin-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-admin-action'] );
-            do_action( "getpaid_authenticated_admin_action_$key", $_REQUEST );
+        if (wpinv_current_user_can_manage_invoicing() && isset($_REQUEST['getpaid-admin-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+            $key = sanitize_key($_REQUEST['getpaid-admin-action']);
+            do_action("getpaid_authenticated_admin_action_$key", $_REQUEST);
         }
 
     }
@@ -294,16 +294,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_invoice( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_invoice($args) {
+		$sent = getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Invoice was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Invoice was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent the invoice to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent the invoice to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -312,16 +312,16 @@ 
 	 * 
 	 * @param array $args
      */
-    public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_payment_reminder($args) {
+		$sent = getpaid()->get('invoice_emails')->force_send_overdue_notice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Payment reminder was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent payment reminder to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -332,8 +332,8 @@ 
      * @return array
 	 */
 	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
-        return is_array( $notices ) ? $notices : array();
+		$notices = get_option('wpinv_admin_notices');
+        return is_array($notices) ? $notices : array();
 	}
 
 	/**
@@ -343,7 +343,7 @@ 
 	 * @since       1.0.19
 	 */
 	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
+		delete_option('wpinv_admin_notices');
 	}
 
 	/**
@@ -352,16 +352,16 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function save_notice( $type, $message ) {
+	public function save_notice($type, $message) {
 		$notices = $this->get_notices();
 
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ]) ) {
-			$notices[ $type ] = array();
+		if (empty($notices[$type]) || !is_array($notices[$type])) {
+			$notices[$type] = array();
 		}
 
-		$notices[ $type ][] = $message;
+		$notices[$type][] = $message;
 
-		update_option( 'wpinv_admin_notices', $notices );
+		update_option('wpinv_admin_notices', $notices);
 	}
 
 	/**
@@ -371,8 +371,8 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
+	public function show_success($msg) {
+		$this->save_notice('success', $msg);
 	}
 
 	/**
@@ -382,8 +382,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
+	public function show_error($msg) {
+		$this->save_notice('error', $msg);
 	}
 
 	/**
@@ -393,8 +393,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
+	public function show_warning($msg) {
+		$this->save_notice('warning', $msg);
 	}
 
 	/**
@@ -404,8 +404,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
+	public function show_info($msg) {
+		$this->save_notice('info', $msg);
 	}
 
 	/**
@@ -419,15 +419,15 @@ 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+		foreach ($notices as $type => $messages) {
 
-			if ( ! is_array( $messages ) ) {
+			if (!is_array($messages)) {
 				continue;
 			}
 
-            $type  = sanitize_key( $type );
-			foreach ( $messages as $message ) {
-                $message = wp_kses_post( $message );
+            $type = sanitize_key($type);
+			foreach ($messages as $message) {
+                $message = wp_kses_post($message);
 				echo "<div class='notice notice-$type is-dismissible'><p>$message</p></div>";
             }
 

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

Spacing +87 added lines, -87 removed lines

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

includes/admin/admin-pages.php

Spacing +72 added lines, -72 removed lines

@@ -1,16 +1,16 @@ 
 <?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 $discount->get_code();
         break;
@@ -21,37 +21,37 @@ 
             echo $discount->get_usage();
         break;
         case 'start_date' :
-            echo getpaid_format_date_value( $discount->get_start_date() );
+            echo getpaid_format_date_value($discount->get_start_date());
         break;
         case 'expiry_date' :
-            echo getpaid_format_date_value( $discount->get_expiration_date(), __( 'Never', 'invoicing' ) );
+            echo getpaid_format_date_value($discount->get_expiration_date(), __('Never', 'invoicing'));
         break;
     }
 }
 
-add_filter( 'post_row_actions', 'wpinv_post_row_actions', 9999, 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', 9999, 2);
+function wpinv_post_row_actions($actions, $post) {
+    $post_type = !empty($post->post_type) ? $post->post_type : '';
 
-    if ( $post_type == 'wpi_invoice' ) {
+    if ($post_type == 'wpi_invoice') {
         $actions = array();
     }
 
-    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    = esc_url(
+        $url = esc_url(
                     wp_nonce_url(
                         add_query_arg(
                             array(
@@ -63,13 +63,13 @@ 
                         '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>";
 
-    } else if( in_array( strtolower( $discount->post_status ),  array( 'pending', 'draft' ) ) ) {
+    } else if (in_array(strtolower($discount->post_status), array('pending', 'draft'))) {
 
-        $url    = esc_url(
+        $url = esc_url(
             wp_nonce_url(
                 add_query_arg(
                     array(
@@ -81,13 +81,13 @@ 
                 '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(
@@ -99,11 +99,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;
 }
@@ -111,68 +111,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 _e( 'Show all types', 'invoicing' ); ?></option>
+        <option value=""><?php _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, $_GET['discount_type'] );
+                if (isset($_GET['discount_type']))
+                    selected($name, $_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);
         }
 
-    } else if ( 'wpi_discount' == $typenow ) {
-        $meta_query = !empty( $vars['meta_query'] ) ? $vars['meta_query'] : array();
+    } else if ('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_text_field( $_GET['discount_type'] ),
+                    'value' => sanitize_text_field($_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.
@@ -184,19 +184,19 @@ 
  * @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 ( $option_value > 0 && ( $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 ($option_value > 0 && ($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)){
+    if (!empty($post_parent)) {
         $page = get_page_by_path($post_parent);
         if ($page) {
             $post_parent = $page->ID;
@@ -205,40 +205,40 @@ 
         }
     }
 
-    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',
@@ -250,11 +250,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;

includes/data/item-schema.php

Indentation +228 added lines, -228 removed lines

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

Spacing +77 added lines, -77 removed lines

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