AyeCode / invoicing

templates/payment-forms-admin/previews/billing_email.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

templates/payment-forms-admin/previews/textarea.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

templates/payment-forms-admin/previews/discount.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

templates/payment-forms-admin/previews/paragraph.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

templates/payment-forms-admin/previews/pay_button.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 

includes/payments/class-getpaid-payment-forms.php

Indentation +123 added lines, -123 removed lines

@@ -13,128 +13,128 @@
 class GetPaid_Payment_Forms {
 
     /**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		// Update a payment form's revenue whenever an invoice is paid for or refunded.
-		add_action( 'getpaid_invoice_payment_status_changed', array( $this, 'increment_form_revenue' ) );
-		add_action( 'getpaid_invoice_payment_status_reversed', array( $this, 'decrease_form_revenue' ) );
-
-		// Sync form amount whenever invoice statuses change.
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_failed_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_refunded_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_cancelled_amount' ), 10, 3 );
-
-	}
-
-	/**
-	 * Increments a form's revenue whenever there is a payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function increment_form_revenue( $invoice ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Decreases form revenue whenever invoice payment changes.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function decrease_form_revenue( $invoice ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() - $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Updates a form's failed amount.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $from
-	 * @param string $to
-	 */
-	public function update_form_failed_amount( $invoice, $from, $to ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			return;
-		}
-
-		if ( 'wpi-failed' == $from ) {
-			$form->set_failed( $form->get_failed() - $invoice->get_total() );
-			$form->save();
-		}
-
-		if ( 'wpi-failed' == $to ) {
-			$form->set_failed( $form->get_failed() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Updates a form's refunded amount.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $from
-	 * @param string $to
-	 */
-	public function update_form_refunded_amount( $invoice, $from, $to ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			return;
-		}
-
-		if ( 'wpi-refunded' == $from ) {
-			$form->set_refunded( $form->get_refunded() - $invoice->get_total() );
-			$form->save();
-		}
-
-		if ( 'wpi-refunded' == $to ) {
-			$form->set_refunded( $form->get_refunded() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
-
-	/**
-	 * Updates a form's cancelled amount.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $from
-	 * @param string $to
-	 */
-	public function update_form_cancelled_amount( $invoice, $from, $to ) {
-
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			return;
-		}
-
-		if ( 'wpi-cancelled' == $from ) {
-			$form->set_cancelled( $form->get_cancelled() - $invoice->get_total() );
-			$form->save();
-		}
-
-		if ( 'wpi-cancelled' == $to ) {
-			$form->set_cancelled( $form->get_cancelled() + $invoice->get_total() );
-			$form->save();
-		}
-
-	}
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        // Update a payment form's revenue whenever an invoice is paid for or refunded.
+        add_action( 'getpaid_invoice_payment_status_changed', array( $this, 'increment_form_revenue' ) );
+        add_action( 'getpaid_invoice_payment_status_reversed', array( $this, 'decrease_form_revenue' ) );
+
+        // Sync form amount whenever invoice statuses change.
+        add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_failed_amount' ), 10, 3 );
+        add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_refunded_amount' ), 10, 3 );
+        add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_cancelled_amount' ), 10, 3 );
+
+    }
+
+    /**
+     * Increments a form's revenue whenever there is a payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function increment_form_revenue( $invoice ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            $form->set_earned( $form->get_earned() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Decreases form revenue whenever invoice payment changes.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function decrease_form_revenue( $invoice ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            $form->set_earned( $form->get_earned() - $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Updates a form's failed amount.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $from
+     * @param string $to
+     */
+    public function update_form_failed_amount( $invoice, $from, $to ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            return;
+        }
+
+        if ( 'wpi-failed' == $from ) {
+            $form->set_failed( $form->get_failed() - $invoice->get_total() );
+            $form->save();
+        }
+
+        if ( 'wpi-failed' == $to ) {
+            $form->set_failed( $form->get_failed() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Updates a form's refunded amount.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $from
+     * @param string $to
+     */
+    public function update_form_refunded_amount( $invoice, $from, $to ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            return;
+        }
+
+        if ( 'wpi-refunded' == $from ) {
+            $form->set_refunded( $form->get_refunded() - $invoice->get_total() );
+            $form->save();
+        }
+
+        if ( 'wpi-refunded' == $to ) {
+            $form->set_refunded( $form->get_refunded() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
+
+    /**
+     * Updates a form's cancelled amount.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $from
+     * @param string $to
+     */
+    public function update_form_cancelled_amount( $invoice, $from, $to ) {
+
+        $form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
+        if ( $form->get_id() ) {
+            return;
+        }
+
+        if ( 'wpi-cancelled' == $from ) {
+            $form->set_cancelled( $form->get_cancelled() - $invoice->get_total() );
+            $form->save();
+        }
+
+        if ( 'wpi-cancelled' == $to ) {
+            $form->set_cancelled( $form->get_cancelled() + $invoice->get_total() );
+            $form->save();
+        }
+
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment forms controller class
@@ -19,13 +19,13 @@ 
 	public function __construct() {
 
 		// Update a payment form's revenue whenever an invoice is paid for or refunded.
-		add_action( 'getpaid_invoice_payment_status_changed', array( $this, 'increment_form_revenue' ) );
-		add_action( 'getpaid_invoice_payment_status_reversed', array( $this, 'decrease_form_revenue' ) );
+		add_action('getpaid_invoice_payment_status_changed', array($this, 'increment_form_revenue'));
+		add_action('getpaid_invoice_payment_status_reversed', array($this, 'decrease_form_revenue'));
 
 		// Sync form amount whenever invoice statuses change.
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_failed_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_refunded_amount' ), 10, 3 );
-		add_action( 'getpaid_invoice_status_changed', array( $this, 'update_form_cancelled_amount' ), 10, 3 );
+		add_action('getpaid_invoice_status_changed', array($this, 'update_form_failed_amount'), 10, 3);
+		add_action('getpaid_invoice_status_changed', array($this, 'update_form_refunded_amount'), 10, 3);
+		add_action('getpaid_invoice_status_changed', array($this, 'update_form_cancelled_amount'), 10, 3);
 
 	}
 
@@ -34,11 +34,11 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function increment_form_revenue( $invoice ) {
+	public function increment_form_revenue($invoice) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() + $invoice->get_total() );
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
+			$form->set_earned($form->get_earned() + $invoice->get_total());
 			$form->save();
 		}
 
@@ -49,11 +49,11 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function decrease_form_revenue( $invoice ) {
+	public function decrease_form_revenue($invoice) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
-			$form->set_earned( $form->get_earned() - $invoice->get_total() );
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
+			$form->set_earned($form->get_earned() - $invoice->get_total());
 			$form->save();
 		}
 
@@ -66,20 +66,20 @@ 
 	 * @param string $from
 	 * @param string $to
 	 */
-	public function update_form_failed_amount( $invoice, $from, $to ) {
+	public function update_form_failed_amount($invoice, $from, $to) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
 			return;
 		}
 
-		if ( 'wpi-failed' == $from ) {
-			$form->set_failed( $form->get_failed() - $invoice->get_total() );
+		if ('wpi-failed' == $from) {
+			$form->set_failed($form->get_failed() - $invoice->get_total());
 			$form->save();
 		}
 
-		if ( 'wpi-failed' == $to ) {
-			$form->set_failed( $form->get_failed() + $invoice->get_total() );
+		if ('wpi-failed' == $to) {
+			$form->set_failed($form->get_failed() + $invoice->get_total());
 			$form->save();
 		}
 
@@ -92,20 +92,20 @@ 
 	 * @param string $from
 	 * @param string $to
 	 */
-	public function update_form_refunded_amount( $invoice, $from, $to ) {
+	public function update_form_refunded_amount($invoice, $from, $to) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
 			return;
 		}
 
-		if ( 'wpi-refunded' == $from ) {
-			$form->set_refunded( $form->get_refunded() - $invoice->get_total() );
+		if ('wpi-refunded' == $from) {
+			$form->set_refunded($form->get_refunded() - $invoice->get_total());
 			$form->save();
 		}
 
-		if ( 'wpi-refunded' == $to ) {
-			$form->set_refunded( $form->get_refunded() + $invoice->get_total() );
+		if ('wpi-refunded' == $to) {
+			$form->set_refunded($form->get_refunded() + $invoice->get_total());
 			$form->save();
 		}
 
@@ -118,20 +118,20 @@ 
 	 * @param string $from
 	 * @param string $to
 	 */
-	public function update_form_cancelled_amount( $invoice, $from, $to ) {
+	public function update_form_cancelled_amount($invoice, $from, $to) {
 
-		$form = new GetPaid_Payment_Form( $invoice->get_payment_form() );
-		if ( $form->get_id() ) {
+		$form = new GetPaid_Payment_Form($invoice->get_payment_form());
+		if ($form->get_id()) {
 			return;
 		}
 
-		if ( 'wpi-cancelled' == $from ) {
-			$form->set_cancelled( $form->get_cancelled() - $invoice->get_total() );
+		if ('wpi-cancelled' == $from) {
+			$form->set_cancelled($form->get_cancelled() - $invoice->get_total());
 			$form->save();
 		}
 
-		if ( 'wpi-cancelled' == $to ) {
-			$form->set_cancelled( $form->get_cancelled() + $invoice->get_total() );
+		if ('wpi-cancelled' == $to) {
+			$form->set_cancelled($form->get_cancelled() + $invoice->get_total());
 			$form->save();
 		}
 

includes/admin/meta-boxes/class-getpaid-meta-box-payment-form.php

Indentation +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,10 +16,10 @@ 
 class GetPaid_Meta_Box_Payment_Form {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
         ?>
         <div id="wpinv-form-builder" class="bsui">
@@ -86,11 +86,11 @@ 
     }
 
     /**
-	 * 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 form.
         $form = new GetPaid_Payment_Form( $post_id );
@@ -121,11 +121,11 @@ 
     }
 
     /**
-	 * Converts an array fo form items to objects.
-	 *
-	 * @param array $items
-	 */
-	public static function item_to_objects( $items ) {
+     * Converts an array fo form items to objects.
+     *
+     * @param array $items
+     */
+    public static function item_to_objects( $items ) {
 
         $objects = array();
 

Spacing +29 added lines, -29 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,14 +20,14 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
         ?>
         <div id="wpinv-form-builder" class="bsui">
             <div class="row">
                 <div class="col-sm-4">
 
                     <!-- Builder tabs -->
-                    <button class="button button-primary" v-if="active_tab!='new_item'" @click.prevent="active_tab='new_item'"><?php _e( 'Go Back', 'invoicing' ); ?></button>
+                    <button class="button button-primary" v-if="active_tab!='new_item'" @click.prevent="active_tab='new_item'"><?php _e('Go Back', 'invoicing'); ?></button>
 
                     <!-- Builder tab content -->
                     <div class="mt-4">
@@ -35,7 +35,7 @@ 
                         <!-- Available builder elements -->
                         <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='new_item'">
                             <div class="wpinv-form-builder-add-field-types">
-                                <small class='form-text text-muted'><?php _e( 'Add an element by dragging it to the payment form.', 'invoicing' ); ?></small>
+                                <small class='form-text text-muted'><?php _e('Add an element by dragging it to the payment form.', 'invoicing'); ?></small>
                                 <draggable class="section mt-2" style="display: flex; flex-flow: wrap; justify-content: space-between;" v-model="elements" :group="{ name: 'fields', pull: 'clone', put: false }" :sort="false" :clone="addDraggedField" tag="ul" filter=".wpinv-undraggable">
                                     <li v-for="element in elements" class= "wpinv-payment-form-left-fields-field" @click.prevent="addField(element)" :class="{ 'd-none': element.defaults.premade }">
                                         <button class="button btn text-dark">
@@ -50,18 +50,18 @@ 
                         <!-- Edit an element -->
                         <div class="wpinv-form-builder-tab-pane" v-if="active_tab=='edit_item'" style="font-size: 14px;">
                             <div class="wpinv-form-builder-edit-field-wrapper">
-                                <?php do_action( 'wpinv_payment_form_edit_element_template', 'active_form_element', $post ); ?>
-                                <?php do_action( 'getpaid_payment_form_edit_element_template', $post ); ?>
+                                <?php do_action('wpinv_payment_form_edit_element_template', 'active_form_element', $post); ?>
+                                <?php do_action('getpaid_payment_form_edit_element_template', $post); ?>
                                 <div class='form-group'>
-                                    <label :for="active_form_element.id + '_grid_width'"><?php esc_html_e( 'Width', 'invoicing' ) ?></label>
+                                    <label :for="active_form_element.id + '_grid_width'"><?php esc_html_e('Width', 'invoicing') ?></label>
                                     <select class='form-control custom-select' :id="active_form_element.id + '_grid_width'" v-model='gridWidth'>
-                                        <option value='full'><?php esc_html_e( 'Full Width', 'invoicing' ); ?></option>
-                                        <option value='half'><?php esc_html_e( 'Half Width', 'invoicing' ); ?></option>
-                                        <option value='third'><?php esc_html_e( '1/3 Width', 'invoicing' ); ?></option>
+                                        <option value='full'><?php esc_html_e('Full Width', 'invoicing'); ?></option>
+                                        <option value='half'><?php esc_html_e('Half Width', 'invoicing'); ?></option>
+                                        <option value='third'><?php esc_html_e('1/3 Width', 'invoicing'); ?></option>
                                     </select>
                                 </div>
                                 <div>
-                                    <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e( 'Delete Element', 'invoicing' ); ?></button>
+                                    <button type="button" class="button button-link button-link-delete" @click.prevent="removeField(active_form_element)" v-show="! active_form_element.premade"><?php _e('Delete Element', 'invoicing'); ?></button>
                                 </div>
                             </div>
                         </div>
@@ -70,15 +70,15 @@ 
 
                 </div>
                 <div class="col-sm-8 border-left">
-                    <small class='form-text text-muted' v-if='form_elements.length'><?php _e( 'Click on any element to edit or delete it.', 'invoicing' ); ?></small>
-                    <p class='form-text text-muted' v-if='! form_elements.length'><?php _e( 'This form is empty. Add new elements by dragging them from the right.', 'invoicing' ); ?></p>
+                    <small class='form-text text-muted' v-if='form_elements.length'><?php _e('Click on any element to edit or delete it.', 'invoicing'); ?></small>
+                    <p class='form-text text-muted' v-if='! form_elements.length'><?php _e('This form is empty. Add new elements by dragging them from the right.', 'invoicing'); ?></p>
 
                     <div class="container-fluid">
                         <draggable class="section row" v-model="form_elements" @add="highlightLastDroppedField" group="fields" tag="div" style="min-height: 100%; font-size: 14px;">
                             <div v-for="form_element in form_elements" class="wpinv-form-builder-element-preview" :class="[{ active: active_form_element==form_element &&  active_tab=='edit_item' }, form_element.type, grid_class( form_element ) ]" @click="active_tab = 'edit_item'; active_form_element = form_element">
                                 <div class="wpinv-form-builder-element-preview-inner">
                                     <div class="wpinv-payment-form-field-preview-overlay"></div>
-                                    <?php do_action( 'wpinv_payment_form_render_element_template', 'form_element', $post ); ?>
+                                    <?php do_action('wpinv_payment_form_render_element_template', 'form_element', $post); ?>
                                 </div>
                             </div>
                         </draggable>
@@ -92,7 +92,7 @@ 
         </div>
         <?php
 
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
     }
 
     /**
@@ -100,33 +100,33 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the form.
-        $form = new GetPaid_Payment_Form( $post_id );
+        $form = new GetPaid_Payment_Form($post_id);
 
         // Fetch form items.
-        $form_items = json_decode( wp_unslash( $_POST['wpinv_form_items'] ), true );
+        $form_items = json_decode(wp_unslash($_POST['wpinv_form_items']), true);
 
         // Ensure that we have an array...
-        if ( empty( $form_items ) ) {
+        if (empty($form_items)) {
             $form_items = array();
         }
 
         // Add it to the form.
-        $form->set_items( self::item_to_objects( $form_items ) );
+        $form->set_items(self::item_to_objects($form_items));
 
         // Save form elements.
-        $form_elements = json_decode( wp_unslash( $_POST['wpinv_form_elements'] ), true );
-        if ( empty( $form_elements ) ) {
+        $form_elements = json_decode(wp_unslash($_POST['wpinv_form_elements']), true);
+        if (empty($form_elements)) {
             $form_elements = array();
         }
 
-        $form->set_elements( $form_elements );
+        $form->set_elements($form_elements);
 
         // Persist data to the datastore.
         $form->save();
-        do_action( 'getpaid_payment_form_metabox_save', $post_id, $form );
+        do_action('getpaid_payment_form_metabox_save', $post_id, $form);
 
     }
 
@@ -135,14 +135,14 @@ 
 	 *
 	 * @param array $items
 	 */
-	public static function item_to_objects( $items ) {
+	public static function item_to_objects($items) {
 
         $objects = array();
 
-        foreach ( $items as $item ) {
-            $_item = new GetPaid_Form_Item( $item['id'] );
-            $_item->set_allow_quantities( (bool) $item['allow_quantities'] );
-            $_item->set_is_required( (bool) $item['required'] );
+        foreach ($items as $item) {
+            $_item = new GetPaid_Form_Item($item['id']);
+            $_item->set_allow_quantities((bool) $item['allow_quantities']);
+            $_item->set_is_required((bool) $item['required']);
             $objects[] = $_item;
         }
 

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.
@@ -368,34 +368,34 @@ 
     }
 
     /**
-	 * 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'] ) ? $_POST['wpinv_discount_code'] : null,
-				'amount'               => isset( $_POST['wpinv_discount_amount'] ) ? $_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'        => isset( $_POST['wpinv_discount_single_use'] ),
+            array(
+                'code'                 => isset( $_POST['wpinv_discount_code'] ) ? $_POST['wpinv_discount_code'] : null,
+                'amount'               => isset( $_POST['wpinv_discount_amount'] ) ? $_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'        => isset( $_POST['wpinv_discount_single_use'] ),
                 'type'                 => isset( $_POST['wpinv_discount_type'] ) ? $_POST['wpinv_discount_type'] : null,
-				'is_recurring'         => isset( $_POST['wpinv_discount_recurring'] ),
-				'items'                => isset( $_POST['wpinv_discount_items'] ) ? $_POST['wpinv_discount_items'] : array(),
-				'excluded_items'       => isset( $_POST['wpinv_discount_excluded_items'] ) ? $_POST['wpinv_discount_excluded_items'] : array(),
-				'max_uses'             => isset( $_POST['wpinv_discount_max_uses'] ) ? $_POST['wpinv_discount_max_uses'] : null,
-				'min_total'            => isset( $_POST['wpinv_discount_min_total'] ) ? $_POST['wpinv_discount_min_total'] : null,
-				'max_total'            => isset( $_POST['wpinv_discount_max_total'] ) ? $_POST['wpinv_discount_max_total'] : null,
-			)
+                'is_recurring'         => isset( $_POST['wpinv_discount_recurring'] ),
+                'items'                => isset( $_POST['wpinv_discount_items'] ) ? $_POST['wpinv_discount_items'] : array(),
+                'excluded_items'       => isset( $_POST['wpinv_discount_excluded_items'] ) ? $_POST['wpinv_discount_excluded_items'] : array(),
+                'max_uses'             => isset( $_POST['wpinv_discount_max_uses'] ) ? $_POST['wpinv_discount_max_uses'] : null,
+                'min_total'            => isset( $_POST['wpinv_discount_min_total'] ) ? $_POST['wpinv_discount_min_total'] : null,
+                'max_total'            => isset( $_POST['wpinv_discount_max_total'] ) ? $_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 +96 added lines, -96 removed lines

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

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

Indentation +181 added lines, -181 removed lines

@@ -12,189 +12,189 @@
  */
 class GetPaid_Payment_Form_Submission_Discount {
 
-	/**
-	 * Submission discounts.
-	 * @var array
-	 */
-	public $discounts = array();
+    /**
+     * Submission discounts.
+     * @var array
+     */
+    public $discounts = array();
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param float                           $initial_total
+     * @param float                           $recurring_total
+     */
+    public function __construct( $submission, $initial_total, $recurring_total ) {
+
+        // Process any existing invoice discounts.
+        if ( $submission->has_invoice() ) {
+            $this->discounts = $submission->get_invoice()->get_discounts();
+        }
+
+        // Do we have a discount?
+        $discount = $submission->get_field( 'discount' );
+
+        if ( empty( $discount ) ) {
+
+            if ( isset( $this->discounts['discount_code'] ) ) {
+                unset( $this->discounts['discount_code'] );
+            }
+
+            return;
+        }
+
+        // Processes the discount code.
+        $amount = max( $initial_total, $recurring_total );
+        $this->process_discount( $submission, $discount, $amount );
+
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param float                           $initial_total
-	 * @param float                           $recurring_total
-	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
-
-		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
-			$this->discounts = $submission->get_invoice()->get_discounts();
-		}
-
-		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
-
-		if ( empty( $discount ) ) {
-
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
-			}
-
-			return;
-		}
-
-		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
-
-	}
-
-	/**
-	 * Processes a submission discount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param string                          $discount
-	 * @param float                           $amount
-	 */
-	public function process_discount( $submission, $discount, $amount ) {
-
-		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
-
-		// Ensure it is active.
+     * Processes a submission discount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param string                          $discount
+     * @param float                           $amount
+     */
+    public function process_discount( $submission, $discount, $amount ) {
+
+        // Fetch the discount.
+        $discount = new WPInv_Discount( $discount );
+
+        // Ensure it is active.
         if ( ! $this->is_discount_active( $discount ) ) {
-			throw new Exception( __( 'Invalid or expired discount code', 'invoicing' ) );
-		}
-
-		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new Exception( __( 'This discount code has been used up', 'invoicing' ) );
-		}
-
-		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
-
-		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
-
-		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
-	}
-
-	/**
-	 * Validates a single use discount.
-	 *
-	 * @param WPInv_Discount                  $discount
-	 * @return bool
-	 */
-	public function is_discount_active(  $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
-	}
-
-	/**
-	 * Returns a user's id or email.
-	 *
-	 * @param string $email
-	 * @return int|string|false
-	 */
-	public function get_user_id_or_email( $email ) {
-
-		if ( is_user_logged_in() ) {
-			return get_current_user_id();
-		}
-
-		return empty( $email ) ? false : sanitize_email( $email );
-	}
-
-	/**
-	 * Validates a single use discount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount                  $discount
-	 */
-	public function validate_single_use_discount( $submission, $discount ) {
-
-		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
-			return;
-		}
-
-		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
-
-		if ( empty( $user ) ) {
-			throw new Exception( __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
-		}
-
-		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new Exception( __( 'You have already used this discount', 'invoicing' ) );
-		}
-
-	}
-
-	/**
-	 * Validates the discount's amount.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount         $discount
-	 * @param float                  $amount
-	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
-
-		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
-		}
-
-		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
-		}
-
-	}
-
-	/**
-	 * Calculates the discount code's amount.
-	 *
-	 * Ensure that the discount exists and has been validated before calling this method.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @param WPInv_Discount                  $discount
-	 * @return array
-	 */
-	public function calculate_discount( $submission, $discount ) {
-
-		$initial_discount   = 0;
-		$recurring_discount = 0;
-
-		foreach ( $submission->get_items() as $item ) {
-
-			// Abort if it is not valid for this item.
-			if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
-				continue;
-			}
-
-			// Calculate the initial amount...
-			$initial_discount += $discount->get_discounted_amount( $item->get_sub_total() );
-
-			// ... and maybe the recurring amount.
-			if ( $item->is_recurring() && $discount->is_recurring() ) {
-				$recurring_discount += $discount->get_discounted_amount( $item->get_recurring_sub_total() );
-			}
-
-		}
-
-		return array(
-			'name'               => 'discount_code',
-			'discount_code'      => $discount->get_code(),
-			'initial_discount'   => $initial_discount,
-			'recurring_discount' => $recurring_discount,
-		);
-
-	}
+            throw new Exception( __( 'Invalid or expired discount code', 'invoicing' ) );
+        }
+
+        // Exceeded limit.
+        if ( $discount->has_exceeded_limit() ) {
+            throw new Exception( __( 'This discount code has been used up', 'invoicing' ) );
+        }
+
+        // Validate usages.
+        $this->validate_single_use_discount( $submission, $discount );
+
+        // Validate amount.
+        $this->validate_discount_amount( $submission, $discount, $amount );
+
+        // Save the discount.
+        $this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+    }
+
+    /**
+     * Validates a single use discount.
+     *
+     * @param WPInv_Discount                  $discount
+     * @return bool
+     */
+    public function is_discount_active(  $discount ) {
+        return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+    }
+
+    /**
+     * Returns a user's id or email.
+     *
+     * @param string $email
+     * @return int|string|false
+     */
+    public function get_user_id_or_email( $email ) {
+
+        if ( is_user_logged_in() ) {
+            return get_current_user_id();
+        }
+
+        return empty( $email ) ? false : sanitize_email( $email );
+    }
+
+    /**
+     * Validates a single use discount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount                  $discount
+     */
+    public function validate_single_use_discount( $submission, $discount ) {
+
+        // Abort if it is not a single use discount.
+        if ( ! $discount->is_single_use() ) {
+            return;
+        }
+
+        // Ensure there is a valid billing email.
+        $user = $this->get_user_id_or_email( $submission->get_billing_email() );
+
+        if ( empty( $user ) ) {
+            throw new Exception( __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+        }
+
+        // Has the user used this discount code before?
+        if ( ! $discount->is_valid_for_user( $user ) ) {
+            throw new Exception( __( 'You have already used this discount', 'invoicing' ) );
+        }
+
+    }
+
+    /**
+     * Validates the discount's amount.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount         $discount
+     * @param float                  $amount
+     */
+    public function validate_discount_amount( $submission, $discount, $amount ) {
+
+        // Validate minimum amount.
+        if ( ! $discount->is_minimum_amount_met( $amount ) ) {
+            $min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
+            throw new Exception( sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+        }
+
+        // Validate the maximum amount.
+        if ( ! $discount->is_maximum_amount_met( $amount ) ) {
+            $max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
+            throw new Exception( sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+        }
+
+    }
+
+    /**
+     * Calculates the discount code's amount.
+     *
+     * Ensure that the discount exists and has been validated before calling this method.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @param WPInv_Discount                  $discount
+     * @return array
+     */
+    public function calculate_discount( $submission, $discount ) {
+
+        $initial_discount   = 0;
+        $recurring_discount = 0;
+
+        foreach ( $submission->get_items() as $item ) {
+
+            // Abort if it is not valid for this item.
+            if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+                continue;
+            }
+
+            // Calculate the initial amount...
+            $initial_discount += $discount->get_discounted_amount( $item->get_sub_total() );
+
+            // ... and maybe the recurring amount.
+            if ( $item->is_recurring() && $discount->is_recurring() ) {
+                $recurring_discount += $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+            }
+
+        }
+
+        return array(
+            'name'               => 'discount_code',
+            'discount_code'      => $discount->get_code(),
+            'initial_discount'   => $initial_discount,
+            'recurring_discount' => $recurring_discount,
+        );
+
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission discount class
@@ -25,28 +25,28 @@ 
 	 * @param float                           $initial_total
 	 * @param float                           $recurring_total
 	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
+	public function __construct($submission, $initial_total, $recurring_total) {
 
 		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->discounts = $submission->get_invoice()->get_discounts();
 		}
 
 		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
+		$discount = $submission->get_field('discount');
 
-		if ( empty( $discount ) ) {
+		if (empty($discount)) {
 
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
+			if (isset($this->discounts['discount_code'])) {
+				unset($this->discounts['discount_code']);
 			}
 
 			return;
 		}
 
 		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
+		$amount = max($initial_total, $recurring_total);
+		$this->process_discount($submission, $discount, $amount);
 
 	}
 
@@ -57,29 +57,29 @@ 
 	 * @param string                          $discount
 	 * @param float                           $amount
 	 */
-	public function process_discount( $submission, $discount, $amount ) {
+	public function process_discount($submission, $discount, $amount) {
 
 		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
+		$discount = new WPInv_Discount($discount);
 
 		// Ensure it is active.
-        if ( ! $this->is_discount_active( $discount ) ) {
-			throw new Exception( __( 'Invalid or expired discount code', 'invoicing' ) );
+        if (!$this->is_discount_active($discount)) {
+			throw new Exception(__('Invalid or expired discount code', 'invoicing'));
 		}
 
 		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new Exception( __( 'This discount code has been used up', 'invoicing' ) );
+		if ($discount->has_exceeded_limit()) {
+			throw new Exception(__('This discount code has been used up', 'invoicing'));
 		}
 
 		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
+		$this->validate_single_use_discount($submission, $discount);
 
 		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
+		$this->validate_discount_amount($submission, $discount, $amount);
 
 		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+		$this->discounts['discount_code'] = $this->calculate_discount($submission, $discount);
 	}
 
 	/**
@@ -88,8 +88,8 @@ 
 	 * @param WPInv_Discount                  $discount
 	 * @return bool
 	 */
-	public function is_discount_active(  $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+	public function is_discount_active($discount) {
+		return $discount->exists() && $discount->is_active() && $discount->has_started() && !$discount->is_expired();
 	}
 
 	/**
@@ -98,13 +98,13 @@ 
 	 * @param string $email
 	 * @return int|string|false
 	 */
-	public function get_user_id_or_email( $email ) {
+	public function get_user_id_or_email($email) {
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return get_current_user_id();
 		}
 
-		return empty( $email ) ? false : sanitize_email( $email );
+		return empty($email) ? false : sanitize_email($email);
 	}
 
 	/**
@@ -113,23 +113,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @param WPInv_Discount                  $discount
 	 */
-	public function validate_single_use_discount( $submission, $discount ) {
+	public function validate_single_use_discount($submission, $discount) {
 
 		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
+		if (!$discount->is_single_use()) {
 			return;
 		}
 
 		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
+		$user = $this->get_user_id_or_email($submission->get_billing_email());
 
-		if ( empty( $user ) ) {
-			throw new Exception( __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+		if (empty($user)) {
+			throw new Exception(__('You need to either log in or enter your billing email before applying this discount', 'invoicing'));
 		}
 
 		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new Exception( __( 'You have already used this discount', 'invoicing' ) );
+		if (!$discount->is_valid_for_user($user)) {
+			throw new Exception(__('You have already used this discount', 'invoicing'));
 		}
 
 	}
@@ -141,18 +141,18 @@ 
 	 * @param WPInv_Discount         $discount
 	 * @param float                  $amount
 	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
+	public function validate_discount_amount($submission, $discount, $amount) {
 
 		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+		if (!$discount->is_minimum_amount_met($amount)) {
+			$min = wpinv_price($discount->get_minimum_total(), $submission->get_currency());
+			throw new Exception(sprintf(__('The minimum total for using this discount is %s', 'invoicing'), $min));
 		}
 
 		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new Exception( sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+		if (!$discount->is_maximum_amount_met($amount)) {
+			$max = wpinv_price($discount->get_maximum_total(), $submission->get_currency());
+			throw new Exception(sprintf(__('The maximum total for using this discount is %s', 'invoicing'), $max));
 		}
 
 	}
@@ -166,24 +166,24 @@ 
 	 * @param WPInv_Discount                  $discount
 	 * @return array
 	 */
-	public function calculate_discount( $submission, $discount ) {
+	public function calculate_discount($submission, $discount) {
 
 		$initial_discount   = 0;
 		$recurring_discount = 0;
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
 			// Abort if it is not valid for this item.
-			if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+			if (!$discount->is_valid_for_items(array($item->get_id()))) {
 				continue;
 			}
 
 			// Calculate the initial amount...
-			$initial_discount += $discount->get_discounted_amount( $item->get_sub_total() );
+			$initial_discount += $discount->get_discounted_amount($item->get_sub_total());
 
 			// ... and maybe the recurring amount.
-			if ( $item->is_recurring() && $discount->is_recurring() ) {
-				$recurring_discount += $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+			if ($item->is_recurring() && $discount->is_recurring()) {
+				$recurring_discount += $discount->get_discounted_amount($item->get_recurring_sub_total());
 			}
 
 		}