AyeCode / invoicing

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/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--;
 
 		}

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

Indentation +82 added lines, -82 removed lines

@@ -12,23 +12,23 @@ 
  */
 class GetPaid_Reports_Report_Items extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'item_name';
-
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$table2     = $wpdb->prefix . 'getpaid_invoice_items';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'item_name';
+
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $table2     = $wpdb->prefix . 'getpaid_invoice_items';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				item.item_name AS item_name,
 				item.item_id AS item_id,
 				SUM(price) as total
@@ -43,91 +43,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_items_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_items_graphs_get_sql', $sql, $range );
 
-	}
+    }
 
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'item_name' => strip_tags( $stat->item_name ),
-				);
+                $normalized[] = array(
+                    'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'item_name' => strip_tags( $stat->item_name ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'item_name' => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'item_name' => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'item_name' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'item_name' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-items"></canvas>
 
@@ -156,6 +156,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Items Class.
@@ -21,12 +21,12 @@ 
 	 * Retrieves the earning sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
 		$table2     = $wpdb->prefix . 'getpaid_invoice_items';
-		$clauses    = $this->get_range_sql( $range );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				item.item_name AS item_name,
@@ -43,7 +43,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_items_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_items_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -53,30 +53,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'item_name' => strip_tags( $stat->item_name ),
+					'total'     => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'item_name' => strip_tags($stat->item_name),
 				);
 
 			}
@@ -84,11 +84,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'item_name' => esc_html__( 'Others', 'invoicing' ),
+				'total'     => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'item_name' => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -102,10 +102,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -119,7 +119,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'item_name' );
+		return wp_list_pluck($this->stats, 'item_name');
 	}
 
 	/**
@@ -140,8 +140,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( wp_kses_post_deep( $this->get_labels() ) ); ?>,
-								'datasets': [ <?php echo wp_json_encode( wp_kses_post_deep( $this->get_data() ) ); ?> ]
+								'labels': <?php echo wp_json_encode(wp_kses_post_deep($this->get_labels())); ?>,
+								'datasets': [ <?php echo wp_json_encode(wp_kses_post_deep($this->get_data())); ?> ]
 							},
 							options: {
 								legend: {

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

Indentation +133 added lines, -133 removed lines

@@ -12,43 +12,43 @@ 
  */
 class GetPaid_Reports_Report_Earnings extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * Retrieves the earning graphs.
-	 *
-	 */
-	public function get_graphs() {
+    /**
+     * Retrieves the earning graphs.
+     *
+     */
+    public function get_graphs() {
 
-		$graphs = array(
+        $graphs = array(
 
             'total'      => __( 'Earnings', 'invoicing' ),
             'discount'   => __( 'Discount', 'invoicing' ),
-			'fees_total' => __( 'Fees', 'invoicing' ),
-			'tax'        => __( 'Tax', 'invoicing' ),
+            'fees_total' => __( 'Fees', 'invoicing' ),
+            'tax'        => __( 'Tax', 'invoicing' ),
 
-		);
+        );
 
-		return apply_filters( 'getpaid_earning_graphs', $graphs );
+        return apply_filters( 'getpaid_earning_graphs', $graphs );
 
-	}
+    }
 
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
 
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-		$graphs     = array_keys( $this->get_graphs() );
-		$graphs_sql = array();
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+        $graphs     = array_keys( $this->get_graphs() );
+        $graphs_sql = array();
 
-		foreach ( $graphs as $graph ) {
-			$graphs_sql[] = "SUM( meta.$graph ) AS $graph";
-		}
+        foreach ( $graphs as $graph ) {
+            $graphs_sql[] = "SUM( meta.$graph ) AS $graph";
+        }
 
-		$graphs_sql = implode( ', ', $graphs_sql );
-		$sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
+        $graphs_sql = implode( ', ', $graphs_sql );
+        $sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
             FROM $wpdb->posts
             LEFT JOIN $table as meta ON meta.post_id = $wpdb->posts.ID
             WHERE meta.post_id IS NOT NULL
@@ -58,94 +58,94 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-		return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-	}
-
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels( $range ) {
-
-		$labels = array(
-			'today'     => $this->get_hours_in_a_day(),
-			'yesterday' => $this->get_hours_in_a_day(),
-			'7_days'    => $this->get_days_in_period( 7 ),
-			'30_days'   => $this->get_days_in_period( 30 ),
-			'60_days'   => $this->get_days_in_period( 60 ),
-			'90_days'   => $this->get_weeks_in_period( 90 ),
-			'180_days'  => $this->get_weeks_in_period( 180 ),
-			'360_days'  => $this->get_weeks_in_period( 360 ),
-		);
-
-		$label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels['7_days'];
-		return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
-	}
-
-	/**
-	 * Retrieves report datasets.
-	 *
-	 */
-	public function get_datasets( $labels ) {
-
-		$datasets = array();
-
-		foreach ( $this->get_graphs() as $key => $label ) {
-			$datasets[ $key ] = array(
-				'label' => $label,
-				'data'  => $this->get_data( $key, $labels ),
-			);
-		}
-
-		return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
-	}
-
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data( $key, $labels ) {
-
-		$data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
-		$prepared = array();
-
-		foreach ( $labels as $label ) {
-
-			$value = 0;
-			if ( isset( $data[ $label ] ) ) {
-				$value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
-			}
-
-			$prepared[] = $value;
-		}
-
-		return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
-
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-
-		$labels     = $this->get_labels( $this->get_range() );
-		$chart_data = array(
-			'labels'   => array_values( $labels ),
-			'datasets' => $this->get_datasets( array_keys( $labels ) ),
-		);
-
-		?>
+        return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
+
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+    }
+
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels( $range ) {
+
+        $labels = array(
+            'today'     => $this->get_hours_in_a_day(),
+            'yesterday' => $this->get_hours_in_a_day(),
+            '7_days'    => $this->get_days_in_period( 7 ),
+            '30_days'   => $this->get_days_in_period( 30 ),
+            '60_days'   => $this->get_days_in_period( 60 ),
+            '90_days'   => $this->get_weeks_in_period( 90 ),
+            '180_days'  => $this->get_weeks_in_period( 180 ),
+            '360_days'  => $this->get_weeks_in_period( 360 ),
+        );
+
+        $label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels['7_days'];
+        return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
+    }
+
+    /**
+     * Retrieves report datasets.
+     *
+     */
+    public function get_datasets( $labels ) {
+
+        $datasets = array();
+
+        foreach ( $this->get_graphs() as $key => $label ) {
+            $datasets[ $key ] = array(
+                'label' => $label,
+                'data'  => $this->get_data( $key, $labels ),
+            );
+        }
+
+        return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
+    }
+
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data( $key, $labels ) {
+
+        $data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
+        $prepared = array();
+
+        foreach ( $labels as $label ) {
+
+            $value = 0;
+            if ( isset( $data[ $label ] ) ) {
+                $value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
+            }
+
+            $prepared[] = $value;
+        }
+
+        return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
+
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+
+        $labels     = $this->get_labels( $this->get_range() );
+        $chart_data = array(
+            'labels'   => array_values( $labels ),
+            'datasets' => $this->get_datasets( array_keys( $labels ) ),
+        );
+
+        ?>
 
 			<?php foreach ( $chart_data['datasets'] as $key => $dataset ) : ?>
 				<div class="row mb-4">
@@ -165,15 +165,15 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_graph( $key, $dataset, $labels ) {
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_graph( $key, $dataset, $labels ) {
 
-		?>
+        ?>
 
 		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>"></canvas>
 
@@ -223,20 +223,20 @@ 
 		</script>
 
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {}
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {}
 
-	/**
-	 * Displays the range selector.
-	 *
-	 */
-	public function display_range_selector() {
+    /**
+     * Displays the range selector.
+     *
+     */
+    public function display_range_selector() {
 
-	}
+    }
 
 }

Spacing +45 added lines, -45 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Earnings Class.
@@ -20,14 +20,14 @@ 
 
 		$graphs = array(
 
-            'total'      => __( 'Earnings', 'invoicing' ),
-            'discount'   => __( 'Discount', 'invoicing' ),
-			'fees_total' => __( 'Fees', 'invoicing' ),
-			'tax'        => __( 'Tax', 'invoicing' ),
+            'total'      => __('Earnings', 'invoicing'),
+            'discount'   => __('Discount', 'invoicing'),
+			'fees_total' => __('Fees', 'invoicing'),
+			'tax'        => __('Tax', 'invoicing'),
 
 		);
 
-		return apply_filters( 'getpaid_earning_graphs', $graphs );
+		return apply_filters('getpaid_earning_graphs', $graphs);
 
 	}
 
@@ -35,19 +35,19 @@ 
 	 * Retrieves the earning sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-		$graphs     = array_keys( $this->get_graphs() );
+		$clauses    = $this->get_range_sql($range);
+		$graphs     = array_keys($this->get_graphs());
 		$graphs_sql = array();
 
-		foreach ( $graphs as $graph ) {
+		foreach ($graphs as $graph) {
 			$graphs_sql[] = "SUM( meta.$graph ) AS $graph";
 		}
 
-		$graphs_sql = implode( ', ', $graphs_sql );
+		$graphs_sql = implode(', ', $graphs_sql);
 		$sql        = "SELECT {$clauses[0]} AS completed_date, $graphs_sql
             FROM $wpdb->posts
             LEFT JOIN $table as meta ON meta.post_id = $wpdb->posts.ID
@@ -58,7 +58,7 @@ 
             GROUP BY {$clauses[0]}
         ";
 
-		return apply_filters( 'getpaid_earning_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_earning_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -68,68 +68,68 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
 	}
 
 	/**
 	 * Retrieves report labels.
 	 *
 	 */
-	public function get_labels( $range ) {
+	public function get_labels($range) {
 
 		$labels = array(
 			'today'     => $this->get_hours_in_a_day(),
 			'yesterday' => $this->get_hours_in_a_day(),
-			'7_days'    => $this->get_days_in_period( 7 ),
-			'30_days'   => $this->get_days_in_period( 30 ),
-			'60_days'   => $this->get_days_in_period( 60 ),
-			'90_days'   => $this->get_weeks_in_period( 90 ),
-			'180_days'  => $this->get_weeks_in_period( 180 ),
-			'360_days'  => $this->get_weeks_in_period( 360 ),
+			'7_days'    => $this->get_days_in_period(7),
+			'30_days'   => $this->get_days_in_period(30),
+			'60_days'   => $this->get_days_in_period(60),
+			'90_days'   => $this->get_weeks_in_period(90),
+			'180_days'  => $this->get_weeks_in_period(180),
+			'360_days'  => $this->get_weeks_in_period(360),
 		);
 
-		$label = isset( $labels[ $range ] ) ? $labels[ $range ] : $labels['7_days'];
-		return apply_filters( 'getpaid_earning_graphs_get_labels', $label, $range );
+		$label = isset($labels[$range]) ? $labels[$range] : $labels['7_days'];
+		return apply_filters('getpaid_earning_graphs_get_labels', $label, $range);
 	}
 
 	/**
 	 * Retrieves report datasets.
 	 *
 	 */
-	public function get_datasets( $labels ) {
+	public function get_datasets($labels) {
 
 		$datasets = array();
 
-		foreach ( $this->get_graphs() as $key => $label ) {
-			$datasets[ $key ] = array(
+		foreach ($this->get_graphs() as $key => $label) {
+			$datasets[$key] = array(
 				'label' => $label,
-				'data'  => $this->get_data( $key, $labels ),
+				'data'  => $this->get_data($key, $labels),
 			);
 		}
 
-		return apply_filters( 'getpaid_earning_graphs_get_datasets', $datasets, $labels );
+		return apply_filters('getpaid_earning_graphs_get_datasets', $datasets, $labels);
 	}
 
 	/**
 	 * Retrieves report data.
 	 *
 	 */
-	public function get_data( $key, $labels ) {
+	public function get_data($key, $labels) {
 
-		$data     = wp_list_pluck( $this->stats, $key, 'completed_date' );
+		$data     = wp_list_pluck($this->stats, $key, 'completed_date');
 		$prepared = array();
 
-		foreach ( $labels as $label ) {
+		foreach ($labels as $label) {
 
 			$value = 0;
-			if ( isset( $data[ $label ] ) ) {
-				$value = wpinv_round_amount( wpinv_sanitize_amount( $data[ $label ] ) );
+			if (isset($data[$label])) {
+				$value = wpinv_round_amount(wpinv_sanitize_amount($data[$label]));
 			}
 
 			$prepared[] = $value;
 		}
 
-		return apply_filters( 'getpaid_earning_graphs_get_data', $prepared, $key, $labels );
+		return apply_filters('getpaid_earning_graphs_get_data', $prepared, $key, $labels);
 
 	}
 
@@ -139,24 +139,24 @@ 
 	 */
 	public function display() {
 
-		$labels     = $this->get_labels( $this->get_range() );
+		$labels     = $this->get_labels($this->get_range());
 		$chart_data = array(
-			'labels'   => array_values( $labels ),
-			'datasets' => $this->get_datasets( array_keys( $labels ) ),
+			'labels'   => array_values($labels),
+			'datasets' => $this->get_datasets(array_keys($labels)),
 		);
 
 		?>
 
-			<?php foreach ( $chart_data['datasets'] as $key => $dataset ) : ?>
+			<?php foreach ($chart_data['datasets'] as $key => $dataset) : ?>
 				<div class="row mb-4">
 					<div class="col-12">
 						<div class="card m-0 p-0" style="max-width:100%">
 							<div class="card-header d-flex align-items-center">
-								<strong class="flex-grow-1"><?php echo esc_html( $dataset['label'] ); ?></strong>
+								<strong class="flex-grow-1"><?php echo esc_html($dataset['label']); ?></strong>
 								<?php $this->display_range_selector(); ?>
 							</div>
 							<div class="card-body">
-								<?php $this->display_graph( $key, $dataset, $chart_data['labels'] ); ?>
+								<?php $this->display_graph($key, $dataset, $chart_data['labels']); ?>
 							</div>
 						</div>
 					</div>
@@ -171,26 +171,26 @@ 
 	 * Displays the actual report.
 	 *
 	 */
-	public function display_graph( $key, $dataset, $labels ) {
+	public function display_graph($key, $dataset, $labels) {
 
 		?>
 
-		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>"></canvas>
+		<canvas id="getpaid-chartjs-earnings-<?php echo esc_attr($key); ?>"></canvas>
 
 		<script>
 			window.addEventListener( 'DOMContentLoaded', function() {
 
-				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo esc_attr( $key ); ?>' ).getContext('2d');
+				var ctx = document.getElementById( 'getpaid-chartjs-earnings-<?php echo esc_attr($key); ?>' ).getContext('2d');
 				new Chart(
 					ctx,
 					{
 						type: 'line',
 						data: {
-							'labels': <?php echo wp_json_encode( wpinv_clean( $labels ) ); ?>,
+							'labels': <?php echo wp_json_encode(wpinv_clean($labels)); ?>,
 							'datasets': [
 								{
-									label: '<?php echo esc_attr( $dataset['label'] ); ?>',
-									data: <?php echo wp_json_encode( wpinv_clean( $dataset['data'] ) ); ?>,
+									label: '<?php echo esc_attr($dataset['label']); ?>',
+									data: <?php echo wp_json_encode(wpinv_clean($dataset['data'])); ?>,
 									backgroundColor: 'rgba(54, 162, 235, 0.1)',
 									borderColor: 'rgb(54, 162, 235)',
 									borderWidth: 4,

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

Indentation +81 added lines, -81 removed lines

@@ -12,22 +12,22 @@ 
  */
 class GetPaid_Reports_Report_Discounts extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'discount_code';
-
-	/**
-	 * Retrieves the discounts sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'discount_code';
+
+    /**
+     * Retrieves the discounts sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				meta.discount_code AS discount_code,
 				SUM(total) as total
             FROM $wpdb->posts
@@ -41,91 +41,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
 
-	}
+    }
 
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'discount_code' => strip_tags( $stat->discount_code ),
-				);
+                $normalized[] = array(
+                    'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'discount_code' => strip_tags( $stat->discount_code ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'discount_code' => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'discount_code' => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'discount_code' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-discount_code"></canvas>
 
@@ -154,6 +154,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Discounts Class.
@@ -21,11 +21,11 @@ 
 	 * Retrieves the discounts sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				meta.discount_code AS discount_code,
@@ -41,7 +41,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_discounts_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -51,30 +51,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'discount_code' => strip_tags( $stat->discount_code ),
+					'total'         => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'discount_code' => strip_tags($stat->discount_code),
 				);
 
 			}
@@ -82,11 +82,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'discount_code' => esc_html__( 'Others', 'invoicing' ),
+				'total'         => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'discount_code' => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -100,10 +100,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -117,7 +117,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
+		return wp_list_pluck($this->stats, 'discount_code');
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( wpinv_clean( $this->get_labels() ) ); ?>,
-								'datasets': [ <?php echo wp_json_encode( wpinv_clean( $this->get_data() ) ); ?> ]
+								'labels': <?php echo wp_json_encode(wpinv_clean($this->get_labels())); ?>,
+								'datasets': [ <?php echo wp_json_encode(wpinv_clean($this->get_data())); ?> ]
 							},
 							options: {
 								legend: {