From 24e9ca8ccd62cbbb1a3d15e9a173bea27d82dfbb Mon Sep 17 00:00:00 2001
From: Shohrat <shokki.a96@gmail.com>
Date: Fri, 26 Jan 2024 15:06:32 +0500
Subject: [PATCH] gb

---
 config/database.php                           |  2 +-
 plugins/romanah/gokbakja/components/Order.php | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config/database.php b/config/database.php
index cd32e88..40b91f3 100644
--- a/config/database.php
+++ b/config/database.php
@@ -57,7 +57,7 @@ return [
             'engine' => 'InnoDB',
             'host' => 'localhost',
             'port' => 3306,
-            'database' => 'gok_bakja_from_server',
+            'database' => 'gok_bakja_01_24',
             'username' => 'root',
             'password' => 'bt110226',
             'charset' => 'utf8mb4',
diff --git a/plugins/romanah/gokbakja/components/Order.php b/plugins/romanah/gokbakja/components/Order.php
index 591e4ed..4594fd2 100644
--- a/plugins/romanah/gokbakja/components/Order.php
+++ b/plugins/romanah/gokbakja/components/Order.php
@@ -290,47 +290,48 @@ class Order extends ComponentBase
 
             $mustPay = '';
             $mustPayCalc = number_format(($orderDatas[$x]->order_all_price - $orderDatas[$x]->all_payments), 2);
+            $mustPayCalcQQ = ($orderDatas[$x]->order_all_price - $orderDatas[$x]->all_payments);
 
-            if($mustPayCalc < 0){
+            if($mustPayCalcQQ < 0){
                 $mustPay = 'artykmaç '.abs($mustPayCalc).' $';
-            }else if($mustPayCalc == 0){
+            }else if($mustPayCalcQQ == 0){
                 $mustPay = '';
             } else{
                 $mustPay = $mustPayCalc.' $';
             }
-            
+
             if($orderDatas[$x]->shippingTransport == null){
-                
+
                 $shippingDate = '';
                 $status = '';
-                    
+
             }else{
-                
+
                 $shippingDate =  Carbon::parse($orderDatas[$x]->shippingTransport->date)->format('d.m.Y') ?? '';
-                
+
                 if ($orderDatas[$x]->shippingTransport->status == "loaded") {
                     $status = '<span class="badge badge-soft-info"
                     style="font-size: 14px;">ÝÜKLENDI</span>';
                 }
-    
+
                 if ($orderDatas[$x]->shippingTransport->status == "loading") {
                     $status = '<span class="badge badge-soft-primary"
                     style="font-size: 14px;">ÝÜKLENÝÄR</span>';
                 }
-    
+
                 if ($orderDatas[$x]->shippingTransport->status == "proccess") {
                     $status = '<span class="badge badge-soft-warning"
                     style="font-size: 14px;">ÝOLDA</span>';
                 }
-    
+
                 if ($orderDatas[$x]->shippingTransport->status == "complated") {
                     $status = '<span class="badge badge-soft-success"
                     style="font-size: 14px;">TAMAMLANDY</span>';
                 }
-                
-                    
+
+
             }
-            
+
             $html_data .= '<tr>
                                 <td style="font-weight: bold;">' . ($x + 1) . '</td>
                                 <td><a href="/order-detail/' . $orderDatas[$x]->id . '" style="font-weight: bold;">Sargyt #' . $orderDatas[$x]->id . '</a></td>