Merge branch 'branch_fix_2' into 'new-super'

adding backup imbang duga

See merge request online-sistem1/kaunter!214

app/Http/Controllers/KhazanahController.php

@@ -4127,15 +4127,17 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
         $tarikh_cetak = $current->toDateString();
 
         $tarikh_imbangan= $current->toDateString();
         $tarikh_imbangan2= $current->toDateString();
 
-
         $tarikh_cetak = $current->toDateString();
 
-
         if($request->datetimepicker2 == null){
             $tarikh_cetak = $current->toDateString();
         }else{
@@ -4143,7 +4145,18 @@ class KhazanahController extends Controller
             $tarikh_imbangan2 = $request->datetimepicker2;     
         }
 
-        $response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2);
+
+
+        if($tarikh_imbangan2 < $current->toDateString()){
+            $response = (new ImbanganDuga())->GetImbangDugaBackup($auth_user['cawangan'],$request->datetimepicker2);
+        }else{
+            $response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2);
+        }
+
+        if($response->getContent() == 'notfound')
+        {
+            return redirect()->route('laporan.imbangdugaakru')->with('error','Tiada Rekod Dijumpai Dalam Imbang Duga Backup!');
+        }
 
         $array_ig = json_decode($response->getContent());
         $hartasemasa = $array_ig->array_harta;
@@ -4151,10 +4164,6 @@ class KhazanahController extends Controller
         $totalhartasemasa = $array_ig->sum_harta;
         $totaltanggungansemasa = $array_ig->sum_tanggungan;
 
-        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-
         return view('print.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
     }
 

app/Services/ImbangdugaServices.php

@@ -259,4 +259,36 @@ class ImbangdugaServices
         $array_ig = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $summation_harta,'sum_tanggungan' => $summation_tanggungan];
         return response($array_ig);
     }
+
+    public function GetImbangDugaBackup($kodcaw,$tarikh){
+
+        $date = date_create_from_format('j-m-Y', $tarikh);
+        $new_date = date_format($date, 'Y-m-d');
+
+        $response = Http::get(config('api.url'). '/api/Backup/ImbangDuga/' . $kodcaw,['tarikh' => $new_date])->json();
+
+        if($response == 'notfound' || $response == null)
+        {
+            return response('notfound');
+        }else{
+            $array_harta = [];
+            $array_tanggungan = [];
+            foreach($response as $variable=>$res)
+            {
+                if($variable !== 'recno' && $variable !== 'kodcaw' && $variable !== 'tarikh' && $variable !== 'totalharta' && $variable !== 'totaltanggungan' && $variable !== 'tagtally' && $variable !== 'created_at' && $variable !== 'updated_at'){
+                    $imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray();
+                    if($imbangdugadata['jenis'] == 'harta'){
+                        array_push($array_harta,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]);
+                    }else{
+                        array_push($array_tanggungan,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]);
+                    }
+                }
+            }
+
+            $array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']];
+            return response($array_all);
+        }
+        
+    }
+
 }

resources/views/khazanah/laporan/imbangduga_akru.blade.php

@@ -16,6 +16,11 @@
                   </nav>
 
                 <div class="card-body text-center">
+                  @if(session()->has('error'))
+                  <div class="alert alert-danger">
+                      {{ session()->get('error') }}
+                  </div>
+                  @endif
                   <div class="row form-group">
                     <div class="col-md-2"></div>
                     <div class="col-md-15"></div>
@@ -30,7 +35,7 @@
                     <br>
                     <div class="row">
                       <div class="col-sm-3"></div>
-                      <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan "   formaction="{{route('imbangdugaakru.cetak')}}"></div>
+                      <div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan " formaction="{{route('imbangdugaakru.cetak')}}"></div>
                     </div>
                   </form>
                   </div>
@@ -51,7 +56,9 @@
         $('#datetimepicker2').datepicker({
             format: 'dd-mm-yyyy',
         });
-        $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,18));
+        $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,19));
+        $('#datetimepicker2').datepicker('setEndDate', new Date());
+
     });
 
     function loadingmodal()