AyeCode / invoicing

templates/payment-forms/cart-totals.php

Indentation +17 added lines, -17 removed lines

@@ -11,26 +11,26 @@ 
 
 // Totals rows.
 $cart_totals = apply_filters(
-	'getpaid_payment_form_cart_table_totals',
-	array(
-		'subtotal' => __( 'Subtotal', 'invoicing' ),
-		'tax'      => __( 'Tax', 'invoicing' ),
-		'fees'     => __( 'Fee', 'invoicing' ),
-		'discount' => __( 'Discount', 'invoicing' ),
-		'total'    => __( 'Total', 'invoicing' ),
-	),
-	$form
+    'getpaid_payment_form_cart_table_totals',
+    array(
+        'subtotal' => __( 'Subtotal', 'invoicing' ),
+        'tax'      => __( 'Tax', 'invoicing' ),
+        'fees'     => __( 'Fee', 'invoicing' ),
+        'discount' => __( 'Discount', 'invoicing' ),
+        'total'    => __( 'Total', 'invoicing' ),
+    ),
+    $form
 );
 
 $currency = $form->get_currency();
 $country  = wpinv_get_default_country();
 
 if ( ! empty( $form->invoice ) ) {
-	$country  = $form->invoice->get_country();
+    $country  = $form->invoice->get_country();
 }
 
 if ( ! wpinv_use_taxes() && isset( $cart_totals['tax'] ) ) {
-	unset( $cart_totals['tax'] );
+    unset( $cart_totals['tax'] );
 }
 
 do_action( 'getpaid_before_payment_form_cart_totals', $form, $cart_totals );
@@ -61,13 +61,13 @@ 
 
 							<?php
 
-								// Total tax.
-								if ( in_array( $key, array( 'tax', 'discount', 'subtotal', 'total', 'fees' ), true ) ) {
-									wpinv_the_price( 0, $currency );
-								}
+                                // Total tax.
+                                if ( in_array( $key, array( 'tax', 'discount', 'subtotal', 'total', 'fees' ), true ) ) {
+                                    wpinv_the_price( 0, $currency );
+                                }
 
-								do_action( "getpaid_payment_form_cart_totals_$key", $form );
-							?>
+                                do_action( "getpaid_payment_form_cart_totals_$key", $form );
+                            ?>
 
 						</div>
 

Spacing +19 added lines, -19 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
 $cart_totals = apply_filters(
 	'getpaid_payment_form_cart_table_totals',
 	array(
-		'subtotal' => __( 'Subtotal', 'invoicing' ),
-		'tax'      => __( 'Tax', 'invoicing' ),
-		'fees'     => __( 'Fee', 'invoicing' ),
-		'discount' => __( 'Discount', 'invoicing' ),
-		'total'    => __( 'Total', 'invoicing' ),
+		'subtotal' => __('Subtotal', 'invoicing'),
+		'tax'      => __('Tax', 'invoicing'),
+		'fees'     => __('Fee', 'invoicing'),
+		'discount' => __('Discount', 'invoicing'),
+		'total'    => __('Total', 'invoicing'),
 	),
 	$form
 );
@@ -25,15 +25,15 @@ 
 $currency = $form->get_currency();
 $country  = wpinv_get_default_country();
 
-if ( ! empty( $form->invoice ) ) {
-	$country  = $form->invoice->get_country();
+if (!empty($form->invoice)) {
+	$country = $form->invoice->get_country();
 }
 
-if ( ! wpinv_use_taxes() && isset( $cart_totals['tax'] ) ) {
-	unset( $cart_totals['tax'] );
+if (!wpinv_use_taxes() && isset($cart_totals['tax'])) {
+	unset($cart_totals['tax']);
 }
 
-do_action( 'getpaid_before_payment_form_cart_totals', $form, $cart_totals );
+do_action('getpaid_before_payment_form_cart_totals', $form, $cart_totals);
 
 ?>
 <style>
@@ -47,26 +47,26 @@ 
 	<div class="row">
 		<div class="col-12 offset-sm-6 col-sm-6 border-sm-left pl-sm-0">
 
-			<?php foreach ( $cart_totals as $key => $label ) : ?>
+			<?php foreach ($cart_totals as $key => $label) : ?>
 
-				<div class="getpaid-form-cart-totals-col getpaid-form-cart-totals-<?php echo esc_attr( $key ); ?> font-weight-bold py-2 px-3 <?php echo 'total' == $key ? 'bg-light' : 'border-bottom'; ?>">
+				<div class="getpaid-form-cart-totals-col getpaid-form-cart-totals-<?php echo esc_attr($key); ?> font-weight-bold py-2 px-3 <?php echo 'total' == $key ? 'bg-light' : 'border-bottom'; ?>">
 
 					<div class="form-row row">
 
 						<div class="col-8 pl-sm-0 getpaid-payment-form-line-totals-label">
-							<?php echo esc_html( $label ); ?>
+							<?php echo esc_html($label); ?>
 						</div>
 
-						<div class="col-4 getpaid-payment-form-line-totals-value getpaid-form-cart-totals-total-<?php echo esc_attr( $key ); ?>">
+						<div class="col-4 getpaid-payment-form-line-totals-value getpaid-form-cart-totals-total-<?php echo esc_attr($key); ?>">
 
 							<?php
 
 								// Total tax.
-								if ( in_array( $key, array( 'tax', 'discount', 'subtotal', 'total', 'fees' ), true ) ) {
-									wpinv_the_price( 0, $currency );
+								if (in_array($key, array('tax', 'discount', 'subtotal', 'total', 'fees'), true)) {
+									wpinv_the_price(0, $currency);
 								}
 
-								do_action( "getpaid_payment_form_cart_totals_$key", $form );
+								do_action("getpaid_payment_form_cart_totals_$key", $form);
 							?>
 
 						</div>
@@ -82,4 +82,4 @@ 
 </div>
 
 <?php
-do_action( 'getpaid_payment_form_cart_totals', $form, $cart_totals );
+do_action('getpaid_payment_form_cart_totals', $form, $cart_totals);

templates/payment-forms/elements/address-fields.php

Spacing +52 added lines, -52 removed lines

@@ -12,75 +12,75 @@ 
  * @var GetPaid_Payment_Form $form
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$field_type = sanitize_key( $field_type );
+$field_type = sanitize_key($field_type);
 
-echo "<div class='row " . esc_attr( $field_type ) . "'>";
+echo "<div class='row " . esc_attr($field_type) . "'>";
 
 // Prepare current user.
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
     $user_id = $form->invoice->get_user_id();
 }
 
-if ( empty( $user_id ) && is_user_logged_in() ) {
+if (empty($user_id) && is_user_logged_in()) {
     $user_id = get_current_user_id();
 }
 
-if ( ! empty( $user_id ) ) {
-    $user  = wp_get_current_user();
+if (!empty($user_id)) {
+    $user = wp_get_current_user();
 }
 
-foreach ( $fields as $address_field ) {
+foreach ($fields as $address_field) {
 
     // Skip if it is hidden.
-    if ( empty( $address_field['visible'] ) ) {
+    if (empty($address_field['visible'])) {
         continue;
     }
 
-    do_action( 'getpaid_payment_form_address_field_before_' . $address_field['name'], $field_type, $address_field );
+    do_action('getpaid_payment_form_address_field_before_' . $address_field['name'], $field_type, $address_field);
 
     // Prepare variables.
     $field_name  = $address_field['name'];
     $field_name  = "{$field_type}[$field_name]";
-    $wrap_class  = getpaid_get_form_element_grid_class( $address_field );
-    $wrap_class  = esc_attr( "$wrap_class getpaid-address-field-wrapper" );
-    $placeholder = empty( $address_field['placeholder'] ) ? '' : esc_attr( $address_field['placeholder'] );
-    $description = empty( $address_field['description'] ) ? '' : wp_kses_post( $address_field['description'] );
-    $value       = ! empty( $user_id ) ? get_user_meta( $user_id, '_' . $address_field['name'], true ) : '';
-    $label       = empty( $address_field['label'] ) ? '' : wp_kses_post( $address_field['label'] );
-
-    $method_name = 'get_' . str_replace( 'wpinv_', '', $address_field['name'] );
-    if ( ! empty( $form->invoice ) && is_callable( array( $form->invoice, $method_name ) ) ) {
-        $value = call_user_func( array( $form->invoice, $method_name ) );
+    $wrap_class  = getpaid_get_form_element_grid_class($address_field);
+    $wrap_class  = esc_attr("$wrap_class getpaid-address-field-wrapper");
+    $placeholder = empty($address_field['placeholder']) ? '' : esc_attr($address_field['placeholder']);
+    $description = empty($address_field['description']) ? '' : wp_kses_post($address_field['description']);
+    $value       = !empty($user_id) ? get_user_meta($user_id, '_' . $address_field['name'], true) : '';
+    $label       = empty($address_field['label']) ? '' : wp_kses_post($address_field['label']);
+
+    $method_name = 'get_' . str_replace('wpinv_', '', $address_field['name']);
+    if (!empty($form->invoice) && is_callable(array($form->invoice, $method_name))) {
+        $value = call_user_func(array($form->invoice, $method_name));
     }
 
-    if ( empty( $value ) && 'wpinv_first_name' === $address_field['name'] && ! empty( $user ) ) {
+    if (empty($value) && 'wpinv_first_name' === $address_field['name'] && !empty($user)) {
         $value = $user->first_name;
     }
 
-    if ( empty( $value ) && 'wpinv_last_name' === $address_field['name'] && ! empty( $user ) ) {
+    if (empty($value) && 'wpinv_last_name' === $address_field['name'] && !empty($user)) {
         $value = $user->last_name;
     }
 
-    if ( ! empty( $address_field['required'] ) ) {
+    if (!empty($address_field['required'])) {
         $label .= "<span class='text-danger'> *</span>";
     }
 
     // Display the country.
-    if ( 'wpinv_country' === $address_field['name'] ) {
+    if ('wpinv_country' === $address_field['name']) {
 
-        echo "<div class='form-group mb-3 " . esc_attr( $wrap_class ) . " getpaid-address-field-wrapper__country'";
+        echo "<div class='form-group mb-3 " . esc_attr($wrap_class) . " getpaid-address-field-wrapper__country'";
 
         aui()->select(
             array(
                 'options'          => wpinv_get_country_list(),
-                'name'             => esc_attr( $field_name ),
-                'id'               => sanitize_html_class( $field_name ) . $uniqid,
-                'value'            => esc_attr( $country ),
+                'name'             => esc_attr($field_name),
+                'id'               => sanitize_html_class($field_name) . $uniqid,
+                'value'            => esc_attr($country),
                 'placeholder'      => $placeholder,
-                'required'         => ! empty( $address_field['required'] ),
-                'label'            => wp_kses_post( $label ),
+                'required'         => !empty($address_field['required']),
+                'label'            => wp_kses_post($label),
                 'label_type'       => 'vertical',
                 'help_text'        => $description,
                 'class'            => 'getpaid-address-field wpinv_country',
@@ -94,7 +94,7 @@ 
             true
         );
 
-        if ( wpinv_should_validate_vat_number() ) {
+        if (wpinv_should_validate_vat_number()) {
 
             aui()->input(
                 array(
@@ -103,7 +103,7 @@ 
                     'id'         => "shipping-toggle$uniqid",
                     'wrap_class' => 'getpaid-address-field-wrapper__address-confirm mt-1 d-none',
                     'required'   => false,
-                    'label'      => __( 'I certify that I live in the country selected above', 'invoicing' ) . "<span class='text-danger'> *</span>",
+                    'label'      => __('I certify that I live in the country selected above', 'invoicing') . "<span class='text-danger'> *</span>",
                     'value'      => 1,
                     'checked'    => true,
                     'class'      => 'w-auto',
@@ -118,9 +118,9 @@ 
     }
 
     // Display the state.
-    elseif ( 'wpinv_state' == $address_field['name'] ) {
+    elseif ('wpinv_state' == $address_field['name']) {
 
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             $value = wpinv_get_default_state();
         }
 
@@ -130,7 +130,7 @@ 
             $placeholder,
             $label,
             $description,
-            ! empty( $address_field['required'] ),
+            !empty($address_field['required']),
             $wrap_class,
             $field_name,
             true
@@ -138,8 +138,8 @@ 
 
     } else {
 
-        $key      = str_replace( 'wpinv_', '', $address_field['name'] );
-        $key      = esc_attr( str_replace( '_', '-', $key ) );
+        $key      = str_replace('wpinv_', '', $address_field['name']);
+        $key      = esc_attr(str_replace('_', '-', $key));
         $autocomplete = '';
         $replacements = array(
             'zip'        => 'postal-code',
@@ -152,37 +152,37 @@ 
         );
 
 
-        if ( isset( $replacements[ $key ] ) ) {
+        if (isset($replacements[$key])) {
             $autocomplete = array(
-                'autocomplete' => "$field_type {$replacements[ $key ]}",
+                'autocomplete' => "$field_type {$replacements[$key]}",
             );
         }
 
         $append = '';
 
-        if ( 'billing' === $field_type && wpinv_should_validate_vat_number() && 'vat-number' === $key ) {
-            $valid    = esc_attr__( 'Valid', 'invoicing' );
-            $invalid  = esc_attr__( 'Invalid', 'invoicing' );
-            $validate = esc_attr__( 'Validate', 'invoicing' );
+        if ('billing' === $field_type && wpinv_should_validate_vat_number() && 'vat-number' === $key) {
+            $valid    = esc_attr__('Valid', 'invoicing');
+            $invalid  = esc_attr__('Invalid', 'invoicing');
+            $validate = esc_attr__('Validate', 'invoicing');
             $append   = "<span class='btn btn-primary getpaid-vat-number-validate' data-valid='$valid' data-invalid='$invalid' data-validate='$validate'>$validate</span>";
         }
 
-        if ( 'billing' === $field_type ) {
-            $description .= '<div class="getpaid-error-' . esc_attr( $field_name ) . ' getpaid-custom-payment-form-errors alert alert-danger d-none"></div>';
+        if ('billing' === $field_type) {
+            $description .= '<div class="getpaid-error-' . esc_attr($field_name) . ' getpaid-custom-payment-form-errors alert alert-danger d-none"></div>';
         }
 
         aui()->input(
             array(
-                'name'              => esc_attr( $field_name ),
-                'id'                => sanitize_html_class( $field_name ) . $uniqid,
-                'required'          => ! empty( $address_field['required'] ),
+                'name'              => esc_attr($field_name),
+                'id'                => sanitize_html_class($field_name) . $uniqid,
+                'required'          => !empty($address_field['required']),
                 'placeholder'       => $placeholder,
-                'label'             => wp_kses_post( $label ),
+                'label'             => wp_kses_post($label),
                 'label_type'        => 'vertical',
                 'help_text'         => $description,
                 'type'              => 'text',
-                'value'             => apply_filters( 'getpaid_payment_form_value_' . $address_field['name'], esc_attr( $value ) ),
-                'class'             => 'getpaid-address-field ' . esc_attr( $address_field['name'] ),
+                'value'             => apply_filters('getpaid_payment_form_value_' . $address_field['name'], esc_attr($value)),
+                'class'             => 'getpaid-address-field ' . esc_attr($address_field['name']),
                 'wrap_class'        => "$wrap_class getpaid-address-field-wrapper__$key",
                 'label_class'       => 'getpaid-address-field-label getpaid-address-field-label__' . $key,
                 'extra_attributes'  => $autocomplete,
@@ -193,7 +193,7 @@ 
 
     }
 
-    do_action( 'getpaid_payment_form_address_field_after_' . $address_field['name'], $field_type, $address_field );
+    do_action('getpaid_payment_form_address_field_after_' . $address_field['name'], $field_type, $address_field);
 }
 
 echo '</div>';

templates/payment-forms/elements/address.php

Indentation +26 added lines, -26 removed lines

@@ -10,7 +10,7 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( empty( $fields ) ) {
-	return;
+    return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -18,12 +18,12 @@ 
 
 // Prepare the user's country.
 if ( ! empty( $form->invoice ) ) {
-	$country = $form->invoice->get_country();
+    $country = $form->invoice->get_country();
 }
 
 if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+    $country = empty( $country ) ? getpaid_get_ip_country() : $country;
+    $country = empty( $country ) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -55,10 +55,10 @@ 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
-			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
-		?>
+            $field_type = 'billing';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_billing_fields', $form );
+        ?>
 	</div>
 	<!-- End Billing Address -->
 
@@ -70,21 +70,21 @@ 
 
 	<?php
 
-		aui()->input(
-		    array(
-			    'type'     => 'checkbox',
-			    'name'     => 'same-shipping-address',
-			    'id'       => "shipping-toggle$uniqid",
-			    'required' => false,
-			    'label'    => empty( $shipping_address_toggle ) ? esc_html__( 'Same billing & shipping address.', 'invoicing' ) : wp_kses_post( $shipping_address_toggle ),
-			    'value'    => 1,
-			    'checked'  => true,
-				'class'    => 'w-auto',
-		    ),
-			true
-		);
+        aui()->input(
+            array(
+                'type'     => 'checkbox',
+                'name'     => 'same-shipping-address',
+                'id'       => "shipping-toggle$uniqid",
+                'required' => false,
+                'label'    => empty( $shipping_address_toggle ) ? esc_html__( 'Same billing & shipping address.', 'invoicing' ) : wp_kses_post( $shipping_address_toggle ),
+                'value'    => 1,
+                'checked'  => true,
+                'class'    => 'w-auto',
+            ),
+            true
+        );
 
-	?>
+    ?>
 
 
 	<!-- Start Shipping Address Title -->
@@ -103,10 +103,10 @@ 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
-			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
-		?>
+            $field_type = 'shipping';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+        ?>
 	</div>
 	<!-- End Shipping Address -->
 

Spacing +21 added lines, -21 removed lines

@@ -7,57 +7,57 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $fields ) ) {
+if (empty($fields)) {
 	return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
 // Prepare the user's country.
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
 	$country = $form->invoice->get_country();
 }
 
-if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+if (empty($country)) {
+	$country = empty($country) ? getpaid_get_ip_country() : $country;
+	$country = empty($country) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
-$address_type = empty( $address_type ) ? 'billing' : $address_type;
+$address_type = empty($address_type) ? 'billing' : $address_type;
 
 ?>
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 	<!-- Start Billing/Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-billing-address-title">
-		<?php esc_html_e( 'Billing / Shipping Address', 'invoicing' ); ?>
+		<?php esc_html_e('Billing / Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 	<!-- Start Billing Address Title -->
 	<h4 class="mb-3 getpaid-billing-address-title">
-		<?php esc_html_e( 'Billing Address', 'invoicing' ); ?>
+		<?php esc_html_e('Billing Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type || 'billing' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'billing' === $address_type) : ?>
 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
 			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_billing_fields', $form);
 		?>
 	</div>
 	<!-- End Billing Address -->
@@ -65,7 +65,7 @@ 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 
 	<?php
@@ -76,7 +76,7 @@ 
 			    'name'     => 'same-shipping-address',
 			    'id'       => "shipping-toggle$uniqid",
 			    'required' => false,
-			    'label'    => empty( $shipping_address_toggle ) ? esc_html__( 'Same billing & shipping address.', 'invoicing' ) : wp_kses_post( $shipping_address_toggle ),
+			    'label'    => empty($shipping_address_toggle) ? esc_html__('Same billing & shipping address.', 'invoicing') : wp_kses_post($shipping_address_toggle),
 			    'value'    => 1,
 			    'checked'  => true,
 				'class'    => 'w-auto',
@@ -89,7 +89,7 @@ 
 
 	<!-- Start Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-address-title">
-		<?php esc_html_e( 'Shipping Address', 'invoicing' ); ?>
+		<?php esc_html_e('Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Shipping Address Title -->
 
@@ -98,14 +98,14 @@ 
 
 
 	
-<?php if ( 'both' === $address_type || 'shipping' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'shipping' === $address_type) : ?>
 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
 			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_shipping_fields', $form);
 		?>
 	</div>
 	<!-- End Shipping Address -->

includes/wpinv-discount-functions.php

Indentation +33 added lines, -33 removed lines

@@ -160,50 +160,50 @@
  */
 function getpaid_calculate_invoice_discount( $invoice, $discount ) {
 
-	$initial_discount   = 0;
-	$recurring_discount = 0;
+    $initial_discount   = 0;
+    $recurring_discount = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+    foreach ( $invoice->get_items() as $item ) {
 
-		// Abort if it is not valid for this item.
-		if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
-			continue;
-		}
+        // Abort if it is not valid for this item.
+        if ( ! $discount->is_valid_for_items( array( $item->get_id() ) ) ) {
+            continue;
+        }
 
-		// Calculate the initial amount...
-		$item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
-		$recurring_item_discount = 0;
+        // Calculate the initial amount...
+        $item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
+        $recurring_item_discount = 0;
 
-		// ... and maybe the recurring amount.
-		if ( $item->is_recurring() && $discount->is_recurring() ) {
-			$recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
-		}
+        // ... and maybe the recurring amount.
+        if ( $item->is_recurring() && $discount->is_recurring() ) {
+            $recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+        }
 
-		// Discount should not exceed discounted amount.
-		if ( ! $discount->is_type( 'percent' ) ) {
+        // Discount should not exceed discounted amount.
+        if ( ! $discount->is_type( 'percent' ) ) {
 
-			if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
-				$item_discount = $discount->get_amount() - $initial_discount;
-			}
+            if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
+                $item_discount = $discount->get_amount() - $initial_discount;
+            }
 
-			if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
-				$recurring_item_discount = $discount->get_amount() - $recurring_discount;
-			}
+            if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
+                $recurring_item_discount = $discount->get_amount() - $recurring_discount;
+            }
         }
 
-		$initial_discount             += $item_discount;
-		$recurring_discount           += $recurring_item_discount;
-		$item->item_discount           = $item_discount;
-		$item->recurring_item_discount = $recurring_item_discount;
+        $initial_discount             += $item_discount;
+        $recurring_discount           += $recurring_item_discount;
+        $item->item_discount           = $item_discount;
+        $item->recurring_item_discount = $recurring_item_discount;
 
-	}
+    }
 
-	return array(
-		'name'               => 'discount_code',
-		'discount_code'      => $discount->get_code(),
-		'initial_discount'   => $initial_discount,
-		'recurring_discount' => $recurring_discount,
-	);
+    return array(
+        'name'               => 'discount_code',
+        'discount_code'      => $discount->get_code(),
+        'initial_discount'   => $initial_discount,
+        'recurring_discount' => $recurring_discount,
+    );
 
 }
 

Spacing +44 added lines, -44 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Returns an array of discount type.
@@ -17,8 +17,8 @@ 
     return apply_filters(
         'wpinv_discount_types',
         array(
-            'percent' => __( 'Percentage', 'invoicing' ),
-            'flat'    => __( 'Flat Amount', 'invoicing' ),
+            'percent' => __('Percentage', 'invoicing'),
+            'flat'    => __('Flat Amount', 'invoicing'),
         )
     );
 }
@@ -28,46 +28,46 @@ 
  *
  * @return string
  */
-function wpinv_get_discount_type_name( $type = '' ) {
+function wpinv_get_discount_type_name($type = '') {
     $types = wpinv_get_discount_types();
-    return isset( $types[ $type ] ) ? $types[ $type ] : $type;
+    return isset($types[$type]) ? $types[$type] : $type;
 }
 
 /**
  * Deletes a discount via the admin page.
  *
  */
-function wpinv_delete_discount( $data ) {
+function wpinv_delete_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->delete( true );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->delete(true);
 
 }
-add_action( 'getpaid_authenticated_admin_action_delete_discount', 'wpinv_delete_discount' );
+add_action('getpaid_authenticated_admin_action_delete_discount', 'wpinv_delete_discount');
 
 /**
  * Deactivates a discount via the admin page.
  */
-function wpinv_activate_discount( $data ) {
+function wpinv_activate_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->set_status( 'publish' );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->set_status('publish');
     $discount->save();
 
 }
-add_action( 'getpaid_authenticated_admin_action_activate_discount', 'wpinv_activate_discount' );
+add_action('getpaid_authenticated_admin_action_activate_discount', 'wpinv_activate_discount');
 
 /**
  * Activates a discount via the admin page.
  */
-function wpinv_deactivate_discount( $data ) {
+function wpinv_deactivate_discount($data) {
 
-    $discount = new WPInv_Discount( absint( $data['discount'] ) );
-    $discount->set_status( 'pending' );
+    $discount = new WPInv_Discount(absint($data['discount']));
+    $discount->set_status('pending');
     $discount->save();
 
 }
-add_action( 'getpaid_authenticated_admin_action_deactivate_discount', 'wpinv_deactivate_discount' );
+add_action('getpaid_authenticated_admin_action_deactivate_discount', 'wpinv_deactivate_discount');
 
 /**
  * Fetches a discount object.
@@ -76,8 +76,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount( $discount ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount($discount) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -87,8 +87,8 @@ 
  * @since 1.0.15
  * @return WPInv_Discount
  */
-function wpinv_get_discount_obj( $discount = 0 ) {
-    return new WPInv_Discount( $discount );
+function wpinv_get_discount_obj($discount = 0) {
+    return new WPInv_Discount($discount);
 }
 
 /**
@@ -98,10 +98,10 @@ 
  * @param string|int $value The field value
  * @return bool|WPInv_Discount
  */
-function wpinv_get_discount_by( $deprecated = null, $value = '' ) {
-    $discount = new WPInv_Discount( $value );
+function wpinv_get_discount_by($deprecated = null, $value = '') {
+    $discount = new WPInv_Discount($value);
 
-    if ( $discount->get_id() != 0 ) {
+    if ($discount->get_id() != 0) {
         return $discount;
     }
 
@@ -116,9 +116,9 @@ 
 function wpinv_get_discount_statuses() {
 
     return array(
-        'expired'  => __( 'Expired', 'invoicing' ),
-        'publish'  => __( 'Active', 'invoicing' ),
-        'inactive' => __( 'Inactive', 'invoicing' ),
+        'expired'  => __('Expired', 'invoicing'),
+        'publish'  => __('Active', 'invoicing'),
+        'inactive' => __('Inactive', 'invoicing'),
     );
 
 }
@@ -126,9 +126,9 @@ 
 /**
  * Retrieves an invoice status label.
  */
-function wpinv_discount_status( $status ) {
+function wpinv_discount_status($status) {
     $statuses = wpinv_get_discount_statuses();
-    return isset( $statuses[ $status ] ) ? $statuses[ $status ] : __( 'Inactive', 'invoicing' );
+    return isset($statuses[$status]) ? $statuses[$status] : __('Inactive', 'invoicing');
 }
 
 /**
@@ -138,12 +138,12 @@ 
  * @param int|array|string|WPInv_Discount $code discount data, object, ID or code.
  * @return bool
  */
-function wpinv_discount_is_recurring( $discount = 0, $code = 0 ) {
+function wpinv_discount_is_recurring($discount = 0, $code = 0) {
 
-    if ( ! empty( $discount ) ) {
-        $discount    = wpinv_get_discount_obj( $discount );
+    if (!empty($discount)) {
+        $discount    = wpinv_get_discount_obj($discount);
     } else {
-        $discount    = wpinv_get_discount_obj( $code );
+        $discount    = wpinv_get_discount_obj($code);
     }
 
     return $discount->get_is_recurring();
@@ -158,35 +158,35 @@ 
  * @param WPInv_Discount $discount
  * @return array
  */
-function getpaid_calculate_invoice_discount( $invoice, $discount ) {
+function getpaid_calculate_invoice_discount($invoice, $discount) {
 
 	$initial_discount   = 0;
 	$recurring_discount = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->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...
-		$item_discount           = $discount->get_discounted_amount( $item->get_sub_total() );
+		$item_discount           = $discount->get_discounted_amount($item->get_sub_total());
 		$recurring_item_discount = 0;
 
 		// ... and maybe the recurring amount.
-		if ( $item->is_recurring() && $discount->is_recurring() ) {
-			$recurring_item_discount = $discount->get_discounted_amount( $item->get_recurring_sub_total() );
+		if ($item->is_recurring() && $discount->is_recurring()) {
+			$recurring_item_discount = $discount->get_discounted_amount($item->get_recurring_sub_total());
 		}
 
 		// Discount should not exceed discounted amount.
-		if ( ! $discount->is_type( 'percent' ) ) {
+		if (!$discount->is_type('percent')) {
 
-			if ( ( $initial_discount + $item_discount ) > $discount->get_amount() ) {
+			if (($initial_discount + $item_discount) > $discount->get_amount()) {
 				$item_discount = $discount->get_amount() - $initial_discount;
 			}
 
-			if ( ( $recurring_discount + $recurring_item_discount ) > $discount->get_amount() ) {
+			if (($recurring_discount + $recurring_item_discount) > $discount->get_amount()) {
 				$recurring_item_discount = $discount->get_amount() - $recurring_discount;
 			}
         }
@@ -218,10 +218,10 @@ 
         array(
             'post_type'   => 'wpi_discount',
             'numberposts' => 1,
-            'fields'      => array( 'ids' ),
+            'fields'      => array('ids'),
         )
     );
 
-    return ! empty( $discounts );
+    return !empty($discounts);
 
 }

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

Indentation +579 added lines, -579 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,55 +10,55 @@ 
 class GetPaid_Payment_Form extends GetPaid_Data {
 
     /**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'payment_form';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'payment_form';
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'payment_form';
 
     /**
-	 * Form Data array. This is the core form data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'status'        => 'draft',
-		'version'       => '',
-		'date_created'  => null,
+     * Form Data array. This is the core form data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'status'        => 'draft',
+        'version'       => '',
+        'date_created'  => null,
         'date_modified' => null,
         'name'          => '',
         'author'        => 1,
         'elements'      => null,
-		'items'         => null,
-		'earned'        => 0,
-		'refunded'      => 0,
-		'cancelled'     => 0,
-		'failed'        => 0,
-	);
-
-    /**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_forms';
-
-	/**
-	 * Stores a reference to the invoice if the form is for an invoice..
-	 *
-	 * @var WPInv_Invoice
-	 */
-	public $invoice = 0;
+        'items'         => null,
+        'earned'        => 0,
+        'refunded'      => 0,
+        'cancelled'     => 0,
+        'failed'        => 0,
+    );
+
+    /**
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_forms';
+
+    /**
+     * Stores a reference to the invoice if the form is for an invoice..
+     *
+     * @var WPInv_Invoice
+     */
+    public $invoice = 0;
 
     /**
      * Stores a reference to the original WP_Post object
@@ -68,35 +68,35 @@ 
     protected $post = null;
 
     /**
-	 * Get the form if ID is passed, otherwise the form is new and empty.
-	 *
-	 * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
-	 */
-	public function __construct( $form = 0 ) {
-		parent::__construct( $form );
+     * Get the form if ID is passed, otherwise the form is new and empty.
+     *
+     * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
+     */
+    public function __construct( $form = 0 ) {
+        parent::__construct( $form );
 
-		if ( is_numeric( $form ) && $form > 0 ) {
-			$this->set_id( $form );
-		} elseif ( $form instanceof self ) {
+        if ( is_numeric( $form ) && $form > 0 ) {
+            $this->set_id( $form );
+        } elseif ( $form instanceof self ) {
 
-			$this->set_id( $form->get_id() );
-			$this->invoice = $form->invoice;
+            $this->set_id( $form->get_id() );
+            $this->invoice = $form->invoice;
 
-		} elseif ( ! empty( $form->ID ) ) {
-			$this->set_id( $form->ID );
-		} else {
-			$this->set_object_read( true );
-		}
+        } elseif ( ! empty( $form->ID ) ) {
+            $this->set_id( $form->ID );
+        } else {
+            $this->set_object_read( true );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
+        if ( $this->get_id() > 0 ) {
             $this->post = get_post( $this->get_id() );
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
         }
 
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -114,356 +114,356 @@ 
     */
 
     /**
-	 * Get plugin version when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+     * Get plugin version when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_version( $context = 'view' ) {
+        return $this->get_prop( 'version', $context );
     }
 
     /**
-	 * Get date when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+     * Get date when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_prop( 'date_created', $context );
     }
 
     /**
-	 * Get GMT date when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
+     * Get GMT date when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
         $date = $this->get_date_created( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get date when the form was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+     * Get date when the form was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified( $context = 'view' ) {
+        return $this->get_prop( 'date_modified', $context );
     }
 
     /**
-	 * Get GMT date when the form was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
+     * Get GMT date when the form was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified_gmt( $context = 'view' ) {
         $date = $this->get_date_modified( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get the form name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+     * Get the form name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        return $this->get_prop( 'name', $context );
     }
 
     /**
-	 * Alias of self::get_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
-	}
+     * Alias of self::get_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_title( $context = 'view' ) {
+        return $this->get_name( $context );
+    }
 
     /**
-	 * Get the owner of the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+     * Get the owner of the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
     }
 
     /**
-	 * Get the elements that make up the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_elements( $context = 'view' ) {
-		$elements = $this->get_prop( 'elements', $context );
+     * Get the elements that make up the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_elements( $context = 'view' ) {
+        $elements = $this->get_prop( 'elements', $context );
 
-		if ( empty( $elements ) || ! is_array( $elements ) ) {
+        if ( empty( $elements ) || ! is_array( $elements ) ) {
             return wpinv_get_data( 'sample-payment-form' );
-		}
+        }
 
-		// Ensure that all required elements exist.
-		$_elements = array();
-		foreach ( $elements as $element ) {
+        // Ensure that all required elements exist.
+        $_elements = array();
+        foreach ( $elements as $element ) {
 
-			if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
+            if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
 
-				$_elements[] = array(
-					'text'    => __( 'Select Payment Method', 'invoicing' ),
-					'id'      => 'gtscicd',
-					'name'    => 'gtscicd',
-					'type'    => 'gateway_select',
-					'premade' => true,
+                $_elements[] = array(
+                    'text'    => __( 'Select Payment Method', 'invoicing' ),
+                    'id'      => 'gtscicd',
+                    'name'    => 'gtscicd',
+                    'type'    => 'gateway_select',
+                    'premade' => true,
 
-				);
+                );
 
-			}
+            }
 
-			$_elements[] = $element;
+            $_elements[] = $element;
 
-		}
+        }
 
         return $_elements;
-	}
-
-	/**
-	 * Get the items sold via the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @param  string $return objects or arrays.
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items( $context = 'view', $return = 'objects' ) {
-		$items = $this->get_prop( 'items', $context );
-
-		if ( empty( $items ) || ! is_array( $items ) ) {
+    }
+
+    /**
+     * Get the items sold via the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @param  string $return objects or arrays.
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items( $context = 'view', $return = 'objects' ) {
+        $items = $this->get_prop( 'items', $context );
+
+        if ( empty( $items ) || ! is_array( $items ) ) {
             $items = wpinv_get_data( 'sample-payment-form-items' );
-		}
+        }
+
+        // Convert the items.
+        $prepared = array();
+
+        foreach ( $items as $key => $value ) {
+
+            // Form items.
+            if ( $value instanceof GetPaid_Form_Item ) {
+
+                if ( $value->can_purchase() ) {
+                    $prepared[] = $value;
+                }
 
-		// Convert the items.
-		$prepared = array();
+                continue;
 
-		foreach ( $items as $key => $value ) {
+            }
 
-			// Form items.
-			if ( $value instanceof GetPaid_Form_Item ) {
+            // $item_id => $quantity (buy buttons)
+            if ( is_numeric( $key ) && is_numeric( $value ) ) {
+                $item = new GetPaid_Form_Item( $key );
 
-				if ( $value->can_purchase() ) {
-					$prepared[] = $value;
-				}
+                if ( $item->can_purchase() ) {
 
-				continue;
+                    $value = (float) $value;
+                    $item->set_quantity( $value );
+                    if ( 0 == $value ) {
+                        $item->set_quantity( 1 );
+                        $item->set_allow_quantities( true );
+                    }
 
-			}
+                    $prepared[] = $item;
+                }
 
-			// $item_id => $quantity (buy buttons)
-			if ( is_numeric( $key ) && is_numeric( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+                continue;
+            }
 
-				if ( $item->can_purchase() ) {
+            // Items saved via payment forms editor.
+            if ( is_array( $value ) && isset( $value['id'] ) ) {
 
-					$value = (float) $value;
-					$item->set_quantity( $value );
-					if ( 0 == $value ) {
-						$item->set_quantity( 1 );
-						$item->set_allow_quantities( true );
-					}
+                $item = new GetPaid_Form_Item( $value['id'] );
 
-					$prepared[] = $item;
-				}
+                if ( ! $item->can_purchase() ) {
+                    continue;
+                }
 
-				continue;
-			}
+                // Sub-total (Cart items).
+                if ( isset( $value['subtotal'] ) ) {
+                    $item->set_price( $value['subtotal'] );
+                }
 
-			// Items saved via payment forms editor.
-			if ( is_array( $value ) && isset( $value['id'] ) ) {
+                if ( isset( $value['quantity'] ) ) {
+                    $item->set_quantity( $value['quantity'] );
+                }
 
-				$item = new GetPaid_Form_Item( $value['id'] );
+                if ( isset( $value['allow_quantities'] ) ) {
+                    $item->set_allow_quantities( $value['allow_quantities'] );
+                }
 
-				if ( ! $item->can_purchase() ) {
-					continue;
-				}
+                if ( isset( $value['required'] ) ) {
+                    $item->set_is_required( $value['required'] );
+                }
 
-				// Sub-total (Cart items).
-				if ( isset( $value['subtotal'] ) ) {
-					$item->set_price( $value['subtotal'] );
-				}
+                if ( isset( $value['description'] ) ) {
+                    $item->set_custom_description( $value['description'] );
+                }
 
-				if ( isset( $value['quantity'] ) ) {
-					$item->set_quantity( $value['quantity'] );
-				}
+                $prepared[] = $item;
+                continue;
 
-				if ( isset( $value['allow_quantities'] ) ) {
-					$item->set_allow_quantities( $value['allow_quantities'] );
-				}
+            }
 
-				if ( isset( $value['required'] ) ) {
-					$item->set_is_required( $value['required'] );
-				}
+            // $item_id => array( 'price' => 10 ) (item variations)
+            if ( is_numeric( $key ) && is_array( $value ) ) {
+                $item = new GetPaid_Form_Item( $key );
 
-				if ( isset( $value['description'] ) ) {
-					$item->set_custom_description( $value['description'] );
-				}
+                if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
+                    $item->set_price( $value['price'] );
+                }
 
-				$prepared[] = $item;
-				continue;
+                if ( $item->can_purchase() ) {
+                    $prepared[] = $item;
+                }
 
-			}
-
-			// $item_id => array( 'price' => 10 ) (item variations)
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
-
-				if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
-					$item->set_price( $value['price'] );
-				}
-
-				if ( $item->can_purchase() ) {
-					$prepared[] = $item;
-				}
-
-				continue;
-			}
-		}
-
-		if ( 'objects' == $return && 'view' == $context ) {
-			return $prepared;
-		}
-
-		$items = array();
-		foreach ( $prepared as $item ) {
-			$items[] = $item->prepare_data_for_use();
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get a single item belonging to the form.
-	 *
-	 * @since 1.0.19
-	 * @param  int $item_id The item id to return.
-	 * @return GetPaid_Form_Item|bool
-	 */
-	public function get_item( $item_id ) {
-
-		if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
-			return false;
-		}
-
-		foreach ( $this->get_items() as $item ) {
-			if ( $item->get_id() == (int) $item_id ) {
-				return $item;
-			}
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Gets a single element.
-	 *
-	 * @since 1.0.19
-	 * @param  string $element_type The element type to return.
-	 * @return array|bool
-	 */
-	public function get_element_type( $element_type ) {
-
-		if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
-			return false;
-		}
-
-		foreach ( $this->get_prop( 'elements' ) as $element ) {
-
-			if ( $element['type'] === $element_type ) {
-				return $element;
-			}
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Get the total amount earned via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_earned( $context = 'view' ) {
-		return $this->get_prop( 'earned', $context );
-	}
-
-	/**
-	 * Get the total amount refunded via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_refunded( $context = 'view' ) {
-		return $this->get_prop( 'refunded', $context );
-	}
-
-	/**
-	 * Get the total amount cancelled via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_cancelled( $context = 'view' ) {
-		return $this->get_prop( 'cancelled', $context );
-	}
-
-	/**
-	 * Get the total amount failed via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_failed( $context = 'view' ) {
-		return $this->get_prop( 'failed', $context );
-	}
-
-	/**
-	 * Get the currency.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_currency() {
-		$currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
-		return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
-	}
+                continue;
+            }
+        }
+
+        if ( 'objects' == $return && 'view' == $context ) {
+            return $prepared;
+        }
+
+        $items = array();
+        foreach ( $prepared as $item ) {
+            $items[] = $item->prepare_data_for_use();
+        }
+
+        return $items;
+    }
+
+    /**
+     * Get a single item belonging to the form.
+     *
+     * @since 1.0.19
+     * @param  int $item_id The item id to return.
+     * @return GetPaid_Form_Item|bool
+     */
+    public function get_item( $item_id ) {
+
+        if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
+            return false;
+        }
+
+        foreach ( $this->get_items() as $item ) {
+            if ( $item->get_id() == (int) $item_id ) {
+                return $item;
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Gets a single element.
+     *
+     * @since 1.0.19
+     * @param  string $element_type The element type to return.
+     * @return array|bool
+     */
+    public function get_element_type( $element_type ) {
+
+        if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
+            return false;
+        }
+
+        foreach ( $this->get_prop( 'elements' ) as $element ) {
+
+            if ( $element['type'] === $element_type ) {
+                return $element;
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Get the total amount earned via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_earned( $context = 'view' ) {
+        return $this->get_prop( 'earned', $context );
+    }
+
+    /**
+     * Get the total amount refunded via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_refunded( $context = 'view' ) {
+        return $this->get_prop( 'refunded', $context );
+    }
+
+    /**
+     * Get the total amount cancelled via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_cancelled( $context = 'view' ) {
+        return $this->get_prop( 'cancelled', $context );
+    }
+
+    /**
+     * Get the total amount failed via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_failed( $context = 'view' ) {
+        return $this->get_prop( 'failed', $context );
+    }
+
+    /**
+     * Get the currency.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_currency() {
+        $currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
+        return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -476,22 +476,22 @@ 
     */
 
     /**
-	 * Set plugin version when the item was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+     * Set plugin version when the item was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
     }
 
     /**
-	 * Set date when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was created.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_created( $value ) {
+     */
+    public function set_date_created( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -504,13 +504,13 @@ 
     }
 
     /**
-	 * Set date when the item was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was last modified.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_modified( $value ) {
+     */
+    public function set_date_modified( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -523,164 +523,164 @@ 
     }
 
     /**
-	 * Set the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
-		$this->set_prop( 'name', sanitize_text_field( $value ) );
-    }
-
-    /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
-    }
-
-    /**
-	 * Set the owner of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
-	}
-
-	/**
-	 * Set the form elements.
-	 *
-	 * @since 1.0.19
-	 * @sinve 2.3.4 Array values sanitized.
-	 * @param  array $value Form elements.
-	 */
-	public function set_elements( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'elements', wp_kses_post_deep( $value ) );
-		}
-	}
-
-	/**
-	 * Sanitize array values.
-	 *
-	 * @param $value
-	 *
-	 * @return mixed
-	 */
-	public function sanitize_array_values( $value ) {
-
-		// sanitize
-		if ( ! empty( $value ) ) {
-
-			foreach ( $value as $key => $val_arr ) {
-
-				if ( is_array( $val_arr ) ) {
-					// check if we have sub array items.
-					$sub_arr = array();
-					foreach ( $val_arr as $key2 => $val2 ) {
-						if ( is_array( $val2 ) ) {
-							$sub_arr[ $key2 ] = $this->sanitize_array_values( $val2 );
-							unset( $val_arr[ $key ][ $key2 ] );
-						}
-					}
-
-					// we allow some html in description so we sanitize it separately.
-					$help_text = ! empty( $val_arr['description'] ) ? wp_kses_post( $val_arr['description'] ) : '';
-
-					// sanitize array elements
-					$value[ $key ] = array_map( 'sanitize_text_field', $val_arr );
-
-					// add back the description if set
-					if ( isset( $val_arr['description'] ) ) {
+     * Set the item name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
+        $this->set_prop( 'name', sanitize_text_field( $value ) );
+    }
+
+    /**
+     * Alias of self::set_name().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_title( $value ) {
+        $this->set_name( $value );
+    }
+
+    /**
+     * Set the owner of the item.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $this->set_prop( 'author', (int) $value );
+    }
+
+    /**
+     * Set the form elements.
+     *
+     * @since 1.0.19
+     * @sinve 2.3.4 Array values sanitized.
+     * @param  array $value Form elements.
+     */
+    public function set_elements( $value ) {
+        if ( is_array( $value ) ) {
+            $this->set_prop( 'elements', wp_kses_post_deep( $value ) );
+        }
+    }
+
+    /**
+     * Sanitize array values.
+     *
+     * @param $value
+     *
+     * @return mixed
+     */
+    public function sanitize_array_values( $value ) {
+
+        // sanitize
+        if ( ! empty( $value ) ) {
+
+            foreach ( $value as $key => $val_arr ) {
+
+                if ( is_array( $val_arr ) ) {
+                    // check if we have sub array items.
+                    $sub_arr = array();
+                    foreach ( $val_arr as $key2 => $val2 ) {
+                        if ( is_array( $val2 ) ) {
+                            $sub_arr[ $key2 ] = $this->sanitize_array_values( $val2 );
+                            unset( $val_arr[ $key ][ $key2 ] );
+                        }
+                    }
+
+                    // we allow some html in description so we sanitize it separately.
+                    $help_text = ! empty( $val_arr['description'] ) ? wp_kses_post( $val_arr['description'] ) : '';
+
+                    // sanitize array elements
+                    $value[ $key ] = array_map( 'sanitize_text_field', $val_arr );
+
+                    // add back the description if set
+                    if ( isset( $val_arr['description'] ) ) {
 $value[ $key ]['description'] = $help_text;}
 
-					// add back sub array items after its been sanitized.
-					if ( ! empty( $sub_arr ) ) {
-						$value[ $key ] = array_merge( $value[ $key ], $sub_arr );
-					}
-				}
+                    // add back sub array items after its been sanitized.
+                    if ( ! empty( $sub_arr ) ) {
+                        $value[ $key ] = array_merge( $value[ $key ], $sub_arr );
+                    }
+                }
 }
 }
 
-		return $value;
-	}
-
-	/**
-	 * Set the form items.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value Form elements.
-	 */
-	public function set_items( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'items', $value );
-		}
-	}
-
-	/**
-	 * Set the total amount earned via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount earned.
-	 */
-	public function set_earned( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'earned', $value );
-	}
-
-	/**
-	 * Set the total amount refunded via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount refunded.
-	 */
-	public function set_refunded( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'refunded', $value );
-	}
-
-	/**
-	 * Set the total amount cancelled via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount cancelled.
-	 */
-	public function set_cancelled( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'cancelled', $value );
-	}
-
-	/**
-	 * Set the total amount failed via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount cancelled.
-	 */
-	public function set_failed( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'failed', $value );
-	}
+        return $value;
+    }
+
+    /**
+     * Set the form items.
+     *
+     * @since 1.0.19
+     * @param  array $value Form elements.
+     */
+    public function set_items( $value ) {
+        if ( is_array( $value ) ) {
+            $this->set_prop( 'items', $value );
+        }
+    }
+
+    /**
+     * Set the total amount earned via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount earned.
+     */
+    public function set_earned( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'earned', $value );
+    }
+
+    /**
+     * Set the total amount refunded via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount refunded.
+     */
+    public function set_refunded( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'refunded', $value );
+    }
+
+    /**
+     * Set the total amount cancelled via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount cancelled.
+     */
+    public function set_cancelled( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'cancelled', $value );
+    }
+
+    /**
+     * Set the total amount failed via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount cancelled.
+     */
+    public function set_failed( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'failed', $value );
+    }
 
     /**
      * Create an item. For backwards compatibilty.
      *
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function create( $data = array() ) {
 
-		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
-		}
+        // Set the properties.
+        if ( is_array( $data ) ) {
+            $this->set_props( $data );
+        }
 
-		// Save the item.
-		return $this->save();
+        // Save the item.
+        return $this->save();
 
     }
 
@@ -688,7 +688,7 @@ 
      * Updates an item. For backwards compatibilty.
      *
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function update( $data = array() ) {
         return $this->create( $data );
@@ -704,22 +704,22 @@ 
 	*/
 
     /**
-	 * Checks whether this is the default payment form.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether this is the default payment form.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_default() {
         $is_default = $this->get_id() == wpinv_get_default_payment_form();
         return (bool) apply_filters( 'wpinv_is_default_payment_form', $is_default, $this->get_id(), $this );
-	}
+    }
 
     /**
-	 * Checks whether the form is active.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the form is active.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_active() {
         $is_active = 0 !== (int) $this->get_id();
 
@@ -728,81 +728,81 @@ 
         }
 
         return (bool) apply_filters( 'wpinv_is_payment_form_active', $is_active, $this );
-	}
-
-	/**
-	 * Checks whether the form has a given item.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether the form has a given item.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_item( $item_id ) {
         return false !== $this->get_item( $item_id );
-	}
-
-	/**
-	 * Checks whether the form has a given element.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether the form has a given element.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_element_type( $element_type ) {
         return false !== $this->get_element_type( $element_type );
-	}
-
-	/**
-	 * Checks whether this form is recurring or not.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether this form is recurring or not.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_recurring() {
 
-		if ( ! empty( $this->invoice ) ) {
-			return $this->invoice->is_recurring();
-		}
+        if ( ! empty( $this->invoice ) ) {
+            return $this->invoice->is_recurring();
+        }
 
-		foreach ( $this->get_items() as $item ) {
+        foreach ( $this->get_items() as $item ) {
 
-			if ( $item->is_recurring() ) {
-				return true;
-			}
+            if ( $item->is_recurring() ) {
+                return true;
+            }
 }
 
         return false;
-	}
+    }
 
-	/**
-	 * Retrieves the form's html.
-	 *
-	 * @since 1.0.19
-	 */
+    /**
+     * Retrieves the form's html.
+     *
+     * @since 1.0.19
+     */
     public function get_html( $extra_markup = '' ) {
 
-		// Return the HTML.
-		return wpinv_get_template_html(
-			'payment-forms/form.php',
-			array(
-				'form'         => $this,
-				'extra_markup' => $extra_markup,
-			)
-		);
-
-	}
-
-	/**
-	 * Displays the payment form.
-	 *
-	 * @since 1.0.19
-	 */
+        // Return the HTML.
+        return wpinv_get_template_html(
+            'payment-forms/form.php',
+            array(
+                'form'         => $this,
+                'extra_markup' => $extra_markup,
+            )
+        );
+
+    }
+
+    /**
+     * Displays the payment form.
+     *
+     * @since 1.0.19
+     */
     public function display( $extra_markup = '' ) {
-		wpinv_get_template(
-			'payment-forms/form.php',
-			array(
-				'form'         => $this,
-				'extra_markup' => $extra_markup,
-			)
-		);
+        wpinv_get_template(
+            'payment-forms/form.php',
+            array(
+                'form'         => $this,
+                'extra_markup' => $extra_markup,
+            )
+        );
     }
 
 }

Spacing +158 added lines, -158 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -72,28 +72,28 @@ 
 	 *
 	 * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
 	 */
-	public function __construct( $form = 0 ) {
-		parent::__construct( $form );
+	public function __construct($form = 0) {
+		parent::__construct($form);
 
-		if ( is_numeric( $form ) && $form > 0 ) {
-			$this->set_id( $form );
-		} elseif ( $form instanceof self ) {
+		if (is_numeric($form) && $form > 0) {
+			$this->set_id($form);
+		} elseif ($form instanceof self) {
 
-			$this->set_id( $form->get_id() );
+			$this->set_id($form->get_id());
 			$this->invoice = $form->invoice;
 
-		} elseif ( ! empty( $form->ID ) ) {
-			$this->set_id( $form->ID );
+		} elseif (!empty($form->ID)) {
+			$this->set_id($form->ID);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-            $this->post = get_post( $this->get_id() );
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+            $this->post = get_post($this->get_id());
+			$this->data_store->read($this);
         }
 
 	}
@@ -120,8 +120,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+	public function get_version($context = 'view') {
+		return $this->get_prop('version', $context);
     }
 
     /**
@@ -131,8 +131,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_prop('date_created', $context);
     }
 
     /**
@@ -142,11 +142,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -158,8 +158,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+	public function get_date_modified($context = 'view') {
+		return $this->get_prop('date_modified', $context);
     }
 
     /**
@@ -169,11 +169,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
-        $date = $this->get_date_modified( $context );
+	public function get_date_modified_gmt($context = 'view') {
+        $date = $this->get_date_modified($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -185,8 +185,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+	public function get_name($context = 'view') {
+		return $this->get_prop('name', $context);
     }
 
     /**
@@ -196,8 +196,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+	public function get_title($context = 'view') {
+		return $this->get_name($context);
 	}
 
     /**
@@ -207,8 +207,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+	public function get_author($context = 'view') {
+		return (int) $this->get_prop('author', $context);
     }
 
     /**
@@ -218,21 +218,21 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_elements( $context = 'view' ) {
-		$elements = $this->get_prop( 'elements', $context );
+	public function get_elements($context = 'view') {
+		$elements = $this->get_prop('elements', $context);
 
-		if ( empty( $elements ) || ! is_array( $elements ) ) {
-            return wpinv_get_data( 'sample-payment-form' );
+		if (empty($elements) || !is_array($elements)) {
+            return wpinv_get_data('sample-payment-form');
 		}
 
 		// Ensure that all required elements exist.
 		$_elements = array();
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 
-			if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
+			if ($element['type'] == 'pay_button' && !$this->has_element_type('gateway_select')) {
 
 				$_elements[] = array(
-					'text'    => __( 'Select Payment Method', 'invoicing' ),
+					'text'    => __('Select Payment Method', 'invoicing'),
 					'id'      => 'gtscicd',
 					'name'    => 'gtscicd',
 					'type'    => 'gateway_select',
@@ -257,22 +257,22 @@ 
 	 * @param  string $return objects or arrays.
 	 * @return GetPaid_Form_Item[]
 	 */
-	public function get_items( $context = 'view', $return = 'objects' ) {
-		$items = $this->get_prop( 'items', $context );
+	public function get_items($context = 'view', $return = 'objects') {
+		$items = $this->get_prop('items', $context);
 
-		if ( empty( $items ) || ! is_array( $items ) ) {
-            $items = wpinv_get_data( 'sample-payment-form-items' );
+		if (empty($items) || !is_array($items)) {
+            $items = wpinv_get_data('sample-payment-form-items');
 		}
 
 		// Convert the items.
 		$prepared = array();
 
-		foreach ( $items as $key => $value ) {
+		foreach ($items as $key => $value) {
 
 			// Form items.
-			if ( $value instanceof GetPaid_Form_Item ) {
+			if ($value instanceof GetPaid_Form_Item) {
 
-				if ( $value->can_purchase() ) {
+				if ($value->can_purchase()) {
 					$prepared[] = $value;
 				}
 
@@ -281,16 +281,16 @@ 
 			}
 
 			// $item_id => $quantity (buy buttons)
-			if ( is_numeric( $key ) && is_numeric( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+			if (is_numeric($key) && is_numeric($value)) {
+				$item = new GetPaid_Form_Item($key);
 
-				if ( $item->can_purchase() ) {
+				if ($item->can_purchase()) {
 
 					$value = (float) $value;
-					$item->set_quantity( $value );
-					if ( 0 == $value ) {
-						$item->set_quantity( 1 );
-						$item->set_allow_quantities( true );
+					$item->set_quantity($value);
+					if (0 == $value) {
+						$item->set_quantity(1);
+						$item->set_allow_quantities(true);
 					}
 
 					$prepared[] = $item;
@@ -300,33 +300,33 @@ 
 			}
 
 			// Items saved via payment forms editor.
-			if ( is_array( $value ) && isset( $value['id'] ) ) {
+			if (is_array($value) && isset($value['id'])) {
 
-				$item = new GetPaid_Form_Item( $value['id'] );
+				$item = new GetPaid_Form_Item($value['id']);
 
-				if ( ! $item->can_purchase() ) {
+				if (!$item->can_purchase()) {
 					continue;
 				}
 
 				// Sub-total (Cart items).
-				if ( isset( $value['subtotal'] ) ) {
-					$item->set_price( $value['subtotal'] );
+				if (isset($value['subtotal'])) {
+					$item->set_price($value['subtotal']);
 				}
 
-				if ( isset( $value['quantity'] ) ) {
-					$item->set_quantity( $value['quantity'] );
+				if (isset($value['quantity'])) {
+					$item->set_quantity($value['quantity']);
 				}
 
-				if ( isset( $value['allow_quantities'] ) ) {
-					$item->set_allow_quantities( $value['allow_quantities'] );
+				if (isset($value['allow_quantities'])) {
+					$item->set_allow_quantities($value['allow_quantities']);
 				}
 
-				if ( isset( $value['required'] ) ) {
-					$item->set_is_required( $value['required'] );
+				if (isset($value['required'])) {
+					$item->set_is_required($value['required']);
 				}
 
-				if ( isset( $value['description'] ) ) {
-					$item->set_custom_description( $value['description'] );
+				if (isset($value['description'])) {
+					$item->set_custom_description($value['description']);
 				}
 
 				$prepared[] = $item;
@@ -335,14 +335,14 @@ 
 			}
 
 			// $item_id => array( 'price' => 10 ) (item variations)
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+			if (is_numeric($key) && is_array($value)) {
+				$item = new GetPaid_Form_Item($key);
 
-				if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
-					$item->set_price( $value['price'] );
+				if (isset($value['price']) && $item->user_can_set_their_price()) {
+					$item->set_price($value['price']);
 				}
 
-				if ( $item->can_purchase() ) {
+				if ($item->can_purchase()) {
 					$prepared[] = $item;
 				}
 
@@ -350,12 +350,12 @@ 
 			}
 		}
 
-		if ( 'objects' == $return && 'view' == $context ) {
+		if ('objects' == $return && 'view' == $context) {
 			return $prepared;
 		}
 
 		$items = array();
-		foreach ( $prepared as $item ) {
+		foreach ($prepared as $item) {
 			$items[] = $item->prepare_data_for_use();
 		}
 
@@ -369,14 +369,14 @@ 
 	 * @param  int $item_id The item id to return.
 	 * @return GetPaid_Form_Item|bool
 	 */
-	public function get_item( $item_id ) {
+	public function get_item($item_id) {
 
-		if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
+		if (empty($item_id) || !is_numeric($item_id)) {
 			return false;
 		}
 
-		foreach ( $this->get_items() as $item ) {
-			if ( $item->get_id() == (int) $item_id ) {
+		foreach ($this->get_items() as $item) {
+			if ($item->get_id() == (int) $item_id) {
 				return $item;
 			}
 		}
@@ -392,15 +392,15 @@ 
 	 * @param  string $element_type The element type to return.
 	 * @return array|bool
 	 */
-	public function get_element_type( $element_type ) {
+	public function get_element_type($element_type) {
 
-		if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
+		if (empty($element_type) || !is_scalar($element_type)) {
 			return false;
 		}
 
-		foreach ( $this->get_prop( 'elements' ) as $element ) {
+		foreach ($this->get_prop('elements') as $element) {
 
-			if ( $element['type'] === $element_type ) {
+			if ($element['type'] === $element_type) {
 				return $element;
 			}
 		}
@@ -416,8 +416,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_earned( $context = 'view' ) {
-		return $this->get_prop( 'earned', $context );
+	public function get_earned($context = 'view') {
+		return $this->get_prop('earned', $context);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_refunded( $context = 'view' ) {
-		return $this->get_prop( 'refunded', $context );
+	public function get_refunded($context = 'view') {
+		return $this->get_prop('refunded', $context);
 	}
 
 	/**
@@ -438,8 +438,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_cancelled( $context = 'view' ) {
-		return $this->get_prop( 'cancelled', $context );
+	public function get_cancelled($context = 'view') {
+		return $this->get_prop('cancelled', $context);
 	}
 
 	/**
@@ -449,8 +449,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_failed( $context = 'view' ) {
-		return $this->get_prop( 'failed', $context );
+	public function get_failed($context = 'view') {
+		return $this->get_prop('failed', $context);
 	}
 
 	/**
@@ -461,8 +461,8 @@ 
 	 * @return string
 	 */
 	public function get_currency() {
-		$currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
-		return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
+		$currency = empty($this->invoice) ? wpinv_get_currency() : $this->invoice->get_currency();
+		return apply_filters('getpaid-payment-form-currency', $currency, $this);
 	}
 
     /*
@@ -480,8 +480,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+	public function set_version($value) {
+		$this->set_prop('version', $value);
     }
 
     /**
@@ -491,11 +491,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_created( $value ) {
-        $date = strtotime( $value );
+	public function set_date_created($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_created', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_created', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -510,11 +510,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_modified( $value ) {
-        $date = strtotime( $value );
+	public function set_date_modified($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_modified', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_modified', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -528,8 +528,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_name( $value ) {
-		$this->set_prop( 'name', sanitize_text_field( $value ) );
+	public function set_name($value) {
+		$this->set_prop('name', sanitize_text_field($value));
     }
 
     /**
@@ -538,8 +538,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+	public function set_title($value) {
+		$this->set_name($value);
     }
 
     /**
@@ -548,8 +548,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New author.
 	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
+	public function set_author($value) {
+		$this->set_prop('author', (int) $value);
 	}
 
 	/**
@@ -559,9 +559,9 @@ 
 	 * @sinve 2.3.4 Array values sanitized.
 	 * @param  array $value Form elements.
 	 */
-	public function set_elements( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'elements', wp_kses_post_deep( $value ) );
+	public function set_elements($value) {
+		if (is_array($value)) {
+			$this->set_prop('elements', wp_kses_post_deep($value));
 		}
 	}
 
@@ -572,36 +572,36 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function sanitize_array_values( $value ) {
+	public function sanitize_array_values($value) {
 
 		// sanitize
-		if ( ! empty( $value ) ) {
+		if (!empty($value)) {
 
-			foreach ( $value as $key => $val_arr ) {
+			foreach ($value as $key => $val_arr) {
 
-				if ( is_array( $val_arr ) ) {
+				if (is_array($val_arr)) {
 					// check if we have sub array items.
 					$sub_arr = array();
-					foreach ( $val_arr as $key2 => $val2 ) {
-						if ( is_array( $val2 ) ) {
-							$sub_arr[ $key2 ] = $this->sanitize_array_values( $val2 );
-							unset( $val_arr[ $key ][ $key2 ] );
+					foreach ($val_arr as $key2 => $val2) {
+						if (is_array($val2)) {
+							$sub_arr[$key2] = $this->sanitize_array_values($val2);
+							unset($val_arr[$key][$key2]);
 						}
 					}
 
 					// we allow some html in description so we sanitize it separately.
-					$help_text = ! empty( $val_arr['description'] ) ? wp_kses_post( $val_arr['description'] ) : '';
+					$help_text = !empty($val_arr['description']) ? wp_kses_post($val_arr['description']) : '';
 
 					// sanitize array elements
-					$value[ $key ] = array_map( 'sanitize_text_field', $val_arr );
+					$value[$key] = array_map('sanitize_text_field', $val_arr);
 
 					// add back the description if set
-					if ( isset( $val_arr['description'] ) ) {
-$value[ $key ]['description'] = $help_text;}
+					if (isset($val_arr['description'])) {
+$value[$key]['description'] = $help_text; }
 
 					// add back sub array items after its been sanitized.
-					if ( ! empty( $sub_arr ) ) {
-						$value[ $key ] = array_merge( $value[ $key ], $sub_arr );
+					if (!empty($sub_arr)) {
+						$value[$key] = array_merge($value[$key], $sub_arr);
 					}
 				}
 }
@@ -616,9 +616,9 @@ 
 	 * @since 1.0.19
 	 * @param  array $value Form elements.
 	 */
-	public function set_items( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'items', $value );
+	public function set_items($value) {
+		if (is_array($value)) {
+			$this->set_prop('items', $value);
 		}
 	}
 
@@ -628,9 +628,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount earned.
 	 */
-	public function set_earned( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'earned', $value );
+	public function set_earned($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('earned', $value);
 	}
 
 	/**
@@ -639,9 +639,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount refunded.
 	 */
-	public function set_refunded( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'refunded', $value );
+	public function set_refunded($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('refunded', $value);
 	}
 
 	/**
@@ -650,9 +650,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount cancelled.
 	 */
-	public function set_cancelled( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'cancelled', $value );
+	public function set_cancelled($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('cancelled', $value);
 	}
 
 	/**
@@ -661,9 +661,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount cancelled.
 	 */
-	public function set_failed( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'failed', $value );
+	public function set_failed($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('failed', $value);
 	}
 
     /**
@@ -672,11 +672,11 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function create( $data = array() ) {
+    public function create($data = array()) {
 
 		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
+		if (is_array($data)) {
+			$this->set_props($data);
 		}
 
 		// Save the item.
@@ -690,8 +690,8 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function update( $data = array() ) {
-        return $this->create( $data );
+    public function update($data = array()) {
+        return $this->create($data);
     }
 
     /*
@@ -711,7 +711,7 @@ 
 	 */
     public function is_default() {
         $is_default = $this->get_id() == wpinv_get_default_payment_form();
-        return (bool) apply_filters( 'wpinv_is_default_payment_form', $is_default, $this->get_id(), $this );
+        return (bool) apply_filters('wpinv_is_default_payment_form', $is_default, $this->get_id(), $this);
 	}
 
     /**
@@ -723,11 +723,11 @@ 
     public function is_active() {
         $is_active = 0 !== (int) $this->get_id();
 
-        if ( $is_active && ! current_user_can( 'edit_post', $this->get_id() ) && $this->get_status() != 'publish' ) {
+        if ($is_active && !current_user_can('edit_post', $this->get_id()) && $this->get_status() != 'publish') {
             $is_active = false;
         }
 
-        return (bool) apply_filters( 'wpinv_is_payment_form_active', $is_active, $this );
+        return (bool) apply_filters('wpinv_is_payment_form_active', $is_active, $this);
 	}
 
 	/**
@@ -736,8 +736,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-    public function has_item( $item_id ) {
-        return false !== $this->get_item( $item_id );
+    public function has_item($item_id) {
+        return false !== $this->get_item($item_id);
 	}
 
 	/**
@@ -746,8 +746,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-    public function has_element_type( $element_type ) {
-        return false !== $this->get_element_type( $element_type );
+    public function has_element_type($element_type) {
+        return false !== $this->get_element_type($element_type);
 	}
 
 	/**
@@ -758,13 +758,13 @@ 
 	 */
     public function is_recurring() {
 
-		if ( ! empty( $this->invoice ) ) {
+		if (!empty($this->invoice)) {
 			return $this->invoice->is_recurring();
 		}
 
-		foreach ( $this->get_items() as $item ) {
+		foreach ($this->get_items() as $item) {
 
-			if ( $item->is_recurring() ) {
+			if ($item->is_recurring()) {
 				return true;
 			}
 }
@@ -777,7 +777,7 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-    public function get_html( $extra_markup = '' ) {
+    public function get_html($extra_markup = '') {
 
 		// Return the HTML.
 		return wpinv_get_template_html(
@@ -795,7 +795,7 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-    public function display( $extra_markup = '' ) {
+    public function display($extra_markup = '') {
 		wpinv_get_template(
 			'payment-forms/form.php',
 			array(

includes/wpinv-address-functions.php

Indentation +87 added lines, -87 removed lines

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

Spacing +142 added lines, -142 removed lines

@@ -7,15 +7,15 @@ 
  */
 
 // MUST have WordPress.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -23,8 +23,8 @@ 
  *
  * @return string
  */
-function getpaid_get_ip_country( $ip_address = '' ) {
-    $country = GetPaid_Geolocation::geolocate_ip( $ip_address, true );
+function getpaid_get_ip_country($ip_address = '') {
+    $country = GetPaid_Geolocation::geolocate_ip($ip_address, true);
     return $country['country'];
 }
 
@@ -34,59 +34,59 @@ 
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
 
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) {
+function wpinv_country_name($country_code = '') {
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[ $country_code ] ) ? $countries[ $country_code ] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+	$state = wpinv_get_option('default_state', '');
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
 
-    if ( ! empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
 
-        $state = ! empty( $states ) && isset( $states[ $state_code ] ) ? $states[ $state_code ] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -94,24 +94,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_maybe_add_default_address( &$invoice ) {
+function getpaid_maybe_add_default_address(&$invoice) {
 
     $user_id = $invoice->get_user_id();
 
     // Abort if the invoice belongs to no one.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return;
     }
 
     // Fill in defaults whenever necessary.
-    foreach ( wpinv_get_user_address( $user_id ) as $key => $value ) {
+    foreach (wpinv_get_user_address($user_id) as $key => $value) {
 
-        if ( is_callable( $invoice, "get_$key" ) ) {
-            $current = call_user_func( array( $invoice, "get_$key" ) );
+        if (is_callable($invoice, "get_$key")) {
+            $current = call_user_func(array($invoice, "get_$key"));
 
-            if ( empty( $current ) ) {
+            if (empty($current)) {
                 $method = "set_$key";
-                $invoice->$method( $value );
+                $invoice->$method($value);
             }
 }
 }
@@ -128,22 +128,22 @@ 
     $address_fields = apply_filters(
         'getpaid_user_address_fields',
         array(
-            'first_name' => __( 'First Name', 'invoicing' ),
-            'last_name'  => __( 'Last Name', 'invoicing' ),
-            'address'    => __( 'Address', 'invoicing' ),
-            'city'       => __( 'City', 'invoicing' ),
-            'country'    => __( 'Country', 'invoicing' ),
-            'state'      => __( 'State', 'invoicing' ),
-            'zip'        => __( 'Zip/Postal Code', 'invoicing' ),
-            'phone'      => __( 'Phone Number', 'invoicing' ),
-            'company'    => __( 'Company', 'invoicing' ),
-            'company_id' => __( 'Company ID', 'invoicing' ),
-            'vat_number' => __( 'VAT Number', 'invoicing' ),
+            'first_name' => __('First Name', 'invoicing'),
+            'last_name'  => __('Last Name', 'invoicing'),
+            'address'    => __('Address', 'invoicing'),
+            'city'       => __('City', 'invoicing'),
+            'country'    => __('Country', 'invoicing'),
+            'state'      => __('State', 'invoicing'),
+            'zip'        => __('Zip/Postal Code', 'invoicing'),
+            'phone'      => __('Phone Number', 'invoicing'),
+            'company'    => __('Company', 'invoicing'),
+            'company_id' => __('Company ID', 'invoicing'),
+            'vat_number' => __('VAT Number', 'invoicing'),
         )
     );
 
-    if ( ! wpinv_use_taxes() && isset( $address_fields['vat_number'] ) && ! wp_doing_ajax() ) {
-        unset( $address_fields['vat_number'] );
+    if (!wpinv_use_taxes() && isset($address_fields['vat_number']) && !wp_doing_ajax()) {
+        unset($address_fields['vat_number']);
     }
 
     return $address_fields;
@@ -154,8 +154,8 @@ 
  *
  * @return bool
  */
-function getpaid_is_address_field_whitelisted( $key ) {
-    return array_key_exists( $key, getpaid_user_address_fields() );
+function getpaid_is_address_field_whitelisted($key) {
+    return array_key_exists($key, getpaid_user_address_fields());
 }
 
 /**
@@ -165,30 +165,30 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
+    $invoice = wpinv_get_invoice($invoice);
 
     // Abort if it does not exist.
-    if ( empty( $invoice ) || $invoice->is_renewal() ) {
+    if (empty($invoice) || $invoice->is_renewal()) {
         return;
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( is_callable( array( $invoice, "get_$field" ) ) ) {
-            $value = call_user_func( array( $invoice, "get_$field" ) );
+        if (is_callable(array($invoice, "get_$field"))) {
+            $value = call_user_func(array($invoice, "get_$field"));
 
             // Only save if it is not empty.
-            if ( ! empty( $value ) ) {
-                update_user_meta( $invoice->get_user_id(), '_wpinv_' . $field, $value );
+            if (!empty($value)) {
+                update_user_meta($invoice->get_user_id(), '_wpinv_' . $field, $value);
             }
         }
     }
 
 }
-add_action( 'getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address' );
+add_action('getpaid_checkout_invoice_updated', 'getpaid_save_invoice_user_address');
 
 /**
  * Retrieves a saved user address.
@@ -196,14 +196,14 @@ 
  * @param int $user_id The user id whose address we should get. Defaults to the current user id.
  * @return array
  */
-function wpinv_get_user_address( $user_id = 0 ) {
+function wpinv_get_user_address($user_id = 0) {
 
     // Prepare the user id.
-    $user_id   = empty( $user_id ) ? get_current_user_id() : $user_id;
-    $user_info = get_userdata( $user_id );
+    $user_id   = empty($user_id) ? get_current_user_id() : $user_id;
+    $user_info = get_userdata($user_id);
 
     // Abort if non exists.
-    if ( empty( $user_info ) ) {
+    if (empty($user_info)) {
         return array();
     }
 
@@ -214,11 +214,11 @@ 
         'display_name' => $user_info->display_name,
     );
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-        $address[ $field ] = getpaid_get_user_address_field( $user_id, $field );
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
+        $address[$field] = getpaid_get_user_address_field($user_id, $field);
     }
 
-    $address = array_filter( $address );
+    $address = array_filter($address);
 
     $defaults = array(
         'first_name' => $user_info->first_name,
@@ -227,7 +227,7 @@ 
         'country'    => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -238,7 +238,7 @@ 
  * @param string $field The field to use.
  * @return string|null
  */
-function getpaid_get_user_address_field( $user_id, $field ) {
+function getpaid_get_user_address_field($user_id, $field) {
 
     $prefixes = array(
         '_wpinv_',
@@ -246,15 +246,15 @@ 
         '',
     );
 
-    foreach ( $prefixes as $prefix ) {
+    foreach ($prefixes as $prefix) {
 
         // Meta table.
-        $value = get_user_meta( $user_id, $prefix . $field, true );
+        $value = get_user_meta($user_id, $prefix . $field, true);
 
         // UWP table.
-        $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+        $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-        if ( ! empty( $value ) ) {
+        if (!empty($value)) {
             return $value;
         }
 }
@@ -270,16 +270,16 @@ 
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch ( $return ) {
+    switch ($return) {
         case 'name':
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries':
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default:
             return $continents;
@@ -295,12 +295,12 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -316,13 +316,13 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null ) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -335,8 +335,8 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -346,22 +346,22 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
 
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array();
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
 
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -371,7 +371,7 @@ 
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -381,7 +381,7 @@ 
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -391,7 +391,7 @@ 
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -401,7 +401,7 @@ 
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -411,7 +411,7 @@ 
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -421,7 +421,7 @@ 
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -431,7 +431,7 @@ 
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -441,7 +441,7 @@ 
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -451,7 +451,7 @@ 
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -461,7 +461,7 @@ 
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -471,7 +471,7 @@ 
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -481,7 +481,7 @@ 
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -491,7 +491,7 @@ 
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -501,7 +501,7 @@ 
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -511,7 +511,7 @@ 
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -521,7 +521,7 @@ 
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -531,7 +531,7 @@ 
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -541,7 +541,7 @@ 
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -551,7 +551,7 @@ 
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -561,7 +561,7 @@ 
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -571,7 +571,7 @@ 
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -581,7 +581,7 @@ 
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -591,31 +591,31 @@ 
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if ( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if ( ! empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
 
-        $class  = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
+        $class  = isset($_POST['class']) ? esc_attr(sanitize_text_field($_POST['class'])) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
-        $args  = array(
+        $args = array(
 			'name'             => $sanitized_field_name,
 			'id'               => $sanitized_field_name,
-			'class'            => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options'          => array_merge( array( '' => '' ), $states ),
+			'class'            => implode(' ', array_unique(explode(' ', $class))),
+			'options'          => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false,
 		);
 
-		wpinv_html_select( $args );
+		wpinv_html_select($args);
 
 	} else {
 		echo 'nostates';
@@ -623,10 +623,10 @@ 
 
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = ! empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
 
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -688,9 +688,9 @@ 
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false ) {
+function wpinv_get_full_address_format($country = false) {
 
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -698,7 +698,7 @@ 
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
 
     /**
 	 * Filters the address format to use on Invoices.
@@ -710,7 +710,7 @@ 
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -721,7 +721,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'    => '',
@@ -734,15 +734,15 @@ 
 		'company'    => '',
     );
 
-    $args    = map_deep( wp_parse_args( array_filter( $billing_details ), $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args(array_filter($billing_details), $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ? wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ? wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
@@ -760,14 +760,14 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach ( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
-        $return[ '{{' . $key . '}}' ] = $value;
-        $return[ '{{' . $key . '_upper}}' ] = wpinv_utf8_strtoupper( $value );
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
+        $return['{{' . $key . '}}'] = $value;
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -781,6 +781,6 @@ 
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }

includes/class-getpaid-invoice-notification-emails.php

Indentation +470 added lines, -470 removed lines

@@ -12,493 +12,493 @@
  */
 class GetPaid_Invoice_Notification_Emails {
 
-	/**
-	 * The array of invoice email actions.
-	 *
-	 * @param array
-	 */
-	public $invoice_actions;
-
-	/**
-	 * Class constructor
-	 *
-	 */
-	public function __construct() {
-
-		$this->invoice_actions = apply_filters(
-			'getpaid_notification_email_invoice_triggers',
-			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
-				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
-				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
-				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
-				'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
-				'getpaid_invoice_status_publish'        => 'completed_invoice',
-				'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
-				'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
-				'getpaid_new_customer_note'             => 'user_note',
-				'getpaid_daily_maintenance'             => 'overdue',
-			)
-		);
-
-		$this->init_hooks();
-
-	}
-
-	/**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
-
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
-		}
-	}
-
-	/**
-	 * Registers an email hook for an invoice action.
-	 *
-	 * @param string $hook
-	 * @param string|array $email_type
-	 */
-	public function init_email_type_hook( $hook, $email_type ) {
-
-		$email_type = wpinv_parse_list( $email_type );
-
-		foreach ( $email_type as $type ) {
-
-			$email = new GetPaid_Notification_Email( $type );
-
-			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
-		}
-
-	}
-
-	/**
-	 * Filters invoice merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
-			);
-		}
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			return array_merge(
-				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates invoice merge tags.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_invoice_merge_tags( $invoice ) {
-
-		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
-			return array();
-		}
-
-		$due_date   = $invoice->get_due_date();
-		$due_date   = empty( $due_date ) ? time() + MINUTE_IN_SECONDS : strtotime( $due_date ) + ( (int) get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
-		$merge_tags = array(
-			'{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'                => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'         => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'               => $due_date < time() ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
-		);
-
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
-
-		if ( is_array( $payment_form_data ) ) {
-
-			foreach ( $payment_form_data as $label => $value ) {
-
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
-
-				if ( is_scalar( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
-				}
-			}
-		}
-
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param string|array $recipients
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
-
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
-
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
-			return;
-		}
-
-		$mailer     = new GetPaid_Notification_Email_Sender();
-		$merge_tags = $email->get_merge_tags();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
-			$email->get_attachments()
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
-				$email->get_attachments()
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
-				)
-			);
-		}
-
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
-
-		return $result;
-	}
-
-	/**
-	 * Also send emails to any cc users.
-	 *
-	 * @param array $recipients
-	 * @param GetPaid_Notification_Email $email
-	 */
-	public function filter_email_recipients( $recipients, $email ) {
-
-		if ( ! $email->is_admin_email() ) {
-			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
-
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-			}
-
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
-			}
-		}
-
-		return $recipients;
-
-	}
-
-	/**
-	 * Sends a new invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function new_invoice( $invoice ) {
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a cancelled invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function cancelled_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-	}
-
-	/**
-	 * Sends a failed invoice notification.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function failed_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = wpinv_get_admin_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is put on hold.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function onhold_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is marked as processing payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function processing_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Sends a notification whenever an invoice is paid.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function completed_invoice( $invoice ) {
-
-		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
+    /**
+     * The array of invoice email actions.
+     *
+     * @param array
+     */
+    public $invoice_actions;
+
+    /**
+     * Class constructor
+     *
+     */
+    public function __construct() {
+
+        $this->invoice_actions = apply_filters(
+            'getpaid_notification_email_invoice_triggers',
+            array(
+                'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+                'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
+                'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
+                'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
+                'getpaid_invoice_status_wpi-processing' => 'processing_invoice',
+                'getpaid_invoice_status_publish'        => 'completed_invoice',
+                'getpaid_invoice_status_wpi-renewal'    => 'completed_invoice',
+                'getpaid_invoice_status_wpi-refunded'   => 'refunded_invoice',
+                'getpaid_new_customer_note'             => 'user_note',
+                'getpaid_daily_maintenance'             => 'overdue',
+            )
+        );
+
+        $this->init_hooks();
+
+    }
+
+    /**
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
+        add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+
+        foreach ( $this->invoice_actions as $hook => $email_type ) {
+            $this->init_email_type_hook( $hook, $email_type );
+        }
+    }
+
+    /**
+     * Registers an email hook for an invoice action.
+     *
+     * @param string $hook
+     * @param string|array $email_type
+     */
+    public function init_email_type_hook( $hook, $email_type ) {
+
+        $email_type = wpinv_parse_list( $email_type );
+
+        foreach ( $email_type as $type ) {
+
+            $email = new GetPaid_Notification_Email( $type );
+
+            // Abort if it is not active.
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $type ) ) {
+                add_action( $hook, array( $this, $type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+        }
+
+    }
+
+    /**
+     * Filters invoice merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function invoice_merge_tags( $merge_tags, $object ) {
+
+        if ( is_a( $object, 'WPInv_Invoice' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object )
+            );
+        }
+
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            return array_merge(
+                $merge_tags,
+                $this->get_invoice_merge_tags( $object->get_parent_payment() )
+            );
+        }
+
+        return $merge_tags;
+
+    }
+
+    /**
+     * Generates invoice merge tags.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_invoice_merge_tags( $invoice ) {
+
+        // Abort if it does not exist.
+        if ( ! $invoice->get_id() ) {
+            return array();
+        }
+
+        $due_date   = $invoice->get_due_date();
+        $due_date   = empty( $due_date ) ? time() + MINUTE_IN_SECONDS : strtotime( $due_date ) + ( (int) get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+        $merge_tags = array(
+            '{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
+            '{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
+            '{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
+            '{email}'                => sanitize_email( $invoice->get_email() ),
+            '{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
+            '{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
+            '{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
+            '{invoice_link}'         => esc_url( $invoice->get_view_url() ),
+            '{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
+            '{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
+            '{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
+            '{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
+            '{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
+            '{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
+            '{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
+            '{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
+            '{is_was}'               => $due_date < time() ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+        );
+
+        $payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+
+        if ( is_array( $payment_form_data ) ) {
+
+            foreach ( $payment_form_data as $label => $value ) {
+
+                $label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
+                $value = is_array( $value ) ? implode( ', ', $value ) : $value;
+
+                if ( is_scalar( $value ) ) {
+                    $merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+                }
+            }
+        }
+
+        return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+    }
 
-	/**
-	 * Sends a notification whenever an invoice is refunded.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function refunded_invoice( $invoice ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param string|array $recipients
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
 
-	/**
-	 * Notifies a user about new invoices
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param bool $force
-	 */
-	public function user_invoice( $invoice, $force = false ) {
+        do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
-			return;
-		}
-
-		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
-			return;
-		}
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
-
-	}
-
-	/**
-	 * Checks if an invoice is a payment form invoice.
-	 *
-	 * @param int $invoice
-	 * @return bool
-	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$created_via             = get_post_meta( $invoice, 'wpinv_created_via', true );
-		$is_payment_form_invoice = 'payment_form' === $created_via || 'geodirectory' === $created_via;
-		$is_payment_form_invoice = apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
-		return empty( $_GET['getpaid-admin-action'] ) && $is_payment_form_invoice;
-	}
-
-	/**
-	 * Notifies admin about new invoice notes
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param string $note
-	 */
-	public function user_note( $invoice, $note ) {
-
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
-		$recipient = $invoice->get_email();
-
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
-
-	}
-
-	/**
-	 * (Force) Sends overdue notices.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
-	}
-
-	/**
-	 * Sends overdue notices.
-	 *
-	 * @TODO: Create an invoices query class.
-	 */
-	public function overdue() {
-		global $wpdb;
-
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
-
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
-
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
-
-		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
-
-		// Invoices table.
-		$table = $wpdb->prefix . 'getpaid_invoices';
-
-		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
-			"SELECT posts.ID FROM $wpdb->posts as posts
+        $skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
+        if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+            return;
+        }
+
+        $mailer     = new GetPaid_Notification_Email_Sender();
+        $merge_tags = $email->get_merge_tags();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $email->add_merge_tags( $email->get_subject(), $merge_tags ),
+            $email->get_content( $merge_tags, $extra_args ),
+            $email->get_attachments()
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
+                $email->get_content( $merge_tags ),
+                $email->get_attachments()
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    // translators: %1 is the email type, %2 is the invoice recipient.
+                    __( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    // translators: %1 is the email type, %2 is the invoice recipient.
+                    __( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+                )
+            );
+        }
+
+        do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+
+        return $result;
+    }
+
+    /**
+     * Also send emails to any cc users.
+     *
+     * @param array $recipients
+     * @param GetPaid_Notification_Email $email
+     */
+    public function filter_email_recipients( $recipients, $email ) {
+
+        if ( ! $email->is_admin_email() ) {
+            $cc   = $email->object->get_email_cc();
+            $cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+
+            if ( ! empty( $cc ) ) {
+                $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+            }
+
+            if ( ! empty( $cc_2 ) ) {
+                $cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
+                $recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+            }
+        }
+
+        return $recipients;
+
+    }
+
+    /**
+     * Sends a new invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function new_invoice( $invoice ) {
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a cancelled invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function cancelled_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+    }
+
+    /**
+     * Sends a failed invoice notification.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function failed_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = wpinv_get_admin_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is put on hold.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function onhold_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is marked as processing payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function processing_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is paid.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function completed_invoice( $invoice ) {
+
+        // (Maybe) abort if it is a renewal invoice.
+        if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Sends a notification whenever an invoice is refunded.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function refunded_invoice( $invoice ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Notifies a user about new invoices
+     *
+     * @param WPInv_Invoice $invoice
+     * @param bool $force
+     */
+    public function user_invoice( $invoice, $force = false ) {
+
+        if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+            return;
+        }
+
+        // Only send this email for invoices created via the admin page.
+        if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+            return;
+        }
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+
+    }
+
+    /**
+     * Checks if an invoice is a payment form invoice.
+     *
+     * @param int $invoice
+     * @return bool
+     */
+    public function is_payment_form_invoice( $invoice ) {
+        $created_via             = get_post_meta( $invoice, 'wpinv_created_via', true );
+        $is_payment_form_invoice = 'payment_form' === $created_via || 'geodirectory' === $created_via;
+        $is_payment_form_invoice = apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
+        return empty( $_GET['getpaid-admin-action'] ) && $is_payment_form_invoice;
+    }
+
+    /**
+     * Notifies admin about new invoice notes
+     *
+     * @param WPInv_Invoice $invoice
+     * @param string $note
+     */
+    public function user_note( $invoice, $note ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+        $recipient = $invoice->get_email();
+
+        return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+
+    }
+
+    /**
+     * (Force) Sends overdue notices.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    public function force_send_overdue_notice( $invoice ) {
+        $email = new GetPaid_Notification_Email( 'overdue', $invoice );
+        return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+    }
+
+    /**
+     * Sends overdue notices.
+     *
+     * @TODO: Create an invoices query class.
+     */
+    public function overdue() {
+        global $wpdb;
+
+        $email = new GetPaid_Notification_Email( __FUNCTION__ );
+
+        // Fetch reminder days.
+        $reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+
+        // Abort if non is set.
+        if ( empty( $reminder_days ) ) {
+            return;
+        }
+
+        // Retrieve date query.
+        $date_query = $this->get_date_query( $reminder_days );
+
+        // Invoices table.
+        $table = $wpdb->prefix . 'getpaid_invoices';
+
+        // Fetch invoices.
+        $invoices  = $wpdb->get_col(
+            "SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query"
         );
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
-				$email->object = $invoice;
+            // Only send this email for invoices created via the admin page.
+            if ( ! $this->is_payment_form_invoice( $invoice ) ) {
+                $invoice       = new WPInv_Invoice( $invoice );
+                $email->object = $invoice;
 
-				if ( $invoice->needs_payment() && ! $invoice->is_renewal() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
-				}
-			}
-		}
+                if ( $invoice->needs_payment() && ! $invoice->is_renewal() ) {
+                    $this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+                }
+            }
+        }
 
-	}
+    }
 
-	/**
-	 * Calculates the date query for an invoices query
-	 *
-	 * @param array $reminder_days
-	 * @return string
-	 */
-	public function get_date_query( $reminder_days ) {
+    /**
+     * Calculates the date query for an invoices query
+     *
+     * @param array $reminder_days
+     * @return string
+     */
+    public function get_date_query( $reminder_days ) {
 
-		$date_query = array(
-			'relation' => 'OR',
-		);
+        $date_query = array(
+            'relation' => 'OR',
+        );
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+        foreach ( $reminder_days as $days ) {
+            $date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
 
-			$date_query[] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $date_query[] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+        $date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
 
-		return $date_query->get_sql();
+        return $date_query->get_sql();
 
-	}
+    }
 
 }

Spacing +127 added lines, -127 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles invoice notificaiton emails.
@@ -28,7 +28,7 @@ 
 		$this->invoice_actions = apply_filters(
 			'getpaid_notification_email_invoice_triggers',
 			array(
-				'getpaid_new_invoice'                   => array( 'new_invoice', 'user_invoice' ),
+				'getpaid_new_invoice'                   => array('new_invoice', 'user_invoice'),
 				'getpaid_invoice_status_wpi-cancelled'  => 'cancelled_invoice',
 				'getpaid_invoice_status_wpi-failed'     => 'failed_invoice',
 				'getpaid_invoice_status_wpi-onhold'     => 'onhold_invoice',
@@ -50,11 +50,11 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'invoice_merge_tags' ), 10, 2 );
-		add_filter( 'getpaid_invoice_email_recipients', array( $this, 'filter_email_recipients' ), 10, 2 );
+		add_filter('getpaid_get_email_merge_tags', array($this, 'invoice_merge_tags'), 10, 2);
+		add_filter('getpaid_invoice_email_recipients', array($this, 'filter_email_recipients'), 10, 2);
 
-		foreach ( $this->invoice_actions as $hook => $email_type ) {
-			$this->init_email_type_hook( $hook, $email_type );
+		foreach ($this->invoice_actions as $hook => $email_type) {
+			$this->init_email_type_hook($hook, $email_type);
 		}
 	}
 
@@ -64,25 +64,25 @@ 
 	 * @param string $hook
 	 * @param string|array $email_type
 	 */
-	public function init_email_type_hook( $hook, $email_type ) {
+	public function init_email_type_hook($hook, $email_type) {
 
-		$email_type = wpinv_parse_list( $email_type );
+		$email_type = wpinv_parse_list($email_type);
 
-		foreach ( $email_type as $type ) {
+		foreach ($email_type as $type) {
 
-			$email = new GetPaid_Notification_Email( $type );
+			$email = new GetPaid_Notification_Email($type);
 
 			// Abort if it is not active.
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $type ) ) {
-				add_action( $hook, array( $this, $type ), 100, 2 );
+			if (method_exists($this, $type)) {
+				add_action($hook, array($this, $type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_invoice_init_email_type_hook', $type, $hook );
+			do_action('getpaid_invoice_init_email_type_hook', $type, $hook);
 		}
 
 	}
@@ -93,19 +93,19 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function invoice_merge_tags( $merge_tags, $object ) {
+	public function invoice_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Invoice' ) ) {
+		if (is_a($object, 'WPInv_Invoice')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object )
+				$this->get_invoice_merge_tags($object)
 			);
 		}
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			return array_merge(
 				$merge_tags,
-				$this->get_invoice_merge_tags( $object->get_parent_payment() )
+				$this->get_invoice_merge_tags($object->get_parent_payment())
 			);
 		}
 
@@ -119,52 +119,52 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_invoice_merge_tags( $invoice ) {
+	public function get_invoice_merge_tags($invoice) {
 
 		// Abort if it does not exist.
-		if ( ! $invoice->get_id() ) {
+		if (!$invoice->get_id()) {
 			return array();
 		}
 
 		$due_date   = $invoice->get_due_date();
-		$due_date   = empty( $due_date ) ? time() + MINUTE_IN_SECONDS : strtotime( $due_date ) + ( (int) get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		$due_date   = empty($due_date) ? time() + MINUTE_IN_SECONDS : strtotime($due_date) + ((int) get_option('gmt_offset') * HOUR_IN_SECONDS);
 		$merge_tags = array(
-			'{name}'                 => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{full_name}'            => sanitize_text_field( $invoice->get_user_full_name() ),
-			'{first_name}'           => sanitize_text_field( $invoice->get_first_name() ),
-			'{last_name}'            => sanitize_text_field( $invoice->get_last_name() ),
-			'{email}'                => sanitize_email( $invoice->get_email() ),
-			'{invoice_number}'       => sanitize_text_field( $invoice->get_number() ),
-			'{invoice_currency}'     => sanitize_text_field( $invoice->get_currency() ),
-			'{invoice_total}'        => sanitize_text_field( wpinv_price( $invoice->get_total(), $invoice->get_currency() ) ),
-			'{invoice_link}'         => esc_url( $invoice->get_view_url() ),
-			'{invoice_pay_link}'     => esc_url( $invoice->get_checkout_payment_url() ),
-			'{invoice_receipt_link}' => esc_url( $invoice->get_receipt_url() ),
-			'{invoice_date}'         => getpaid_format_date_value( $invoice->get_date_created() ),
-			'{invoice_due_date}'     => getpaid_format_date_value( $invoice->get_due_date(), __( 'on receipt', 'invoicing' ) ),
-			'{invoice_quote}'        => sanitize_text_field( strtolower( $invoice->get_label() ) ),
-			'{invoice_label}'        => sanitize_text_field( ucfirst( $invoice->get_label() ) ),
-			'{invoice_description}'  => wp_kses_post( $invoice->get_description() ),
-			'{subscription_name}'    => wp_kses_post( $invoice->get_subscription_name() ),
-			'{is_was}'               => $due_date < time() ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' ),
+			'{name}'                 => sanitize_text_field($invoice->get_user_full_name()),
+			'{full_name}'            => sanitize_text_field($invoice->get_user_full_name()),
+			'{first_name}'           => sanitize_text_field($invoice->get_first_name()),
+			'{last_name}'            => sanitize_text_field($invoice->get_last_name()),
+			'{email}'                => sanitize_email($invoice->get_email()),
+			'{invoice_number}'       => sanitize_text_field($invoice->get_number()),
+			'{invoice_currency}'     => sanitize_text_field($invoice->get_currency()),
+			'{invoice_total}'        => sanitize_text_field(wpinv_price($invoice->get_total(), $invoice->get_currency())),
+			'{invoice_link}'         => esc_url($invoice->get_view_url()),
+			'{invoice_pay_link}'     => esc_url($invoice->get_checkout_payment_url()),
+			'{invoice_receipt_link}' => esc_url($invoice->get_receipt_url()),
+			'{invoice_date}'         => getpaid_format_date_value($invoice->get_date_created()),
+			'{invoice_due_date}'     => getpaid_format_date_value($invoice->get_due_date(), __('on receipt', 'invoicing')),
+			'{invoice_quote}'        => sanitize_text_field(strtolower($invoice->get_label())),
+			'{invoice_label}'        => sanitize_text_field(ucfirst($invoice->get_label())),
+			'{invoice_description}'  => wp_kses_post($invoice->get_description()),
+			'{subscription_name}'    => wp_kses_post($invoice->get_subscription_name()),
+			'{is_was}'               => $due_date < time() ? __('was', 'invoicing') : __('is', 'invoicing'),
 		);
 
-		$payment_form_data = $invoice->get_meta( 'payment_form_data', true );
+		$payment_form_data = $invoice->get_meta('payment_form_data', true);
 
-		if ( is_array( $payment_form_data ) ) {
+		if (is_array($payment_form_data)) {
 
-			foreach ( $payment_form_data as $label => $value ) {
+			foreach ($payment_form_data as $label => $value) {
 
-				$label = preg_replace( '/[^a-z0-9]+/', '_', strtolower( $label ) );
-				$value = is_array( $value ) ? implode( ', ', $value ) : $value;
+				$label = preg_replace('/[^a-z0-9]+/', '_', strtolower($label));
+				$value = is_array($value) ? implode(', ', $value) : $value;
 
-				if ( is_scalar( $value ) ) {
-					$merge_tags[ "{{$label}}" ] = wp_kses_post( $value );
+				if (is_scalar($value)) {
+					$merge_tags["{{$label}}"] = wp_kses_post($value);
 				}
 			}
 		}
 
-		return apply_filters( 'getpaid_invoice_email_merge_tags', $merge_tags, $invoice );
+		return apply_filters('getpaid_invoice_email_merge_tags', $merge_tags, $invoice);
 	}
 
 	/**
@@ -176,12 +176,12 @@ 
 	 * @param string|array $recipients
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $invoice, $email, $type, $recipients, $extra_args = array() ) {
+	public function send_email($invoice, $email, $type, $recipients, $extra_args = array()) {
 
-		do_action( 'getpaid_before_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_before_send_invoice_notification', $type, $invoice, $email);
 
-		$skip = $invoice->is_free() && wpinv_get_option( 'skip_email_free_invoice' );
-		if ( apply_filters( 'getpaid_skip_invoice_email', $skip, $type, $invoice ) ) {
+		$skip = $invoice->is_free() && wpinv_get_option('skip_email_free_invoice');
+		if (apply_filters('getpaid_skip_invoice_email', $skip, $type, $invoice)) {
 			return;
 		}
 
@@ -189,43 +189,43 @@ 
 		$merge_tags = $email->get_merge_tags();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_invoice_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$email->add_merge_tags( $email->get_subject(), $merge_tags ),
-			$email->get_content( $merge_tags, $extra_args ),
+			apply_filters('getpaid_invoice_email_recipients', wpinv_parse_list($recipients), $email),
+			$email->add_merge_tags($email->get_subject(), $merge_tags),
+			$email->get_content($merge_tags, $extra_args),
 			$email->get_attachments()
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$email->add_merge_tags( $email->get_subject() . __( ' - ADMIN BCC COPY', 'invoicing' ), $merge_tags ),
-				$email->get_content( $merge_tags ),
+				$email->add_merge_tags($email->get_subject() . __(' - ADMIN BCC COPY', 'invoicing'), $merge_tags),
+				$email->get_content($merge_tags),
 				$email->get_attachments()
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
 					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+					__('Successfully sent %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin', 'invoicing') : __('the customer', 'invoicing')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
 					// translators: %1 is the email type, %2 is the invoice recipient.
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin', 'invoicing' ) : __( 'the customer', 'invoicing' )
+					__('Failed sending %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin', 'invoicing') : __('the customer', 'invoicing')
 				)
 			);
 		}
 
-		do_action( 'getpaid_after_send_invoice_notification', $type, $invoice, $email );
+		do_action('getpaid_after_send_invoice_notification', $type, $invoice, $email);
 
 		return $result;
 	}
@@ -236,20 +236,20 @@ 
 	 * @param array $recipients
 	 * @param GetPaid_Notification_Email $email
 	 */
-	public function filter_email_recipients( $recipients, $email ) {
+	public function filter_email_recipients($recipients, $email) {
 
-		if ( ! $email->is_admin_email() ) {
+		if (!$email->is_admin_email()) {
 			$cc   = $email->object->get_email_cc();
-			$cc_2 = get_user_meta( $email->object->get_user_id(), '_wpinv_email_cc', true );
+			$cc_2 = get_user_meta($email->object->get_user_id(), '_wpinv_email_cc', true);
 
-			if ( ! empty( $cc ) ) {
-				$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+			if (!empty($cc)) {
+				$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 			}
 
-			if ( ! empty( $cc_2 ) ) {
-				$cc_2 = array_map( 'sanitize_email', wpinv_parse_list( $cc_2 ) );
-				$recipients = array_filter( array_unique( array_merge( $recipients, $cc_2 ) ) );
+			if (!empty($cc_2)) {
+				$cc_2 = array_map('sanitize_email', wpinv_parse_list($cc_2));
+				$recipients = array_filter(array_unique(array_merge($recipients, $cc_2)));
 			}
 		}
 
@@ -262,17 +262,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function new_invoice( $invoice ) {
+	public function new_invoice($invoice) {
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || $invoice->is_paid() || $this->is_payment_form_invoice( $invoice->get_id() ) ) {
+		if (!$invoice->is_type('invoice') || $invoice->is_paid() || $this->is_payment_form_invoice($invoice->get_id())) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -281,12 +281,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function cancelled_invoice( $invoice ) {
+	public function cancelled_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 	}
 
 	/**
@@ -294,12 +294,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function failed_invoice( $invoice ) {
+	public function failed_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = wpinv_get_admin_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -308,12 +308,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function onhold_invoice( $invoice ) {
+	public function onhold_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -322,12 +322,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function processing_invoice( $invoice ) {
+	public function processing_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -336,17 +336,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function completed_invoice( $invoice ) {
+	public function completed_invoice($invoice) {
 
 		// (Maybe) abort if it is a renewal invoice.
-		if ( $invoice->is_renewal() && ! wpinv_get_option( 'email_completed_invoice_renewal_active', false ) ) {
+		if ($invoice->is_renewal() && !wpinv_get_option('email_completed_invoice_renewal_active', false)) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -355,12 +355,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function refunded_invoice( $invoice ) {
+	public function refunded_invoice($invoice) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -370,21 +370,21 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param bool $force
 	 */
-	public function user_invoice( $invoice, $force = false ) {
+	public function user_invoice($invoice, $force = false) {
 
-		if ( ! $force && ! empty( $GLOBALS['wpinv_skip_invoice_notification'] ) ) {
+		if (!$force && !empty($GLOBALS['wpinv_skip_invoice_notification'])) {
 			return;
 		}
 
 		// Only send this email for invoices created via the admin page.
-		if ( ! $invoice->is_type( 'invoice' ) || ( empty( $force ) && $invoice->is_paid() ) || ( empty( $force ) && $this->is_payment_form_invoice( $invoice->get_id() ) ) ) {
+		if (!$invoice->is_type('invoice') || (empty($force) && $invoice->is_paid()) || (empty($force) && $this->is_payment_form_invoice($invoice->get_id()))) {
 			return;
 		}
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient);
 
 	}
 
@@ -394,11 +394,11 @@ 
 	 * @param int $invoice
 	 * @return bool
 	 */
-	public function is_payment_form_invoice( $invoice ) {
-		$created_via             = get_post_meta( $invoice, 'wpinv_created_via', true );
+	public function is_payment_form_invoice($invoice) {
+		$created_via             = get_post_meta($invoice, 'wpinv_created_via', true);
 		$is_payment_form_invoice = 'payment_form' === $created_via || 'geodirectory' === $created_via;
-		$is_payment_form_invoice = apply_filters( 'getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice );
-		return empty( $_GET['getpaid-admin-action'] ) && $is_payment_form_invoice;
+		$is_payment_form_invoice = apply_filters('getpaid_invoice_notifications_is_payment_form_invoice', $is_payment_form_invoice, $invoice);
+		return empty($_GET['getpaid-admin-action']) && $is_payment_form_invoice;
 	}
 
 	/**
@@ -407,12 +407,12 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $note
 	 */
-	public function user_note( $invoice, $note ) {
+	public function user_note($invoice, $note) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $invoice );
+		$email     = new GetPaid_Notification_Email(__FUNCTION__, $invoice);
 		$recipient = $invoice->get_email();
 
-		return $this->send_email( $invoice, $email, __FUNCTION__, $recipient, array( 'customer_note' => $note ) );
+		return $this->send_email($invoice, $email, __FUNCTION__, $recipient, array('customer_note' => $note));
 
 	}
 
@@ -421,9 +421,9 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	public function force_send_overdue_notice( $invoice ) {
-		$email = new GetPaid_Notification_Email( 'overdue', $invoice );
-		return $this->send_email( $invoice, $email, 'overdue', $invoice->get_email() );
+	public function force_send_overdue_notice($invoice) {
+		$email = new GetPaid_Notification_Email('overdue', $invoice);
+		return $this->send_email($invoice, $email, 'overdue', $invoice->get_email());
 	}
 
 	/**
@@ -434,38 +434,38 @@ 
 	public function overdue() {
 		global $wpdb;
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Retrieve date query.
-		$date_query = $this->get_date_query( $reminder_days );
+		$date_query = $this->get_date_query($reminder_days);
 
 		// Invoices table.
 		$table = $wpdb->prefix . 'getpaid_invoices';
 
 		// Fetch invoices.
-		$invoices  = $wpdb->get_col(
+		$invoices = $wpdb->get_col(
 			"SELECT posts.ID FROM $wpdb->posts as posts
 			LEFT JOIN $table as invoices ON invoices.post_id = posts.ID
 			WHERE posts.post_type = 'wpi_invoice' AND posts.post_status = 'wpi-pending' $date_query"
         );
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
 			// Only send this email for invoices created via the admin page.
-			if ( ! $this->is_payment_form_invoice( $invoice ) ) {
-				$invoice       = new WPInv_Invoice( $invoice );
+			if (!$this->is_payment_form_invoice($invoice)) {
+				$invoice       = new WPInv_Invoice($invoice);
 				$email->object = $invoice;
 
-				if ( $invoice->needs_payment() && ! $invoice->is_renewal() ) {
-					$this->send_email( $invoice, $email, __FUNCTION__, $invoice->get_email() );
+				if ($invoice->needs_payment() && !$invoice->is_renewal()) {
+					$this->send_email($invoice, $email, __FUNCTION__, $invoice->get_email());
 				}
 			}
 		}
@@ -478,14 +478,14 @@ 
 	 * @param array $reminder_days
 	 * @return string
 	 */
-	public function get_date_query( $reminder_days ) {
+	public function get_date_query($reminder_days) {
 
 		$date_query = array(
 			'relation' => 'OR',
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("-$days days", current_time('timestamp'))));
 
 			$date_query[] = array(
 				'year'  => $date['year'],
@@ -495,7 +495,7 @@ 
 
 		}
 
-		$date_query = new WP_Date_Query( $date_query, 'invoices.due_date' );
+		$date_query = new WP_Date_Query($date_query, 'invoices.due_date');
 
 		return $date_query->get_sql();
 

includes/gateways/class-getpaid-bank-transfer-gateway.php

Indentation +232 added lines, -232 removed lines

@@ -13,40 +13,40 @@ 
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
+
+    /**
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
+
+    /**
+     * Bank transfer instructions.
+     */
+    public $instructions;
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
-
-	/**
-	 * Bank transfer instructions.
-	 */
-	public $instructions;
-
-	/**
-	 * Locale array.
-	 */
-	public $locale;
+     * Locale array.
+     */
+    public $locale;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -54,24 +54,24 @@ 
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
@@ -92,66 +92,66 @@ 
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
         }
 
-	}
+    }
 
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
 
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'   => __( 'Account Name', 'invoicing' ),
@@ -170,11 +170,11 @@ 
 
             if ( ! empty( $value ) ) {
                 $bank_info[ $field ] = array(
-					'label' => $label,
-					'value' => $value,
-				);
+                    'label' => $label,
+                    'value' => $value,
+                );
             }
-		}
+        }
 
         $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
 
@@ -182,139 +182,139 @@ 
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+
+        foreach ( $bank_info as $key => $data ) {
+            echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+        }
+
+        echo '</table>';
+
+    }
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+    /**
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
-		}
+        }
 
-		echo '</table>';
+        return $this->locale;
 
     }
 
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
 
-		$locale  = $this->get_country_locale();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
-		$admin_settings['bank_transfer_ac_name'] = array(
+        $admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
             'name' => __( 'Account Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ac_no'] = array(
+        $admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
             'name' => __( 'Account Number', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bank_name'] = array(
+        $admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
             'name' => __( 'Bank Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ifsc'] = array(
+        $admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
             'name' => __( 'IFSC Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_iban'] = array(
+        $admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
             'name' => __( 'IBAN', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bic'] = array(
+        $admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
             'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		$admin_settings['bank_transfer_info'] = array(
+        $admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
             'name' => __( 'Instructions', 'invoicing' ),
             'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
@@ -324,17 +324,17 @@ 
             'rows' => 5,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+    /**
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );
@@ -342,66 +342,66 @@ 
 
         $invoice->recalculate_total();
         $invoice->save();
-	}
+    }
 
-	/**
-	 * (Maybe) renews a bank transfer subscription profile.
-	 *
-	 *
+    /**
+     * (Maybe) renews a bank transfer subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-			$subscription->create_payment();
+            $subscription->create_payment();
         }
 
     }
 
-	/**
-	 * Process a bank transfer payment.
-	 *
-	 *
+    /**
+     * Process a bank transfer payment.
+     *
+     *
      * @param WPInv_Invoice $invoice
-	 */
-	public function invoice_paid( $invoice ) {
-
-		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
-			return;
-		}
-
-		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
-
-			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
-
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
-
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
-						$subscription->activate();
-					}
-				}
+     */
+    public function invoice_paid( $invoice ) {
+
+        // Abort if not paid by bank transfer.
+        if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+            return;
+        }
+
+        // Is it a parent payment?
+        if ( 0 == $invoice->get_parent_id() ) {
+
+            // (Maybe) activate subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+
+            if ( ! empty( $subscriptions ) ) {
+                $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+
+                foreach ( $subscriptions as $subscription ) {
+                    if ( $subscription->exists() ) {
+                        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
+                        $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+
+                        $subscription->set_next_renewal_date( $expiry );
+                        $subscription->set_date_created( current_time( 'mysql' ) );
+                        $subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+                        $subscription->activate();
+                    }
+                }
 }
 } else {
 
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+            $subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
 
-			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
-					}
+            // Renew the subscription.
+            if ( $subscription && $subscription->exists() ) {
+                $subscription->add_payment( array(), $invoice );
+                $subscription->renew( strtotime( $invoice->get_date_created() ) );
+                    }
 }
 
     }

Spacing +90 added lines, -90 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bank transfer Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
+	protected $supports = array('subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups');
 
     /**
 	 * Payment method order.
@@ -49,17 +49,17 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title                = __( 'Direct bank transfer', 'invoicing' );
-        $this->method_title         = __( 'Bank transfer', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed', 'invoicing' );
-        $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
+        $this->title                = __('Direct bank transfer', 'invoicing');
+        $this->method_title         = __('Bank transfer', 'invoicing');
+        $this->checkout_button_text = __('Proceed', 'invoicing');
+        $this->instructions         = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+		add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
+		add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
+		add_action('wpinv_pdf_content_billing', array($this, 'thankyou_page'), 11);
+		add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
+		add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
+		add_action('getpaid_invoice_status_publish', array($this, 'invoice_paid'), 20);
 
     }
 
@@ -71,23 +71,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Add a transaction id.
-        $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
+        $invoice->set_transaction_id($invoice->generate_key('bt_'));
 
         // Set it as pending payment.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-        } elseif ( ! $invoice->is_paid() ) {
-            $invoice->set_status( 'wpi-onhold' );
+        } elseif (!$invoice->is_paid()) {
+            $invoice->set_status('wpi-onhold');
         }
 
         // Save it.
         $invoice->save();
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -96,17 +96,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function thankyou_page( $invoice ) {
+	public function thankyou_page($invoice) {
 
-        if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
-            if ( ! empty( $this->instructions ) ) {
-                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
+            if (!empty($this->instructions)) {
+                echo wp_kses_post(wpautop(wptexturize($this->instructions)));
 			}
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -121,17 +121,17 @@ 
 	 * @param string     $email_type Email format: plain text or HTML.
 	 * @param bool     $sent_to_admin Sent to admin.
 	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+	public function email_instructions($invoice, $email_type, $sent_to_admin) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+		if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+			if ($this->instructions) {
+				echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
             }
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -144,50 +144,50 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function bank_details( $invoice ) {
+	protected function bank_details($invoice) {
 
 		// Get the invoice country and country $locale.
 		$country = $invoice->get_country();
 		$locale  = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
         $bank_fields = array(
-            'ac_name'   => __( 'Account Name', 'invoicing' ),
-            'ac_no'     => __( 'Account Number', 'invoicing' ),
-            'bank_name' => __( 'Bank Name', 'invoicing' ),
-            'ifsc'      => __( 'IFSC code', 'invoicing' ),
-            'iban'      => __( 'IBAN', 'invoicing' ),
-            'bic'       => __( 'BIC/Swift code', 'invoicing' ),
+            'ac_name'   => __('Account Name', 'invoicing'),
+            'ac_no'     => __('Account Number', 'invoicing'),
+            'bank_name' => __('Bank Name', 'invoicing'),
+            'ifsc'      => __('IFSC code', 'invoicing'),
+            'iban'      => __('IBAN', 'invoicing'),
+            'bic'       => __('BIC/Swift code', 'invoicing'),
             'sort_code' => $sortcode,
         );
 
         $bank_info = array();
 
-        foreach ( $bank_fields as $field => $label ) {
-            $value = $this->get_option( $field );
+        foreach ($bank_fields as $field => $label) {
+            $value = $this->get_option($field);
 
-            if ( ! empty( $value ) ) {
-                $bank_info[ $field ] = array(
+            if (!empty($value)) {
+                $bank_info[$field] = array(
 					'label' => $label,
 					'value' => $value,
 				);
             }
 		}
 
-        $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
+        $bank_info = apply_filters('wpinv_bank_info', $bank_info, $invoice);
 
-        if ( empty( $bank_info ) ) {
+        if (empty($bank_info)) {
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html(apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing'), $invoice)) . '</h3>' . PHP_EOL;
 
 		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+		foreach ($bank_info as $key => $data) {
+			echo "<tr class='getpaid-bank-transfer-" . esc_attr($key) . "'><th class='font-weight-bold'>" . wp_kses_post($data['label']) . "</th><td class='w-75'>" . wp_kses_post(wptexturize($data['value'])) . '</td></tr>' . PHP_EOL;
 		}
 
 		echo '</table>';
@@ -201,7 +201,7 @@ 
 	 */
 	public function get_country_locale() {
 
-		if ( empty( $this->locale ) ) {
+		if (empty($this->locale)) {
 
 			// Locale information to be used - only those that are not 'Sort Code'.
 			$this->locale = apply_filters(
@@ -209,42 +209,42 @@ 
 				array(
 					'AU' => array(
 						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
+							'label' => __('BSB', 'invoicing'),
 						),
 					),
 					'CA' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
+							'label' => __('Bank transit number', 'invoicing'),
 						),
 					),
 					'IN' => array(
 						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
+							'label' => __('IFSC', 'invoicing'),
 						),
 					),
 					'IT' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
+							'label' => __('Branch sort', 'invoicing'),
 						),
 					),
 					'NZ' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'SE' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'US' => array(
 						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
+							'label' => __('Routing number', 'invoicing'),
 						),
 					),
 					'ZA' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
+							'label' => __('Branch code', 'invoicing'),
 						),
 					),
 				)
@@ -261,51 +261,51 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
-        $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
+		$admin_settings['bank_transfer_active']['desc'] = __('Enable bank transfer', 'invoicing');
 
-		$locale  = $this->get_country_locale();
+		$locale = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
 		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
 		$admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_sort_code'] = array(
@@ -316,10 +316,10 @@ 
 
 		$admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'std'  => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
             'cols' => 50,
             'rows' => 5,
         );
@@ -334,10 +334,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();
@@ -350,10 +350,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 			$subscription->create_payment();
         }
 
@@ -365,42 +365,42 @@ 
 	 *
      * @param WPInv_Invoice $invoice
 	 */
-	public function invoice_paid( $invoice ) {
+	public function invoice_paid($invoice) {
 
 		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+		if ($this->id !== $invoice->get_gateway() || !$invoice->is_recurring()) {
 			return;
 		}
 
 		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
+		if (0 == $invoice->get_parent_id()) {
 
 			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+			if (!empty($subscriptions)) {
+				$subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+				foreach ($subscriptions as $subscription) {
+					if ($subscription->exists()) {
+						$duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+						$expiry   = gmdate('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+						$subscription->set_next_renewal_date($expiry);
+						$subscription->set_date_created(current_time('mysql'));
+						$subscription->set_profile_id('bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id());
 						$subscription->activate();
 					}
 				}
 }
 } else {
 
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+			$subscription = getpaid_get_subscription($invoice->get_subscription_id());
 
 			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
+			if ($subscription && $subscription->exists()) {
+				$subscription->add_payment(array(), $invoice);
+				$subscription->renew(strtotime($invoice->get_date_created()));
 					}
 }
 

invoicing.php

Indentation +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@ 
 
 // Define constants.
 if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+    define( 'WPINV_PLUGIN_FILE', __FILE__ );
 }
 
 if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.7.3' );
+    define( 'WPINV_VERSION', '2.7.3' );
 }
 
 // Include the main Invoicing class.
 if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+    require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
-	return $GLOBALS['invoicing'];
+    return $GLOBALS['invoicing'];
 }
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -15,20 +15,20 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Define constants.
-if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+	define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.7.3' );
+if (!defined('WPINV_VERSION')) {
+	define('WPINV_VERSION', '2.7.3');
 }
 
 // Include the main Invoicing class.
-if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+if (!class_exists('WPInv_Plugin', false)) {
+	require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -39,7 +39,7 @@ 
  */
 function getpaid() {
 
-    if ( empty( $GLOBALS['invoicing'] ) ) {
+    if (empty($GLOBALS['invoicing'])) {
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
@@ -52,9 +52,9 @@ 
  * @since  2.0.8
  */
 function getpaid_deactivation_hook() {
-    update_option( 'wpinv_flush_permalinks', 1 );
+    update_option('wpinv_flush_permalinks', 1);
 }
-register_deactivation_hook( __FILE__, 'getpaid_deactivation_hook' );
+register_deactivation_hook(__FILE__, 'getpaid_deactivation_hook');
 
 /**
  * @deprecated
@@ -64,4 +64,4 @@ 
 }
 
 // Kickstart the plugin.
-add_action( 'plugins_loaded', 'getpaid', -100 );
+add_action('plugins_loaded', 'getpaid', -100);