Strikewood / woocommerce-first-atlantic-commerce

woocommerce-first-atlantic-commerce.php

Spacing +16 added lines, -16 removed lines

@@ -10,49 +10,49 @@
  * License URI: https://github.com/Strikewood/woocommerce-first-atlantic-commerce/blob/master/LICENSE
  */
 
-if ( !defined('ABSPATH') ) exit;
+if ( !defined( 'ABSPATH' ) ) exit;
 
 function woocommerce_init_fac_gateway()
 {
     // Make sure WooCommerce is available
-    if ( !class_exists('WC_Payment_Gateway') ) return;
+    if ( !class_exists( 'WC_Payment_Gateway' ) ) return;
 
     // Localisation
-    load_plugin_textdomain('wc-gateway-fac', false, dirname( plugin_basename(__FILE__) ) . '/languages');
+    load_plugin_textdomain( 'wc-gateway-fac', false, dirname( plugin_basename( __FILE__ ) ).'/languages' );
 
     // Our classes and depdencies (if not using composer)
-    if ( is_file( dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php' ) ) require_once('vendor/autoload.php');
+    if ( is_file( dirname( __FILE__ ).DIRECTORY_SEPARATOR.'vendor/autoload.php' ) ) require_once('vendor/autoload.php');
 
     // Make sure the FAC class was autoloaded
-    if ( !class_exists('WC_Gateway_FirstAtlanticCommerce') ) return;
+    if ( !class_exists( 'WC_Gateway_FirstAtlanticCommerce' ) ) return;
 
     // Register the gateway in WC
-    function woocommerce_register_fac_gateway($methods)
+    function woocommerce_register_fac_gateway( $methods )
     {
         $methods[] = 'WC_Gateway_FirstAtlanticCommerce';
 
         return $methods;
     }
-    add_filter('woocommerce_payment_gateways', 'woocommerce_register_fac_gateway');
+    add_filter( 'woocommerce_payment_gateways', 'woocommerce_register_fac_gateway' );
 
-    function woocommerce_fac_process_payment($order_id)
+    function woocommerce_fac_process_payment( $order_id )
     {
         $fac = new WC_Gateway_FirstAtlanticCommerce;
 
-        $fac->process_payment($order_id);
+        $fac->process_payment( $order_id );
     }
 
-    function woocommerce_fac_process_refund($order_id)
+    function woocommerce_fac_process_refund( $order_id )
     {
         $fac = new WC_Gateway_FirstAtlanticCommerce;
 
-        $fac->process_refund($order_id);
+        $fac->process_refund( $order_id );
     }
 
     // Actions to capture or void authorized transactions
-    add_action('woocommerce_order_status_on-hold_to_processing', 'woocommerce_fac_process_payment');
-    add_action('woocommerce_order_status_on-hold_to_completed', 'woocommerce_fac_process_payment');
-    add_action('woocommerce_order_status_on-hold_to_cancelled', 'woocommerce_fac_process_refund');
-    add_action('woocommerce_order_status_on-hold_to_refunded', 'woocommerce_fac_process_refund');
+    add_action( 'woocommerce_order_status_on-hold_to_processing', 'woocommerce_fac_process_payment' );
+    add_action( 'woocommerce_order_status_on-hold_to_completed', 'woocommerce_fac_process_payment' );
+    add_action( 'woocommerce_order_status_on-hold_to_cancelled', 'woocommerce_fac_process_refund' );
+    add_action( 'woocommerce_order_status_on-hold_to_refunded', 'woocommerce_fac_process_refund' );
 }
-add_action('plugins_loaded', 'woocommerce_init_fac_gateway', 0);
+add_action( 'plugins_loaded', 'woocommerce_init_fac_gateway', 0 );

Braces +16 added lines, -12 removed lines

@@ -10,40 +10,44 @@
  * License URI: https://github.com/Strikewood/woocommerce-first-atlantic-commerce/blob/master/LICENSE
  */
 
-if ( !defined('ABSPATH') ) exit;
+if ( !defined('ABSPATH') ) {
+    exit;
+}
 
-function woocommerce_init_fac_gateway()
-{
+function woocommerce_init_fac_gateway() {
     // Make sure WooCommerce is available
-    if ( !class_exists('WC_Payment_Gateway') ) return;
+    if ( !class_exists('WC_Payment_Gateway') ) {
+        return;
+    }
 
     // Localisation
     load_plugin_textdomain('wc-gateway-fac', false, dirname( plugin_basename(__FILE__) ) . '/languages');
 
     // Our classes and depdencies (if not using composer)
-    if ( is_file( dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php' ) ) require_once('vendor/autoload.php');
+    if ( is_file( dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php' ) ) {
+        require_once('vendor/autoload.php');
+    }
 
     // Make sure the FAC class was autoloaded
-    if ( !class_exists('WC_Gateway_FirstAtlanticCommerce') ) return;
+    if ( !class_exists('WC_Gateway_FirstAtlanticCommerce') ) {
+        return;
+    }
 
     // Register the gateway in WC
-    function woocommerce_register_fac_gateway($methods)
-    {
+    function woocommerce_register_fac_gateway($methods) {
         $methods[] = 'WC_Gateway_FirstAtlanticCommerce';
 
         return $methods;
     }
     add_filter('woocommerce_payment_gateways', 'woocommerce_register_fac_gateway');
 
-    function woocommerce_fac_process_payment($order_id)
-    {
+    function woocommerce_fac_process_payment($order_id) {
         $fac = new WC_Gateway_FirstAtlanticCommerce;
 
         $fac->process_payment($order_id);
     }
 
-    function woocommerce_fac_process_refund($order_id)
-    {
+    function woocommerce_fac_process_refund($order_id) {
         $fac = new WC_Gateway_FirstAtlanticCommerce;
 
         $fac->process_refund($order_id);

includes/class-wc-gateway-fac.php

Spacing +100 added lines, -100 removed lines

@@ -4,7 +4,7 @@ 
 use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Common\Exception\OmnipayException;
 
-if ( !defined('ABSPATH') ) exit;
+if ( !defined( 'ABSPATH' ) ) exit;
 
 /**
  * WC_Gateway_FirstAtlanticCommerce class
@@ -19,8 +19,8 @@ 
     public function __construct()
     {
         $this->id                 = 'fac';
-        $this->method_title       = __('First Atlantic Commerce', 'wc-gateway-fac');
-        $this->method_description = __('First Atlantic Commerce works by adding credit card fields on the checkout and then sending the details to First Atlantic Commerce for verification.', 'wc-gateway-fac');
+        $this->method_title       = __( 'First Atlantic Commerce', 'wc-gateway-fac' );
+        $this->method_description = __( 'First Atlantic Commerce works by adding credit card fields on the checkout and then sending the details to First Atlantic Commerce for verification.', 'wc-gateway-fac' );
         $this->has_fields         = true;
         $this->supports           = [
             //'subscriptions',
@@ -43,18 +43,18 @@ 
         $this->init_settings();
 
         // User defined settings
-        $this->title             = $this->get_option('title');
-        $this->description       = $this->get_option('description');
-        $this->enabled           = $this->get_option('enabled');
-        $this->testmode          = 'yes' === $this->get_option('testmode', 'no');
-        $this->capture           = $this->get_option('capture', "yes") === "yes" ? true : false;
+        $this->title             = $this->get_option( 'title' );
+        $this->description       = $this->get_option( 'description' );
+        $this->enabled           = $this->get_option( 'enabled' );
+        $this->testmode          = 'yes' === $this->get_option( 'testmode', 'no' );
+        $this->capture           = $this->get_option( 'capture', "yes" ) === "yes" ? true : false;
         //$this->saved_cards       = $this->get_option( 'saved_cards' ) === "yes" ? true : false;
-        $this->merchant_id       = $this->testmode ? $this->get_option('test_merchant_id') : $this->get_option('merchant_id');
-        $this->merchant_password = $this->testmode ? $this->get_option('test_merchant_password') : $this->get_option('merchant_password');
+        $this->merchant_id       = $this->testmode ? $this->get_option( 'test_merchant_id' ) : $this->get_option( 'merchant_id' );
+        $this->merchant_password = $this->testmode ? $this->get_option( 'test_merchant_password' ) : $this->get_option( 'merchant_password' );
 
         // Hooks
-        add_action('admin_notices', [$this, 'admin_notices']);
-        add_action('woocommerce_update_options_payment_gateways_' . $this->id, [$this, 'process_admin_options']);
+        add_action( 'admin_notices', [$this, 'admin_notices'] );
+        add_action( 'woocommerce_update_options_payment_gateways_'.$this->id, [$this, 'process_admin_options'] );
     }
 
     /**
@@ -62,26 +62,26 @@ 
      */
     public function admin_notices()
     {
-        if ($this->enabled == 'no')
+        if ( $this->enabled == 'no' )
         {
             return;
         }
 
         // Check required fields
-        if (!$this->merchant_id)
+        if ( !$this->merchant_id )
         {
-            echo '<div class="error"><p>' . sprintf( __( 'First Atlantic Commerce error: Please enter your merchant id <a href="%s">here</a>', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_fac' ) ) . '</p></div>';
+            echo '<div class="error"><p>'.sprintf( __( 'First Atlantic Commerce error: Please enter your merchant id <a href="%s">here</a>', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_fac' ) ).'</p></div>';
             return;
         }
-        elseif (!$this->merchant_password)
+        elseif ( !$this->merchant_password )
         {
-            echo '<div class="error"><p>' . sprintf( __( 'First Atlantic Commerce error: Please enter your merchant password <a href="%s">here</a>', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_fac' ) ) . '</p></div>';
+            echo '<div class="error"><p>'.sprintf( __( 'First Atlantic Commerce error: Please enter your merchant password <a href="%s">here</a>', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_fac' ) ).'</p></div>';
             return;
         }
 
         // Check if enabled and force SSL is disabled
-        if ( get_option('woocommerce_force_ssl_checkout') == 'no' ) {
-            echo '<div class="error"><p>' . sprintf( __( 'First Atlantic Commerce is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - First Atlantic Commerce will only work in test mode.', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ) . '</p></div>';
+        if ( get_option( 'woocommerce_force_ssl_checkout' ) == 'no' ) {
+            echo '<div class="error"><p>'.sprintf( __( 'First Atlantic Commerce is enabled, but the <a href="%s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid SSL certificate - First Atlantic Commerce will only work in test mode.', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) ).'</p></div>';
             return;
         }
     }
@@ -93,14 +93,14 @@ 
      *
      * @return void
      */
-    public function log($message)
+    public function log( $message )
     {
         if ( empty($this->log) )
         {
             $this->log = new WC_Logger();
         }
 
-        $this->log->add($this->id, $message);
+        $this->log->add( $this->id, $message );
     }
 
     /**
@@ -113,13 +113,13 @@ 
         $is_available = parent::is_available();
 
         // Only allow unencrypted connections when testing
-        if (!is_ssl() && !$this->testmode)
+        if ( !is_ssl() && !$this->testmode )
         {
             $is_available = false;
         }
 
         // Required fields check
-        if (!$this->merchant_id || !$this->merchant_password)
+        if ( !$this->merchant_id || !$this->merchant_password )
         {
             $is_available = false;
         }
@@ -132,62 +132,62 @@ 
      */
     public function init_form_fields()
     {
-        $this->form_fields = apply_filters('wc_fac_settings', [
+        $this->form_fields = apply_filters( 'wc_fac_settings', [
             'enabled' => [
-                'title'       => __('Enable/Disable', 'woocommerce-gateway-fac'),
-                'label'       => __('Enable FAC', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Enable/Disable', 'woocommerce-gateway-fac' ),
+                'label'       => __( 'Enable FAC', 'woocommerce-gateway-fac' ),
                 'type'        => 'checkbox',
                 'description' => '',
                 'default'     => 'no'
             ],
             'title' => [
-                'title'       => __('Title', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Title', 'woocommerce-gateway-fac' ),
                 'type'        => 'text',
-                'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-fac'),
-                'default'     => __('Credit card', 'woocommerce-gateway-fac')
+                'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-fac' ),
+                'default'     => __( 'Credit card', 'woocommerce-gateway-fac' )
             ],
             'description' => [
-                'title'       => __('Description', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Description', 'woocommerce-gateway-fac' ),
                 'type'        => 'textarea',
-                'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-fac'),
-                'default'     => __('Pay with your credit card.', 'woocommerce-gateway-fac')
+                'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-fac' ),
+                'default'     => __( 'Pay with your credit card.', 'woocommerce-gateway-fac' )
             ],
             'testmode' => [
-                'title'       => __('Test mode', 'woocommerce-gateway-fac'),
-                'label'       => __('Enable Test Mode', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Test mode', 'woocommerce-gateway-fac' ),
+                'label'       => __( 'Enable Test Mode', 'woocommerce-gateway-fac' ),
                 'type'        => 'checkbox',
-                'description' => __('Place the payment gateway in test mode using test API credentials.', 'woocommerce-gateway-fac'),
+                'description' => __( 'Place the payment gateway in test mode using test API credentials.', 'woocommerce-gateway-fac' ),
                 'default'     => 'yes'
             ],
             'merchant_id' => [
-                'title'       => __('Live Merchant ID', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Live Merchant ID', 'woocommerce-gateway-fac' ),
                 'type'        => 'text',
-                'description' => __('Get your API credentials from your merchant account.', 'woocommerce-gateway-fac'),
+                'description' => __( 'Get your API credentials from your merchant account.', 'woocommerce-gateway-fac' ),
                 'default'     => ''
             ],
             'merchant_password' => [
-                'title'       => __('Live Merchant Password', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Live Merchant Password', 'woocommerce-gateway-fac' ),
                 'type'        => 'text',
-                'description' => __('Get your API credentials from your merchant account.', 'woocommerce-gateway-fac'),
+                'description' => __( 'Get your API credentials from your merchant account.', 'woocommerce-gateway-fac' ),
                 'default'     => ''
             ],
             'test_merchant_id' => [
-                'title'       => __('Test Merchant ID', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Test Merchant ID', 'woocommerce-gateway-fac' ),
                 'type'        => 'text',
-                'description' => __('Get your API credentials from your merchant account.', 'woocommerce-gateway-fac'),
+                'description' => __( 'Get your API credentials from your merchant account.', 'woocommerce-gateway-fac' ),
                 'default'     => ''
             ],
             'test_merchant_password' => [
-                'title'       => __('Test Merchant Password', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Test Merchant Password', 'woocommerce-gateway-fac' ),
                 'type'        => 'text',
-                'description' => __('Get your API credentials from your merchant account.', 'woocommerce-gateway-fac'),
+                'description' => __( 'Get your API credentials from your merchant account.', 'woocommerce-gateway-fac' ),
                 'default'     => ''
             ],
             'capture' => [
-                'title'       => __('Capture', 'woocommerce-gateway-fac'),
-                'label'       => __('Capture charge immediately', 'woocommerce-gateway-fac'),
+                'title'       => __( 'Capture', 'woocommerce-gateway-fac' ),
+                'label'       => __( 'Capture charge immediately', 'woocommerce-gateway-fac' ),
                 'type'        => 'checkbox',
-                'description' => __('Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-fac'),
+                'description' => __( 'Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-fac' ),
                 'default'     => 'yes'
             ]/*,
             'saved_cards' => [
@@ -197,7 +197,7 @@ 
                 'description' => __('If enabled, users will be able to pay with a saved card during checkout. Card details are saved on FAC servers, not on your store.', 'woocommerce-gateway-fac'),
                 'default'     => 'no'
             ]*/
-        ]);
+        ] );
     }
 
     /**
@@ -205,14 +205,14 @@ 
      */
     public function setup_gateway()
     {
-        $gateway = Omnipay::create('FirstAtlanticCommerce');
+        $gateway = Omnipay::create( 'FirstAtlanticCommerce' );
 
-        $gateway->setMerchantId($this->merchant_id);
-        $gateway->setMerchantPassword($this->merchant_password);
+        $gateway->setMerchantId( $this->merchant_id );
+        $gateway->setMerchantPassword( $this->merchant_password );
 
-        if ($this->testmode)
+        if ( $this->testmode )
         {
-            $gateway->setTestMode(true);
+            $gateway->setTestMode( true );
         }
 
         return $gateway;
@@ -240,17 +240,17 @@ 
 
         if ( empty($_POST['fac-card-number']) )
         {
-            wc_add_notice( $this->get_validation_error( __('Card Number', 'woocommerce-gateway-fac'), $_POST['fac-card-number'] ), 'error' );
+            wc_add_notice( $this->get_validation_error( __( 'Card Number', 'woocommerce-gateway-fac' ), $_POST['fac-card-number'] ), 'error' );
             $validated = false;
         }
         if ( empty($_POST['fac-card-expiry']) )
         {
-            wc_add_notice( $this->get_validation_error( __('Card Expiry', 'woocommerce-gateway-fac'), $_POST['fac-card-number'] ), 'error' );
+            wc_add_notice( $this->get_validation_error( __( 'Card Expiry', 'woocommerce-gateway-fac' ), $_POST['fac-card-number'] ), 'error' );
             $validated = false;
         }
         if ( empty($_POST['fac-card-cvc']) )
         {
-            wc_add_notice( $this->get_validation_error( __('Card Code', 'woocommerce-gateway-fac'), $_POST['fac-card-number'] ), 'error' );
+            wc_add_notice( $this->get_validation_error( __( 'Card Code', 'woocommerce-gateway-fac' ), $_POST['fac-card-number'] ), 'error' );
             $validated = false;
         }
 
@@ -264,7 +264,7 @@ 
      * @param string $type
      * @return string
      */
-    protected function get_validation_error($field, $type = 'undefined')
+    protected function get_validation_error( $field, $type = 'undefined' )
     {
         if ( $type === 'invalid' )
         {
@@ -283,7 +283,7 @@ 
      *
      * @return bool
      */
-    public function can_process_order($order)
+    public function can_process_order( $order )
     {
         return $order && $order->payment_method == 'fac';
     }
@@ -295,17 +295,17 @@ 
      *
      * @return array
      */
-    public function process_payment($order_id)
+    public function process_payment( $order_id )
     {
-        $order = new WC_Order($order_id);
+        $order = new WC_Order( $order_id );
 
-        if ( !$this->can_process_order($order) ) return;
+        if ( !$this->can_process_order( $order ) ) return;
 
         $transaction = $order->get_transaction_id();
-        $captured    = get_post_meta($order_id, '_fac_captured', true);
+        $captured    = get_post_meta( $order_id, '_fac_captured', true );
 
         // Skip already captured transactions
-        if ($captured) return;
+        if ( $captured ) return;
 
         try
         {
@@ -320,13 +320,13 @@ 
             // Already authorized transactions should be captured
             if ( $transaction && !$captured )
             {
-                $response = $gateway->capture($data)->send();
+                $response = $gateway->capture( $data )->send();
             }
             else
             {
-                $card_number = str_replace( [' ', '-'], '', wc_clean($_POST['fac-card-number']) );
-                $card_cvv    = wc_clean($_POST['fac-card-cvc']);
-                $card_expiry = preg_split('/\s?\/\s?/', wc_clean($_POST['fac-card-expiry']), 2);
+                $card_number = str_replace( [' ', '-'], '', wc_clean( $_POST['fac-card-number'] ) );
+                $card_cvv    = wc_clean( $_POST['fac-card-cvc'] );
+                $card_expiry = preg_split( '/\s?\/\s?/', wc_clean( $_POST['fac-card-expiry'] ), 2 );
 
                 $data['card'] = [
                     'firstName'       => $order->billing_first_name,
@@ -345,13 +345,13 @@ 
                 ];
 
                 // Capture in one pass if enabled, otherwise authorize
-                if ($this->capture)
+                if ( $this->capture )
                 {
-                    $response = $gateway->purchase($data)->send();
+                    $response = $gateway->purchase( $data )->send();
                 }
                 else
                 {
-                    $response = $gateway->authorize($data)->send();
+                    $response = $gateway->authorize( $data )->send();
                 }
             }
 
@@ -363,23 +363,23 @@ 
                 if ( ($transaction && !$captured) || (!$transaction && $this->capture) )
                 {
                     // Store captured
-                    update_post_meta($order_id, '_fac_captured', true);
+                    update_post_meta( $order_id, '_fac_captured', true );
 
                     // Complete payment
-                    $order->payment_complete($reference);
+                    $order->payment_complete( $reference );
 
                     // Add note to order
-                    $order->add_order_note( sprintf( __('FAC transaction complete (ID: %s)', 'woocommerce-gateway-fac'), $reference ) );
+                    $order->add_order_note( sprintf( __( 'FAC transaction complete (ID: %s)', 'woocommerce-gateway-fac' ), $reference ) );
                 }
                 // Authorized transaction
                 else
                 {
                     // Store captured
-                    update_post_meta($order_id, '_transaction_id', $reference, true);
-                    update_post_meta($order_id, '_fac_captured', false);
+                    update_post_meta( $order_id, '_transaction_id', $reference, true );
+                    update_post_meta( $order_id, '_fac_captured', false );
 
                     // Mark order as on-hold and add note
-                    $order->update_status( 'on-hold', sprintf( __('FAC charge authorized (ID: %s). Process the order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-fac'), $reference ) );
+                    $order->update_status( 'on-hold', sprintf( __( 'FAC charge authorized (ID: %s). Process the order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-fac' ), $reference ) );
 
                     // Reduce stock level
                     $order->reduce_order_stock();
@@ -391,7 +391,7 @@ 
                 // Return thank you page redirect
                 return [
                     'result'   => 'success',
-                    'redirect' => $this->get_return_url($order)
+                    'redirect' => $this->get_return_url( $order )
                 ];
             }
             else
@@ -399,28 +399,28 @@ 
                 throw new InvalidResponseException( $response->getMessage(), $response->getCode() );
             }
         }
-        catch (OmnipayException $e)
+        catch ( OmnipayException $e )
         {
-            $message = 'Transaction Failed: '. $e->getCode() .' – '. $e->getMessage();
+            $message = 'Transaction Failed: '.$e->getCode().' – '.$e->getMessage();
 
-            $this->log($message);
-            $order->add_order_note( __($message, 'woocommerce-gateway-fac') );
+            $this->log( $message );
+            $order->add_order_note( __( $message, 'woocommerce-gateway-fac' ) );
 
             // Friendly declined message
             if ( in_array( $e->getCode(), [2, 3, 4, 35, 38, 39] ) )
             {
-                $message = __('Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction.', 'woocommerce') .' '. __('Please attempt your purchase again.', 'woocommerce');
+                $message = __( 'Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction.', 'woocommerce' ).' '.__( 'Please attempt your purchase again.', 'woocommerce' );
             }
 
             // Friendly error message
             else
             {
-                $message = __('Unfortunately your order cannot be processed as an error has occured.', 'woocommerce') .' '. __('Please attempt your purchase again.', 'woocommerce');
+                $message = __( 'Unfortunately your order cannot be processed as an error has occured.', 'woocommerce' ).' '.__( 'Please attempt your purchase again.', 'woocommerce' );
             }
 
-            if ( !is_admin() || ( defined('DOING_AJAX') && DOING_AJAX ) )
+            if ( !is_admin() || (defined( 'DOING_AJAX' ) && DOING_AJAX) )
             {
-                wc_add_notice($message, 'error');
+                wc_add_notice( $message, 'error' );
             }
 
             return;
@@ -434,7 +434,7 @@ 
      *
      * @return bool
      */
-    public function can_refund_order($order)
+    public function can_refund_order( $order )
     {
         return $order && $order->payment_method == 'fac' && $order->get_transaction_id();
     }
@@ -447,20 +447,20 @@ 
      *
      * @return bool
      */
-    public function process_refund($order_id, $amount = null, $reason = '')
+    public function process_refund( $order_id, $amount = null, $reason = '' )
     {
-        $order = wc_get_order($order_id);
+        $order = wc_get_order( $order_id );
 
-        if ( !$this->can_refund_order($order) )
+        if ( !$this->can_refund_order( $order ) )
         {
-            $this->log('Refund Failed: No transaction ID for FAC');
+            $this->log( 'Refund Failed: No transaction ID for FAC' );
             return false;
         }
 
         $transaction = $order->get_transaction_id();
-        $captured    = get_post_meta($order_id, '_fac_captured', true);
+        $captured    = get_post_meta( $order_id, '_fac_captured', true );
 
-        if ( is_null($amount) )
+        if ( is_null( $amount ) )
         {
             $amount = $order->get_total();
         }
@@ -474,18 +474,18 @@ 
                 'amount'        => $amount
             ];
 
-            if ($captured)
+            if ( $captured )
             {
-                $response = $gateway->refund($data)->send();
+                $response = $gateway->refund( $data )->send();
             }
             else
             {
-                $response = $gateway->void($data)->send();
+                $response = $gateway->void( $data )->send();
             }
 
             if ( $response->isSuccessful() )
             {
-                $order->add_order_note( sprintf( __('Refunded %s', 'woocommerce-gateway-fac'), $data['amount'] ) );
+                $order->add_order_note( sprintf( __( 'Refunded %s', 'woocommerce-gateway-fac' ), $data['amount'] ) );
                 return true;
             }
             else
@@ -493,14 +493,14 @@ 
                 throw new InvalidResponseException( $response->getMessage(), $response->getCode() );
             }
         }
-        catch (OmnipayException $e)
+        catch ( OmnipayException $e )
         {
-            $message = 'Refund Failed: '. $e->getCode() .' – '. $e->getMessage();
+            $message = 'Refund Failed: '.$e->getCode().' – '.$e->getMessage();
 
-            $this->log($message);
-            $order->add_order_note( __($message, 'woocommerce-gateway-fac') );
+            $this->log( $message );
+            $order->add_order_note( __( $message, 'woocommerce-gateway-fac' ) );
 
-            return new WP_Error( 'fac-refund', __($e->getCode() .' – '.$e->getMessage(), 'woocommerce-gateway-fac') );
+            return new WP_Error( 'fac-refund', __( $e->getCode().' – '.$e->getMessage(), 'woocommerce-gateway-fac' ) );
         }
     }
 }

Braces +56 added lines, -106 removed lines

@@ -4,20 +4,20 @@ 
 use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Common\Exception\OmnipayException;
 
-if ( !defined('ABSPATH') ) exit;
+if ( !defined('ABSPATH') ) {
+    exit;
+}
 
 /**
  * WC_Gateway_FirstAtlanticCommerce class
  *
  * @extends WC_Payment_Gateway
  */
-class WC_Gateway_FirstAtlanticCommerce extends WC_Payment_Gateway
-{
+class WC_Gateway_FirstAtlanticCommerce extends WC_Payment_Gateway {
     /**
      * Constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->id                 = 'fac';
         $this->method_title       = __('First Atlantic Commerce', 'wc-gateway-fac');
         $this->method_description = __('First Atlantic Commerce works by adding credit card fields on the checkout and then sending the details to First Atlantic Commerce for verification.', 'wc-gateway-fac');
@@ -60,21 +60,16 @@ 
     /**
      * Notify of issues in wp-admin
      */
-    public function admin_notices()
-    {
-        if ($this->enabled == 'no')
-        {
+    public function admin_notices() {
+        if ($this->enabled == 'no') {
             return;
         }
 
         // Check required fields
-        if (!$this->merchant_id)
-        {
+        if (!$this->merchant_id) {
             echo '<div class="error"><p>' . sprintf( __( 'First Atlantic Commerce error: Please enter your merchant id <a href="%s">here</a>', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_fac' ) ) . '</p></div>';
             return;
-        }
-        elseif (!$this->merchant_password)
-        {
+        } elseif (!$this->merchant_password) {
             echo '<div class="error"><p>' . sprintf( __( 'First Atlantic Commerce error: Please enter your merchant password <a href="%s">here</a>', 'woocommerce-gateway-fac' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=wc_gateway_fac' ) ) . '</p></div>';
             return;
         }
@@ -93,10 +88,8 @@ 
      *
      * @return void
      */
-    public function log($message)
-    {
-        if ( empty($this->log) )
-        {
+    public function log($message) {
+        if ( empty($this->log) ) {
             $this->log = new WC_Logger();
         }
 
@@ -108,19 +101,16 @@ 
      *
      * @return bool
      */
-    public function is_available()
-    {
+    public function is_available() {
         $is_available = parent::is_available();
 
         // Only allow unencrypted connections when testing
-        if (!is_ssl() && !$this->testmode)
-        {
+        if (!is_ssl() && !$this->testmode) {
             $is_available = false;
         }
 
         // Required fields check
-        if (!$this->merchant_id || !$this->merchant_password)
-        {
+        if (!$this->merchant_id || !$this->merchant_password) {
             $is_available = false;
         }
 
@@ -130,8 +120,7 @@ 
     /**
      * Initialise Gateway Settings Form Fields
      */
-    public function init_form_fields()
-    {
+    public function init_form_fields() {
         $this->form_fields = apply_filters('wc_fac_settings', [
             'enabled' => [
                 'title'       => __('Enable/Disable', 'woocommerce-gateway-fac'),
@@ -203,15 +192,13 @@ 
     /**
      * Setup the gateway object
      */
-    public function setup_gateway()
-    {
+    public function setup_gateway() {
         $gateway = Omnipay::create('FirstAtlanticCommerce');
 
         $gateway->setMerchantId($this->merchant_id);
         $gateway->setMerchantPassword($this->merchant_password);
 
-        if ($this->testmode)
-        {
+        if ($this->testmode) {
             $gateway->setTestMode(true);
         }
 
@@ -223,8 +210,7 @@ 
      *
      * @return void
      */
-    public function payment_fields()
-    {
+    public function payment_fields() {
         // Default credit card form
         $this->credit_card_form();
     }
@@ -234,22 +220,18 @@ 
      *
      * @return bool
      */
-    public function validate_fields()
-    {
+    public function validate_fields() {
         $validated = true;
 
-        if ( empty($_POST['fac-card-number']) )
-        {
+        if ( empty($_POST['fac-card-number']) ) {
             wc_add_notice( $this->get_validation_error( __('Card Number', 'woocommerce-gateway-fac'), $_POST['fac-card-number'] ), 'error' );
             $validated = false;
         }
-        if ( empty($_POST['fac-card-expiry']) )
-        {
+        if ( empty($_POST['fac-card-expiry']) ) {
             wc_add_notice( $this->get_validation_error( __('Card Expiry', 'woocommerce-gateway-fac'), $_POST['fac-card-number'] ), 'error' );
             $validated = false;
         }
-        if ( empty($_POST['fac-card-cvc']) )
-        {
+        if ( empty($_POST['fac-card-cvc']) ) {
             wc_add_notice( $this->get_validation_error( __('Card Code', 'woocommerce-gateway-fac'), $_POST['fac-card-number'] ), 'error' );
             $validated = false;
         }
@@ -264,14 +246,10 @@ 
      * @param string $type
      * @return string
      */
-    protected function get_validation_error($field, $type = 'undefined')
-    {
-        if ( $type === 'invalid' )
-        {
+    protected function get_validation_error($field, $type = 'undefined') {
+        if ( $type === 'invalid' ) {
             return sprintf( __( 'Please enter a valid %s.', 'woocommerce-gateway-fac' ), "<strong>$field</strong>" );
-        }
-        else
-        {
+        } else {
             return sprintf( __( '%s is a required field.', 'woocommerce-gateway-fac' ), "<strong>$field</strong>" );
         }
     }
@@ -283,8 +261,7 @@ 
      *
      * @return bool
      */
-    public function can_process_order($order)
-    {
+    public function can_process_order($order) {
         return $order && $order->payment_method == 'fac';
     }
 
@@ -295,20 +272,22 @@ 
      *
      * @return array
      */
-    public function process_payment($order_id)
-    {
+    public function process_payment($order_id) {
         $order = new WC_Order($order_id);
 
-        if ( !$this->can_process_order($order) ) return;
+        if ( !$this->can_process_order($order) ) {
+            return;
+        }
 
         $transaction = $order->get_transaction_id();
         $captured    = get_post_meta($order_id, '_fac_captured', true);
 
         // Skip already captured transactions
-        if ($captured) return;
+        if ($captured) {
+            return;
+        }
 
-        try
-        {
+        try {
             $gateway = $this->setup_gateway();
 
             $data = [
@@ -318,12 +297,9 @@ 
             ];
 
             // Already authorized transactions should be captured
-            if ( $transaction && !$captured )
-            {
+            if ( $transaction && !$captured ) {
                 $response = $gateway->capture($data)->send();
-            }
-            else
-            {
+            } else {
                 $card_number = str_replace( [' ', '-'], '', wc_clean($_POST['fac-card-number']) );
                 $card_cvv    = wc_clean($_POST['fac-card-cvc']);
                 $card_expiry = preg_split('/\s?\/\s?/', wc_clean($_POST['fac-card-expiry']), 2);
@@ -345,23 +321,18 @@ 
                 ];
 
                 // Capture in one pass if enabled, otherwise authorize
-                if ($this->capture)
-                {
+                if ($this->capture) {
                     $response = $gateway->purchase($data)->send();
-                }
-                else
-                {
+                } else {
                     $response = $gateway->authorize($data)->send();
                 }
             }
 
-            if ( $response->isSuccessful() )
-            {
+            if ( $response->isSuccessful() ) {
                 $reference = $response->getTransactionReference();
 
                 // Captured transaction
-                if ( ($transaction && !$captured) || (!$transaction && $this->capture) )
-                {
+                if ( ($transaction && !$captured) || (!$transaction && $this->capture) ) {
                     // Store captured
                     update_post_meta($order_id, '_fac_captured', true);
 
@@ -372,8 +343,7 @@ 
                     $order->add_order_note( sprintf( __('FAC transaction complete (ID: %s)', 'woocommerce-gateway-fac'), $reference ) );
                 }
                 // Authorized transaction
-                else
-                {
+                else {
                     // Store captured
                     update_post_meta($order_id, '_transaction_id', $reference, true);
                     update_post_meta($order_id, '_fac_captured', false);
@@ -393,33 +363,26 @@ 
                     'result'   => 'success',
                     'redirect' => $this->get_return_url($order)
                 ];
-            }
-            else
-            {
+            } else {
                 throw new InvalidResponseException( $response->getMessage(), $response->getCode() );
             }
-        }
-        catch (OmnipayException $e)
-        {
+        } catch (OmnipayException $e) {
             $message = 'Transaction Failed: '. $e->getCode() .' – '. $e->getMessage();
 
             $this->log($message);
             $order->add_order_note( __($message, 'woocommerce-gateway-fac') );
 
             // Friendly declined message
-            if ( in_array( $e->getCode(), [2, 3, 4, 35, 38, 39] ) )
-            {
+            if ( in_array( $e->getCode(), [2, 3, 4, 35, 38, 39] ) ) {
                 $message = __('Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction.', 'woocommerce') .' '. __('Please attempt your purchase again.', 'woocommerce');
             }
 
             // Friendly error message
-            else
-            {
+            else {
                 $message = __('Unfortunately your order cannot be processed as an error has occured.', 'woocommerce') .' '. __('Please attempt your purchase again.', 'woocommerce');
             }
 
-            if ( !is_admin() || ( defined('DOING_AJAX') && DOING_AJAX ) )
-            {
+            if ( !is_admin() || ( defined('DOING_AJAX') && DOING_AJAX ) ) {
                 wc_add_notice($message, 'error');
             }
 
@@ -434,8 +397,7 @@ 
      *
      * @return bool
      */
-    public function can_refund_order($order)
-    {
+    public function can_refund_order($order) {
         return $order && $order->payment_method == 'fac' && $order->get_transaction_id();
     }
 
@@ -447,12 +409,10 @@ 
      *
      * @return bool
      */
-    public function process_refund($order_id, $amount = null, $reason = '')
-    {
+    public function process_refund($order_id, $amount = null, $reason = '') {
         $order = wc_get_order($order_id);
 
-        if ( !$this->can_refund_order($order) )
-        {
+        if ( !$this->can_refund_order($order) ) {
             $this->log('Refund Failed: No transaction ID for FAC');
             return false;
         }
@@ -460,13 +420,11 @@ 
         $transaction = $order->get_transaction_id();
         $captured    = get_post_meta($order_id, '_fac_captured', true);
 
-        if ( is_null($amount) )
-        {
+        if ( is_null($amount) ) {
             $amount = $order->get_total();
         }
 
-        try
-        {
+        try {
             $gateway = $this->setup_gateway();
 
             $data = [
@@ -474,27 +432,19 @@ 
                 'amount'        => $amount
             ];
 
-            if ($captured)
-            {
+            if ($captured) {
                 $response = $gateway->refund($data)->send();
-            }
-            else
-            {
+            } else {
                 $response = $gateway->void($data)->send();
             }
 
-            if ( $response->isSuccessful() )
-            {
+            if ( $response->isSuccessful() ) {
                 $order->add_order_note( sprintf( __('Refunded %s', 'woocommerce-gateway-fac'), $data['amount'] ) );
                 return true;
-            }
-            else
-            {
+            } else {
                 throw new InvalidResponseException( $response->getMessage(), $response->getCode() );
             }
-        }
-        catch (OmnipayException $e)
-        {
+        } catch (OmnipayException $e) {
             $message = 'Refund Failed: '. $e->getCode() .' – '. $e->getMessage();
 
             $this->log($message);

build/config.php

Spacing +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 
 $root_dir = dirname( getcwd() );
 $src_dir  = $root_dir;
-$tmp_dir  = $root_dir . '/builds';
+$tmp_dir  = $root_dir.'/builds';
 $zip_dir  = $tmp_dir;