Lançamento da versão inicial.

src/VindiWoocommerce.php

@@ -36,7 +36,7 @@ public function __construct()
       /**
        * Add Gateway to Woocommerce
        */
-      add_filter('woocommerce_payment_gateways', 'add_gateway');
+      add_filter('woocommerce_payment_gateways', array($this->settings, 'add_gateway'));
     } else {
 
       add_action('admin_notices', 'dependencies_notices');
@@ -51,9 +51,6 @@ public function __construct()
    */
   public function init()
   {
-    // Loading Methods in the WC
-    require_once $this->getPath() . '/utils/WcAddGateway.php';
-
     // Helpers and Languages
     require_once $this->getPath() . '/services/Api.php';
     require_once $this->getPath() . '/services/Logger.php';

src/assets/js/frontend.js

@@ -1,23 +1,14 @@
 /* global wcbcf_public_params */
-jQuery(function($) {
-  const vindi_plugin = {
-    init: function() {
-      /* woocommerce-extra-checkout-fields-for-brazil input mask toggle value
-      if (wcbcf_public_params.maskedinput === "yes")
-       */
-      vindi_plugin.maskCC();
-    },
-    maskCC: function() {
-      $("#misha_ccNo").mask("0000 0000 0000 0000");
-      $("#misha_expdate").mask("00/00");
-      $("#misha_cvv").mask("000");
-    },
-    unmaskCC: function() {
-      $("#misha_ccNo").unmask();
-      $("#misha_expdate").unmask();
-      $("#misha_cvv").unmask();
-    }
-  };
-
-  vindi_plugin.init();
-});
+(function ($) {
+  "use strict";
+  $(function () {
+    $("#vindi_ccNo").payment("formatCardNumber");
+    $("#vindi_expdate").payment("formatCardExpiry");
+    $("#vindi_cvv").payment("formatCardCVC");
+    $("body").on("updated_checkout", function () {
+      $("#vindi_ccNo").payment("formatCardNumber");
+      $("#vindi_expdate").payment("formatCardExpiry");
+      $("#vindi_cvv").payment("formatCardCVC");
+    });
+  });
+})(jQuery);

src/includes/FrontendFilesLoader.php

@@ -13,7 +13,7 @@ function __construct() {
 
   public static function registerFiles()
   {
-    wp_register_script( 'vindi_woocommerce_frontend_js', plugins_url( '/assets/js/frontend.js', plugin_dir_path( __FILE__ ) ), array( 'jquery', 'jquery-mask' ), VINDI_VERSION, true );
+    wp_register_script( 'vindi_woocommerce_frontend_js', plugins_url( '/assets/js/frontend.js', plugin_dir_path( __FILE__ ) ), array( 'jquery', 'jquery-payment' ), VINDI_VERSION, true );
     wp_enqueue_script ( 'vindi_woocommerce_frontend_js' );
   }
 }

src/includes/admin/Settings.php

@@ -268,18 +268,39 @@ public function api_key_field()
     if (!$api_key) {
       return;
     }
-    if ('unauthorized' == $this->api->test_api_key($api_key)) {
+    if ('unauthorized' === $this->api->test_api_key($api_key)) {
       update_option('vindi_invalid_token', true);
+      $this->invalidToken = true;
 
       include_once VINDI_SRC . 'views/invalid-token.php';
     } else {
       update_option('vindi_invalid_token', false);
+      $this->invalidToken = false;
     }
   }
+
+  /**
+   * Check if invalidToken is true
+   * @return mixed includes the invalid-token view
+   */
   public function is_api_key_valid()
   {
     if($this->invalidToken) {
       include_once VINDI_SRC . 'views/invalid-token.php';
     }
   }
+
+  /**
+   * Add the gateway to WooCommerce.
+   * @param  array $methods WooCommerce payment methods.
+   * @return array Payment methods with Vindi.
+   */
+  public function add_gateway($methods)
+  {
+
+    $methods[] = new VindiCreditGateway($this);
+    $methods[] = new VindiBankSlipGateway($this);
+
+    return $methods;
+  }
 }

src/includes/gateways/BankSlipPayment.php

@@ -14,16 +14,17 @@
 
 class VindiBankSlipGateway extends VindiPaymentGateway
 {
-
   /**
    * Constructor for the gateway.
    */
 
-  public function __construct()
+  public function __construct(VindiSettings $vindiSettings)
   {
 
     global $woocommerce;
 
+    $this->vindiSettings = $vindiSettings;
+
     $this->id                   = 'vindi-bank-slip';
     $this->icon                 = apply_filters('vindi_woocommerce_bank_slip_icon', '');
     $this->method_title         = __('Vindi - Bank slip', 'vindi-woocommerce');
@@ -156,33 +157,10 @@ public function payment_scripts()
 
   public function payment_fields()
   {
-
-    // ok, let's display some description before the payment form
-    if ($this->description) {
-      // you can instructions for test mode, I mean test card numbers etc.
-      if ($this->testmode) {
-        $this->description .= ' TEST MODE ENABLED. In test mode, you can use the bank slip listed in <a href="#" target="_blank" rel="noopener noreferrer">documentation</a>.';
-        $this->description  = trim($this->description);
-      }
-      // display the description with <p> tags etc.
-      echo wpautop(wp_kses_post($this->description));
-    }
-
-    // I will echo() the form, but you can close PHP tags and print it directly in HTML
-    echo '<fieldset id="wc-' . esc_attr($this->id) . '-cc-form" class="wc-bank-slip-form wc-payment-form" style="background:transparent;">';
-
-    // Add this action hook if you want your custom payment gateway to support it
-    do_action('woocommerce_bank_slip_form_start', $this->id);
-
-    // I recommend to use inique IDs, because other gateways could already use #ccNo, #expdate, #cvc
-    echo '<div class="form-row form-row-wide">' .
-      _e('Um Boleto Bancário será enviado para o seu endereço de e-mail.', VINDI) .
-      '</div>
-      <div class="clear"></div>';
-
-    do_action('woocommerce_bank_slip_form_end', $this->id);
-
-    echo '<div class="clear"></div></fieldset>';
+    $id = $this->id;
+    $description = $this->description;
+    $testmode = $this->testmode;
+    $this->vindiSettings->get_template('bankslip-checkout.html.php', compact('id', 'description', 'testmode'));
   }
 
 

src/includes/gateways/CreditPayment.php

@@ -19,11 +19,13 @@ class VindiCreditGateway extends VindiPaymentGateway
    * Constructor for the gateway.
    */
 
-  public function __construct()
+  public function __construct(VindiSettings $vindiSettings)
   {
 
     global $woocommerce;
 
+    $this->vindiSettings = $vindiSettings;
+
     $this->id                   = 'vindi-credit-card';
     $this->icon                 = apply_filters('vindi_woocommerce_credit_card_icon', '');
     $this->method_title         = __('Vindi - Credit card', 'vindi-woocommerce');
@@ -156,41 +158,10 @@ public function payment_scripts()
 
   public function payment_fields()
   {
-
-    // ok, let's display some description before the payment form
-    if ($this->description) {
-      // you can instructions for test mode, I mean test card numbers etc.
-      if ($this->testmode) {
-        $this->description .= ' TEST MODE ENABLED. In test mode, you can use the card numbers listed in <a href="#" target="_blank" rel="noopener noreferrer">documentation</a>.';
-        $this->description  = trim($this->description);
-      }
-      // display the description with <p> tags etc.
-      echo wpautop(wp_kses_post($this->description));
-    }
-
-    // I will echo() the form, but you can close PHP tags and print it directly in HTML
-    echo '<fieldset id="wc-' . esc_attr($this->id) . '-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">';
-
-    // Add this action hook if you want your custom payment gateway to support it
-    do_action('woocommerce_credit_card_form_start', $this->id);
-
-    // I recommend to use inique IDs, because other gateways could already use #ccNo, #expdate, #cvc
-    echo '<div class="form-row form-row-wide"><label>Card Number <span class="required">*</span></label>
-      <input id="misha_ccNo" type="text" autocomplete="off">
-      </div>
-      <div class="form-row form-row-first">
-        <label>Expiry Date <span class="required">*</span></label>
-        <input id="misha_expdate" type="text" autocomplete="off" placeholder="MM / YY">
-      </div>
-      <div class="form-row form-row-last">
-        <label>Card Code (CVC) <span class="required">*</span></label>
-        <input id="misha_cvv" type="password" autocomplete="off" placeholder="CVC">
-      </div>
-      <div class="clear"></div>';
-
-    do_action('woocommerce_credit_card_form_end', $this->id);
-
-    echo '<div class="clear"></div></fieldset>';
+    $id = $this->id;
+    $description = $this->description;
+    $testmode = $this->testmode;
+    $this->vindiSettings->get_template('creditcard-checkout.html.php', compact('id', 'description', 'testmode'));
   }
 
 

src/templates/bankslip-checkout.html.php

@@ -0,0 +1,23 @@
+<?php if (!defined('ABSPATH')) exit; ?>
+
+<?php if ($testmode): ?>
+  <p>TEST MODE ENABLED. In test mode, you can use the card numbers listed in <a href="#" target="_blank" rel="noopener noreferrer">documentation</a>.</p>
+<?php endif; ?>
+<?php if ($description): ?>
+  <p><?php echo $description; ?></p>
+<?php endif; ?>
+
+<fieldset id="wc-<?php echo $id; ?>-form" class="wc-bankslip-form wc-payment-form" style="background:transparent;">
+
+    <?php do_action('woocommerce_bank_slip_form_start', $id); ?>
+
+    <div class="form-row form-row-wide">
+      <?php _e('A Bank Slip wil be sent to your e-mail.', VINDI); ?>
+      <?php //_e('Um Boleto Bancário será enviado para o seu endereço de e-mail.', VINDI); ?>
+    </div>
+    <div class="clear"></div>
+
+    <?php do_action('woocommerce_bank_slip_form_end', $id); ?>
+
+    <div class="clear"></div>
+</fieldset>

src/templates/creditcard-checkout.html.php

@@ -0,0 +1,31 @@
+<?php if (!defined('ABSPATH')) exit; ?>
+
+<?php if ($testmode): ?>
+  <p>TEST MODE ENABLED. In test mode, you can use the card numbers listed in <a href="#" target="_blank" rel="noopener noreferrer">documentation</a>.</p>
+<?php endif; ?>
+<?php if ($description): ?>
+  <p><?php echo $description; ?></p>
+<?php endif; ?>
+
+<fieldset id="wc-<?php echo $id; ?>-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
+
+    <?php do_action('woocommerce_credit_card_form_start', $id); ?>
+
+    <div class="form-row form-row-wide">
+      <label><?php _e('Card Number', VINDI); ?> <span class="required">*</span></label>
+      <input id="vindi_ccNo" type="text" autocomplete="off">
+    </div>
+    <div class="form-row form-row-first">
+      <label><?php _e('Expiry Date', VINDI); ?> <span class="required">*</span></label>
+      <input id="vindi_expdate" type="text" autocomplete="off" placeholder="MM / YY">
+    </div>
+    <div class="form-row form-row-last">
+      <label><?php _e('Card Code (CVC)', VINDI); ?> <span class="required">*</span></label>
+      <input id="vindi_cvv" type="password" autocomplete="off" placeholder="CVC">
+    </div>
+    <div class="clear"></div>
+
+    <?php do_action('woocommerce_credit_card_form_end', $id); ?>
+
+    <div class="clear"></div>
+</fieldset>

tests/phpunit/vindi/base/test-initial-subscription.php

@@ -4,8 +4,9 @@
 require_once VINDI_PATH . 'src/utils/PaymentGateway.php';
 include_once VINDI_PATH . 'src/includes/gateways/CreditPayment.php';
 
+include_once VINDI_PATH . 'src/includes/admin/Settings.php';
+
 /**
- * These tests assert various things about processing an initial payment
  * for a WooCommerce Subscriptions.
  *
  * The responses from HTTP requests are mocked using the WP filter
@@ -42,8 +43,7 @@ function test_data_for_mutli_item_order()
     $product_2->save();
 
     // Arrange: Set up an order with:
-    // 1) A variation product.
-    // 2) The same product added several times.
+    // 1) A variation product.    // 2) The same product added several times.
     // 3) A valid BR ZIP code
     $order = new WC_Order();
 
@@ -55,7 +55,10 @@ function test_data_for_mutli_item_order()
     $order->calculate_totals();
 
     // Act: Call get_level3_data_from_order().
-    $gateway = new VindiCreditGateway();
+
+    $settings = new VindiSettings();
+
+    $gateway = new VindiCreditGateway($settings);
     $result = $gateway->get_level3_data_from_order($order);
 
 
@@ -128,7 +131,10 @@ public function test_non_us_shipping_zip_codes()
 
     // Act: Call get_level3_data_from_order().
     $store_postcode = '1100';
-    $gateway = new VindiCreditGateway();
+
+    $settings = new VindiSettings();
+
+    $gateway = new VindiCreditGateway($settings);
     $result = $gateway->get_level3_data_from_order($order);
 
     // Assert.