fix

app/Http/Controllers/KhazanahController.php

@@ -1975,9 +1975,11 @@ class KhazanahController extends Controller
 
         //Harta semasa
         $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruq/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
-        
+        $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
         //Tanggungan Semasa
         $panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
@@ -1994,11 +1996,12 @@ class KhazanahController extends Controller
         $hartasemasa = [];
         // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
         
-        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]);
+        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan]);
+        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
         array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
         array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
         array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
-        array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0]);
+        array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
         array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]);
         array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
         array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
@@ -2035,7 +2038,16 @@ class KhazanahController extends Controller
             $totaltanggungansemasa += $ts['amaun'];
         }
 
-        return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
+        $untungrugifield = [];
+        $untungrugi = 0;
+        array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]);
+
+
+        $totaluntungrugi = 0;
+        $totaluntungrugi = $totaltanggungansemasa + $untungrugi;
+
+
+        return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
 
     }
 

app/Http/Controllers/PenebusanController.php

@@ -526,11 +526,9 @@ class PenebusanController extends Controller
             $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
 
             $totalnilaimarhun += $nilaimarhun;
-
        }
 
        return $totalnilaimarhun;
-
     }
 
 }

resources/views/homepage/teller/home.blade.php

@@ -5,7 +5,7 @@
     <div class="row justify-content-center" style="margin-top:60px;">
         <div class="col-md-8">
             <div class="card">
-                <div class="card-header bg-secondary"><span style="font-weight:500;">{{ __('Dashboard') }}</span></div>
+                <div class="card-header bg-secondary text-center"><span style="font-weight:500;">{{ __('Paparan Utama') }}</span></div>
 
                 <div class="card-body text-center">
                     <a class="btn btn-info btn-lg" href="#" onclick="pelangganclick()">PELANGGAN</a>

resources/views/penebusan/index.blade.php

@@ -117,18 +117,19 @@
                             @php $count = 0; @endphp
                             @foreach ($marhun as $index=>$m)
                             <tr>
-                            <td><input type="checkbox" id="checkmarhun" data-recno="{{ $m['recno'] }}" data-nm="{{ $m['n_marhun'] }}" data-marhun="{{ $m['marhun'] }}" data-berat="{{ $m['berat'] }}" style="display:none;"/><span class="spannar">{{ $index+1 }}</span></td>
+                            @php
+                                $karatbaru = str_replace('.','-',$m['karat']);
+                                $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+                                $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']);
+                                @endphp
+                            <td><input type="checkbox" id="checkmarhun" data-nmhs="{{ $hargaemassemasa }}" data-recno="{{ $m['recno'] }}" data-nm="{{ $m['n_marhun'] }}" data-marhun="{{ $m['marhun'] }}" data-berat="{{ $m['berat'] }}" style="display:none;"/><span class="spannar">{{ $index+1 }}</span></td>
                             @php
                             $marhunperibadi = Http::get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json();
                             @endphp
                             <td>{{ $marhunperibadi['descpt'] }}</td>
                             <td>RM {{ number_format($m['n_marhun'],2) }}</td>
                             <td>@php
-                             $karatbaru = str_replace('.','-',$m['karat']);
-                             $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
-
-                                $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']);
-
                                 echo "RM " . number_format($hargaemassemasa,2);
                             @endphp</td>
                             <td>{{ $m['berat'] }}</td>
@@ -273,6 +274,17 @@
                                 </div>
                             </div>
 
+                            <div class="col-6" id="divpembiayaanseparuhhargasemasa">
+                                <div class="form-group row">
+                                    <div class="col-4">
+                                        PEMBIAYAAN BARU HARGA SEMASA (RM)
+                                    </div>
+                                    <div class="col-8">
+                                        <input type="text" id="separuhhargasemasa" class="form-control" readonly/>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div class="col-6" id="divpinjamanbaru">
                                
                                 <div class="form-group row">
@@ -299,7 +311,6 @@
                                         <input type="text" id="bayaranditerima" class="form-control" readonly/>
                                     </div>
                                 </div>
-
                             </div>
 
                            
@@ -341,16 +352,19 @@
     $('#divbayaranditerima').hide();
     $('#divbakipinjaman').hide();
     $('#divhargaemassemasa').hide();
+    $('#divpembiayaanseparuhhargasemasa').hide();
 
 
     var array_recno = [];
     var array_nm = [];
     var array_marhun = [];
     var array_berat = [];
+    var array_nmhs = [];
 
     //max bayaran 
     let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}");
     let totalmarhun = jumlahasalmarhun;
+    let totalmarhunhargasemasa = jumlahasalmarhun;
 
     let bayaranseparuhasal = 0;
 
@@ -501,19 +515,23 @@
             var nilaimarhun = $(this).data('nm');
             var marhun = $(this).data('marhun');
             var berat = $(this).data('berat');
+            var nilaimarhunhargasemasa = $(this).data('nmhs');
 
             if ($(this).is(':checked')) {
                 array_recno.push(recno);
                 array_nm.push(nilaimarhun);
                 array_marhun.push(marhun);
                 array_berat.push(berat);
+                array_nmhs.push(nilaimarhunhargasemasa);
 
 
                 totalmarhun = totalmarhun - parseFloat(nilaimarhun);
+                totalmarhunhargasemasa = totalmarhunhargasemasa - parseFloat(nilaimarhunhargasemasa);
                 
             }else{
                 var rm = array_recno.findIndex(x => x === recno);
                 var rmnilai = array_nm.findIndex(y => y == nilaimarhun);
+                var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa);
                 var rmmarhun = array_marhun.findIndex(z => z == marhun);
                 var rmberat = array_berat.findIndex(a => a == berat);
                 
@@ -521,10 +539,10 @@
                 array_nm.splice(rmnilai,1);
                 array_marhun.splice(rmmarhun,1);
                 array_berat.splice(rmberat,1);
+                array_nmhs.splice(rmhargasemasa,1);
 
                 totalmarhun = totalmarhun + parseFloat(nilaimarhun);
-
+                totalmarhunhargasemasa = totalmarhunhargasemasa + parseFloat(nilaimarhunhargasemasa);
-
             }
             if(numbernotchecked != totalCheckboxes){
                 $.ajax({
@@ -646,6 +664,8 @@
             $('#divbayaranditerima').hide();
             $('#divbakipinjaman').hide();
             $('#divhargaemassemasa').hide();
+            $('#divpembiayaanseparuhhargasemasa').hide();
+
 
 
             $('#divtelahdibayar').show();
@@ -668,6 +688,7 @@
             $('#divbayaranditerima').hide();
             $('#divbakipinjaman').hide();
             $('#divhargaemassemasa').hide();
+            $('#divpembiayaanseparuhhargasemasa').hide();
 
 
             $('#divtelahdibayar').show();
@@ -696,6 +717,8 @@
             $('#divtelahdibayar').show();
             $('#divbayaran').show();
             $('#divperludibayar').show();
+            $('#divpembiayaanseparuhhargasemasa').show();
+
             
 
             $('#perludibayar').val(formatter.format(jumupah));
@@ -711,6 +734,7 @@
             $('#divhargaemassemasa').show();
 
             $('#divtelahdibayar').hide();
+            $('#divpembiayaanseparuhhargasemasa').hide();
             $('#divbakipinjaman').hide();
             $('#divbayaran').hide();
             $('#divperludibayar').hide();

resources/views/print/laporan_imbanduga.blade.php

@@ -411,16 +411,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 <table id="header">
   <tr>
     <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
@@ -442,8 +432,6 @@
 <br>
 
 
-<br>
-
 <table id="tarikh_ib">
 <tr>
  <td cospan="2" > <B><U>LAPORAN IMBANGAN DUGA CAWANGAN</U></B></td>
@@ -451,7 +439,6 @@
 
 </tr>
 </table>
-<BR> 
 
 <table id="tarikh_ib">
 
@@ -463,7 +450,6 @@
 </table>
 <br>
 
-<br>
 <table id="GL_dtl"> 
 
   <tr>
@@ -494,12 +480,10 @@
 
 </table>
 <br>
-<br>
-<br>
 <table id="GL_dtl"> 
 
   <tr>
-    <th width="20%"><b> TANGGUNGAN SEMASA</b> </th>
+    <th width="20%"><b> T. SEMASA</b> </th>
     <th width="60%"></th>
     <th width="20%"></th>
   </tr>
@@ -518,6 +502,30 @@
     <td>{{ number_format($totaltanggungansemasa,2) }}</td>
   </tr>
 
+</table>
+<br>
+<table id="GL_dtl"> 
+
+  <tr>
+    <th width="20%"><b> Untung Rugi</b> </th>
+    <th width="60%"></th>
+    <th width="20%"></th>
+  </tr>
+
+  @foreach($untungrugifield as $index => $untungrugi)
+  <tr>
+    <td>{{ $untungrugi['glcode'] }}</td>
+    <td>{{ $untungrugi['descpt'] }}</td>
+    <td>{{ number_format($untungrugi['amaun'],2) }}</td>
+  </tr>
+  @endforeach
+
+  <tr>
+    <td><b>JUMLAH </b></td>
+    <td colspan="1"></td>
+    <td>{{ number_format($totaluntungrugi,2) }}</td>
+  </tr>
+
 </table>
 <br>