kawalanstok

app/Http/Controllers/GadaiController.php

@@ -936,68 +936,39 @@ class GadaiController extends Controller
 
         $gadai1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
+                ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',1)
-                // ->where('nilaimarhun','<=',400.99)
                 ->whereBetween('nilaimarhun', [1, 400.99])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
                 ->get();       
 
-        
-
         $gadai2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
+                ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',401)
-                // ->where('nilaimarhun','<=',2000.99)
                 ->whereBetween('nilaimarhun', [401, 2000.99])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
                 ->get(); 
                 
         $gadai3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
-                // ->where('t_gadai','<',$tarikh)
+                ->where('t_gadai','<',$tarikh)
-                // ->where('sttebus','=','')
-                // ->where('nilaimarhun','>=',2001)
-                // ->where('nilaimarhun','<=',100000)
                 ->whereBetween('nilaimarhun', [2001, 100000])
-                ->where([['t_gadai','<',$tarikh],['sttebus','=','']])
-                ->orWhere([['t_gadai','<',$tarikh],['sttebus','!=',''],['t_update','>',$tarikh]])
-                // ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','<',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
                 ->get();    
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
+                ->whereBetween('nilaimarhun', [1, 400.99])
-                ->where('nilaimarhun','>=',1)
-                ->where('nilaimarhun','<=',400.99)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',1],['nilaimarhun','<=',400.99]])
                 ->get();  
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
+                ->whereBetween('nilaimarhun', [401, 2000.99])
-                ->where('nilaimarhun','>=',401)
-                ->where('nilaimarhun','<=',2000.99)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',401],['nilaimarhun','<=',2000.99]])
                 ->get();  
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','=',$tarikh)
-                ->where('sttebus','=','')
+                ->whereBetween('nilaimarhun', [2001, 100000])
-                ->where('nilaimarhun','>=',2001)
-                ->where('nilaimarhun','<=',100000)
-                ->orWhere([['t_update','>',$tarikh],['sttebus','!=',''],['t_gadai','=',$tarikh],['nilaimarhun','>=',2001],['nilaimarhun','<=',100000]])
                 ->get();  
                 
                 
@@ -1110,6 +1081,8 @@ class GadaiController extends Controller
                 ->where('nilaimarhun','<=',100000)
                 ->get();   
 
+        if($kodcaw == 'KB2')
+        {
             foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
             {
                 //Gadai 
@@ -1160,6 +1133,7 @@ class GadaiController extends Controller
                 $lelong3[0]['pinj'] = $lelpinj3;
 
             }
+        }
 
         //////////////////
         ///HAPUS KIRA/////

app/Http/Controllers/PanjarController.php

@@ -38,6 +38,20 @@ class PanjarController extends Controller
       return response()->json($panjar);
    }
 
+   public function listeachpanjar(Request $request,$kodcaw)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $panjar=Panjar::on($cawangan['mysql'])
+               ->where('nobaucer','=',$request->nobaucer)
+               ->first();
+
+      return response()->json($panjar);
+   }
+
    public function listmulaakhir($kodcaw,$mula,$akhir)
    {
    

routes/web.php

@@ -235,6 +235,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
     $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']);
+    $router->get('SenaraiPanjar/listeach/{kodcaw}',['uses'=>'PanjarController@listeachpanjar']);
     $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']);
     // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']);
     $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']);