Changeset 1785732

Timestamp:

12/12/2017 08:07:23 PM (8 years ago)

Author:

cardinalmarketing

Message:

Change the way ECI and CAVV values are passed.

Location:

cardinalcommerce-oneconnect/trunk

Files:

• README.txt (modified) (2 diffs)
• changelog.txt (modified) (1 diff)
• includes/abstracts/abstract-wc-gateway-cardinalpm.php (modified) (5 diffs)
• includes/classes/class-wc-gateway-cardinalpm-common.php (modified) (2 diffs)
• includes/classes/class-wc-gateway-cardinalpm-payment-form.php (modified) (1 diff)
• includes/classes/class-wc-gateway-cardinalpm-plugin.php (modified) (3 diffs)
• php-src/CardinalCommerce/Payments/Carts/WooCommerce/Settings/AdminSettings.php (modified) (1 diff)
• vendor/cardinalcommerce/cart-common/src/CardinalCommerce/Payments/Carts/Common/Payment/Implementations/ProcessorModuleV2/PaymentMethodOrder.php (modified) (1 diff)
• vendor/cardinalcommerce/client/src/CardinalCommerce/Client/Centinel/Messages/AuthorizationRequest.php (modified) (1 diff)
• vendor/cardinalcommerce/client/src/CardinalCommerce/Client/Centinel/Messages/CaptureRequest.php (modified) (2 diffs)
• vendor/cardinalcommerce/client/src/CardinalCommerce/Client/ProcessorModule/ProcessorModuleClient.php (modified) (3 diffs)
• vendor/cardinalcommerce/client/src/CardinalCommerce/Payments/Objects/PaymentExtensions.php (modified) (1 diff)

cardinalcommerce-oneconnect/trunk/README.txt

@@ -4 +4 @@
 Requires at least: 4.6
 Tested up to: 4.7.5
-Stable tag: 1.1.0
+Stable tag: 2.0
 License: GPLv3 or later
 LicenseURI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -92 +92 @@
 == Changelog ==
 
+= 2017.12.12 - Version 2.0 =
+ * Changed the way ECI and CAVV values are passed during authorization and capture
+
 = 2017.11.07 - Version 1.1.0 =
  * Added Enable / Disable gateway functionality in settings

cardinalcommerce-oneconnect/trunk/changelog.txt

@@ -1 +1 @@
 *** CardinalCommerce OneConnect 3D-Secure for Authorize.net Changelog ***
+
+2017.12.12 - version 2.0
+ * Changed the way ECI and CAVV values are passed during authorization and capture
 
 2017.11.07 - version 1.1.0

cardinalcommerce-oneconnect/trunk/includes/abstracts/abstract-wc-gateway-cardinalpm.php

@@ -39 +39 @@
 * WC_Gateway_CardinalPM Class.
 */
-abstract class WC_Gateway_CardinalPM extends \WC_Payment_Gateway_CC {
+abstract class WC_Gateway_CardinalPM extends WC_Payment_Gateway {
 
     /**
@@ -50 +50 @@
      */
     private $_settings;
+
+    /** @var string payment type, one of 'credit-card' or 'echeck' */
+    private $payment_type = 'credit-card';
 
     public function __construct() {
@@ -68 +71 @@
 
         $this->has_fields         = true;
+
+        $this->init_form_fields();
+
+        $this->init_settings();
+
         $this->order_button_text  = __( 'Complete Payment', 'wc-cardinalprocessormodule' );
 
@@ -140 +148 @@
 
     /**
+     * Returns the payment type for this gateway
+     *
+     * @since 2.1.0
+     * @return string the payment type, ie 'credit-card', 'echeck', etc
+     */
+    public function get_payment_type() {
+      return $this->payment_type;
+    }
+
+    /**
      * Define payment fields
      */
-  // public function payment_fields() {
-            // $this->get_payment_form()->render();
-    // }
+    public function payment_fields() {
+             $this->get_payment_form()->render();
+      }
 
   /**
    * Get the payment form class
    */
-  // public function get_payment_form() {
-    // return new WC_Gateway_CardinalPM_Payment_Form( $this );
-  // }
+    public function get_payment_form() {
+      return new WC_Gateway_CardinalPM_Payment_Form( $this );
+   }
 
     /**
@@ -322 +340 @@
         }
     }
+
+
+    class WC_Gateway_CardinalPM_Payment_Form {
+
+      /** @var \WC_Gateway_CardinalPM gateway for this payment form */
+      protected $gateway;
+
+      /** @var bool default to show new payment method form */
+      protected $default_new_payment_method = true;
+
+      public function __construct( $gateway ) {
+
+        $this->gateway = $gateway;
+
+        // hook up rendering
+        $this->add_hooks();
+
+      }
+
+      /**
+       * Add hooks for rendering the payment form
+       *
+       * @see SV_WC_Payment_Gateway_Payment_Form::render()
+       * @since 4.0.0
+       */
+      protected function add_hooks() {
+
+        $gateway_id = $this->get_gateway()->get_id();
+
+        // fieldset start
+        add_action( "wc_{$gateway_id}_payment_form_start", array( $this, 'render_fieldset_start' ), 30 );
+
+        // payment fields
+        add_action( "wc_{$gateway_id}_payment_form",       array( $this, 'render_payment_fields' ), 0 );
+
+        // fieldset end
+        add_action( "wc_{$gateway_id}_payment_form_end",   array( $this, 'render_fieldset_end' ), 5 );
+
+      }
+
+      /**
+       * Return the gateway for this form
+       *
+       * @since 4.0.0
+       * @return \SV_WC_Payment_Gateway|\SV_WC_Payment_Gateway_Direct
+       */
+      public function get_gateway() {
+        return $this->gateway;
+      }
+
+      public function render() {
+        /**
+         * Payment Gateway Payment Form Start Action.
+         *
+         * Triggered before the payment fields are rendered.
+         *
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_payment_form_description() - 15 (outputs payment form description HTML)
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_saved_payment_methods() - 20 (outputs saved payment method fields)
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_sample_check() - 25 (outputs sample check div if eCheck gateway)
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_fieldset_start() - 30 (outputs opening fieldset tag and starting payment fields div)
+         *
+         * @since 4.0.0
+         * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+         */
+        do_action( 'wc_' . $this->get_gateway()->get_id() . '_payment_form_start', $this );
+
+
+        /**
+         * Payment Gateway Payment Form Action.
+         *
+         * Triggered for the payment fields.
+         *
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_payment_fields() - 0 (outputs payment fields like account number, expiry, etc)
+         *
+         * @since 4.0.0
+         * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+         */
+        do_action( 'wc_' . $this->get_gateway()->get_id() . '_payment_form', $this );
+
+
+        /**
+         * Payment Gateway Payment Form End Action.
+         *
+         * Triggered after the payment form fields are rendered.
+         *
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_fieldset_end() - 5 (outputs clear div, save payment method checkbox, and closing fieldset tag)
+         * @hooked SV_WC_Payment_Gateway_Payment_Form::render_js() - 5 (outputs JS for instantiating payment form JS class)
+         *
+         * @since 4.0.0
+         * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+         */
+        do_action( 'wc_' . $this->get_gateway()->get_id() . '_payment_form_end', $this );
+      }
+
+      /**
+       * Render the payment form opening fieldset tag and div
+       *
+       * @hooked wc_{gateway ID}_payment_form_start @ priority 30
+       *
+       * @since 4.0.0
+       */
+      public function render_fieldset_start() {
+
+        printf( '<fieldset id="wc-%s-%s-form">', esc_attr( $this->get_gateway()->get_id_dasherized() ), esc_attr( $this->get_gateway()->get_payment_type() ) );
+
+        printf( '<div class="wc-%1$s-new-payment-method-form js-wc-%1$s-new-payment-method-form">', esc_attr( $this->get_gateway()->get_id_dasherized() ) );
+      }
+
+
+      /**
+       * Render the payment fields (e.g. account number, expiry, etc)
+       *
+       * @hooked wc_{gateway ID}_payment_form_start @ priority 0
+       *
+       * @since 4.0.0
+       */
+      public function render_payment_fields() {
+
+        foreach ( $this->get_payment_fields() as $field ) {
+          $this->render_payment_field( $field );
+        }
+      }
+
+
+      /**
+       * Render the payment, a simple wrapper around woocommerce_form_field() to
+       * make it more convenient for concrete gateways to override form output
+       *
+       * @since 4.1.2
+       * @param array $field
+       */
+      protected function render_payment_field( $field ) {
+
+        woocommerce_form_field( $field['name'], $field, $field['value'] );
+      }
+
+      /**
+       * Render the payment form closing fieldset tag, clearing div, and "save
+       * payment method" checkbox
+       *
+       * @hooked wc_{gateway ID}_payment_form_end @ priority 5
+       *
+       * @since 4.0.0
+       */
+      public function render_fieldset_end() {
+
+        // clear
+        echo '<div class="clear"></div>';
+
+        echo '</fieldset>';
+      }
+
+      /**
+       * Get the payment form fields
+       *
+       * @since 4.0.0
+       * @return array payment fields in format suitable for woocommerce_form_field()
+       */
+      protected function get_payment_fields() {
+
+          $fields = $this->get_credit_card_fields();
+
+      }
+
+      /**
+       * Get default credit card form fields, note this pulls default values
+       * from the associated gateway
+       *
+       * for an explanation of autocomplete attribute values, see:
+       * @link https://html.spec.whatwg.org/multipage/forms.html#autofill
+       *
+       * @since 4.0.0
+       * @return array credit card form fields
+       */
+      protected function get_credit_card_fields() {
+
+        $fields = array(
+          'card-number' => array(
+            'type'              => 'tel',
+            'label'             => esc_html__( 'Card Number', 'wc-cardinalprocessormodule' ),
+            'id'                => 'cardinalpm-card-number',
+            'name'              => 'cardinalpm-card-number',
+            'placeholder'       => '•••• •••• •••• ••••',
+            'required'          => true,
+            'class'             => array( 'form-row-wide' ),
+            'input_class'       => array( 'wc-credit-card-form-card-number' ),
+            'maxlength'         => 20,
+            'custom_attributes' => array(
+              'autocomplete'   => 'cc-number',
+              'autocorrect'    => 'no',
+              'autocapitalize' => 'no',
+              'spellcheck'     => 'no',
+            ),
+            'value' => '',
+          ),
+          'card-expiry' => array(
+            'type'              => 'text',
+            'label'             => esc_html__( 'Expiration (MM/YY)', 'wc-cardinalprocessormodule' ),
+            'id'                => 'cardinalpm-card-expiry',
+            'name'              => 'cardinalpm-card-expiry',
+            'placeholder'       => esc_html__( 'MM / YY', 'wc-cardinalprocessormodule' ),
+            'required'          => true,
+            'class'             => array( 'form-row-first' ),
+            'input_class'       => array( 'wc-credit-card-form-card-expiry' ),
+            'custom_attributes' => array(
+              'autocomplete'   => 'cc-exp',
+              'autocorrect'    => 'no',
+              'autocapitalize' => 'no',
+              'spellcheck'     => 'no',
+            ),
+            'value' => '',
+          ),
+          'card-cvc' => array(
+            'type'              => 'tel',
+            'label'             => esc_html__( 'Card code', 'wc-cardinalprocessormodule' ),
+            'id'                => 'cardinalpm-card-cvc',
+            'name'              => 'cardinalpm-card-cvc',
+            'placeholder'       => esc_html__( 'CVC', 'wc-cardinalprocessormodule' ),
+            'required'          => true,
+            'class'             => array( 'form-row-last' ),
+            'input_class'       => array( 'wc-credit-card-form-card-cvc' ),
+            'maxlength'         => 4,
+            'custom_attributes' => array(
+              'autocomplete'   => 'off',
+              'autocorrect'    => 'no',
+              'autocapitalize' => 'no',
+              'spellcheck'     => 'no',
+            ),
+            'value' => '',
+          )
+        );
+
+        /**
+         * Payment Gateway Payment Form Default Credit Card Fields.
+         *
+         * Filters the default field data for credit card gateways.
+         *
+         * @since 4.0.0
+         * @param array $fields in the format supported by woocommerce_form_fields()
+         * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+         */
+        return apply_filters( 'wc_' . $this->get_gateway()->get_id() . '_payment_form_default_credit_card_fields', $fields, $this );
+      }
+
+    }

cardinalcommerce-oneconnect/trunk/includes/classes/class-wc-gateway-cardinalpm-common.php

@@ -15 +15 @@
 * @class       WC_Gateway_CardinalPM
 * @extends     WC_Payment_Gateway
-* @version     1.1.0
+* @version     2.0
 * @package     CardinalCommerce/Carts/WooCommerce/Payment
 * @author      CardinalCommerce
@@ -27 +27 @@
 
     const DEFAULT_TITLE = 'Credit Card';
-    const DEFAULT_DESCR = 'Credit Card payment with optional Cardinal Consumer Authentication (CCA)';
+    const DEFAULT_DESCR = 'Credit Card payment with Cardinal Consumer Authentication (CCA)';
 
     const DEFAULT_METHOD_TITLE = 'CardinalCommerce OneConnect';
     const DEFAULT_METHOD_DESCR = 'Process payments with CardinalCommerce with optional Cardinal Consumer Authentication (CCA)';
+
+
+    /**
+     * Returns the plugin id
+     *
+     * @since 2.0.0
+     * @return string plugin id
+     */
+    public function get_id() {
+      return $this->id;
+    }
+
+
+    /**
+     * Returns the plugin id with dashes in place of underscores, and
+     * appropriate for use in frontend element names, classes and ids
+     *
+     * @since 2.0.0
+     * @return string plugin id with dashes in place of underscores
+     */
+    public function get_id_dasherized() {
+      return str_replace( '_', '-', $this->get_id() );
+    }
+
 }

cardinalcommerce-oneconnect/trunk/includes/classes/class-wc-gateway-cardinalpm-payment-form.php

@@ -1 +1 @@
 <?php
 
-class WC_Gateway_CardinalPM_Payment_Form{
+defined( 'ABSPATH' ) or exit;
+
+if ( ! class_exists( 'WC_Gateway_CardinalPM_Payment_Form' ) ) :
+
+class WC_Gateway_CardinalPM_Payment_Form {
+
+  /** @var \WC_Gateway_CardinalPM gateway for this payment form */
+  protected $gateway;
+
+  /** @var bool default to show new payment method form */
+  protected $default_new_payment_method = true;
 
   public function __construct() {
-    
+
+    $this->gateway = $gateway;
+
+    // hook up rendering
+    $this->add_hooks();
+
+  }
+
+  /**
+   * Add hooks for rendering the payment form
+   *
+   * @see SV_WC_Payment_Gateway_Payment_Form::render()
+   * @since 4.0.0
+   */
+  protected function add_hooks() {
+
+    $gateway_id = $this->get_gateway()->get_id();
+
+    // fieldset start
+    add_action( "wc_{$gateway_id}_payment_form_start", array( $this, 'render_fieldset_start' ), 30 );
+
+    // payment fields
+    add_action( "wc_{$gateway_id}_payment_form",       array( $this, 'render_payment_fields' ), 0 );
+
+    // fieldset end
+    add_action( "wc_{$gateway_id}_payment_form_end",   array( $this, 'render_fieldset_end' ), 5 );
+
+  }
+
+  /**
+   * Return the gateway for this form
+   *
+   * @since 4.0.0
+   * @return \SV_WC_Payment_Gateway|\SV_WC_Payment_Gateway_Direct
+   */
+  public function get_gateway() {
+    return $this->gateway;
   }
 
   public function render() {
-
+    /**
+     * Payment Gateway Payment Form Start Action.
+     *
+     * Triggered before the payment fields are rendered.
+     *
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_payment_form_description() - 15 (outputs payment form description HTML)
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_saved_payment_methods() - 20 (outputs saved payment method fields)
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_sample_check() - 25 (outputs sample check div if eCheck gateway)
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_fieldset_start() - 30 (outputs opening fieldset tag and starting payment fields div)
+     *
+     * @since 4.0.0
+     * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+     */
+    do_action( 'wc_' . $this->get_gateway()->get_id() . '_payment_form_start', $this );
+
+
+    /**
+     * Payment Gateway Payment Form Action.
+     *
+     * Triggered for the payment fields.
+     *
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_payment_fields() - 0 (outputs payment fields like account number, expiry, etc)
+     *
+     * @since 4.0.0
+     * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+     */
+    do_action( 'wc_' . $this->get_gateway()->get_id() . '_payment_form', $this );
+
+
+    /**
+     * Payment Gateway Payment Form End Action.
+     *
+     * Triggered after the payment form fields are rendered.
+     *
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_fieldset_end() - 5 (outputs clear div, save payment method checkbox, and closing fieldset tag)
+     * @hooked SV_WC_Payment_Gateway_Payment_Form::render_js() - 5 (outputs JS for instantiating payment form JS class)
+     *
+     * @since 4.0.0
+     * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+     */
+    do_action( 'wc_' . $this->get_gateway()->get_id() . '_payment_form_end', $this );
+  }
+
+  /**
+   * Render the payment form opening fieldset tag and div
+   *
+   * @hooked wc_{gateway ID}_payment_form_start @ priority 30
+   *
+   * @since 4.0.0
+   */
+  public function render_fieldset_start() {
+
+    printf( '<fieldset id="wc-%s-%s-form">', esc_attr( $this->get_gateway()->get_id_dasherized() ), esc_attr( $this->get_gateway()->get_payment_type() ) );
+
+    printf( '<div class="wc-%1$s-new-payment-method-form js-wc-%1$s-new-payment-method-form">', esc_attr( $this->get_gateway()->get_id_dasherized() ) );
+  }
+
+
+  /**
+   * Render the payment fields (e.g. account number, expiry, etc)
+   *
+   * @hooked wc_{gateway ID}_payment_form_start @ priority 0
+   *
+   * @since 4.0.0
+   */
+  public function render_payment_fields() {
+
+    foreach ( $this->get_payment_fields() as $field ) {
+      $this->render_payment_field( $field );
+    }
+  }
+
+
+  /**
+   * Render the payment, a simple wrapper around woocommerce_form_field() to
+   * make it more convenient for concrete gateways to override form output
+   *
+   * @since 4.1.2
+   * @param array $field
+   */
+  protected function render_payment_field( $field ) {
+
+    woocommerce_form_field( $field['name'], $field, $field['value'] );
+  }
+
+  /**
+   * Render the payment form closing fieldset tag, clearing div, and "save
+   * payment method" checkbox
+   *
+   * @hooked wc_{gateway ID}_payment_form_end @ priority 5
+   *
+   * @since 4.0.0
+   */
+  public function render_fieldset_end() {
+
+    // clear
+    echo '<div class="clear"></div>';
+
+    echo '</fieldset>';
+  }
+
+  /**
+   * Get the payment form fields
+   *
+   * @since 4.0.0
+   * @return array payment fields in format suitable for woocommerce_form_field()
+   */
+  protected function get_payment_fields() {
+
+      $fields = $this->get_credit_card_fields();
+
+  }
+
+  /**
+   * Get default credit card form fields, note this pulls default values
+   * from the associated gateway
+   *
+   * for an explanation of autocomplete attribute values, see:
+   * @link https://html.spec.whatwg.org/multipage/forms.html#autofill
+   *
+   * @since 4.0.0
+   * @return array credit card form fields
+   */
+  protected function get_credit_card_fields() {
+
+    $fields = array(
+      'card-number' => array(
+        'type'              => 'tel',
+        'label'             => esc_html__( 'Card Number', 'wc-cardinalprocessormodule' ),
+        'id'                => 'cardinalpm-card-number',
+        'name'              => 'cardinalpm-card-number',
+        'placeholder'       => '•••• •••• •••• ••••',
+        'required'          => true,
+        'class'             => array( 'form-row-wide' ),
+        'input_class'       => array( 'wc-credit-card-form-card-number' ),
+        'maxlength'         => 20,
+        'custom_attributes' => array(
+          'autocomplete'   => 'cc-number',
+          'autocorrect'    => 'no',
+          'autocapitalize' => 'no',
+          'spellcheck'     => 'no',
+        ),
+        'value' => '',
+      ),
+      'card-expiry' => array(
+        'type'              => 'text',
+        'label'             => esc_html__( 'Expiration (MM/YY)', 'wc-cardinalprocessormodule' ),
+        'id'                => 'cardinalpm-card-expiry',
+        'name'              => 'cardinalpm-card-expiry',
+        'placeholder'       => esc_html__( 'MM / YY', 'wc-cardinalprocessormodule' ),
+        'required'          => true,
+        'class'             => array( 'form-row-first' ),
+        'input_class'       => array( 'wc-credit-card-form-card-expiry' ),
+        'custom_attributes' => array(
+          'autocomplete'   => 'cc-exp',
+          'autocorrect'    => 'no',
+          'autocapitalize' => 'no',
+          'spellcheck'     => 'no',
+        ),
+        'value' => '',
+      ),
+      'card-cvc' => array(
+        'type'              => 'tel',
+        'label'             => esc_html__( 'Card code', 'wc-cardinalprocessormodule' ),
+        'id'                => 'cardinalpm-card-cvc',
+        'name'              => 'cardinalpm-card-cvc',
+        'placeholder'       => esc_html__( 'CVC', 'wc-cardinalprocessormodule' ),
+        'required'          => true,
+        'class'             => array( 'form-row-last' ),
+        'input_class'       => array( 'wc-credit-card-form-card-cvc' ),
+        'maxlength'         => 4,
+        'custom_attributes' => array(
+          'autocomplete'   => 'off',
+          'autocorrect'    => 'no',
+          'autocapitalize' => 'no',
+          'spellcheck'     => 'no',
+        ),
+        'value' => '',
+      )
+    );
+
+    /**
+     * Payment Gateway Payment Form Default Credit Card Fields.
+     *
+     * Filters the default field data for credit card gateways.
+     *
+     * @since 4.0.0
+     * @param array $fields in the format supported by woocommerce_form_fields()
+     * @param \SV_WC_Payment_Gateway_Payment_Form $this payment form instance
+     */
+    return apply_filters( 'wc_' . $this->get_gateway()->get_id() . '_payment_form_default_credit_card_fields', $fields, $this );
   }
 
 }
+
+endif;  // class exists check

cardinalcommerce-oneconnect/trunk/includes/classes/class-wc-gateway-cardinalpm-plugin.php

@@ -30 +30 @@
      */
     private $_bootstrapped;
-    
+
     /**
      * @var CartProcessors\CheckoutProcessor
@@ -138 +138 @@
     }
 
+    /**
+     * Returns the plugin id
+     *
+     * @since 2.0.0
+     * @return string plugin id
+     */
+    //public function get_id() {
+      //return $this->id;
+    //}
+
+
+    /**
+     * Returns the plugin id with dashes in place of underscores, and
+     * appropriate for use in frontend element names, classes and ids
+     *
+     * @since 2.0.0
+     * @return string plugin id with dashes in place of underscores
+     */
+    //public function get_id_dasherized() {
+      //return str_replace( '_', '-', $this->get_id() );
+    //}
+
     /*
     public function resolver() {
@@ -175 +197 @@
         return $this->_pluginUrl;
     }
-    
+
     public function assets_url() {
         return $this->_assetsUrl;
     }
-   
+
     public function config_dir() {
         return $this->_configDir;

cardinalcommerce-oneconnect/trunk/php-src/CardinalCommerce/Payments/Carts/WooCommerce/Settings/AdminSettings.php

@@ -74 +74 @@
 
             'enabled' => array(
-                'title'   => esc_html__( 'Enable / Disable', 'woocommerce-plugin-framework' ),
-                'label'   => esc_html__( 'Enable this gateway', 'woocommerce-plugin-framework' ),
+                'title'   => esc_html__( 'Enable / Disable', 'wc-cardinalprocessormodule' ),
+                'label'   => esc_html__( 'Enable this gateway', 'wc-cardinalprocessormodule' ),
                 'type'    => 'checkbox',
                 'default' => 'yes',

cardinalcommerce-oneconnect/trunk/vendor/cardinalcommerce/cart-common/src/CardinalCommerce/Payments/Carts/Common/Payment/Implementations/ProcessorModuleV2/PaymentMethodOrder.php

@@ -68 +68 @@
     }
 
-    /*
     public function getPaymentExtensions() {
-        return $this->_paymentExtensions;
+      if ($this->_responseObject == null) {
+          return null;
+      }
+      return $this->_responseObject->Payment->ExtendedData;
     }
-    */
 
     public function getAuthorizationProcessorObject() {

cardinalcommerce-oneconnect/trunk/vendor/cardinalcommerce/client/src/CardinalCommerce/Client/Centinel/Messages/AuthorizationRequest.php

@@ -23 +23 @@
     public $TransactionId;
 
-    // TODO: Check these fields
-    public $CAVV;
-    public $ECIFlag;
+    public $Cavv;
+    public $Eci;
+    public $Xid;
 
     public $OrderId;

cardinalcommerce-oneconnect/trunk/vendor/cardinalcommerce/client/src/CardinalCommerce/Client/Centinel/Messages/CaptureRequest.php

@@ -21 +21 @@
     public $TransactionType;
 
+    public $Cavv;
+    public $Eci;
+    public $Xid;
+
     public $OrderId;
     public $AuthorizationCode;
@@ -26 +30 @@
     public $CurrencyCode;
     public $Description;
-}    
+}

cardinalcommerce-oneconnect/trunk/vendor/cardinalcommerce/client/src/CardinalCommerce/Client/ProcessorModule/ProcessorModuleClient.php

@@ -84 +84 @@
         if ( $consumerObject != null ) {
             if ( $consumerObject->BillingAddress != null ) {
-                $request->EMail = $consumerObject->Email1;                
+                $request->EMail = $consumerObject->Email1;
                 $this->populateAddress( $request, 'Billing', $consumerObject->BillingAddress );
             }
@@ -198 +198 @@
         }
 
+        $authReq->Cavv = $paymentExtensions->Cavv;
+        $authReq->Eci = $paymentExtensions->Eci;
+        $authReq->Xid = $paymentExtensions->Xid;
+
         return $centinelClient->sendMessage( $authReq );
     }
@@ -227 +231 @@
         $captureReq->CurrencyCode = $orderDetailsObject->CurrencyCode;
 
+        $captureReq->Cavv = $paymentExtensions->Cavv;
+        $captureReq->Eci = $paymentExtensions->Eci;
+        $captureReq->Xid = $paymentExtensions->Xid;
+
         return $centinelClient->sendMessage( $captureReq );
     }

cardinalcommerce-oneconnect/trunk/vendor/cardinalcommerce/client/src/CardinalCommerce/Payments/Objects/PaymentExtensions.php

@@ -5 +5 @@
     public function __construct( $data ) {
         $this->Enrolled = $data->Enrolled;
-        $this->CAVV = $data->CAVV;
-        $this->ECIFlag = $data->ECIFlag;
+        $this->Cavv = $data->CAVV;
+        $this->Eci = $data->ECIFlag;
         $this->PAResStatus = $data->PAResStatus;
         $this->SignatureVerification = $data->SignatureVerification;
-        $this->XID = $data->XID;
+        $this->Xid = $data->XID;
         $this->UCAFIndicator = $data->UCAFIndicator;
     }
 
     public $Enrolled;
-    public $CAVV;
-    public $ECIFlag;
+    public $Cavv;
+    public $Eci;
     public $PAResStatus;
     public $SignatureVerification;
-    public $XID;
+    public $Xid;
     public $UCAFIndicator;