diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index b11525c..25b2ac8 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -581,5 +581,30 @@ class AliranTunaiController extends Controller
return response($updateTunai);
}
+ public function LaporanAliranTunai($teller)
+ {
+ $auth_user = Auth::user();
+ $api_url = config('api.url');
+
+ $current = Carbon::now();
+ $current = new Carbon();
+
+ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+ $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+ $cawangan_detail=$cawangan[0];
+
+ $tarikh_cetak = $current->toDateString();
+
+ $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+
+ $alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
+
+ $addtunai = Http::get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json();
+
+ $teller = $auth_user['name'];
+
+ return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller'));
+ }
+
}
diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 7feb8bb..4365020 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -349,13 +349,13 @@ class GadaianController extends Controller
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
- $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
-
- // dd($wakil);
- if(sizeof($wakil) != 0)
- $wakil = $wakil[0];
-
-
+ if($penebusan['nowakil'])
+ {
+ $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
+ if(sizeof($wakil) != 0)
+ $wakil = $wakil[0];
+ }
+
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
}
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 1db168c..5cb1246 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -125,6 +125,7 @@
+
-
+
@@ -1552,8 +1552,13 @@
let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
- var id = $('.tab-content .active').attr('id');
- if(id == "nav-tawarruq-tab") {
+ // var id = $('.tab-content .active').attr('id');
+
+ var activeTab = $("#navtawarruqdannottawarruq.tab-content").find(".active");
+ var id = activeTab.attr('id');
+
+ console.log(id);
+ if(id == "nav-tawarruq") {
if(+harini !== +tarikhgadai2){
Swal.fire({
icon: 'error',
@@ -1694,10 +1699,12 @@
alert(xhr.responseText);
}
});
+
+ return false;
}
- return false;
+ // return false;
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
diff --git a/routes/web.php b/routes/web.php
index 7058e90..5cf6b09 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -69,6 +69,7 @@ Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanContr
Route::get('/lelongan/{norujukan}',['as'=>'lelongan','uses' => 'LelongController@index'])->middleware('auth','teller');
Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller');
Route::get('/aliran_tunai/laporanserahan',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller');
+Route::get('/aliran_tunai/laporanalirantunai/{teller}',['as'=>'laporan.alirantunai','uses' => 'AliranTunaiController@LaporanAliranTunai'])->middleware('auth','teller');
Route::put('/aliran_tunai/Gadaian',['as'=>'alirantunai.gadai','uses' => 'AliranTunaiController@alirantunaiGadai'])->middleware('auth','teller');
Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranTunaiController@alirantunaiTebus'])->middleware('auth','teller');
Route::put('/aliran_tunai/advansur',['as'=>'alirantunai.advansur','uses' => 'AliranTunaiController@alirantunaiUpahBknTawarruq'])->middleware('auth','teller');