From 10ac9e93732bf1c39674c8517753ab6f860140cf Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 17 Jan 2021 09:25:08 +0800 Subject: [PATCH] fix wakil --- app/Http/Controllers/GadaianController.php | 2 +- app/Http/Controllers/PenebusanController.php | 3 +-- resources/views/penebusan/index.blade.php | 7 ++++--- resources/views/print/resittebus.blade.php | 8 ++++---- resources/views/print/resittebussebelum.blade.php | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 406ec3b..0f9c106 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -373,7 +373,7 @@ class GadaianController extends Controller // dd($wakil); if(sizeof($wakil) != 0) $wakil = $wakil[0]; - + return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction')); } diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index e373313..068dcc8 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -287,7 +287,6 @@ class PenebusanController extends Controller $auth_user = Auth::user(); - //////////////////////// /// UPDATE TEBUS API//// /////////////////////// @@ -416,7 +415,7 @@ class PenebusanController extends Controller $getfirstwakil = Http::get(config('api.url') . '/api/getwakil/'. $auth_user['cawangan'])->json(); if(sizeof($getfirstwakil) != 0) - return $getfirstwakil[0]['NOWAKIL']; + return $getfirstwakil[0]['nowakil']; else return $getfirstwakil; } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index c9324d4..fa353c2 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -752,7 +752,8 @@ function bayaransemua() var marhun = "{{ $gadai['marhun'] }}"; var nowakil = nw; - + alert(nw); + return; $.ajax({ method:'put', @@ -1296,8 +1297,8 @@ function wakilfunction(e) title: 'Maklumat anda Berjaya Direkodkan!' }); - console.log(data.NOWAKIL); - nw = data.NOWAKIL; + console.log(data.nowakil); + nw = data.nowakil; $('#wakiltxt').prop( "disabled", true ); $(e).html("Ubah"); diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php index 78a4056..4ccc5cb 100644 --- a/resources/views/print/resittebus.blade.php +++ b/resources/views/print/resittebus.blade.php @@ -408,11 +408,11 @@ hr.new5 { -Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp +Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp -No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp +No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
@@ -509,12 +509,12 @@ hr.new5 { -Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp +Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp -No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp +No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php index 9716e0c..1ab3407 100644 --- a/resources/views/print/resittebussebelum.blade.php +++ b/resources/views/print/resittebussebelum.blade.php @@ -408,11 +408,11 @@ hr.new5 { -Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp +Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp -No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp +No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
@@ -503,12 +503,12 @@ hr.new5 { -Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp +Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp -No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp +No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp