AyeCode / invoicing

includes/class-wpinv-privacy.php

Indentation +19 added lines, -19 removed lines

@@ -31,25 +31,25 @@
     public function get_privacy_message() {
 
         $content = '<div class="wp-suggested-text">' .
-                   '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
-                   '<ul>' .
-                   '<li>' . __( '- Send you important account/order/service information.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '</ul>' .
-                   '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
-                   '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
-                   '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
-                   '</div>';
+                    '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
+                    '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
+                    '<ul>' .
+                    '<li>' . __( '- Send you important account/order/service information.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
+                    '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                    '</ul>' .
+                    '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
+                    '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
+                    '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
+                    '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
+                    '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
+                    '</div>';
 
         return apply_filters( 'wpinv_privacy_policy_content', $content );
     }

includes/wpinv-address-functions.php

Indentation +88 added lines, -88 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -26,7 +26,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -56,9 +56,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+    $state = wpinv_get_option( 'default_state', false );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -166,11 +166,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
     
@@ -462,30 +462,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . ' wpinv-select wpi_select2',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
@@ -503,46 +503,46 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+        return apply_filters( 'wpinv_localisation_address_formats',
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -559,21 +559,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
     
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      * 
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -594,8 +594,8 @@ 
         'country'           => '',
         'zip'               => '',
         'first_name'        => '',
-		'last_name'         => '',
-		'company'           => '',
+        'last_name'         => '',
+        'company'           => '',
     );
 
     $args    = array_map( 'trim', wp_parse_args( $billing_details, $default_args ) );
@@ -616,14 +616,14 @@ 
     $args['country_code']= $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     *
+     * @since 1.0.13
+     *
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -646,5 +646,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }
\ No newline at end of file

widgets/buy-item.php

Indentation +49 added lines, -49 removed lines

@@ -38,29 +38,29 @@ 
                     'advanced'    => false
                 ),
                 'items'  => array(
-	                'title'       => __( 'Items to buy', 'invoicing' ),
-	                'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'placeholder' => __('Items to buy','invoicing'),
-	                'advanced'    => false
+                    'title'       => __( 'Items to buy', 'invoicing' ),
+                    'desc'        => __( 'Enter comma separated list of invoicing item id and quantity (item_id|quantity). Ex. 101|2 ', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'placeholder' => __('Items to buy','invoicing'),
+                    'advanced'    => false
                 ),
                 'label'  => array(
-	                'title'       => __( 'Button Label', 'invoicing' ),
-	                'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
-	                'type'        => 'text',
-	                'desc_tip'    => true,
-	                'default'     => __( 'Buy Now', 'invoicing' ),
-	                'advanced'    => false
+                    'title'       => __( 'Button Label', 'invoicing' ),
+                    'desc'        => __( 'Enter button label. Default "Buy Now".', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => __( 'Buy Now', 'invoicing' ),
+                    'advanced'    => false
                 ),
                 'post_id'  => array(
-	                'title'       => __( 'Post ID', 'invoicing' ),
-	                'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
-	                'type'        => 'number',
-	                'desc_tip'    => true,
-	                'default'     => '',
-	                'advanced'    => true
+                    'title'       => __( 'Post ID', 'invoicing' ),
+                    'desc'        => __( 'Enter related post ID. This is for 3rd party add ons and not mandatory field.', 'invoicing' ),
+                    'type'        => 'number',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => true
                 ),
             )
 
@@ -70,43 +70,43 @@ 
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return string
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return string
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    $defaults = array(
-		    'items'     	=> '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
-		    'label'  	    => __( 'Buy Now', 'invoicing' ), // the button title
-		    'post_id'   	=> '', // any related post_id
-	    );
+        $defaults = array(
+            'items'     	=> '', // should be used like: item_id|quantity,item_id|quantity,item_id|quantity
+            'label'  	    => __( 'Buy Now', 'invoicing' ), // the button title
+            'post_id'   	=> '', // any related post_id
+        );
 
-	    /**
-	     * Parse incoming $args into an array and merge it with $defaults
-	     */
-	    $args = wp_parse_args( $args, $defaults );
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
 
-		$html = '<div class="wpi-buy-button-wrapper wpi-g">';
+        $html = '<div class="wpi-buy-button-wrapper wpi-g">';
 		
-		if ( empty( $args['items'] ) ) {
-			$html .= __( 'No items selected', 'invoicing' );
-		} else {
-			$post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
-			$label   = isset( $args['label'] ) ? sanitize_text_field( $args['label'] ) : __( 'Buy Now', 'invoicing' );
-			$items   = esc_attr( $args['items'] );
-			$html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$label</button>";
-		}
+        if ( empty( $args['items'] ) ) {
+            $html .= __( 'No items selected', 'invoicing' );
+        } else {
+            $post_id = isset( $args['post_id'] ) && is_numeric( $args['post_id'] ) ? sanitize_text_field( $args['post_id'] ) : 0;
+            $label   = isset( $args['label'] ) ? sanitize_text_field( $args['label'] ) : __( 'Buy Now', 'invoicing' );
+            $items   = esc_attr( $args['items'] );
+            $html   .= "<button class='button button-primary wpi-buy-button' type='button' onclick=\"wpi_buy(this, '$items','$post_id');\">$label</button>";
+        }
 	
-	    $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
-	    $html .= '</div>';
+        $html .= wp_nonce_field( 'wpinv_buy_items', 'wpinv_buy_nonce', true, false );
+        $html .= '</div>';
 
-	    return $html;
+        return $html;
 
     }
 

includes/api/class-wpinv-rest-invoice-controller.php

Indentation +1272 added lines, -1272 removed lines

@@ -20,31 +20,31 @@ 
 class WPInv_REST_Invoice_Controller extends WP_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_invoice';
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_invoice';
 	
-	/**
-	 * Cached results of get_item_schema.
-	 *
-	 * @since 1.0.13
-	 * @var array
-	 */
-	protected $schema;
+    /**
+     * Cached results of get_item_schema.
+     *
+     * @since 1.0.13
+     * @var array
+     */
+    protected $schema;
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $namespace Api Namespace
-	 */
-	public function __construct( $namespace ) {
+     * Constructor.
+     *
+     * @since 1.0.13
+     *
+     * @param string $namespace Api Namespace
+     */
+    public function __construct( $namespace ) {
         
         // Set api namespace...
-		$this->namespace = $namespace;
+        $this->namespace = $namespace;
 
         // ... and the rest base
         $this->rest_base = 'invoices';
@@ -52,79 +52,79 @@ 
     }
     
     /**
-	 * Checks if a given request has access to read invoices.
+     * Checks if a given request has access to read invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
-	 */
-	public function get_items_permissions_check( $request ) {
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+     */
+    public function get_items_permissions_check( $request ) {
 	
         $post_type = get_post_type_object( $this->post_type );
 
-		if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
-			return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
+        if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
+            return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
 
-		if ( ! is_user_logged_in() ) {
-			return new WP_Error( 'rest_forbidden', __( 'Sorry, you must be logged in to view items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
-		}
+        if ( ! is_user_logged_in() ) {
+            return new WP_Error( 'rest_forbidden', __( 'Sorry, you must be logged in to view items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        }
 
-		// Read checks will be evaluated on a per invoice basis
+        // Read checks will be evaluated on a per invoice basis
 
-		return true;
+        return true;
 
     }
     
     /**
-	 * Retrieves a collection of invoices.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_items( $request ) {
+     * Retrieves a collection of invoices.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_items( $request ) {
 		
-		// Retrieve request query parameters.
-		$args          = $this->get_request_collection_params( $request );
+        // Retrieve request query parameters.
+        $args          = $this->get_request_collection_params( $request );
 		
-		// WP_Query Args.
-		$wp_query_args = $this->get_collection_wp_query_params( $args, $request );
+        // WP_Query Args.
+        $wp_query_args = $this->get_collection_wp_query_params( $args, $request );
 		
-		// Get invoice ids...
-		$query         = new WP_Query( $wp_query_args );
-
-		// ... and map them into invoice objects.
-		$_invoices     = array_map( array( $this, 'get_post' ), $query->posts );
-
-		// Prepare the retrieved invoices
-		$invoices      = array();
-
-		foreach( $_invoices as $invoice ) {
-			if ( $this->check_read_permission( $invoice ) ) {
-				$invoices[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $invoice, $request ) );
-			}
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $invoices );
-		$response->header( 'X-WP-Total', (int) $query->found_posts );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
-
-		/**
-		 * Filters the responses for invoices requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param arrWP_REST_Response $response    Response object.
-		 * @param WP_REST_Request     $request The request used.
+        // Get invoice ids...
+        $query         = new WP_Query( $wp_query_args );
+
+        // ... and map them into invoice objects.
+        $_invoices     = array_map( array( $this, 'get_post' ), $query->posts );
+
+        // Prepare the retrieved invoices
+        $invoices      = array();
+
+        foreach( $_invoices as $invoice ) {
+            if ( $this->check_read_permission( $invoice ) ) {
+                $invoices[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $invoice, $request ) );
+            }
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $invoices );
+        $response->header( 'X-WP-Total', (int) $query->found_posts );
+        $response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+
+        /**
+         * Filters the responses for invoices requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param arrWP_REST_Response $response    Response object.
+         * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the invoices
-		 */
+         */
         $response       = apply_filters( "wpinv_rest_invoices_response", $response, $request, $args );
 
         return rest_ensure_response( $response );
@@ -132,25 +132,25 @@ 
     }
 
     /**
-	 * Get the post, if the ID is valid.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param int $invoice_id Supplied ID.
-	 * @return WPInv_Invoice|WP_Error Invoice object if ID is valid, WP_Error otherwise.
-	 */
-	protected function get_post( $invoice_id ) {
+     * Get the post, if the ID is valid.
+     *
+     * @since 1.0.13
+     *
+     * @param int $invoice_id Supplied ID.
+     * @return WPInv_Invoice|WP_Error Invoice object if ID is valid, WP_Error otherwise.
+     */
+    protected function get_post( $invoice_id ) {
 		
-		$error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_invoice_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
 
         // Ids start from 1
         if ( (int) $invoice_id <= 0 ) {
-			return $error;
-		}
+            return $error;
+        }
 
-		$invoice = wpinv_get_invoice( (int) $invoice_id );
-		if ( empty( $invoice ) || $this->post_type !== $invoice->post_type ) {
-			return $error;
+        $invoice = wpinv_get_invoice( (int) $invoice_id );
+        if ( empty( $invoice ) || $this->post_type !== $invoice->post_type ) {
+            return $error;
         }
 
         return $invoice;
@@ -158,77 +158,77 @@ 
     }
 
     /**
-	 * Checks if a given request has access to read an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the invoice, WP_Error object otherwise.
-	 */
-	public function get_item_permissions_check( $request ) {
+     * Checks if a given request has access to read an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return bool|WP_Error True if the request has read access for the invoice, WP_Error object otherwise.
+     */
+    public function get_item_permissions_check( $request ) {
 
         // Retrieve the invoice object.
         $invoice = $this->get_post( $request['id'] );
         
         // Ensure it is valid.
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
 
-		if ( $invoice ) {
-			return $this->check_read_permission( $invoice );
-		}
+        if ( $invoice ) {
+            return $this->check_read_permission( $invoice );
+        }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Checks if an invoice can be read.
-	 * 
-	 * An invoice can be read by site admins and owners of the invoice
-	 *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice $invoice WPInv_Invoice object.
-	 * @return bool Whether the post can be read.
-	 */
-	public function check_read_permission( $invoice ) {
-		return wpinv_user_can_view_invoice( $invoice->ID );
+     * Checks if an invoice can be read.
+     * 
+     * An invoice can be read by site admins and owners of the invoice
+     *
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice $invoice WPInv_Invoice object.
+     * @return bool Whether the post can be read.
+     */
+    public function check_read_permission( $invoice ) {
+        return wpinv_user_can_view_invoice( $invoice->ID );
     }
     
     /**
-	 * Retrieves a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item( $request ) {
+     * Retrieves a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item( $request ) {
 
         // Fetch the invoice.
         $invoice = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
-		$response->link_header( 'alternate', esc_url( $invoice->get_view_url() ), array( 'type' => 'text/html' ) );
-
-		/**
-		 * Filters the responses for single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 * @var WP_HTTP_Response
-		 *
-		 * @param WP_HTTP_Response $response Response.
-		 * @param WP_REST_Request  $request The request used.
-		 */
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
+        $response->link_header( 'alternate', esc_url( $invoice->get_view_url() ), array( 'type' => 'text/html' ) );
+
+        /**
+         * Filters the responses for single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         * @var WP_HTTP_Response
+         *
+         * @param WP_HTTP_Response $response Response.
+         * @param WP_REST_Request  $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_get_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
@@ -236,23 +236,23 @@ 
     }
     
     /**
-	 * Checks if a given request has access to create an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
-	 */
-	public function create_item_permissions_check( $request ) {
+     * Checks if a given request has access to create an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
+     */
+    public function create_item_permissions_check( $request ) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
+        $post_type = get_post_type_object( $this->post_type );
 
-		if ( ! current_user_can( $post_type->cap->create_posts ) && ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 
+        if ( ! current_user_can( $post_type->cap->create_posts ) && ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 
                 'rest_cannot_create',
                 __( 'Sorry, you are not allowed to create items as this user.', 'invoicing' ), 
                 array( 
@@ -261,90 +261,90 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Creates a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function create_item( $request ) {
-
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
-
-		$request->set_param( 'context', 'edit' );
-
-		// Prepare the updated data.
-		$invoice_data = $this->prepare_item_for_database( $request );
-
-		if ( is_wp_error( $invoice_data ) ) {
-			return $invoice_data;
-		}
-
-		// Try creating the invoice
-		$invoice_data['post_type']    = $this->post_type;
-		$invoice_data['private_note'] = __( 'Created via API.', 'invoicing' );
+     * Creates a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function create_item( $request ) {
+
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_invoice_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
+
+        $request->set_param( 'context', 'edit' );
+
+        // Prepare the updated data.
+        $invoice_data = $this->prepare_item_for_database( $request );
+
+        if ( is_wp_error( $invoice_data ) ) {
+            return $invoice_data;
+        }
+
+        // Try creating the invoice
+        $invoice_data['post_type']    = $this->post_type;
+        $invoice_data['private_note'] = __( 'Created via API.', 'invoicing' );
         $invoice = wpinv_insert_invoice( $invoice_data, true );
 
-		if ( is_wp_error( $invoice ) ) {
+        if ( is_wp_error( $invoice ) ) {
             return $invoice;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
-
-		/**
-		 * Fires after a single invoice is created or updated via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPinv_Invoice   $invoice  Inserted or updated invoice object.
-		 * @param WP_REST_Request $request  Request object.
-		 * @param bool            $creating True when creating a post, false when updating.
-		 */
-		do_action( "wpinv_rest_insert_invoice", $invoice, $request, true );
-
-		/**
-		 * Filters the responses for creating single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
+
+        /**
+         * Fires after a single invoice is created or updated via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param WPinv_Invoice   $invoice  Inserted or updated invoice object.
+         * @param WP_REST_Request $request  Request object.
+         * @param bool            $creating True when creating a post, false when updating.
+         */
+        do_action( "wpinv_rest_insert_invoice", $invoice, $request, true );
+
+        /**
+         * Filters the responses for creating single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_create_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to update an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
-	 */
-	public function update_item_permissions_check( $request ) {
-
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		$post_type = get_post_type_object( $this->post_type );
-
-		if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to update an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
+     */
+    public function update_item_permissions_check( $request ) {
+
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        $post_type = get_post_type_object( $this->post_type );
+
+        if ( ! current_user_can(  $post_type->cap->edit_post, $invoice->ID  ) ) {
+            return new WP_Error( 
                 'rest_cannot_edit', 
                 __( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
                 array( 
@@ -353,162 +353,162 @@ 
             );
         }
 
-		return true;
-	}
-
-	/**
-	 * Updates a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function update_item( $request ) {
+        return true;
+    }
+
+    /**
+     * Updates a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function update_item( $request ) {
 		
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         $valid_check = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
-			return $valid_check;
-		}
+        if ( is_wp_error( $valid_check ) ) {
+            return $valid_check;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $data_to_update = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $data_to_update ) ) {
-			return $data_to_update;
-		}
+        if ( is_wp_error( $data_to_update ) ) {
+            return $data_to_update;
+        }
 
-		// Abort if no invoice data is provided
+        // Abort if no invoice data is provided
         if( empty( $data_to_update ) ) {
             return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
         }
 
-		// Include the invoice ID
-		$data_to_update['ID'] = $request['id'];
-
-		// Update the invoice
-		$updated_invoice = wpinv_update_invoice( $data_to_update, true );
-
-		// Incase the update operation failed...
-		if ( is_wp_error( $updated_invoice ) ) {
-			return $updated_invoice;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_invoice, $request );
-
-		/** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
-		do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
-
-		/**
-		 * Filters the responses for updating single invoice requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        // Include the invoice ID
+        $data_to_update['ID'] = $request['id'];
+
+        // Update the invoice
+        $updated_invoice = wpinv_update_invoice( $data_to_update, true );
+
+        // Incase the update operation failed...
+        if ( is_wp_error( $updated_invoice ) ) {
+            return $updated_invoice;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $updated_invoice, $request );
+
+        /** This action is documented in includes/class-wpinv-rest-invoice-controller.php */
+        do_action( "wpinv_rest_insert_invoice", $updated_invoice, $request, false );
+
+        /**
+         * Filters the responses for updating single invoice requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_update_invoice_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to delete an invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to delete the invoice, WP_Error object otherwise.
-	 */
-	public function delete_item_permissions_check( $request ) {
-
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
-
-		// Ensure the current user can delete invoices
-		if ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
-			return true;
-		}
-
-		return new WP_Error( 
-			'rest_cannot_delete', 
-			__( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
-			array( 
-				'status' => rest_authorization_required_code(),
-			)
-		);
-	}
-
-	/**
-	 * Deletes a single invoice.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function delete_item( $request ) {
+    }
+
+    /**
+     * Checks if a given request has access to delete an invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to delete the invoice, WP_Error object otherwise.
+     */
+    public function delete_item_permissions_check( $request ) {
+
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
+
+        // Ensure the current user can delete invoices
+        if ( wpinv_current_user_can_manage_invoicing() ||  current_user_can( 'delete_invoices', $request['id'] ) ) {
+            return true;
+        }
+
+        return new WP_Error( 
+            'rest_cannot_delete', 
+            __( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
+            array( 
+                'status' => rest_authorization_required_code(),
+            )
+        );
+    }
+
+    /**
+     * Deletes a single invoice.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function delete_item( $request ) {
 		
-		// Retrieve the invoice.
-		$invoice = $this->get_post( $request['id'] );
-		if ( is_wp_error( $invoice ) ) {
-			return $invoice;
-		}
+        // Retrieve the invoice.
+        $invoice = $this->get_post( $request['id'] );
+        if ( is_wp_error( $invoice ) ) {
+            return $invoice;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the invoice id
-		$id    = $invoice->ID;
+        // Prepare the invoice id
+        $id    = $invoice->ID;
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $invoice, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $invoice, $request );
 
-		// Check if the user wants to bypass the trash...
-		$force_delete = (bool) $request['force'];
+        // Check if the user wants to bypass the trash...
+        $force_delete = (bool) $request['force'];
 
-		// Try deleting the invoice.
-		$deleted = wp_delete_post( $id, $force_delete );
+        // Try deleting the invoice.
+        $deleted = wp_delete_post( $id, $force_delete );
 
-		// Abort early if we can't delete the invoice.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
-		}
+        // Abort early if we can't delete the invoice.
+        if ( ! $deleted ) {
+            return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+        }
 
-		/**
-		 * Fires immediately after a single invoice is deleted or trashed via the REST API.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPInv_Invoice    $invoice  The deleted or trashed invoice.
-		 * @param WP_REST_Request  $request  The request sent to the API.
-		 */
-		do_action( "wpinv_rest_delete_invoice", $invoice, $request );
+        /**
+         * Fires immediately after a single invoice is deleted or trashed via the REST API.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param WPInv_Invoice    $invoice  The deleted or trashed invoice.
+         * @param WP_REST_Request  $request  The request sent to the API.
+         */
+        do_action( "wpinv_rest_delete_invoice", $invoice, $request );
 
-		return $response;
+        return $response;
 
-	}
+    }
     
     
     /**
-	 * Retrieves the query params for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
+     * Retrieves the query params for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
         
         $query_params               = array(
 
@@ -526,11 +526,11 @@ 
 
             // User.
             'user'                  => array(
-				'description'       => __( 'Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Limit result set to items for a specif user. Accepts a user ID, or comma-separated list of IDs', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
-			// Exclude certain users
+            // Exclude certain users
             'exclude_users'  	    => array(
                 'description' 		=> __( 'Exclude items from specific users.', 'invoicing' ),
                 'type'        		=> 'array',
@@ -540,59 +540,59 @@ 
                 'default'     		=> array(),
             ),
 			
-			// Items before.
+            // Items before.
             'before_date'           => array(
-				'description'       => __( 'Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Limit result set to items created before a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
             'meta_key'           => array(
-				'description'       => __( 'Filter items by custom field key.', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Filter items by custom field key.', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
             'meta_compare_key'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_key`.', 'invoicing' ),
-				'type'              => 'string',
-				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
-			),
+                'description'       => __( 'Comparison operator to test the `meta_key`.', 'invoicing' ),
+                'type'              => 'string',
+                'default'              => '=',
+                'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+            ),
 
             'meta_value'           => array(
-				'description'       => __( 'Filter items by custom field value.', 'invoicing' ),
-				'type'              => 'string',
-			),
+                'description'       => __( 'Filter items by custom field value.', 'invoicing' ),
+                'type'              => 'string',
+            ),
 
             'meta_compare'           => array(
-				'description'       => __( 'Comparison operator to test the `meta_value`.', 'invoicing' ),
-				'type'              => 'string',
-				'default'              => '=',
-				'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
-			),
-
-			'meta_value_num'           => array(
-				'description'       => __( 'Filter items by a numeric custom field value.', 'invoicing' ),
-				'type'              => 'integer',
-			),
-
-			// items after.
+                'description'       => __( 'Comparison operator to test the `meta_value`.', 'invoicing' ),
+                'type'              => 'string',
+                'default'              => '=',
+                'enum'        		=> array_map( 'trim', explode( ',', '=, !=, >, >=, <, <=, LIKE NOT, LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP, RLIKE' ) ),
+            ),
+
+            'meta_value_num'           => array(
+                'description'       => __( 'Filter items by a numeric custom field value.', 'invoicing' ),
+                'type'              => 'integer',
+            ),
+
+            // items after.
             'after_date'            => array(
-				'description'       => __( 'Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
-				'type'              => 'string',
+                'description'       => __( 'Limit result set to items created after a specific date. Accepts strtotime()-compatible string.', 'invoicing' ),
+                'type'              => 'string',
             ),
             
             // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of items to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+                'description'       => __( 'Number of items to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => (int) get_option( 'posts_per_page' ),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => 1,
+                'description'       => __( 'Current page to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => 1,
             ),
 
             // limit to certain items
@@ -603,9 +603,9 @@ 
                     'type' => 'integer',
                 ),
                 'default'     => array(),
-			),
+            ),
 			
-			// Exclude certain items
+            // Exclude certain items
             'exclude'  => array(
                 'description' => __( 'Ensure result set excludes specific IDs.', 'invoicing' ),
                 'type'        => 'array',
@@ -624,9 +624,9 @@ 
                     'date',
                     'id',
                     'modified',
-					'title',
-					'meta_value',
-					'meta_value_num'
+                    'title',
+                    'meta_value',
+                    'meta_value_num'
                 ),
             ),
 
@@ -639,932 +639,932 @@ 
             ),
         );
 
-		/**
-		 * Filter collection parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $query_params JSON Schema-formatted collection parameters.
-		 */
-		return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
-	}
+        /**
+         * Filter collection parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param array        $query_params JSON Schema-formatted collection parameters.
+         */
+        return apply_filters( "wpinv_rest_invoices_collection_params", $query_params );
+    }
 	
-	/**
-	 * Retrieves the request query params for the invoices collection.
-	 *
-	 * @since 1.0.15
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Request collection parameters.
-	 */
-	public function get_request_collection_params( $request ) {
+    /**
+     * Retrieves the request query params for the invoices collection.
+     *
+     * @since 1.0.15
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Request collection parameters.
+     */
+    public function get_request_collection_params( $request ) {
 		
-		// Retrieve the list of registered invoice query parameters.
-		$registered = $this->get_collection_params();
+        // Retrieve the list of registered invoice query parameters.
+        $registered = $this->get_collection_params();
 
-		// Default args
-		$args       = array(
+        // Default args
+        $args       = array(
             'status'                => $this->get_post_statuses(),
             'user'                  => null,
             'exclude_users'  	    => array(),
-			'before_date'           => null,
+            'before_date'           => null,
             'meta_key'              => null,
             'meta_compare_key'      => '=',
             'meta_value'            => null,
             'meta_compare'          => '=',
-			'meta_value_num'        => null,
+            'meta_value_num'        => null,
             'after_date'            => null,
             'limit'                 => (int) get_option( 'posts_per_page' ),
-			'page'     				=> 1,
-			'include'				=> array(),
+            'page'     				=> 1,
+            'include'				=> array(),
             'exclude'  				=> array(),
             'orderby'  		  		=> 'date',
             'order'    				=> 'DESC',
-		);
+        );
 
-		// Add any params from the requests.
-		foreach ( array_keys( $registered ) as $key ) {
+        // Add any params from the requests.
+        foreach ( array_keys( $registered ) as $key ) {
             if ( isset( $request[ $key] ) ) {
                 $args[ $key ] = $request[ $key];
             }
         }
 		
-		/**
-		 * Filters the requests collection parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.15
-		 *
-		 * @param array           $args    Request query args.
-		 * @param WP_REST_Request $request Full details about the request.
-		 */
-		return apply_filters( "wpinv_rest_invoices_collection_request_params", $args, $request );
-	}
+        /**
+         * Filters the requests collection parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.15
+         *
+         * @param array           $args    Request query args.
+         * @param WP_REST_Request $request Full details about the request.
+         */
+        return apply_filters( "wpinv_rest_invoices_collection_request_params", $args, $request );
+    }
 	
-	/**
-	 * Retrieves the WP_Query params for the invoices collection.
-	 *
-	 * @since 1.0.15
-	 * @param array           $args Request args.
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array WP_Query parameters.
-	 */
-	public function get_collection_wp_query_params( $args, $request ) {
+    /**
+     * Retrieves the WP_Query params for the invoices collection.
+     *
+     * @since 1.0.15
+     * @param array           $args Request args.
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array WP_Query parameters.
+     */
+    public function get_collection_wp_query_params( $args, $request ) {
 		
-		// Prepare the parameters.
-		$wp_query_args = array(
-			'post_type'        => $this->post_type,
-			'post_status'      => $args['status'],
-			'author'           => $args['user'],
-			'author__not_in'   => $args['exclude_users'],
-			'posts_per_page'   => $args['limit'],
-			'paged'            => $args['page'],
-			'meta_key'         => $args['meta_key'],
-			'meta_compare_key' => $args['meta_compare_key'],
-			'meta_value'       => $args['meta_value'],
-			'meta_compare'     => $args['meta_compare'],
-			'meta_value_num'   => $args['meta_value_num'],
-			'post__in'         => $args['include'],
-			'post__in'         => $args['exclude'],
-			'date_query'       => array( array() ),
-			'fields'           => 'ids',
-			'orderby'          => $args['orderby'],
-			'order'            => $args['order'],
-		);
-
-		// Only admins can view other user's invoices.
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			$wp_query_args['author'] = get_current_user_id();
-		}
-
-		// No date specific params provided.
-		if ( empty( $args['before_date'] ) && empty( $args['after_date'] ) ) {
-			unset( $wp_query_args['date_query'] );
-		}
-
-		if ( ! empty( $args['before_date'] ) ) {
-			$wp_query_args['date_query'][0]['before'] = $args['before_date'];
-		}
-
-		if ( ! empty( $args['after_date'] ) ) {
-			$wp_query_args['date_query'][0]['after'] = $args['after_date'];
-		}
-
-		// Remove empty variables.
-		$wp_query_args = array_filter( $wp_query_args );
-
-		// This can be zero.
-		if ( ! is_null( $args['meta_value_num'] ) ) {
-			$wp_query_args['meta_value_num'] = $args['meta_value_num'];
-		}
+        // Prepare the parameters.
+        $wp_query_args = array(
+            'post_type'        => $this->post_type,
+            'post_status'      => $args['status'],
+            'author'           => $args['user'],
+            'author__not_in'   => $args['exclude_users'],
+            'posts_per_page'   => $args['limit'],
+            'paged'            => $args['page'],
+            'meta_key'         => $args['meta_key'],
+            'meta_compare_key' => $args['meta_compare_key'],
+            'meta_value'       => $args['meta_value'],
+            'meta_compare'     => $args['meta_compare'],
+            'meta_value_num'   => $args['meta_value_num'],
+            'post__in'         => $args['include'],
+            'post__in'         => $args['exclude'],
+            'date_query'       => array( array() ),
+            'fields'           => 'ids',
+            'orderby'          => $args['orderby'],
+            'order'            => $args['order'],
+        );
+
+        // Only admins can view other user's invoices.
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            $wp_query_args['author'] = get_current_user_id();
+        }
+
+        // No date specific params provided.
+        if ( empty( $args['before_date'] ) && empty( $args['after_date'] ) ) {
+            unset( $wp_query_args['date_query'] );
+        }
+
+        if ( ! empty( $args['before_date'] ) ) {
+            $wp_query_args['date_query'][0]['before'] = $args['before_date'];
+        }
+
+        if ( ! empty( $args['after_date'] ) ) {
+            $wp_query_args['date_query'][0]['after'] = $args['after_date'];
+        }
+
+        // Remove empty variables.
+        $wp_query_args = array_filter( $wp_query_args );
+
+        // This can be zero.
+        if ( ! is_null( $args['meta_value_num'] ) ) {
+            $wp_query_args['meta_value_num'] = $args['meta_value_num'];
+        }
 		
-		/**
-		 * Filters the invoices collection WP_Query parameters for the invoices controller.
-		 *
-		 *
-		 * @since 1.0.15
-		 *
-		 * @param array           $args          Request args.
-		 * @param array           $wp_query_args Generated WP_Query args args.
-		 * @param WP_REST_Request $request       Full details about the request.
-		 */
-		return apply_filters( "wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request );
+        /**
+         * Filters the invoices collection WP_Query parameters for the invoices controller.
+         *
+         *
+         * @since 1.0.15
+         *
+         * @param array           $args          Request args.
+         * @param array           $wp_query_args Generated WP_Query args args.
+         * @param WP_REST_Request $request       Full details about the request.
+         */
+        return apply_filters( "wpinv_rest_invoices_collection_wp_query_params", $wp_query_args, $args, $request );
     }
     
     /**
-	 * Checks if a given post type can be viewed or managed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param object|string $post_type Post type name or object.
-	 * @return bool Whether the post type is allowed in REST.
-	 */
-	protected function check_is_post_type_allowed( $post_type ) {
-		return true;
-	}
-
-	/**
-	 * Prepares a single invoice for create or update.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array|WP_Error Invoice Properties or WP_Error.
-	 */
-	protected function prepare_item_for_database( $request ) {
-		$prepared_invoice = new stdClass();
-
-		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_invoice = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_invoice ) ) {
-				return $existing_invoice;
-			}
-
-			$prepared_invoice->ID 		  = $existing_invoice->ID;
-			$prepared_invoice->invoice_id = $existing_invoice->ID;
-		}
-
-		$schema = $this->get_item_schema();
-
-		// Invoice owner.
-		if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
-			$prepared_invoice->user_id = (int) $request['user_id'];
-		}
-
-		// Cart details.
-		if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
-			$prepared_invoice->cart_details = (array) $request['cart_details'];
-		}
-
-		// Invoice status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
-
-			if ( in_array( $request['status'], $this->get_post_statuses(), true ) ) {
-				$prepared_invoice->status = $request['status'];
-			}
-
-		}
-
-		// User info
-		if ( ! empty( $schema['properties']['user_info'] ) && isset( $request['user_info'] ) ) {
-			$prepared_invoice->user_info = array();
-			$user_info = (array) $request['user_info'];
-
-			foreach( $user_info as $prop => $value ) {
-
-				if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
-
-					$prepared_invoice->user_info[$prop] = $value;
+     * Checks if a given post type can be viewed or managed.
+     *
+     * @since 1.0.13
+     *
+     * @param object|string $post_type Post type name or object.
+     * @return bool Whether the post type is allowed in REST.
+     */
+    protected function check_is_post_type_allowed( $post_type ) {
+        return true;
+    }
+
+    /**
+     * Prepares a single invoice for create or update.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array|WP_Error Invoice Properties or WP_Error.
+     */
+    protected function prepare_item_for_database( $request ) {
+        $prepared_invoice = new stdClass();
+
+        // Post ID.
+        if ( isset( $request['id'] ) ) {
+            $existing_invoice = $this->get_post( $request['id'] );
+            if ( is_wp_error( $existing_invoice ) ) {
+                return $existing_invoice;
+            }
+
+            $prepared_invoice->ID 		  = $existing_invoice->ID;
+            $prepared_invoice->invoice_id = $existing_invoice->ID;
+        }
+
+        $schema = $this->get_item_schema();
+
+        // Invoice owner.
+        if ( ! empty( $schema['properties']['user_id'] ) && isset( $request['user_id'] ) ) {
+            $prepared_invoice->user_id = (int) $request['user_id'];
+        }
+
+        // Cart details.
+        if ( ! empty( $schema['properties']['cart_details'] ) && isset( $request['cart_details'] ) ) {
+            $prepared_invoice->cart_details = (array) $request['cart_details'];
+        }
+
+        // Invoice status.
+        if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+
+            if ( in_array( $request['status'], $this->get_post_statuses(), true ) ) {
+                $prepared_invoice->status = $request['status'];
+            }
+
+        }
+
+        // User info
+        if ( ! empty( $schema['properties']['user_info'] ) && isset( $request['user_info'] ) ) {
+            $prepared_invoice->user_info = array();
+            $user_info = (array) $request['user_info'];
+
+            foreach( $user_info as $prop => $value ) {
+
+                if ( ! empty( $schema['properties']['user_info']['properties'][$prop] ) ) {
+
+                    $prepared_invoice->user_info[$prop] = $value;
 		
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		// IP
-		if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
-			$prepared_invoice->ip = $request['ip'];
-		}
+        // IP
+        if ( ! empty( $schema['properties']['ip'] ) && isset( $request['ip'] ) ) {
+            $prepared_invoice->ip = $request['ip'];
+        }
 
-		// Payment details
-		$prepared_invoice->payment_details = array();
+        // Payment details
+        $prepared_invoice->payment_details = array();
 
-		if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
-			$prepared_invoice->payment_details['gateway'] = $request['gateway'];
-		}
+        if ( ! empty( $schema['properties']['gateway'] ) && isset( $request['gateway'] ) ) {
+            $prepared_invoice->payment_details['gateway'] = $request['gateway'];
+        }
 
-		if ( ! empty( $schema['properties']['gateway_title'] ) && isset( $request['gateway_title'] ) ) {
-			$prepared_invoice->payment_details['gateway_title'] = $request['gateway_title'];
-		}
+        if ( ! empty( $schema['properties']['gateway_title'] ) && isset( $request['gateway_title'] ) ) {
+            $prepared_invoice->payment_details['gateway_title'] = $request['gateway_title'];
+        }
 
-		if ( ! empty( $schema['properties']['currency'] ) && isset( $request['currency'] ) ) {
-			$prepared_invoice->payment_details['currency'] = $request['currency'];
-		}
+        if ( ! empty( $schema['properties']['currency'] ) && isset( $request['currency'] ) ) {
+            $prepared_invoice->payment_details['currency'] = $request['currency'];
+        }
 
-		if ( ! empty( $schema['properties']['transaction_id'] ) && isset( $request['transaction_id'] ) ) {
-			$prepared_invoice->payment_details['transaction_id'] = $request['transaction_id'];
-		}
+        if ( ! empty( $schema['properties']['transaction_id'] ) && isset( $request['transaction_id'] ) ) {
+            $prepared_invoice->payment_details['transaction_id'] = $request['transaction_id'];
+        }
 
-		// Dates
-		if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
-			$post_date = rest_get_date_with_gmt( $request['date'] );
+        // Dates
+        if ( ! empty( $schema['properties']['date'] ) && isset( $request['date'] ) ) {
+            $post_date = rest_get_date_with_gmt( $request['date'] );
 
-			if ( ! empty( $post_date ) ) {
-				$prepared_invoice->post_date = $post_date[0];
-			}
+            if ( ! empty( $post_date ) ) {
+                $prepared_invoice->post_date = $post_date[0];
+            }
 			
-		}
+        }
 
-		if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
-			$due_date = rest_get_date_with_gmt( $request['due_date'] );
+        if ( ! empty( $schema['properties']['due_date'] ) && isset( $request['due_date'] ) ) {
+            $due_date = rest_get_date_with_gmt( $request['due_date'] );
 
-			if ( ! empty( $due_date ) ) {
-				$prepared_invoice->due_date = $due_date[0];
-			}
+            if ( ! empty( $due_date ) ) {
+                $prepared_invoice->due_date = $due_date[0];
+            }
 
-		}
+        }
 
-		if ( ! empty( $schema['properties']['valid_until'] ) && isset( $request['valid_until'] ) ) {
+        if ( ! empty( $schema['properties']['valid_until'] ) && isset( $request['valid_until'] ) ) {
 
-			if ( ! empty( $request['valid_until'] ) ) {
-				$prepared_invoice->valid_until = gmdate( 'Y-m-d', strtotime( $request['valid_until'] ) );
-			} else {
-				$prepared_invoice->valid_until = '';
-			}
+            if ( ! empty( $request['valid_until'] ) ) {
+                $prepared_invoice->valid_until = gmdate( 'Y-m-d', strtotime( $request['valid_until'] ) );
+            } else {
+                $prepared_invoice->valid_until = '';
+            }
 
-		}
+        }
 
-		$invoice_data = (array) wp_unslash( $prepared_invoice );
+        $invoice_data = (array) wp_unslash( $prepared_invoice );
 
-		/**
-		 * Filters an invoice before it is inserted via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $invoice_data An array of invoice data
-		 * @param WP_REST_Request $request       Request object.
-		 */
-		return apply_filters( "wpinv_rest_pre_insert_invoice", $invoice_data, $request );
+        /**
+         * Filters an invoice before it is inserted via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param array        $invoice_data An array of invoice data
+         * @param WP_REST_Request $request       Request object.
+         */
+        return apply_filters( "wpinv_rest_pre_insert_invoice", $invoice_data, $request );
 
-	}
+    }
 
-	/**
-	 * Prepares a single invoice output for response.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice   $invoice    Invoice object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $invoice, $request ) {
+    /**
+     * Prepares a single invoice output for response.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice   $invoice    Invoice object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response Response object.
+     */
+    public function prepare_item_for_response( $invoice, $request ) {
 
-		$GLOBALS['post'] = get_post( $invoice->ID );
+        $GLOBALS['post'] = get_post( $invoice->ID );
 
-		setup_postdata( $invoice->ID );
+        setup_postdata( $invoice->ID );
 
-		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+        // Fetch the fields to include in this response.
+        $fields = $this->get_fields_for_response( $request );
 
-		// Base fields for every invoice.
-		$data = array();
+        // Base fields for every invoice.
+        $data = array();
 
-		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $invoice->ID;
-		}
+        // Set up ID
+        if ( rest_is_field_included( 'id', $fields ) ) {
+            $data['id'] = $invoice->ID;
+        }
 
 
-		// Basic properties
-		$invoice_properties = array(
-			'title', 'email', 'ip', 
-			'key', 'number', 'transaction_id', 'mode',
-			'gateway', 'gateway_title',
-			'total', 'discount', 'discount_code', 
-			'tax', 'fees_total', 'subtotal', 'currency',
-			'status', 'status_nicename', 'post_type'
-		);
-
-		foreach( $invoice_properties as $property ) {
+        // Basic properties
+        $invoice_properties = array(
+            'title', 'email', 'ip', 
+            'key', 'number', 'transaction_id', 'mode',
+            'gateway', 'gateway_title',
+            'total', 'discount', 'discount_code', 
+            'tax', 'fees_total', 'subtotal', 'currency',
+            'status', 'status_nicename', 'post_type'
+        );
 
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $invoice->get( $property );
-			}
-
-		}
-
-		// Valid until
-		if ( rest_is_field_included( 'valid_until', $fields ) && $this->post_type === 'wpi_quote' ) {
-			$data['valid_until'] = get_post_meta( $invoice->ID, 'wpinv_quote_valid_until', true );
-		}
-
-		// Cart details
-		if ( rest_is_field_included( 'cart_details', $fields ) ) {
-			$data['cart_details'] = $invoice->get( 'cart_details' );
-		}
-
-		//Dates
-		$invoice_properties = array( 'date', 'due_date', 'completed_date' );
-
-		foreach( $invoice_properties as $property ) {
-
-			if ( rest_is_field_included( $property, $fields ) ) {
-				$data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
-			}
-
-		}
-
-		// User id
-		if ( rest_is_field_included( 'user_id', $fields ) ) {
-			$data['user_id'] = (int) $invoice->get( 'user_id' );
-		}
-
-		// User info
-		$user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
-
-		foreach( $user_info as $property ) {
-
-			if ( rest_is_field_included( "user_info.$property", $fields ) ) {
-				$data['user_info'][$property] = $invoice->get( $property );
-			}
-
-		}
-
-		// Slug
-		if ( rest_is_field_included( 'slug', $fields ) ) {
-			$data['slug'] = $invoice->get( 'post_name' );
-		}
-
-		// View invoice link
-		if ( rest_is_field_included( 'link', $fields ) ) {
-			$data['link'] = esc_url( $invoice->get_view_url() );
-		}
-
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		$links = $this->prepare_links( $invoice );
-		$response->add_links( $links );
-
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $invoice, $request );
-
-			$self = $links['self']['href'];
-
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
-			}
-		}
-
-		/**
-		 * Filters the invoice data for a response.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_REST_Response $response The response object.
-		 * @param WPInv_Invoice    $invoice  The invoice object.
-		 * @param WP_REST_Request  $request  Request object.
-		 */
-		return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
-	}
-
-	/**
-	 * Gets an array of fields to be included on the response.
-	 *
-	 * Included fields are based on item schema and `_fields=` request argument.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Fields to be included in the response.
-	 */
-	public function get_fields_for_response( $request ) {
-		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
-
-		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
-			// For back-compat, include any field with an empty schema
-			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
-			}
-		}
-
-		// Exclude fields that specify a different context than the request context.
-		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
-				}
-			}
-		}
-
-		$fields = array_keys( $properties );
-
-		if ( ! isset( $request['_fields'] ) ) {
-			return $fields;
-		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
-			return $fields;
-		}
-		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
-		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
-			$requested_fields[] = 'id';
-		}
-		// Return the list of all requested fields which appear in the schema.
-		return array_reduce(
-			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
-					$response_fields[] = $field;
-					return $response_fields;
-				}
-				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
-				// A nested field is included so long as its top-level property is
-				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
-					$response_fields[] = $field;
-				}
-				return $response_fields;
-			},
-			array()
-		);
-	}
-
-	/**
-	 * Retrieves the invoice's schema, conforming to JSON Schema.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Invoice schema data.
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->post_type,
-			'type'       => 'object',
-
-			// Base properties for every Invoice.
-			'properties' 		  => array(
-
-				'title'			  => array(
-					'description' => __( 'The title for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'user_id'		  => array(
-					'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'email'		  	  => array(
-					'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'ip'			  => array(
-					'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'user_info'       => array(
-					'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
-					'type'        => 'object',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'properties'  => array(
-
-						'first_name'      => array(
-							'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'last_name'       => array(
-							'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'company'         => array(
-							'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'vat_number'      => array(
-							'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'vat_rate'        => array(
-							'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'address'        => array(
-							'description' => __( 'The address of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'city'            => array(
-							'description' => __( 'The city of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'country'         => array(
-							'description' => __( 'The country of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'state'           => array(
-							'description' => __( 'The state of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'zip'             => array(
-							'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-
-						'phone'             => array(
-							'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
-							'type'        => 'string',
-							'context'     => array( 'view', 'edit', 'embed' ),
-						),
-					),
-				),
-
-				'id'           => array(
-					'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'key'			  => array(
-					'description' => __( 'A unique key for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'number'		  => array(
-					'description' => __( 'The invoice number.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'transaction_id'  => array(
-					'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'gateway'		  => array(
-					'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'gateway_title'	  => array(
-					'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'total'	  		  => array(
-					'description' => __( 'The total amount of the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'discount'		  => array(
-					'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'discount_code'	  => array(
-					'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'tax'	  		  => array(
-					'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'fees_total'	  => array(
-					'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'subtotal'	  	  => array(
-					'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'currency'	  	  => array(
-					'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'cart_details'	  => array(
-					'description' => __( 'The cart details for invoice.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'required'	  => true,
-				),
-
-				'date'         => array(
-					'description' => __( "The date the invoice was published, in the site's timezone.", 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'due_date'     => array(
-					'description' => __( 'The due date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'completed_date'  => array(
-					'description' => __( 'The completed date for the invoice.', 'invoicing' ),
-					'type'        => array( 'string', 'null' ),
-					'format'      => 'date-time',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
+        foreach( $invoice_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $invoice->get( $property );
+            }
+
+        }
+
+        // Valid until
+        if ( rest_is_field_included( 'valid_until', $fields ) && $this->post_type === 'wpi_quote' ) {
+            $data['valid_until'] = get_post_meta( $invoice->ID, 'wpinv_quote_valid_until', true );
+        }
+
+        // Cart details
+        if ( rest_is_field_included( 'cart_details', $fields ) ) {
+            $data['cart_details'] = $invoice->get( 'cart_details' );
+        }
+
+        //Dates
+        $invoice_properties = array( 'date', 'due_date', 'completed_date' );
+
+        foreach( $invoice_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) ) {
+                $data[$property] = $this->prepare_date_response( '0000-00-00 00:00:00', $invoice->get( $property ) );
+            }
+
+        }
+
+        // User id
+        if ( rest_is_field_included( 'user_id', $fields ) ) {
+            $data['user_id'] = (int) $invoice->get( 'user_id' );
+        }
+
+        // User info
+        $user_info = array( 'first_name', 'last_name', 'company', 'vat_number', 'vat_rate', 'address', 'city', 'country', 'state', 'zip', 'phone' );
+
+        foreach( $user_info as $property ) {
+
+            if ( rest_is_field_included( "user_info.$property", $fields ) ) {
+                $data['user_info'][$property] = $invoice->get( $property );
+            }
+
+        }
+
+        // Slug
+        if ( rest_is_field_included( 'slug', $fields ) ) {
+            $data['slug'] = $invoice->get( 'post_name' );
+        }
+
+        // View invoice link
+        if ( rest_is_field_included( 'link', $fields ) ) {
+            $data['link'] = esc_url( $invoice->get_view_url() );
+        }
+
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+
+        $links = $this->prepare_links( $invoice );
+        $response->add_links( $links );
+
+        if ( ! empty( $links['self']['href'] ) ) {
+            $actions = $this->get_available_actions( $invoice, $request );
+
+            $self = $links['self']['href'];
+
+            foreach ( $actions as $rel ) {
+                $response->add_link( $rel, $self );
+            }
+        }
+
+        /**
+         * Filters the invoice data for a response.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_REST_Response $response The response object.
+         * @param WPInv_Invoice    $invoice  The invoice object.
+         * @param WP_REST_Request  $request  Request object.
+         */
+        return apply_filters( "wpinv_rest_prepare_invoice", $response, $invoice, $request );
+    }
+
+    /**
+     * Gets an array of fields to be included on the response.
+     *
+     * Included fields are based on item schema and `_fields=` request argument.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Fields to be included in the response.
+     */
+    public function get_fields_for_response( $request ) {
+        $schema     = $this->get_item_schema();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+
+        $additional_fields = $this->get_additional_fields();
+        foreach ( $additional_fields as $field_name => $field_options ) {
+            // For back-compat, include any field with an empty schema
+            // because it won't be present in $this->get_item_schema().
+            if ( is_null( $field_options['schema'] ) ) {
+                $properties[ $field_name ] = $field_options;
+            }
+        }
+
+        // Exclude fields that specify a different context than the request context.
+        $context = $request['context'];
+        if ( $context ) {
+            foreach ( $properties as $name => $options ) {
+                if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
+                    unset( $properties[ $name ] );
+                }
+            }
+        }
+
+        $fields = array_keys( $properties );
+
+        if ( ! isset( $request['_fields'] ) ) {
+            return $fields;
+        }
+        $requested_fields = wpinv_parse_list( $request['_fields'] );
+        if ( 0 === count( $requested_fields ) ) {
+            return $fields;
+        }
+        // Trim off outside whitespace from the comma delimited list.
+        $requested_fields = array_map( 'trim', $requested_fields );
+        // Always persist 'id', because it can be needed for add_additional_fields_to_object().
+        if ( in_array( 'id', $fields, true ) ) {
+            $requested_fields[] = 'id';
+        }
+        // Return the list of all requested fields which appear in the schema.
+        return array_reduce(
+            $requested_fields,
+            function( $response_fields, $field ) use ( $fields ) {
+                if ( in_array( $field, $fields, true ) ) {
+                    $response_fields[] = $field;
+                    return $response_fields;
+                }
+                // Check for nested fields if $field is not a direct match.
+                $nested_fields = explode( '.', $field );
+                // A nested field is included so long as its top-level property is
+                // present in the schema.
+                if ( in_array( $nested_fields[0], $fields, true ) ) {
+                    $response_fields[] = $field;
+                }
+                return $response_fields;
+            },
+            array()
+        );
+    }
+
+    /**
+     * Retrieves the invoice's schema, conforming to JSON Schema.
+     *
+     * @since 1.0.13
+     *
+     * @return array Invoice schema data.
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if ( $this->schema ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+
+            // Base properties for every Invoice.
+            'properties' 		  => array(
+
+                'title'			  => array(
+                    'description' => __( 'The title for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'user_id'		  => array(
+                    'description' => __( 'The ID of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'email'		  	  => array(
+                    'description' => __( 'The email of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'ip'			  => array(
+                    'description' => __( 'The IP of the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'user_info'       => array(
+                    'description' => __( 'Information about the owner of the invoice.', 'invoicing' ),
+                    'type'        => 'object',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'properties'  => array(
+
+                        'first_name'      => array(
+                            'description' => __( 'The first name of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'last_name'       => array(
+                            'description' => __( 'The last name of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'company'         => array(
+                            'description' => __( 'The company of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'vat_number'      => array(
+                            'description' => __( 'The VAT number of the owner of the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'vat_rate'        => array(
+                            'description' => __( 'The VAT rate applied on the invoice.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'address'        => array(
+                            'description' => __( 'The address of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'city'            => array(
+                            'description' => __( 'The city of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'country'         => array(
+                            'description' => __( 'The country of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'state'           => array(
+                            'description' => __( 'The state of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'zip'             => array(
+                            'description' => __( 'The zip code of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+
+                        'phone'             => array(
+                            'description' => __( 'The phone number of the invoice owner.', 'invoicing' ),
+                            'type'        => 'string',
+                            'context'     => array( 'view', 'edit', 'embed' ),
+                        ),
+                    ),
+                ),
+
+                'id'           => array(
+                    'description' => __( 'Unique identifier for the invoice.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'key'			  => array(
+                    'description' => __( 'A unique key for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'number'		  => array(
+                    'description' => __( 'The invoice number.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'transaction_id'  => array(
+                    'description' => __( 'The transaction id of the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'gateway'		  => array(
+                    'description' => __( 'The gateway used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'gateway_title'	  => array(
+                    'description' => __( 'The title of the gateway used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'total'	  		  => array(
+                    'description' => __( 'The total amount of the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'discount'		  => array(
+                    'description' => __( 'The discount applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'discount_code'	  => array(
+                    'description' => __( 'The discount code applied to the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'tax'	  		  => array(
+                    'description' => __( 'The tax applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'fees_total'	  => array(
+                    'description' => __( 'The total fees applied to the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'subtotal'	  	  => array(
+                    'description' => __( 'The sub-total for the invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'currency'	  	  => array(
+                    'description' => __( 'The currency used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'cart_details'	  => array(
+                    'description' => __( 'The cart details for invoice.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'required'	  => true,
+                ),
+
+                'date'         => array(
+                    'description' => __( "The date the invoice was published, in the site's timezone.", 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'due_date'     => array(
+                    'description' => __( 'The due date for the invoice.', 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'completed_date'  => array(
+                    'description' => __( 'The completed date for the invoice.', 'invoicing' ),
+                    'type'        => array( 'string', 'null' ),
+                    'format'      => 'date-time',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
 				
-				'link'         => array(
-					'description' => __( 'URL to the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'format'      => 'uri',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'mode'       	  => array(
-					'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array( 'live', 'test' ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'slug'       	  => array(
-					'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'arg_options' => array(
-						'sanitize_callback' => array( $this, 'sanitize_slug' ),
-					),
-					'readonly'    => true,
-				),
-
-				'status'       	  => array(
-					'description' => __( 'A named status for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => $this->get_post_statuses(),
-					'context'     => array( 'view', 'edit' ),
-					'default'	  => 'wpi-pending',
-				),
-
-				'status_nicename' => array(
-					'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'post_type'       => array(
-					'description' => __( 'The post type for the invoice.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		// Add helpful links to the invoice schem.
-		$schema['links'] = $this->get_schema_links();
-
-		/**
-		 * Filters the invoice schema for the REST API.
-		 *
-		 * Enables adding extra properties to invoices.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $schema    The invoice schema.
-		 */
+                'link'         => array(
+                    'description' => __( 'URL to the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'format'      => 'uri',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'mode'       	  => array(
+                    'description' => __( 'The mode used to process the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array( 'live', 'test' ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'slug'       	  => array(
+                    'description' => __( 'An alphanumeric identifier for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'arg_options' => array(
+                        'sanitize_callback' => array( $this, 'sanitize_slug' ),
+                    ),
+                    'readonly'    => true,
+                ),
+
+                'status'       	  => array(
+                    'description' => __( 'A named status for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => $this->get_post_statuses(),
+                    'context'     => array( 'view', 'edit' ),
+                    'default'	  => 'wpi-pending',
+                ),
+
+                'status_nicename' => array(
+                    'description' => __( 'A human-readable status name for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'post_type'       => array(
+                    'description' => __( 'The post type for the invoice.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        // Add helpful links to the invoice schem.
+        $schema['links'] = $this->get_schema_links();
+
+        /**
+         * Filters the invoice schema for the REST API.
+         *
+         * Enables adding extra properties to invoices.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $schema    The invoice schema.
+         */
         $schema = apply_filters( "wpinv_rest_invoice_schema", $schema );
 
-		// Cache the invoice schema.
-		$this->schema = $schema;
+        // Cache the invoice schema.
+        $this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-
-	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array
-	 */
-	protected function get_schema_links() {
-
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
-
-		$links = array();
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can mark this invoice as completed.', 'invoicing' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties' => array(
-					'status' => array(
-						'type' => 'string',
-						'enum' => array( 'publish', 'wpi-renewal' ),
-					),
-				),
-			),
-		);
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-assign-author',
-			'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties'   => array(
-					'user_id'  => array(
-						'type' => 'integer',
-					),
-				),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepares links for the request.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice $invoice Invoice Object.
-	 * @return array Links for the given invoice.
-	 */
-	protected function prepare_links( $invoice ) {
-
-		// Prepare the base REST API endpoint for invoices.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-		// Entity meta.
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
-			),
-			'collection' => array(
-				'href' => rest_url( $base ),
-			),
-		);
-
-		if ( ! empty( $invoice->user_id ) ) {
-			$links['user'] = array(
-				'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
-				'embeddable' => true,
-			);
-		}
-
-		/**
-		 * Filters the returned invoice links for the REST API.
-		 *
-		 * Enables adding extra links to invoice API responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $links    Rest links.
-		 */
-		return apply_filters( "wpinv_rest_invoice_links", $links );
-
-	}
-
-	/**
-	 * Get the link relations available for the post and current user.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Invoice   $invoice    Invoice object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array List of link relations.
-	 */
-	protected function get_available_actions( $invoice, $request ) {
-
-		if ( 'edit' !== $request['context'] ) {
-			return array();
-		}
-
-		$rels = array();
-
-		// Retrieve the post type object.
-		$post_type = get_post_type_object( $invoice->post_type );
-
-		// Mark invoice as completed.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
-			$rels[] = 'https://api.w.org/action-publish';
-		}
-
-		// Change the owner of the invoice.
-		if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
-			$rels[] = 'https://api.w.org/action-assign-author';
-		}
-
-		/**
-		 * Filters the available invoice link relations for the REST API.
-		 *
-		 * Enables adding extra link relation for the current user and request to invoice responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $rels    Available link relations.
-		 */
-		return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
-	}
-
-	/**
-	 * Sanitizes and validates the list of post statuses.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string|array    $statuses  One or more post statuses.
-	 * @param WP_REST_Request $request   Full details about the request.
-	 * @param string          $parameter Additional parameter to pass to validation.
-	 * @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
-	 */
-	public function sanitize_post_statuses( $statuses, $request, $parameter ) {
-		return array_intersect( wp_parse_slug_list( $statuses ), $this->get_post_statuses() );
-	}
-
-	/**
-	 * Retrieves a valid list of post statuses.
-	 *
-	 * @since 1.0.15
-	 *
-	 * @return array A list of registered item statuses.
-	 */
-	public function get_post_statuses() {
-		return array_keys( wpinv_get_invoice_statuses( true, true ) );
-	}
+        return $this->add_additional_fields_schema( $this->schema );
+    }
+
+    /**
+     * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array
+     */
+    protected function get_schema_links() {
+
+        $href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+
+        $links = array();
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-publish',
+            'title'        => __( 'The current user can mark this invoice as completed.', 'invoicing' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties' => array(
+                    'status' => array(
+                        'type' => 'string',
+                        'enum' => array( 'publish', 'wpi-renewal' ),
+                    ),
+                ),
+            ),
+        );
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-assign-author',
+            'title'        => __( 'The current user can change the owner of this invoice.', 'invoicing' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties'   => array(
+                    'user_id'  => array(
+                        'type' => 'integer',
+                    ),
+                ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepares links for the request.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice $invoice Invoice Object.
+     * @return array Links for the given invoice.
+     */
+    protected function prepare_links( $invoice ) {
+
+        // Prepare the base REST API endpoint for invoices.
+        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+        // Entity meta.
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( trailingslashit( $base ) . $invoice->ID ),
+            ),
+            'collection' => array(
+                'href' => rest_url( $base ),
+            ),
+        );
+
+        if ( ! empty( $invoice->user_id ) ) {
+            $links['user'] = array(
+                'href'       => rest_url( 'wp/v2/users/' . $invoice->user_id ),
+                'embeddable' => true,
+            );
+        }
+
+        /**
+         * Filters the returned invoice links for the REST API.
+         *
+         * Enables adding extra links to invoice API responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $links    Rest links.
+         */
+        return apply_filters( "wpinv_rest_invoice_links", $links );
+
+    }
+
+    /**
+     * Get the link relations available for the post and current user.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Invoice   $invoice    Invoice object.
+     * @param WP_REST_Request $request Request object.
+     * @return array List of link relations.
+     */
+    protected function get_available_actions( $invoice, $request ) {
+
+        if ( 'edit' !== $request['context'] ) {
+            return array();
+        }
+
+        $rels = array();
+
+        // Retrieve the post type object.
+        $post_type = get_post_type_object( $invoice->post_type );
+
+        // Mark invoice as completed.
+        if ( current_user_can( $post_type->cap->publish_posts ) ) {
+            $rels[] = 'https://api.w.org/action-publish';
+        }
+
+        // Change the owner of the invoice.
+        if ( current_user_can( $post_type->cap->edit_others_posts ) ) {
+            $rels[] = 'https://api.w.org/action-assign-author';
+        }
+
+        /**
+         * Filters the available invoice link relations for the REST API.
+         *
+         * Enables adding extra link relation for the current user and request to invoice responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $rels    Available link relations.
+         */
+        return apply_filters( "wpinv_rest_invoice_link_relations", $rels );
+    }
+
+    /**
+     * Sanitizes and validates the list of post statuses.
+     *
+     * @since 1.0.13
+     *
+     * @param string|array    $statuses  One or more post statuses.
+     * @param WP_REST_Request $request   Full details about the request.
+     * @param string          $parameter Additional parameter to pass to validation.
+     * @return array|WP_Error A list of valid statuses, otherwise WP_Error object.
+     */
+    public function sanitize_post_statuses( $statuses, $request, $parameter ) {
+        return array_intersect( wp_parse_slug_list( $statuses ), $this->get_post_statuses() );
+    }
+
+    /**
+     * Retrieves a valid list of post statuses.
+     *
+     * @since 1.0.15
+     *
+     * @return array A list of registered item statuses.
+     */
+    public function get_post_statuses() {
+        return array_keys( wpinv_get_invoice_statuses( true, true ) );
+    }
     
 }
\ No newline at end of file

includes/class-wpinv-api.php

Indentation +15 added lines, -15 removed lines

@@ -58,14 +58,14 @@ 
     }
 
 
-	/**
-	 * Registers routes
-	 *
+    /**
+     * Registers routes
+     *
      * @since 1.0.13
-	 */
-	public function register_rest_routes() {
+     */
+    public function register_rest_routes() {
 
-		// Invoices.
+        // Invoices.
         $this->invoices_controller->register_routes();
         
         // Items.
@@ -75,15 +75,15 @@ 
         $this->discounts_controller->register_routes();
 
         /**
-		 * Fires when registering Invoicing REST routes.
-		 *
-		 *
-		 * @since 1.0.15
-		 *
-		 *
-		 * @param array           $invoice_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+         * Fires when registering Invoicing REST routes.
+         *
+         *
+         * @since 1.0.15
+         *
+         *
+         * @param array           $invoice_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         do_action( "wpinv_register_rest_routes", $this );
         
     }

includes/wpinv-subscription.php

Indentation +456 added lines, -456 removed lines

@@ -2,7 +2,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 
@@ -13,183 +13,183 @@ 
  */
 class WPInv_Subscription {
 
-	private $subs_db;
+    private $subs_db;
+
+    public $id                = 0;
+    public $customer_id       = 0;
+    public $period            = '';
+    public $initial_amount    = '';
+    public $recurring_amount  = '';
+    public $bill_times        = 0;
+    public $transaction_id    = '';
+    public $parent_payment_id = 0;
+    public $product_id        = 0;
+    public $created           = '0000-00-00 00:00:00';
+    public $expiration        = '0000-00-00 00:00:00';
+    public $trial_period      = '';
+    public $status            = 'pending';
+    public $profile_id        = '';
+    public $gateway           = '';
+    public $customer;
 
-	public $id                = 0;
-	public $customer_id       = 0;
-	public $period            = '';
-	public $initial_amount    = '';
-	public $recurring_amount  = '';
-	public $bill_times        = 0;
-	public $transaction_id    = '';
-	public $parent_payment_id = 0;
-	public $product_id        = 0;
-	public $created           = '0000-00-00 00:00:00';
-	public $expiration        = '0000-00-00 00:00:00';
-	public $trial_period      = '';
-	public $status            = 'pending';
-	public $profile_id        = '';
-	public $gateway           = '';
-	public $customer;
-
-	/**
-	 * Get us started
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
+    /**
+     * Get us started
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    function __construct( $_id_or_object = 0, $_by_profile_id = false ) {
 
-		$this->subs_db = new WPInv_Subscriptions_DB;
+        $this->subs_db = new WPInv_Subscriptions_DB;
 
-		if( $_by_profile_id ) {
+        if( $_by_profile_id ) {
 
-			$_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
+            $_sub = $this->subs_db->get_by( 'profile_id', $_id_or_object );
 
-			if( empty( $_sub ) ) {
-				return false;
-			}
+            if( empty( $_sub ) ) {
+                return false;
+            }
 
-			$_id_or_object = $_sub;
+            $_id_or_object = $_sub;
 
-		}
+        }
 
-		return $this->setup_subscription( $_id_or_object );
-	}
+        return $this->setup_subscription( $_id_or_object );
+    }
 
-	/**
-	 * Setup the subscription object
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	private function setup_subscription( $id_or_object = 0 ) {
+    /**
+     * Setup the subscription object
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    private function setup_subscription( $id_or_object = 0 ) {
 
-		if( empty( $id_or_object ) ) {
-			return false;
-		}
+        if( empty( $id_or_object ) ) {
+            return false;
+        }
 
-		if( is_numeric( $id_or_object ) ) {
+        if( is_numeric( $id_or_object ) ) {
 
-			$sub = $this->subs_db->get( $id_or_object );
+            $sub = $this->subs_db->get( $id_or_object );
 
-		} elseif( is_object( $id_or_object ) ) {
+        } elseif( is_object( $id_or_object ) ) {
 
-			$sub = $id_or_object;
+            $sub = $id_or_object;
 
-		}
+        }
 
-		if( empty( $sub ) ) {
-			return false;
-		}
+        if( empty( $sub ) ) {
+            return false;
+        }
 
-		foreach( $sub as $key => $value ) {
-			$this->$key = $value;
-		}
+        foreach( $sub as $key => $value ) {
+            $this->$key = $value;
+        }
 
-		$this->customer = get_userdata( $this->customer_id );
-		$this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
+        $this->customer = get_userdata( $this->customer_id );
+        $this->gateway  = wpinv_get_payment_gateway( $this->parent_payment_id );
 
-		do_action( 'wpinv_recurring_setup_subscription', $this );
+        do_action( 'wpinv_recurring_setup_subscription', $this );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Magic __get function to dispatch a call to retrieve a private property
-	 *
-	 * @since 1.0.0
-	 */
-	public function __get( $key ) {
+    /**
+     * Magic __get function to dispatch a call to retrieve a private property
+     *
+     * @since 1.0.0
+     */
+    public function __get( $key ) {
 
-		if( method_exists( $this, 'get_' . $key ) ) {
+        if( method_exists( $this, 'get_' . $key ) ) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+            return call_user_func( array( $this, 'get_' . $key ) );
 
-		} else {
+        } else {
 
-			return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error( 'wpinv-subscription-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Creates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array  $data Array of attributes for a subscription
-	 * @return mixed  false if data isn't passed and class not instantiated for creation
-	 */
-	public function create( $data = array() ) {
+    /**
+     * Creates a subscription
+     *
+     * @since  1.0.0
+     * @param  array  $data Array of attributes for a subscription
+     * @return mixed  false if data isn't passed and class not instantiated for creation
+     */
+    public function create( $data = array() ) {
 
-		if ( $this->id != 0 ) {
-			return false;
-		}
+        if ( $this->id != 0 ) {
+            return false;
+        }
 
-		$defaults = array(
-			'customer_id'       => 0,
-			'frequency'         => '',
-			'period'            => '',
-			'initial_amount'    => '',
-			'recurring_amount'  => '',
-			'bill_times'        => 0,
-			'parent_payment_id' => 0,
-			'product_id'        => 0,
-			'created'           => '',
-			'expiration'        => '',
-			'status'            => '',
-			'profile_id'        => '',
-		);
+        $defaults = array(
+            'customer_id'       => 0,
+            'frequency'         => '',
+            'period'            => '',
+            'initial_amount'    => '',
+            'recurring_amount'  => '',
+            'bill_times'        => 0,
+            'parent_payment_id' => 0,
+            'product_id'        => 0,
+            'created'           => '',
+            'expiration'        => '',
+            'status'            => '',
+            'profile_id'        => '',
+        );
 
-		$args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args( $data, $defaults );
 
-		if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
+        if( $args['expiration'] && strtotime( 'NOW', current_time( 'timestamp' ) ) > strtotime( $args['expiration'], current_time( 'timestamp' ) ) ) {
 
-			if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
+            if( 'active' == $args['status'] || 'trialling' == $args['status'] ) {
 
-				// Force an active subscription to expired if expiration date is in the past
-				$args['status'] = 'expired';
+                // Force an active subscription to expired if expiration date is in the past
+                $args['status'] = 'expired';
 
-			}
-		}
+            }
+        }
 
-		do_action( 'wpinv_subscription_pre_create', $args );
+        do_action( 'wpinv_subscription_pre_create', $args );
 
-		$id = $this->subs_db->insert( $args, 'subscription' );
+        $id = $this->subs_db->insert( $args, 'subscription' );
 
-		do_action( 'wpinv_subscription_post_create', $id, $args );
+        do_action( 'wpinv_subscription_post_create', $id, $args );
 
-		return $this->setup_subscription( $id );
+        return $this->setup_subscription( $id );
 
-	}
+    }
 
-	/**
-	 * Updates a subscription
-	 *
-	 * @since  1.0.0
-	 * @param  array $args Array of fields to update
-	 * @return bool
-	 */
-	public function update( $args = array() ) {
+    /**
+     * Updates a subscription
+     *
+     * @since  1.0.0
+     * @param  array $args Array of fields to update
+     * @return bool
+     */
+    public function update( $args = array() ) {
 
-		$ret = $this->subs_db->update( $this->id, $args );
+        $ret = $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
+        do_action( 'wpinv_recurring_update_subscription', $this->id, $args, $this );
 
-		return $ret;
+        return $ret;
 
-	}
+    }
 
-	/**
-	 * Delete the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function delete() {
-		return $this->subs_db->delete( $this->id );
-	}
+    /**
+     * Delete the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function delete() {
+        return $this->subs_db->delete( $this->id );
+    }
 
     /**
      * Retrieves the parent payment ID
@@ -357,8 +357,8 @@ 
             
             $invoice = wpinv_get_invoice( $invoice->ID );
 
-			// Send email notifications.
-			wpinv_completed_invoice_notification( $invoice->ID );
+            // Send email notifications.
+            wpinv_completed_invoice_notification( $invoice->ID );
 
             do_action( 'wpinv_recurring_add_subscription_payment', $invoice, $this );
             do_action( 'wpinv_recurring_record_payment', $invoice->ID, $this->parent_payment_id, $args['amount'], $args['transaction_id'] );
@@ -369,185 +369,185 @@ 
         return false;
     }
 
-	/**
-	 * Retrieves the transaction ID from the subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function get_transaction_id() {
+    /**
+     * Retrieves the transaction ID from the subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function get_transaction_id() {
 
-		if( empty( $this->transaction_id ) ) {
+        if( empty( $this->transaction_id ) ) {
 
-			$txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
+            $txn_id = wpinv_get_payment_transaction_id( $this->parent_payment_id );
 
-			if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
-				$this->set_transaction_id( $txn_id );
-			}
+            if( ! empty( $txn_id ) && (int) $this->parent_payment_id !== (int) $txn_id ) {
+                $this->set_transaction_id( $txn_id );
+            }
 
-		}
+        }
 
-		return $this->transaction_id;
+        return $this->transaction_id;
 
-	}
+    }
 
-	/**
-	 * Stores the transaction ID for the subscription purchase
-	 *
-	 * @since  1.0.0.4
-	 * @return bool
-	 */
-	public function set_transaction_id( $txn_id = '' ) {
-		$this->update( array( 'transaction_id' => $txn_id ) );
-		$this->transaction_id = $txn_id;
-	}
+    /**
+     * Stores the transaction ID for the subscription purchase
+     *
+     * @since  1.0.0.4
+     * @return bool
+     */
+    public function set_transaction_id( $txn_id = '' ) {
+        $this->update( array( 'transaction_id' => $txn_id ) );
+        $this->transaction_id = $txn_id;
+    }
 
-	/**
-	 * Renews a subscription
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function renew() {
+    /**
+     * Renews a subscription
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function renew() {
 
-		$expires = $this->get_expiration_time();
+        $expires = $this->get_expiration_time();
 
 
-		// Determine what date to use as the start for the new expiration calculation
-		if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
+        // Determine what date to use as the start for the new expiration calculation
+        if( $expires > current_time( 'timestamp' ) && $this->is_active() ) {
 
-			$base_date  = $expires;
+            $base_date  = $expires;
 
-		} else {
+        } else {
 
-			$base_date  = current_time( 'timestamp' );
+            $base_date  = current_time( 'timestamp' );
 
-		}
+        }
 
-		$last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
+        $last_day = wpinv_cal_days_in_month( CAL_GREGORIAN, date( 'n', $base_date ), date( 'Y', $base_date ) );
 
 
-		$frequency = isset($this->frequency) ? $this->frequency : 1;
-		$expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
+        $frequency = isset($this->frequency) ? $this->frequency : 1;
+        $expiration = date( 'Y-m-d H:i:s', strtotime( '+' . $frequency . ' ' . $this->period  . ' 23:59:59', $base_date ) );
 
-		if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
-			$expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
-		}
+        if( date( 'j', $base_date ) == $last_day && 'day' != $this->period ) {
+            $expiration = date( 'Y-m-d H:i:s', strtotime( $expiration . ' +2 days' ) );
+        }
 
-		$expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
+        $expiration  = apply_filters( 'wpinv_subscription_renewal_expiration', $expiration, $this->id, $this );
 
-		do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_subscription_pre_renew', $this->id, $expiration, $this );
 
-		$this->status = 'active';
-		$times_billed = $this->get_times_billed();
+        $this->status = 'active';
+        $times_billed = $this->get_times_billed();
 
-		// Complete subscription if applicable
-		if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
-			$this->complete();
-			$this->status = 'completed';
-		}
+        // Complete subscription if applicable
+        if ( $this->bill_times > 0 && $times_billed >= $this->bill_times ) {
+            $this->complete();
+            $this->status = 'completed';
+        }
 
-		$args = array(
-			'expiration' => $expiration,
-			'status'     => $this->status,
-		);
+        $args = array(
+            'expiration' => $expiration,
+            'status'     => $this->status,
+        );
 
         $this->subs_db->update( $this->id, $args );
 
-		do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
-		do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
+        do_action( 'wpinv_subscription_post_renew', $this->id, $expiration, $this );
+        do_action( 'wpinv_recurring_set_subscription_status', $this->id, $this->status, $this );
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as completed
-	 *
-	 * Subscription is completed when the number of payments matches the billing_times field
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function complete() {
+    /**
+     * Marks a subscription as completed
+     *
+     * Subscription is completed when the number of payments matches the billing_times field
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function complete() {
 
-		// Only mark a subscription as complete if it's not already cancelled.
-		if ( 'cancelled' === $this->status ) {
-			return;
-		}
+        // Only mark a subscription as complete if it's not already cancelled.
+        if ( 'cancelled' === $this->status ) {
+            return;
+        }
 
-		$args = array(
-			'status' => 'completed'
-		);
+        $args = array(
+            'status' => 'completed'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'completed';
+            $this->status = 'completed';
 
-			do_action( 'wpinv_subscription_completed', $this->id, $this );
+            do_action( 'wpinv_subscription_completed', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as expired
-	 *
-	 * Subscription is completed when the billing times is reached
-	 *
-	 * @since  1.0.0
-	 * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
-	 * @return void
-	 */
-	public function expire( $check_expiration = false ) {
+    /**
+     * Marks a subscription as expired
+     *
+     * Subscription is completed when the billing times is reached
+     *
+     * @since  1.0.0
+     * @param  $check_expiration bool True if expiration date should be checked with merchant processor before expiring
+     * @return void
+     */
+    public function expire( $check_expiration = false ) {
 
-		$expiration = $this->expiration;
+        $expiration = $this->expiration;
 
-		if( $check_expiration ) {
+        if( $check_expiration ) {
 
-			// check_expiration() updates $this->expiration so compare to $expiration above
+            // check_expiration() updates $this->expiration so compare to $expiration above
 
-			if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
+            if( $expiration < $this->get_expiration() && current_time( 'timestamp' ) < $this->get_expiration_time() ) {
 
-				return false; // Do not mark as expired since real expiration date is in the future
-			}
+                return false; // Do not mark as expired since real expiration date is in the future
+            }
 
-		}
+        }
 
-		$args = array(
-			'status' => 'expired'
-		);
+        $args = array(
+            'status' => 'expired'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'expired';
+            $this->status = 'expired';
 
-			do_action( 'wpinv_subscription_expired', $this->id, $this );
+            do_action( 'wpinv_subscription_expired', $this->id, $this );
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Marks a subscription as failing
-	 *
-	 * @since  2.4.2
-	 * @return void
-	 */
-	public function failing() {
+    /**
+     * Marks a subscription as failing
+     *
+     * @since  2.4.2
+     * @return void
+     */
+    public function failing() {
 
-		$args = array(
-			'status' => 'failing'
-		);
+        $args = array(
+            'status' => 'failing'
+        );
 
-		if( $this->subs_db->update( $this->id, $args ) ) {
+        if( $this->subs_db->update( $this->id, $args ) ) {
 
-			$this->status = 'failing';
+            $this->status = 'failing';
 
-			do_action( 'wpinv_subscription_failing', $this->id, $this );
+            do_action( 'wpinv_subscription_failing', $this->id, $this );
 
 
-		}
+        }
 
-	}
+    }
 
     /**
      * Marks a subscription as cancelled
@@ -581,22 +581,22 @@ 
         }
     }
 
-	/**
-	 * Determines if subscription can be cancelled
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be cancelled with a profile ID through the merchant processor
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_cancel() {
+    /**
+     * Determines if subscription can be cancelled
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be cancelled with a profile ID through the merchant processor
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_cancel() {
         $ret = false;
-	    if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
+        if( $this->gateway === 'manual' || in_array( $this->status, $this->get_cancellable_statuses() ) ) {
             $ret = true;
         }
-		return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
-	}
+        return apply_filters( 'wpinv_subscription_can_cancel', $ret, $this );
+    }
 
     /**
      * Returns an array of subscription statuses that can be cancelled
@@ -609,197 +609,197 @@ 
         return apply_filters( 'wpinv_recurring_cancellable_statuses', array( 'active', 'trialling', 'failing' ) );
     }
 
-	/**
-	 * Retrieves the URL to cancel subscription
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_cancel_url() {
+    /**
+     * Retrieves the URL to cancel subscription
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_cancel_url() {
 
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'cancel_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-cancel' );
 
-		return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
-	}
+        return apply_filters( 'wpinv_subscription_cancel_url', $url, $this );
+    }
 
-	/**
-	 * Determines if subscription can be manually renewed
-	 *
-	 * This method is filtered by payment gateways in order to return true on subscriptions
-	 * that can be renewed manually
-	 *
-	 * @since  2.5
-	 * @return bool
-	 */
-	public function can_renew() {
+    /**
+     * Determines if subscription can be manually renewed
+     *
+     * This method is filtered by payment gateways in order to return true on subscriptions
+     * that can be renewed manually
+     *
+     * @since  2.5
+     * @return bool
+     */
+    public function can_renew() {
 
-		return apply_filters( 'wpinv_subscription_can_renew', true, $this );
-	}
-
-	/**
-	 * Retrieves the URL to renew a subscription
-	 *
-	 * @since  2.5
-	 * @return string
-	 */
-	public function get_renew_url() {
-
-		$url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
-
-		return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription can have their payment method updated
-	 *
-	 * @since  1.0.0
-	 * @return bool
-	 */
-	public function can_update() {
-		return apply_filters( 'wpinv_subscription_can_update', false, $this );
-	}
-
-	/**
-	 * Retrieves the URL to update subscription
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function get_update_url() {
-
-		$url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
-
-		return apply_filters( 'wpinv_subscription_update_url', $url, $this );
-	}
-
-	/**
-	 * Determines if subscription is active
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_active() {
-
-		$ret = false;
-
-		if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
-			$ret = true;
-		}
-
-		return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Determines if subscription is expired
-	 *
-	 * @since  1.0.0
-	 * @return void
-	 */
-	public function is_expired() {
-
-		$ret = false;
-
-		if ( $this->status == 'expired' ) {
-
-			$ret = true;
-
-		} elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
-
-			$ret        = false;
-			$expiration = $this->get_expiration_time();
-
-			if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
-				$ret = true;
-
-				if ( 'active' === $this->status || $this->status == 'trialling'  ) {
-					$this->expire();
-				}
-			}
-
-		}
-
-		return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
-
-	}
-
-	/**
-	 * Retrieves the expiration date
-	 *
-	 * @since  1.0.0
-	 * @return string
-	 */
-	public function get_expiration() {
-		return $this->expiration;
-	}
-
-	/**
-	 * Retrieves the expiration date in a timestamp
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_expiration_time() {
-		return strtotime( $this->expiration, current_time( 'timestamp' ) );
-	}
-
-	/**
-	 * Retrieves the subscription status
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status() {
-
-		// Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
-		$this->is_expired();
-		return $this->status;
-	}
-
-	/**
-	 * Retrieves the subscription status label
-	 *
-	 * @since  1.0.0
-	 * @return int
-	 */
-	public function get_status_label() {
-
-		switch( $this->get_status() ) {
-			case 'active' :
-				$status = __( 'Active', 'invoicing' );
-				break;
-
-			case 'cancelled' :
-				$status = __( 'Cancelled', 'invoicing' );
-				break;
-
-			case 'expired' :
-				$status = __( 'Expired', 'invoicing' );
-				break;
-
-			case 'pending' :
-				$status = __( 'Pending', 'invoicing' );
-				break;
-
-			case 'failing' :
-				$status = __( 'Failing', 'invoicing' );
-				break;
-
-			case 'trialling' :
-				$status = __( 'Trialling', 'invoicing' );
-				break;
-
-			case 'completed' :
-				$status = __( 'Completed', 'invoicing' );
-				break;
-
-			default:
-				$status = ucfirst( $this->get_status() );
-				break;
-		}
-
-		return $status;
-	}
+        return apply_filters( 'wpinv_subscription_can_renew', true, $this );
+    }
+
+    /**
+     * Retrieves the URL to renew a subscription
+     *
+     * @since  2.5
+     * @return string
+     */
+    public function get_renew_url() {
+
+        $url = wp_nonce_url( add_query_arg( array( 'wpinv_action' => 'renew_subscription', 'sub_id' => $this->id ) ), 'wpinv-recurring-renew' );
+
+        return apply_filters( 'wpinv_subscription_renew_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription can have their payment method updated
+     *
+     * @since  1.0.0
+     * @return bool
+     */
+    public function can_update() {
+        return apply_filters( 'wpinv_subscription_can_update', false, $this );
+    }
+
+    /**
+     * Retrieves the URL to update subscription
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function get_update_url() {
+
+        $url = add_query_arg( array( 'action' => 'update', 'subscription_id' => $this->id ) );
+
+        return apply_filters( 'wpinv_subscription_update_url', $url, $this );
+    }
+
+    /**
+     * Determines if subscription is active
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_active() {
+
+        $ret = false;
+
+        if( ! $this->is_expired() && ( $this->status == 'active' || $this->status == 'cancelled' || $this->status == 'trialling' ) ) {
+            $ret = true;
+        }
+
+        return apply_filters( 'wpinv_subscription_is_active', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Determines if subscription is expired
+     *
+     * @since  1.0.0
+     * @return void
+     */
+    public function is_expired() {
+
+        $ret = false;
+
+        if ( $this->status == 'expired' ) {
+
+            $ret = true;
+
+        } elseif( 'active' === $this->status || 'cancelled' === $this->status || $this->status == 'trialling'  ) {
+
+            $ret        = false;
+            $expiration = $this->get_expiration_time();
+
+            if( $expiration && strtotime( 'NOW', current_time( 'timestamp' ) ) > $expiration ) {
+                $ret = true;
+
+                if ( 'active' === $this->status || $this->status == 'trialling'  ) {
+                    $this->expire();
+                }
+            }
+
+        }
+
+        return apply_filters( 'wpinv_subscription_is_expired', $ret, $this->id, $this );
+
+    }
+
+    /**
+     * Retrieves the expiration date
+     *
+     * @since  1.0.0
+     * @return string
+     */
+    public function get_expiration() {
+        return $this->expiration;
+    }
+
+    /**
+     * Retrieves the expiration date in a timestamp
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_expiration_time() {
+        return strtotime( $this->expiration, current_time( 'timestamp' ) );
+    }
+
+    /**
+     * Retrieves the subscription status
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status() {
+
+        // Monitor for page load delays on pages with large subscription lists (IE: Subscriptions table in admin)
+        $this->is_expired();
+        return $this->status;
+    }
+
+    /**
+     * Retrieves the subscription status label
+     *
+     * @since  1.0.0
+     * @return int
+     */
+    public function get_status_label() {
+
+        switch( $this->get_status() ) {
+            case 'active' :
+                $status = __( 'Active', 'invoicing' );
+                break;
+
+            case 'cancelled' :
+                $status = __( 'Cancelled', 'invoicing' );
+                break;
+
+            case 'expired' :
+                $status = __( 'Expired', 'invoicing' );
+                break;
+
+            case 'pending' :
+                $status = __( 'Pending', 'invoicing' );
+                break;
+
+            case 'failing' :
+                $status = __( 'Failing', 'invoicing' );
+                break;
+
+            case 'trialling' :
+                $status = __( 'Trialling', 'invoicing' );
+                break;
+
+            case 'completed' :
+                $status = __( 'Completed', 'invoicing' );
+                break;
+
+            default:
+                $status = ucfirst( $this->get_status() );
+                break;
+        }
+
+        return $status;
+    }
 
     /**
      * Retrieves the subscription status label

includes/class-wpinv-discount.php

Indentation +668 added lines, -668 removed lines

@@ -33,173 +33,173 @@ 
  */
 class WPInv_Discount {
 	
-	/**
-	 * Discount ID.
-	 *
-	 * @since 1.0.15
-	 * @var integer|null
-	 */
-	public $ID = null;
-
-	/**
-	 * Old discount status.
-	 *
-	 * @since 1.0.15
-	 * @var string
-	 */
-	public $old_status = 'draft';
+    /**
+     * Discount ID.
+     *
+     * @since 1.0.15
+     * @var integer|null
+     */
+    public $ID = null;
+
+    /**
+     * Old discount status.
+     *
+     * @since 1.0.15
+     * @var string
+     */
+    public $old_status = 'draft';
 	
-	/**
-	 * Data array.
-	 *
-	 * @since 1.0.15
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Discount constructor.
-	 *
-	 * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
-	 * @since 1.0.15
-	 */
-	public function __construct( $discount = array() ) {
+    /**
+     * Data array.
+     *
+     * @since 1.0.15
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Discount constructor.
+     *
+     * @param int|array|string|WPInv_Discount $discount discount data, object, ID or code.
+     * @since 1.0.15
+     */
+    public function __construct( $discount = array() ) {
         
         // If the discount is an instance of this class...
-		if ( $discount instanceof WPInv_Discount ) {
-			$this->init( $discount->data );
-			return;
+        if ( $discount instanceof WPInv_Discount ) {
+            $this->init( $discount->data );
+            return;
         }
         
         // If the discount is an array of discount details...
         if ( is_array( $discount ) ) {
-			$this->init( $discount );
-			return;
-		}
+            $this->init( $discount );
+            return;
+        }
 		
-		// Try fetching the discount by its post id.
-		$data = false;
+        // Try fetching the discount by its post id.
+        $data = false;
 		
-		if ( ! empty( $discount ) && is_numeric( $discount ) ) {
-			$discount = absint( $discount );
-			$data = self::get_data_by( 'id', $discount );
-		}
-
-		if ( is_array( $data ) ) {
-			$this->init( $data );
-			return;
-		}
+        if ( ! empty( $discount ) && is_numeric( $discount ) ) {
+            $discount = absint( $discount );
+            $data = self::get_data_by( 'id', $discount );
+        }
+
+        if ( is_array( $data ) ) {
+            $this->init( $data );
+            return;
+        }
 		
-		// Try fetching the discount by its discount code.
-		if ( ! empty( $discount ) && is_string( $discount ) ) {
-			$data = self::get_data_by( 'discount_code', $discount );
-		}
-
-		if ( is_array( $data ) ) {
-			$this->init( $data );
-			return;
-		} 
+        // Try fetching the discount by its discount code.
+        if ( ! empty( $discount ) && is_string( $discount ) ) {
+            $data = self::get_data_by( 'discount_code', $discount );
+        }
+
+        if ( is_array( $data ) ) {
+            $this->init( $data );
+            return;
+        } 
 		
-		// If we are here then the discount does not exist.
-		$this->init( array() );
-	}
+        // If we are here then the discount does not exist.
+        $this->init( array() );
+    }
 	
-	/**
-	 * Sets up object properties
-	 *
-	 * @since 1.0.15
-	 * @param array $data An array containing the discount's data
-	 */
-	public function init( $data ) {
-		$data       	  = self::sanitize_discount_data( $data );
-		$this->data 	  = $data;
-		$this->old_status = $data['status'];
-		$this->ID   	  = $data['ID'];
-	}
+    /**
+     * Sets up object properties
+     *
+     * @since 1.0.15
+     * @param array $data An array containing the discount's data
+     */
+    public function init( $data ) {
+        $data       	  = self::sanitize_discount_data( $data );
+        $this->data 	  = $data;
+        $this->old_status = $data['status'];
+        $this->ID   	  = $data['ID'];
+    }
 	
-	/**
-	 * Fetch a discount from the db/cache
-	 *
-	 *
-	 * @static
-	 * @param string $field The field to query against: 'ID', 'discount_code'
-	 * @param string|int $value The field value
-	 * @since 1.0.15
-	 * @return array|bool array of discount details on success. False otherwise.
-	 */
-	public static function get_data_by( $field, $value ) {
-
-		if ( 'id' == strtolower( $field ) ) {
-			// Make sure the value is numeric to avoid casting objects, for example,
-			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
-		}
-
-		if ( ! $value || ! is_string( $field ) ) {
-			return false;
-		}
+    /**
+     * Fetch a discount from the db/cache
+     *
+     *
+     * @static
+     * @param string $field The field to query against: 'ID', 'discount_code'
+     * @param string|int $value The field value
+     * @since 1.0.15
+     * @return array|bool array of discount details on success. False otherwise.
+     */
+    public static function get_data_by( $field, $value ) {
+
+        if ( 'id' == strtolower( $field ) ) {
+            // Make sure the value is numeric to avoid casting objects, for example,
+            // to int 1.
+            if ( ! is_numeric( $value ) )
+                return false;
+            $value = intval( $value );
+            if ( $value < 1 )
+                return false;
+        }
+
+        if ( ! $value || ! is_string( $field ) ) {
+            return false;
+        }
 		
-		$field = trim( $field );
-
-		// prepare query args
-		switch ( strtolower( $field ) ) {
-			case 'id':
-				$discount_id = $value;
-				$args		 = array( 'include' => array( $value ) );
-				break;
-			case 'discount_code':
-			case 'code':
-				$value       = trim( $value );
-				$discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
-				$args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
-				break;
-			case 'name':
-				$discount_id = 0;
-				$args		 = array( 'name' => trim( $value ) );
-				break;
-			default:
-				$args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
-				if ( ! is_array( $args ) ) {
-					return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
-				}
-
-		}
-
-		// Check if there is a cached value.
-		if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
-			return $discount;
-		}
-
-		$args = array_merge(
-			$args,
-			array(
-				'post_type'      => 'wpi_discount',
-				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
-			)
-		);
-
-		$discount = get_posts( $args );
+        $field = trim( $field );
+
+        // prepare query args
+        switch ( strtolower( $field ) ) {
+            case 'id':
+                $discount_id = $value;
+                $args		 = array( 'include' => array( $value ) );
+                break;
+            case 'discount_code':
+            case 'code':
+                $value       = trim( $value );
+                $discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
+                $args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
+                break;
+            case 'name':
+                $discount_id = 0;
+                $args		 = array( 'name' => trim( $value ) );
+                break;
+            default:
+                $args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
+                if ( ! is_array( $args ) ) {
+                    return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
+                }
+
+        }
+
+        // Check if there is a cached value.
+        if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
+            return $discount;
+        }
+
+        $args = array_merge(
+            $args,
+            array(
+                'post_type'      => 'wpi_discount',
+                'posts_per_page' => 1,
+                'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+            )
+        );
+
+        $discount = get_posts( $args );
 				
-		if( empty( $discount ) ) {
-			return false;
-		}
+        if( empty( $discount ) ) {
+            return false;
+        }
 
-		$discount = $discount[0];
+        $discount = $discount[0];
 		
-		// Prepare the return data.
-		$return = array(
+        // Prepare the return data.
+        $return = array(
             'ID'                          => $discount->ID,
             'code'                        => get_post_meta( $discount->ID, '_wpi_discount_code', true ),
             'amount'                      => get_post_meta( $discount->ID, '_wpi_discount_amount', true ),
             'date_created'                => $discount->post_date,
-			'date_modified'               => $discount->post_modified,
-			'status'               		  => $discount->post_status,
-			'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
+            'date_modified'               => $discount->post_modified,
+            'status'               		  => $discount->post_status,
+            'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
             'expiration'                  => get_post_meta( $discount->ID, '_wpi_discount_expiration', true ),
             'type'               		  => get_post_meta( $discount->ID, '_wpi_discount_type', true ),
             'description'                 => $discount->post_excerpt,
@@ -213,38 +213,38 @@ 
             'max_total'                   => get_post_meta( $discount->ID, '_wpi_discount_max_total', true ),
         );
 		
-		$return = self::sanitize_discount_data( $return );
-		$return = apply_filters( 'wpinv_discount_properties', $return );
+        $return = self::sanitize_discount_data( $return );
+        $return = apply_filters( 'wpinv_discount_properties', $return );
 
-		// Update the cache with our data
-		wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
-		wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
+        // Update the cache with our data
+        wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
+        wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
 
-		return $return;
-	}
+        return $return;
+    }
 	
-	/**
-	 * Sanitizes discount data
-	 *
-	 * @static
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return array the sanitized data
-	 */
-	public static function sanitize_discount_data( $data ) {
+    /**
+     * Sanitizes discount data
+     *
+     * @static
+     * @since 1.0.15
+     * @access public
+     *
+     * @return array the sanitized data
+     */
+    public static function sanitize_discount_data( $data ) {
 		
-		$allowed_discount_types = array_keys( wpinv_get_discount_types() );
+        $allowed_discount_types = array_keys( wpinv_get_discount_types() );
 		
-		$return = array(
+        $return = array(
             'ID'                          => null,
             'code'                        => '',
             'amount'                      => 0,
             'date_created'                => current_time('mysql'),
             'date_modified'               => current_time('mysql'),
-			'expiration'                  => null,
-			'start'                  	  => current_time('mysql'),
-			'status'                  	  => 'draft',
+            'expiration'                  => null,
+            'start'                  	  => current_time('mysql'),
+            'status'                  	  => 'draft',
             'type'               		  => 'percent',
             'description'                 => '',
             'uses'                        => 0,
@@ -254,426 +254,426 @@ 
             'max_uses'                    => 0,
             'is_recurring'                => false,
             'min_total'                   => '',
-			'max_total'              	  => '',
-		);
+            'max_total'              	  => '',
+        );
 		
 				
-		// Arrays only please.
-		if ( ! is_array( $data ) ) {
+        // Arrays only please.
+        if ( ! is_array( $data ) ) {
             return $return;
         }
 
-		// If an id is provided, ensure it is a valid discount.
+        // If an id is provided, ensure it is a valid discount.
         if ( ! empty( $data['ID'] ) && ( ! is_numeric( $data['ID'] ) || 'wpi_discount' !== get_post_type( $data['ID'] ) ) ) {
             return $return;
-		}
+        }
 
         $return = array_merge( $return, $data );
 
         // Sanitize some keys.
         $return['amount']         = wpinv_sanitize_amount( $return['amount'] );
-		$return['is_single_use']  = (bool) $return['is_single_use'];
-		$return['is_recurring']   = (bool) $return['is_recurring'];
-		$return['uses']	          = (int) $return['uses'];
-		$return['max_uses']	      = (int) $return['max_uses'];
-		$return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
+        $return['is_single_use']  = (bool) $return['is_single_use'];
+        $return['is_recurring']   = (bool) $return['is_recurring'];
+        $return['uses']	          = (int) $return['uses'];
+        $return['max_uses']	      = (int) $return['max_uses'];
+        $return['min_total'] 	  = wpinv_sanitize_amount( $return['min_total'] );
         $return['max_total'] 	  = wpinv_sanitize_amount( $return['max_total'] );
 
-		// Trim all values.
-		$return = wpinv_clean( $return );
+        // Trim all values.
+        $return = wpinv_clean( $return );
 		
-		// Ensure the discount type is supported.
+        // Ensure the discount type is supported.
         if ( ! in_array( $return['type'], $allowed_discount_types, true ) ) {
             $return['type'] = 'percent';
-		}
-		$return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
+        }
+        $return['type_name'] = wpinv_get_discount_type_name( $return['type'] );
 		
-		// Do not offer more than a 100% discount.
-		if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
-			$return['amount'] = 100;
-		}
-
-		// Format dates.
-		foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
-			if( ! empty( $return[$prop] ) ) {
-				$return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
-			}
-		}
-
-		// Formart items.
-		foreach( array( 'excluded_items', 'items' ) as $prop ) {
-
-			if( ! empty( $return[$prop] ) ) {
-				// Ensure that the property is an array of non-empty integers.
-				$return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
-			} else {
-				$return[$prop]      = array();
-			}
-
-		}
+        // Do not offer more than a 100% discount.
+        if ( $return['type'] == 'percent' && (float) $return['amount'] > 100 ) {
+            $return['amount'] = 100;
+        }
+
+        // Format dates.
+        foreach( wpinv_parse_list( 'date_created date_modified expiration start') as $prop ) {
+            if( ! empty( $return[$prop] ) ) {
+                $return[$prop]      = date_i18n( 'Y-m-d H:i:s', strtotime( $return[$prop] ) );
+            }
+        }
+
+        // Formart items.
+        foreach( array( 'excluded_items', 'items' ) as $prop ) {
+
+            if( ! empty( $return[$prop] ) ) {
+                // Ensure that the property is an array of non-empty integers.
+                $return[$prop]      = array_filter( array_map( 'intval', wpinv_parse_list( $return[$prop] ) ) );
+            } else {
+                $return[$prop]      = array();
+            }
+
+        }
 		
-		return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
-	}
+        return apply_filters( 'wpinv_sanitize_discount_data', $return, $data );
+    }
 	
-	/**
-	 * Magic method for checking the existence of a certain custom field.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return bool Whether the given discount field is set.
-	 */
-	public function __isset( $key ){
-		return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
-	}
+    /**
+     * Magic method for checking the existence of a certain custom field.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @return bool Whether the given discount field is set.
+     */
+    public function __isset( $key ){
+        return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
+    }
 	
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function __get( $key ) {
-		return $this->get( $key );
-	}
-
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function get( $key ) {
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function __get( $key ) {
+        return $this->get( $key );
+    }
+
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function get( $key ) {
 		
-		if ( $key == 'id' ) {
-			$key = 'ID';
-		}
+        if ( $key == 'id' ) {
+            $key = 'ID';
+        }
 		
-		if( method_exists( $this, "get_$key") ) {
-			$value 	= call_user_func( array( $this, "get_$key" ) );
-		} else if( isset( $this->data[$key] ) ) {
-			$value 	= $this->data[$key];
-		} else {
-			$value = null;
-		}
+        if( method_exists( $this, "get_$key") ) {
+            $value 	= call_user_func( array( $this, "get_$key" ) );
+        } else if( isset( $this->data[$key] ) ) {
+            $value 	= $this->data[$key];
+        } else {
+            $value = null;
+        }
 		
-		/**
-		 * Filters a discount's property value.
-		 * 
-		 * The dynamic part ($key) can be any property name e.g items, code, type etc.
-		 * 
-		 * @param mixed          $value    The property's value.
-		 * @param int            $ID       The discount's ID.
-		 * @param WPInv_Discount $discount The discount object.
-		 * @param string         $code     The discount's discount code.
-		 * @param array          $data     The discount's data array.
-		 */
-		return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
-
-	}
+        /**
+         * Filters a discount's property value.
+         * 
+         * The dynamic part ($key) can be any property name e.g items, code, type etc.
+         * 
+         * @param mixed          $value    The property's value.
+         * @param int            $ID       The discount's ID.
+         * @param WPInv_Discount $discount The discount object.
+         * @param string         $code     The discount's discount code.
+         * @param array          $data     The discount's data array.
+         */
+        return apply_filters( "wpinv_get_discount_{$key}", $value, $this->ID, $this, $this->data['code'], $this->data );
+
+    }
 	
-	/**
-	 * Magic method for setting discount fields.
-	 *
-	 * This method does not update custom fields in the database.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 */
-	public function __set( $key, $value ) {
+    /**
+     * Magic method for setting discount fields.
+     *
+     * This method does not update custom fields in the database.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     */
+    public function __set( $key, $value ) {
 		
-		if ( 'id' == strtolower( $key ) ) {
+        if ( 'id' == strtolower( $key ) ) {
 			
-			$this->ID = $value;
-			$this->data['ID'] = $value;
-			return;
+            $this->ID = $value;
+            $this->data['ID'] = $value;
+            return;
 			
-		}
+        }
 		
-		/**
-		 * Filters a discount's property value before it is saved.
-		 * 
-		 * 
-		 * 
-		 * The dynamic part ($key) can be any property name e.g items, code, type etc.
-		 * 
-		 * @param mixed          $value    The property's value.
-		 * @param int            $ID       The discount's ID.
-		 * @param WPInv_Discount $discount The discount object.
-		 * @param string         $code     The discount's discount code.
-		 * @param array          $data     The discount's data array.
-		 */
-		$value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
-
-		if( method_exists( $this, "set_$key") ) {
-			call_user_func( array( $this, "set_$key" ), $value );
-		} else {
-			$this->data[$key] = $value;
-		}
+        /**
+         * Filters a discount's property value before it is saved.
+         * 
+         * 
+         * 
+         * The dynamic part ($key) can be any property name e.g items, code, type etc.
+         * 
+         * @param mixed          $value    The property's value.
+         * @param int            $ID       The discount's ID.
+         * @param WPInv_Discount $discount The discount object.
+         * @param string         $code     The discount's discount code.
+         * @param array          $data     The discount's data array.
+         */
+        $value = apply_filters( "wpinv_set_discount_{$key}", $value, $this->ID, $this, $this->code, $this->data );
+
+        if( method_exists( $this, "set_$key") ) {
+            call_user_func( array( $this, "set_$key" ), $value );
+        } else {
+            $this->data[$key] = $value;
+        }
 		
-	}
+    }
 	
-	/**
-	 * Saves (or updates) a discount to the database
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function save(){
+    /**
+     * Saves (or updates) a discount to the database
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function save(){
 		
-		$data = self::sanitize_discount_data( $this->data );
+        $data = self::sanitize_discount_data( $this->data );
 
-		// Should we create a new post?
-		if( ! $data[ 'ID' ] ) {
+        // Should we create a new post?
+        if( ! $data[ 'ID' ] ) {
 
-			$id = wp_insert_post( array(
-				'post_status'           => $data['status'],
-				'post_type'             => 'wpi_discount',
-				'post_excerpt'          => $data['description'],
-			) );
+            $id = wp_insert_post( array(
+                'post_status'           => $data['status'],
+                'post_type'             => 'wpi_discount',
+                'post_excerpt'          => $data['description'],
+            ) );
 
-			if( empty( $id ) ) {
-				return false;
-			}
+            if( empty( $id ) ) {
+                return false;
+            }
 
-			$data[ 'ID' ] = (int) $id;
-			$this->ID = $data[ 'ID' ];
-			$this->data['ID'] = $data[ 'ID' ];
+            $data[ 'ID' ] = (int) $id;
+            $this->ID = $data[ 'ID' ];
+            $this->data['ID'] = $data[ 'ID' ];
 
-		} else {
-			$this->update_status( $data['status'] );
-		}
+        } else {
+            $this->update_status( $data['status'] );
+        }
 
-		$meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
+        $meta = apply_filters( 'wpinv_update_discount', $data, $this->ID, $this );
 
-		do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
+        do_action( 'wpinv_pre_update_discount', $meta, $this->ID, $this );
 
-		foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
-			if ( isset( $meta[$prop] ) ) {
-				unset( $meta[$prop] );
-			}
-		}
+        foreach( wpinv_parse_list( 'ID date_created date_modified status description type_name' ) as $prop ) {
+            if ( isset( $meta[$prop] ) ) {
+                unset( $meta[$prop] );
+            }
+        }
 
-		if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
-			unset( $meta['uses'] );
-		}
+        if( isset( $meta['uses'] ) && empty( $meta['uses'] ) ) {
+            unset( $meta['uses'] );
+        }
 
-		// Save the metadata.
-		foreach( $meta as $key => $value ) {
-			update_post_meta( $this->ID, "_wpi_discount_$key", $value );
-		}
+        // Save the metadata.
+        foreach( $meta as $key => $value ) {
+            update_post_meta( $this->ID, "_wpi_discount_$key", $value );
+        }
 
-		$this->refresh();
+        $this->refresh();
 
-		do_action( 'wpinv_post_update_discount', $meta, $this->ID );
+        do_action( 'wpinv_post_update_discount', $meta, $this->ID );
 
-		return true;		
-	}
+        return true;		
+    }
 
-	/**
-	 * Refreshes the discount data.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function refresh(){
+    /**
+     * Refreshes the discount data.
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function refresh(){
 
-		// Empty the cache for this discount.
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-		wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
+        // Empty the cache for this discount.
+        wp_cache_delete( $this->ID, 'WPInv_Discounts' );
+        wp_cache_delete( $this->get( 'code' ), 'WPInv_Discount_Codes' );
 
-		$data = self::get_data_by( 'id', $this->ID );
-		if( is_array( $data ) ) {
-			$this->init( $data );
-		} else {
-			$this->init( array() );
-		}
+        $data = self::get_data_by( 'id', $this->ID );
+        if( is_array( $data ) ) {
+            $this->init( $data );
+        } else {
+            $this->init( array() );
+        }
 
-	}
+    }
 
-	/**
-	 * Saves (or updates) a discount to the database
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 * @return bool
-	 *
-	 */
-	public function update_status( $status = 'publish' ){
+    /**
+     * Saves (or updates) a discount to the database
+     *
+     * @since 1.0.15
+     * @access public
+     * @return bool
+     *
+     */
+    public function update_status( $status = 'publish' ){
 
 
-		if ( $this->exists() && $this->old_status != $status ) {
+        if ( $this->exists() && $this->old_status != $status ) {
 
-			do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
-        	$updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
-			do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
+            do_action( 'wpinv_pre_update_discount_status', $this->ID, $this->old_status, $status );
+            $updated = wp_update_post( array( 'ID' => $this->ID, 'post_status' => $status ) );
+            do_action( 'wpinv_post_update_discount_status', $this->ID, $this->old_status, $status );
 
-			$this->refresh();
+            $this->refresh();
 
-			return $updated !== 0;
+            return $updated !== 0;
 			
-		}
+        }
 
-		return false;		
-	}
+        return false;		
+    }
 	
 	
-	/**
-	 * Checks whether a discount exists in the database or not
-	 * 
-	 * @since 1.0.15
-	 */
-	public function exists(){
-		return ! empty( $this->ID );
-	}
+    /**
+     * Checks whether a discount exists in the database or not
+     * 
+     * @since 1.0.15
+     */
+    public function exists(){
+        return ! empty( $this->ID );
+    }
 	
-	// Boolean methods
+    // Boolean methods
 	
-	/**
-	 * Checks the discount type.
-	 * 
-	 * 
-	 * @param  string $type the discount type to check against
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_type( $type ) {
-		return $this->type == $type;
-	}
+    /**
+     * Checks the discount type.
+     * 
+     * 
+     * @param  string $type the discount type to check against
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_type( $type ) {
+        return $this->type == $type;
+    }
 	
-	/**
-	 * Checks whether the discount is published or not
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->status == 'publish';
-	}
+    /**
+     * Checks whether the discount is published or not
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_active() {
+        return $this->status == 'publish';
+    }
 	
-	/**
-	 * Checks whether the discount is has exided the usage limit or not
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_exceeded_limit() {
-		if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
-			return false ;
-		}
+    /**
+     * Checks whether the discount is has exided the usage limit or not
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_exceeded_limit() {
+        if( empty( $this->max_uses ) || empty( $this->uses ) ) { 
+            return false ;
+        }
 		
-		$exceeded =  $this->uses >= $this->max_uses;
-		return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
-	}
+        $exceeded =  $this->uses >= $this->max_uses;
+        return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->ID, $this, $this->code );
+    }
 	
-	/**
-	 * Checks if the discount is expired
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_expired() {
-		$expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
-		return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
-	}
-
-	/**
-	 * Checks the discount start date.
-	 * 
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_started() {
-		$started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
-		return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
-	}
+    /**
+     * Checks if the discount is expired
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_expired() {
+        $expired = empty ( $this->expiration ) ? false : current_time( 'timestamp' ) > strtotime( $this->expiration );
+        return apply_filters( 'wpinv_is_discount_expired', $expired, $this->ID, $this, $this->code );
+    }
+
+    /**
+     * Checks the discount start date.
+     * 
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_started() {
+        $started = empty ( $this->start ) ? true : current_time( 'timestamp' ) > strtotime( $this->start );
+        return apply_filters( 'wpinv_is_discount_started', $started, $this->ID, $this, $this->code );		
+    }
 	
-	/**
-	 * Check if a discount is valid for a given item id.
-	 *
-	 * @param  int|int[]  $item_ids
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_items( $item_ids ) {
+    /**
+     * Check if a discount is valid for a given item id.
+     *
+     * @param  int|int[]  $item_ids
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_items( $item_ids ) {
 		 
-		$item_ids = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
-		$included = array_intersect( $item_ids, $this->items );
-		$excluded = array_intersect( $item_ids, $this->excluded_items );
-
-		if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
-			return false;
-		}
-
-		if( ! empty( $this->items ) && empty( $included ) ) {
-			return false;
-		}
-		return true;
-	}
+        $item_ids = array_map( 'intval',  wpinv_parse_list( $item_ids ) );
+        $included = array_intersect( $item_ids, $this->items );
+        $excluded = array_intersect( $item_ids, $this->excluded_items );
+
+        if( ! empty( $this->excluded_items ) && ! empty( $excluded ) ) {
+            return false;
+        }
+
+        if( ! empty( $this->items ) && empty( $included ) ) {
+            return false;
+        }
+        return true;
+    }
 	
-	/**
-	 * Check if a discount is valid for the given amount
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_amount( $amount ) {
-		return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
-	}
-
-	/**
-	 * Checks if the minimum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_minimum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
-		return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
-	}
-
-	/**
-	 * Checks if the maximum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_maximum_amount_met( $amount ) {
-		$amount = floatval( $amount );
-		$max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
-		return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
-	}
-
-	/**
-	 * Check if a discount is valid for the given user
-	 *
-	 * @param  int|string  $user
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_user( $user ) {
-		global $wpi_checkout_id;
-
-		if( empty( $user ) || empty( $this->is_single_use ) ) {
-			return true;
-		}
-
-		$user_id = 0;
+    /**
+     * Check if a discount is valid for the given amount
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_amount( $amount ) {
+        return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
+    }
+
+    /**
+     * Checks if the minimum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_minimum_amount_met( $amount ) {
+        $amount = floatval( $amount );
+        $min_met= ! ( $this->min_total > 0 && $amount < $this->min_total );
+        return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->ID, $this, $this->code, $amount );
+    }
+
+    /**
+     * Checks if the maximum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_maximum_amount_met( $amount ) {
+        $amount = floatval( $amount );
+        $max_met= ! ( $this->max_total > 0 && $amount > $this->max_total );
+        return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->ID, $this, $this->code, $amount );
+    }
+
+    /**
+     * Check if a discount is valid for the given user
+     *
+     * @param  int|string  $user
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_user( $user ) {
+        global $wpi_checkout_id;
+
+        if( empty( $user ) || empty( $this->is_single_use ) ) {
+            return true;
+        }
+
+        $user_id = 0;
         if ( is_int( $user ) ) {
             $user_id = absint( $user );
         } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
@@ -682,164 +682,164 @@ 
             $user_id = $user_data->ID;
         } else if ( absint( $user ) > 0 ) {
             $user_id = absint( $user );
-		}
+        }
 
-		if ( empty( $user_id ) ) {
-			return true;
-		}
+        if ( empty( $user_id ) ) {
+            return true;
+        }
 		
-		// Get all payments with matching user id
+        // Get all payments with matching user id
         $payments = wpinv_get_invoices( array( 'user' => $user_id, 'limit' => false ) ); 
-		$code     = strtolower( $this->code );
+        $code     = strtolower( $this->code );
 
-		foreach ( $payments as $payment ) {
+        foreach ( $payments as $payment ) {
 
-			// Don't count discount used for current invoice checkout.
-			if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
-				continue;
-			}
+            // Don't count discount used for current invoice checkout.
+            if ( ! empty( $wpi_checkout_id ) && $wpi_checkout_id == $payment->ID ) {
+                continue;
+            }
 			
-			if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
-				continue;
-			}
-
-			$discounts = $payment->get_discounts( true );
-			if ( empty( $discounts ) ) {
-				continue;
-			}
-
-			$discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
-			if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes the discount from the database
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function remove() {
-
-		if ( empty( $this->ID ) ) {
-			return true;
-		}
-
-		do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
-		wp_cache_delete( $this->ID, 'WPInv_Discounts' );
-    	wp_delete_post( $this->ID, true );
-		wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
-    	do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
-
-		$this->ID = null;
-		$this->data['id'] = null;
-		return true;
-	}
-
-	/**
-	 * Increases a discount's usage.
-	 *
-	 * @since 1.0.15
-	 * @param int $by The number of usages to increas by.
-	 * @return int
-	 */
-	public function increase_usage( $by = 1 ) {
-
-		$this->uses = $this->uses + $by;
-
-		if( $this->uses  < 0 ) {
-			$this->uses = 0;
-			update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
-		}
-
-		$this->save();
-
-		if( $by > 0 ) {
-			do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
-		} else {
-			do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
-		}
+            if ( $payment->has_status( array( 'wpi-cancelled', 'wpi-failed' ) ) ) {
+                continue;
+            }
+
+            $discounts = $payment->get_discounts( true );
+            if ( empty( $discounts ) ) {
+                continue;
+            }
+
+            $discounts = array_map( 'strtolower', wpinv_parse_list( $discounts ) );
+            if ( ! empty( $discounts ) && in_array( $code, $discounts ) ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes the discount from the database
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function remove() {
+
+        if ( empty( $this->ID ) ) {
+            return true;
+        }
+
+        do_action( 'wpinv_pre_delete_discount', $this->ID, $this->data );
+        wp_cache_delete( $this->ID, 'WPInv_Discounts' );
+        wp_delete_post( $this->ID, true );
+        wp_cache_delete( $this->code, 'WPInv_Discount_Codes' );
+        do_action( 'wpinv_post_delete_discount', $this->ID, $this->data );
+
+        $this->ID = null;
+        $this->data['id'] = null;
+        return true;
+    }
+
+    /**
+     * Increases a discount's usage.
+     *
+     * @since 1.0.15
+     * @param int $by The number of usages to increas by.
+     * @return int
+     */
+    public function increase_usage( $by = 1 ) {
+
+        $this->uses = $this->uses + $by;
+
+        if( $this->uses  < 0 ) {
+            $this->uses = 0;
+            update_post_meta( $this->ID, "_wpi_discount_uses", 0 );
+        }
+
+        $this->save();
+
+        if( $by > 0 ) {
+            do_action( 'wpinv_discount_increase_use_count', $this->uses, $this->ID, $this->code, $by );
+        } else {
+            do_action( 'wpinv_discount_decrease_use_count', $this->uses, $this->ID, $this->code, absint( $by ) );
+        }
 		
-		return $this->uses;
-	}
-
-	/**
-	 * Retrieves discount data
-	 *
-	 * @since 1.0.15
-	 * @return array
-	 */
-	public function get_data() {
-		$return = array();
-		foreach( array_keys( $this->data ) as $key ) {
-			$return[ $key ] = $this->get( $key );
-		}
-		return $return;
-	}
-
-	/**
-	 * Retrieves discount data as json
-	 *
-	 * @since 1.0.15
-	 * @return string|false
-	 */
-	public function get_data_as_json() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Checks if a discount can only be used once per user.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function get_is_single_use() {
-		return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
-	}
-
-	/**
-	 * Checks if a discount is recurring.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function get_is_recurring() {
-		return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
-	}
-
-	/**
-	 * Returns a discount's included items.
-	 *
-	 * @since 1.0.15
-	 * @return array
-	 */
-	public function get_items() {
-		return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
-	}
-
-	/**
-	 * Returns a discount's discounted amount.
-	 *
-	 * @since 1.0.15
-	 * @return float
-	 */
-	public function get_discounted_amount( $amount ) {
-
-		if ( $this->type == 'flat' ) {
+        return $this->uses;
+    }
+
+    /**
+     * Retrieves discount data
+     *
+     * @since 1.0.15
+     * @return array
+     */
+    public function get_data() {
+        $return = array();
+        foreach( array_keys( $this->data ) as $key ) {
+            $return[ $key ] = $this->get( $key );
+        }
+        return $return;
+    }
+
+    /**
+     * Retrieves discount data as json
+     *
+     * @since 1.0.15
+     * @return string|false
+     */
+    public function get_data_as_json() {
+        return wp_json_encode( $this->get_data() );
+    }
+
+    /**
+     * Checks if a discount can only be used once per user.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function get_is_single_use() {
+        return (bool) apply_filters( 'wpinv_is_discount_single_use', $this->data['is_single_use'], $this->ID, $this, $this->code );
+    }
+
+    /**
+     * Checks if a discount is recurring.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function get_is_recurring() {
+        return (bool) apply_filters( 'wpinv_is_discount_recurring', $this->data['is_recurring'], $this->ID, $this->code, $this );
+    }
+
+    /**
+     * Returns a discount's included items.
+     *
+     * @since 1.0.15
+     * @return array
+     */
+    public function get_items() {
+        return wpinv_parse_list( apply_filters( 'wpinv_get_discount_item_reqs', $this->data['items'], $this->ID, $this, $this->code ) );
+    }
+
+    /**
+     * Returns a discount's discounted amount.
+     *
+     * @since 1.0.15
+     * @return float
+     */
+    public function get_discounted_amount( $amount ) {
+
+        if ( $this->type == 'flat' ) {
             $amount = $amount - $this->amount;
-		} else {
+        } else {
             $amount = $amount - ( $amount * ( $this->amount / 100 ) );
-		}
+        }
 
-		if ( $amount < 0 ) {
-			$amount = 0;
-		}
+        if ( $amount < 0 ) {
+            $amount = 0;
+        }
 
-		return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
-	}
+        return apply_filters( 'wpinv_discounted_amount', $amount, $this->ID, $this, $this->code, $this->amount );
+    }
 	
 }

includes/wpinv-helper-functions.php

Indentation +13 added lines, -13 removed lines

@@ -700,7 +700,7 @@ 
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+    return ini_get( 'arg_separator.output' );
 }
 
 function wpinv_rgb_from_hex( $color ) {
@@ -1038,11 +1038,11 @@ 
  * @return array Sanitized array of values.
  */
 function wpinv_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-	}
+    if ( ! is_array( $list ) ) {
+        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+    }
 
-	return $list;
+    return $list;
 }
 
 /**
@@ -1062,9 +1062,9 @@ 
     }
 
     $data = apply_filters( "wpinv_get_$key", include WPINV_PLUGIN_DIR . "includes/data/$key.php" );
-	wp_cache_set( "wpinv-$key", $data, 'wpinv' );
+    wp_cache_set( "wpinv-$key", $data, 'wpinv' );
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -1093,17 +1093,17 @@ 
  */
 function wpinv_clean( $var ) {
 
-	if ( is_array( $var ) ) {
-		return array_map( 'wpinv_clean', $var );
+    if ( is_array( $var ) ) {
+        return array_map( 'wpinv_clean', $var );
     }
 
     if ( is_object( $var ) ) {
-		$object_vars = get_object_vars( $var );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$var->$property_name = wpinv_clean( $property_value );
+        $object_vars = get_object_vars( $var );
+        foreach ( $object_vars as $property_name => $property_value ) {
+            $var->$property_name = wpinv_clean( $property_value );
         }
         return $var;
-	}
+    }
     
     return is_string( $var ) ? sanitize_text_field( $var ) : $var;
 }
\ No newline at end of file

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

Indentation +310 added lines, -310 removed lines

@@ -1,271 +1,271 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
-	/**
-	 * Allow the quick setup and connection of our AyeCode Connect plugin.
-	 *
-	 * Class AyeCode_Connect_Helper
-	 */
-	class AyeCode_Connect_Helper {
-
-		// Hold the version number
-		var $version = "1.0.3";
-
-		// Hold the default strings.
-		var $strings = array();
-
-		// Hold the default pages.
-		var $pages = array();
-
-		/**
-		 * The constructor.
-		 *
-		 * AyeCode_Connect_Helper constructor.
-		 *
-		 * @param array $strings
-		 * @param array $pages
-		 */
-		public function __construct( $strings = array(), $pages = array() ) {
-
-			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-
-
-				// set default strings
-				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?" ),
-					'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" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site" ),
-					'connecting_button' => __( "Connecting..." ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
-					'error'             => __( "Something went wrong, please refresh and try again." ),
-				);
-				$this->strings   = array_merge( $default_strings, $strings );
-
-
-				// set default pages
-				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
-
-				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
-
-				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
-				}
-			}
-
-			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
-			}
-
-		}
-
-		/**
-		 * Give a way to check we can connect via a external redirect.
-		 */
-		public function ayecode_connect_helper_installed(){
-			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
-			);
-			wp_send_json_success( $active );
-			wp_die();
-		}
-
-		/**
-		 * Get slug from path
-		 *
-		 * @param  string $key
-		 *
-		 * @return string
-		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
-
-			return $slug[0];
-		}
-
-		/**
-		 * Install and activate the AyeCode Connect Plugin
-		 */
-		public function ayecode_connect_install() {
-
-			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-
-			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
-
-			$success     = true;
-			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
-				WP_Filesystem();
-
-				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
-				$plugin_slug       = $plugin_slug;
-				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
-				$installed         = false;
-				$activate          = false;
-
-				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
-					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
-				}
-
-				// Install this thing!
-				if ( ! $installed ) {
-
-					// Suppress feedback
-					ob_start();
-
-					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
-							'slug'   => $plugin_slug,
-							'fields' => array(
-								'short_description' => false,
-								'sections'          => false,
-								'requires'          => false,
-								'rating'            => false,
-								'ratings'           => false,
-								'downloaded'        => false,
-								'last_updated'      => false,
-								'added'             => false,
-								'tags'              => false,
-								'homepage'          => false,
-								'donate_link'       => false,
-								'author_profile'    => false,
-								'author'            => false,
-							),
-						) );
-
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
-						}
-
-						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
-
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
-						}
-
-						$working_dir = $upgrader->unpack_package( $download, true );
-
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
-						}
-
-						$result = $upgrader->install_package( array(
-							'source'                      => $working_dir,
-							'destination'                 => WP_PLUGIN_DIR,
-							'clear_destination'           => false,
-							'abort_if_destination_exists' => false,
-							'clear_working'               => true,
-							'hook_extra'                  => array(
-								'type'   => 'plugin',
-								'action' => 'install',
-							),
-						) );
-
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
-						}
-
-						$activate = true;
-
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-
-					// Discard feedback
-					ob_end_clean();
-				}
-
-				wp_clean_plugins_cache();
-
-				// Activate this thing
-				if ( $activate ) {
-					try {
-						$result = activate_plugin( $plugin );
-
-						if ( is_wp_error( $result ) ) {
-							$success = false;
-						} else {
-							$success = true;
-						}
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-				}
-			}
-
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
-				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
-			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-			wp_die();
-		}
-
-		/**
-		 * Check if maybe localhost.
-		 *
-		 * @return bool
-		 */
-		public function is_localhost() {
-			$localhost = false;
-
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
-			$localhost_domains = array(
-				'localhost',
-				'localhost.localdomain',
-				'127.0.0.1',
-				'::1'
-			);
-
-			if ( in_array( $host, $localhost_domains ) ) {
-				$localhost = true;
-			}
-
-			return $localhost;
-		}
-
-		/**
-		 * Show notice to connect site.
-		 */
-		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
-				$connect_title_string     = $this->strings['connect_title'];
-				$connect_external_string  = $this->strings['connect_external'];
-				$connect_string           = $this->strings['connect'];
-				$connect_button_string    = $this->strings['connect_button'];
-				$connecting_button_string = $this->strings['connecting_button'];
-				?>
+    /**
+     * Allow the quick setup and connection of our AyeCode Connect plugin.
+     *
+     * Class AyeCode_Connect_Helper
+     */
+    class AyeCode_Connect_Helper {
+
+        // Hold the version number
+        var $version = "1.0.3";
+
+        // Hold the default strings.
+        var $strings = array();
+
+        // Hold the default pages.
+        var $pages = array();
+
+        /**
+         * The constructor.
+         *
+         * AyeCode_Connect_Helper constructor.
+         *
+         * @param array $strings
+         * @param array $pages
+         */
+        public function __construct( $strings = array(), $pages = array() ) {
+
+            // Only fire if not localhost and the current user has the right permissions.
+            if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+
+
+                // set default strings
+                $default_strings = array(
+                    'connect_title'     => __( "Thanks for choosing an AyeCode Product!" ),
+                    'connect_external'  => __( "Please confirm you wish to connect your site?" ),
+                    '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" ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+                    'connect_button'    => __( "Connect Site" ),
+                    'connecting_button' => __( "Connecting..." ),
+                    'error_localhost'   => __( "This service will only work with a live domain, not a localhost." ),
+                    'error'             => __( "Something went wrong, please refresh and try again." ),
+                );
+                $this->strings   = array_merge( $default_strings, $strings );
+
+
+                // set default pages
+                $default_pages = array();
+                $this->pages   = array_merge( $default_pages, $pages );
+
+                // maybe show connect site notice
+                add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+
+                // add ajax action if not already added
+                if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
+                    add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+                }
+            }
+
+            // add ajax action if not already added
+            if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
+                add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+            }
+
+        }
+
+        /**
+         * Give a way to check we can connect via a external redirect.
+         */
+        public function ayecode_connect_helper_installed(){
+            $active = array(
+                'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
+                'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
+                'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+            );
+            wp_send_json_success( $active );
+            wp_die();
+        }
+
+        /**
+         * Get slug from path
+         *
+         * @param  string $key
+         *
+         * @return string
+         */
+        private function format_plugin_slug( $key ) {
+            $slug = explode( '/', $key );
+            $slug = explode( '.', end( $slug ) );
+
+            return $slug[0];
+        }
+
+        /**
+         * Install and activate the AyeCode Connect Plugin
+         */
+        public function ayecode_connect_install() {
+
+            // bail if localhost
+            if ( $this->is_localhost() ) {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+
+            // Explicitly clear the event.
+            wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+
+            $success     = true;
+            $plugin_slug = "ayecode-connect";
+            if ( ! empty( $plugin_slug ) ) {
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+                WP_Filesystem();
+
+                $skin              = new Automatic_Upgrader_Skin;
+                $upgrader          = new WP_Upgrader( $skin );
+                $installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+                $plugin_slug       = $plugin_slug;
+                $plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+                $installed         = false;
+                $activate          = false;
+
+                // See if the plugin is installed already
+                if ( in_array( $plugin_slug, $installed_plugins ) ) {
+                    $installed = true;
+                    $activate  = ! is_plugin_active( $plugin );
+                }
+
+                // Install this thing!
+                if ( ! $installed ) {
+
+                    // Suppress feedback
+                    ob_start();
+
+                    try {
+                        $plugin_information = plugins_api( 'plugin_information', array(
+                            'slug'   => $plugin_slug,
+                            'fields' => array(
+                                'short_description' => false,
+                                'sections'          => false,
+                                'requires'          => false,
+                                'rating'            => false,
+                                'ratings'           => false,
+                                'downloaded'        => false,
+                                'last_updated'      => false,
+                                'added'             => false,
+                                'tags'              => false,
+                                'homepage'          => false,
+                                'donate_link'       => false,
+                                'author_profile'    => false,
+                                'author'            => false,
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $plugin_information ) ) {
+                            throw new Exception( $plugin_information->get_error_message() );
+                        }
+
+                        $package  = $plugin_information->download_link;
+                        $download = $upgrader->download_package( $package );
+
+                        if ( is_wp_error( $download ) ) {
+                            throw new Exception( $download->get_error_message() );
+                        }
+
+                        $working_dir = $upgrader->unpack_package( $download, true );
+
+                        if ( is_wp_error( $working_dir ) ) {
+                            throw new Exception( $working_dir->get_error_message() );
+                        }
+
+                        $result = $upgrader->install_package( array(
+                            'source'                      => $working_dir,
+                            'destination'                 => WP_PLUGIN_DIR,
+                            'clear_destination'           => false,
+                            'abort_if_destination_exists' => false,
+                            'clear_working'               => true,
+                            'hook_extra'                  => array(
+                                'type'   => 'plugin',
+                                'action' => 'install',
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $result ) ) {
+                            throw new Exception( $result->get_error_message() );
+                        }
+
+                        $activate = true;
+
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+
+                    // Discard feedback
+                    ob_end_clean();
+                }
+
+                wp_clean_plugins_cache();
+
+                // Activate this thing
+                if ( $activate ) {
+                    try {
+                        $result = activate_plugin( $plugin );
+
+                        if ( is_wp_error( $result ) ) {
+                            $success = false;
+                        } else {
+                            $success = true;
+                        }
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+                }
+            }
+
+            if ( $success && function_exists( 'ayecode_connect_args' ) ) {
+                ayecode_connect();// init
+                $args        = ayecode_connect_args();
+                $client      = new AyeCode_Connect( $args );
+                $redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
+                $redirect    = $client->build_connect_url( $redirect_to );
+                wp_send_json_success( array( 'connect_url' => $redirect ) );
+            } else {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+            wp_die();
+        }
+
+        /**
+         * Check if maybe localhost.
+         *
+         * @return bool
+         */
+        public function is_localhost() {
+            $localhost = false;
+
+            $host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+            $localhost_domains = array(
+                'localhost',
+                'localhost.localdomain',
+                '127.0.0.1',
+                '::1'
+            );
+
+            if ( in_array( $host, $localhost_domains ) ) {
+                $localhost = true;
+            }
+
+            return $localhost;
+        }
+
+        /**
+         * Show notice to connect site.
+         */
+        public function ayecode_connect_install_notice() {
+            if ( $this->maybe_show() ) {
+                $connect_title_string     = $this->strings['connect_title'];
+                $connect_external_string  = $this->strings['connect_external'];
+                $connect_string           = $this->strings['connect'];
+                $connect_button_string    = $this->strings['connect_button'];
+                $connecting_button_string = $this->strings['connecting_button'];
+                ?>
 				<div class="notice notice-info acch-notice">
 					<span class="acch-float-left">
 						<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1"
@@ -304,8 +304,8 @@ 
 						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
 					<p>
 						<?php
-						echo $connect_string;
-						?>
+                        echo $connect_string;
+                        ?>
 					</p>
 					</span>
 
@@ -318,9 +318,9 @@ 
 				</div>
 
 				<?php
-				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-					?>
+                // only include the popup HTML if needed.
+                if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                    ?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
 					<span class="acch-float-left">
@@ -369,23 +369,23 @@ 
 						</div>
 					</div>
 					<?php
-				}
-
-				// add required scripts
-				$this->script();
-			}
-		}
-
-		/**
-		 * Get the JS Script.
-		 */
-		public function script() {
-
-			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-				add_thickbox();
-			}
-			?>
+                }
+
+                // add required scripts
+                $this->script();
+            }
+        }
+
+        /**
+         * Get the JS Script.
+         */
+        public function script() {
+
+            // add thickbox if external request is requested
+            if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                add_thickbox();
+            }
+            ?>
 			<style>
 				.acch-title {
 					margin: 0;
@@ -454,43 +454,43 @@ 
 
 
 				<?php
-				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
-				?>
+                // add thickbox if external request is requested
+                if(! empty( $_REQUEST['external-connect-request'] )) {
+                ?>
 				jQuery(function () {
 					setTimeout(function () {
 						tb_show("AyeCode Connect", "?TB_inline?width=300&height=80&inlineId=ayecode-connect-helper-external-confirm");
 					}, 200);
 				});
 				<?php
-				}
-				?>
+                }
+                ?>
 
 			</script>
 			<?php
-		}
-
-		/**
-		 * Decide what pages to show on.
-		 *
-		 * @return bool
-		 */
-		public function maybe_show() {
-			$show = false;
-
-			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-
-				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
-					$show = true;
-				}
+        }
+
+        /**
+         * Decide what pages to show on.
+         *
+         * @return bool
+         */
+        public function maybe_show() {
+            $show = false;
+
+            // check if on a page set to show
+            if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+
+                // check if not active and connected
+                if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+                    $show = true;
+                }
 
-			}
+            }
 
-			return $show;
-		}
+            return $show;
+        }
 
-	}
+    }
 
 }