diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php
index f7002b9..9c259f4 100644
--- a/app/Http/Controllers/AkaunController.php
+++ b/app/Http/Controllers/AkaunController.php
@@ -15,6 +15,7 @@ use App\Models\Lejeram;
use App\Models\Cawangan;
use App\Services\ImbangdugaServices as ImbanganDuga;
+use App\Services\RingkasanHarianServices;
class AkaunController extends Controller
{
@@ -779,7 +780,7 @@ class AkaunController extends Controller
$tarikh_cetak = $current->toDateString();
if($request->datemula == null){
- $mula_date = '2017-01-01';
+ $mula_date = '2023-01-01';
}else{
$mula_date = $request->datemula;
}
@@ -790,13 +791,15 @@ class AkaunController extends Controller
$hingga_date = $request->datehingga;
}
- $laporan_ringkasan = Http::get($api_url . '/api/laporan/terkumpul',[
- 'kodcaw' => $request->kodcaw,
- 'mula' => $mula_date,
- 'akhir' => $hingga_date
- ])->json();
+ $ringkasan = new RingkasanHarianServices();
+ $laporan_ringkasan = $ringkasan->getRingkasanHarian($mula_date,$hingga_date,$request->kodcaw,'cawangan');
+ // $laporan_ringkasan = Http::get($api_url . '/api/laporan/terkumpul',[
+ // 'kodcaw' => $request->kodcaw,
+ // 'mula' => $mula_date,
+ // 'akhir' => $hingga_date
+ // ])->json();
- $laporan_ringkasan = $laporan_ringkasan[0];
+ // $laporan_ringkasan = $laporan_ringkasan[0];
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$request->kodcaw)->json();
$cawangan_detail=$cawangan[0];
diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php
new file mode 100644
index 0000000..3f9d757
--- /dev/null
+++ b/app/Services/RingkasanHarianServices.php
@@ -0,0 +1,48 @@
+ $mula,
+ 'hingga' => $hingga,
+ 'kodcaw' => 'all',
+ ])->json();
+ }else{
+ $response = Http::get(config('api.url'). '/admin/get/ringkasanharian/' ,[
+ 'mula' => $mula,
+ 'hingga' => $hingga,
+ 'kodcaw' => $kodcaw,
+ ])->json();
+ }
+
+ return $response;
+ }
+
+ public function saveRingkasanHarian($mula,$hingga,$zone,$jenisgenerate) : Object{
+ if($jenisgenerate == 'daily'){
+ $response = Http::get(config('api.url'). '/admin/store/ringkasanharian/' ,[
+ 'mula' => $mula,
+ 'hingga' => $hingga,
+ 'zone' => $zone,
+ ])->json();
+
+ }else{
+ $response = Http::get(config('api.url'). '/admin/store/ringkasanharian/' ,[
+ 'mula' => $mula,
+ 'hingga' => $hingga,
+ 'zone' => $zone,
+ ])->json();
+ }
+ return response($response);
+ }
+}
diff --git a/resources/js/Akaun/RingkasanTerkumpul.vue b/resources/js/Akaun/RingkasanTerkumpul.vue
index 9945668..c72ec2b 100644
--- a/resources/js/Akaun/RingkasanTerkumpul.vue
+++ b/resources/js/Akaun/RingkasanTerkumpul.vue
@@ -18,9 +18,9 @@
Mula
-
+
Hingga
-
+
@@ -40,10 +40,18 @@ export default {
data(){
return{
jenisgenerate:'none',
- kodcaw:''
+ kodcaw:'',
+ maxDate: null
}
},
+ mounted() {
+ this.setMaxDate();
+ },
methods: {
+ setMaxDate() {
+ const today = new Date().toISOString().split('T')[0];
+ this.maxDate = today;
+ },
async generatepdf(){
await this.setJenis('pdf');