AyeCode / invoicing

includes/wpinv-payment-functions.php

Spacing +90 added lines, -90 removed lines

@@ -1,155 +1,155 @@ 
 <?php
-function wpinv_is_subscription_payment( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_is_subscription_payment($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
         
-    if ( $invoice->is_renewal() ) {
+    if ($invoice->is_renewal()) {
         return true;
     }
 
     return false;
 }
 
-function wpinv_payment_link_transaction_id( $invoice = '' ) {
-    if ( empty( $invoice ) ) {
+function wpinv_payment_link_transaction_id($invoice = '') {
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !is_object( $invoice ) && is_scalar( $invoice ) ) {
-        $invoice = wpinv_get_invoice( $invoice );
+    if (!is_object($invoice) && is_scalar($invoice)) {
+        $invoice = wpinv_get_invoice($invoice);
     }
     
-    if ( empty( $invoice ) ) {
+    if (empty($invoice)) {
         return false;
     }
 
-    return apply_filters( 'wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice );
+    return apply_filters('wpinv_payment_details_transaction_id-' . $invoice->gateway, $invoice->get_transaction_id(), $invoice->ID, $invoice);
 }
 
-function wpinv_subscription_initial_payment_desc( $amount, $period, $interval, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
+function wpinv_subscription_initial_payment_desc($amount, $period, $interval, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
-        $amount = __( 'Free', 'invoicing' );
+    if ($trial_interval > 0 && !empty($trial_period)) {
+        $amount = __('Free', 'invoicing');
         $interval = $trial_interval;
         $period = $trial_period;
     }
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :
-            $description = wp_sprintf( _n( '%s for the first day.', '%s for the first %d days.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first day.', '%s for the first %d days.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'W' :
         case 'week' :
-            $description = wp_sprintf( _n( '%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first week.', '%s for the first %d weeks.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'M' :
         case 'month' :
-            $description = wp_sprintf( _n( '%s for the first month.', '%s for the first %d months.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first month.', '%s for the first %d months.', $interval, 'invoicing'), $amount, $interval);
             break;
         case 'Y' :
         case 'year' :
-            $description = wp_sprintf( _n( '%s for the first year.', '%s for the first %d years.', $interval, 'invoicing' ), $amount, $interval );
+            $description = wp_sprintf(_n('%s for the first year.', '%s for the first %d years.', $interval, 'invoicing'), $amount, $interval);
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval  );
+    return apply_filters('wpinv_subscription_initial_payment_desc', $description, $amount, $period, $interval, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_recurring_payment_desc( $amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0 ) {
-    $interval   = (int)$interval > 0 ? (int)$interval : 1;
-    $bill_times = (int)$bill_times > 0 ? (int)$bill_times : 0;
+function wpinv_subscription_recurring_payment_desc($amount, $period, $interval, $bill_times = 0, $trial_period = '', $trial_interval = 0) {
+    $interval   = (int) $interval > 0 ? (int) $interval : 1;
+    $bill_times = (int) $bill_times > 0 ? (int) $bill_times : 0;
     
     $description = '';
-    switch ( $period ) {
+    switch ($period) {
         case 'D' :
         case 'day' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d days, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d days, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d days.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d days.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one day.', '%s for each day, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each day.', '%s for each %d days.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'W' :
         case 'week' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d weeks, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d weeks, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d weeks.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d weeks.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one week.', '%s for each week, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each week.', '%s for each %d weeks.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each week.', '%s for each %d weeks.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'M' :
         case 'month' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d months, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d months, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d months.', 'invoicing' ), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d months.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one month.', '%s for each month, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each month.', '%s for each %d months.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each month.', '%s for each %d months.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
         case 'Y' :
         case 'year' :            
-            if ( (int)$bill_times > 0 ) {
-                if ( $interval > 1 ) {
-                    if ( $bill_times > 1 ) {
-                        $description = wp_sprintf( __( '%s for each %d years, for %d installments.', 'invoicing' ), $amount, $interval, $bill_times );
+            if ((int) $bill_times > 0) {
+                if ($interval > 1) {
+                    if ($bill_times > 1) {
+                        $description = wp_sprintf(__('%s for each %d years, for %d installments.', 'invoicing'), $amount, $interval, $bill_times);
                     } else {
-                        $description = wp_sprintf( __( '%s for %d years.', 'invoicing'), $amount, $interval );
+                        $description = wp_sprintf(__('%s for %d years.', 'invoicing'), $amount, $interval);
                     }
                 } else {
-                    $description = wp_sprintf( _n( '%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing' ), $amount, $bill_times );
+                    $description = wp_sprintf(_n('%s for one year.', '%s for each year, for %d installments.', $bill_times, 'invoicing'), $amount, $bill_times);
                 }
             } else {
-                $description = wp_sprintf( _n( '%s for each year.', '%s for each %d years.', $interval, 'invoicing' ), $amount, $interval );
+                $description = wp_sprintf(_n('%s for each year.', '%s for each %d years.', $interval, 'invoicing'), $amount, $interval);
             }
             break;
     }
 
-    return apply_filters( 'wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    return apply_filters('wpinv_subscription_recurring_payment_desc', $description, $amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
 }
 
-function wpinv_subscription_payment_desc( $invoice ) {
-    if ( empty( $invoice ) ) {
+function wpinv_subscription_payment_desc($invoice) {
+    if (empty($invoice)) {
         return NULL;
     }
 
     $description = '';
-    if ( $invoice->is_parent() && $item = $invoice->get_recurring( true ) ) {
-        if ( $item->has_free_trial() ) {
+    if ($invoice->is_parent() && $item = $invoice->get_recurring(true)) {
+        if ($item->has_free_trial()) {
             $trial_period = $item->get_trial_period();
             $trial_interval = $item->get_trial_interval();
         } else {
@@ -157,40 +157,40 @@ 
             $trial_interval = 0;
         }
         
-        $description = wpinv_get_billing_cycle( $invoice->get_total(), $invoice->get_recurring_details( 'total' ), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency() );
+        $description = wpinv_get_billing_cycle($invoice->get_total(), $invoice->get_recurring_details('total'), $item->get_recurring_period(), $item->get_recurring_interval(), $item->get_recurring_limit(), $trial_period, $trial_interval, $invoice->get_currency());
     }
     
-    return apply_filters( 'wpinv_subscription_payment_desc', $description, $invoice );
+    return apply_filters('wpinv_subscription_payment_desc', $description, $invoice);
 }
 
-function wpinv_get_billing_cycle( $initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '' ) {
-    $initial_total      = wpinv_round_amount( $initial );
-    $recurring_total    = wpinv_round_amount( $recurring );
+function wpinv_get_billing_cycle($initial, $recurring, $period, $interval, $bill_times, $trial_period = '', $trial_interval = 0, $currency = '') {
+    $initial_total      = wpinv_round_amount($initial);
+    $recurring_total    = wpinv_round_amount($recurring);
     
-    if ( $trial_interval > 0 && !empty( $trial_period ) ) {
+    if ($trial_interval > 0 && !empty($trial_period)) {
         // Free trial
     } else {
-        if ( $bill_times == 1 ) {
+        if ($bill_times == 1) {
             $recurring_total = $initial_total;
-        } else if ( $bill_times > 1 && $initial_total != $recurring_total ) {
+        } else if ($bill_times > 1 && $initial_total != $recurring_total) {
             $bill_times--;
         }
     }
     
-    $initial_amount     = wpinv_price( $initial_total, $currency );
-    $recurring_amount   = wpinv_price( $recurring_total, $currency );
+    $initial_amount     = wpinv_price($initial_total, $currency);
+    $recurring_amount   = wpinv_price($recurring_total, $currency);
     
-    $recurring          = wpinv_subscription_recurring_payment_desc( $recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval );
+    $recurring          = wpinv_subscription_recurring_payment_desc($recurring_amount, $period, $interval, $bill_times, $trial_period, $trial_interval);
         
-    if ( $initial_total != $recurring_total ) {
-        $initial        = wpinv_subscription_initial_payment_desc( $initial_amount, $period, $interval, $trial_period, $trial_interval );
+    if ($initial_total != $recurring_total) {
+        $initial        = wpinv_subscription_initial_payment_desc($initial_amount, $period, $interval, $trial_period, $trial_interval);
         
-        $description    = wp_sprintf( __( '%s Then %s', 'invoicing' ), $initial, $recurring );
+        $description    = wp_sprintf(__('%s Then %s', 'invoicing'), $initial, $recurring);
     } else {
         $description    = $recurring;
     }
     
-    return apply_filters( 'wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency );
+    return apply_filters('wpinv_get_billing_cycle', $description, $initial, $recurring, $period, $interval, $bill_times, $trial_period, $trial_interval, $currency);
 }
 
 /**
@@ -200,27 +200,27 @@ 
  * @param string $card_number Card number.
  * @return string
  */
-function getpaid_get_card_name( $card_number ) {
+function getpaid_get_card_name($card_number) {
 
     // Known regexes.
     $regexes = array(
-        '/^4/'                     => __( 'Visa', 'invoicing' ),
-        '/^5[1-5]/'                => __( 'Mastercard', 'invoicing' ),
-        '/^3[47]/'                 => __( 'Amex', 'invoicing' ),
-        '/^3(?:0[0-5]|[68])/'      => __( 'Diners Club', 'invoicing' ),
-        '/^6(?:011|5)/'            => __( 'Discover', 'invoicing' ),
-        '/^(?:2131|1800|35\d{3})/' => __( 'JCB', 'invoicing' ),
+        '/^4/'                     => __('Visa', 'invoicing'),
+        '/^5[1-5]/'                => __('Mastercard', 'invoicing'),
+        '/^3[47]/'                 => __('Amex', 'invoicing'),
+        '/^3(?:0[0-5]|[68])/'      => __('Diners Club', 'invoicing'),
+        '/^6(?:011|5)/'            => __('Discover', 'invoicing'),
+        '/^(?:2131|1800|35\d{3})/' => __('JCB', 'invoicing'),
     );
 
     // Confirm if one matches.
-    foreach ( $regexes as $regex => $card ) {
-        if ( preg_match ( $regex, $card_number ) >= 1 ) {
+    foreach ($regexes as $regex => $card) {
+        if (preg_match($regex, $card_number) >= 1) {
             return $card;
         }
     }
 
     // None matched.
-    return __( 'Card', 'invoicing' );
+    return __('Card', 'invoicing');
 
 }
 
@@ -229,16 +229,16 @@ 
  * 
  * @param WPInv_Invoice|int|null $invoice
  */
-function wpinv_send_back_to_checkout( $invoice = null ) {
+function wpinv_send_back_to_checkout($invoice = null) {
 
-    if ( ! empty( $invoice ) ) {
-        do_action( 'getpaid_checkout_invoice_exception', $invoice );
+    if (!empty($invoice)) {
+        do_action('getpaid_checkout_invoice_exception', $invoice);
     }
 
 	// Do we have any errors?
-    if ( wpinv_get_errors() ) {
-        wp_send_json_error( getpaid_get_errors_html( true, false ) );
+    if (wpinv_get_errors()) {
+        wp_send_json_error(getpaid_get_errors_html(true, false));
     }
 
-    wp_send_json_error( __( 'An error occured while processing your payment. Please try again.', 'invoicing' ) );
+    wp_send_json_error(__('An error occured while processing your payment. Please try again.', 'invoicing'));
 }

includes/gateways/class-getpaid-worldpay-gateway.php

Spacing +86 added lines, -86 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Worldpay Payment Gateway class.
@@ -45,14 +45,14 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'sandbox' );
+    protected $supports = array('sandbox');
     
     /**
 	 * Currencies this gateway is allowed for.
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR' );
+	public $currencies = array('AUD', 'ARS', 'CAD', 'CHF', 'DKK', 'EUR', 'HKD', 'MYR', 'GBP', 'NZD', 'NOK', 'SGD', 'LKR', 'SEK', 'TRY', 'USD', 'ZAR');
 
     /**
 	 * URL to view a transaction.
@@ -73,13 +73,13 @@ 
 	 */
 	public function __construct() {
 
-        $this->method_title         = __( 'Worldpay', 'invoicing' );
-        $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to Worldpay', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->method_title         = __('Worldpay', 'invoicing');
+        $this->title                = __('Worldpay - Credit Card / Debit Card', 'invoicing');
+        $this->checkout_button_text = __('Proceed to Worldpay', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-        add_filter( 'wpinv_gateway_description', array( $this, 'sandbox_notice' ), 10, 2 );
-        add_filter( 'getpaid_worldpay_args', array( $this, 'hash_args' ) );
+        add_filter('wpinv_gateway_description', array($this, 'sandbox_notice'), 10, 2);
+        add_filter('getpaid_worldpay_args', array($this, 'hash_args'));
 
         parent::__construct();
     }
@@ -93,24 +93,24 @@ 
 	 * @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) {
 
         // Get redirect url.
-        $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
+        $worldpay_redirect = esc_url($this->get_request_url($invoice));
 
         // Get submission args.
-        $worldpay_args     = $this->get_worldpay_args( $invoice );
+        $worldpay_args     = $this->get_worldpay_args($invoice);
 
         $form = "<form action='$worldpay_redirect' name='wpi_worldpay_form' method='POST'>";
 
-        foreach ( $worldpay_args as $key => $value ) {
+        foreach ($worldpay_args as $key => $value) {
 
-            if ( false === $value || '' === trim( $value ) ) {
+            if (false === $value || '' === trim($value)) {
                 continue;
             }
 
-            $value = esc_attr( $value );
-            $key   = wpinv_clean( $key );
+            $value = esc_attr($value);
+            $key   = wpinv_clean($key);
             $form .= "<input type='hidden' name='$key' value='$value'>";
         }
 
@@ -133,10 +133,10 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint = $this->is_sandbox( $invoice ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
 
         return $this->endpoint;
 
@@ -148,34 +148,34 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_worldpay_args( $invoice ) {
+	protected function get_worldpay_args($invoice) {
 
 		return apply_filters(
 			'getpaid_worldpay_args',
 			array(
-                'amount'         => wpinv_sanitize_amount( $invoice->get_total() ), // mandatory
-                'cartId'         => wpinv_clean( $invoice->get_number() ), // mandatory reference for the item purchased
-                'currency'       => wpinv_clean( $invoice->get_currency() ), // mandatory
-                'instId'         => wpinv_clean( $this->get_option( 'instId', '' ) ), // mandatory
-                'testMode'       => $this->is_sandbox( $invoice ) ? 100 : 0, // mandatory
-                'name'           => wpinv_clean( $invoice->get_full_name() ),
-                'address'        => wpinv_clean( $invoice->get_address() ),
-                'postcode'       => wpinv_clean( $invoice->get_zip() ),
-                'tel'            => wpinv_clean( $invoice->get_phone() ),
-                'email'          => sanitize_email( $invoice->get_email() ),
-                'country'        => wpinv_clean( $invoice->get_country() ),
-                'desc'           => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_description' => sprintf( __( 'Payment for invoice %s.', 'invoicing' ), wpinv_clean( $invoice->get_number() ) ),
-                'MC_callback'    => esc_url_raw( $this->notify_url ),
-                'resultfile'     => esc_url_raw( $this->get_return_url( $invoice ) ),
-                'MC_key'         => wpinv_clean( $invoice->get_key() ),
+                'amount'         => wpinv_sanitize_amount($invoice->get_total()), // mandatory
+                'cartId'         => wpinv_clean($invoice->get_number()), // mandatory reference for the item purchased
+                'currency'       => wpinv_clean($invoice->get_currency()), // mandatory
+                'instId'         => wpinv_clean($this->get_option('instId', '')), // mandatory
+                'testMode'       => $this->is_sandbox($invoice) ? 100 : 0, // mandatory
+                'name'           => wpinv_clean($invoice->get_full_name()),
+                'address'        => wpinv_clean($invoice->get_address()),
+                'postcode'       => wpinv_clean($invoice->get_zip()),
+                'tel'            => wpinv_clean($invoice->get_phone()),
+                'email'          => sanitize_email($invoice->get_email()),
+                'country'        => wpinv_clean($invoice->get_country()),
+                'desc'           => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_description' => sprintf(__('Payment for invoice %s.', 'invoicing'), wpinv_clean($invoice->get_number())),
+                'MC_callback'    => esc_url_raw($this->notify_url),
+                'resultfile'     => esc_url_raw($this->get_return_url($invoice)),
+                'MC_key'         => wpinv_clean($invoice->get_key()),
                 'MC_invoice_id'  => $invoice->get_id(),
-                'address1'       => wpinv_clean( $invoice->get_address() ),
-                'town'           => wpinv_clean( $invoice->get_city() ),
-                'region'         => wpinv_clean( $invoice->get_state() ),
-                'amountString'   => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
-                'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
-                'compName'       => wpinv_clean( $invoice->get_company() ),
+                'address1'       => wpinv_clean($invoice->get_address()),
+                'town'           => wpinv_clean($invoice->get_city()),
+                'region'         => wpinv_clean($invoice->get_state()),
+                'amountString'   => wpinv_price($invoice->get_total(), $invoice->get_currency()),
+                'countryString'  => wpinv_clean(wpinv_country_name($invoice->get_country())),
+                'compName'       => wpinv_clean($invoice->get_company()),
             ),
 			$invoice
 		);
@@ -188,17 +188,17 @@ 
 	 * @param  array $args Gateway args.
 	 * @return array
 	 */
-	public function hash_args( $args ) {
+	public function hash_args($args) {
 
-        $md5_secret = $this->get_option( 'md5_secret' );
+        $md5_secret = $this->get_option('md5_secret');
 
         // Abort if there is no secret.
-        if ( empty( $md5_secret ) ) {
+        if (empty($md5_secret)) {
             return $args;
         }
 
         // Hash the args.
-        $args['signature'] = md5( "$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}" );
+        $args['signature'] = md5("$md5_secret:{$args['instId']}:{$args['amount']}:{$args['currency']}:{$args['cartId']}");
 
         return $args;
     }
@@ -211,43 +211,43 @@ 
 	public function verify_ipn() {
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Worldpay IPN Request Failure', 'Worldpay IPN', array('response' => 500));
 		}
 
         // Process the IPN.
-        $posted  = wp_unslash( $_POST );
-        $invoice = wpinv_get_invoice( $posted['MC_invoice_id'] );
+        $posted  = wp_unslash($_POST);
+        $invoice = wpinv_get_invoice($posted['MC_invoice_id']);
 
-        if ( $invoice && $this->id == $invoice->get_gateway() ) {
+        if ($invoice && $this->id == $invoice->get_gateway()) {
 
-            wpinv_error_log( 'Found invoice #' . $invoice->get_number() );
-            wpinv_error_log( 'Payment status:' . $posted['transStatus'] );
+            wpinv_error_log('Found invoice #' . $invoice->get_number());
+            wpinv_error_log('Payment status:' . $posted['transStatus']);
 
             // Update the transaction id.
-            if ( ! empty( $posted['transId'] ) ) {
-                $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
+            if (!empty($posted['transId'])) {
+                $invoice->set_transaction_id(wpinv_clean($posted['transId']));
             }
 
              // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
-                $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
+             if (!empty($posted['ipAddress'])) {
+                $invoice->set_ip(wpinv_clean($posted['ipAddress']));
             }
 
-            if ( $posted['transStatus'] == 'Y' ) {
-                $invoice->set_completed_date( date( 'Y-m-d H:i:s', $posted['transTime'] ) );
+            if ($posted['transStatus'] == 'Y') {
+                $invoice->set_completed_date(date('Y-m-d H:i:s', $posted['transTime']));
                 $invoice->mark_paid();
                 return;
             }
 
-            if ( $posted['transStatus'] == 'C' ) {
-                $invoice->set_status( 'wpi-failed' );
-                $invoice->add_note( __( 'Payment transaction failed while processing Worldpay payment.', 'invoicing' ), false, false, true );
+            if ($posted['transStatus'] == 'C') {
+                $invoice->set_status('wpi-failed');
+                $invoice->add_note(__('Payment transaction failed while processing Worldpay payment.', 'invoicing'), false, false, true);
                 $invoice->save();
                 return;
             }
 
-            wpinv_error_log( 'Aborting, Invalid transaction status:' . $posted['transStatus'] );
+            wpinv_error_log('Aborting, Invalid transaction status:' . $posted['transStatus']);
             $invoice->save();
 
         }
@@ -261,27 +261,27 @@ 
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Worldpay IPN response' );
+        wpinv_error_log('Validating Worldpay IPN response');
 
-        $data = wp_unslash( $_POST );
+        $data = wp_unslash($_POST);
 
         // Verify installation.
-        if ( empty( $data['instId'] ) || $data['instId'] != wpinv_clean( $this->get_option( 'instId', '' ) ) ) {
-            wpinv_error_log( 'Received invalid installation ID from Worldpay IPN' );
+        if (empty($data['instId']) || $data['instId'] != wpinv_clean($this->get_option('instId', ''))) {
+            wpinv_error_log('Received invalid installation ID from Worldpay IPN');
             return false;
         }
 
         // Verify invoice.
-        if ( empty( $data['cartId'] ) || !  wpinv_get_id_by_invoice_number( $data['cartId'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (empty($data['cartId']) || !wpinv_get_id_by_invoice_number($data['cartId'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
         
         // (maybe) verify password.
-        $password = $this->get_option( 'callback_password' );
+        $password = $this->get_option('callback_password');
 
-        if ( ! empty( $password ) && ( empty( $data['callbackPW'] ) || $password != $data['callbackPW'] ) ) {
-            wpinv_error_log( 'Received invalid invoice number from Worldpay IPN' );
+        if (!empty($password) && (empty($data['callbackPW']) || $password != $data['callbackPW'])) {
+            wpinv_error_log('Received invalid invoice number from Worldpay IPN');
             return false;
         }
 
@@ -292,10 +292,10 @@ 
     /**
      * Displays a notice on the checkout page if sandbox is enabled.
      */
-    public function sandbox_notice( $description, $gateway ) {
-        if ( 'worldpay' == $gateway && wpinv_is_test_mode( 'worldpay' ) ) {
+    public function sandbox_notice($description, $gateway) {
+        if ('worldpay' == $gateway && wpinv_is_test_mode('worldpay')) {
             $description .= '<br>' . sprintf(
-                __( 'SANDBOX ENABLED. See the %sWorldpay Sandbox Testing Guide%s for more details.', 'invoicing' ),
+                __('SANDBOX ENABLED. See the %sWorldpay Sandbox Testing Guide%s for more details.', 'invoicing'),
                 '<a href="https://developer.worldpay.com/docs/wpg/directintegration/abouttesting">',
                 '</a>'
             );
@@ -309,43 +309,43 @@ 
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['worldpay_active']['desc'] = $admin_settings['worldpay_active']['desc'] . " ($currencies)";
-        $admin_settings['worldpay_desc']['std']    = __( 'Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing' );
+        $admin_settings['worldpay_desc']['std']    = __('Pay securely via Worldpay using your PayPal account, credit or debit card.', 'invoicing');
 
         $admin_settings['worldpay_instId'] = array(
             'type' => 'text',
             'id'   => 'worldpay_instId',
-            'name' => __( 'Installation Id', 'invoicing' ),
-            'desc' => __( 'Your installation id. Ex: 211616', 'invoicing' ),
+            'name' => __('Installation Id', 'invoicing'),
+            'desc' => __('Your installation id. Ex: 211616', 'invoicing'),
         );
 
         $admin_settings['worldpay_md5_secret'] = array(
             'type' => 'text',
             'id'   => 'worldpay_md5_secret',
-            'name' => __( 'MD5 secret', 'invoicing' ),
-            'desc' => __( 'Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing' ) . '<code>instId:amount:currency:cartId</code>',
+            'name' => __('MD5 secret', 'invoicing'),
+            'desc' => __('Optionally enter your MD5 secret here. Next, open your installation settings and ensure that your SignatureFields parameter is set to ', 'invoicing') . '<code>instId:amount:currency:cartId</code>',
         );
 
         $admin_settings['worldpay_callbackPW'] = array(
             'type' => 'text',
             'id'   => 'worldpay_callbackPW',
-            'name' => __( 'Payment Response password', 'invoicing' ),
-            'desc' => __( 'Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing' ),
+            'name' => __('Payment Response password', 'invoicing'),
+            'desc' => __('Recommended. Enter your WorldPay response password to validate payment notifications.', 'invoicing'),
         );
 
         $admin_settings['worldpay_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'worldpay_ipn_url',
-            'name'     => __( 'Payment Response URL', 'invoicing' ),
+            'name'     => __('Payment Response URL', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( 'Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing' ),
+            'desc'     => __('Login to your Worldpay Merchant Interface then enable Payment Response & Shopper Response. Next, go to the Payment Response URL field and enter the above URL.', 'invoicing'),
             'custom'   => 'worldpay',
             'readonly' => true
         );

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

Spacing +63 added lines, -63 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -45,21 +45,21 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
+		add_filter('getpaid_get_email_merge_tags', array($this, 'subscription_merge_tags'), 10, 2);
+		foreach ($this->subscription_actions as $hook => $email_type) {
 
-			$email = new GetPaid_Notification_Email( $email_type );
+			$email = new GetPaid_Notification_Email($email_type);
 
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
+			if (method_exists($this, $email_type)) {
+				add_action($hook, array($this, $email_type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+			do_action('getpaid_subscription_notification_email_register_hook', $email_type, $hook);
 
 		}
 
@@ -71,12 +71,12 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
+	public function subscription_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			$merge_tags = array_merge(
 				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
+				$this->get_subscription_merge_tags($object)
 			);
 		}
 
@@ -90,25 +90,25 @@ 
 	 * @param WPInv_Subscription $subscription
 	 * @return array
 	 */
-	public function get_subscription_merge_tags( $subscription ) {
+	public function get_subscription_merge_tags($subscription) {
 
 		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 			return array();
 		}
 
-		$invoice    = $subscription->get_parent_invoice();
+		$invoice = $subscription->get_parent_invoice();
 		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+			'{subscription_renewal_date}'     => getpaid_format_date_value($subscription->get_next_renewal_date(), __('Never', 'invoicing')),
+			'{subscription_created}'          => getpaid_format_date_value($subscription->get_date_created()),
+			'{subscription_status}'           => sanitize_text_field($subscription->get_status_label()),
+			'{subscription_profile_id}'       => sanitize_text_field($subscription->get_profile_id()),
+			'{subscription_id}'               => absint($subscription->get_id()),
+			'{subscription_recurring_amount}' => sanitize_text_field(wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency())),
+			'{subscription_initial_amount}'   => sanitize_text_field(wpinv_price($subscription->get_initial_amount(), $invoice->get_currency())),
+			'{subscription_recurring_period}' => getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), ''),
 			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+			'{subscription_url}'              => esc_url($subscription->get_view_url()),
 		);
 
 	}
@@ -119,7 +119,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -129,14 +129,14 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
+	public function get_recipients($invoice) {
+		$recipients = array($invoice->get_email());
 
 		$cc = $invoice->get_email_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)) {
+			$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+			$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 		}
 
 		return $recipients;
@@ -150,45 +150,45 @@ 
 	 * @param string $type
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+	public function send_email($subscription, $email, $type, $extra_args = array()) {
 
 		// Abort in case the parent invoice does not exist.
 		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
+		if (!$this->should_send_notification($invoice)) {
 			return;
 		}
 
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_before_send_subscription_notification', $type, $subscription, $email);
 
-		$recipients  = $this->get_recipients( $invoice );
+		$recipients  = $this->get_recipients($invoice);
 		$mailer      = new GetPaid_Notification_Email_Sender();
 		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+		$content     = $email->get_content($merge_tags, $extra_args);
+		$subject     = $email->add_merge_tags($email->get_subject(), $merge_tags);
 		$attachments = $email->get_attachments();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+			apply_filters('getpaid_subscription_email_recipients', wpinv_parse_list($recipients), $email),
 			$subject,
 			$content,
 			$attachments
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+				$subject . __(' - ADMIN BCC COPY', 'invoicing'),
 				$content,
 				$attachments
 			);
 		}
 
-		if ( ! $result ) {
-			$subscription->get_parent_invoice()->add_note( sprintf( __( 'Failed sending %s notification email.', 'invoicing' ), sanitize_key( $type ) ), false, false, true );
+		if (!$result) {
+			$subscription->get_parent_invoice()->add_note(sprintf(__('Failed sending %s notification email.', 'invoicing'), sanitize_key($type)), false, false, true);
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -197,10 +197,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_trial( $subscription ) {
+	public function subscription_trial($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -209,10 +209,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_cancelled( $subscription ) {
+	public function subscription_cancelled($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -221,10 +221,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_expired( $subscription ) {
+	public function subscription_expired($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -233,10 +233,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_complete( $subscription ) {
+	public function subscription_complete($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -246,18 +246,18 @@ 
 	 */
 	public function renewal_reminder() {
 
-		$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;
 		}
 
 		// Fetch matching subscriptions.
-        $args  = array(
+        $args = array(
             'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
@@ -266,8 +266,8 @@ 
             ),
 		);
 
-		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'))));
 
 			$args['date_expires_query'][] = array(
 				'year'  => $date['year'],
@@ -277,14 +277,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions as $subscription ) {
+        foreach ($subscriptions as $subscription) {
 
 			// Skip packages.
-			if ( get_post_meta( $subscription->get_product_id(), '_wpinv_type', true ) != 'package' ) {
+			if (get_post_meta($subscription->get_product_id(), '_wpinv_type', true) != 'package') {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 
 		}

templates/emails/invoice-items.php

Spacing +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$column_count = count( $columns );
+$column_count = count($columns);
 ?>
 
-<?php do_action( 'wpinv_before_email_items', $invoice ); ?>
+<?php do_action('wpinv_before_email_items', $invoice); ?>
 
 
 <div id="wpinv-email-items">
 
     <h3 class="invoice-items-title">
-        <?php echo sprintf( esc_html__( '%s Items', 'invoicing' ), ucfirst( $invoice->get_invoice_quote_type() )); ?>
+        <?php echo sprintf(esc_html__('%s Items', 'invoicing'), ucfirst($invoice->get_invoice_quote_type())); ?>
     </h3>
 
     <table class="table table-bordered table-hover">
@@ -28,9 +28,9 @@ 
 
             <tr class="wpinv_cart_header_row">
 
-                <?php foreach ( $columns as $key => $label ) : ?>
-                    <th class="<?php echo 'name' == $key ? 'text-left' : 'text-right' ?> wpinv_cart_item_<?php echo sanitize_html_class( $key ); ?>">
-                        <?php echo sanitize_text_field( $label ); ?>
+                <?php foreach ($columns as $key => $label) : ?>
+                    <th class="<?php echo 'name' == $key ? 'text-left' : 'text-right' ?> wpinv_cart_item_<?php echo sanitize_html_class($key); ?>">
+                        <?php echo sanitize_text_field($label); ?>
                     </th>
                 <?php endforeach; ?>
 
@@ -43,13 +43,13 @@ 
             <?php
 
                 // Display the item totals.
-                foreach ( $invoice->get_items() as $item ) {
-                    wpinv_get_template( 'emails/invoice-item.php', compact( 'invoice', 'item', 'columns' ) );
+                foreach ($invoice->get_items() as $item) {
+                    wpinv_get_template('emails/invoice-item.php', compact('invoice', 'item', 'columns'));
                 }
 
                 // Display the fee totals.
-                foreach ( $invoice->get_fees() as $fee ) {
-                    wpinv_get_template( 'emails/fee-item.php', compact( 'invoice', 'fee', 'columns' ) );
+                foreach ($invoice->get_fees() as $fee) {
+                    wpinv_get_template('emails/fee-item.php', compact('invoice', 'fee', 'columns'));
                 }
 
             ?>
@@ -57,7 +57,7 @@ 
         </tbody>
 
         <tfoot>
-            <?php wpinv_get_template( 'emails/invoice-totals.php', compact( 'invoice', 'column_count' ) ); ?>
+            <?php wpinv_get_template('emails/invoice-totals.php', compact('invoice', 'column_count')); ?>
         </tfoot>
     
     </table>

templates/emails/invoice-details.php

Spacing +13 added lines, -13 removed lines

@@ -8,45 +8,45 @@ 
  * @var WPInv_Invoice $invoice
  * @var array $columns
  */
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$meta_data = getpaid_get_invoice_meta( $invoice );
+$meta_data = getpaid_get_invoice_meta($invoice);
 
-if ( isset( $meta_data['status'] ) ) {
+if (isset($meta_data['status'])) {
     $meta_data['status']['value'] = $invoice->get_status_nicename();
 }
 
-do_action( 'wpinv_email_before_invoice_details', $invoice, $sent_to_admin );
+do_action('wpinv_email_before_invoice_details', $invoice, $sent_to_admin);
 
 ?>
 
 <div id="wpinv-email-details">
 
     <h3 class="invoice-details-title">
-        <?php echo sprintf( esc_html__( '%s Details', 'invoicing' ), ucfirst( $invoice->get_invoice_quote_type() )); ?>
+        <?php echo sprintf(esc_html__('%s Details', 'invoicing'), ucfirst($invoice->get_invoice_quote_type())); ?>
     </h3>
 
     <table class="table table-bordered table-sm">
 
-        <?php foreach ( $meta_data as $key => $data ) : ?>
+        <?php foreach ($meta_data as $key => $data) : ?>
 
-            <?php if ( ! empty( $data['value'] ) ) : ?>
+            <?php if (!empty($data['value'])) : ?>
 
-                <?php do_action( "getpaid_before_email_details_$key", $invoice, $data ); ?>
+                <?php do_action("getpaid_before_email_details_$key", $invoice, $data); ?>
 
-                <tr class="getpaid-email-details-<?php echo sanitize_html_class( $key ); ?>">
+                <tr class="getpaid-email-details-<?php echo sanitize_html_class($key); ?>">
 
                     <td class="getpaid-lable-td">
-                        <?php echo sanitize_text_field( $data['label'] ); ?>
+                        <?php echo sanitize_text_field($data['label']); ?>
                     </td>
 
                     <td class="getpaid-value-td">
-                        <span class="getpaid-invoice-meta-<?php echo sanitize_html_class( $key ); ?>-value"><?php echo wp_kses_post( $data['value'] ); ?></span>
+                        <span class="getpaid-invoice-meta-<?php echo sanitize_html_class($key); ?>-value"><?php echo wp_kses_post($data['value']); ?></span>
                     </td>
 
                 </tr>
 
-                <?php do_action( "getpaid_after_email_details_$key", $invoice, $data ); ?>
+                <?php do_action("getpaid_after_email_details_$key", $invoice, $data); ?>
 
             <?php endif; ?>
 
@@ -56,4 +56,4 @@ 
 
 </div>
 
-<?php do_action( 'wpinv_email_after_invoice_details', $invoice, $sent_to_admin ); ?>
+<?php do_action('wpinv_email_after_invoice_details', $invoice, $sent_to_admin); ?>

templates/invoice/header-right-actions.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -21,43 +21,43 @@ 
             $actions[] = sprintf(
                 '<a href="javascript:void(0)" class="btn btn-sm m-1 d-inline-block btn-secondary invoice-action-print d-none d-lg-inline-block" onclick="window.print();">%s</a>',
                 sprintf(
-                    __( 'Print %s', 'invoicing' ),
-                    ucfirst( $invoice->get_invoice_quote_type() )
+                    __('Print %s', 'invoicing'),
+                    ucfirst($invoice->get_invoice_quote_type())
                 )
             );
 
-            if ( is_user_logged_in() ) {
+            if (is_user_logged_in()) {
 
                 $actions[] = sprintf(
                     '<a href="%s" class="btn btn-sm btn-secondary m-1 d-inline-block invoice-action-history">%s</a>',
-                    esc_url( wpinv_get_history_page_uri( $invoice->get_post_type() ) ),
+                    esc_url(wpinv_get_history_page_uri($invoice->get_post_type())),
                     sprintf(
-                        __( '%s History', 'invoicing' ),
-                        ucfirst( $invoice->get_invoice_quote_type() )
+                        __('%s History', 'invoicing'),
+                        ucfirst($invoice->get_invoice_quote_type())
                     )
                 );
 
             }
 
-            if ( wpinv_current_user_can_manage_invoicing() ) {
+            if (wpinv_current_user_can_manage_invoicing()) {
 
                 $actions[] = sprintf(
                     '<a href="%s" class="btn btn-sm btn-secondary m-1 d-inline-block invoice-action-edit">%s</a>',
-                    esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                    esc_url(get_edit_post_link($invoice->get_id())),
                     sprintf(
-                        __( 'Edit %s', 'invoicing' ),
-                        ucfirst( $invoice->get_invoice_quote_type() )
+                        __('Edit %s', 'invoicing'),
+                        ucfirst($invoice->get_invoice_quote_type())
                     )
                 );
 
             }
 
-            $actions = apply_filters( 'getpaid_invoice_header_right_actions_array', $actions, $invoice );
-            echo implode( '', $actions );
+            $actions = apply_filters('getpaid_invoice_header_right_actions_array', $actions, $invoice);
+            echo implode('', $actions);
 
         ?>
 
-        <?php do_action('wpinv_invoice_display_right_actions', $invoice ); ?>
+        <?php do_action('wpinv_invoice_display_right_actions', $invoice); ?>
     </div>
 
 <?php

templates/invoice/invoice-type.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 <h2 class="h3 text-dark">
-    <?php echo apply_filters( 'getpaid_invoice_type_label', ucfirst( $invoice->get_invoice_quote_type() ), $invoice ); ?>
+    <?php echo apply_filters('getpaid_invoice_type_label', ucfirst($invoice->get_invoice_quote_type()), $invoice); ?>
 </h2>
 
 <?php

includes/data-stores/class-getpaid-subscription-data-store.php

Spacing +37 added lines, -37 removed lines

@@ -4,7 +4,7 @@ 
  * GetPaid_Subscription_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -50,29 +50,29 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 */
-	public function create( &$subscription ) {
+	public function create(&$subscription) {
 		global $wpdb;
 
 		$values  = array();
 		$formats = array();
 
 		$fields = $this->database_fields_to_data_type;
-		unset( $fields['id'] );
+		unset($fields['id']);
 
-		foreach ( $fields as $key => $format ) {
+		foreach ($fields as $key => $format) {
 			$method       = "get_$key";
-			$values[$key] = $subscription->$method( 'edit' );
+			$values[$key] = $subscription->$method('edit');
 			$formats[]    = $format;
 		}
 
-		$result = $wpdb->insert( $wpdb->prefix . 'wpinv_subscriptions', $values, $formats );
+		$result = $wpdb->insert($wpdb->prefix . 'wpinv_subscriptions', $values, $formats);
 
-		if ( $result ) {
-			$subscription->set_id( $wpdb->insert_id );
+		if ($result) {
+			$subscription->set_id($wpdb->insert_id);
 			$subscription->apply_changes();
 			$subscription->clear_cache();
-			update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
-			do_action( 'getpaid_new_subscription', $subscription );
+			update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id());
+			do_action('getpaid_new_subscription', $subscription);
 			return true;
 		}
 
@@ -85,22 +85,22 @@ 
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 *
 	 */
-	public function read( &$subscription ) {
+	public function read(&$subscription) {
 		global $wpdb;
 
 		$subscription->set_defaults();
 
-		if ( ! $subscription->get_id() ) {
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
-			$subscription->set_id( 0 );
+		if (!$subscription->get_id()) {
+			$subscription->last_error = __('Invalid subscription ID.', 'invoicing');
+			$subscription->set_id(0);
 			return false;
 		}
 
 		// Maybe retrieve from the cache.
-		$raw_subscription = wp_cache_get( $subscription->get_id(), 'getpaid_subscriptions' );
+		$raw_subscription = wp_cache_get($subscription->get_id(), 'getpaid_subscriptions');
 
 		// If not found, retrieve from the db.
-		if ( false === $raw_subscription ) {
+		if (false === $raw_subscription) {
 
 			$raw_subscription = $wpdb->get_row(
 				$wpdb->prepare(
@@ -110,22 +110,22 @@ 
 			);
 
 			// Update the cache with our data
-			wp_cache_set( $subscription->get_id(), $raw_subscription, 'getpaid_subscriptions' );
+			wp_cache_set($subscription->get_id(), $raw_subscription, 'getpaid_subscriptions');
 
 		}
 
-		if ( ! $raw_subscription ) {
-			$subscription->last_error = __( 'Invalid subscription ID.', 'invoicing' );
+		if (!$raw_subscription) {
+			$subscription->last_error = __('Invalid subscription ID.', 'invoicing');
 			return false;
 		}
 
-		foreach ( array_keys( $this->database_fields_to_data_type ) as $key ) {
-			$method     = "set_$key";
-			$subscription->$method( $raw_subscription->$key );
+		foreach (array_keys($this->database_fields_to_data_type) as $key) {
+			$method = "set_$key";
+			$subscription->$method($raw_subscription->$key);
 		}
 
-		$subscription->set_object_read( true );
-		do_action( 'getpaid_read_subscription', $subscription );
+		$subscription->set_object_read(true);
+		do_action('getpaid_read_subscription', $subscription);
 
 	}
 
@@ -134,22 +134,22 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription Subscription object.
 	 */
-	public function update( &$subscription ) {
+	public function update(&$subscription) {
 		global $wpdb;
 
 		$changes = $subscription->get_changes();
 		$values  = array();
 		$formats = array();
 
-		foreach ( $this->database_fields_to_data_type as $key => $format ) {
-			if ( array_key_exists( $key, $changes ) ) {
+		foreach ($this->database_fields_to_data_type as $key => $format) {
+			if (array_key_exists($key, $changes)) {
 				$method       = "get_$key";
-				$values[$key] = $subscription->$method( 'edit' );
+				$values[$key] = $subscription->$method('edit');
 				$formats[]    = $format;
 			}
 		}
 
-		if ( empty( $values ) ) {
+		if (empty($values)) {
 			return;
 		}
 
@@ -169,11 +169,11 @@ 
 		// Delete cache.
 		$subscription->clear_cache();
 
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id() );
-		update_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id() );
+		update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id', $subscription->get_profile_id());
+		update_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id', $subscription->get_id());
 
 		// Fire a hook.
-		do_action( 'getpaid_update_subscription', $subscription );
+		do_action('getpaid_update_subscription', $subscription);
 
 	}
 
@@ -182,7 +182,7 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function delete( &$subscription ) {
+	public function delete(&$subscription) {
 		global $wpdb;
 
 		$wpdb->query(
@@ -193,16 +193,16 @@ 
 			)
 		);
 
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id' );
-		delete_post_meta( $subscription->get_parent_invoice_id(), '_wpinv_subscription_id' );
+		delete_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscr_profile_id');
+		delete_post_meta($subscription->get_parent_invoice_id(), '_wpinv_subscription_id');
 
 		// Delete cache.
 		$subscription->clear_cache();
 
 		// Fire a hook.
-		do_action( 'getpaid_delete_subscription', $subscription );
+		do_action('getpaid_delete_subscription', $subscription);
 
-		$subscription->set_id( 0 );
+		$subscription->set_id(0);
 	}
 
 	/*

includes/reports/class-getpaid-reports.php

Spacing +31 added lines, -31 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports Class.
@@ -17,11 +17,11 @@ 
 	 *
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_reports_page' ), 20 );
-		add_action( 'wpinv_reports_tab_reports', array( $this, 'display_reports_tab' ) );
-		add_action( 'wpinv_reports_tab_export', array( $this, 'display_exports_tab' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_graph', array( $this, 'download_graph' ) );
-		add_action( 'getpaid_authenticated_admin_action_export_invoices', array( $this, 'export_invoices' ) );
+		add_action('admin_menu', array($this, 'register_reports_page'), 20);
+		add_action('wpinv_reports_tab_reports', array($this, 'display_reports_tab'));
+		add_action('wpinv_reports_tab_export', array($this, 'display_exports_tab'));
+		add_action('getpaid_authenticated_admin_action_download_graph', array($this, 'download_graph'));
+		add_action('getpaid_authenticated_admin_action_export_invoices', array($this, 'export_invoices'));
 
 	}
 
@@ -33,11 +33,11 @@ 
 
 		add_submenu_page(
             'wpinv',
-            __( 'Reports', 'invoicing' ),
-            __( 'Reports', 'invoicing' ),
+            __('Reports', 'invoicing'),
+            __('Reports', 'invoicing'),
             wpinv_get_capability(),
             'wpinv-reports',
-            array( $this, 'display_reports_page' )
+            array($this, 'display_reports_page')
 		);
 
 	}
@@ -50,26 +50,26 @@ 
 
 		// Prepare variables.
 		$tabs        = $this->get_tabs();
-		$current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'reports';
-		$current_tab = array_key_exists( $current_tab, $tabs ) ? $current_tab : 'reports';
+		$current_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'reports';
+		$current_tab = array_key_exists($current_tab, $tabs) ? $current_tab : 'reports';
 
 		// Display the current tab.
 		?>
 
         <div class="wrap">
 
-			<h1><?php echo sanitize_text_field( $tabs[ $current_tab ] ); ?></h1>
+			<h1><?php echo sanitize_text_field($tabs[$current_tab]); ?></h1>
 
 			<nav class="nav-tab-wrapper">
 
 				<?php
-					foreach( $tabs as $key => $label ) {
+					foreach ($tabs as $key => $label) {
 
-						$key   = sanitize_text_field( $key );
-						$label = sanitize_text_field( $label );
+						$key   = sanitize_text_field($key);
+						$label = sanitize_text_field($label);
 						$class = $key == $current_tab ? 'nav-tab nav-tab-active' : 'nav-tab';
 						$url   = esc_url(
-							add_query_arg( 'tab', $key, admin_url( 'admin.php?page=wpinv-reports' ) )
+							add_query_arg('tab', $key, admin_url('admin.php?page=wpinv-reports'))
 						);
 
 						echo "\n\t\t\t<a href='$url' class='$class'>$label</a>";
@@ -79,18 +79,18 @@ 
 
 			</nav>
 
-			<div class="bsui <?php echo esc_attr( $current_tab ); ?>">
-				<?php do_action( "wpinv_reports_tab_{$current_tab}" ); ?>
+			<div class="bsui <?php echo esc_attr($current_tab); ?>">
+				<?php do_action("wpinv_reports_tab_{$current_tab}"); ?>
 			</div>
 
         </div>
 		<?php
 
 			// Wordfence loads an unsupported version of chart js on our page.
-			wp_deregister_style( 'chart-js' );
-			wp_deregister_script( 'chart-js' );
-			wp_enqueue_script( 'chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array( 'jquery' ), '2.9.4', true );
-			wp_enqueue_style( 'chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4' );
+			wp_deregister_style('chart-js');
+			wp_deregister_script('chart-js');
+			wp_enqueue_script('chart-js', WPINV_PLUGIN_URL . 'assets/js/chart.bundle.min.js', array('jquery'), '2.9.4', true);
+			wp_enqueue_style('chart-js', WPINV_PLUGIN_URL . 'assets/css/chart.min.css', array(), '2.9.4');
 
 	}
 
@@ -102,11 +102,11 @@ 
 	public function get_tabs() {
 
 		$tabs = array(
-			'reports' => __( 'Reports', 'invoicing' ),
-			'export'  => __( 'Export', 'invoicing' ),
+			'reports' => __('Reports', 'invoicing'),
+			'export'  => __('Export', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_report_tabs', $tabs );
+		return apply_filters('getpaid_report_tabs', $tabs);
 	}
 
 	/**
@@ -136,11 +136,11 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function download_graph( $args ) {
+	public function download_graph($args) {
 
-		if ( ! empty( $args['graph'] ) ) {
+		if (!empty($args['graph'])) {
 			$downloader = new GetPaid_Graph_Downloader();
-			$downloader->download( $args['graph'] );
+			$downloader->download($args['graph']);
 		}
 
 	}
@@ -150,11 +150,11 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function export_invoices( $args ) {
+	public function export_invoices($args) {
 
-		if ( ! empty( $args['post_type'] ) ) {
+		if (!empty($args['post_type'])) {
 			$downloader = new GetPaid_Invoice_Exporter();
-			$downloader->export( $args['post_type'], $args );
+			$downloader->export($args['post_type'], $args);
 		}
 
 	}