diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index a1e10f2..a87726e 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -229,14 +229,14 @@ class KhazanahController extends Controller if($tebus_detail['jenistebus'] == 'P') { - $totalkeluar = $tebus_detail['addpinjaman'] + $keluar; + // $totalkeluar = $tebus_detail['addpinjaman'] + $keluar; $totalmasuk = $tebus_detail['bakiupah'] + $masuk; // $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan; $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ 'kodlaluan' => $tebus_detail['teller'], - 'keluar'=>$totalkeluar, + 'keluar'=>$keluar, 'masuk'=>$totalmasuk, 'bakiakhir'=>$bakiakhir ]); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a498123..7b918f8 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; +use Carbon\Carbon; class LelongController extends Controller { @@ -43,4 +44,18 @@ class LelongController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); return view('khazanah.lelong',compact('cawangan_info','api_url')); } + + public function resittuntutbaki($norujukan){ + + $api_url = config('api.url'); + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url')); + + } } diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index d527bd1..b7cb84f 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -253,10 +253,7 @@ Baki Lelong
- @php - $limit_pinjaman_semasa = 0; - @endphp - +
@@ -287,7 +284,7 @@ Rugi Lelong
- +
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 686f30d..9b20693 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -33,7 +33,7 @@ NO RUJUKAN
- +
@@ -54,12 +54,12 @@
- - + +
- - + +
@@ -158,7 +158,7 @@ JUMLAH (RM)
- +
@@ -168,7 +168,7 @@
- +
@@ -182,4 +182,32 @@ + @endsection \ No newline at end of file diff --git a/resources/views/print/resit_tuntutbaki.blade.php b/resources/views/print/resit_tuntutbaki.blade.php new file mode 100644 index 0000000..1bc58ad --- /dev/null +++ b/resources/views/print/resit_tuntutbaki.blade.php @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + +
Batch No Lelongan :
Tarikh Lelongan :
RESIT BAYARAN LEBIHAN LELONGAN
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No Rujukan Surat Gadai012334
Nama PemilikSiti Aminah
No K/P892322232
Tarikh03-12-2020
Nama wakil
No K/P
Harga Lelongan1,930.00
Pembiayaan1,200.00
Baki Keuntungan198.00
Caj Lelong57.90
Lebihan Lelongan4474.10
Jumlah BayaranRM 474.10
+ +
+ + + +
Nota: Pastikan No Kad Pengenalan Surat Akuan Gadaian dan Tandatangan. Sila ambil cop sekiranya surat gadai hilang/tidak dibawa manakala wakil diminta Tandatangan dan Cop Jari.
+ +
+
+ + + + + + + + + + + + + + + + +
.................................................................. ..................................................................
Tandatangan Pelanggan Penandatangan Berkuasa
+ + + + + + diff --git a/routes/web.php b/routes/web.php index ce55e04..22eb15c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -182,6 +182,8 @@ Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'GadaianController@r Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'GadaianController@resittebusseparuh'])->middleware('auth','teller'); Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller'); Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller'); +Route::get('/resit/tuntutbaki/{id}',['as'=>'resit.tuntutbaki','uses'=>'LelongController@resittuntutbaki'])->middleware('auth','teller'); + Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah');