diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index cc096ca..ab65291 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -228,10 +228,10 @@ class KhazanahController extends Controller
public function barcodescannedtebus(Request $request)
{
+
$auth_user = Auth::user();
- $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json();
$gadai_detail = $gadai[0];
@@ -274,7 +274,7 @@ class KhazanahController extends Controller
$jumlah_bayaran=$jum_bayaran['duit_masuk'];
-
+
//tarikh tawawruqq
$tarikh_gadai_tawaruq_start='2021-04-14';
if($tarikh_gadai<$tarikh_gadai_tawaruq_start)
@@ -314,8 +314,8 @@ class KhazanahController extends Controller
]);
- $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
- $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
+ $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
+ $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
$get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
@@ -378,14 +378,75 @@ class KhazanahController extends Controller
]);
+ if($tebus_detail['jenistebus'] == 'P')
+ {
-
-
-
+ $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
+
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$totalmasuk,
+ 'bakiakhir'=>$bakiakhir
+ ]);
+
+ if($updateTunai)
+ {
+ $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+ }
+ else
+ {
+ dd('x masuk aliran tunai');
+ }
+
+ }else{
+
+ if($tebus_detail['jenistebus'] == 'S')
+ {
+ $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
+
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$totalmasuk,
+ 'bakiakhir'=>$bakiakhir
+ ]);
+
+ if($updateTunai)
+ {
+ $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+ }
+ else
+ {
+ dd('x masuk aliran tunai');
+ }
+ }else{
+ $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
+
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$totalmasuk,
+ 'bakiakhir'=>$bakiakhir
+ ]);
+
+ if($updateTunai)
+ {
+ $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+ }
+ else
+ {
+ dd('x masuk aliran tunai');
+ }
+ }
+ }
+
}
else
{
+ // dd(request()->all());
+
if($tebus_detail['jenistebus'] == 'P')
{
@@ -489,23 +550,48 @@ class KhazanahController extends Controller
'kelmarin' =>$kelmarin_bp,
]);
- //KIRAAN LEJER AM PENEBUSAN P BERAKHIR
+ //KIRAAN LEJER AM PENEBUSAN P BERAKHIR
- $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
- 'kodlaluan' => $tebus_detail['teller'],
- 'keluar'=>$keluar,
- 'masuk'=>$totalmasuk,
- 'bakiakhir'=>$bakiakhir
- ]);
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$totalmasuk,
+ 'bakiakhir'=>$bakiakhir
+ ]);
+
+ if($updateTunai)
+ {
+ $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+ }
+ else
+ {
+ dd('x masuk aliran tunai');
+ }
}else{
if($tebus_detail['jenistebus'] == 'S')
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
+
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$totalmasuk,
+ 'bakiakhir'=>$bakiakhir
+ ]);
+
+ if($updateTunai)
+ {
+ $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+ }
+ else
+ {
+ dd('x masuk aliran tunai');
+ }
- //KIRAAN LEJER AM UNTUK PENEBUSAN S
+ //KIRAAN LEJER AM UNTUK PENEBUSAN S
$get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
$keterangan_Tunai=$get_GLCode_Tunai[0]['descpt'];
@@ -582,36 +668,38 @@ class KhazanahController extends Controller
]);
- $get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
- $jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
-
- $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_BP])->json();
-
- $hariini_bp=$get_lejerBayaran_Pendahuluan[0]['hariini'];
- $kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
- $jumlah_bp=$get_lejerBayaran_Pendahuluan[0]['jumlah'];
- $debit_bp=$get_lejerBayaran_Pendahuluan[0]['debit'];
- $recno_bp=$get_lejerBayaran_Pendahuluan[0]['recno'];
- $kredit_bp=$get_lejerBayaran_Pendahuluan[0]['kredit'];
-
- $debit_bp=$debit_bp+$jumlah_bp;
- $hariini_bp=$debit_bp-$kredit_bp;
- $kelmarin_bp=$jumlah_bp-$hariini_bp;
-
- $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
- 'recno'=>$recno_bp,
- 'debit'=>$debit_bp,
- 'kredit'=>$kredit_bp,
- 'hariini'=>$hariini_bp,
- 'kelmarin' =>$kelmarin_bp,
-
- ]);
+ $get_bayaranPD=Http::get(config('api.url').'/api/jumlah_bayaran_pendahuluan/'.$request->norujukan_barcode)->json();
+ $jumlah_bp=$get_bayaranPD[0]['total_byr_pendahuluan'];
+
+ $get_lejerBayaran_Pendahuluan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_BP])->json();
+
+ $hariini_bp=$get_lejerBayaran_Pendahuluan[0]['hariini'];
+ $kelmarin_bp=$get_lejerBayaran_Pendahuluan[0]['kelmarin'];
+ $jumlah_bp=$get_lejerBayaran_Pendahuluan[0]['jumlah'];
+ $debit_bp=$get_lejerBayaran_Pendahuluan[0]['debit'];
+ $recno_bp=$get_lejerBayaran_Pendahuluan[0]['recno'];
+ $kredit_bp=$get_lejerBayaran_Pendahuluan[0]['kredit'];
+
+ $debit_bp=$debit_bp+$jumlah_bp;
+ $hariini_bp=$debit_bp-$kredit_bp;
+ $kelmarin_bp=$jumlah_bp-$hariini_bp;
+
+ $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+ 'recno'=>$recno_bp,
+ 'debit'=>$debit_bp,
+ 'kredit'=>$kredit_bp,
+ 'hariini'=>$hariini_bp,
+ 'kelmarin' =>$kelmarin_bp,
+
+ ]);
//KIRAAN LEJER AM PENEBUSAN S BERAKHIR
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
// KIRAAN LEJER AM BERMULA UNYTUK PENEBUSAN JENIS 'T'
+
+
$get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
$keterangan_Tunai=$get_GLCode_Tunai[0]['descpt'];
@@ -700,22 +788,33 @@ class KhazanahController extends Controller
$hariini_bp=$debit_bp-$kredit_bp;
$kelmarin_bp=$jumlah_bp-$hariini_bp;
- $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
- 'recno'=>$recno_bp,
- 'debit'=>$debit_bp,
- 'kredit'=>$kredit_bp,
- 'hariini'=>$hariini_bp,
- 'kelmarin' =>$kelmarin_bp,
- ]);
+ $updateGlejer_BP=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+ 'recno'=>$recno_bp,
+ 'debit'=>$debit_bp,
+ 'kredit'=>$kredit_bp,
+ 'hariini'=>$hariini_bp,
+ 'kelmarin' =>$kelmarin_bp,
+ ]);
// KIRAAN LEJER AM PENEBUSAN T BERAKHIR
}
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
- $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
- 'kodlaluan' => $tebus_detail['teller'],
- 'keluar'=>$keluar,
- 'masuk'=>$totalmasuk,
- 'bakiakhir'=>$bakiakhir
+ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+ 'kodlaluan' => $tebus_detail['teller'],
+ 'keluar'=>$keluar,
+ 'masuk'=>$totalmasuk,
+ 'bakiakhir'=>$bakiakhir
]);
+
+ if($updateTunai)
+ {
+ $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
+ }
+ else
+ {
+ //
+
+ //dd('x masuk aliran tunai');
+ }
}
@@ -725,16 +824,9 @@ class KhazanahController extends Controller
//masuk dalam tunai aliran
- return $this->tebus();
-
-
-
-
-
-
-
-
+ // return $this->tebus();
+ return redirect()->route('khazanah.tebus');
}
@@ -1566,7 +1658,7 @@ class KhazanahController extends Controller
{
//WI ERROR MESSAGE SKIT
// dd($baki_awal);
- return redirect()>route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
+ return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
}
else
{
@@ -1701,7 +1793,7 @@ class KhazanahController extends Controller
$amount = $request->amt;
if($amount>$baki_awal){
- return redirect()>route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
+ return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
}else{
$tarikh=$request->tarikh;
$kodlaluan=$request->teller;
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 67bf225..8d43ae3 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -1970,7 +1970,8 @@
allowEnterKey: false,
confirmButtonText: ' Baik Boss!',
icon: 'success',
- title: 'Maklumat Anda Berjaya Direkodkan!'
+ title: 'Maklumat Anda Berjaya Direkodkan!',
+ html: '' + data.nama + '
' + data.nokp + ''
});
nw = data.nowakil;
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 6eb9721..1f6695e 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -409,7 +409,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
@@ -503,7 +503,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
diff --git a/resources/views/print/resitansuransebelum.blade.php b/resources/views/print/resitansuransebelum.blade.php
index df55994..47478c3 100644
--- a/resources/views/print/resitansuransebelum.blade.php
+++ b/resources/views/print/resitansuransebelum.blade.php
@@ -409,7 +409,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
@@ -503,7 +503,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index 7cf82f9..5dce90e 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -409,7 +409,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | : Tempoh Simpan | {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | : Tempoh Simpan | {{ $gadai['tempoh'] }} |
@@ -506,7 +506,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | : Tempoh Simpan | {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | : Tempoh Simpan | {{ $gadai['tempoh'] }} |
| Nama Wakil | : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp | | | | | |
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index c7d96e2..76cdca2 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
@@ -510,7 +510,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
| |
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index ea36b4a..7903f10 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -414,7 +414,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
@@ -506,7 +506,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
| |
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index 107a71e..9652349 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
@@ -513,7 +513,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['tempoh'] }} |
| |
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index 91adab4..a933d35 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -410,7 +410,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['jbg'] }} |
@@ -505,7 +505,7 @@ hr.new5 {
-| No K/P | : {{ $customers_info['kpbaru'] }} | | | | Tempoh Simpan | : {{ $gadai['jbg`'] }} |
+No K/P | : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp | | | | Tempoh Simpan | : {{ $gadai['jbg`'] }} |
| |