diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 134e473..d0b2710 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2836,17 +2836,24 @@ class KhazanahController extends Controller
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
+ if($request->dateringkasanharian == null){
+ $ringkasan_date = $current->toDateString();
+ }else{
+ $split_date = explode('-',$request->dateringkasanharian);
+ $ringkasan_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+ }
+
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[
'kodcaw'=>$auth_user['cawangan'],
- 'tarikh'=>$tarikh_cetak
+ 'tarikh'=>$ringkasan_date
])->json();
$laporan = $laporan_ringkasan[0];
- return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','api_url','laporan'));
+ return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan'));
}
public function cetakLaporanRingkasanTerkumpul(Request $request){
diff --git a/resources/views/khazanah/laporan/imbangduga.blade.php b/resources/views/khazanah/laporan/imbangduga.blade.php
index a4d0031..e105bc6 100644
--- a/resources/views/khazanah/laporan/imbangduga.blade.php
+++ b/resources/views/khazanah/laporan/imbangduga.blade.php
@@ -7,7 +7,13 @@
Peti Besi
diff --git a/resources/views/khazanah/laporan/ringkasanharian.blade.php b/resources/views/khazanah/laporan/ringkasanharian.blade.php
new file mode 100644
index 0000000..8931414
--- /dev/null
+++ b/resources/views/khazanah/laporan/ringkasanharian.blade.php
@@ -0,0 +1,53 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+@endsection
+
diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php
index fb57412..41c8aa0 100644
--- a/resources/views/print/laporan_ringkasanharian.blade.php
+++ b/resources/views/print/laporan_ringkasanharian.blade.php
@@ -50,6 +50,8 @@
+
Tarikh : {{ $ringkasan_date }} Tarikh Cetak : {{ $tarikh_cetak }}
+
1. SISTEM
-
+
{{ 'RM '. number_format($laporan['petibesi_sistem'],2) }}
2. IMBANG DUGA
-
+
{{ 'RM '. number_format($laporan['petibesiimbangduga'],2) }}
3. DENOMINASI
-
+
{{ 'RM '. number_format($laporan['petibesi_deno'],2) }}
@@ -146,7 +148,7 @@
| 2 |
STOK AUDIT |
- |
+ {{ 'RM '. number_format($laporan['stokaudit'],2) }} |
|
|
diff --git a/routes/web.php b/routes/web.php
index 93da917..f902cba 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -183,6 +183,7 @@ Route::get('/laporan/petibesi',['as'=>'laporan.petibesi','uses'=>'KhazanahContro
Route::post('laporan/petibesi/cetak',['as'=>'petibesi.laporancetak','uses'=>'KhazanahController@cetakLaporanPetiBesi'])->middleware('auth','khazanah');
Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>'KhazanahController@laporanMarhunTerkumpul'])->middleware('auth','khazanah');
Route::post('laporan/marhunterkumpul/cetak',['as'=>'marhunterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanMarhunTerkumpul'])->middleware('auth','khazanah');
+Route::get('laporan/ringkasanharian/',['as'=>'laporan.ringkasanharian','uses'=>'KhazanahController@laporanRingkasanHarian'])->middleware('auth','khazanah');
Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanHarian'])->middleware('auth','khazanah');
Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah');
Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');