v3.7.4 released

Redundant card informations requests blocked. jquery.ajax has been update with jquery.post. Added sslverify argument to wp_remote_post. Added result check to all wp_remote_post requests.
optimisthub · Jul 25, 2023 · 67b7a6a · 67b7a6a
1 parent 9260172
commit 67b7a6a
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 164 deletions.
diff --git a/assets/moka-admin.js b/assets/moka-admin.js
@@ -1,34 +1,25 @@
-$ = jQuery;
-$.ajaxSetup({cache: false});
-
-$(document).ready(function () {
+jQuery(document).ready(function ($) {
     console.log('Moka Pay js loaded.');
 
     /**
      * Clear stored installments
      */
 
     $('.js-update-comission-rates').click(function(e){
-        var  r=prompt("Bu işlemi yaptığınızda, girmiş olduğunuz taksit verilerinin tamamı silinir. Ve Moka Pay sunucularından güncel olanları üzerine yazılır. Ve işlem geri alınamaz. Devam etmek için lütfen alttaki alana 'onay' yazıp işleme devam ediniz.Aksi halde işlemniz devam etmeyecektir.");
+        var r = prompt("Bu işlemi yaptığınızda, girmiş olduğunuz taksit verilerinin tamamı silinir. Ve Moka Pay sunucularından güncel olanları üzerine yazılır. Ve işlem geri alınamaz. Devam etmek için lütfen alttaki alana 'onay' yazıp işleme devam ediniz.Aksi halde işlemniz devam etmeyecektir.");
         if(r && r == 'onay'){
-            $.ajax({
-                method: "POST",
-                dataType: "json",
-                url: moka_ajax.ajax_url,
-                data: {
-                    action : 'optimisthub_ajax',
-                    method : 'clear_installment'
-                },
-                success: function(response) {
-                    if(response.data.data.message == 'ok')
-                    {
-                        alert('İşleminiz başarılı bir şekilde tamamlandı. 2 Saniye içerisinde sayfa yenilecektir.')
-                        setTimeout(function(){
-                            window.location.reload();
-                        },2000);
-                    }   
-                }
-            });
+            $.post(moka_ajax.ajax_url + '?_=' + Date.now(), {
+                action : 'optimisthub_ajax',
+                method : 'clear_installment'
+            }, function(response) {
+                if(response.data.data.message == 'ok')
+                {
+                    alert('İşleminiz başarılı bir şekilde tamamlandı. 2 Saniye içerisinde sayfa yenilecektir.')
+                    setTimeout(function(){
+                        window.location.reload();
+                    }, 2e3);
+                }  
+            }, 'json');
         }
     });
 
@@ -37,27 +28,21 @@ $(document).ready(function () {
         let $orderId = jQuery(this).attr('data-order-id');
         var cancelSubscription = window.confirm("Onaylıyor iseniz, aboneliğiniz iptal edilecek ve ödemesi yenilenmeyecek.Ancak; aboneliğinizi üyelik sonlanma tarihine dek kullanmaya devam edebileceksiniz.");
         if (cancelSubscription) {
-            jQuery.ajax({
-                method: "POST",
-                dataType: "json",
-                url: moka_ajax.ajax_url,
-                data: {
-                    action  : 'optimisthub_ajax',
-                    method  : 'cancel_subscription',
-                    orderId : $orderId, 
-                },
-                success: function(response){
-                    if(response.data)
-                    {
-                        if(response.data.data.error) {
-                            alert(response.data.data.error);
-                        } else { 
-                            alert(response.data.data.messsage); 
-                            window.location.reload();
-                        }
+            $.post(moka_ajax.ajax_url + '?_=' + Date.now(), {
+                action  : 'optimisthub_ajax',
+                method  : 'cancel_subscription',
+                orderId : $orderId, 
+            }, function(response) {
+                if(response.data)
+                {
+                    if(response.data.data.error) {
+                        alert(response.data.data.error);
+                    } else { 
+                        alert(response.data.data.messsage); 
+                        window.location.reload();
                     }
-                }
-            });
+                } 
+            }, 'json');
         }  
     });
 });
diff --git a/assets/moka.js b/assets/moka.js
@@ -1,32 +1,24 @@
-jQuery.ajaxSetup({cache: false});
-
 jQuery(document).ready(function () {
-    console.info('Moka PAY Core Js File loaded, successfully. Version 3.7.3');
-
+    console.info('Moka PAY Core Js File loaded, successfully. Version 3.7.4');
+    let binCache = '';
+
     /**
      * Bin Number Request 
      */
-    jQuery(document).on('blur keyup click change','input#mokapay-card-number',function( e ) {  
-        e.preventDefault();
+    jQuery(document).on('blur keyup click change','input#mokapay-card-number', function( e ) {  
         let binValue = jQuery(this).val();
         let total = jQuery('#mokapay-current-order-total').val();
         binValue = binValue.replace(/\s/g, '');
-        if(binValue.length >= 6) {
-            jQuery.ajax({
-                method: "POST",
-                dataType: "json",
-                url: moka_ajax.ajax_url,
-                data: {
-                    action : 'optimisthub_ajax',
-                    method : 'validate_bin',
-                    binNumber : binValue,
-                    total : total 
-                },
-                success: function(response){
-                    jQuery('#ajaxify-installment-table').html('');
-                    jQuery('#ajaxify-installment-table').html(response.data.data.renderedHtml); 
-                }
-            });
+        if(binValue.length >= 6 && binValue.substr(0, 6) != binCache) {
+            binCache = binValue.substr(0, 6);
+            jQuery.post(moka_ajax.ajax_url + '?_=' + Date.now(), {
+                action : 'optimisthub_ajax',
+                method : 'validate_bin',
+                binNumber : binValue,
+                total : total,
+            }, function(response) {
+                jQuery('#ajaxify-installment-table').html(response.data.data.renderedHtml); 
+            }, 'json');
         } 
     }); 
 
@@ -39,29 +31,22 @@ jQuery(document).ready(function () {
         let $orderId = jQuery(this).attr('data-order-id');
         var cancelSubscription = window.confirm("Onaylıyor iseniz, aboneliğiniz iptal edilecek ve ödemesi yenilenmeyecek.Ancak; aboneliğinizi üyelik sonlanma tarihine dek kullanmaya devam edebileceksiniz.");
         if (cancelSubscription) {
-            jQuery.ajax({
-                method: "POST",
-                dataType: "json",
-                url: moka_ajax.ajax_url,
-                data: {
-                    action  : 'optimisthub_ajax',
-                    method  : 'cancel_subscription',
-                    orderId : $orderId, 
-                },
-                success: function(response){
-                    if(response.data)
-                    {
-                        if(response.data.data.error) {
-                            jQuery('#subscription_ajax_response').html(`<p>${response.data.data.error}</p>`);
-                        } else {
-                            jQuery('#subscription_ajax_response').html(`<p class="message">${response.data.data.messsage}</p>`);
-                            setTimeout(function(){
-                                window.location.reload();
-                            },3000);
-                        }
+            jQuery.post(moka_ajax.ajax_url + '?_=' + Date.now(), {
+                action  : 'optimisthub_ajax',
+                method  : 'cancel_subscription',
+                orderId : $orderId, 
+            }, function(response){
+                if(response.data) {
+                    if(response.data.data.error) {
+                        jQuery('#subscription_ajax_response').html(`<p>${response.data.data.error}</p>`);
+                    } else {
+                        jQuery('#subscription_ajax_response').html(`<p class="message">${response.data.data.messsage}</p>`);
+                        setTimeout(function(){
+                            window.location.reload();
+                        }, 3e3);
                     }
                 }
-            });
+            }, 'json');
         }  
     });
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,12 @@
             "name": "Fatih Toprak",
             "email": "[email protected]",
             "homepage": "https://github.com/optimisthub"
-        } 
+        },
+        {
+            "name": "Cüneyt Çil",
+            "email": "[email protected]",
+            "homepage": "https://github.com/optimisthub"
+        }
     ],
     "support": {
         "email": "[email protected]"
@@ -31,7 +36,6 @@
         "php": ">=7.1",
         "rappasoft/laravel-helpers": "^2.0",
         "tightenco/collect": "^8.68",
-        "spatie/ray": "^1.33",
         "nesbot/carbon": "^2.62"
     },
     "autoload": {

diff --git a/core/library/Moka_Core.php b/core/library/Moka_Core.php
@@ -49,12 +49,13 @@ public function initializePayment($params)
 
         $paymentRequest = self::doRequest($method, $postParams);
 
-        if(data_get($paymentRequest, 'response.code') && data_get($paymentRequest, 'response.code') == 200)
+        if($paymentRequest && data_get($paymentRequest, 'response.code') && data_get($paymentRequest, 'response.code') == 200)
         {
             $responseBody = data_get($paymentRequest, 'body');
             $responseBody = json_decode($responseBody, true);
             return $responseBody;
         }
+        return $paymentRequest;
     }
 
     /**
@@ -96,7 +97,7 @@ public function requestBin($params)
 
         $response = self::doRequest('/PaymentDealer/GetBankCardInformation',$postParams);
 
-        if(data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
+        if($response && data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
         {
             $responseBody = data_get($response, 'body');
             $responseBody = json_decode($responseBody, true);
@@ -132,7 +133,7 @@ public function getDealerInformation()
 
         $response = self::doRequest('/Dealer/GetDealer',$postParams);
 
-        if(data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
+        if($response && data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
         {
             $responseBody = data_get($response, 'body');
             $responseBody = json_decode($responseBody, true);
@@ -338,20 +339,30 @@ private function apiHost($params)
      */
     private function doRequest($method, $params)
     {
-        return wp_remote_post($this->apiHost.$method,
+        $remote_request = wp_remote_post($this->apiHost.$method,
             [
-                'method'      => 'POST',
-                'timeout'     => 45,
-                'redirection' => 5,
-                'httpversion' => '1.0',
-                'blocking'    => true,
-                'headers'     => [
-                    'Content-Type' => 'application/json'
+                'method'        => 'POST',
+                'timeout'       => 45,
+                'redirection'   => 5,
+                'httpversion'   => '1.0',
+                'blocking'      => true,
+                'headers'       => 
+                [
+                    'Content-Type'  => 'application/json'
                 ],
-                'body'        => json_encode($params),
-                'cookies'     => [],
+                'body'          => json_encode($params),
+                'cookies'       => [],
+                'sslverify'     => false,
             ]
-        );   
+        );
+        if(
+        !is_wp_error( $remote_request ) && 
+        200 == wp_remote_retrieve_response_code( $remote_request ) && 
+        !empty( wp_remote_retrieve_body( $remote_request ) )
+        ) {
+            return $remote_request;
+        }
+        return false;  
     }
 
     /**
@@ -454,7 +465,7 @@ public function addCustomerWithCard($params)
         $response = self::doRequest('/DealerCustomer/AddCustomerWithCard',$postParams);
 
 
-        if(data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
+        if($response && data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
         {
             $responseBody = data_get($response, 'body');
             $responseBody = json_decode($responseBody, true);
@@ -514,7 +525,7 @@ public function getCustomerByCustomerCode($params)
 
         $response = self::doRequest('/DealerCustomer/GetCustomer',$postParams);
 
-        if(data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
+        if($resposne && data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
         {
             $responseBody = data_get($response, 'body');
             $responseBody = json_decode($responseBody, true);
@@ -557,7 +568,7 @@ public function addCard($params)
 
         $response = self::doRequest('/DealerCustomer/AddCard',$postParams);
 
-        if(data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
+        if($response && data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
         {
             $responseBody = data_get($response, 'body');
             $responseBody = json_decode($responseBody, true);
@@ -596,7 +607,7 @@ public function removeCard($params)
 
         $response = self::doRequest('/DealerCustomer/RemoveCard',$postParams);
 
-        if(data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
+        if($response && data_get($response, 'response.code') && data_get($response, 'response.code') == 200)
         {
             $responseBody = data_get($response, 'body');
             $responseBody = json_decode($responseBody, true);

diff --git a/core/library/Moka_Init.php b/core/library/Moka_Init.php
@@ -3,11 +3,6 @@
 	exit;
 }
 
-define('OPTIMISTHUB_MOKA_PAY_VERSION', '3.7.3');
-
-global $mokaVersion;
-$mokaVersion = OPTIMISTHUB_MOKA_PAY_VERSION;
-
 /**
  * Init Moka POS Confiuration and Gateway Class for WooCommerce
  * @since 2.2