hotfix/empty-lines

optimisthub · Dec 29, 2021 · 593ab04 · 593ab04
1 parent 8722f43
commit 593ab04
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/core/library/Moka_Core.php b/core/library/Moka_Core.php
@@ -190,7 +190,6 @@ public function generateInstallmentsTableHtml($params)
 
         foreach($storedData as $perStoredInstallmentKey => $perStoredInstallment)
         {
-
             $return.='<tr>';
                 $imagePath =  plugins_url( 'moka-woocommerce-master/assets/img/cards/banks/' );
 
@@ -349,7 +348,7 @@ private function doRequest($method, $params)
      * @param [array] $response
      * @return void
      */
-    private function formatInstallmentResponse($response)
+    public function formatInstallmentResponse($response)
     {
         $output = [];
 

diff --git a/core/library/Optimisthub_Ajax.php b/core/library/Optimisthub_Ajax.php
@@ -7,8 +7,9 @@ class Optimisthub_Ajax
 {
     public function __construct() 
     {
+        $this->mokaPayRequest = new MokaPayment();
         $this->mokaOptions  = get_option('woocommerce_mokapay_settings');
-        $this->installments = get_option('woocommerce_mokapay-installments');
+        $this->installments = get_option('woocommerce_mokapay-installments') ? get_option('woocommerce_mokapay-installments') : self::generateDynamicInstallmentData();
         $this->currency = get_option('woocommerce_currency');
         $this->enableInstallment = 'yes' === data_get($this->mokaOptions, 'installment');
 
@@ -37,27 +38,25 @@ public function validate_bin($params)
         $mokaPay = new MokaPayment();
         $response = $mokaPay->requestBin(['binNumber' => $binNumber]);
 
-
         ## installments
         $bankCode = mb_strtolower(data_get($response, 'BankCode')); 
         $bankGroup = mb_strtolower(data_get($response, 'GroupName')); 
- 
+
         $installments = self::fetchInstallment();
+
         $avaliableInstallment = null;
         if($bankGroup)
         { 
-
             foreach($installments as $perInstallment)
             {
                 if($perInstallment['groupName'] == $bankGroup)
                 {
                     $avaliableInstallment = $perInstallment;
                 }
             } 
-        }   
-        ## installments
+        }    
 
-
+        ## installments
         $data= [
             'cardInformation' => $response, 
             'installments' => $avaliableInstallment,
@@ -208,6 +207,23 @@ private function calculateComissionRate( $total, $percent, $installment )
         return number_format(($total/$installment),2);
     }
 
+    /**
+     * Set dynamic installment table from live server
+     *
+     * @return void
+     */
+    private function generateDynamicInstallmentData()
+    {
+        $list = $this->mokaPayRequest->getInstallments();
+        $list = data_get($list, 'CommissionList');
+
+        if(!$list)
+        {
+            return false;
+        }
+        return $this->mokaPayRequest->formatInstallmentResponse($list);
+    }
+
 }
 
 new Optimisthub_Ajax();