AyeCode / invoicing

includes/wpinv-email-functions.php

Indentation +3 added lines, -3 removed lines

@@ -109,8 +109,8 @@ 
     $css = getpaid_get_email_css();
 
     // include css inliner
-	if ( ! class_exists( 'Emogrifier' ) ) {
-		include_once WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php';
+    if ( ! class_exists( 'Emogrifier' ) ) {
+        include_once WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php';
     }
 
     // Inline the css.
@@ -189,7 +189,7 @@ 
     $message = wpinv_email_style_body( $message );
     $to      = array_merge( wpinv_parse_list( $to ), wpinv_parse_list( $cc ) );
 
-	return $mailer->send(
+    return $mailer->send(
         $to,
         $subject,
         $message,

Spacing +124 added lines, -124 removed lines

@@ -6,7 +6,7 @@ 
  * Please use GetPaid_Notification_Email_Sender
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /*
 |--------------------------------------------------------------------------
@@ -17,19 +17,19 @@ 
 /**
  * Generates the email header.
  */
-function wpinv_email_header( $email_heading ) {
-    wpinv_get_template( 'emails/wpinv-email-header.php', compact( 'email_heading' ) );
+function wpinv_email_header($email_heading) {
+    wpinv_get_template('emails/wpinv-email-header.php', compact('email_heading'));
 }
-add_action( 'wpinv_email_header', 'wpinv_email_header' );
+add_action('wpinv_email_header', 'wpinv_email_header');
 
 
 /**
  * Generates the email footer.
  */
 function wpinv_email_footer() {
-    wpinv_get_template( 'emails/wpinv-email-footer.php' );
+    wpinv_get_template('emails/wpinv-email-footer.php');
 }
-add_action( 'wpinv_email_footer', 'wpinv_email_footer' );
+add_action('wpinv_email_footer', 'wpinv_email_footer');
 
 
 /**
@@ -39,13 +39,13 @@ 
  * @param string $email_type
  * @param bool $sent_to_admin
  */
-function wpinv_email_invoice_details( $invoice, $email_type, $sent_to_admin ) {
+function wpinv_email_invoice_details($invoice, $email_type, $sent_to_admin) {
 
-    $args = compact( 'invoice', 'email_type', 'sent_to_admin' );
-    wpinv_get_template( 'emails/invoice-details.php', $args );
+    $args = compact('invoice', 'email_type', 'sent_to_admin');
+    wpinv_get_template('emails/invoice-details.php', $args);
 
 }
-add_action( 'wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3 );
+add_action('wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3);
 
 /**
  * Display line items in emails.
@@ -54,17 +54,17 @@ 
  * @param string $email_type
  * @param bool $sent_to_admin
  */
-function wpinv_email_invoice_items( $invoice, $email_type, $sent_to_admin ) {
+function wpinv_email_invoice_items($invoice, $email_type, $sent_to_admin) {
 
     // Prepare line items.
-    $columns = getpaid_invoice_item_columns( $invoice );
-    $columns = apply_filters( 'getpaid_invoice_line_items_table_columns', $columns, $invoice );
+    $columns = getpaid_invoice_item_columns($invoice);
+    $columns = apply_filters('getpaid_invoice_line_items_table_columns', $columns, $invoice);
 
     // Load the template.
-    wpinv_get_template( 'emails/invoice-items.php', compact( 'invoice', 'columns', 'email_type', 'sent_to_admin' ) );
+    wpinv_get_template('emails/invoice-items.php', compact('invoice', 'columns', 'email_type', 'sent_to_admin'));
 
 }
-add_action( 'wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3 );
+add_action('wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3);
 
 
 /**
@@ -74,13 +74,13 @@ 
  * @param string $email_type
  * @param bool $sent_to_admin
  */
-function wpinv_email_billing_details( $invoice, $email_type, $sent_to_admin ) {
+function wpinv_email_billing_details($invoice, $email_type, $sent_to_admin) {
 
-    $args = compact( 'invoice', 'email_type', 'sent_to_admin' );
-    wpinv_get_template( 'emails/wpinv-email-billing-details.php', $args );
+    $args = compact('invoice', 'email_type', 'sent_to_admin');
+    wpinv_get_template('emails/wpinv-email-billing-details.php', $args);
 
 }
-add_action( 'wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3 );
+add_action('wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3);
 
 /**
  * Returns email css.
@@ -88,8 +88,8 @@ 
  */
 function getpaid_get_email_css() {
 
-    $css = wpinv_get_template_html( 'emails/wpinv-email-styles.php' );
-    return apply_filters( 'wpinv_email_styles', $css );
+    $css = wpinv_get_template_html('emails/wpinv-email-styles.php');
+    return apply_filters('wpinv_email_styles', $css);
 
 }
 
@@ -100,26 +100,26 @@ 
  * @return string
  *
  */
-function wpinv_email_style_body( $content ) {
+function wpinv_email_style_body($content) {
 
-    if ( ! class_exists( 'DOMDocument' ) ) {
+    if (!class_exists('DOMDocument')) {
         return $content;
     }
 
     $css = getpaid_get_email_css();
 
     // include css inliner
-	if ( ! class_exists( 'Emogrifier' ) ) {
+	if (!class_exists('Emogrifier')) {
 		include_once WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php';
     }
 
     // Inline the css.
     try {
-        $emogrifier = new Emogrifier( $content, $css );
+        $emogrifier = new Emogrifier($content, $css);
         $_content   = $emogrifier->emogrify();
         $content    = $_content;
-    } catch ( Exception $e ) {
-        wpinv_error_log( $e->getMessage(), 'emogrifier' );
+    } catch (Exception $e) {
+        wpinv_error_log($e->getMessage(), 'emogrifier');
     }
 
     return $content;
@@ -128,37 +128,37 @@ 
 
 // Backwards compatibility.
 function wpinv_init_transactional_emails() {
-    foreach ( apply_filters( 'wpinv_email_actions', array() ) as $action ) {
-        add_action( $action, 'wpinv_send_transactional_email', 10, 10 );
+    foreach (apply_filters('wpinv_email_actions', array()) as $action) {
+        add_action($action, 'wpinv_send_transactional_email', 10, 10);
     }
 }
-add_action( 'init', 'wpinv_init_transactional_emails' );
+add_action('init', 'wpinv_init_transactional_emails');
 
 function wpinv_send_transactional_email() {
     $args       = func_get_args();
     $function   = current_filter() . '_notification';
-    do_action_ref_array( $function, $args );
+    do_action_ref_array($function, $args);
 }
 
 function wpinv_mail_get_from_address() {
-    $from_address = apply_filters( 'wpinv_mail_from_address', wpinv_get_option( 'email_from', get_option( 'admin_email' ) ) );
-    return sanitize_email( $from_address );
+    $from_address = apply_filters('wpinv_mail_from_address', wpinv_get_option('email_from', get_option('admin_email')));
+    return sanitize_email($from_address);
 }
 
 function wpinv_mail_get_from_name() {
-    $from_name = apply_filters( 'wpinv_mail_from_name', wpinv_get_option( 'email_from_name', get_bloginfo( 'name', 'display' ) ) );
-    return wp_specialchars_decode( esc_html( $from_name ), ENT_QUOTES );
+    $from_name = apply_filters('wpinv_mail_from_name', wpinv_get_option('email_from_name', get_bloginfo('name', 'display')));
+    return wp_specialchars_decode(esc_html($from_name), ENT_QUOTES);
 }
 
-function wpinv_mail_admin_bcc_active( $mail_type = '' ) {
-    $active = apply_filters( 'wpinv_mail_admin_bcc_active', wpinv_get_option( 'email_' . $mail_type . '_admin_bcc' ) );
-    return ( $active ? true : false );
+function wpinv_mail_admin_bcc_active($mail_type = '') {
+    $active = apply_filters('wpinv_mail_admin_bcc_active', wpinv_get_option('email_' . $mail_type . '_admin_bcc'));
+    return ($active ? true : false);
 }
 
-function wpinv_mail_get_content_type( $content_type = 'text/html', $email_type = 'html' ) {
-    $email_type = apply_filters( 'wpinv_mail_content_type', $email_type );
+function wpinv_mail_get_content_type($content_type = 'text/html', $email_type = 'html') {
+    $email_type = apply_filters('wpinv_mail_content_type', $email_type);
 
-    switch ( $email_type ) {
+    switch ($email_type) {
         case 'html':
             $content_type = 'text/html';
             break;
@@ -183,11 +183,11 @@ 
  * @param array        $attachments Any files to attach to the email.
  * @param string|array $cc An email or array of extra emails to send a copy of the email to.
  */
-function wpinv_mail_send( $to, $subject, $message, $deprecated, $attachments = array(), $cc = array() ) {
+function wpinv_mail_send($to, $subject, $message, $deprecated, $attachments = array(), $cc = array()) {
 
     $mailer  = new GetPaid_Notification_Email_Sender();
-    $message = wpinv_email_style_body( $message );
-    $to      = array_merge( wpinv_parse_list( $to ), wpinv_parse_list( $cc ) );
+    $message = wpinv_email_style_body($message);
+    $to      = array_merge(wpinv_parse_list($to), wpinv_parse_list($cc));
 
 	return $mailer->send(
         $to,
@@ -204,7 +204,7 @@ 
  * @return array
  */
 function wpinv_get_emails() {
-    return apply_filters( 'wpinv_get_emails', wpinv_get_data( 'email-settings' ) );
+    return apply_filters('wpinv_get_emails', wpinv_get_data('email-settings'));
 }
 
 /**
@@ -213,172 +213,172 @@ 
  * @param array $settings
  * @return array
  */
-function wpinv_settings_emails( $settings = array() ) {
-    $settings = array_merge( $settings, wpinv_get_emails() );
-    return apply_filters( 'wpinv_settings_get_emails', $settings );
+function wpinv_settings_emails($settings = array()) {
+    $settings = array_merge($settings, wpinv_get_emails());
+    return apply_filters('wpinv_settings_get_emails', $settings);
 }
-add_filter( 'wpinv_settings_emails', 'wpinv_settings_emails', 10, 1 );
+add_filter('wpinv_settings_emails', 'wpinv_settings_emails', 10, 1);
 
 /**
  * Filter email section names.
  *
  */
-function wpinv_settings_sections_emails( $settings ) {
-    foreach ( wpinv_get_emails() as $key => $email ) {
-        $settings[ $key ] = ! empty( $email[ 'email_' . $key . '_header' ]['name'] ) ? strip_tags( $email[ 'email_' . $key . '_header' ]['name'] ) : strip_tags( $key );
+function wpinv_settings_sections_emails($settings) {
+    foreach (wpinv_get_emails() as $key => $email) {
+        $settings[$key] = !empty($email['email_' . $key . '_header']['name']) ? strip_tags($email['email_' . $key . '_header']['name']) : strip_tags($key);
     }
 
     return $settings;
 }
-add_filter( 'wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1 );
+add_filter('wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1);
 
-function wpinv_email_is_enabled( $email_type ) {
+function wpinv_email_is_enabled($email_type) {
     $emails = wpinv_get_emails();
-    $enabled = isset( $emails[ $email_type ] ) && wpinv_get_option( 'email_' . $email_type . '_active', 0 ) ? true : false;
+    $enabled = isset($emails[$email_type]) && wpinv_get_option('email_' . $email_type . '_active', 0) ? true : false;
 
-    return apply_filters( 'wpinv_email_is_enabled', $enabled, $email_type );
+    return apply_filters('wpinv_email_is_enabled', $enabled, $email_type);
 }
 
-function wpinv_email_get_recipient( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    switch ( $email_type ) {
+function wpinv_email_get_recipient($email_type = '', $invoice_id = 0, $invoice = array()) {
+    switch ($email_type) {
         case 'new_invoice':
         case 'cancelled_invoice':
         case 'failed_invoice':
             $recipient  = wpinv_get_admin_email();
             break;
         default:
-            $invoice    = ! empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : null );
-            $recipient  = ! empty( $invoice ) ? $invoice->get_email() : '';
+            $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : null);
+            $recipient  = !empty($invoice) ? $invoice->get_email() : '';
             break;
     }
 
-    return apply_filters( 'wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice);
 }
 
 /**
  * Returns invoice CC recipients
  */
-function wpinv_email_get_cc_recipients( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    switch ( $email_type ) {
+function wpinv_email_get_cc_recipients($email_type = '', $invoice_id = 0, $invoice = array()) {
+    switch ($email_type) {
         case 'new_invoice':
         case 'cancelled_invoice':
         case 'failed_invoice':
             return array();
         break;
         default:
-            $invoice    = ! empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : null );
-            $recipient  = empty( $invoice ) ? '' : get_post_meta( $invoice->ID, 'wpinv_email_cc', true );
-            if ( empty( $recipient ) ) {
+            $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : null);
+            $recipient  = empty($invoice) ? '' : get_post_meta($invoice->ID, 'wpinv_email_cc', true);
+            if (empty($recipient)) {
                 return array();
             }
-            return array_filter( array_map( 'trim', explode( ',', $recipient ) ) );
+            return array_filter(array_map('trim', explode(',', $recipient)));
         break;
     }
 
 }
 
-function wpinv_email_get_subject( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $subject    = wpinv_get_option( 'email_' . $email_type . '_subject' );
-    $subject    = __( $subject, 'invoicing' );
+function wpinv_email_get_subject($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $subject    = wpinv_get_option('email_' . $email_type . '_subject');
+    $subject    = __($subject, 'invoicing');
 
-    $subject    = wpinv_email_format_text( $subject, $invoice );
+    $subject    = wpinv_email_format_text($subject, $invoice);
 
-    return apply_filters( 'wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_heading( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $email_heading = wpinv_get_option( 'email_' . $email_type . '_heading' );
-    $email_heading = __( $email_heading, 'invoicing' );
+function wpinv_email_get_heading($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $email_heading = wpinv_get_option('email_' . $email_type . '_heading');
+    $email_heading = __($email_heading, 'invoicing');
 
-    $email_heading = wpinv_email_format_text( $email_heading, $invoice );
+    $email_heading = wpinv_email_format_text($email_heading, $invoice);
 
-    return apply_filters( 'wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_content( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $content    = wpinv_get_option( 'email_' . $email_type . '_body' );
-    $content    = __( $content, 'invoicing' );
+function wpinv_email_get_content($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $content    = wpinv_get_option('email_' . $email_type . '_body');
+    $content    = __($content, 'invoicing');
 
-    $content    = wpinv_email_format_text( $content, $invoice );
+    $content    = wpinv_email_format_text($content, $invoice);
 
-    return apply_filters( 'wpinv_email_content', $content, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_content', $content, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_headers( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_headers($email_type = '', $invoice_id = 0, $invoice = array()) {
     $from_name = wpinv_mail_get_from_address();
     $from_email = wpinv_mail_get_from_address();
 
-    $invoice    = ! empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : null );
+    $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : null);
 
-    $headers    = 'From: ' . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
+    $headers    = 'From: ' . stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8')) . " <$from_email>\r\n";
     $headers    .= 'Reply-To: ' . $from_email . "\r\n";
     $headers    .= 'Content-Type: ' . wpinv_mail_get_content_type() . "\r\n";
 
-    return apply_filters( 'wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_attachments( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_attachments($email_type = '', $invoice_id = 0, $invoice = array()) {
     $attachments = array();
 
-    return apply_filters( 'wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice);
 }
 
 /**
  * Searches for and replaces certain placeholders in an email.
  */
-function wpinv_email_format_text( $content, $invoice ) {
+function wpinv_email_format_text($content, $invoice) {
 
     $replace_array = array(
         '{site_title}' => wpinv_get_blogname(),
-        '{date}'       => getpaid_format_date( current_time( 'mysql' ) ),
+        '{date}'       => getpaid_format_date(current_time('mysql')),
     );
 
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( $invoice->get_id() ) {
+    if ($invoice->get_id()) {
 
         $replace_array = array_merge(
             $replace_array,
             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_total}'    => sanitize_text_field( wpinv_price( $invoice->get_total( true ), $invoice->get_currency() ) ),
-                '{invoice_link}'     => esc_url( $invoice->get_view_url() ),
-                '{invoice_pay_link}' => esc_url( $invoice->get_checkout_payment_url() ),
-                '{invoice_date}'     => date( get_option( 'date_format' ), strtotime( $invoice->get_date_created(), current_time( 'timestamp' ) ) ),
-                '{invoice_due_date}' => date( get_option( 'date_format' ), strtotime( $invoice->get_due_date(), current_time( 'timestamp' ) ) ),
-                '{invoice_quote}'    => sanitize_text_field( $invoice->get_invoice_quote_type() ),
-                '{invoice_label}'    => sanitize_text_field( ucfirst( $invoice->get_invoice_quote_type() ) ),
-                '{is_was}'           => strtotime( $invoice->get_due_date() ) < current_time( 'timestamp' ) ? __( '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_total}'    => sanitize_text_field(wpinv_price($invoice->get_total(true), $invoice->get_currency())),
+                '{invoice_link}'     => esc_url($invoice->get_view_url()),
+                '{invoice_pay_link}' => esc_url($invoice->get_checkout_payment_url()),
+                '{invoice_date}'     => date(get_option('date_format'), strtotime($invoice->get_date_created(), current_time('timestamp'))),
+                '{invoice_due_date}' => date(get_option('date_format'), strtotime($invoice->get_due_date(), current_time('timestamp'))),
+                '{invoice_quote}'    => sanitize_text_field($invoice->get_invoice_quote_type()),
+                '{invoice_label}'    => sanitize_text_field(ucfirst($invoice->get_invoice_quote_type())),
+                '{is_was}'           => strtotime($invoice->get_due_date()) < current_time('timestamp') ? __('was', 'invoicing') : __('is', 'invoicing'),
             )
         );
 
     }
 
     // Let third party plugins filter the arra.
-    $replace_array = apply_filters( 'wpinv_email_format_text', $replace_array, $content, $invoice );
+    $replace_array = apply_filters('wpinv_email_format_text', $replace_array, $content, $invoice);
 
-    foreach ( $replace_array as $key => $value ) {
-        $content = str_replace( $key, $value, $content );
+    foreach ($replace_array as $key => $value) {
+        $content = str_replace($key, $value, $content);
     }
 
-    return apply_filters( 'wpinv_email_content_replace', $content );
+    return apply_filters('wpinv_email_content_replace', $content);
 }
 
 
-function wpinv_email_wrap_message( $message ) {
+function wpinv_email_wrap_message($message) {
     // Buffer
     ob_start();
 
-    do_action( 'wpinv_email_header' );
+    do_action('wpinv_email_header');
 
-    echo wp_kses_post( wpautop( wptexturize( $message ) ) );
+    echo wp_kses_post(wpautop(wptexturize($message)));
 
-    do_action( 'wpinv_email_footer' );
+    do_action('wpinv_email_footer');
 
     // Get contents
     $message = ob_get_clean();
@@ -386,21 +386,21 @@ 
     return $message;
 }
 
-function wpinv_add_notes_to_invoice_email( $invoice, $email_type ) {
-    if ( ! empty( $invoice ) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes( $invoice->get_id(), true ) ) {
-        $date_format = get_option( 'date_format' );
-        $time_format = get_option( 'time_format' );
+function wpinv_add_notes_to_invoice_email($invoice, $email_type) {
+    if (!empty($invoice) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes($invoice->get_id(), true)) {
+        $date_format = get_option('date_format');
+        $time_format = get_option('time_format');
         ?>
         <div id="wpinv-email-notes">
-            <h3 class="wpinv-notes-t"><?php echo esc_html( apply_filters( 'wpinv_email_invoice_notes_title', __( 'Invoice Notes', 'invoicing' ) ) ); ?></h3>
+            <h3 class="wpinv-notes-t"><?php echo esc_html(apply_filters('wpinv_email_invoice_notes_title', __('Invoice Notes', 'invoicing'))); ?></h3>
             <ol class="wpinv-notes-lists">
         <?php
-        foreach ( $invoice_notes as $note ) {
-            $note_time = strtotime( $note->comment_date );
+        foreach ($invoice_notes as $note) {
+            $note_time = strtotime($note->comment_date);
             ?>
             <li class="comment wpinv-note">
-            <p class="wpinv-note-date meta"><?php printf( esc_html__( '%2$s at %3$s', 'invoicing' ), esc_html( $note->comment_author ), esc_html( date_i18n( $date_format, $note_time ) ), esc_html( date_i18n( $time_format, $note_time ) ), esc_html( $note_time ) ); ?></p>
-            <div class="wpinv-note-desc description"><?php echo wp_kses_post( wpautop( wptexturize( $note->comment_content ) ) ); ?></div>
+            <p class="wpinv-note-date meta"><?php printf(esc_html__('%2$s at %3$s', 'invoicing'), esc_html($note->comment_author), esc_html(date_i18n($date_format, $note_time)), esc_html(date_i18n($time_format, $note_time)), esc_html($note_time)); ?></p>
+            <div class="wpinv-note-desc description"><?php echo wp_kses_post(wpautop(wptexturize($note->comment_content))); ?></div>
             </li>
             <?php
         }
@@ -410,4 +410,4 @@ 
         <?php
     }
 }
-add_action( 'wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3 );
+add_action('wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3);

includes/class-wpinv-notes.php

Indentation +191 added lines, -191 removed lines

@@ -12,207 +12,207 @@
  */
 class WPInv_Notes {
 
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-
-		// Filter inovice notes.
-		add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
-		add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
-
-		// Delete comments count cache whenever there is a new comment or a comment status changes.
-		add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-		add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
-
-		// Count comments.
-		add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 100, 2 );
-
-		// Fires after notes are loaded.
-		do_action( 'wpinv_notes_init', $this );
-	}
-
-	/**
-	 * Filters invoice notes query to only include our notes.
-	 *
-	 * @param WP_Comment_Query $query
-	 */
-	public function set_invoice_note_type( $query ) {
-		$post_id = ! empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
-
-		if ( $post_id && getpaid_is_invoice_post_type( get_post_type( $post_id ) ) ) {
-			$query->query_vars['type'] = 'wpinv_note';
-		} else {
-
-			if ( empty( $query->query_vars['type__not_in'] ) ) {
-				$query->query_vars['type__not_in'] = array();
-			}
-
-			$query->query_vars['type__not_in'] = wpinv_parse_list( $query->query_vars['type__not_in'] );
-			$query->query_vars['type__not_in'] = array_merge( array( 'wpinv_note' ), $query->query_vars['type__not_in'] );
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Exclude notes from the comments feed.
-	 */
-	function wpinv_comment_feed_where( $where ) {
-		return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
-	}
-
-	/**
-	 * Delete comments count cache whenever there is
-	 * new comment or the status of a comment changes. Cache
-	 * will be regenerated next time WPInv_Notes::wp_count_comments()
-	 * is called.
-	 */
-	public function delete_comments_count_cache() {
-		delete_transient( 'getpaid_count_comments' );
-	}
-
-	/**
-	 * Remove invoice notes from wp_count_comments().
-	 *
-	 * @since  2.2
-	 * @param  object $stats   Comment stats.
-	 * @param  int    $post_id Post ID.
-	 * @return object
-	 */
-	public function wp_count_comments( $stats, $post_id ) {
-		global $wpdb;
-
-		if ( empty( $post_id ) ) {
-			$stats = get_transient( 'getpaid_count_comments' );
-
-			if ( ! $stats ) {
-				$stats = array(
-					'total_comments' => 0,
-					'all'            => 0,
-				);
-
-				$count = $wpdb->get_results(
-					"
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+
+        // Filter inovice notes.
+        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
+
+        // Delete comments count cache whenever there is a new comment or a comment status changes.
+        add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
+        add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+
+        // Count comments.
+        add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 100, 2 );
+
+        // Fires after notes are loaded.
+        do_action( 'wpinv_notes_init', $this );
+    }
+
+    /**
+     * Filters invoice notes query to only include our notes.
+     *
+     * @param WP_Comment_Query $query
+     */
+    public function set_invoice_note_type( $query ) {
+        $post_id = ! empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+
+        if ( $post_id && getpaid_is_invoice_post_type( get_post_type( $post_id ) ) ) {
+            $query->query_vars['type'] = 'wpinv_note';
+        } else {
+
+            if ( empty( $query->query_vars['type__not_in'] ) ) {
+                $query->query_vars['type__not_in'] = array();
+            }
+
+            $query->query_vars['type__not_in'] = wpinv_parse_list( $query->query_vars['type__not_in'] );
+            $query->query_vars['type__not_in'] = array_merge( array( 'wpinv_note' ), $query->query_vars['type__not_in'] );
+        }
+
+        return $query;
+    }
+
+    /**
+     * Exclude notes from the comments feed.
+     */
+    function wpinv_comment_feed_where( $where ) {
+        return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
+    }
+
+    /**
+     * Delete comments count cache whenever there is
+     * new comment or the status of a comment changes. Cache
+     * will be regenerated next time WPInv_Notes::wp_count_comments()
+     * is called.
+     */
+    public function delete_comments_count_cache() {
+        delete_transient( 'getpaid_count_comments' );
+    }
+
+    /**
+     * Remove invoice notes from wp_count_comments().
+     *
+     * @since  2.2
+     * @param  object $stats   Comment stats.
+     * @param  int    $post_id Post ID.
+     * @return object
+     */
+    public function wp_count_comments( $stats, $post_id ) {
+        global $wpdb;
+
+        if ( empty( $post_id ) ) {
+            $stats = get_transient( 'getpaid_count_comments' );
+
+            if ( ! $stats ) {
+                $stats = array(
+                    'total_comments' => 0,
+                    'all'            => 0,
+                );
+
+                $count = $wpdb->get_results(
+                    "
 					SELECT comment_approved, COUNT(*) AS num_comments
 					FROM {$wpdb->comments}
 					WHERE comment_type NOT IN ('action_log', 'order_note', 'webhook_delivery', 'wpinv_note')
 					GROUP BY comment_approved
 					",
-					ARRAY_A
-				);
-
-				$approved = array(
-					'0'            => 'moderated',
-					'1'            => 'approved',
-					'spam'         => 'spam',
-					'trash'        => 'trash',
-					'post-trashed' => 'post-trashed',
-				);
-
-				foreach ( (array) $count as $row ) {
-					// Don't count post-trashed toward totals.
-					if ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash', 'spam' ), true ) ) {
-						$stats['all']            += $row['num_comments'];
-						$stats['total_comments'] += $row['num_comments'];
-					} elseif ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash' ), true ) ) {
-						$stats['total_comments'] += $row['num_comments'];
-					}
-					if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-						$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
-					}
-				}
-
-				foreach ( $approved as $key ) {
-					if ( empty( $stats[ $key ] ) ) {
-						$stats[ $key ] = 0;
-					}
-				}
-
-				$stats = (object) $stats;
-				set_transient( 'getpaid_count_comments', $stats );
-			}
+                    ARRAY_A
+                );
+
+                $approved = array(
+                    '0'            => 'moderated',
+                    '1'            => 'approved',
+                    'spam'         => 'spam',
+                    'trash'        => 'trash',
+                    'post-trashed' => 'post-trashed',
+                );
+
+                foreach ( (array) $count as $row ) {
+                    // Don't count post-trashed toward totals.
+                    if ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash', 'spam' ), true ) ) {
+                        $stats['all']            += $row['num_comments'];
+                        $stats['total_comments'] += $row['num_comments'];
+                    } elseif ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash' ), true ) ) {
+                        $stats['total_comments'] += $row['num_comments'];
+                    }
+                    if ( isset( $approved[ $row['comment_approved'] ] ) ) {
+                        $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                    }
+                }
+
+                foreach ( $approved as $key ) {
+                    if ( empty( $stats[ $key ] ) ) {
+                        $stats[ $key ] = 0;
+                    }
+                }
+
+                $stats = (object) $stats;
+                set_transient( 'getpaid_count_comments', $stats );
+            }
 }
 
-		return $stats;
-	}
-
-	/**
-	 * Returns an array of invoice notes.
-	 *
-	 * @param int $invoice_id The invoice ID whose notes to retrieve.
-	 * @param string $type Optional. Pass in customer to only return customer notes.
-	 * @return WP_Comment[]
-	 */
-	public function get_invoice_notes( $invoice_id = 0, $type = 'all' ) {
-
-		// Default comment args.
-		$args = array(
-			'post_id' => $invoice_id,
-			'orderby' => 'comment_ID',
-			'order'   => 'ASC',
-		);
-
-		// Maybe only show customer comments.
-		if ( $type == 'customer' ) {
-			$args['meta_key']   = '_wpi_customer_note';
-			$args['meta_value'] = 1;
-		}
-
-		$args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
-
-		return get_comments( $args );
-	}
-
-	/**
-	 * Saves an invoice comment.
-	 *
-	 * @param WPInv_Invoice $invoice The invoice to add the comment to.
-	 * @param string $note The note content.
-	 * @param string $note_author The name of the author of the note.
-	 * @param bool $for_customer Whether or not this comment is meant to be sent to the customer.
-	 * @return int|false The new note's ID on success, false on failure.
-	 */
-	function add_invoice_note( $invoice, $note, $note_author, $author_email, $for_customer = false ) {
-
-		do_action( 'wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer );
-
-		/**
-		 * Insert the comment.
-		 */
-		$note_id = wp_insert_comment(
-			wp_filter_comment(
-				array(
-					'comment_post_ID'      => $invoice->get_id(),
-					'comment_content'      => $note,
-					'comment_agent'        => 'Invoicing',
-					'user_id'              => get_current_user_id(),
-					'comment_author'       => $note_author,
-					'comment_author_IP'    => wpinv_get_ip(),
-					'comment_author_email' => $author_email,
-					'comment_author_url'   => $invoice->get_view_url(),
-					'comment_type'         => 'wpinv_note',
-				)
-			)
-		);
-
-		do_action( 'wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer );
-
-		// Are we notifying the customer?
-		if ( empty( $note_id ) || empty( $for_customer ) ) {
-			return $note_id;
-		}
-
-		add_comment_meta( $note_id, '_wpi_customer_note', 1 );
-		do_action(
+        return $stats;
+    }
+
+    /**
+     * Returns an array of invoice notes.
+     *
+     * @param int $invoice_id The invoice ID whose notes to retrieve.
+     * @param string $type Optional. Pass in customer to only return customer notes.
+     * @return WP_Comment[]
+     */
+    public function get_invoice_notes( $invoice_id = 0, $type = 'all' ) {
+
+        // Default comment args.
+        $args = array(
+            'post_id' => $invoice_id,
+            'orderby' => 'comment_ID',
+            'order'   => 'ASC',
+        );
+
+        // Maybe only show customer comments.
+        if ( $type == 'customer' ) {
+            $args['meta_key']   = '_wpi_customer_note';
+            $args['meta_value'] = 1;
+        }
+
+        $args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+
+        return get_comments( $args );
+    }
+
+    /**
+     * Saves an invoice comment.
+     *
+     * @param WPInv_Invoice $invoice The invoice to add the comment to.
+     * @param string $note The note content.
+     * @param string $note_author The name of the author of the note.
+     * @param bool $for_customer Whether or not this comment is meant to be sent to the customer.
+     * @return int|false The new note's ID on success, false on failure.
+     */
+    function add_invoice_note( $invoice, $note, $note_author, $author_email, $for_customer = false ) {
+
+        do_action( 'wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer );
+
+        /**
+         * Insert the comment.
+         */
+        $note_id = wp_insert_comment(
+            wp_filter_comment(
+                array(
+                    'comment_post_ID'      => $invoice->get_id(),
+                    'comment_content'      => $note,
+                    'comment_agent'        => 'Invoicing',
+                    'user_id'              => get_current_user_id(),
+                    'comment_author'       => $note_author,
+                    'comment_author_IP'    => wpinv_get_ip(),
+                    'comment_author_email' => $author_email,
+                    'comment_author_url'   => $invoice->get_view_url(),
+                    'comment_type'         => 'wpinv_note',
+                )
+            )
+        );
+
+        do_action( 'wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer );
+
+        // Are we notifying the customer?
+        if ( empty( $note_id ) || empty( $for_customer ) ) {
+            return $note_id;
+        }
+
+        add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+        do_action(
             'wpinv_new_customer_note',
             array(
-				'invoice_id' => $invoice->get_id(),
-				'user_note'  => $note,
+                'invoice_id' => $invoice->get_id(),
+                'user_note'  => $note,
             )
         );
-		do_action( 'getpaid_new_customer_note', $invoice, $note );
-		return $note_id;
-	}
+        do_action( 'getpaid_new_customer_note', $invoice, $note );
+        return $note_id;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Handles invoice notes.
@@ -18,18 +18,18 @@ 
 	public function __construct() {
 
 		// Filter inovice notes.
-		add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
-		add_action( 'comment_feed_where', array( $this, 'wpinv_comment_feed_where' ), 10, 1 );
+		add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
+		add_action('comment_feed_where', array($this, 'wpinv_comment_feed_where'), 10, 1);
 
 		// Delete comments count cache whenever there is a new comment or a comment status changes.
-		add_action( 'wp_insert_comment', array( $this, 'delete_comments_count_cache' ) );
-		add_action( 'wp_set_comment_status', array( $this, 'delete_comments_count_cache' ) );
+		add_action('wp_insert_comment', array($this, 'delete_comments_count_cache'));
+		add_action('wp_set_comment_status', array($this, 'delete_comments_count_cache'));
 
 		// Count comments.
-		add_filter( 'wp_count_comments', array( $this, 'wp_count_comments' ), 100, 2 );
+		add_filter('wp_count_comments', array($this, 'wp_count_comments'), 100, 2);
 
 		// Fires after notes are loaded.
-		do_action( 'wpinv_notes_init', $this );
+		do_action('wpinv_notes_init', $this);
 	}
 
 	/**
@@ -37,19 +37,19 @@ 
 	 *
 	 * @param WP_Comment_Query $query
 	 */
-	public function set_invoice_note_type( $query ) {
-		$post_id = ! empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+	public function set_invoice_note_type($query) {
+		$post_id = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
 
-		if ( $post_id && getpaid_is_invoice_post_type( get_post_type( $post_id ) ) ) {
+		if ($post_id && getpaid_is_invoice_post_type(get_post_type($post_id))) {
 			$query->query_vars['type'] = 'wpinv_note';
 		} else {
 
-			if ( empty( $query->query_vars['type__not_in'] ) ) {
+			if (empty($query->query_vars['type__not_in'])) {
 				$query->query_vars['type__not_in'] = array();
 			}
 
-			$query->query_vars['type__not_in'] = wpinv_parse_list( $query->query_vars['type__not_in'] );
-			$query->query_vars['type__not_in'] = array_merge( array( 'wpinv_note' ), $query->query_vars['type__not_in'] );
+			$query->query_vars['type__not_in'] = wpinv_parse_list($query->query_vars['type__not_in']);
+			$query->query_vars['type__not_in'] = array_merge(array('wpinv_note'), $query->query_vars['type__not_in']);
 		}
 
 		return $query;
@@ -58,8 +58,8 @@ 
 	/**
 	 * Exclude notes from the comments feed.
 	 */
-	function wpinv_comment_feed_where( $where ) {
-		return $where . ( $where ? ' AND ' : '' ) . " comment_type != 'wpinv_note' ";
+	function wpinv_comment_feed_where($where) {
+		return $where . ($where ? ' AND ' : '') . " comment_type != 'wpinv_note' ";
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * is called.
 	 */
 	public function delete_comments_count_cache() {
-		delete_transient( 'getpaid_count_comments' );
+		delete_transient('getpaid_count_comments');
 	}
 
 	/**
@@ -80,13 +80,13 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @return object
 	 */
-	public function wp_count_comments( $stats, $post_id ) {
+	public function wp_count_comments($stats, $post_id) {
 		global $wpdb;
 
-		if ( empty( $post_id ) ) {
-			$stats = get_transient( 'getpaid_count_comments' );
+		if (empty($post_id)) {
+			$stats = get_transient('getpaid_count_comments');
 
-			if ( ! $stats ) {
+			if (!$stats) {
 				$stats = array(
 					'total_comments' => 0,
 					'all'            => 0,
@@ -110,27 +110,27 @@ 
 					'post-trashed' => 'post-trashed',
 				);
 
-				foreach ( (array) $count as $row ) {
+				foreach ((array) $count as $row) {
 					// Don't count post-trashed toward totals.
-					if ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash', 'spam' ), true ) ) {
+					if (!in_array($row['comment_approved'], array('post-trashed', 'trash', 'spam'), true)) {
 						$stats['all']            += $row['num_comments'];
 						$stats['total_comments'] += $row['num_comments'];
-					} elseif ( ! in_array( $row['comment_approved'], array( 'post-trashed', 'trash' ), true ) ) {
+					} elseif (!in_array($row['comment_approved'], array('post-trashed', 'trash'), true)) {
 						$stats['total_comments'] += $row['num_comments'];
 					}
-					if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-						$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+					if (isset($approved[$row['comment_approved']])) {
+						$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
 					}
 				}
 
-				foreach ( $approved as $key ) {
-					if ( empty( $stats[ $key ] ) ) {
-						$stats[ $key ] = 0;
+				foreach ($approved as $key) {
+					if (empty($stats[$key])) {
+						$stats[$key] = 0;
 					}
 				}
 
 				$stats = (object) $stats;
-				set_transient( 'getpaid_count_comments', $stats );
+				set_transient('getpaid_count_comments', $stats);
 			}
 }
 
@@ -144,7 +144,7 @@ 
 	 * @param string $type Optional. Pass in customer to only return customer notes.
 	 * @return WP_Comment[]
 	 */
-	public function get_invoice_notes( $invoice_id = 0, $type = 'all' ) {
+	public function get_invoice_notes($invoice_id = 0, $type = 'all') {
 
 		// Default comment args.
 		$args = array(
@@ -154,14 +154,14 @@ 
 		);
 
 		// Maybe only show customer comments.
-		if ( $type == 'customer' ) {
+		if ($type == 'customer') {
 			$args['meta_key']   = '_wpi_customer_note';
 			$args['meta_value'] = 1;
 		}
 
-		$args = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+		$args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
 
-		return get_comments( $args );
+		return get_comments($args);
 	}
 
 	/**
@@ -173,9 +173,9 @@ 
 	 * @param bool $for_customer Whether or not this comment is meant to be sent to the customer.
 	 * @return int|false The new note's ID on success, false on failure.
 	 */
-	function add_invoice_note( $invoice, $note, $note_author, $author_email, $for_customer = false ) {
+	function add_invoice_note($invoice, $note, $note_author, $author_email, $for_customer = false) {
 
-		do_action( 'wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer );
+		do_action('wpinv_pre_insert_invoice_note', $invoice->get_id(), $note, $for_customer);
 
 		/**
 		 * Insert the comment.
@@ -196,14 +196,14 @@ 
 			)
 		);
 
-		do_action( 'wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer );
+		do_action('wpinv_insert_payment_note', $note_id, $invoice->get_id(), $note, $for_customer);
 
 		// Are we notifying the customer?
-		if ( empty( $note_id ) || empty( $for_customer ) ) {
+		if (empty($note_id) || empty($for_customer)) {
 			return $note_id;
 		}
 
-		add_comment_meta( $note_id, '_wpi_customer_note', 1 );
+		add_comment_meta($note_id, '_wpi_customer_note', 1);
 		do_action(
             'wpinv_new_customer_note',
             array(
@@ -211,7 +211,7 @@ 
 				'user_note'  => $note,
             )
         );
-		do_action( 'getpaid_new_customer_note', $invoice, $note );
+		do_action('getpaid_new_customer_note', $invoice, $note);
 		return $note_id;
 	}
 

includes/gateways/class-getpaid-authorize-net-legacy-gateway.php

Indentation +50 added lines, -50 removed lines

@@ -15,31 +15,31 @@ 
 abstract class GetPaid_Authorize_Net_Legacy_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
     }
 
     /**
-	 * Returns the API URL.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @return string
-	 */
-	public function get_api_url( $invoice ) {
+     * Returns the API URL.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @return string
+     */
+    public function get_api_url( $invoice ) {
         return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
     }
 
     /**
-	 * Communicates with authorize.net
-	 *
-	 *
-	 * @param array $post Data to post.
+     * Communicates with authorize.net
+     *
+     *
+     * @param array $post Data to post.
      * @param WPInv_Invoice $invoice Invoice.
-	 * @return stdClass|WP_Error
-	 */
+     * @return stdClass|WP_Error
+     */
     public function post( $post, $invoice ) {
 
         $url      = $this->get_api_url( $invoice );
@@ -89,12 +89,12 @@ 
     }
 
     /**
-	 * Returns the API authentication params.
-	 *
-	 *
-	 * @return array
-	 */
-	public function get_auth_params() {
+     * Returns the API authentication params.
+     *
+     *
+     * @return array
+     */
+    public function get_auth_params() {
 
         return array(
             'name'           => $this->get_option( 'login_id' ),
@@ -104,13 +104,13 @@ 
     }
 
     /**
-	 * Cancels a subscription remotely
-	 *
-	 *
-	 * @param WPInv_Subscription $subscription Subscription.
+     * Cancels a subscription remotely
+     *
+     *
+     * @param WPInv_Subscription $subscription Subscription.
      * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function cancel_subscription( $subscription, $invoice ) {
+     */
+    public function cancel_subscription( $subscription, $invoice ) {
 
         // Backwards compatibility. New version do not use authorize.net subscriptions.
         $this->post(
@@ -126,17 +126,17 @@ 
     }
 
     /**
-	 * Processes ipns.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
 
         $this->maybe_process_old_ipn();
 
         // Validate the IPN.
         if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
+            wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
         }
 
         // Event type.
@@ -175,24 +175,24 @@ 
     }
 
     /**
-	 * Validates IPN invoices.
-	 *
+     * Validates IPN invoices.
+     *
      * @param WPInv_Invoice $invoice
      * @param object $payload
-	 * @return void
-	 */
-	public function validate_ipn_invoice( $invoice, $payload ) {
+     * @return void
+     */
+    public function validate_ipn_invoice( $invoice, $payload ) {
         if ( ! $invoice->exists() || $payload->id != $invoice->get_transaction_id() ) {
             exit;
         }
     }
 
     /**
-	 * Process subscriptio IPNS.
-	 *
-	 * @return void
-	 */
-	public function maybe_process_old_ipn() {
+     * Process subscriptio IPNS.
+     *
+     * @return void
+     */
+    public function maybe_process_old_ipn() {
 
         $data = wp_kses_post_deep( wp_unslash( $_POST ) );
 
@@ -234,11 +234,11 @@ 
     }
 
     /**
-	 * Validates the old IPN signature.
+     * Validates the old IPN signature.
      *
      * @param array $posted
-	 */
-	public function validate_old_ipn_signature( $posted ) {
+     */
+    public function validate_old_ipn_signature( $posted ) {
 
         $signature = $this->get_option( 'signature_key' );
         if ( ! empty( $signature ) ) {
@@ -256,9 +256,9 @@ 
     }
 
     /**
-	 * Check Authorize.NET IPN validity.
-	 */
-	public function validate_ipn() {
+     * Check Authorize.NET IPN validity.
+     */
+    public function validate_ipn() {
 
         wpinv_error_log( 'Validating Authorize.NET IPN response' );
 

Spacing +69 added lines, -69 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Legacy Payment Gateway class.
@@ -28,8 +28,8 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_api_url( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
+	public function get_api_url($invoice) {
+        return $this->is_sandbox($invoice) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
     }
 
     /**
@@ -40,48 +40,48 @@ 
      * @param WPInv_Invoice $invoice Invoice.
 	 * @return stdClass|WP_Error
 	 */
-    public function post( $post, $invoice ) {
+    public function post($post, $invoice) {
 
-        $url      = $this->get_api_url( $invoice );
+        $url      = $this->get_api_url($invoice);
         $response = wp_remote_post(
             $url,
             array(
                 'headers' => array(
                     'Content-Type' => 'application/json; charset=utf-8',
                 ),
-                'body'    => json_encode( $post ),
+                'body'    => json_encode($post),
                 'method'  => 'POST',
             )
         );
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return $response;
         }
 
-        $response = wp_unslash( wp_remote_retrieve_body( $response ) );
-        $response = preg_replace( '/\xEF\xBB\xBF/', '', $response ); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
-        $response = json_decode( $response );
+        $response = wp_unslash(wp_remote_retrieve_body($response));
+        $response = preg_replace('/\xEF\xBB\xBF/', '', $response); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
+        $response = json_decode($response);
 
-        if ( empty( $response ) ) {
-            return new WP_Error( 'invalid_reponse', __( 'Invalid gateway response', 'invoicing' ) );
+        if (empty($response)) {
+            return new WP_Error('invalid_reponse', __('Invalid gateway response', 'invoicing'));
         }
 
-        if ( $response->messages->resultCode == 'Error' ) {
+        if ($response->messages->resultCode == 'Error') {
 
-            if ( $this->is_sandbox( $invoice ) ) {
-                wpinv_error_log( $response );
+            if ($this->is_sandbox($invoice)) {
+                wpinv_error_log($response);
             }
 
-            if ( $response->messages->message[0]->code == 'E00039' && ! empty( $response->customerProfileId ) && ! empty( $response->customerPaymentProfileId ) ) {
-                return new WP_Error( 'dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId );
+            if ($response->messages->message[0]->code == 'E00039' && !empty($response->customerProfileId) && !empty($response->customerPaymentProfileId)) {
+                return new WP_Error('dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId);
             }
 
-            if ( ! empty( $response->transactionResponse ) && ! empty( $response->transactionResponse->errors ) ) {
+            if (!empty($response->transactionResponse) && !empty($response->transactionResponse->errors)) {
                 $error = $response->transactionResponse->errors[0];
-                return new WP_Error( $error->errorCode, $error->errorText );
+                return new WP_Error($error->errorCode, $error->errorText);
             }
 
-            return new WP_Error( $response->messages->message[0]->code, $response->messages->message[0]->text );
+            return new WP_Error($response->messages->message[0]->code, $response->messages->message[0]->text);
         }
 
         return $response;
@@ -97,8 +97,8 @@ 
 	public function get_auth_params() {
 
         return array(
-            'name'           => $this->get_option( 'login_id' ),
-            'transactionKey' => $this->get_option( 'transaction_key' ),
+            'name'           => $this->get_option('login_id'),
+            'transactionKey' => $this->get_option('transaction_key'),
         );
 
     }
@@ -110,7 +110,7 @@ 
 	 * @param WPInv_Subscription $subscription Subscription.
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function cancel_subscription( $subscription, $invoice ) {
+	public function cancel_subscription($subscription, $invoice) {
 
         // Backwards compatibility. New version do not use authorize.net subscriptions.
         $this->post(
@@ -135,38 +135,38 @@ 
         $this->maybe_process_old_ipn();
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Event type.
-        $posted = json_decode( file_get_contents( 'php://input' ) );
-        if ( empty( $posted ) ) {
-            wp_die( 'Invalid JSON', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        $posted = json_decode(file_get_contents('php://input'));
+        if (empty($posted)) {
+            wp_die('Invalid JSON', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Process the IPN.
-        $posted = (object) wp_unslash( $posted );
+        $posted = (object) wp_unslash($posted);
 
         // Process refunds.
-        if ( 'net.authorize.payment.refund.created' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->merchantReferenceId );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
+        if ('net.authorize.payment.refund.created' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->merchantReferenceId);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
             $invoice->refund();
         }
 
         // Held funds approved.
-        if ( 'net.authorize.payment.fraud.approved' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->mark_paid( false, __( 'Payment released', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.approved' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->mark_paid(false, __('Payment released', 'invoicing'));
         }
 
         // Held funds declined.
-        if ( 'net.authorize.payment.fraud.declined' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->set_status( 'wpi-failed', __( 'Payment declined', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.declined' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->set_status('wpi-failed', __('Payment declined', 'invoicing'));
             $invoice->save();
         }
 
@@ -181,8 +181,8 @@ 
      * @param object $payload
 	 * @return void
 	 */
-	public function validate_ipn_invoice( $invoice, $payload ) {
-        if ( ! $invoice->exists() || $payload->id != $invoice->get_transaction_id() ) {
+	public function validate_ipn_invoice($invoice, $payload) {
+        if (!$invoice->exists() || $payload->id != $invoice->get_transaction_id()) {
             exit;
         }
     }
@@ -194,32 +194,32 @@ 
 	 */
 	public function maybe_process_old_ipn() {
 
-        $data = wp_kses_post_deep( wp_unslash( $_POST ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST));
 
         // Only process subscriptions subscriptions.
-        if ( empty( $data['x_subscription_id'] ) ) {
+        if (empty($data['x_subscription_id'])) {
             return;
         }
 
         // Check validity.
-        $this->validate_old_ipn_signature( $data );
+        $this->validate_old_ipn_signature($data);
 
         // Fetch the associated subscription.
-        $subscription_id = WPInv_Subscription::get_subscription_id_by_field( $data['x_subscription_id'] );
-        $subscription    = new WPInv_Subscription( $subscription_id );
+        $subscription_id = WPInv_Subscription::get_subscription_id_by_field($data['x_subscription_id']);
+        $subscription    = new WPInv_Subscription($subscription_id);
 
         // Abort if it is missing or completed.
-        if ( ! $subscription->get_id() || $subscription->has_status( 'completed' ) ) {
+        if (!$subscription->get_id() || $subscription->has_status('completed')) {
             return;
         }
 
         // Payment status.
-        if ( 1 == $data['x_response_code'] ) {
+        if (1 == $data['x_response_code']) {
 
             // Renew the subscription.
             $subscription->add_payment(
                 array(
-                    'transaction_id' => sanitize_text_field( $data['x_trans_id'] ),
+                    'transaction_id' => sanitize_text_field($data['x_trans_id']),
                     'gateway'        => $this->id,
                 )
             );
@@ -238,17 +238,17 @@ 
      *
      * @param array $posted
 	 */
-	public function validate_old_ipn_signature( $posted ) {
+	public function validate_old_ipn_signature($posted) {
 
-        $signature = $this->get_option( 'signature_key' );
-        if ( ! empty( $signature ) ) {
-            $login_id  = $this->get_option( 'login_id' );
-            $trans_id  = wpinv_clean( $_POST['x_trans_id'] );
-            $amount    = wpinv_clean( $_POST['x_amount'] );
-            $hash      = hash_hmac( 'sha512', "^$login_id^$trans_id^$amount^", hex2bin( $signature ) );
+        $signature = $this->get_option('signature_key');
+        if (!empty($signature)) {
+            $login_id  = $this->get_option('login_id');
+            $trans_id  = wpinv_clean($_POST['x_trans_id']);
+            $amount    = wpinv_clean($_POST['x_amount']);
+            $hash      = hash_hmac('sha512', "^$login_id^$trans_id^$amount^", hex2bin($signature));
 
-            if ( ! hash_equals( $hash, $posted['x_SHA2_Hash'] ) ) {
-                wpinv_error_log( $posted['x_SHA2_Hash'], "Invalid signature. Expected $hash" );
+            if (!hash_equals($hash, $posted['x_SHA2_Hash'])) {
+                wpinv_error_log($posted['x_SHA2_Hash'], "Invalid signature. Expected $hash");
                 exit;
             }
 }
@@ -260,28 +260,28 @@ 
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Authorize.NET IPN response' );
+        wpinv_error_log('Validating Authorize.NET IPN response');
 
-        if ( empty( $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
+        if (empty($_SERVER['HTTP_X_ANET_SIGNATURE'])) {
             return false;
         }
 
-        $signature = $this->get_option( 'signature_key' );
+        $signature = $this->get_option('signature_key');
 
-        if ( empty( $signature ) ) {
-            wpinv_error_log( 'Error: You have not set a signature key' );
+        if (empty($signature)) {
+            wpinv_error_log('Error: You have not set a signature key');
             return false;
         }
 
-        $hash  = hash_hmac( 'sha512', file_get_contents( 'php://input' ), hex2bin( $signature ) );
+        $hash = hash_hmac('sha512', file_get_contents('php://input'), hex2bin($signature));
 
-        if ( hash_equals( $hash, $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
-            wpinv_error_log( 'Successfully validated the IPN' );
+        if (hash_equals($hash, $_SERVER['HTTP_X_ANET_SIGNATURE'])) {
+            wpinv_error_log('Successfully validated the IPN');
             return true;
         }
 
-        wpinv_error_log( 'IPN hash is not valid' );
-        wpinv_error_log( $_SERVER['HTTP_X_ANET_SIGNATURE'] );
+        wpinv_error_log('IPN hash is not valid');
+        wpinv_error_log($_SERVER['HTTP_X_ANET_SIGNATURE']);
         return false;
 
     }

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

Indentation +94 added lines, -94 removed lines

@@ -13,65 +13,65 @@ 
 class GetPaid_Worldpay_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'worldpay';
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
+     * Payment method order.
+     *
+     * @var int
+     */
     public $order = 5;
 
     /**
-	 * Endpoint for requests from Worldpay.
-	 *
-	 * @var string
-	 */
-	protected $notify_url;
-
-	/**
-	 * Endpoint for requests to Worldpay.
-	 *
-	 * @var string
-	 */
+     * Endpoint for requests from Worldpay.
+     *
+     * @var string
+     */
+    protected $notify_url;
+
+    /**
+     * Endpoint for requests to Worldpay.
+     *
+     * @var string
+     */
     protected $endpoint;
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     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' );
+     * 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' );
 
     /**
-	 * URL to view a transaction.
-	 *
-	 * @var string
-	 */
+     * URL to view a transaction.
+     *
+     * @var string
+     */
     public $view_transaction_url = 'https://www.{sandbox}paypal.com/activity/payment/%s';
 
     /**
-	 * URL to view a subscription.
-	 *
-	 * @var string
-	 */
-	public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
+     * URL to view a subscription.
+     *
+     * @var string
+     */
+    public $view_subscription_url = 'https://www.{sandbox}paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=%s';
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->method_title         = __( 'Worldpay', 'invoicing' );
         $this->title                = __( 'Worldpay - Credit Card / Debit Card', 'invoicing' );
@@ -85,15 +85,15 @@ 
     }
 
     /**
-	 * 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 ) {
 
         // Get redirect url.
         $worldpay_redirect = esc_url( $this->get_request_url( $invoice ) );
@@ -128,31 +128,31 @@ 
     }
 
     /**
-	 * Get the Worldpay request URL for an invoice.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return string
-	 */
-	public function get_request_url( $invoice ) {
+     * Get the Worldpay request URL for an invoice.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return string
+     */
+    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;
 
-	}
+    }
 
     /**
-	 * Get Worldpay Args for passing to Worldpay.
-	 *
-	 * @param  WPInv_Invoice $invoice Invoice object.
-	 * @return array
-	 */
-	protected function get_worldpay_args( $invoice ) {
-
-		return apply_filters(
-			'getpaid_worldpay_args',
-			array(
+     * Get Worldpay Args for passing to Worldpay.
+     *
+     * @param  WPInv_Invoice $invoice Invoice object.
+     * @return array
+     */
+    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
@@ -177,18 +177,18 @@ 
                 'countryString'  => wpinv_clean( wpinv_country_name( $invoice->get_country() ) ),
                 'compName'       => wpinv_clean( $invoice->get_company() ),
             ),
-			$invoice
-		);
+            $invoice
+        );
 
     }
 
     /**
-	 * Secures worldpay args with an md5 hash.
-	 *
-	 * @param  array $args Gateway args.
-	 * @return array
-	 */
-	public function hash_args( $args ) {
+     * Secures worldpay args with an md5 hash.
+     *
+     * @param  array $args Gateway args.
+     * @return array
+     */
+    public function hash_args( $args ) {
 
         $md5_secret = $this->get_option( 'md5_secret' );
 
@@ -204,16 +204,16 @@ 
     }
 
     /**
-	 * Processes ipns and marks payments as complete.
-	 *
-	 * @return void
-	 */
-	public function verify_ipn() {
+     * Processes ipns and marks payments as complete.
+     *
+     * @return void
+     */
+    public function verify_ipn() {
 
         // Validate the IPN.
         if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
-		}
+            wp_die( 'Worldpay IPN Request Failure', 'Worldpay IPN', array( 'response' => 500 ) );
+        }
 
         // Process the IPN.
         $posted  = wp_kses_post_deep( wp_unslash( $_POST ) );
@@ -229,8 +229,8 @@ 
                 $invoice->set_transaction_id( wpinv_clean( $posted['transId'] ) );
             }
 
-             // Update the ip address.
-             if ( ! empty( $posted['ipAddress'] ) ) {
+                // Update the ip address.
+                if ( ! empty( $posted['ipAddress'] ) ) {
                 $invoice->set_ip( wpinv_clean( $posted['ipAddress'] ) );
             }
 
@@ -257,9 +257,9 @@ 
     }
 
     /**
-	 * Check Worldpay IPN validity.
-	 */
-	public function validate_ipn() {
+     * Check Worldpay IPN validity.
+     */
+    public function validate_ipn() {
 
         wpinv_error_log( 'Validating Worldpay IPN response' );
 
@@ -305,11 +305,11 @@ 
     }
 
     /**
-	 * 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 ) {
 
         $currencies = sprintf(
             __( 'Supported Currencies: %s', 'invoicing' ),
@@ -350,7 +350,7 @@ 
             'readonly' => true,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
 }

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_kses_post_deep( wp_unslash( $_POST ) );
-        $invoice = wpinv_get_invoice( $posted['MC_invoice_id'] );
+        $posted  = wp_kses_post_deep(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_kses_post_deep( wp_unslash( $_POST ) );
+        $data = wp_kses_post_deep(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 %1$sWorldpay Sandbox Testing Guide%2$s for more details.', 'invoicing' ),
+                __('SANDBOX ENABLED. See the %1$sWorldpay Sandbox Testing Guide%2$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-wpinv-subscriptions-db.php

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The Subscriptions DB Class
@@ -72,8 +72,8 @@ 
             'transaction_id'    => '',
             'parent_payment_id' => 0,
             'product_id'        => 0,
-            'created'           => date( 'Y-m-d H:i:s' ),
-            'expiration'        => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
+            'expiration'        => date('Y-m-d H:i:s'),
             'trial_period'      => '',
             'status'            => '',
             'profile_id'        => '',
@@ -86,8 +86,8 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function get_subscriptions( $args = array() ) {
-        return getpaid_get_subscriptions( $args );
+    public function get_subscriptions($args = array()) {
+        return getpaid_get_subscriptions($args);
     }
 
     /**
@@ -96,8 +96,8 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function count( $args = array() ) {
-        return getpaid_get_subscriptions( $args, 'count' );
+    public function count($args = array()) {
+        return getpaid_get_subscriptions($args, 'count');
     }
 
     /**
@@ -133,9 +133,9 @@ 
         KEY customer_and_status ( customer_id, status)
         ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_db_version', $this->version );
+        update_option($this->table_name . '_db_version', $this->version);
     }
 
 }

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

Indentation +159 added lines, -159 removed lines

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

Spacing +41 added lines, -41 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission discount class
@@ -25,28 +25,28 @@ 
 	 * @param float                           $initial_total
 	 * @param float                           $recurring_total
 	 */
-	public function __construct( $submission, $initial_total, $recurring_total ) {
+	public function __construct($submission, $initial_total, $recurring_total) {
 
 		// Process any existing invoice discounts.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->discounts = $submission->get_invoice()->get_discounts();
 		}
 
 		// Do we have a discount?
-		$discount = $submission->get_field( 'discount' );
+		$discount = $submission->get_field('discount');
 
-		if ( empty( $discount ) ) {
+		if (empty($discount)) {
 
-			if ( isset( $this->discounts['discount_code'] ) ) {
-				unset( $this->discounts['discount_code'] );
+			if (isset($this->discounts['discount_code'])) {
+				unset($this->discounts['discount_code']);
 			}
 
 			return;
 		}
 
 		// Processes the discount code.
-		$amount = max( $initial_total, $recurring_total );
-		$this->process_discount( $submission, $discount, $amount );
+		$amount = max($initial_total, $recurring_total);
+		$this->process_discount($submission, $discount, $amount);
 
 	}
 
@@ -57,34 +57,34 @@ 
 	 * @param string                          $discount
 	 * @param float                           $amount
 	 */
-	public function process_discount( $submission, $discount, $amount ) {
+	public function process_discount($submission, $discount, $amount) {
 
 		// Fetch the discount.
-		$discount = new WPInv_Discount( $discount );
+		$discount = new WPInv_Discount($discount);
 
 		// Ensure it is active.
-        if ( ! $this->is_discount_active( $discount ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'Invalid or expired discount code', 'invoicing' ) );
+        if (!$this->is_discount_active($discount)) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('Invalid or expired discount code', 'invoicing'));
 		}
 
 		// Required items.
-		if ( ! $discount->is_required_items_met( array_keys( $submission->get_items() ) ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You are not allowed to use this discount code.', 'invoicing' ) );
+		if (!$discount->is_required_items_met(array_keys($submission->get_items()))) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('You are not allowed to use this discount code.', 'invoicing'));
 		}
 
 		// Exceeded limit.
-		if ( $discount->has_exceeded_limit() ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'This discount code has been used up', 'invoicing' ) );
+		if ($discount->has_exceeded_limit()) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('This discount code has been used up', 'invoicing'));
 		}
 
 		// Validate usages.
-		$this->validate_single_use_discount( $submission, $discount );
+		$this->validate_single_use_discount($submission, $discount);
 
 		// Validate amount.
-		$this->validate_discount_amount( $submission, $discount, $amount );
+		$this->validate_discount_amount($submission, $discount, $amount);
 
 		// Save the discount.
-		$this->discounts['discount_code'] = $this->calculate_discount( $submission, $discount );
+		$this->discounts['discount_code'] = $this->calculate_discount($submission, $discount);
 	}
 
 	/**
@@ -93,8 +93,8 @@ 
 	 * @param WPInv_Discount                  $discount
 	 * @return bool
 	 */
-	public function is_discount_active( $discount ) {
-		return $discount->exists() && $discount->is_active() && $discount->has_started() && ! $discount->is_expired();
+	public function is_discount_active($discount) {
+		return $discount->exists() && $discount->is_active() && $discount->has_started() && !$discount->is_expired();
 	}
 
 	/**
@@ -103,13 +103,13 @@ 
 	 * @param string $email
 	 * @return int|string|false
 	 */
-	public function get_user_id_or_email( $email ) {
+	public function get_user_id_or_email($email) {
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return get_current_user_id();
 		}
 
-		return empty( $email ) ? false : sanitize_email( $email );
+		return empty($email) ? false : sanitize_email($email);
 	}
 
 	/**
@@ -118,23 +118,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @param WPInv_Discount                  $discount
 	 */
-	public function validate_single_use_discount( $submission, $discount ) {
+	public function validate_single_use_discount($submission, $discount) {
 
 		// Abort if it is not a single use discount.
-		if ( ! $discount->is_single_use() ) {
+		if (!$discount->is_single_use()) {
 			return;
 		}
 
 		// Ensure there is a valid billing email.
-		$user = $this->get_user_id_or_email( $submission->get_billing_email() );
+		$user = $this->get_user_id_or_email($submission->get_billing_email());
 
-		if ( empty( $user ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You need to either log in or enter your billing email before applying this discount', 'invoicing' ) );
+		if (empty($user)) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('You need to either log in or enter your billing email before applying this discount', 'invoicing'));
 		}
 
 		// Has the user used this discount code before?
-		if ( ! $discount->is_valid_for_user( $user ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', __( 'You have already used this discount', 'invoicing' ) );
+		if (!$discount->is_valid_for_user($user)) {
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', __('You have already used this discount', 'invoicing'));
 		}
 
 	}
@@ -146,18 +146,18 @@ 
 	 * @param WPInv_Discount         $discount
 	 * @param float                  $amount
 	 */
-	public function validate_discount_amount( $submission, $discount, $amount ) {
+	public function validate_discount_amount($submission, $discount, $amount) {
 
 		// Validate minimum amount.
-		if ( ! $discount->is_minimum_amount_met( $amount ) ) {
-			$min = wpinv_price( $discount->get_minimum_total(), $submission->get_currency() );
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The minimum total for using this discount is %s', 'invoicing' ), $min ) );
+		if (!$discount->is_minimum_amount_met($amount)) {
+			$min = wpinv_price($discount->get_minimum_total(), $submission->get_currency());
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf(__('The minimum total for using this discount is %s', 'invoicing'), $min));
 		}
 
 		// Validate the maximum amount.
-		if ( ! $discount->is_maximum_amount_met( $amount ) ) {
-			$max = wpinv_price( $discount->get_maximum_total(), $submission->get_currency() );
-			throw new GetPaid_Payment_Exception( '.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf( __( 'The maximum total for using this discount is %s', 'invoicing' ), $max ) );
+		if (!$discount->is_maximum_amount_met($amount)) {
+			$max = wpinv_price($discount->get_maximum_total(), $submission->get_currency());
+			throw new GetPaid_Payment_Exception('.getpaid-discount-field .getpaid-custom-payment-form-errors', sprintf(__('The maximum total for using this discount is %s', 'invoicing'), $max));
 		}
 
 	}
@@ -171,8 +171,8 @@ 
 	 * @param WPInv_Discount                  $discount
 	 * @return array
 	 */
-	public function calculate_discount( $submission, $discount ) {
-		return getpaid_calculate_invoice_discount( $submission, $discount );
+	public function calculate_discount($submission, $discount) {
+		return getpaid_calculate_invoice_discount($submission, $discount);
 	}
 
 }

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

Indentation +104 added lines, -104 removed lines

@@ -12,113 +12,113 @@
  */
 class GetPaid_Payment_Form_Submission_Fees {
 
-	/**
-	 * The fee validation error.
-	 * @var string
-	 */
-	public $fee_error;
-
-	/**
-	 * Submission fees.
-	 * @var array
-	 */
-	public $fees = array();
+    /**
+     * The fee validation error.
+     * @var string
+     */
+    public $fee_error;
+
+    /**
+     * Submission fees.
+     * @var array
+     */
+    public $fees = array();
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
-			$this->fees = $submission->get_invoice()->get_fees();
-		}
-
-		// Process price fields.
-		$data         = $submission->get_data();
-		$payment_form = $submission->get_payment_form();
-
-		foreach ( $payment_form->get_elements() as $element ) {
-
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
-			}
-
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
-			}
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Process any existing invoice fees.
+        if ( $submission->has_invoice() ) {
+            $this->fees = $submission->get_invoice()->get_fees();
+        }
+
+        // Process price fields.
+        $data         = $submission->get_data();
+        $payment_form = $submission->get_payment_form();
+
+        foreach ( $payment_form->get_elements() as $element ) {
+
+            if ( 'price_input' == $element['type'] ) {
+                $this->process_price_input( $element, $data, $submission );
+            }
+
+            if ( 'price_select' == $element['type'] ) {
+                $this->process_price_select( $element, $data );
+            }
 }
 
-	}
-
-	/**
-	 * Process a price input field.
-	 *
-	 * @param array $element
-	 * @param array $data
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_price_input( $element, $data, $submission ) {
-
-		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
-			return;
-		}
-
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
-
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
-		}
-
-		$this->fees[ $element['label'] ] = array(
-			'name'          => $element['label'],
-			'initial_fee'   => $amount,
-			'recurring_fee' => 0,
-		);
-
-	}
-
-	/**
-	 * Process a price select field.
-	 *
-	 * @param array $element
-	 * @param array $data
-	 */
-	public function process_price_select( $element, $data ) {
-
-		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
-			return;
-		}
-
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
-		$total      = 0;
-		$sub_labels = array();
-
-		foreach ( $selected as $price ) {
-
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
-			}
-
-			$price = explode( '|', $price );
-
-			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
-		}
-
-		$this->fees[ $element['label'] ] = array(
-			'name'          => $element['label'],
-			'initial_fee'   => $total,
-			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
-		);
-
-	}
+    }
+
+    /**
+     * Process a price input field.
+     *
+     * @param array $element
+     * @param array $data
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_price_input( $element, $data, $submission ) {
+
+        // Abort if not passed.
+        if ( empty( $data[ $element['id'] ] ) ) {
+            return;
+        }
+
+        $amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
+        $minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+
+        if ( $amount < $minimum ) {
+            throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+        }
+
+        $this->fees[ $element['label'] ] = array(
+            'name'          => $element['label'],
+            'initial_fee'   => $amount,
+            'recurring_fee' => 0,
+        );
+
+    }
+
+    /**
+     * Process a price select field.
+     *
+     * @param array $element
+     * @param array $data
+     */
+    public function process_price_select( $element, $data ) {
+
+        // Abort if not passed.
+        if ( empty( $data[ $element['id'] ] ) ) {
+            return;
+        }
+
+        $options    = getpaid_convert_price_string_to_options( $element['options'] );
+        $selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+        $total      = 0;
+        $sub_labels = array();
+
+        foreach ( $selected as $price ) {
+
+            if ( ! isset( $options[ $price ] ) ) {
+                throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+            }
+
+            $price = explode( '|', $price );
+
+            $sub_labels[] = $price[0];
+            $total += (float) wpinv_sanitize_amount( $price[1] );
+        }
+
+        $this->fees[ $element['label'] ] = array(
+            'name'          => $element['label'],
+            'initial_fee'   => $total,
+            'recurring_fee' => 0,
+            'description'   => implode( ', ', $sub_labels ),
+        );
+
+    }
 
 }

Spacing +26 added lines, -26 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission fees class
@@ -29,10 +29,10 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Process any existing invoice fees.
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			$this->fees = $submission->get_invoice()->get_fees();
 		}
 
@@ -40,14 +40,14 @@ 
 		$data         = $submission->get_data();
 		$payment_form = $submission->get_payment_form();
 
-		foreach ( $payment_form->get_elements() as $element ) {
+		foreach ($payment_form->get_elements() as $element) {
 
-			if ( 'price_input' == $element['type'] ) {
-				$this->process_price_input( $element, $data, $submission );
+			if ('price_input' == $element['type']) {
+				$this->process_price_input($element, $data, $submission);
 			}
 
-			if ( 'price_select' == $element['type'] ) {
-				$this->process_price_select( $element, $data );
+			if ('price_select' == $element['type']) {
+				$this->process_price_select($element, $data);
 			}
 }
 
@@ -60,21 +60,21 @@ 
 	 * @param array $data
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_price_input( $element, $data, $submission ) {
+	public function process_price_input($element, $data, $submission) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$amount  = (float) wpinv_sanitize_amount( $data[ $element['id'] ] );
-		$minimum = empty( $element['minimum'] ) ? 0 : (float) wpinv_sanitize_amount( $element['minimum'] );
+		$amount  = (float) wpinv_sanitize_amount($data[$element['id']]);
+		$minimum = empty($element['minimum']) ? 0 : (float) wpinv_sanitize_amount($element['minimum']);
 
-		if ( $amount < $minimum ) {
-			throw new Exception( sprintf( __( 'The minimum allowed amount is %s', 'invoicing' ), getpaid_unstandardize_amount( $minimum, $submission->get_currency() ) ) );
+		if ($amount < $minimum) {
+			throw new Exception(sprintf(__('The minimum allowed amount is %s', 'invoicing'), getpaid_unstandardize_amount($minimum, $submission->get_currency())));
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $amount,
 			'recurring_fee' => 0,
@@ -88,35 +88,35 @@ 
 	 * @param array $element
 	 * @param array $data
 	 */
-	public function process_price_select( $element, $data ) {
+	public function process_price_select($element, $data) {
 
 		// Abort if not passed.
-		if ( empty( $data[ $element['id'] ] ) ) {
+		if (empty($data[$element['id']])) {
 			return;
 		}
 
-		$options    = getpaid_convert_price_string_to_options( $element['options'] );
-		$selected   = array_filter( array_map( 'trim', explode( ',', $data[ $element['id'] ] ) ) );
+		$options    = getpaid_convert_price_string_to_options($element['options']);
+		$selected   = array_filter(array_map('trim', explode(',', $data[$element['id']])));
 		$total      = 0;
 		$sub_labels = array();
 
-		foreach ( $selected as $price ) {
+		foreach ($selected as $price) {
 
-			if ( ! isset( $options[ $price ] ) ) {
-				throw new Exception( __( 'You have selected an invalid amount', 'invoicing' ) );
+			if (!isset($options[$price])) {
+				throw new Exception(__('You have selected an invalid amount', 'invoicing'));
 			}
 
-			$price = explode( '|', $price );
+			$price = explode('|', $price);
 
 			$sub_labels[] = $price[0];
-			$total += (float) wpinv_sanitize_amount( $price[1] );
+			$total += (float) wpinv_sanitize_amount($price[1]);
 		}
 
-		$this->fees[ $element['label'] ] = array(
+		$this->fees[$element['label']] = array(
 			'name'          => $element['label'],
 			'initial_fee'   => $total,
 			'recurring_fee' => 0,
-			'description'   => implode( ', ', $sub_labels ),
+			'description'   => implode(', ', $sub_labels),
 		);
 
 	}

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

Indentation +206 added lines, -206 removed lines

@@ -12,227 +12,227 @@
  */
 class GetPaid_Payment_Form_Submission_Taxes {
 
-	/**
-	 * Submission taxes.
-	 * @var array
-	 */
-	public $taxes = array();
-
-	/**
-	 * Whether or not we should skip the taxes.
-	 * @var bool
-	 */
-	protected $skip_taxes = false;
+    /**
+     * Submission taxes.
+     * @var array
+     */
+    public $taxes = array();
+
+    /**
+     * Whether or not we should skip the taxes.
+     * @var bool
+     */
+    protected $skip_taxes = false;
+
+    /**
+     * Class constructor
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+
+        // Validate VAT number.
+        $this->validate_vat( $submission );
+
+        if ( $this->skip_taxes ) {
+            return;
+        }
+
+        foreach ( $submission->get_items() as $item ) {
+            $this->process_item_tax( $item, $submission );
+        }
+
+        // Process any existing invoice taxes.
+        if ( $submission->has_invoice() ) {
+            $this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+        }
+
+    }
+
+    /**
+     * Maybe process tax.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function process_item_tax( $item, $submission ) {
+
+        $rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
+        $rates    = getpaid_filter_item_tax_rates( $item, $rates );
+        $taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
+        $r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+
+        foreach ( $taxes as $name => $amount ) {
+            $recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
+            $tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+
+            $item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
+
+            if ( ! isset( $this->taxes[ $name ] ) ) {
+                $this->taxes[ $name ] = $tax;
+                continue;
+            }
+
+            $this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
+            $this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+
+        }
+
+    }
 
     /**
-	 * Class constructor
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-
-		// Validate VAT number.
-		$this->validate_vat( $submission );
-
-		if ( $this->skip_taxes ) {
-			return;
-		}
-
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
-		}
-
-		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
-		}
-
-	}
-
-	/**
-	 * Maybe process tax.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function process_item_tax( $item, $submission ) {
-
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
-
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
-
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
-
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
-				continue;
-			}
-
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
-
-		}
-
-	}
-
-	/**
-	 * Checks if the submission has a digital item.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_digital_item( $submission ) {
-
-		foreach ( $submission->get_items() as $item ) {
-
-			if ( 'digital' == $item->get_vat_rule() ) {
-				return true;
-			}
+     * Checks if the submission has a digital item.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_digital_item( $submission ) {
+
+        foreach ( $submission->get_items() as $item ) {
+
+            if ( 'digital' == $item->get_vat_rule() ) {
+                return true;
+            }
 }
 
-		return false;
-	}
-
-	/**
-	 * Checks if this is an eu store.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
-	}
-
-	/**
-	 * Checks if this is an eu country.
-	 *
-	 * @param string $country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
-	}
-
-	/**
-	 * Checks if this is an eu purchase.
-	 *
-	 * @param string $customer_country
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
-	}
-
-	/**
-	 * Retrieves the vat number.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_vat_number( $submission ) {
-
-		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
-		}
-
-		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
-	}
-
-	/**
-	 * Retrieves the company.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_company( $submission ) {
-
-		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
-		}
-
-		// Retrieve from the invoice.
-		return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
-	}
-
-	/**
-	 * Checks if we require a VAT number.
-	 *
-	 * @param bool $ip_in_eu Whether the customer IP is from the EU
-	 * @param bool $country_in_eu Whether the customer country is from the EU
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
-
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
-		$is_eu       = $ip_in_eu || $country_in_eu;
-
-		return $prevent_b2c && $is_eu;
-	}
-
-	/**
-	 * Validate VAT data.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 * @since 1.0.19
-	 */
-	public function validate_vat( $submission ) {
-
-		$in_eu = $this->is_eu_transaction( $submission->country );
-
-		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+        return false;
+    }
+
+    /**
+     * Checks if this is an eu store.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_store() {
+        return self::is_eu_country( wpinv_get_default_country() );
+    }
+
+    /**
+     * Checks if this is an eu country.
+     *
+     * @param string $country
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_country( $country ) {
+        return getpaid_is_eu_state( $country );
+    }
+
+    /**
+     * Checks if this is an eu purchase.
+     *
+     * @param string $customer_country
+     * @since 1.0.19
+     * @return bool
+     */
+    public static function is_eu_transaction( $customer_country ) {
+        return self::is_eu_country( $customer_country ) && self::is_eu_store();
+    }
+
+    /**
+     * Retrieves the vat number.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_vat_number( $submission ) {
+
+        // Retrieve from the posted number.
+        $vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
+        if ( ! is_null( $vat_number ) ) {
+            return wpinv_clean( $vat_number );
+        }
+
+        return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
+    }
+
+    /**
+     * Retrieves the company.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_company( $submission ) {
+
+        // Retrieve from the posted data.
+        $company = $submission->get_field( 'wpinv_company', 'billing' );
+        if ( ! empty( $company ) ) {
+            return wpinv_clean( $company );
+        }
+
+        // Retrieve from the invoice.
+        return $submission->has_invoice() ? $submission->get_invoice()->get_company() : '';
+    }
+
+    /**
+     * Checks if we require a VAT number.
+     *
+     * @param bool $ip_in_eu Whether the customer IP is from the EU
+     * @param bool $country_in_eu Whether the customer country is from the EU
+     * @since 1.0.19
+     * @return string
+     */
+    public function requires_vat( $ip_in_eu, $country_in_eu ) {
+
+        $prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
+        $prevent_b2c = ! empty( $prevent_b2c );
+        $is_eu       = $ip_in_eu || $country_in_eu;
+
+        return $prevent_b2c && $is_eu;
+    }
+
+    /**
+     * Validate VAT data.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     * @since 1.0.19
+     */
+    public function validate_vat( $submission ) {
+
+        $in_eu = $this->is_eu_transaction( $submission->country );
+
+        // Abort if we are not validating vat numbers.
+        if ( ! $in_eu ) {
             return;
-		}
+        }
 
-		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
-		$ip_country  = getpaid_get_ip_country();
+        // Prepare variables.
+        $vat_number  = $this->get_vat_number( $submission );
+        $ip_country  = getpaid_get_ip_country();
         $is_eu       = $this->is_eu_country( $submission->country );
         $is_ip_eu    = $this->is_eu_country( $ip_country );
 
-		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
-			return;
-		}
+        // Maybe abort early for initial fetches.
+        if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+            return;
+        }
 
-		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+        // If we're preventing business to consumer purchases,
+        if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
 
-			// Ensure that a vat number has been specified.
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
+            // Ensure that a vat number has been specified.
+            throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
 
-		}
+        }
 
-		if ( empty( $vat_number ) ) {
-			return;
-		}
+        if ( empty( $vat_number ) ) {
+            return;
+        }
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
-		}
+        if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
+            throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
+        }
 
-		if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
-			return;
-		}
+        if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+            return;
+        }
 
-		$this->skip_taxes = true;
-	}
+        $this->skip_taxes = true;
+    }
 
 }

Spacing +53 added lines, -53 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission taxes class
@@ -29,22 +29,22 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		// Validate VAT number.
-		$this->validate_vat( $submission );
+		$this->validate_vat($submission);
 
-		if ( $this->skip_taxes ) {
+		if ($this->skip_taxes) {
 			return;
 		}
 
-		foreach ( $submission->get_items() as $item ) {
-			$this->process_item_tax( $item, $submission );
+		foreach ($submission->get_items() as $item) {
+			$this->process_item_tax($item, $submission);
 		}
 
 		// Process any existing invoice taxes.
-		if ( $submission->has_invoice() ) {
-			$this->taxes = array_replace( $submission->get_invoice()->get_taxes(), $this->taxes );
+		if ($submission->has_invoice()) {
+			$this->taxes = array_replace($submission->get_invoice()->get_taxes(), $this->taxes);
 		}
 
 	}
@@ -56,26 +56,26 @@ 
 	 * @param GetPaid_Form_Item $item
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function process_item_tax( $item, $submission ) {
+	public function process_item_tax($item, $submission) {
 
-		$rates    = getpaid_get_item_tax_rates( $item, $submission->country, $submission->state );
-		$rates    = getpaid_filter_item_tax_rates( $item, $rates );
-		$taxes    = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, false ), $rates );
-		$r_taxes  = getpaid_calculate_item_taxes( getpaid_get_taxable_amount( $item, true ), $rates );
+		$rates    = getpaid_get_item_tax_rates($item, $submission->country, $submission->state);
+		$rates    = getpaid_filter_item_tax_rates($item, $rates);
+		$taxes    = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, false), $rates);
+		$r_taxes  = getpaid_calculate_item_taxes(getpaid_get_taxable_amount($item, true), $rates);
 
-		foreach ( $taxes as $name => $amount ) {
-			$recurring = isset( $r_taxes[ $name ] ) ? $r_taxes[ $name ] : 0;
-			$tax       = getpaid_prepare_item_tax( $item, $name, $amount, $recurring );
+		foreach ($taxes as $name => $amount) {
+			$recurring = isset($r_taxes[$name]) ? $r_taxes[$name] : 0;
+			$tax       = getpaid_prepare_item_tax($item, $name, $amount, $recurring);
 
-			$item->item_tax += wpinv_sanitize_amount( $tax['initial_tax'] );
+			$item->item_tax += wpinv_sanitize_amount($tax['initial_tax']);
 
-			if ( ! isset( $this->taxes[ $name ] ) ) {
-				$this->taxes[ $name ] = $tax;
+			if (!isset($this->taxes[$name])) {
+				$this->taxes[$name] = $tax;
 				continue;
 			}
 
-			$this->taxes[ $name ]['initial_tax']   += $tax['initial_tax'];
-			$this->taxes[ $name ]['recurring_tax'] += $tax['recurring_tax'];
+			$this->taxes[$name]['initial_tax']   += $tax['initial_tax'];
+			$this->taxes[$name]['recurring_tax'] += $tax['recurring_tax'];
 
 		}
 
@@ -88,11 +88,11 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function has_digital_item( $submission ) {
+	public function has_digital_item($submission) {
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 
-			if ( 'digital' == $item->get_vat_rule() ) {
+			if ('digital' == $item->get_vat_rule()) {
 				return true;
 			}
 }
@@ -107,7 +107,7 @@ 
 	 * @return bool
 	 */
 	public static function is_eu_store() {
-		return self::is_eu_country( wpinv_get_default_country() );
+		return self::is_eu_country(wpinv_get_default_country());
 	}
 
 	/**
@@ -117,8 +117,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_country( $country ) {
-		return getpaid_is_eu_state( $country );
+	public static function is_eu_country($country) {
+		return getpaid_is_eu_state($country);
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public static function is_eu_transaction( $customer_country ) {
-		return self::is_eu_country( $customer_country ) && self::is_eu_store();
+	public static function is_eu_transaction($customer_country) {
+		return self::is_eu_country($customer_country) && self::is_eu_store();
 	}
 
 	/**
@@ -139,12 +139,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_vat_number( $submission ) {
+	public function get_vat_number($submission) {
 
 		// Retrieve from the posted number.
-		$vat_number = $submission->get_field( 'wpinv_vat_number', 'billing' );
-		if ( ! is_null( $vat_number ) ) {
-			return wpinv_clean( $vat_number );
+		$vat_number = $submission->get_field('wpinv_vat_number', 'billing');
+		if (!is_null($vat_number)) {
+			return wpinv_clean($vat_number);
 		}
 
 		return $submission->has_invoice() ? $submission->get_invoice()->get_vat_number() : '';
@@ -157,12 +157,12 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function get_company( $submission ) {
+	public function get_company($submission) {
 
 		// Retrieve from the posted data.
-		$company = $submission->get_field( 'wpinv_company', 'billing' );
-		if ( ! empty( $company ) ) {
-			return wpinv_clean( $company );
+		$company = $submission->get_field('wpinv_company', 'billing');
+		if (!empty($company)) {
+			return wpinv_clean($company);
 		}
 
 		// Retrieve from the invoice.
@@ -177,10 +177,10 @@ 
 	 * @since 1.0.19
 	 * @return string
 	 */
-	public function requires_vat( $ip_in_eu, $country_in_eu ) {
+	public function requires_vat($ip_in_eu, $country_in_eu) {
 
-		$prevent_b2c = wpinv_get_option( 'vat_prevent_b2c_purchase' );
-		$prevent_b2c = ! empty( $prevent_b2c );
+		$prevent_b2c = wpinv_get_option('vat_prevent_b2c_purchase');
+		$prevent_b2c = !empty($prevent_b2c);
 		$is_eu       = $ip_in_eu || $country_in_eu;
 
 		return $prevent_b2c && $is_eu;
@@ -192,43 +192,43 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 * @since 1.0.19
 	 */
-	public function validate_vat( $submission ) {
+	public function validate_vat($submission) {
 
-		$in_eu = $this->is_eu_transaction( $submission->country );
+		$in_eu = $this->is_eu_transaction($submission->country);
 
 		// Abort if we are not validating vat numbers.
-		if ( ! $in_eu ) {
+		if (!$in_eu) {
             return;
 		}
 
 		// Prepare variables.
-		$vat_number  = $this->get_vat_number( $submission );
+		$vat_number  = $this->get_vat_number($submission);
 		$ip_country  = getpaid_get_ip_country();
-        $is_eu       = $this->is_eu_country( $submission->country );
-        $is_ip_eu    = $this->is_eu_country( $ip_country );
+        $is_eu       = $this->is_eu_country($submission->country);
+        $is_ip_eu    = $this->is_eu_country($ip_country);
 
 		// Maybe abort early for initial fetches.
-		if ( $submission->is_initial_fetch() && empty( $vat_number ) ) {
+		if ($submission->is_initial_fetch() && empty($vat_number)) {
 			return;
 		}
 
 		// If we're preventing business to consumer purchases,
-		if ( $this->requires_vat( $is_ip_eu, $is_eu ) && empty( $vat_number ) ) {
+		if ($this->requires_vat($is_ip_eu, $is_eu) && empty($vat_number)) {
 
 			// Ensure that a vat number has been specified.
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing' ) );
+			throw new GetPaid_Payment_Exception('.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __('Please enter your VAT number to verify your purchase is by an EU business.', 'invoicing'));
 
 		}
 
-		if ( empty( $vat_number ) ) {
+		if (empty($vat_number)) {
 			return;
 		}
 
-		if ( wpinv_should_validate_vat_number() && ! wpinv_validate_vat_number( $vat_number, $submission->country ) ) {
-			throw new GetPaid_Payment_Exception( '.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __( 'Your VAT number is invalid', 'invoicing' ) );
+		if (wpinv_should_validate_vat_number() && !wpinv_validate_vat_number($vat_number, $submission->country)) {
+			throw new GetPaid_Payment_Exception('.getpaid-error-billingwpinv_vat_number.getpaid-custom-payment-form-errors', __('Your VAT number is invalid', 'invoicing'));
 		}
 
-		if ( wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option( 'vat_same_country_rule', 'vat_too' ) ) {
+		if (wpinv_default_billing_country() == $submission->country && 'vat_too' == wpinv_get_option('vat_same_country_rule', 'vat_too')) {
 			return;
 		}
 

includes/reports/class-getpaid-reports-abstract-report.php

Indentation +177 added lines, -177 removed lines

@@ -12,69 +12,69 @@ 
  */
 abstract class GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var array
-	 */
-	public $stats;
-
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		$this->prepare_stats();
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	public function get_range() {
-		$valid_ranges = $this->get_periods();
-
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	public function get_periods() {
-
-		$periods = array(
+    /**
+     * @var array
+     */
+    public $stats;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        $this->prepare_stats();
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    public function get_range() {
+        $valid_ranges = $this->get_periods();
+
+        if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
+            return sanitize_key( $_GET['date_range'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    public function get_periods() {
+
+        $periods = array(
             'today'     => __( 'Today', 'invoicing' ),
             'yesterday' => __( 'Yesterday', 'invoicing' ),
             '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Retrieves the current range's sql.
-	 *
-	 */
-	public function get_range_sql( $range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date' ) {
+            '30_days'   => __( 'Last 30 days', 'invoicing' ),
+            '60_days'   => __( 'Last 60 days', 'invoicing' ),
+            '90_days'   => __( 'Last 90 days', 'invoicing' ),
+            '180_days'  => __( 'Last 180 days', 'invoicing' ),
+            '360_days'  => __( 'Last 360 days', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Retrieves the current range's sql.
+     *
+     */
+    public function get_range_sql( $range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date' ) {
 
         // Prepare durations.
         $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
+        $seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
+        $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
+        $ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
+        $sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
+        $one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
+        $three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
 
         $ranges = array(
 
@@ -91,130 +91,130 @@ 
             '7_days'    => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$seven_days_ago' AND '$today'",
-			),
+            ),
 
-			'30_days'   => array(
+            '30_days'   => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$thirty_days_ago' AND '$today'",
-			),
+            ),
 
-			'60_days'   => array(
+            '60_days'   => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$sixty_days_ago' AND '$today'",
-			),
+            ),
 
-			'90_days'   => array(
+            '90_days'   => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$ninety_days_ago' AND '$today'",
-			),
+            ),
 
-			'180_days'  => array(
+            '180_days'  => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$one_eighty_days_ago' AND '$today'",
-			),
+            ),
 
-			'360_days'  => array(
+            '360_days'  => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$three_sixty_days_ago' AND '$today'",
             ),
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges['7_days'];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Retrieves the hours in a day
-	 *
-	 */
-	public function get_hours_in_a_day() {
-
-		return array(
-			'12AM' => __( '12 AM', 'invoicing' ),
-			'1AM'  => __( '1 AM', 'invoicing' ),
-			'2AM'  => __( '2 AM', 'invoicing' ),
-			'3AM'  => __( '3 AM', 'invoicing' ),
-			'4AM'  => __( '4 AM', 'invoicing' ),
-			'5AM'  => __( '5 AM', 'invoicing' ),
-			'6AM'  => __( '6 AM', 'invoicing' ),
-			'7AM'  => __( '7 AM', 'invoicing' ),
-			'8AM'  => __( '8 AM', 'invoicing' ),
-			'9AM'  => __( '9 AM', 'invoicing' ),
-			'10AM' => __( '10 AM', 'invoicing' ),
-			'11AM' => __( '11 AM', 'invoicing' ),
-			'12pm' => __( '12 PM', 'invoicing' ),
-			'1PM'  => __( '1 PM', 'invoicing' ),
-			'2PM'  => __( '2 PM', 'invoicing' ),
-			'3PM'  => __( '3 PM', 'invoicing' ),
-			'4PM'  => __( '4 PM', 'invoicing' ),
-			'5PM'  => __( '5 PM', 'invoicing' ),
-			'6PM'  => __( '6 PM', 'invoicing' ),
-			'7PM'  => __( '7 PM', 'invoicing' ),
-			'8PM'  => __( '8 PM', 'invoicing' ),
-			'9PM'  => __( '9 PM', 'invoicing' ),
-			'10PM' => __( '10 PM', 'invoicing' ),
-			'11PM' => __( '11 PM', 'invoicing' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves the days in a period
-	 *
-	 */
-	public function get_days_in_period( $days ) {
-
-		$return = array();
-		$format = 'Y-m-d';
-
-		if ( $days < 8 ) {
-			$format = 'D';
-		}
-
-		if ( $days < 32 ) {
-			$format = 'M j';
-		}
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Retrieves the weeks in a period
-	 *
-	 */
-	public function get_weeks_in_period( $days ) {
-
-		$return = array();
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-		?>
+        $sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges['7_days'];
+        return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+
+    }
+
+    /**
+     * Retrieves the hours in a day
+     *
+     */
+    public function get_hours_in_a_day() {
+
+        return array(
+            '12AM' => __( '12 AM', 'invoicing' ),
+            '1AM'  => __( '1 AM', 'invoicing' ),
+            '2AM'  => __( '2 AM', 'invoicing' ),
+            '3AM'  => __( '3 AM', 'invoicing' ),
+            '4AM'  => __( '4 AM', 'invoicing' ),
+            '5AM'  => __( '5 AM', 'invoicing' ),
+            '6AM'  => __( '6 AM', 'invoicing' ),
+            '7AM'  => __( '7 AM', 'invoicing' ),
+            '8AM'  => __( '8 AM', 'invoicing' ),
+            '9AM'  => __( '9 AM', 'invoicing' ),
+            '10AM' => __( '10 AM', 'invoicing' ),
+            '11AM' => __( '11 AM', 'invoicing' ),
+            '12pm' => __( '12 PM', 'invoicing' ),
+            '1PM'  => __( '1 PM', 'invoicing' ),
+            '2PM'  => __( '2 PM', 'invoicing' ),
+            '3PM'  => __( '3 PM', 'invoicing' ),
+            '4PM'  => __( '4 PM', 'invoicing' ),
+            '5PM'  => __( '5 PM', 'invoicing' ),
+            '6PM'  => __( '6 PM', 'invoicing' ),
+            '7PM'  => __( '7 PM', 'invoicing' ),
+            '8PM'  => __( '8 PM', 'invoicing' ),
+            '9PM'  => __( '9 PM', 'invoicing' ),
+            '10PM' => __( '10 PM', 'invoicing' ),
+            '11PM' => __( '11 PM', 'invoicing' ),
+        );
+
+    }
+
+    /**
+     * Retrieves the days in a period
+     *
+     */
+    public function get_days_in_period( $days ) {
+
+        $return = array();
+        $format = 'Y-m-d';
+
+        if ( $days < 8 ) {
+            $format = 'D';
+        }
+
+        if ( $days < 32 ) {
+            $format = 'M j';
+        }
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Retrieves the weeks in a period
+     *
+     */
+    public function get_weeks_in_period( $days ) {
+
+        $return = array();
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+        ?>
 
 			<div class="row">
 				<div class="col-12">
@@ -228,20 +228,20 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function prepare_stats();
-
-	/**
-	 * Displays the actual report.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function display_stats();
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function prepare_stats();
+
+    /**
+     * Displays the actual report.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function display_stats();
 
 }

Spacing +59 added lines, -59 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Abstract_Report Class.
@@ -32,8 +32,8 @@ 
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -47,34 +47,34 @@ 
 	public function get_periods() {
 
 		$periods = array(
-            'today'     => __( 'Today', 'invoicing' ),
-            'yesterday' => __( 'Yesterday', 'invoicing' ),
-            '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
+            'today'     => __('Today', 'invoicing'),
+            'yesterday' => __('Yesterday', 'invoicing'),
+            '7_days'    => __('Last 7 days', 'invoicing'),
+			'30_days'   => __('Last 30 days', 'invoicing'),
+			'60_days'   => __('Last 60 days', 'invoicing'),
+			'90_days'   => __('Last 90 days', 'invoicing'),
+			'180_days'  => __('Last 180 days', 'invoicing'),
+			'360_days'  => __('Last 360 days', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
 	 * Retrieves the current range's sql.
 	 *
 	 */
-	public function get_range_sql( $range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date' ) {
+	public function get_range_sql($range, $date = 'CAST(meta.completed_date AS DATE)', $datetime = 'meta.comlpeted_date') {
 
         // Prepare durations.
-        $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $today = current_time('Y-m-d');
+		$yesterday            = date('Y-m-d', strtotime('-1 day', current_time('timestamp')));
+		$seven_days_ago       = date('Y-m-d', strtotime('-7 days', current_time('timestamp')));
+		$thirty_days_ago      = date('Y-m-d', strtotime('-30 days', current_time('timestamp')));
+		$ninety_days_ago      = date('Y-m-d', strtotime('-90 days', current_time('timestamp')));
+		$sixty_days_ago       = date('Y-m-d', strtotime('-60 days', current_time('timestamp')));
+		$one_eighty_days_ago  = date('Y-m-d', strtotime('-180 days', current_time('timestamp')));
+		$three_sixty_days_ago = date('Y-m-d', strtotime('-360 days', current_time('timestamp')));
 
         $ranges = array(
 
@@ -120,8 +120,8 @@ 
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges['7_days'];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+		$sql = isset($ranges[$range]) ? $ranges[$range] : $ranges['7_days'];
+		return apply_filters('getpaid_earning_graphs_get_range_sql', $sql, $range);
 
 	}
 
@@ -132,30 +132,30 @@ 
 	public function get_hours_in_a_day() {
 
 		return array(
-			'12AM' => __( '12 AM', 'invoicing' ),
-			'1AM'  => __( '1 AM', 'invoicing' ),
-			'2AM'  => __( '2 AM', 'invoicing' ),
-			'3AM'  => __( '3 AM', 'invoicing' ),
-			'4AM'  => __( '4 AM', 'invoicing' ),
-			'5AM'  => __( '5 AM', 'invoicing' ),
-			'6AM'  => __( '6 AM', 'invoicing' ),
-			'7AM'  => __( '7 AM', 'invoicing' ),
-			'8AM'  => __( '8 AM', 'invoicing' ),
-			'9AM'  => __( '9 AM', 'invoicing' ),
-			'10AM' => __( '10 AM', 'invoicing' ),
-			'11AM' => __( '11 AM', 'invoicing' ),
-			'12pm' => __( '12 PM', 'invoicing' ),
-			'1PM'  => __( '1 PM', 'invoicing' ),
-			'2PM'  => __( '2 PM', 'invoicing' ),
-			'3PM'  => __( '3 PM', 'invoicing' ),
-			'4PM'  => __( '4 PM', 'invoicing' ),
-			'5PM'  => __( '5 PM', 'invoicing' ),
-			'6PM'  => __( '6 PM', 'invoicing' ),
-			'7PM'  => __( '7 PM', 'invoicing' ),
-			'8PM'  => __( '8 PM', 'invoicing' ),
-			'9PM'  => __( '9 PM', 'invoicing' ),
-			'10PM' => __( '10 PM', 'invoicing' ),
-			'11PM' => __( '11 PM', 'invoicing' ),
+			'12AM' => __('12 AM', 'invoicing'),
+			'1AM'  => __('1 AM', 'invoicing'),
+			'2AM'  => __('2 AM', 'invoicing'),
+			'3AM'  => __('3 AM', 'invoicing'),
+			'4AM'  => __('4 AM', 'invoicing'),
+			'5AM'  => __('5 AM', 'invoicing'),
+			'6AM'  => __('6 AM', 'invoicing'),
+			'7AM'  => __('7 AM', 'invoicing'),
+			'8AM'  => __('8 AM', 'invoicing'),
+			'9AM'  => __('9 AM', 'invoicing'),
+			'10AM' => __('10 AM', 'invoicing'),
+			'11AM' => __('11 AM', 'invoicing'),
+			'12pm' => __('12 PM', 'invoicing'),
+			'1PM'  => __('1 PM', 'invoicing'),
+			'2PM'  => __('2 PM', 'invoicing'),
+			'3PM'  => __('3 PM', 'invoicing'),
+			'4PM'  => __('4 PM', 'invoicing'),
+			'5PM'  => __('5 PM', 'invoicing'),
+			'6PM'  => __('6 PM', 'invoicing'),
+			'7PM'  => __('7 PM', 'invoicing'),
+			'8PM'  => __('8 PM', 'invoicing'),
+			'9PM'  => __('9 PM', 'invoicing'),
+			'10PM' => __('10 PM', 'invoicing'),
+			'11PM' => __('11 PM', 'invoicing'),
 		);
 
 	}
@@ -164,24 +164,24 @@ 
 	 * Retrieves the days in a period
 	 *
 	 */
-	public function get_days_in_period( $days ) {
+	public function get_days_in_period($days) {
 
 		$return = array();
 		$format = 'Y-m-d';
 
-		if ( $days < 8 ) {
+		if ($days < 8) {
 			$format = 'D';
 		}
 
-		if ( $days < 32 ) {
+		if ($days < 32) {
 			$format = 'M j';
 		}
 
-		while ( $days > 0 ) {
+		while ($days > 0) {
 
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
+			$key            = date('Y-m-d', strtotime("-$days days", current_time('timestamp')));
+			$label          = date_i18n($format, strtotime("-$days days", current_time('timestamp')));
+			$return[$key] = $label;
 			$days--;
 
 		}
@@ -193,15 +193,15 @@ 
 	 * Retrieves the weeks in a period
 	 *
 	 */
-	public function get_weeks_in_period( $days ) {
+	public function get_weeks_in_period($days) {
 
 		$return = array();
 
-		while ( $days > 0 ) {
+		while ($days > 0) {
 
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
+			$key            = date('W', strtotime("-$days days", current_time('timestamp')));
+			$label          = date_i18n('Y-m-d', strtotime("-$days days", current_time('timestamp')));
+			$return[$key] = $label;
 			$days--;
 
 		}