Version 2.9.3 released

optimisthub · Feb 17, 2022 · 73c6208 · 73c6208
1 parent c7fafb7
commit 73c6208
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/assets/moka.js b/assets/moka.js
@@ -9,6 +9,7 @@ $(document).ready(function () {
      */
     $(document).on('keyup','input#mokapay-card-number',function( e ) {  
         let binValue = $(this).val();
+        let total = $('#mokapay-current-order-total').val();
         binValue = binValue.replace(/\s/g, '');
         if(binValue.length >= 6) {
             $.ajax({
@@ -19,6 +20,7 @@ $(document).ready(function () {
                     action : 'optimisthub_ajax',
                     method : 'validate_bin',
                     binNumber : binValue,
+                    total : total 
                 },
                 success: function(response){
                     $('#ajaxify-installment-table').html('');

diff --git a/core/library/Moka_Gateway.php b/core/library/Moka_Gateway.php
@@ -195,7 +195,34 @@ public function admin_options()
          */
         public function payment_form_fields($cc_fields , $payment_id)
         {
+
+            global $woocommerce;
+            $referer = is_wc_endpoint_url( 'order-pay' ) ? 'order-pay' : 'checkout'; 
+            $total = data_get($woocommerce, 'cart.total'); 
+
+            if ( get_query_var('order-pay') ) {
+                $order = wc_get_order(get_query_var('order-pay'));
+                $total = $order->get_total();  
+            } 
+
             $cc_fields = [
+                'current-step-of-payment' => '
+                    <p class="form-row form-row-wide">
+                        <input 
+                            id="'.$payment_id.'-current-step-of-payment" 
+                            class="current-step-of-payment" 
+                            type="hidden"  
+                            value="'.$referer.'"
+                            name="' .$payment_id. '-current-step-of-payment" 
+                        />
+                        <input 
+                            id="'.$payment_id.'-current-order-total" 
+                            class="current-order-total" 
+                            type="hidden"  
+                            value="'.$total.'"
+                            name="' .$payment_id. '-current-order-total" 
+                        />
+                    </p>',
                 'name-on-card' => '
                     <p class="form-row form-row-wide">
                         <label for="'. $payment_id.'-card-holder">' . __('Name On Card','moka-woocommerce') . ' <span class="required">*</span></label>

diff --git a/core/library/Moka_Init.php b/core/library/Moka_Init.php
@@ -3,7 +3,7 @@
 	exit;
 }
 
-define('OPTIMISTHUB_MOKA_PAY_VERSION', '2.9.2');
+define('OPTIMISTHUB_MOKA_PAY_VERSION', '2.9.3');
 
 global $mokaVersion;
 $mokaVersion = OPTIMISTHUB_MOKA_PAY_VERSION;

diff --git a/core/library/Optimisthub_Ajax.php b/core/library/Optimisthub_Ajax.php
@@ -25,6 +25,7 @@ public function __construct()
     public function validate_bin($params)
     { 
         $postData = $params;
+
         $action = data_get($postData, 'action');
 
         if(!$action)
@@ -60,7 +61,7 @@ public function validate_bin($params)
         $data= [
             'cardInformation' => $response, 
             'installments' => $avaliableInstallment,
-            'renderedHtml' => self::renderedHtml(['card' => $response, 'installments' => $avaliableInstallment]),
+            'renderedHtml' => self::renderedHtml(['card' => $response, 'installments' => $avaliableInstallment, 'total' => data_get($postData, 'total')]),
         ];  
 
         if(!$response)
@@ -145,12 +146,7 @@ private function fetchInstallment()
      */
     private function renderedHtml( $params )
     {
-        global $woocommerce; 
-
-        $orderId = $woocommerce->session->order_awaiting_payment;
-        $order = new WC_Order($orderId);
-
-        $total = $order->get_total(); 
+        $total = data_get($params, 'total');
         $maxInstallment = data_get($params, 'card.MaxInstallmentNumber');
         $installmentRates = data_get($params, 'installments.rates');
         $orderTotal = $total;

diff --git a/index.php b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: Moka Payment Gateway for WooCommerce
  * Plugin URI: https://github.com/optimisthub/moka-woocommerce
  * Description: Moka Payment gateway for woocommerce
- * Version: 2.9.2
+ * Version: 2.9.3
  * Author: Optimist Hub
  * Author URI: https://optimisthub.com?ref=mokaPayment
  * Domain Path: /languages/ 

diff --git a/readme.md b/readme.md
@@ -72,6 +72,9 @@ Moka Pos, Moka Pay plugin;
 
 ### Changelog 
 
+#### Version 2.9.3
+- Issue : Installment issues. 
+
 #### Version 2.9.2
 - Issue : Installment issues.
 - Feature : Added, ray package for remote debugging.