From 0f4e99dcec26770d5a28b431ad277a6699bf59d9 Mon Sep 17 00:00:00 2001
From: Afiq <afiq@arrahns.local>
Date: Mon, 18 Jan 2021 09:07:47 +0800
Subject: [PATCH] add weekly

---
 app/Http/Controllers/GadaiController.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 50f6bac..bb44e75 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1244,10 +1244,14 @@ class GadaiController extends Controller
         $penggadai_all = [];
         $current = Carbon::now();
         $current = new Carbon();
+        $weekly = Carbon::now();
+        $weekly = new Carbon();
         $monthly = Carbon::now();
         $monthly = new Carbon();
         $yearly = Carbon::now();
         $yearly = new Carbon();
+        $weekly_array = Carbon::now();
+        $weekly_array = new Carbon();
         $monthly_array = Carbon::now();
         $monthly_array = new Carbon();
         $yearly_array = Carbon::now();
@@ -1258,6 +1262,16 @@ class GadaiController extends Controller
         if($request->method == 'daily'){
             array_push($array_totalup,['tarikh'=>$current->toDateString(),'totalgadai'=>0,'totaltebus'=>0,'totalupah'=>0]);
         }
+        if($request->method == 'weekly'){
+            for($i=0;$i<7;$i++){
+                if($i == 0){
+                    $weekly_array_date = $weekly->subDays(0);
+                }else{
+                    $weekly_array_date = $weekly->subDays(1);
+                }
+                array_push($array_totalup,['tarikh'=>$weekly_array_date->toDateString(),'totalgadai'=>0,'totaltebus'=>0,'totalupah'=>0]);
+            }
+        }
         if($request->method == 'monthly'){
             for($i=0;$i<12;$i++){
                 if($i == 0){
@@ -1275,16 +1289,19 @@ class GadaiController extends Controller
                 }else{
                     $yearly_array_date = $yearly_array->startOfYear()->subYears(1);
                 }
-                array_push($array_totalup,['tarikh'=>$yearly_array_date->year,'totalgadai'=>0,'totaltebus'=>0,'totalupah'=>0]);
+                array_push($array_totalup,['tarikh'=>sprintf("%04d",$yearly_array_date->year),'totalgadai'=>0,'totaltebus'=>0,'totalupah'=>0]);
             }
         }
-
+        $weekly_date = $weekly->subDays(6)->toDateString();
         $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
         $yearly_date = $yearly->startOfYear()->subYears(4)->toDateString();
         foreach($cawangan_all as $index => $cawangan){
             if($request->method == 'daily'){
                 $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect('t_gadai')->groupBy('t_gadai')->where('t_gadai','=',$current->toDateString())->orderBy('t_gadai','desc')->get();
                 $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect('t_tebus')->groupBy('t_tebus')->where('t_tebus','=',$current->toDateString())->orderBy('t_tebus','desc')->get();
+            }elseif($request->method == 'weekly'){
+                $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect('t_gadai')->groupBy('t_gadai')->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$weekly_date]])->orderBy('t_gadai','desc')->get();
+                $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect('t_tebus')->groupBy('t_tebus')->where([['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$weekly_date]])->orderBy('t_tebus','desc')->get();
             }elseif($request->method == 'monthly'){
                 $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])->orderBy('t_gadai','desc')->get();
                 $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_tebus,'%Y%m')"))->where([['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])->orderBy('t_tebus','desc')->get();