diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 2c2848f..b57c5b6 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -1524,14 +1524,14 @@ class AkaunController extends Controller if($request->jenis == 'pdf') { $stokaudit_aktif = Http::get($api_url. '/api/stokaudit/aktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json(); - $stokaudit_takaktif = Http::get($api_url. '/api/stokaudit/takaktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json(); + $stokaudit_takaktif = Http::get($api_url. '/api/stokaudit/takaktifcombine/'. $request->kodcaw,['tarikh' => $tebus_date])->json(); $pdf = PDF::loadView('akaun.laporan_stokaudit_combine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait'); return $pdf->download('laporan_stokaudit_' . $request->kodcaw .'_'. $tebus_date . '.pdf'); } else{ $stokaudit_aktif = Http::get($api_url. '/api/stokaudit/aktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json(); - $stokaudit_takaktif = Http::get($api_url. '/api/stokaudit/takaktif/'. $request->kodcaw,['tarikh' => $tebus_date])->json(); + $stokaudit_takaktif = Http::get($api_url. '/api/stokaudit/takaktifcombine/'. $request->kodcaw,['tarikh' => $tebus_date])->json(); return view('akaun.laporan_stokaudit_combine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','tebus_date','api_url')); } diff --git a/resources/views/akaun/laporan_stokaudit_combine.blade.php b/resources/views/akaun/laporan_stokaudit_combine.blade.php index 129dae3..2e0529c 100644 --- a/resources/views/akaun/laporan_stokaudit_combine.blade.php +++ b/resources/views/akaun/laporan_stokaudit_combine.blade.php @@ -239,12 +239,15 @@
| JUMLAH BILANGAN = {{ $total_bilangan }} | +JUMLAH NILAI MARHUN (RM) = {{ + number_format($total_nm,2)}} | + + +
|---|