From e2bf6f42709bf1ab4b94051514ec24501b480462 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Fri, 25 Nov 2022 17:39:03 +0800
Subject: [PATCH] update new pada lelong

---
 app/Http/Controllers/LelongController.php      | 15 +++++++++------
 app/Http/Controllers/ReportController.php      |  7 ++++---
 resources/views/lelong/senaraimarhun.blade.php |  6 +++++-
 resources/views/pdf/pdflelongreport.blade.php  |  6 +++++-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 6b69a5c3..648b112a 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -250,8 +250,10 @@ class LelongController extends Controller
                 //$cajlelong += $lel_bid->cajlelong;
 
                 $sumcajlelong =  $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
-                $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong, 1, 1);
+                $cajlelongnew = round($sumcajlelong, 1, 1);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
+                $cajlelong = $cajlelong + $cajlelongnew;
+                $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $cajlelongnew;
                 if (strpos($totalbaki, '-') !== false) {
                     $rugi  = -$totalbaki;
                     $rugilelong += $rugi;
@@ -1304,8 +1306,9 @@ class LelongController extends Controller
         $arraymarhun = [];
         foreach ($marhuns as $index1=> $cal) {
             $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
-            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
-            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $marhuns[$index1]['cajlelong'] = $cajlelongnew;
             $marhuns[$index1]['baki'] =  $totalbaki;
             $marhuns[$index1]['keuntungan'] = $keuntungan;
 
@@ -1314,7 +1317,7 @@ class LelongController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
+            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
 
             array_push($arraymarhun,[
                 'norujukan' => $cal['norujukan'],
@@ -1324,7 +1327,7 @@ class LelongController extends Controller
                 'hargaasas' => $cal['hargaasas'],
                 'pinjaman' => $cal['pinjaman'],
                 'bakiupah' => $cal['bakiupah'],
-                'cajlelong' => $cal['cajlelong'],
+                'cajlelong' => $cajlelongnew,
                 'baki' => $cal['baki'],
             ]);
         }
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index bb46a616..ba6fe4a2 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -797,8 +797,9 @@ class ReportController extends Controller
             // dd($customer);
             $simulasilel = Lelong::where('id',$lelongid)->get();
             $sumcajlelong =  $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
-            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
-            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $marhuns[$index1]['cajlelong'] =  $cajlelongnew;
             $marhuns[$index1]['baki'] =  $totalbaki;
 
 
@@ -828,7 +829,7 @@ class ReportController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
+            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
 
         }
 
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 1277a272..aaad5b81 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -132,7 +132,11 @@
                             <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
-                            <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
                             <td align = 'right'></td>
                         </tr>
                     </tfoot>
diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php
index 5a5865a5..8735b522 100644
--- a/resources/views/pdf/pdflelongreport.blade.php
+++ b/resources/views/pdf/pdflelongreport.blade.php
@@ -214,7 +214,11 @@
                               <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
                               <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
                               <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
-                              <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
                           </tr>
                       </tfoot>