Merge branch 'apiaku' into 'master'

history

See merge request online-sistem1/api_arrahn!11

app/Http/Controllers/GadaiController.php

@@ -543,6 +543,19 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
+    public function updateHistoryGadai($kodcaw,$norujukan,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $updatehistory = Gadai::on($cawangan['mysql'])
+                        ->where('norujukan','=',$norujukan)
+                        ->update(array(
+                            'historygadaian' => $request->historygadaian
+                        ));
+
+        return response()->json($updatehistory,200);
+    }
+
     public function getLaporanKawalanStok($kodcaw,$tarikh){
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

app/Http/Controllers/HargaEmasController.php

@@ -29,6 +29,8 @@ class HargaEmasController extends Controller
         return response()->json($harga_emas, 200);
     }
 
+
+
     public function showAllHargaEmasMobile(){
         $emas = HargaEmas::on('mysql7')->orderby('recno')->get();
         $hargaemas = [];

app/Http/Controllers/TebusController.php

@@ -40,6 +40,7 @@ class TebusController extends Controller
         $totalBayaranKeuntungan = 0;
         $totalBayaran = 0;
 
+
         foreach($transaction as $index=>$trans){
             $totalBayaran += $trans['duit_masuk'];
         }
@@ -350,4 +351,14 @@ class TebusController extends Controller
             return response()->json($wakil_create ,201);
         }
 
+        public function listhistorypenebusan($kodcaw,Request $request)
+        {
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+            $listtebus = Tebus::on($cawangan['mysql'])
+                      ->where('norujukan','=',$request->norujukan)
+                      ->get();
+      
+              return response()->json($listtebus);
+        }
 }

app/Http/Controllers/TransactionController.php

@@ -50,6 +50,7 @@ class TransactionController extends Controller
     }
 
     public function getTransactionByRujukan($norujukan){
+        
         $transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->get();
 
         return response()->json($transaction);

routes/web.php

@@ -65,6 +65,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
 
     $router->get('gadai/customers/{ic}/outstandingsemasa',['uses'=>'GadaiController@outstandingSemasaCustomer']);
+    $router->get('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
 
 
     //Tebus API
@@ -78,6 +79,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //Maintenance API TEBUS
     // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
     $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
+    $router->get('listpenebusanhistory/{kodcaw}',['uses'=>'TebusController@listhistorypenebusan']);
 
     //API FARIS
     $router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']);