diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index e98dfed..cf00e6c 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2424,7 +2424,7 @@ class KhazanahController extends Controller $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - // dd($gadai); + return view('print.laporan_kawalanstok', compact('kawalanstok','cawangan_detail','tarikh_cetak','tebus_date','api_url')); } @@ -3125,9 +3125,23 @@ class KhazanahController extends Controller return view('print.laporan_perbelanjaan', compact('perbelanjaan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } + public function cetaklaporan_Perbelanjaan_Baucer($baucer) + { + $api_url = config('api.url'); + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + $perbelanjaan = Http::get(config('api.url'). '/api/SenaraiPanjar/listeach/' . $auth_user['cawangan'],['nobaucer' => $baucer])->json(); + + $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + return view('print.laporan_perbelanjaan_baucer', compact('perbelanjaan','cawangan_detail','tarikh_cetak','api_url')); + } + - - public function RequestPembatalan(Request $request) { $kodcaw = $request->kodcaw; diff --git a/resources/views/khazanah/laporan/perbelanjaan.blade.php b/resources/views/khazanah/laporan/perbelanjaan.blade.php index f0f4904..0bd14ff 100644 --- a/resources/views/khazanah/laporan/perbelanjaan.blade.php +++ b/resources/views/khazanah/laporan/perbelanjaan.blade.php @@ -183,13 +183,17 @@ panjartebus.clear().draw(); $.each(data,function(index,panjar){ total_bayaran += parseFloat(panjar['bayaran']); + + var urlroute = '{{ route("perbelanjaan.cetaklaporanbaucer", ":id") }}'; + urlroute = urlroute.replace(':id', panjar['nobaucer']); + panjartebus.row.add([ counter, panjar['tarikh'], panjar['tuntutoleh'], panjar['deskripsi'], '' + panjar['kategori'] + '', - panjar['nobaucer'], + '' + panjar['nobaucer'] + '', formatter.format(panjar['bayaran']) ]).draw(); counter = counter + 1; diff --git a/resources/views/khazanah/laporan/stokaudit.blade.php b/resources/views/khazanah/laporan/stokaudit.blade.php index 752efa6..05c190a 100644 --- a/resources/views/khazanah/laporan/stokaudit.blade.php +++ b/resources/views/khazanah/laporan/stokaudit.blade.php @@ -100,11 +100,11 @@
@@ -122,6 +122,12 @@ var tablecustomers = $('#myTable').DataTable({ "ordering": false }); + + $(document).ready( function () { + $('#datetimepicker1').datepicker({ + format: 'dd-mm-yyyy' + }); + }); @endsection diff --git a/resources/views/print/laporan_kawalanstok.blade.php b/resources/views/print/laporan_kawalanstok.blade.php index 72be36c..0d474a5 100644 --- a/resources/views/print/laporan_kawalanstok.blade.php +++ b/resources/views/print/laporan_kawalanstok.blade.php @@ -225,7 +225,6 @@ @php $counter = 1;@endphp - {{-- {{ dd($kawalanstok) }} --}} Gadai @@ -505,27 +504,28 @@ - @php $percentbil1 = (($gad1 - $teb1 - $lel1 - $hpk1)/$totalbil)*100; echo number_format($percentbil1,2) . ' %';@endphp + + @php $percentbil1 = (($totalbil1)/$totalbil)*100; echo number_format($percentbil1,2) . ' %';@endphp - @php $percentpinj1 = (($gadpinj1 - $tebpinj1 - $lelpinj1 - $hpkpinj1)/$totalpinj)*100; echo number_format($percentpinj1,2) . ' %';@endphp + @php $percentpinj1 = (($totalpinj1)/$totalpinj)*100; echo number_format($percentpinj1,2) . ' %';@endphp - @php $percentbil2 = (($gad2 - $teb2 - $lel2 - $hpk2)/$totalbil)*100; echo number_format($percentbil2,2) . ' %';@endphp + @php $percentbil2 = (($totalbil2)/$totalbil)*100; echo number_format($percentbil2,2) . ' %';@endphp - @php $percentpinj2 = (($gadpinj2 - $tebpinj2 - $lelpinj2 - $hpkpinj2)/$totalpinj)*100; echo number_format($percentpinj2,2) . ' %';@endphp + @php $percentpinj2 = (($totalpinj2)/$totalpinj)*100; echo number_format($percentpinj2,2) . ' %';@endphp - @php $percentbil3 = (($gad3 - $teb3 - $lel3 - $hpk3)/$totalbil)*100; echo number_format($percentbil3,2) . ' %';@endphp + @php $percentbil3 = (($totalbil3)/$totalbil)*100; echo number_format($percentbil3,2) . ' %';@endphp - @php $percentpinj3 = (($gadpinj3 - $tebpinj3 - $lelpinj3 - $hpkpinj3)/$totalpinj)*100;; echo number_format($percentpinj3,2) . ' %';@endphp + @php $percentpinj3 = (($totalpinj3)/$totalpinj)*100;; echo number_format($percentpinj3,2) . ' %';@endphp diff --git a/resources/views/print/laporan_perbelanjaan_baucer.blade.php b/resources/views/print/laporan_perbelanjaan_baucer.blade.php new file mode 100644 index 0000000..f82eb96 --- /dev/null +++ b/resources/views/print/laporan_perbelanjaan_baucer.blade.php @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + {{-- --}} + {{-- --}} + + + + + + {{-- + + + + + + + --}} + +
+ + + + + + + + + + + + + + + + + + + + + + + +
BAUCER WANG PANJAR
Tarikh Cetak: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp +
Bayar Kepada: + {{ $perbelanjaan['tuntutoleh'] }} + No Baucer#: + {{ $perbelanjaan['nobaucer'] }} +
+ +
+ + + + + + + + + + + + + + + + + +
Tarikh BilPerkara/ItemKategoriJumlah (RM)
{{ $perbelanjaan['tarikh'] }}{{ $perbelanjaan['deskripsi'] }}{{ $perbelanjaan['kategori'] }}{{ number_format($perbelanjaan['bayaran'],2) }}
JUMLAH BAYARAN : RM {{ number_format($perbelanjaan['bayaran'],2) }}
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
.................................................................. .................................................................. ..................................................................
Disediakan Disemak Disahkan
+ + + + + + diff --git a/routes/web.php b/routes/web.php index a2b9420..78253a8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -188,6 +188,7 @@ Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'Kha Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah'); Route::get('/laporan/perbelanjaan', [ 'as'=>'laporan.perbelanjaan', 'uses'=>'KhazanahController@laporan_Perbelanjaan'])->middleware('auth','khazanah'); Route::post('/laporan/perbelanjaan/cetak', ['as'=>'perbelanjaan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan'])->middleware('auth','khazanah'); +Route::get('/laporan/perbelanjaan/cetak/{baucer}', ['as'=>'perbelanjaan.cetaklaporanbaucer', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan_Baucer'])->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');