From c78e125a6f62b79ac953d318faa7b2f3fd535da5 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 6 Jun 2021 13:57:30 +0800 Subject: [PATCH] fix laporan di ofis --- app/Http/Controllers/KhazanahController.php | 6 ++++-- .../views/print/laporan_ringkasanterkumpulv2.blade.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index eead57b..2dc0ae9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3326,16 +3326,18 @@ class KhazanahController extends Controller $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[ + $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/terkumpul',[ 'kodcaw' => $auth_user['cawangan'], 'mula' => $mula_date, 'akhir' => $hingga_date ])->json(); + dd($laporan_ringkasan); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','hingga_date','api_url')); + return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } public function laporanKawalanStok(){ diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php index 4dda355..a8e86ba 100644 --- a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php +++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php @@ -50,8 +50,8 @@

-

Tarikh Mula: {{ $hingga_date }} Tarikh Hingga : {{ $tarikh_cetak }} Tarikh Cetak : {{ $tarikh_cetak }}

- +

Tarikh Mula: {{ $mula_date }} Tarikh Hingga : {{ $hingga_date }} Tarikh Cetak : {{ $tarikh_cetak }}

+{{ dd($laporan_ringkasan) }}