kelulusan

app/Http/Controllers/KelulusanController.php

@@ -96,9 +96,10 @@ class KelulusanController extends Controller
             $kelulusan=Mohon::on($cawangan['mysql'])
             ->where('tarikh','=',$harini->toDateString())
             ->where('norujukan','=',$norujukan)
+            ->where('siri','=',$request->siri)
             ->update(array(
-                     'masalulus'=> $harini->toTimeString(),
-                     'pelulus'=> 'khazanah'
+                     'masalulus' => $harini->toTimeString(),
+                     'pelulus' => 'khazanah'
             ));
 
          }else{
@@ -106,6 +107,7 @@ class KelulusanController extends Controller
             $kelulusan=Mohon::on($cawangan['mysql'])
             ->where('tarikh','=',$harini->toDateString())
             ->where('norujukan','=',$norujukan)
+            ->where('siri','=',$request->siri)
             ->update(array(
                      'masalulus'=> 'batal',
                      'pelulus'=> 'khazanah'
@@ -116,12 +118,28 @@ class KelulusanController extends Controller
       }
       else
       {
+         if($request->pembatalan == null)
+         {
             $kelulusan=Mohon::on($cawangan['mysql'])
             ->where('tarikh','=',$harini->toDateString())
             ->where('norujukan','=',$norujukan)
+            ->where('siri','=',$request->siri)
             ->update(array(
                      'pelulus' => 'operasi' 
             ));  
+
+         }
+         else
+         {
+            $kelulusan=Mohon::on($cawangan['mysql'])
+            ->where('tarikh','=',$harini->toDateString())
+            ->where('norujukan','=',$norujukan)
+            ->where('siri','=',$request->siri)
+            ->update(array(
+                     'pelulus' => 'operasi',
+                     'masalulus' => 'batal' 
+            ));  
+         }
       }
 
       if($request->sahkan === 1)
@@ -129,15 +147,44 @@ class KelulusanController extends Controller
          $kelulusan=Mohon::on($cawangan['mysql'])
          ->where('tarikh','=',$harini->toDateString())
          ->where('norujukan','=',$norujukan)
+         ->where('siri','=',$request->siri)
          ->update(array(
                   'pelulus' => 'dahlulus',
                   'masalulus'=> $harini->toTimeString()
          )); 
+      }else{
+         $kelulusan=Mohon::on($cawangan['mysql'])
+         ->where('tarikh','=',$harini->toDateString())
+         ->where('norujukan','=',$norujukan)
+         ->where('siri','=',$request->siri)
+         ->update(array(
+                  'pelulus' => 'dahlulus',
+                  'masalulus'=> 'batal'
+         )); 
       }
 
       return response()->json($kelulusan,201);
    }
 
+   public function updatekomen($kodcaw,$norujukan,Request $request)
+   {
+      $harini = Carbon::now();
+      $harini = new Carbon;
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $kelulusan=Mohon::on($cawangan['mysql'])
+            ->where('tarikh','=',$harini->toDateString())
+            ->where('norujukan','=',$norujukan)
+            ->where('siri','=',$request->siri)
+            ->update(array(
+                     'komen' => $request->komen
+            )); 
+         
+      return response()->json($kelulusan,201);      
+            
+   }
+
    public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
    {
       $harini = Carbon::now();
@@ -170,7 +217,7 @@ class KelulusanController extends Controller
         
                   'tarikh'=> $harini->toDateString(),
                   'norujukan'=> $norujukan,
-                  'siri' => "try",
+                  'siri' => $request->siri,
                   'komen' => $request->komen,
                   'lastdategadai' => $request->dategadai,
                   'bilgad' => $request->bilgadai,

app/Http/Controllers/MarhunController.php

@@ -109,11 +109,11 @@ class MarhunController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $marhun = Marhun::on($cawangan['mysql'])
-                ->select('Marhun.norujukan','Gadai.nokp','Customer.nama','Marhun.marhun','Marhun.nota','Marhun.berat','Marhun.karat','Marhun.harga','Marhun.n_marhun','Marhun.t_gadai')
-                ->rightJoin('Gadai', 'Gadai.norujukan', '=', 'Marhun.norujukan')
-                ->rightJoin('Customer', 'Customer.kpbaru', '=', 'Gadai.nokp') 
-                ->where('Marhun.t_gadai','=',$tarikh)
-                ->orderBy('Marhun.t_gadai')
+                ->select('marhun.norujukan','gadai.nokp','customer.nama','marhun.marhun','marhun.nota','marhun.berat','marhun.karat','marhun.harga','marhun.n_marhun','marhun.t_gadai')
+                ->rightJoin('gadai', 'gadai.norujukan', '=', 'marhun.norujukan')
+                ->rightJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') 
+                ->where('marhun.t_gadai','=',$tarikh)
+                ->orderBy('marhun.t_gadai')
                 ->get();
         
         return response()->json($marhun);

app/Http/Controllers/TransactionController.php

@@ -61,4 +61,11 @@ class TransactionController extends Controller
 
         return response()->json($transaction);
     }
+
+    public function getTransactionByRujukanOne($norujukan){
+        
+        $transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('created_at','desc')->first();
+
+        return response()->json($transaction);
+    }
 }

app/Http/Controllers/TunaiController.php

@@ -26,6 +26,7 @@ class TunaiController extends Controller
         return response()->json($tunai);
 
     }
+    
 
     public function countgadaidantebus($kodcaw)
     {
@@ -144,6 +145,23 @@ class TunaiController extends Controller
 
     }
 
+    public function getTunaiPast($kodcaw,Request $request)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tunai=Tunai::on($cawangan['mysql'])
+        ->where([['kodcaw','=',$kodcaw],['tarikh','<',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
+        ->orderBy('tarikh','desc')
+        ->get();
+        
+        return response()->json($tunai);
+
+    }
+
     public function getLatestTunai($kodcaw,Request $request)
     {
 

routes/web.php

@@ -147,6 +147,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('transaction/duit_keluar',['uses'=>'TransactionController@duitKeluar']);
     $router->get('transaction',['uses'=>'TransactionController@showAllTransaction']);
     $router->get('transaction/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan']);
+    $router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']);
     $router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']);
 
     $router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);
@@ -195,6 +196,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
     $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
     $router->get('GetCurrentTunai/{kodcaw}',['uses' =>'TunaiController@getCurrentTunai']);
+    $router->get('getPastTunai/{kodcaw}',['uses' =>'TunaiController@getTunaiPast']);
     $router->get('GetLatestTunai/{kodcaw}',['uses' =>'TunaiController@getLatestTunai']);
     $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
     $router->get('getAddTunai/{kodcaw}/kodlaluan/',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
@@ -220,6 +222,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']);
     $router->get('ListLatestLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listlatestlulus']);
     $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']);
+    $router->put('UpdateKelulusanKomen/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@updatekomen']);
+    
     $router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']);
     $router->post('CreateLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@kepohonancreate']);
     $router->get('GetLulus/{kodcaw}/',['uses'=>'KelulusanController@kepohonangetteller']);