diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d7cd0f7..c0babe9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3352,6 +3352,42 @@ class KhazanahController extends Controller return view('print.laporan_audittrail', compact('audittrail','cawangan_detail','tarikh_cetak','date','api_url')); } + + public function laporanWakil() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $lookwakil = Http::get(config('api.url') . '/api/lookupwakil/')->json(); + + return view('khazanah.laporan.wakil', compact('cawangan_info','api_url','lookwakil')); + } + + public function cetakLaporanWakil(Request $request) + { + + $api_url = config('api.url'); + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + // if($request->dateaudit == null){ + // $date = $current->toDateString(); + // }else{ + // $split_date = explode('-', $request->dateaudit); + // $date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + // } + + + $wakil = Http::get(config('api.url'). '/api/getwakil/' . Auth::user()->cawangan . '/status/hubungan/',['hubungan' => $request->slthubungan])->json(); + + $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + return view('print.laporan_wakil', compact('wakil','cawangan_detail','tarikh_cetak','api_url')); + } diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index a0eef2e..81b7b69 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -25,7 +25,7 @@ - @@ -194,7 +194,7 @@ Pendahuluan - Serahan
- Denominasi + Denominasi
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index d51bf03..2df87af 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -281,7 +281,10 @@ var channel = pusher.subscribe('gadai-notify'); channel.bind('trigger-gadai', function(data) { - fetchGadaianEverytime(); + if(cawangan == data.cawangan) + { + fetchGadaianEverytime(); + } }); diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php index 37bd4e5..d2bea38 100644 --- a/resources/views/khazanah/gadaian.blade.php +++ b/resources/views/khazanah/gadaian.blade.php @@ -219,8 +219,10 @@ var channel = pusher.subscribe('serahanpenilai-notify'); channel.bind('trigger-serahanpenilai', function(data) { - fetchGadaianEverytime(); - + if(cawangan == data.kodcaw) + { + fetchGadaianEverytime(); + } }); $(document).ready(function(){ diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 9430ce4..6591ea5 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -38,14 +38,10 @@ Tuntut Baki
- {{-- Stok Audit Details --}} Harga Emas
- Senarai Wakil -
-
- Hapus S/P HQ + Senarai Wakil
@@ -70,9 +66,9 @@
Denominasi
-
- Hapus Ansuran -
+ {{--
+ Hapus S/P HQ +
--}}
Rebet
@@ -103,10 +99,7 @@ Perbelanjaan
- Transaksi Komoditi -
-
- SAG Hilang + SAG Hilang
diff --git a/resources/views/khazanah/laporan/saghilang.blade.php b/resources/views/khazanah/laporan/saghilang.blade.php new file mode 100644 index 0000000..bf99f84 --- /dev/null +++ b/resources/views/khazanah/laporan/saghilang.blade.php @@ -0,0 +1,59 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ @csrf +
+
+ Tarikh +
+ + +
+
+
+
+ +
+
+
+
+
+ +@endsection + diff --git a/resources/views/khazanah/laporan/wakil.blade.php b/resources/views/khazanah/laporan/wakil.blade.php new file mode 100644 index 0000000..d4a00dc --- /dev/null +++ b/resources/views/khazanah/laporan/wakil.blade.php @@ -0,0 +1,64 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ @csrf +
+
+ Hubungan +
+ + {{-- --}} + +
+
+
+
+ +
+
+
+
+
+ +@endsection + diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php index 20428fc..8dba38a 100644 --- a/resources/views/khazanah/tebus.blade.php +++ b/resources/views/khazanah/tebus.blade.php @@ -190,7 +190,10 @@ var channel = pusher.subscribe('tebus-notify'); channel.bind('trigger-tebus', function(data) { - fetchTebusEverytime(); + if(cawangan == data.cawangan) + { + fetchTebusEverytime(); + } }); diff --git a/resources/views/modal/wakil.blade.php b/resources/views/modal/wakil.blade.php index f40b640..57b0632 100644 --- a/resources/views/modal/wakil.blade.php +++ b/resources/views/modal/wakil.blade.php @@ -94,7 +94,7 @@ - + diff --git a/resources/views/print/laporan_saghilang.blade.php b/resources/views/print/laporan_saghilang.blade.php new file mode 100644 index 0000000..468d339 --- /dev/null +++ b/resources/views/print/laporan_saghilang.blade.php @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{-- --}} + {{-- --}} + + + + + + {{-- + + + + + + + --}} + +
+ + + + + + + + + + + + + + + + + + {{-- + + --}} + {{-- + --}} + {{-- + + + + + + --}} +
LAPORAN WAKIL
TARIKH CETAK: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp +
TARIKH:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp HINGGA:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp
+ +
+ + + + + + + + + + + @foreach($wakil as $index=>$lw) + + + + + + + + + + @endforeach +
Bilnamanokpnowakilhubunganalamat1telefon
{{ $loop->iteration}}{{ $lw['nama'] }}{{ $lw['nokp'] }}{{ $lw['nowakil'] }}{{ $lw['hubungan'] }}{{ $lw['alamat1'] }}{{ $lw['telefon'] }}
+

+{{-- + + + + +
JUMLAH {{ $jenis }}{{ 'RM ' . number_format($totalamaun,2) }}
--}} + +
+


+ + + + + + + + + + + + + + + + + + + +
.................................................................. .................................................................. ..................................................................
Disediakan Disemak Disahkan
+ + + + + + diff --git a/resources/views/print/laporan_wakil.blade.php b/resources/views/print/laporan_wakil.blade.php new file mode 100644 index 0000000..468d339 --- /dev/null +++ b/resources/views/print/laporan_wakil.blade.php @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{-- --}} + {{-- --}} + + + + + + {{-- + + + + + + + --}} + +
+ + + + + + + + + + + + + + + + + + {{-- + + --}} + {{-- + --}} + {{-- + + + + + + --}} +
LAPORAN WAKIL
TARIKH CETAK: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp +
TARIKH:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp HINGGA:@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp
+ +
+ + + + + + + + + + + @foreach($wakil as $index=>$lw) + + + + + + + + + + @endforeach +
Bilnamanokpnowakilhubunganalamat1telefon
{{ $loop->iteration}}{{ $lw['nama'] }}{{ $lw['nokp'] }}{{ $lw['nowakil'] }}{{ $lw['hubungan'] }}{{ $lw['alamat1'] }}{{ $lw['telefon'] }}
+

+{{-- + + + + +
JUMLAH {{ $jenis }}{{ 'RM ' . number_format($totalamaun,2) }}
--}} + +
+


+ + + + + + + + + + + + + + + + + + + +
.................................................................. .................................................................. ..................................................................
Disediakan Disemak Disahkan
+ + + + + + diff --git a/routes/web.php b/routes/web.php index 050bbf3..635bbe2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -226,6 +226,12 @@ Route::get('laporan/hargaemas/',['as'=>'laporan.hargaemas','uses'=>'KhazanahCont Route::post('laporan/hargaemas/cetak',['as'=>'hargaemas.laporancetak','uses'=>'KhazanahController@cetakLaporanhargaemas'])->middleware('auth','khazanah'); Route::get('laporan/audittrail/',['as'=>'laporan.audittrail','uses'=>'KhazanahController@laporanAuditTrail'])->middleware('auth','khazanah'); Route::post('laporan/audittrail/cetak',['as'=>'audittrail.laporancetak','uses'=>'KhazanahController@cetakLaporanAuditTrail'])->middleware('auth','khazanah'); +Route::get('laporan/wakil/',['as'=>'laporan.wakil','uses'=>'KhazanahController@laporanWakil'])->middleware('auth','khazanah'); +Route::post('laporan/wakil/cetak',['as'=>'wakil.laporancetak','uses'=>'KhazanahController@cetakLaporanWakil'])->middleware('auth','khazanah'); +// Route::get('laporan/hapushq/',['as'=>'laporan.hapushq','uses'=>'KhazanahController@laporanHapusHQ'])->middleware('auth','khazanah'); +// Route::post('laporan/hapushq/cetak',['as'=>'hapushq.laporancetak','uses'=>'KhazanahController@cetakLaporanHapusHQ'])->middleware('auth','khazanah'); +Route::get('laporan/saghilang/',['as'=>'laporan.saghilang','uses'=>'KhazanahController@laporanSAGHilang'])->middleware('auth','khazanah'); +Route::post('laporan/saghilang/cetak',['as'=>'saghilang.laporancetak','uses'=>'KhazanahController@cetakLaporanSAGHilang'])->middleware('auth','khazanah'); // Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah'); // Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');