diff --git a/app/Http/Controllers/SemakController.php b/app/Http/Controllers/SemakController.php index c9e33a0..0cf2e9d 100644 --- a/app/Http/Controllers/SemakController.php +++ b/app/Http/Controllers/SemakController.php @@ -29,6 +29,11 @@ class SemakController extends Controller if(sizeof($belum_tebus) > 0) $belum_tebus = $belum_tebus[0]; - return view('semak.senaraisag', compact('belum_tebus')); + $sudah_tebus = Http::get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'sudah_tebus')->json(); + + if(sizeof($sudah_tebus) > 0) + $sudah_tebus = $sudah_tebus[0]; + + return view('semak.senaraisag', compact('belum_tebus','sudah_tebus')); } } diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index fa0c806..eb55a1f 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -71,7 +71,7 @@
{{--
Traffic
--}} - S.O.A + Penyata
diff --git a/resources/views/penyata/penyata.blade.php b/resources/views/penyata/penyata.blade.php index de53ec5..fe4c944 100644 --- a/resources/views/penyata/penyata.blade.php +++ b/resources/views/penyata/penyata.blade.php @@ -4,6 +4,8 @@ .header{ font-size:12px; font-weight: bold; + margin-left:40px; + } .middleheader{ @@ -23,6 +25,7 @@ font-family: Arial, Helvetica, sans-serif; border-collapse: collapse; width: 100%; + margin-left:40px; } #header td, #customers th { @@ -138,6 +141,16 @@ DEBIT KREDIT + @foreach($gadai as $index1=>$gad) + + {{ $gad['t_gadai'] }} + Pelanggan Gadai + {{ $gad['norujukan'] }} + {{ number_format($gad['pinjaman'],2) }} + + {{ number_format($gad['bakipjm'],2) }} + + @endforeach @foreach($transaction as $index=>$trans) {{ $trans['created_at'] }} @@ -145,22 +158,30 @@ {{ $trans['norujukan'] }} @if($trans['trans_type'] != 'P') - {{ $trans['duit_masuk'] }} + {{ number_format($trans['duit_masuk'],2) }} @else - {{ $trans['duit_masuk'] }} + {{ number_format($trans['duit_masuk'],2) }} @endif - {{ $trans['bakiharga'] }} + {{ number_format($trans['bakiharga'],2) }} @endforeach
- +
+ + \ No newline at end of file diff --git a/resources/views/semak/senaraisag.blade.php b/resources/views/semak/senaraisag.blade.php index 9333b33..ed4f48d 100644 --- a/resources/views/semak/senaraisag.blade.php +++ b/resources/views/semak/senaraisag.blade.php @@ -12,8 +12,8 @@ @@ -31,232 +31,253 @@
- -
-

SAG Belum Tawarruq

-
- -
- - - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - - - - - - - - - - +
+
+ +
+

Belum Tawarruq

+
+ +
+
No RujukanPembiayaanUpahNilai MarhunBeratMarhunJBGKadar Upah
-
-
- {{ $bt['norujukan'] }} -
-
- 		- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['pinjaman'],2) }} -
+ + + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] == '') + + + + + + + + + + + @endif @endforeach - -
No RujukanPembiayaanUpahNilai MarhunBeratMarhunJBGKadar Upah
+
+
+ {{ $bt['norujukan'] }} +
+
+ 		+ {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['pinjaman'],2) }} +
+ + +
+
- -
-

SAG Tawarruq

-
- -
- - - - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - - - - - - - - - - - +
+
+

Tawarruq

+
+ +
+
No RujukanPembiayaan AsalBaki PembiayaanKeuntunganN. MarhunBerat(gm)Kos Keuntungan (12bulan)MarhunJBG
-
-
- {{ $bt['norujukan'] }} -
-
- 		- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['bakipjm'],2) }} - - {{ number_format($bt['bakipjm'],2) }} - - {{ number_format($bt['nilaimarhun'],2) }} - - {{ number_format($bt['berat'],2) }} - - {{ number_format($bt['upah12'],2) }} - - {{ number_format($bt['upah12'],2) }} - - {{ number_format($bt['jbg'],2) }} -
+ + + + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] != '') + + + + + + + + + + + + @endif @endforeach - -
No RujukanPembiayaan AsalBaki PembiayaanKeuntunganN. MarhunBerat(gm)Kos Keuntungan (12bulan)MarhunJBG
+
+
+ {{ $bt['norujukan'] }} +
+
+ 		+ {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['bakipjm'],2) }} + + {{ number_format($bt['bakipjm'],2) }} + + {{ number_format($bt['nilaimarhun'],2) }} + + {{ number_format($bt['berat'],2) }} + + {{ number_format($bt['upah12'],2) }} + + {{ number_format($bt['upah12'],2) }} + + {{ number_format($bt['jbg'],2) }} +
+ + +
+
- - -
-

SAG HISTORY

-
- -
- - - - - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - - + + + + + + + + + + + @endforeach + +
No RujukanPinjamanN. MarhunBerat(gm)MarhunJBGK.UpahUpahJ.TebusT.Tebus
-
-
- {{ $bt['norujukan'] }} +
+
+

History

+
+ +
+ + + + + + + + + + + + + + + + + @foreach($sudah_tebus as $index=>$st) + + - - - - - - - - - - - @endforeach - -
No RujukanPinjamanN. MarhunBerat(gm)MarhunJBGK.UpahUpahJ.TebusT.Tebus
+
+
+ {{ $st['norujukan'] }} +
- - 		- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['bakipjm'],2) }} - - {{ number_format($bt['bakipjm'],2) }} - - {{ number_format($bt['nilaimarhun'],2) }} - - {{ number_format($bt['berat'],2) }} - - {{ number_format($bt['upah12'],2) }} - - {{ number_format($bt['upah12'],2) }} - - {{ number_format($bt['jbg'],2) }} - - {{ number_format($bt['jbg'],2) }} -
+
+ {{ number_format($st['pinjaman'],2) }} + + {{ number_format($st['bakipjm'],2) }} + + {{ number_format($st['bakipjm'],2) }} + + {{ number_format($st['nilaimarhun'],2) }} + + {{ number_format($st['berat'],2) }} + + {{ number_format($st['upah12'],2) }} + + {{ number_format($st['upah12'],2) }} + + {{ number_format($st['jbg'],2) }} + + {{ number_format($st['jbg'],2) }} +
+
+
- - {{-- -
- -
--}} +
- {{-- --}} + @endsection diff --git a/routes/web.php b/routes/web.php index 975f33e..de36a38 100644 --- a/routes/web.php +++ b/routes/web.php @@ -66,9 +66,14 @@ Route::get('/penyata/{norujukan}', function ($norujukan) { $customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json(); + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + + if(sizeof($gadai) != 0) + $gadai = $gadai[0]; + $transaction = Http::get(config('api.url').'/api/transaction/norujukan/'. $norujukan)->json(); - return view('penyata.penyata',compact('cawangan_detail','transaction','customer')); + return view('penyata.penyata',compact('cawangan_detail','transaction','customer','gadai')); })->name('penyata.show');