Merge branch 'adminapi' of https://gitlab.com/online-sistem1/api_arrahn into adminapi

app/Http/Controllers/CustomerController.php

@@ -141,17 +141,21 @@ class CustomerController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         
-        if($status == 'belum_tebus' || $status == 'sudah_tebus'){
+	if($status == 'belum_tebus'){
+            $gadai = Gadai::on($cawangan['mysql'])
+            ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
+            ->get();
+        }elseif($status == 'sudah_tebus'){
             $gadai = Gadai::on($cawangan['mysql'])
                 ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
-                ->get();
+                ->orderBy('t_update', 'desc')
+                ->take(100)->get();
         }elseif($status == 'lelong'){
             $gadai = Gadai::on($cawangan['mysql'])
                 ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
                 ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
                 ->get();
         }        
-        
         return response()->json($gadai);
     }
 

app/Http/Controllers/GadaiController.php

@@ -3467,7 +3467,7 @@ class GadaiController extends Controller
             $gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
             foreach($gadai_all as $index=>$gadai){
                 $totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1);
-                $upah6bln_raw = $gadai['bakiupah'] - 0.2;
+                $upah6bln_raw = $gadai['bakiupah'] - 0.5;
 
                 $upah6bln_round = number_format($upah6bln_raw,2);
                 $upah6bln = substr($upah6bln_round, 0, -1);
@@ -3613,4 +3613,30 @@ class GadaiController extends Controller
 
         return response()->json(number_format($total,2));
     }
+
+    public function updateTagLelong(Request $request){
+        $norujukan = $request->norujukan;
+        $kodcaw = $request->kodcaw;
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
+
+        $updateTag = Gadai::on($cawangan->mysql)->where('norujukan',$norujukan)->update([
+            'taglel'=>1
+        ]);
+
+        return response()->json('success');
+    }
+
+    public function revertTagLelong(Request $request){
+        $norujukan = $request->norujukan;
+        $kodcaw = $request->kodcaw;
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
+
+        $updateTag = Gadai::on($cawangan->mysql)->where('norujukan',$norujukan)->update([
+            'taglel'=>0
+        ]);
+
+        return response()->json('success');
+    }
 }

routes/web.php

@@ -11,9 +11,9 @@
 |
 */
 
-$router->get('/', function () use ($router) {
+// $router->get('/', function () use ($router) {
-    return $router->app->version();
+//     return $router->app->version();
-});
+// });
 // $router->get('/key', function() {
 //     return \Illuminate\Support\Str::random(32);
 // });
@@ -22,13 +22,13 @@ $router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use
     $router->get('logs', 'LogViewerController@index');
 });
 
-$router->get('_/phpinfo', function () {
+// $router->get('_/phpinfo', function () {
-        ob_start();
+//         ob_start();
-        phpinfo();
+//         phpinfo();
-        $response = ob_get_contents();
+//         $response = ob_get_contents();
-        ob_get_clean();
+//         ob_get_clean();
-        return $response;
+//         return $response;
-    });
+//     });
 
 $router->group(['prefix'=>'api'], function () use ($router){
     //Customer API
@@ -721,6 +721,11 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     
 
 
+});
+
+$router->group(['prefix'=>'lelong'], function () use ($router){
+    $router->post('taglel/update',['uses'=>'GadaiController@updateTagLelong']);
+    $router->post('taglel/revert',['uses'=>'GadaiController@revertTagLelong']);
 });
 
 $router->group(['prefix'=>'kelantanpay'], function () use ($router){