Merge branch 'amir_dev' into 'main'

add new api

See merge request online-sistem1/lelong!59

app/Http/Controllers/ApiController.php

@@ -198,7 +198,7 @@ class ApiController extends Controller
         return response()->json([
             'success' => true,
             'message' => $billcode['url'],
-        ], 401);
+        ], 201);
 
         // return view('pembayaran.result.berjaya',compact('arraybayaran'));
     }
@@ -371,7 +371,7 @@ class ApiController extends Controller
         $resit->lelong_id = $request->lelong_id;
         $resit->reference_no = $reference_no;
         $resit->billplz_id = $billcode['id'];
-        $resit->resit_type = 3; //billplz resit for bid payment
+        $resit->resit_type = 2; //billplz resit for bid payment
         $resit->total_payment = $request->total;
         $resit->save();
 
@@ -380,7 +380,7 @@ class ApiController extends Controller
         return response()->json([
             'success' => true,
             'message' => $billcode['url'],
-        ], 401);
+        ], 201);
         // return view('pembayaran.result.berjaya',compact('arraybayaran'));
     }
     

app/Http/Controllers/Mobile/LelongMobileController.php

@@ -128,7 +128,7 @@ class LelongMobileController extends Controller
         }
         else if($feepayment == null){
 
-            $errors = [
+            $response = [
                 'success' => "error",
                 'message' => "Something wrong with the server"
             ];
@@ -374,4 +374,67 @@ class LelongMobileController extends Controller
         }
         return response()->json($lelongs, 201);
     }
+
+    public function listCawLelongToday()
+    {
+
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateString();
+
+        $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
+            ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
+            ->where('tarikh_lelong', '=', $currentdate)
+            ->select(
+                'lelong.id as lelong_id',
+                'lelong.tarikh_lelong',
+                'cawangan.caw_name',
+                'cawangan_lelong.caw_id',
+                'lelong.masamula_lelong',
+                'lelong.masatamat_lelong',
+            )
+            ->get()->toArray();
+
+        if ($lelong) {
+            return response()->json([
+                'success' => true,
+                'lelong' => $lelong
+            ]);
+        } else {
+            return response()->json([
+                'success' => false,
+            ]);
+        }
+    }
+
+    public function listCawLelongNext()
+    {
+
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateString();
+
+        $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
+            ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
+            ->where('tarikh_lelong', '>', $currentdate)
+            ->select(
+                'lelong.id as lelong_id',
+                'lelong.tarikh_lelong',
+                'cawangan.caw_name',
+                'cawangan_lelong.caw_id',
+                'lelong.masamula_lelong',
+                'lelong.masatamat_lelong',
+            )
+            ->orderBy('lelong.tarikh_lelong', 'ASC')
+            ->get()->toArray();
+
+        if ($lelong) {
+            return response()->json([
+                'success' => true,
+                'lelong' => $lelong
+            ]);
+        } else {
+            return response()->json([
+                'success' => false,
+            ]);
+        }
+    }
 }

routes/api.php

@@ -60,6 +60,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::get('/karat', [LelongMobileController::class, 'getListKarat']);
     Route::get('/result/{user_id}', [LelongMobileController::class, 'bidresult']);
     Route::get('/history/{user_id}', [LelongMobileController::class, 'history']);
+    Route::get('/listcawlelongtoday', [LelongMobileController::class, 'listCawLelongToday']);
+    Route::get('/listcawlelongnext', [LelongMobileController::class, 'listCawLelongNext']);
 
     // Lelong => Bidder
     Route::post('/bidder/biditem', [LelongMobileController::class, 'bidderSelectBidItem']);