AyeCode / invoicing

includes/admin/views/html-gateways-edit.php

Indentation +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
                         <?php
 
                             if ( wpinv_is_gateway_active( $id ) ) {
-							echo "<i class='text-success fa fa-check'></i>";
+                            echo "<i class='text-success fa fa-check'></i>";
                             } else {
-							echo "<i class='text-dark fa fa-times'></i>";
+                            echo "<i class='text-dark fa fa-times'></i>";
                             }
 
                         ?>
@@ -58,9 +58,9 @@ 
                             $supports = apply_filters( 'getapid_gateway_supports_subscription', $supports, $id );
 
                             if ( $supports ) {
-							echo "<i class='text-success fa fa-check'></i>";
+                            echo "<i class='text-success fa fa-check'></i>";
                             } else {
-							echo "<i class='text-dark fa fa-times'></i>";
+                            echo "<i class='text-dark fa fa-times'></i>";
                             }
 
                         ?>

Spacing +15 added lines, -15 removed lines

@@ -4,29 +4,29 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $gateways = wpinv_get_payment_gateways();
-ksort( $gateways );
+ksort($gateways);
 
 ?>
 <div class="table-responsive">
     <table id="wpinv_gateways_select" class="table border bg-white form-table">
-        <caption><?php echo esc_html_e( 'This table displays installed payment methods.', 'invoicing' ); ?></caption>
+        <caption><?php echo esc_html_e('This table displays installed payment methods.', 'invoicing'); ?></caption>
 
         <thead>
             <tr class="table-light">
 
                 <th scope="col" class="border-bottom border-top text-left">
-                    <?php esc_html_e( 'Payment Method', 'invoicing' ); ?>
+                    <?php esc_html_e('Payment Method', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-center">
-                    <?php esc_html_e( 'Enabled', 'invoicing' ); ?>
+                    <?php esc_html_e('Enabled', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-center">
-                    <?php esc_html_e( 'Supports Subscriptions', 'invoicing' ); ?>
+                    <?php esc_html_e('Supports Subscriptions', 'invoicing'); ?>
                 </th>
 
                 <th scope="col" class="border-bottom border-top text-right" style="width:32px">&nbsp;</th>
@@ -35,15 +35,15 @@ 
         </thead>
 
         <tbody>
-            <?php foreach ( $gateways as $id => $gateway ) : ?>
+            <?php foreach ($gateways as $id => $gateway) : ?>
                 <tr>
                     <td class="getpaid-payment-method text-left">
-                        <a style="color: #0073aa;" href="<?php echo esc_url( add_query_arg( 'section', $id ) ); ?>" class="font-weight-bold"><?php echo esc_html( $gateway['admin_label'] ); ?></a>
+                        <a style="color: #0073aa;" href="<?php echo esc_url(add_query_arg('section', $id)); ?>" class="font-weight-bold"><?php echo esc_html($gateway['admin_label']); ?></a>
                     </td>
                     <td class="getpaid-payment-method-enabled text-center">
                         <?php
 
-                            if ( wpinv_is_gateway_active( $id ) ) {
+                            if (wpinv_is_gateway_active($id)) {
 							echo "<i class='text-success fa fa-check'></i>";
                             } else {
 							echo "<i class='text-dark fa fa-times'></i>";
@@ -54,10 +54,10 @@ 
                     <td class="getpaid-payment-method-subscription text-center">
                         <?php
 
-                            $supports = apply_filters( "wpinv_{$id}_support_subscription", false );
-                            $supports = apply_filters( 'getapid_gateway_supports_subscription', $supports, $id );
+                            $supports = apply_filters("wpinv_{$id}_support_subscription", false);
+                            $supports = apply_filters('getapid_gateway_supports_subscription', $supports, $id);
 
-                            if ( $supports ) {
+                            if ($supports) {
 							echo "<i class='text-success fa fa-check'></i>";
                             } else {
 							echo "<i class='text-dark fa fa-times'></i>";
@@ -67,7 +67,7 @@ 
                     </td>
 
                     <td class="getpaid-payment-method-action text-right">
-                        <a class="button button-secondary" href="<?php echo esc_url( add_query_arg( 'section', $id ) ); ?>"><?php esc_html_e( 'Manage', 'invoicing' ); ?></a>
+                        <a class="button button-secondary" href="<?php echo esc_url(add_query_arg('section', $id)); ?>"><?php esc_html_e('Manage', 'invoicing'); ?></a>
                     </td>
 
                 </tr>
@@ -77,8 +77,8 @@ 
         <tfoot>
             <tr class="table-light">
                 <td colspan="4" class="border-top">
-                    <a class="button button-secondary getpaid-install-gateways" href="<?php echo esc_url( admin_url( 'admin.php?page=wpi-addons&tab=gateways' ) ); ?>">
-                        <span><?php esc_html_e( 'Add Payment Methods', 'invoicing' ); ?></span>
+                    <a class="button button-secondary getpaid-install-gateways" href="<?php echo esc_url(admin_url('admin.php?page=wpi-addons&tab=gateways')); ?>">
+                        <span><?php esc_html_e('Add Payment Methods', 'invoicing'); ?></span>
                     </a>
                 </td>
             </tr>

includes/admin/views/wizard-plugins.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 						<input type="checkbox" name="plugins[<?php echo esc_attr( $plugin['slug'] ); ?>]" value="<?php echo esc_attr( $plugin['file'] ); ?>" class="custom-control-input"  
                                                                         <?php
                         if ( is_plugin_active( $plugin['slug'] ) ) {
-																								echo 'checked';}
+                                                                                                echo 'checked';}
 ?>
 >
 						<label class="custom-control-label" for="ac-setting-updates"></label>

Spacing +14 added lines, -14 removed lines

@@ -4,35 +4,35 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class="card shadow-sm my-5">'
 
-    <form method="post" class="text-center card-body" action="<?php echo esc_url( admin_url() ); ?>">
-		<?php getpaid_hidden_field( 'getpaid-admin-action', 'install_plugin' ); ?>
-		<?php wp_nonce_field( 'getpaid-nonce', 'getpaid-nonce' ); ?>
-		<?php getpaid_hidden_field( 'redirect', $next_url ); ?>
+    <form method="post" class="text-center card-body" action="<?php echo esc_url(admin_url()); ?>">
+		<?php getpaid_hidden_field('getpaid-admin-action', 'install_plugin'); ?>
+		<?php wp_nonce_field('getpaid-nonce', 'getpaid-nonce'); ?>
+		<?php getpaid_hidden_field('redirect', $next_url); ?>
 		<div class="gd-wizard-recommend">
 
-			<h2 class="gd-settings-title h3"><?php esc_html_e( 'Recommended Plugins', 'invoicing' ); ?></h2>
-			<p><?php esc_html_e( 'Below are a few of our own plugins that may help you.', 'invoicing' ); ?></p>
+			<h2 class="gd-settings-title h3"><?php esc_html_e('Recommended Plugins', 'invoicing'); ?></h2>
+			<p><?php esc_html_e('Below are a few of our own plugins that may help you.', 'invoicing'); ?></p>
 
 			<ul class="list-group">
-				<?php foreach ( $recommended_plugins as $plugin ) : ?>
+				<?php foreach ($recommended_plugins as $plugin) : ?>
 				<li class="list-group-item d-flex justify-content-between align-items-center flex-wrap text-left">
-					<span class="mr-auto"><?php echo esc_html( $plugin['name'] ); ?></span>
+					<span class="mr-auto"><?php echo esc_html($plugin['name']); ?></span>
 					<div class="custom-control custom-switch getpaid-install-plugin-siwtch-div mr-n2">
-						<input type="checkbox" name="plugins[<?php echo esc_attr( $plugin['slug'] ); ?>]" value="<?php echo esc_attr( $plugin['file'] ); ?>" class="custom-control-input"  
+						<input type="checkbox" name="plugins[<?php echo esc_attr($plugin['slug']); ?>]" value="<?php echo esc_attr($plugin['file']); ?>" class="custom-control-input"  
                                                                         <?php
-                        if ( is_plugin_active( $plugin['slug'] ) ) {
-																								echo 'checked';}
+                        if (is_plugin_active($plugin['slug'])) {
+																								echo 'checked'; }
 ?>
 >
 						<label class="custom-control-label" for="ac-setting-updates"></label>
 					</div>
-					<small class="w-100"><?php echo esc_attr( $plugin['desc'] ); ?></small>
+					<small class="w-100"><?php echo esc_attr($plugin['desc']); ?></small>
 				</li>
 				<?php endforeach; ?>
 			</ul>
@@ -41,7 +41,7 @@ 
 				<input
                 	type="submit"
                 	class="btn btn-primary button-next"
-				    value="<?php esc_attr_e( 'Continue', 'invoicing' ); ?>" name="save_step"/>
+				    value="<?php esc_attr_e('Continue', 'invoicing'); ?>" name="save_step"/>
 			</p>
 
 		</div>

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

Indentation +34 added lines, -34 removed lines

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

Spacing +19 added lines, -19 removed lines

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

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

Indentation +26 added lines, -26 removed lines

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

Spacing +123 added lines, -123 removed lines

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

Braces +35 added lines, -14 removed lines

@@ -154,9 +154,12 @@ 
                                         <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
                                     </span>
                                 </div>
-                            <?php else : ?>
+                            <?php else {
+    : ?>
                                 <span class="input-group-text left wpinv-if-flat">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post( wpinv_currency_symbol() );
+}
+?>
                                 </span>
                             <?php endif; ?>
                         <?php endif; ?>
@@ -170,9 +173,12 @@ 
                                         <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
                                     </span>
                                 </div>
-                            <?php else : ?>
+                            <?php else {
+    : ?>
                                 <span class="input-group-text left wpinv-if-flat">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post( wpinv_currency_symbol() );
+}
+?>
                                 </span>
                             <?php endif; ?>
                         <?php endif; ?>
@@ -180,9 +186,12 @@ 
                             <div class="input-group-append right wpinv-if-percent">
                                 <span class="input-group-text">%</span>
                             </div>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="input-group-text right wpinv-if-percent">%</span>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </div>
                 </div>
                 <div class="col-sm-1 pt-2 pl-0">
@@ -357,9 +366,12 @@ 
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
                                 </div>
-                            <?php else : ?>
+                            <?php else {
+    : ?>
                                 <span class="input-group-text">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post( wpinv_currency_symbol() );
+}
+?>
                                 </span>
                             <?php endif; ?>
                         <?php endif; ?>
@@ -371,9 +383,12 @@ 
                                 <div class="input-group-append">
                                     <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
                                 </div>
-                            <?php else : ?>
+                            <?php else {
+    : ?>
                                 <span class="input-group-text">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post( wpinv_currency_symbol() );
+}
+?>
                                 </span>
                             <?php endif; ?>
                         <?php endif; ?>
@@ -397,9 +412,12 @@ 
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
                                 </div>
-                            <?php else : ?>
+                            <?php else {
+    : ?>
                                 <span class="input-group-text">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post( wpinv_currency_symbol() );
+}
+?>
                                 </span>
                             <?php endif; ?>
                         <?php endif; ?>
@@ -411,9 +429,12 @@ 
                                 <div class="input-group-append">
                                     <span class="input-group-text"><?php echo wp_kses_post( wpinv_currency_symbol() ); ?></span>
                                 </div>
-                            <?php else : ?>
+                            <?php else {
+    : ?>
                                 <span class="input-group-text">
-                                    <?php echo wp_kses_post( wpinv_currency_symbol() ); ?>
+                                    <?php echo wp_kses_post( wpinv_currency_symbol() );
+}
+?>
                                 </span>
                             <?php endif; ?>
                         <?php endif; ?>

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

Indentation +11 added lines, -11 removed lines

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

Spacing +78 added lines, -78 removed lines

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

includes/api/class-getpaid-rest-controller.php

Indentation +539 added lines, -539 removed lines

@@ -21,569 +21,569 @@
  */
 class GetPaid_REST_Controller extends WP_REST_Controller {
 
-	/**
+    /**
      * The namespaces of this controller's route.
      *
      * @since 1.0.19
      * @var array
      */
-	protected $namespaces;
+    protected $namespaces;
 
-	/**
+    /**
      * The official namespace of this controller's route.
      *
      * @since 1.0.19
      * @var string
      */
-	protected $namespace = 'getpaid/v1';
+    protected $namespace = 'getpaid/v1';
 
-	/**
+    /**
      * Cached results of get_item_schema.
      *
      * @since 1.0.19
      * @var array
      */
-	protected $schema;
+    protected $schema;
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.19
-	 *
-	 */
-	public function __construct() {
-
-		// Offer several namespaces for backwards compatibility.
-		$this->namespaces = apply_filters(
-			'getpaid_rest_api_namespaces',
-			array(
-				'getpaid/v1',
-				'invoicing/v1',
-				'wpi/v1',
-			)
-		);
-
-		// Register REST routes.
+     * Constructor.
+     *
+     * @since 1.0.19
+     *
+     */
+    public function __construct() {
+
+        // Offer several namespaces for backwards compatibility.
+        $this->namespaces = apply_filters(
+            'getpaid_rest_api_namespaces',
+            array(
+                'getpaid/v1',
+                'invoicing/v1',
+                'wpi/v1',
+            )
+        );
+
+        // Register REST routes.
         add_action( 'rest_api_init', array( $this, 'register_routes' ) );
 
-	}
-
-	/**
-	 * Registers routes for each namespace.
-	 *
-	 * @since 1.0.19
-	 *
-	 */
-	public function register_routes() {
-
-		foreach ( $this->namespaces as $namespace ) {
-			$this->register_namespace_routes( $namespace );
-		}
-
-	}
-
-	/**
-	 * Registers routes for a namespace.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $namespace
-	 */
-	public function register_namespace_routes( /** @scrutinizer ignore-unused */ $namespace ) {
-
-		getpaid_doing_it_wrong(
-			__CLASS__ . '::' . __METHOD__,
-			/* translators: %s: register_namespace_routes() */
-			sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ),
-			'1.0.19'
-		);
-
-	}
-
-	/**
-	 * Get normalized rest base.
-	 *
-	 * @return string
-	 */
-	protected function get_normalized_rest_base() {
-		return preg_replace( '/\(.*\)\//i', '', $this->rest_base );
-	}
-
-	/**
-	 * Fill batches.
-	 *
-	 * @param array array of request items.
-	 * @return array
-	 */
-	protected function fill_batch_keys( $items ) {
-
-		$items['create'] = empty( $items['create'] ) ? array() : $items['create'];
-		$items['update'] = empty( $items['update'] ) ? array() : $items['update'];
-		$items['delete'] = empty( $items['delete'] ) ? array() : wp_parse_id_list( $items['delete'] );
-		return $items;
-
-	}
-
-	/**
-	 * Check batch limit.
-	 *
-	 * @param array $items Request items.
-	 * @return bool|WP_Error
-	 */
-	protected function check_batch_limit( $items ) {
-		$limit = apply_filters( 'getpaid_rest_batch_items_limit', 100, $this->get_normalized_rest_base() );
-		$total = count( $items['create'] ) + count( $items['update'] ) + count( $items['delete'] );
-
-		if ( $total > $limit ) {
-			/* translators: %s: items limit */
-			return new WP_Error( 'getpaid_rest_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'invoicing' ), $limit ), array( 'status' => 413 ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Bulk create items.
-	 *
-	 * @param array $items Array of items to create.
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @param WP_REST_Server $wp_rest_server
-	 * @return array()
-	 */
-	protected function batch_create_items( $items, $request, $wp_rest_server ) {
-
-		$query  = $request->get_query_params();
-		$create = array();
-
-		foreach ( $items as $item ) {
-			$_item = new WP_REST_Request( 'POST' );
-
-			// Default parameters.
-			$defaults = array();
-			$schema   = $this->get_public_item_schema();
-			foreach ( $schema['properties'] as $arg => $options ) {
-				if ( isset( $options['default'] ) ) {
-					$defaults[ $arg ] = $options['default'];
-				}
-			}
-			$_item->set_default_params( $defaults );
-
-			// Set request parameters.
-			$_item->set_body_params( $item );
-
-			// Set query (GET) parameters.
-			$_item->set_query_params( $query );
-
-			// Create the item.
-			$_response = $this->create_item( $_item );
-
-			// If an error occured...
-			if ( is_wp_error( $_response ) ) {
-
-				$create[]   = array(
-					'id'    => 0,
-					'error' => array(
-						'code'    => $_response->get_error_code(),
-						'message' => $_response->get_error_message(),
-						'data'    => $_response->get_error_data(),
-					),
-				);
-
-				continue;
-			}
-
-			$create[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
-
-		}
-
-		return $create;
+    }
+
+    /**
+     * Registers routes for each namespace.
+     *
+     * @since 1.0.19
+     *
+     */
+    public function register_routes() {
+
+        foreach ( $this->namespaces as $namespace ) {
+            $this->register_namespace_routes( $namespace );
+        }
+
+    }
+
+    /**
+     * Registers routes for a namespace.
+     *
+     * @since 1.0.19
+     *
+     * @param string $namespace
+     */
+    public function register_namespace_routes( /** @scrutinizer ignore-unused */ $namespace ) {
+
+        getpaid_doing_it_wrong(
+            __CLASS__ . '::' . __METHOD__,
+            /* translators: %s: register_namespace_routes() */
+            sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ),
+            '1.0.19'
+        );
+
+    }
+
+    /**
+     * Get normalized rest base.
+     *
+     * @return string
+     */
+    protected function get_normalized_rest_base() {
+        return preg_replace( '/\(.*\)\//i', '', $this->rest_base );
+    }
+
+    /**
+     * Fill batches.
+     *
+     * @param array array of request items.
+     * @return array
+     */
+    protected function fill_batch_keys( $items ) {
+
+        $items['create'] = empty( $items['create'] ) ? array() : $items['create'];
+        $items['update'] = empty( $items['update'] ) ? array() : $items['update'];
+        $items['delete'] = empty( $items['delete'] ) ? array() : wp_parse_id_list( $items['delete'] );
+        return $items;
+
+    }
+
+    /**
+     * Check batch limit.
+     *
+     * @param array $items Request items.
+     * @return bool|WP_Error
+     */
+    protected function check_batch_limit( $items ) {
+        $limit = apply_filters( 'getpaid_rest_batch_items_limit', 100, $this->get_normalized_rest_base() );
+        $total = count( $items['create'] ) + count( $items['update'] ) + count( $items['delete'] );
+
+        if ( $total > $limit ) {
+            /* translators: %s: items limit */
+            return new WP_Error( 'getpaid_rest_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'invoicing' ), $limit ), array( 'status' => 413 ) );
+        }
+
+        return true;
+    }
+
+    /**
+     * Bulk create items.
+     *
+     * @param array $items Array of items to create.
+     * @param WP_REST_Request $request Full details about the request.
+     * @param WP_REST_Server $wp_rest_server
+     * @return array()
+     */
+    protected function batch_create_items( $items, $request, $wp_rest_server ) {
+
+        $query  = $request->get_query_params();
+        $create = array();
+
+        foreach ( $items as $item ) {
+            $_item = new WP_REST_Request( 'POST' );
+
+            // Default parameters.
+            $defaults = array();
+            $schema   = $this->get_public_item_schema();
+            foreach ( $schema['properties'] as $arg => $options ) {
+                if ( isset( $options['default'] ) ) {
+                    $defaults[ $arg ] = $options['default'];
+                }
+            }
+            $_item->set_default_params( $defaults );
+
+            // Set request parameters.
+            $_item->set_body_params( $item );
+
+            // Set query (GET) parameters.
+            $_item->set_query_params( $query );
+
+            // Create the item.
+            $_response = $this->create_item( $_item );
+
+            // If an error occured...
+            if ( is_wp_error( $_response ) ) {
+
+                $create[]   = array(
+                    'id'    => 0,
+                    'error' => array(
+                        'code'    => $_response->get_error_code(),
+                        'message' => $_response->get_error_message(),
+                        'data'    => $_response->get_error_data(),
+                    ),
+                );
+
+                continue;
+            }
+
+            $create[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
+
+        }
+
+        return $create;
+
+    }
+
+    /**
+     * Bulk update items.
+     *
+     * @param array $items Array of items to update.
+     * @param WP_REST_Request $request Full details about the request.
+     * @param WP_REST_Server $wp_rest_server
+     * @return array()
+     */
+    protected function batch_update_items( $items, $request, $wp_rest_server ) {
+
+        $query  = $request->get_query_params();
+        $update = array();
+
+        foreach ( $items as $item ) {
+
+            // Create a dummy request.
+            $_item = new WP_REST_Request( 'PUT' );
+
+            // Add body params.
+            $_item->set_body_params( $item );
+
+            // Set query (GET) parameters.
+            $_item->set_query_params( $query );
+
+            // Update the item.
+            $_response = $this->update_item( $_item );
+
+            // If an error occured...
+            if ( is_wp_error( $_response ) ) {
+
+                $update[] = array(
+                    'id'    => $item['id'],
+                    'error' => array(
+                        'code'    => $_response->get_error_code(),
+                        'message' => $_response->get_error_message(),
+                        'data'    => $_response->get_error_data(),
+                    ),
+                );
+
+                continue;
+
+            }
+
+            $update[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
+
+        }
+
+        return $update;
+
+    }
+
+    /**
+     * Bulk delete items.
+     *
+     * @param array $items Array of items to delete.
+     * @param WP_REST_Server $wp_rest_server
+     * @return array()
+     */
+    protected function batch_delete_items( $items, $wp_rest_server ) {
+
+        $delete = array();
+
+        foreach ( array_filter( $items ) as $id ) {
+
+            // Prepare the request.
+            $_item = new WP_REST_Request( 'DELETE' );
+            $_item->set_query_params(
+                array(
+                    'id'    => $id,
+                    'force' => true,
+                )
+            );
+
+            // Delete the item.
+            $_response = $this->delete_item( $_item );
+
+            if ( is_wp_error( $_response ) ) {
+
+                $delete[] = array(
+                    'id'    => $id,
+                    'error' => array(
+                        'code'    => $_response->get_error_code(),
+                        'message' => $_response->get_error_message(),
+                        'data'    => $_response->get_error_data(),
+                    ),
+                );
+
+                continue;
+            }
 
-	}
-
-	/**
-	 * Bulk update items.
-	 *
-	 * @param array $items Array of items to update.
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @param WP_REST_Server $wp_rest_server
-	 * @return array()
-	 */
-	protected function batch_update_items( $items, $request, $wp_rest_server ) {
-
-		$query  = $request->get_query_params();
-		$update = array();
-
-		foreach ( $items as $item ) {
-
-			// Create a dummy request.
-			$_item = new WP_REST_Request( 'PUT' );
-
-			// Add body params.
-			$_item->set_body_params( $item );
-
-			// Set query (GET) parameters.
-			$_item->set_query_params( $query );
-
-			// Update the item.
-			$_response = $this->update_item( $_item );
-
-			// If an error occured...
-			if ( is_wp_error( $_response ) ) {
-
-				$update[] = array(
-					'id'    => $item['id'],
-					'error' => array(
-						'code'    => $_response->get_error_code(),
-						'message' => $_response->get_error_message(),
-						'data'    => $_response->get_error_data(),
-					),
-				);
-
-				continue;
-
-			}
-
-			$update[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
-
-		}
-
-		return $update;
-
-	}
+            $delete[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
 
-	/**
-	 * Bulk delete items.
-	 *
-	 * @param array $items Array of items to delete.
-	 * @param WP_REST_Server $wp_rest_server
-	 * @return array()
-	 */
-	protected function batch_delete_items( $items, $wp_rest_server ) {
-
-		$delete = array();
-
-		foreach ( array_filter( $items ) as $id ) {
-
-			// Prepare the request.
-			$_item = new WP_REST_Request( 'DELETE' );
-			$_item->set_query_params(
-				array(
-					'id'    => $id,
-					'force' => true,
-				)
-			);
-
-			// Delete the item.
-			$_response = $this->delete_item( $_item );
-
-			if ( is_wp_error( $_response ) ) {
-
-				$delete[] = array(
-					'id'    => $id,
-					'error' => array(
-						'code'    => $_response->get_error_code(),
-						'message' => $_response->get_error_message(),
-						'data'    => $_response->get_error_data(),
-					),
-				);
-
-				continue;
-			}
-
-			$delete[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
-
-		}
-
-		return $delete;
-
-	}
-
-	/**
-	 * Bulk create, update and delete items.
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_Error|array.
-	 */
-	public function batch_items( $request ) {
-		global $wp_rest_server;
-
-		// Prepare the batch items.
-		$items = $this->fill_batch_keys( array_filter( $request->get_params() ) );
-
-		// Ensure that the batch has not exceeded the limit to prevent abuse.
-		$limit = $this->check_batch_limit( $items );
-		if ( is_wp_error( $limit ) ) {
-			return $limit;
-		}
-
-		// Process the items.
-		return array(
-			'create' => $this->batch_create_items( $items['create'], $request, $wp_rest_server ),
-			'update' => $this->batch_update_items( $items['update'], $request, $wp_rest_server ),
-			'delete' => $this->batch_delete_items( $items['delete'], $wp_rest_server ),
-		);
-
-	}
-
-	/**
-	 * Add meta query.
-	 *
-	 * @since 1.0.19
-	 * @param array $args       Query args.
-	 * @param array $meta_query Meta query.
-	 * @return array
-	 */
-	protected function add_meta_query( $args, $meta_query ) {
-		if ( empty( $args['meta_query'] ) ) {
-			$args['meta_query'] = array();
-		}
-
-		$args['meta_query'][] = $meta_query;
-
-		return $args['meta_query'];
-	}
-
-	/**
-	 * Get the batch schema, conforming to JSON Schema.
-	 *
-	 * @return array
-	 */
-	public function get_public_batch_schema() {
-
-		return array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => 'batch',
-			'type'       => 'object',
-			'properties' => array(
-				'create' => array(
-					'description' => __( 'List of created resources.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
-					'items'       => array(
-						'type' => 'object',
-					),
-				),
-				'update' => array(
-					'description' => __( 'List of updated resources.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
-					'items'       => array(
-						'type' => 'object',
-					),
-				),
-				'delete' => array(
-					'description' => __( 'List of deleted resources.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
-					'items'       => array(
-						'type' => 'integer',
-					),
-				),
-			),
-		);
-
-	}
-
-	/**
-	 * Returns the value of schema['properties']
-	 *
-	 * i.e Schema fields.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	protected function get_schema_properties() {
-
-		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
-
-		// For back-compat, include any field with an empty schema
-		// because it won't be present in $this->get_item_schema().
-		foreach ( $this->get_additional_fields() as $field_name => $field_options ) {
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
-			}
-		}
-
-		return $properties;
-	}
-
-	/**
-	 * Filters fields by context.
-	 *
-	 * @param array $fields Array of fields
-	 * @param string|null context view, edit or embed
-	 * @since 1.0.19
-	 * @return array
-	 */
-	protected function filter_response_fields_by_context( $fields, $context ) {
-
-		if ( empty( $context ) ) {
-			return $fields;
-		}
-
-		foreach ( $fields as $name => $options ) {
-			if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-				unset( $fields[ $name ] );
-			}
-		}
-
-		return $fields;
-
-	}
-
-	/**
-	 * Filters fields by an array of requested fields.
-	 *
-	 * @param array $fields Array of available fields
-	 * @param array $requested array of requested fields.
-	 * @since 1.0.19
-	 * @return array
-	 */
-	protected function filter_response_fields_by_array( $fields, $requested ) {
-
-		// Trim off any whitespace from the list array.
-		$requested = array_map( 'trim', $requested );
-
-		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
-			$requested[] = 'id';
-		}
-
-		// Get rid of duplicate fields.
-		$requested = array_unique( $requested );
-
-		// Return the list of all included fields which are available.
-		return array_reduce(
-			$requested,
-			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()
-		);
-
-	}
-
-	/**
-	 * Gets an array of fields to be included on the response.
-	 *
-	 * Included fields are based on item schema and `_fields=` request argument.
-	 * Copied from WordPress 5.3 to support old versions.
-	 *
-	 * @since 1.0.19
-	 * @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 ) {
-
-		// Retrieve fields in the schema.
-		$properties = $this->get_schema_properties();
-
-		// Exclude fields that specify a different context than the request context.
-		$properties = $this->filter_response_fields_by_context( $properties, $request['context'] );
-
-		// We only need the field keys.
-		$fields = array_keys( $properties );
-
-		// Is the user filtering the response fields??
-		if ( empty( $request['_fields'] ) ) {
-			return $fields;
-		}
-
-		return $this->filter_response_fields_by_array( $fields, wpinv_parse_list( $request['_fields'] ) );
-
-	}
-
-	/**
-	 * Limits an object to the requested fields.
-	 *
-	 * Included fields are based on the `_fields` request argument.
-	 *
-	 * @since 1.0.19
-	 * @param array $data Fields to include in the response.
-	 * @param array $fields Requested fields.
-	 * @return array Fields to be included in the response.
-	 */
-	public function limit_object_to_requested_fields( $data, $fields, $prefix = '' ) {
-
-		// Is the user filtering the response fields??
-		if ( empty( $fields ) ) {
-			return $data;
-		}
-
-		foreach ( $data as $key => $value ) {
-
-			// Numeric arrays.
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$data[ $key ] = $this->limit_object_to_requested_fields( $value, $fields, $prefix );
-				continue;
-			}
-
-			// Generate a new prefix.
-			$new_prefix = empty( $prefix ) ? $key : "$prefix.$key";
-
-			// Check if it was requested.
-			if ( ! empty( $key ) && ! $this->is_field_included( $new_prefix, $fields ) ) {
-				unset( $data[ $key ] );
-				continue;
-			}
-
-			if ( $key != 'meta_data' && is_array( $value ) ) {
-				$data[ $key ] = $this->limit_object_to_requested_fields( $value, $fields, $new_prefix );
-			}
+        }
+
+        return $delete;
+
+    }
+
+    /**
+     * Bulk create, update and delete items.
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_Error|array.
+     */
+    public function batch_items( $request ) {
+        global $wp_rest_server;
+
+        // Prepare the batch items.
+        $items = $this->fill_batch_keys( array_filter( $request->get_params() ) );
+
+        // Ensure that the batch has not exceeded the limit to prevent abuse.
+        $limit = $this->check_batch_limit( $items );
+        if ( is_wp_error( $limit ) ) {
+            return $limit;
+        }
+
+        // Process the items.
+        return array(
+            'create' => $this->batch_create_items( $items['create'], $request, $wp_rest_server ),
+            'update' => $this->batch_update_items( $items['update'], $request, $wp_rest_server ),
+            'delete' => $this->batch_delete_items( $items['delete'], $wp_rest_server ),
+        );
+
+    }
+
+    /**
+     * Add meta query.
+     *
+     * @since 1.0.19
+     * @param array $args       Query args.
+     * @param array $meta_query Meta query.
+     * @return array
+     */
+    protected function add_meta_query( $args, $meta_query ) {
+        if ( empty( $args['meta_query'] ) ) {
+            $args['meta_query'] = array();
+        }
+
+        $args['meta_query'][] = $meta_query;
+
+        return $args['meta_query'];
+    }
+
+    /**
+     * Get the batch schema, conforming to JSON Schema.
+     *
+     * @return array
+     */
+    public function get_public_batch_schema() {
+
+        return array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => 'batch',
+            'type'       => 'object',
+            'properties' => array(
+                'create' => array(
+                    'description' => __( 'List of created resources.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit' ),
+                    'items'       => array(
+                        'type' => 'object',
+                    ),
+                ),
+                'update' => array(
+                    'description' => __( 'List of updated resources.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit' ),
+                    'items'       => array(
+                        'type' => 'object',
+                    ),
+                ),
+                'delete' => array(
+                    'description' => __( 'List of deleted resources.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit' ),
+                    'items'       => array(
+                        'type' => 'integer',
+                    ),
+                ),
+            ),
+        );
+
+    }
+
+    /**
+     * Returns the value of schema['properties']
+     *
+     * i.e Schema fields.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    protected function get_schema_properties() {
+
+        $schema     = $this->get_item_schema();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+
+        // For back-compat, include any field with an empty schema
+        // because it won't be present in $this->get_item_schema().
+        foreach ( $this->get_additional_fields() as $field_name => $field_options ) {
+            if ( is_null( $field_options['schema'] ) ) {
+                $properties[ $field_name ] = $field_options;
+            }
+        }
+
+        return $properties;
+    }
+
+    /**
+     * Filters fields by context.
+     *
+     * @param array $fields Array of fields
+     * @param string|null context view, edit or embed
+     * @since 1.0.19
+     * @return array
+     */
+    protected function filter_response_fields_by_context( $fields, $context ) {
+
+        if ( empty( $context ) ) {
+            return $fields;
+        }
+
+        foreach ( $fields as $name => $options ) {
+            if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
+                unset( $fields[ $name ] );
+            }
+        }
+
+        return $fields;
+
+    }
+
+    /**
+     * Filters fields by an array of requested fields.
+     *
+     * @param array $fields Array of available fields
+     * @param array $requested array of requested fields.
+     * @since 1.0.19
+     * @return array
+     */
+    protected function filter_response_fields_by_array( $fields, $requested ) {
+
+        // Trim off any whitespace from the list array.
+        $requested = array_map( 'trim', $requested );
+
+        // Always persist 'id', because it can be needed for add_additional_fields_to_object().
+        if ( in_array( 'id', $fields, true ) ) {
+            $requested[] = 'id';
+        }
+
+        // Get rid of duplicate fields.
+        $requested = array_unique( $requested );
+
+        // Return the list of all included fields which are available.
+        return array_reduce(
+            $requested,
+            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()
+        );
+
+    }
+
+    /**
+     * Gets an array of fields to be included on the response.
+     *
+     * Included fields are based on item schema and `_fields=` request argument.
+     * Copied from WordPress 5.3 to support old versions.
+     *
+     * @since 1.0.19
+     * @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 ) {
+
+        // Retrieve fields in the schema.
+        $properties = $this->get_schema_properties();
+
+        // Exclude fields that specify a different context than the request context.
+        $properties = $this->filter_response_fields_by_context( $properties, $request['context'] );
+
+        // We only need the field keys.
+        $fields = array_keys( $properties );
+
+        // Is the user filtering the response fields??
+        if ( empty( $request['_fields'] ) ) {
+            return $fields;
+        }
+
+        return $this->filter_response_fields_by_array( $fields, wpinv_parse_list( $request['_fields'] ) );
+
+    }
+
+    /**
+     * Limits an object to the requested fields.
+     *
+     * Included fields are based on the `_fields` request argument.
+     *
+     * @since 1.0.19
+     * @param array $data Fields to include in the response.
+     * @param array $fields Requested fields.
+     * @return array Fields to be included in the response.
+     */
+    public function limit_object_to_requested_fields( $data, $fields, $prefix = '' ) {
+
+        // Is the user filtering the response fields??
+        if ( empty( $fields ) ) {
+            return $data;
+        }
+
+        foreach ( $data as $key => $value ) {
+
+            // Numeric arrays.
+            if ( is_numeric( $key ) && is_array( $value ) ) {
+                $data[ $key ] = $this->limit_object_to_requested_fields( $value, $fields, $prefix );
+                continue;
+            }
+
+            // Generate a new prefix.
+            $new_prefix = empty( $prefix ) ? $key : "$prefix.$key";
+
+            // Check if it was requested.
+            if ( ! empty( $key ) && ! $this->is_field_included( $new_prefix, $fields ) ) {
+                unset( $data[ $key ] );
+                continue;
+            }
+
+            if ( $key != 'meta_data' && is_array( $value ) ) {
+                $data[ $key ] = $this->limit_object_to_requested_fields( $value, $fields, $new_prefix );
+            }
 }
 
-		return $data;
-	}
-
-	/**
-	 * Given an array of fields to include in a response, some of which may be
-	 * `nested.fields`, determine whether the provided field should be included
-	 * in the response body.
-	 *
-	 * Copied from WordPress 5.3 to support old versions.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $field  A field to test for inclusion in the response body.
-	 * @param array  $fields An array of string fields supported by the endpoint.
-	 * @return bool Whether to include the field or not.
-	 * @see rest_is_field_included()
-	 */
-	public function is_field_included( $field, $fields ) {
-		if ( in_array( $field, $fields, true ) ) {
-			return true;
-		}
-
-		foreach ( $fields as $accepted_field ) {
-			// Check to see if $field is the parent of any item in $fields.
-			// A field "parent" should be accepted if "parent.child" is accepted.
-			if ( strpos( $accepted_field, "$field." ) === 0 ) {
-				return true;
-			}
-			// Conversely, if "parent" is accepted, all "parent.child" fields
-			// should also be accepted.
-			if ( strpos( $field, "$accepted_field." ) === 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
+        return $data;
+    }
+
+    /**
+     * Given an array of fields to include in a response, some of which may be
+     * `nested.fields`, determine whether the provided field should be included
+     * in the response body.
+     *
+     * Copied from WordPress 5.3 to support old versions.
+     *
+     * @since 1.0.19
+     *
+     * @param string $field  A field to test for inclusion in the response body.
+     * @param array  $fields An array of string fields supported by the endpoint.
+     * @return bool Whether to include the field or not.
+     * @see rest_is_field_included()
+     */
+    public function is_field_included( $field, $fields ) {
+        if ( in_array( $field, $fields, true ) ) {
+            return true;
+        }
+
+        foreach ( $fields as $accepted_field ) {
+            // Check to see if $field is the parent of any item in $fields.
+            // A field "parent" should be accepted if "parent.child" is accepted.
+            if ( strpos( $accepted_field, "$field." ) === 0 ) {
+                return true;
+            }
+            // Conversely, if "parent" is accepted, all "parent.child" fields
+            // should also be accepted.
+            if ( strpos( $field, "$accepted_field." ) === 0 ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 
 }

Spacing +95 added lines, -95 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Core class to access posts via the REST API.
@@ -64,7 +64,7 @@ 
 		);
 
 		// Register REST routes.
-        add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+        add_action('rest_api_init', array($this, 'register_routes'));
 
 	}
 
@@ -76,8 +76,8 @@ 
 	 */
 	public function register_routes() {
 
-		foreach ( $this->namespaces as $namespace ) {
-			$this->register_namespace_routes( $namespace );
+		foreach ($this->namespaces as $namespace) {
+			$this->register_namespace_routes($namespace);
 		}
 
 	}
@@ -89,12 +89,12 @@ 
 	 *
 	 * @param string $namespace
 	 */
-	public function register_namespace_routes( /** @scrutinizer ignore-unused */ $namespace ) {
+	public function register_namespace_routes(/** @scrutinizer ignore-unused */ $namespace) {
 
 		getpaid_doing_it_wrong(
 			__CLASS__ . '::' . __METHOD__,
 			/* translators: %s: register_namespace_routes() */
-			sprintf( __( "Method '%s' must be overridden." ), __METHOD__ ),
+			sprintf(__("Method '%s' must be overridden."), __METHOD__),
 			'1.0.19'
 		);
 
@@ -106,7 +106,7 @@ 
 	 * @return string
 	 */
 	protected function get_normalized_rest_base() {
-		return preg_replace( '/\(.*\)\//i', '', $this->rest_base );
+		return preg_replace('/\(.*\)\//i', '', $this->rest_base);
 	}
 
 	/**
@@ -115,11 +115,11 @@ 
 	 * @param array array of request items.
 	 * @return array
 	 */
-	protected function fill_batch_keys( $items ) {
+	protected function fill_batch_keys($items) {
 
-		$items['create'] = empty( $items['create'] ) ? array() : $items['create'];
-		$items['update'] = empty( $items['update'] ) ? array() : $items['update'];
-		$items['delete'] = empty( $items['delete'] ) ? array() : wp_parse_id_list( $items['delete'] );
+		$items['create'] = empty($items['create']) ? array() : $items['create'];
+		$items['update'] = empty($items['update']) ? array() : $items['update'];
+		$items['delete'] = empty($items['delete']) ? array() : wp_parse_id_list($items['delete']);
 		return $items;
 
 	}
@@ -130,13 +130,13 @@ 
 	 * @param array $items Request items.
 	 * @return bool|WP_Error
 	 */
-	protected function check_batch_limit( $items ) {
-		$limit = apply_filters( 'getpaid_rest_batch_items_limit', 100, $this->get_normalized_rest_base() );
-		$total = count( $items['create'] ) + count( $items['update'] ) + count( $items['delete'] );
+	protected function check_batch_limit($items) {
+		$limit = apply_filters('getpaid_rest_batch_items_limit', 100, $this->get_normalized_rest_base());
+		$total = count($items['create']) + count($items['update']) + count($items['delete']);
 
-		if ( $total > $limit ) {
+		if ($total > $limit) {
 			/* translators: %s: items limit */
-			return new WP_Error( 'getpaid_rest_request_entity_too_large', sprintf( __( 'Unable to accept more than %s items for this request.', 'invoicing' ), $limit ), array( 'status' => 413 ) );
+			return new WP_Error('getpaid_rest_request_entity_too_large', sprintf(__('Unable to accept more than %s items for this request.', 'invoicing'), $limit), array('status' => 413));
 		}
 
 		return true;
@@ -150,37 +150,37 @@ 
 	 * @param WP_REST_Server $wp_rest_server
 	 * @return array()
 	 */
-	protected function batch_create_items( $items, $request, $wp_rest_server ) {
+	protected function batch_create_items($items, $request, $wp_rest_server) {
 
 		$query  = $request->get_query_params();
 		$create = array();
 
-		foreach ( $items as $item ) {
-			$_item = new WP_REST_Request( 'POST' );
+		foreach ($items as $item) {
+			$_item = new WP_REST_Request('POST');
 
 			// Default parameters.
 			$defaults = array();
 			$schema   = $this->get_public_item_schema();
-			foreach ( $schema['properties'] as $arg => $options ) {
-				if ( isset( $options['default'] ) ) {
-					$defaults[ $arg ] = $options['default'];
+			foreach ($schema['properties'] as $arg => $options) {
+				if (isset($options['default'])) {
+					$defaults[$arg] = $options['default'];
 				}
 			}
-			$_item->set_default_params( $defaults );
+			$_item->set_default_params($defaults);
 
 			// Set request parameters.
-			$_item->set_body_params( $item );
+			$_item->set_body_params($item);
 
 			// Set query (GET) parameters.
-			$_item->set_query_params( $query );
+			$_item->set_query_params($query);
 
 			// Create the item.
-			$_response = $this->create_item( $_item );
+			$_response = $this->create_item($_item);
 
 			// If an error occured...
-			if ( is_wp_error( $_response ) ) {
+			if (is_wp_error($_response)) {
 
-				$create[]   = array(
+				$create[] = array(
 					'id'    => 0,
 					'error' => array(
 						'code'    => $_response->get_error_code(),
@@ -192,7 +192,7 @@ 
 				continue;
 			}
 
-			$create[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
+			$create[] = $wp_rest_server->response_to_data(/** @scrutinizer ignore-type */ $_response, false);
 
 		}
 
@@ -208,27 +208,27 @@ 
 	 * @param WP_REST_Server $wp_rest_server
 	 * @return array()
 	 */
-	protected function batch_update_items( $items, $request, $wp_rest_server ) {
+	protected function batch_update_items($items, $request, $wp_rest_server) {
 
 		$query  = $request->get_query_params();
 		$update = array();
 
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 
 			// Create a dummy request.
-			$_item = new WP_REST_Request( 'PUT' );
+			$_item = new WP_REST_Request('PUT');
 
 			// Add body params.
-			$_item->set_body_params( $item );
+			$_item->set_body_params($item);
 
 			// Set query (GET) parameters.
-			$_item->set_query_params( $query );
+			$_item->set_query_params($query);
 
 			// Update the item.
-			$_response = $this->update_item( $_item );
+			$_response = $this->update_item($_item);
 
 			// If an error occured...
-			if ( is_wp_error( $_response ) ) {
+			if (is_wp_error($_response)) {
 
 				$update[] = array(
 					'id'    => $item['id'],
@@ -243,7 +243,7 @@ 
 
 			}
 
-			$update[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
+			$update[] = $wp_rest_server->response_to_data(/** @scrutinizer ignore-type */ $_response, false);
 
 		}
 
@@ -258,14 +258,14 @@ 
 	 * @param WP_REST_Server $wp_rest_server
 	 * @return array()
 	 */
-	protected function batch_delete_items( $items, $wp_rest_server ) {
+	protected function batch_delete_items($items, $wp_rest_server) {
 
 		$delete = array();
 
-		foreach ( array_filter( $items ) as $id ) {
+		foreach (array_filter($items) as $id) {
 
 			// Prepare the request.
-			$_item = new WP_REST_Request( 'DELETE' );
+			$_item = new WP_REST_Request('DELETE');
 			$_item->set_query_params(
 				array(
 					'id'    => $id,
@@ -274,9 +274,9 @@ 
 			);
 
 			// Delete the item.
-			$_response = $this->delete_item( $_item );
+			$_response = $this->delete_item($_item);
 
-			if ( is_wp_error( $_response ) ) {
+			if (is_wp_error($_response)) {
 
 				$delete[] = array(
 					'id'    => $id,
@@ -290,7 +290,7 @@ 
 				continue;
 			}
 
-			$delete[] = $wp_rest_server->response_to_data( /** @scrutinizer ignore-type */ $_response, false );
+			$delete[] = $wp_rest_server->response_to_data(/** @scrutinizer ignore-type */ $_response, false);
 
 		}
 
@@ -304,23 +304,23 @@ 
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|array.
 	 */
-	public function batch_items( $request ) {
+	public function batch_items($request) {
 		global $wp_rest_server;
 
 		// Prepare the batch items.
-		$items = $this->fill_batch_keys( array_filter( $request->get_params() ) );
+		$items = $this->fill_batch_keys(array_filter($request->get_params()));
 
 		// Ensure that the batch has not exceeded the limit to prevent abuse.
-		$limit = $this->check_batch_limit( $items );
-		if ( is_wp_error( $limit ) ) {
+		$limit = $this->check_batch_limit($items);
+		if (is_wp_error($limit)) {
 			return $limit;
 		}
 
 		// Process the items.
 		return array(
-			'create' => $this->batch_create_items( $items['create'], $request, $wp_rest_server ),
-			'update' => $this->batch_update_items( $items['update'], $request, $wp_rest_server ),
-			'delete' => $this->batch_delete_items( $items['delete'], $wp_rest_server ),
+			'create' => $this->batch_create_items($items['create'], $request, $wp_rest_server),
+			'update' => $this->batch_update_items($items['update'], $request, $wp_rest_server),
+			'delete' => $this->batch_delete_items($items['delete'], $wp_rest_server),
 		);
 
 	}
@@ -333,8 +333,8 @@ 
 	 * @param array $meta_query Meta query.
 	 * @return array
 	 */
-	protected function add_meta_query( $args, $meta_query ) {
-		if ( empty( $args['meta_query'] ) ) {
+	protected function add_meta_query($args, $meta_query) {
+		if (empty($args['meta_query'])) {
 			$args['meta_query'] = array();
 		}
 
@@ -356,25 +356,25 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'create' => array(
-					'description' => __( 'List of created resources.', 'invoicing' ),
+					'description' => __('List of created resources.', 'invoicing'),
 					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'items'       => array(
 						'type' => 'object',
 					),
 				),
 				'update' => array(
-					'description' => __( 'List of updated resources.', 'invoicing' ),
+					'description' => __('List of updated resources.', 'invoicing'),
 					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'items'       => array(
 						'type' => 'object',
 					),
 				),
 				'delete' => array(
-					'description' => __( 'List of deleted resources.', 'invoicing' ),
+					'description' => __('List of deleted resources.', 'invoicing'),
 					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
+					'context'     => array('view', 'edit'),
 					'items'       => array(
 						'type' => 'integer',
 					),
@@ -395,13 +395,13 @@ 
 	protected function get_schema_properties() {
 
 		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+		$properties = isset($schema['properties']) ? $schema['properties'] : array();
 
 		// For back-compat, include any field with an empty schema
 		// because it won't be present in $this->get_item_schema().
-		foreach ( $this->get_additional_fields() as $field_name => $field_options ) {
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
+		foreach ($this->get_additional_fields() as $field_name => $field_options) {
+			if (is_null($field_options['schema'])) {
+				$properties[$field_name] = $field_options;
 			}
 		}
 
@@ -416,15 +416,15 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	protected function filter_response_fields_by_context( $fields, $context ) {
+	protected function filter_response_fields_by_context($fields, $context) {
 
-		if ( empty( $context ) ) {
+		if (empty($context)) {
 			return $fields;
 		}
 
-		foreach ( $fields as $name => $options ) {
-			if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-				unset( $fields[ $name ] );
+		foreach ($fields as $name => $options) {
+			if (!empty($options['context']) && !in_array($context, $options['context'], true)) {
+				unset($fields[$name]);
 			}
 		}
 
@@ -440,35 +440,35 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	protected function filter_response_fields_by_array( $fields, $requested ) {
+	protected function filter_response_fields_by_array($fields, $requested) {
 
 		// Trim off any whitespace from the list array.
-		$requested = array_map( 'trim', $requested );
+		$requested = array_map('trim', $requested);
 
 		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
+		if (in_array('id', $fields, true)) {
 			$requested[] = 'id';
 		}
 
 		// Get rid of duplicate fields.
-		$requested = array_unique( $requested );
+		$requested = array_unique($requested);
 
 		// Return the list of all included fields which are available.
 		return array_reduce(
 			$requested,
-			function( $response_fields, $field ) use ( $fields ) {
+			function($response_fields, $field) use ($fields) {
 
-				if ( in_array( $field, $fields, true ) ) {
+				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 );
+				$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 ) ) {
+				if (in_array($nested_fields[0], $fields, true)) {
 					$response_fields[] = $field;
 				}
 
@@ -489,23 +489,23 @@ 
 	 * @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 ) {
+	public function get_fields_for_response($request) {
 
 		// Retrieve fields in the schema.
 		$properties = $this->get_schema_properties();
 
 		// Exclude fields that specify a different context than the request context.
-		$properties = $this->filter_response_fields_by_context( $properties, $request['context'] );
+		$properties = $this->filter_response_fields_by_context($properties, $request['context']);
 
 		// We only need the field keys.
-		$fields = array_keys( $properties );
+		$fields = array_keys($properties);
 
 		// Is the user filtering the response fields??
-		if ( empty( $request['_fields'] ) ) {
+		if (empty($request['_fields'])) {
 			return $fields;
 		}
 
-		return $this->filter_response_fields_by_array( $fields, wpinv_parse_list( $request['_fields'] ) );
+		return $this->filter_response_fields_by_array($fields, wpinv_parse_list($request['_fields']));
 
 	}
 
@@ -519,32 +519,32 @@ 
 	 * @param array $fields Requested fields.
 	 * @return array Fields to be included in the response.
 	 */
-	public function limit_object_to_requested_fields( $data, $fields, $prefix = '' ) {
+	public function limit_object_to_requested_fields($data, $fields, $prefix = '') {
 
 		// Is the user filtering the response fields??
-		if ( empty( $fields ) ) {
+		if (empty($fields)) {
 			return $data;
 		}
 
-		foreach ( $data as $key => $value ) {
+		foreach ($data as $key => $value) {
 
 			// Numeric arrays.
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$data[ $key ] = $this->limit_object_to_requested_fields( $value, $fields, $prefix );
+			if (is_numeric($key) && is_array($value)) {
+				$data[$key] = $this->limit_object_to_requested_fields($value, $fields, $prefix);
 				continue;
 			}
 
 			// Generate a new prefix.
-			$new_prefix = empty( $prefix ) ? $key : "$prefix.$key";
+			$new_prefix = empty($prefix) ? $key : "$prefix.$key";
 
 			// Check if it was requested.
-			if ( ! empty( $key ) && ! $this->is_field_included( $new_prefix, $fields ) ) {
-				unset( $data[ $key ] );
+			if (!empty($key) && !$this->is_field_included($new_prefix, $fields)) {
+				unset($data[$key]);
 				continue;
 			}
 
-			if ( $key != 'meta_data' && is_array( $value ) ) {
-				$data[ $key ] = $this->limit_object_to_requested_fields( $value, $fields, $new_prefix );
+			if ($key != 'meta_data' && is_array($value)) {
+				$data[$key] = $this->limit_object_to_requested_fields($value, $fields, $new_prefix);
 			}
 }
 
@@ -565,20 +565,20 @@ 
 	 * @return bool Whether to include the field or not.
 	 * @see rest_is_field_included()
 	 */
-	public function is_field_included( $field, $fields ) {
-		if ( in_array( $field, $fields, true ) ) {
+	public function is_field_included($field, $fields) {
+		if (in_array($field, $fields, true)) {
 			return true;
 		}
 
-		foreach ( $fields as $accepted_field ) {
+		foreach ($fields as $accepted_field) {
 			// Check to see if $field is the parent of any item in $fields.
 			// A field "parent" should be accepted if "parent.child" is accepted.
-			if ( strpos( $accepted_field, "$field." ) === 0 ) {
+			if (strpos($accepted_field, "$field.") === 0) {
 				return true;
 			}
 			// Conversely, if "parent" is accepted, all "parent.child" fields
 			// should also be accepted.
-			if ( strpos( $field, "$accepted_field." ) === 0 ) {
+			if (strpos($field, "$accepted_field.") === 0) {
 				return true;
 			}
 		}

includes/api/class-getpaid-rest-report-top-sellers-controller.php

Indentation +175 added lines, -175 removed lines

@@ -18,179 +18,179 @@
  */
 class GetPaid_REST_Report_Top_Sellers_Controller extends GetPaid_REST_Report_Sales_Controller {
 
-	/**
-	 * Route base.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'reports/top_sellers';
-
-	/**
-	 * Get top sellers report.
-	 *
-	 * @param WP_REST_Request $request
-	 * @return array|WP_Error
-	 */
-	public function get_items( $request ) {
-
-		// Prepare items.
-		$this->report_range = $this->get_date_range( $request );
-		$report_data        = $this->get_report_data();
-
-		$top_sellers = array();
-
-		foreach ( $report_data as $item ) {
-
-			$item_obj  = new WPInv_Item( $item );
-			$item_name = $item->invoice_item_name;
-			$item_qty  = floatval( $item->invoice_item_qty );
-			$item_id   = absint( $item->invoice_item_id );
-			$price     = sanitize_text_field( wpinv_price( $item->invoice_item_price ) );
-
-			$item_obj  = new WPInv_Item( $item_id );
-
-			if ( $item_obj->exists() ) {
-				$item_name = $item_obj->get_name();
-			} else {
-				$item_id   = 0;
-			}
-
-			$top_sellers[] = array(
-				'name'               => sanitize_text_field( $item_name ),
-				'item_id'            => $item_id,
-				'quantity'           => $item_qty,
-				'earnings'           => wpinv_round_amount( $item->invoice_item_price ),
-				'earnings_formatted' => sanitize_text_field( wpinv_price( $price ) ),
-			);
-
-		}
-
-		$data = array();
-		foreach ( $top_sellers as $top_seller ) {
-			$item   = $this->prepare_item_for_response( (object) $top_seller, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
-		}
-
-		return rest_ensure_response( $data );
-
-	}
-
-	/**
-	 * Prepare a report sales object for serialization.
-	 *
-	 * @param stdClass $top_seller
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response $response Response data.
-	 */
-	public function prepare_item_for_response( $top_seller, $request ) {
-		$data    = (array) $top_seller;
-
-		$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 = array(
-			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
-			),
-		);
-
-		if ( ! empty( $top_seller->item_id ) ) {
-			$links['item']   = array(
-				'href'       => rest_url( sprintf( '/%s/items/%s', $this->namespace, $top_seller->item_id ) ),
-				'embeddable' => true,
-			);
-		}
-
-		$response->add_links( $links );
-		return apply_filters( 'getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request );
-	}
-
-	/**
-	 * Get all data needed for this report and store in the class.
-	 */
-	protected function query_report_data() {
-
-		$this->report_data = GetPaid_Reports_Helper::get_invoice_report_data(
-			array(
-				'data'         => array(
-					'quantity'  => array(
-						'type'     => 'invoice_item',
-						'function' => 'SUM',
-						'name'     => 'invoice_item_qty',
-					),
-					'item_id'   => array(
-						'type'     => 'invoice_item',
-						'function' => '',
-						'name'     => 'invoice_item_id',
-					),
-					'item_name' => array(
-						'type'     => 'invoice_item',
-						'function' => '',
-						'name'     => 'invoice_item_name',
-					),
-					'price'     => array(
-						'type'     => 'invoice_item',
-						'function' => 'SUM',
-						'name'     => 'invoice_item_price',
-					),
-				),
-				'group_by'     => 'invoice_item_id',
-				'order_by'     => 'invoice_item_qty DESC',
-				'query_type'   => 'get_results',
-				'limit'        => 10,
-				'filter_range' => $this->report_range,
-			)
-		);
-
-	}
-
-	/**
-	 * Get the Report's schema, conforming to JSON Schema.
-	 *
-	 * @return array
-	 */
-	public function get_item_schema() {
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->rest_base,
-			'type'       => 'object',
-			'properties' => array(
-				'name'                => array(
-					'description' => __( 'Item name.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'item_id'             => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'quantity'            => array(
-					'description' => __( 'Total number of purchases.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'earnings'            => array(
-					'description' => __( 'Total earnings for the item.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-				'earnings_formatted"' => array(
-					'description' => __( 'Total earnings (formatted) for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view' ),
-					'readonly'    => true,
-				),
-			),
-		);
-
-		return $this->add_additional_fields_schema( $schema );
-	}
+    /**
+     * Route base.
+     *
+     * @var string
+     */
+    protected $rest_base = 'reports/top_sellers';
+
+    /**
+     * Get top sellers report.
+     *
+     * @param WP_REST_Request $request
+     * @return array|WP_Error
+     */
+    public function get_items( $request ) {
+
+        // Prepare items.
+        $this->report_range = $this->get_date_range( $request );
+        $report_data        = $this->get_report_data();
+
+        $top_sellers = array();
+
+        foreach ( $report_data as $item ) {
+
+            $item_obj  = new WPInv_Item( $item );
+            $item_name = $item->invoice_item_name;
+            $item_qty  = floatval( $item->invoice_item_qty );
+            $item_id   = absint( $item->invoice_item_id );
+            $price     = sanitize_text_field( wpinv_price( $item->invoice_item_price ) );
+
+            $item_obj  = new WPInv_Item( $item_id );
+
+            if ( $item_obj->exists() ) {
+                $item_name = $item_obj->get_name();
+            } else {
+                $item_id   = 0;
+            }
+
+            $top_sellers[] = array(
+                'name'               => sanitize_text_field( $item_name ),
+                'item_id'            => $item_id,
+                'quantity'           => $item_qty,
+                'earnings'           => wpinv_round_amount( $item->invoice_item_price ),
+                'earnings_formatted' => sanitize_text_field( wpinv_price( $price ) ),
+            );
+
+        }
+
+        $data = array();
+        foreach ( $top_sellers as $top_seller ) {
+            $item   = $this->prepare_item_for_response( (object) $top_seller, $request );
+            $data[] = $this->prepare_response_for_collection( $item );
+        }
+
+        return rest_ensure_response( $data );
+
+    }
+
+    /**
+     * Prepare a report sales object for serialization.
+     *
+     * @param stdClass $top_seller
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response $response Response data.
+     */
+    public function prepare_item_for_response( $top_seller, $request ) {
+        $data    = (array) $top_seller;
+
+        $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 = array(
+            'about' => array(
+                'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+            ),
+        );
+
+        if ( ! empty( $top_seller->item_id ) ) {
+            $links['item']   = array(
+                'href'       => rest_url( sprintf( '/%s/items/%s', $this->namespace, $top_seller->item_id ) ),
+                'embeddable' => true,
+            );
+        }
+
+        $response->add_links( $links );
+        return apply_filters( 'getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request );
+    }
+
+    /**
+     * Get all data needed for this report and store in the class.
+     */
+    protected function query_report_data() {
+
+        $this->report_data = GetPaid_Reports_Helper::get_invoice_report_data(
+            array(
+                'data'         => array(
+                    'quantity'  => array(
+                        'type'     => 'invoice_item',
+                        'function' => 'SUM',
+                        'name'     => 'invoice_item_qty',
+                    ),
+                    'item_id'   => array(
+                        'type'     => 'invoice_item',
+                        'function' => '',
+                        'name'     => 'invoice_item_id',
+                    ),
+                    'item_name' => array(
+                        'type'     => 'invoice_item',
+                        'function' => '',
+                        'name'     => 'invoice_item_name',
+                    ),
+                    'price'     => array(
+                        'type'     => 'invoice_item',
+                        'function' => 'SUM',
+                        'name'     => 'invoice_item_price',
+                    ),
+                ),
+                'group_by'     => 'invoice_item_id',
+                'order_by'     => 'invoice_item_qty DESC',
+                'query_type'   => 'get_results',
+                'limit'        => 10,
+                'filter_range' => $this->report_range,
+            )
+        );
+
+    }
+
+    /**
+     * Get the Report's schema, conforming to JSON Schema.
+     *
+     * @return array
+     */
+    public function get_item_schema() {
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->rest_base,
+            'type'       => 'object',
+            'properties' => array(
+                'name'                => array(
+                    'description' => __( 'Item name.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'item_id'             => array(
+                    'description' => __( 'Item ID.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'quantity'            => array(
+                    'description' => __( 'Total number of purchases.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'earnings'            => array(
+                    'description' => __( 'Total earnings for the item.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+                'earnings_formatted"' => array(
+                    'description' => __( 'Total earnings (formatted) for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view' ),
+                    'readonly'    => true,
+                ),
+            ),
+        );
+
+        return $this->add_additional_fields_schema( $schema );
+    }
 }

Spacing +39 added lines, -39 removed lines

@@ -9,7 +9,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST top sellers controller class.
@@ -31,47 +31,47 @@ 
 	 * @param WP_REST_Request $request
 	 * @return array|WP_Error
 	 */
-	public function get_items( $request ) {
+	public function get_items($request) {
 
 		// Prepare items.
-		$this->report_range = $this->get_date_range( $request );
+		$this->report_range = $this->get_date_range($request);
 		$report_data        = $this->get_report_data();
 
 		$top_sellers = array();
 
-		foreach ( $report_data as $item ) {
+		foreach ($report_data as $item) {
 
-			$item_obj  = new WPInv_Item( $item );
+			$item_obj  = new WPInv_Item($item);
 			$item_name = $item->invoice_item_name;
-			$item_qty  = floatval( $item->invoice_item_qty );
-			$item_id   = absint( $item->invoice_item_id );
-			$price     = sanitize_text_field( wpinv_price( $item->invoice_item_price ) );
+			$item_qty  = floatval($item->invoice_item_qty);
+			$item_id   = absint($item->invoice_item_id);
+			$price     = sanitize_text_field(wpinv_price($item->invoice_item_price));
 
-			$item_obj  = new WPInv_Item( $item_id );
+			$item_obj  = new WPInv_Item($item_id);
 
-			if ( $item_obj->exists() ) {
+			if ($item_obj->exists()) {
 				$item_name = $item_obj->get_name();
 			} else {
 				$item_id   = 0;
 			}
 
 			$top_sellers[] = array(
-				'name'               => sanitize_text_field( $item_name ),
+				'name'               => sanitize_text_field($item_name),
 				'item_id'            => $item_id,
 				'quantity'           => $item_qty,
-				'earnings'           => wpinv_round_amount( $item->invoice_item_price ),
-				'earnings_formatted' => sanitize_text_field( wpinv_price( $price ) ),
+				'earnings'           => wpinv_round_amount($item->invoice_item_price),
+				'earnings_formatted' => sanitize_text_field(wpinv_price($price)),
 			);
 
 		}
 
 		$data = array();
-		foreach ( $top_sellers as $top_seller ) {
-			$item   = $this->prepare_item_for_response( (object) $top_seller, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
+		foreach ($top_sellers as $top_seller) {
+			$item   = $this->prepare_item_for_response((object) $top_seller, $request);
+			$data[] = $this->prepare_response_for_collection($item);
 		}
 
-		return rest_ensure_response( $data );
+		return rest_ensure_response($data);
 
 	}
 
@@ -82,30 +82,30 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response $response Response data.
 	 */
-	public function prepare_item_for_response( $top_seller, $request ) {
+	public function prepare_item_for_response($top_seller, $request) {
 		$data    = (array) $top_seller;
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
+		$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 );
+		$response = rest_ensure_response($data);
 		$links = array(
 			'about' => array(
-				'href' => rest_url( sprintf( '%s/reports', $this->namespace ) ),
+				'href' => rest_url(sprintf('%s/reports', $this->namespace)),
 			),
 		);
 
-		if ( ! empty( $top_seller->item_id ) ) {
-			$links['item']   = array(
-				'href'       => rest_url( sprintf( '/%s/items/%s', $this->namespace, $top_seller->item_id ) ),
+		if (!empty($top_seller->item_id)) {
+			$links['item'] = array(
+				'href'       => rest_url(sprintf('/%s/items/%s', $this->namespace, $top_seller->item_id)),
 				'embeddable' => true,
 			);
 		}
 
-		$response->add_links( $links );
-		return apply_filters( 'getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request );
+		$response->add_links($links);
+		return apply_filters('getpaid_rest_prepare_report_' . $this->rest_base, $response, $top_seller, $request);
 	}
 
 	/**
@@ -159,38 +159,38 @@ 
 			'type'       => 'object',
 			'properties' => array(
 				'name'                => array(
-					'description' => __( 'Item name.', 'invoicing' ),
+					'description' => __('Item name.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'item_id'             => array(
-					'description' => __( 'Item ID.', 'invoicing' ),
+					'description' => __('Item ID.', 'invoicing'),
 					'type'        => 'integer',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'quantity'            => array(
-					'description' => __( 'Total number of purchases.', 'invoicing' ),
+					'description' => __('Total number of purchases.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'earnings'            => array(
-					'description' => __( 'Total earnings for the item.', 'invoicing' ),
+					'description' => __('Total earnings for the item.', 'invoicing'),
 					'type'        => 'number',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 				'earnings_formatted"' => array(
-					'description' => __( 'Total earnings (formatted) for the item.', 'invoicing' ),
+					'description' => __('Total earnings (formatted) for the item.', 'invoicing'),
 					'type'        => 'string',
-					'context'     => array( 'view' ),
+					'context'     => array('view'),
 					'readonly'    => true,
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		return $this->add_additional_fields_schema($schema);
 	}
 }

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

Indentation +156 added lines, -156 removed lines

@@ -15,168 +15,168 @@
 class WPInv_REST_Items_Controller extends GetPaid_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_item';
-
-	/**
-	 * The base of this controller's route.
-	 *
-	 * @since 1.0.13
-	 * @var string
-	 */
-	protected $rest_base = 'items';
-
-	/** Contains this controller's class name.
-	 *
-	 * @var string
-	 */
-	public $crud_class = 'WPInv_Item';
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_namespace_routes( $namespace ) {
-
-		parent::register_namespace_routes( $namespace );
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/item-types',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item_types' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Handles rest requests for item types.
-	 *
-	 * @since 1.0.13
-	 *
-	 *
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item_types() {
-		return rest_ensure_response( wpinv_get_item_types() );
-	}
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_item';
 
     /**
-	 * Retrieves the query params for the items collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
-
-		$params = array_merge(
-			parent::get_collection_params(),
-        	array(
-
-				// Item types
-				'type' => array(
-					'description'       => __( 'Type of items to fetch.', 'invoicing' ),
-					'type'              => array( 'array', 'string' ),
-					'default'           => 'any',
-					'validate_callback' => 'rest_validate_request_arg',
-					'sanitize_callback' => 'wpinv_parse_list',
-					'items'             => array(
-						'enum' => array_merge( array( 'any' ), wpinv_item_types() ),
-						'type' => 'string',
-					),
-				),
-
-			)
-		);
-
-		// Filter collection parameters for the items controller.
-		return apply_filters( 'getpaid_rest_items_collection_params', $params, $this );
-
-	}
-
-	/**
-	 * Determine the allowed query_vars for a get_items() response and
-	 * prepare for WP_Query.
-	 *
-	 * @param array           $prepared_args Prepared arguments.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array          $query_args
-	 */
-	protected function prepare_items_query( $prepared_args = array(), $request = null ) {
-
-		$query_args = parent::prepare_items_query( $prepared_args );
-
-		// Retrieve items by type.
-		if ( ! in_array( 'any', $request['type'] ) ) {
-
-			if ( empty( $query_args['meta_query'] ) ) {
-				$query_args['meta_query'] = array();
-			}
-
-			$query_args['meta_query'][] = array(
-				'key'     => '_wpinv_type',
-				'value'   => implode( ',', $request['type'] ),
-				'compare' => 'IN',
-			);
-
-		}
-
-		return apply_filters( 'getpaid_rest_items_prepare_items_query', $query_args, $request, $this );
-
-	}
-
-	/**
-	 * 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( 'draft', 'pending', 'publish' );
-	}
-
-	/**
-	 * Checks if a key should be included in a response.
-	 *
-	 * @since  1.0.19
-	 * @param  WPInv_Item   $item  Item object.
-	 * @param  string       $field_key The key to check for.
-	 * @return bool
-	 */
-	public function object_supports_field( $item, $field_key ) {
-
-		if ( 'minimum_price' == $field_key && ! $item->user_can_set_their_price() ) {
-			return false;
-		}
-
-		foreach ( wpinv_parse_list( 'initial_price the_initial_price recurring_price the_recurring_price recurring_period recurring_interval recurring_limit is_free_trial trial_period trial_interval first_renewal_date' ) as $key ) {
-
-			if ( $key == $field_key && ! $item->is_recurring() ) {
-				return false;
-			}
+     * The base of this controller's route.
+     *
+     * @since 1.0.13
+     * @var string
+     */
+    protected $rest_base = 'items';
+
+    /** Contains this controller's class name.
+     *
+     * @var string
+     */
+    public $crud_class = 'WPInv_Item';
+
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 1.0.19
+     *
+     * @see register_rest_route()
+     */
+    public function register_namespace_routes( $namespace ) {
+
+        parent::register_namespace_routes( $namespace );
+
+        register_rest_route(
+            $this->namespace,
+            '/' . $this->rest_base . '/item-types',
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_item_types' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Handles rest requests for item types.
+     *
+     * @since 1.0.13
+     *
+     *
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item_types() {
+        return rest_ensure_response( wpinv_get_item_types() );
+    }
+
+    /**
+     * Retrieves the query params for the items collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
+
+        $params = array_merge(
+            parent::get_collection_params(),
+            array(
+
+                // Item types
+                'type' => array(
+                    'description'       => __( 'Type of items to fetch.', 'invoicing' ),
+                    'type'              => array( 'array', 'string' ),
+                    'default'           => 'any',
+                    'validate_callback' => 'rest_validate_request_arg',
+                    'sanitize_callback' => 'wpinv_parse_list',
+                    'items'             => array(
+                        'enum' => array_merge( array( 'any' ), wpinv_item_types() ),
+                        'type' => 'string',
+                    ),
+                ),
+
+            )
+        );
+
+        // Filter collection parameters for the items controller.
+        return apply_filters( 'getpaid_rest_items_collection_params', $params, $this );
+
+    }
+
+    /**
+     * Determine the allowed query_vars for a get_items() response and
+     * prepare for WP_Query.
+     *
+     * @param array           $prepared_args Prepared arguments.
+     * @param WP_REST_Request $request Request object.
+     * @return array          $query_args
+     */
+    protected function prepare_items_query( $prepared_args = array(), $request = null ) {
+
+        $query_args = parent::prepare_items_query( $prepared_args );
+
+        // Retrieve items by type.
+        if ( ! in_array( 'any', $request['type'] ) ) {
+
+            if ( empty( $query_args['meta_query'] ) ) {
+                $query_args['meta_query'] = array();
+            }
+
+            $query_args['meta_query'][] = array(
+                'key'     => '_wpinv_type',
+                'value'   => implode( ',', $request['type'] ),
+                'compare' => 'IN',
+            );
+
+        }
+
+        return apply_filters( 'getpaid_rest_items_prepare_items_query', $query_args, $request, $this );
+
+    }
+
+    /**
+     * 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( 'draft', 'pending', 'publish' );
+    }
+
+    /**
+     * Checks if a key should be included in a response.
+     *
+     * @since  1.0.19
+     * @param  WPInv_Item   $item  Item object.
+     * @param  string       $field_key The key to check for.
+     * @return bool
+     */
+    public function object_supports_field( $item, $field_key ) {
+
+        if ( 'minimum_price' == $field_key && ! $item->user_can_set_their_price() ) {
+            return false;
+        }
+
+        foreach ( wpinv_parse_list( 'initial_price the_initial_price recurring_price the_recurring_price recurring_period recurring_interval recurring_limit is_free_trial trial_period trial_interval first_renewal_date' ) as $key ) {
+
+            if ( $key == $field_key && ! $item->is_recurring() ) {
+                return false;
+            }
 }
 
-		foreach ( wpinv_parse_list( 'trial_period trial_interval' ) as $key ) {
+        foreach ( wpinv_parse_list( 'trial_period trial_interval' ) as $key ) {
 
-			if ( $key == $field_key && ! $item->has_free_trial() ) {
-				return false;
-			}
+            if ( $key == $field_key && ! $item->has_free_trial() ) {
+                return false;
+            }
 }
 
-		return parent::object_supports_field( $item, $field_key );
-	}
+        return parent::object_supports_field( $item, $field_key );
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * REST API items controller class.
@@ -42,9 +42,9 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
-		parent::register_namespace_routes( $namespace );
+		parent::register_namespace_routes($namespace);
 
 		register_rest_route(
 			$this->namespace,
@@ -52,8 +52,8 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item_types' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_item_types'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 				),
 			)
 		);
@@ -69,7 +69,7 @@ 
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_item_types() {
-		return rest_ensure_response( wpinv_get_item_types() );
+		return rest_ensure_response(wpinv_get_item_types());
 	}
 
     /**
@@ -87,13 +87,13 @@ 
 
 				// Item types
 				'type' => array(
-					'description'       => __( 'Type of items to fetch.', 'invoicing' ),
-					'type'              => array( 'array', 'string' ),
+					'description'       => __('Type of items to fetch.', 'invoicing'),
+					'type'              => array('array', 'string'),
 					'default'           => 'any',
 					'validate_callback' => 'rest_validate_request_arg',
 					'sanitize_callback' => 'wpinv_parse_list',
 					'items'             => array(
-						'enum' => array_merge( array( 'any' ), wpinv_item_types() ),
+						'enum' => array_merge(array('any'), wpinv_item_types()),
 						'type' => 'string',
 					),
 				),
@@ -102,7 +102,7 @@ 
 		);
 
 		// Filter collection parameters for the items controller.
-		return apply_filters( 'getpaid_rest_items_collection_params', $params, $this );
+		return apply_filters('getpaid_rest_items_collection_params', $params, $this);
 
 	}
 
@@ -114,26 +114,26 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array          $query_args
 	 */
-	protected function prepare_items_query( $prepared_args = array(), $request = null ) {
+	protected function prepare_items_query($prepared_args = array(), $request = null) {
 
-		$query_args = parent::prepare_items_query( $prepared_args );
+		$query_args = parent::prepare_items_query($prepared_args);
 
 		// Retrieve items by type.
-		if ( ! in_array( 'any', $request['type'] ) ) {
+		if (!in_array('any', $request['type'])) {
 
-			if ( empty( $query_args['meta_query'] ) ) {
+			if (empty($query_args['meta_query'])) {
 				$query_args['meta_query'] = array();
 			}
 
 			$query_args['meta_query'][] = array(
 				'key'     => '_wpinv_type',
-				'value'   => implode( ',', $request['type'] ),
+				'value'   => implode(',', $request['type']),
 				'compare' => 'IN',
 			);
 
 		}
 
-		return apply_filters( 'getpaid_rest_items_prepare_items_query', $query_args, $request, $this );
+		return apply_filters('getpaid_rest_items_prepare_items_query', $query_args, $request, $this);
 
 	}
 
@@ -145,7 +145,7 @@ 
 	 * @return array A list of registered item statuses.
 	 */
 	public function get_post_statuses() {
-		return array( 'draft', 'pending', 'publish' );
+		return array('draft', 'pending', 'publish');
 	}
 
 	/**
@@ -156,27 +156,27 @@ 
 	 * @param  string       $field_key The key to check for.
 	 * @return bool
 	 */
-	public function object_supports_field( $item, $field_key ) {
+	public function object_supports_field($item, $field_key) {
 
-		if ( 'minimum_price' == $field_key && ! $item->user_can_set_their_price() ) {
+		if ('minimum_price' == $field_key && !$item->user_can_set_their_price()) {
 			return false;
 		}
 
-		foreach ( wpinv_parse_list( 'initial_price the_initial_price recurring_price the_recurring_price recurring_period recurring_interval recurring_limit is_free_trial trial_period trial_interval first_renewal_date' ) as $key ) {
+		foreach (wpinv_parse_list('initial_price the_initial_price recurring_price the_recurring_price recurring_period recurring_interval recurring_limit is_free_trial trial_period trial_interval first_renewal_date') as $key) {
 
-			if ( $key == $field_key && ! $item->is_recurring() ) {
+			if ($key == $field_key && !$item->is_recurring()) {
 				return false;
 			}
 }
 
-		foreach ( wpinv_parse_list( 'trial_period trial_interval' ) as $key ) {
+		foreach (wpinv_parse_list('trial_period trial_interval') as $key) {
 
-			if ( $key == $field_key && ! $item->has_free_trial() ) {
+			if ($key == $field_key && !$item->has_free_trial()) {
 				return false;
 			}
 }
 
-		return parent::object_supports_field( $item, $field_key );
+		return parent::object_supports_field($item, $field_key);
 	}
 
 }

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

Indentation +129 added lines, -129 removed lines

@@ -15,136 +15,136 @@
 class WPInv_REST_Discounts_Controller extends GetPaid_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_discount';
-
-	/**
-	 * The base of this controller's route.
-	 *
-	 * @since 1.0.13
-	 * @var string
-	 */
-	protected $rest_base = 'discounts';
-
-	/** Contains this controller's class name.
-	 *
-	 * @var string
-	 */
-	public $crud_class = 'WPInv_Discount';
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_namespace_routes( $namespace ) {
-
-		parent::register_namespace_routes( $namespace );
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/discount-types',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_discount_types' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Handles rest requests for discount types.
-	 *
-	 * @since 1.0.13
-	 *
-	 *
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_discount_types() {
-		return rest_ensure_response( wpinv_get_discount_types() );
-	}
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_discount';
 
     /**
-	 * Retrieves the query params for the discount collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
-
-		$params = array_merge(
-			parent::get_collection_params(),
-        	array(
-
-				// Discount types
-				'type' => array(
-					'description'       => __( 'Type of discounts to fetch.', 'invoicing' ),
-					'type'              => array( 'array', 'string' ),
-					'default'           => 'any',
-					'validate_callback' => 'rest_validate_request_arg',
-					'sanitize_callback' => 'wpinv_parse_list',
-					'items'             => array(
-						'enum' => array_merge( array( 'any' ), array_keys( wpinv_get_discount_types() ) ),
-						'type' => 'string',
-					),
-				),
-
-			)
-		);
-
-		// Filter collection parameters for the discounts controller.
-		return apply_filters( 'getpaid_rest_discounts_collection_params', $params, $this );
-	}
-
-	/**
-	 * Determine the allowed query_vars for a get_items() response and
-	 * prepare for WP_Query.
-	 *
-	 * @param array           $prepared_args Prepared arguments.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array          $query_args
-	 */
-	protected function prepare_items_query( $prepared_args = array(), $request = null ) {
-
-		$query_args = parent::prepare_items_query( $prepared_args );
-
-		// Retrieve items by type.
-		if ( ! in_array( 'any', $request['type'] ) ) {
-
-			if ( empty( $query_args['meta_query'] ) ) {
-				$query_args['meta_query'] = array();
-			}
-
-			$query_args['meta_query'][] = array(
-				'key'     => '_wpi_discount_type',
-				'value'   => implode( ',', $request['type'] ),
-				'compare' => 'IN',
-			);
-
-		}
-
-		return apply_filters( 'getpaid_rest_discounts_prepare_items_query', $query_args, $request, $this );
-
-	}
-
-	/**
-	 * 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( 'publish', 'pending', 'draft', 'expired' );
-	}
+     * The base of this controller's route.
+     *
+     * @since 1.0.13
+     * @var string
+     */
+    protected $rest_base = 'discounts';
+
+    /** Contains this controller's class name.
+     *
+     * @var string
+     */
+    public $crud_class = 'WPInv_Discount';
+
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 1.0.19
+     *
+     * @see register_rest_route()
+     */
+    public function register_namespace_routes( $namespace ) {
+
+        parent::register_namespace_routes( $namespace );
+
+        register_rest_route(
+            $this->namespace,
+            '/' . $this->rest_base . '/discount-types',
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_discount_types' ),
+                    'permission_callback' => array( $this, 'get_items_permissions_check' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Handles rest requests for discount types.
+     *
+     * @since 1.0.13
+     *
+     *
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_discount_types() {
+        return rest_ensure_response( wpinv_get_discount_types() );
+    }
+
+    /**
+     * Retrieves the query params for the discount collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
+
+        $params = array_merge(
+            parent::get_collection_params(),
+            array(
+
+                // Discount types
+                'type' => array(
+                    'description'       => __( 'Type of discounts to fetch.', 'invoicing' ),
+                    'type'              => array( 'array', 'string' ),
+                    'default'           => 'any',
+                    'validate_callback' => 'rest_validate_request_arg',
+                    'sanitize_callback' => 'wpinv_parse_list',
+                    'items'             => array(
+                        'enum' => array_merge( array( 'any' ), array_keys( wpinv_get_discount_types() ) ),
+                        'type' => 'string',
+                    ),
+                ),
+
+            )
+        );
+
+        // Filter collection parameters for the discounts controller.
+        return apply_filters( 'getpaid_rest_discounts_collection_params', $params, $this );
+    }
+
+    /**
+     * Determine the allowed query_vars for a get_items() response and
+     * prepare for WP_Query.
+     *
+     * @param array           $prepared_args Prepared arguments.
+     * @param WP_REST_Request $request Request object.
+     * @return array          $query_args
+     */
+    protected function prepare_items_query( $prepared_args = array(), $request = null ) {
+
+        $query_args = parent::prepare_items_query( $prepared_args );
+
+        // Retrieve items by type.
+        if ( ! in_array( 'any', $request['type'] ) ) {
+
+            if ( empty( $query_args['meta_query'] ) ) {
+                $query_args['meta_query'] = array();
+            }
+
+            $query_args['meta_query'][] = array(
+                'key'     => '_wpi_discount_type',
+                'value'   => implode( ',', $request['type'] ),
+                'compare' => 'IN',
+            );
+
+        }
+
+        return apply_filters( 'getpaid_rest_discounts_prepare_items_query', $query_args, $request, $this );
+
+    }
+
+    /**
+     * 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( 'publish', 'pending', 'draft', 'expired' );
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * REST API discounts controller class.
@@ -42,9 +42,9 @@ 
 	 *
 	 * @see register_rest_route()
 	 */
-	public function register_namespace_routes( $namespace ) {
+	public function register_namespace_routes($namespace) {
 
-		parent::register_namespace_routes( $namespace );
+		parent::register_namespace_routes($namespace);
 
 		register_rest_route(
 			$this->namespace,
@@ -52,8 +52,8 @@ 
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_discount_types' ),
-					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'callback'            => array($this, 'get_discount_types'),
+					'permission_callback' => array($this, 'get_items_permissions_check'),
 				),
 			)
 		);
@@ -69,7 +69,7 @@ 
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_discount_types() {
-		return rest_ensure_response( wpinv_get_discount_types() );
+		return rest_ensure_response(wpinv_get_discount_types());
 	}
 
     /**
@@ -87,13 +87,13 @@ 
 
 				// Discount types
 				'type' => array(
-					'description'       => __( 'Type of discounts to fetch.', 'invoicing' ),
-					'type'              => array( 'array', 'string' ),
+					'description'       => __('Type of discounts to fetch.', 'invoicing'),
+					'type'              => array('array', 'string'),
 					'default'           => 'any',
 					'validate_callback' => 'rest_validate_request_arg',
 					'sanitize_callback' => 'wpinv_parse_list',
 					'items'             => array(
-						'enum' => array_merge( array( 'any' ), array_keys( wpinv_get_discount_types() ) ),
+						'enum' => array_merge(array('any'), array_keys(wpinv_get_discount_types())),
 						'type' => 'string',
 					),
 				),
@@ -102,7 +102,7 @@ 
 		);
 
 		// Filter collection parameters for the discounts controller.
-		return apply_filters( 'getpaid_rest_discounts_collection_params', $params, $this );
+		return apply_filters('getpaid_rest_discounts_collection_params', $params, $this);
 	}
 
 	/**
@@ -113,26 +113,26 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array          $query_args
 	 */
-	protected function prepare_items_query( $prepared_args = array(), $request = null ) {
+	protected function prepare_items_query($prepared_args = array(), $request = null) {
 
-		$query_args = parent::prepare_items_query( $prepared_args );
+		$query_args = parent::prepare_items_query($prepared_args);
 
 		// Retrieve items by type.
-		if ( ! in_array( 'any', $request['type'] ) ) {
+		if (!in_array('any', $request['type'])) {
 
-			if ( empty( $query_args['meta_query'] ) ) {
+			if (empty($query_args['meta_query'])) {
 				$query_args['meta_query'] = array();
 			}
 
 			$query_args['meta_query'][] = array(
 				'key'     => '_wpi_discount_type',
-				'value'   => implode( ',', $request['type'] ),
+				'value'   => implode(',', $request['type']),
 				'compare' => 'IN',
 			);
 
 		}
 
-		return apply_filters( 'getpaid_rest_discounts_prepare_items_query', $query_args, $request, $this );
+		return apply_filters('getpaid_rest_discounts_prepare_items_query', $query_args, $request, $this);
 
 	}
 
@@ -144,7 +144,7 @@ 
 	 * @return array A list of registered item statuses.
 	 */
 	public function get_post_statuses() {
-		return array( 'publish', 'pending', 'draft', 'expired' );
+		return array('publish', 'pending', 'draft', 'expired');
 	}
 
 }