WooCommerce Amount Issue fixed for latest version

optimisthub · Feb 14, 2022 · 2998769 · 2998769
1 parent 7c4e4df
commit 2998769
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/core/library/Moka_Gateway.php b/core/library/Moka_Gateway.php
@@ -405,8 +405,7 @@ public function process_payment( $orderId )
                 'result_message'=> self::mokaPosErrorMessages($callbackResult),
                 'result'        => 1, // 1 False 0 True
                 'created_at'    => date('Y-m-d H:i:s'), 
-            ];
-
+            ]; 
 
             ## Display Error on Checkout
             if($callbackResult != 'Success')
@@ -560,14 +559,15 @@ private function formatOrder( $orderId )
 
             $selectedInstallment    = data_get($postData, $this->id.'-installment');
             $currentComission       = data_get($rates, $selectedInstallment.'.value'); 
-
+            $getAmount = $order->get_total();
+
             $orderData = [
                 'CardHolderFullName'    => (string) data_get($postData, $this->id.'-name-oncard'),
                 'CardNumber'            => (string) self::formatCartNumber(data_get($postData, $this->id.'-card-number')),
                 'ExpMonth'              => (string) data_get($expriyDate,'month' ),
                 'ExpYear'               => (string) self::formatExpiryDate(data_get($expriyDate,'year' )),
                 'CvcNumber'             => (string) data_get($postData, $this->id.'-card-cvc'),
-                'Amount'                => (string) self::calculateComissionRate(data_get($postData, $this->id.'-order-total'),$currentComission),
+                'Amount'                => (string) self::calculateComissionRate($getAmount,$currentComission),
                 'Currency'              => (string) $order->get_currency() == 'TRY' ? 'TL' : $order->get_currency() ,
                 'InstallmentNumber'     => (int) $selectedInstallment,
                 'ClientIP'              => (string) self::getUserIp(),
@@ -658,7 +658,7 @@ private function formatExperyDate($string)
          * @return void
          */
         private function calculateComissionRate( $total, $percent )
-        {
+        { 
             $total = ( ( ($total*$percent)/100) + $total); 
             return number_format($total,2,'.', '');
         }
@@ -670,7 +670,7 @@ private function calculateComissionRate( $total, $percent )
          * @return void
          */
         private function fetchOrder($orderId)
-        {
+        { 
             return wc_get_order( $orderId );
         }
 

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');
+define('OPTIMISTHUB_MOKA_PAY_VERSION', '2.9.1');
 
 global $mokaVersion;
 $mokaVersion = OPTIMISTHUB_MOKA_PAY_VERSION;

diff --git a/core/library/Optimisthub_Ajax.php b/core/library/Optimisthub_Ajax.php
@@ -23,7 +23,7 @@ public function __construct()
      * @return void
      */
     public function validate_bin($params)
-    {
+    { 
         $postData = $params;
         $action = data_get($postData, 'action');
 
@@ -55,7 +55,7 @@ public function validate_bin($params)
                 }
             } 
         }    
-
+        
         ## installments
         $data= [
             'cardInformation' => $response, 

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
+ * Version: 2.9.1
  * Author: Optimist Hub
  * Author URI: https://optimisthub.com?ref=mokaPayment
  * Domain Path: /languages/