fix gadai

app/Http/Controllers/LelongController.php

@@ -7,8 +7,12 @@ use App\Cawangan;
 use App\Gadai;
 use App\TuntutBaki;
 use App\WTD;
+use App\GlCode;
+use App\imbangdugalama;
+use App\AnsRugi;
 use Illuminate\Http\Request;
 
+
     use Carbon\Carbon;
 
 class LelongController extends Controller
@@ -134,22 +138,44 @@ class LelongController extends Controller
     public function BakiLelongCalculation($kodcaw,Request $request)
     {
 
+        $tarikhbaru = $request->tarikh;
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $bakilelong = Gadai::on($cawangan['mysql'])
-        ->where([['gadai.sttebus','=', 'L'],['lelong.t_jual','<=',$request->tarikh],['lelong.baki','>=', 0]])
-        ->whereNull('lelong.trkhtuntut')
-        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-                ->sum('baki');
 
+        $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('baki_lelong');
+
+        $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('rugi_lelong');
+
+        $bakilelong = Lelong::on($cawangan['mysql'])
+        ->where('t_jual','<=',$request->tarikh)
+        ->where(function($query){
+            $query->whereNull('trkhtuntut')
+                  ->orWhere('trkhtuntut','>','2021-01-02');
+        })
+        ->where('baki','>=',0)
+        ->sum('baki');
+
+        // dd($bakilelong->toSql(), $bakilelong->getBindings());
+        // dd($bakilelong);
+
+        $ansrugi = AnsRugi::on($cawangan['mysql'])
+            ->sum('bayaran');
                 
-        $rugilelong = Gadai::on($cawangan['mysql'])
-        ->where([['gadai.sttebus','=', 'L'],['lelong.t_jual','<=',$request->tarikh],['lelong.baki','<=', 0]])
-        ->whereNull('lelong.trkhtuntut')
-        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-                ->sum('baki');
+        $rugilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','<=',$request->tarikh)
+            ->where(function($query)
+            {
+                $query->whereNull('trkhtuntut')
+                    ->orWhere('trkhtuntut','>','2021-01-02');
+            })
+            ->where('baki','<',0)
+            ->sum('baki');
 
-        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong];
+        $rugitotal=$rugilelong + $ansrugi;
+
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
 
         return response()->json($arraylelong,200);
     }
@@ -313,19 +339,33 @@ class LelongController extends Controller
         return response()->json($wtd,200);
     }
 
-    public function cajlelongcalculation($kodcaw)
+    public function cajlelongcalculation($kodcaw,Request $request)
     {
         $current = Carbon::now();
-        $current = new Carbon();
+
+        $current = new Carbon($request->tarikh);
+
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $cajlelong = Lelong::on($cawangan['mysql'])
+        ->whereNotNull('t_jual')
+        ->where([['t_jual','<=', $request->tarikh],['t_jual','>','2014-12-31']])
         ->whereYear('t_jual','=',$current->year)
         ->sum('cajlelong');
 
         return response()->json($cajlelong,200);
     }
 
+    public function cajperkhidmatancalculation($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $cajperkhidmatan = GlCode::on($cawangan['mysql'])
+        ->where('glcode','=','7000/500')
+        ->sum('amaun');
+  
+        return response()->json($cajperkhidmatan,200);
+    }
 
 }