diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php new file mode 100644 index 00000000..b03604f5 --- /dev/null +++ b/app/Http/Controllers/ApiController.php @@ -0,0 +1,82 @@ +toDateString(); + // dd($currentdate->toDateString()); + $lelong = Lelong::where('tarikh_lelong','=',$currentdate)->get(); + + $arrayID = []; + foreach($lelong as $data) + { + array_push($arrayID,$data->id); + } + $lelongbid = LelongBid::whereIn('lelong_id',$arrayID) + ->join('lelongbidmarhun','lelongbid.id','=','lelongbidmarhun.lelongbid_id') + ->get(); + + $surat = LelongBid::whereIn('lelong_id',$arrayID)->get(); + + if(sizeof($lelongbid)!=0) + { + return response()->json([ + 'success' => true, + 'lelong' => $lelong, + 'surat' => $surat, + 'item' => $lelongbid + ]); + } + else + { + return response()->json([ + 'success' => false, + 'message' => 'No Data', + ], 401); + } + } + +} + \ No newline at end of file diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1e9b0cd4..ceab41cf 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -335,14 +335,19 @@ class LelongController extends Controller { $lelong = Lelong::where('id','=',$id)->first(); $lelong->masatamat_lelong = '2021-12-20 04:51:50'; + $lelong->sts_lelong = 1; $lelong->save(); return redirect()->route('lelong.senarailelong') ->with('success','Lelongan bermula'); } - public function refresh() + public function refresh($id) { + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masakemaskini_data = '2021-12-20 04:51:50'; + $lelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Kemaskini Berjaya'); } diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index f74c4501..901c0270 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -65,8 +65,6 @@ class SimulasiController extends Controller ->where('taglel','=',0) ->where('lelong_tawarruq','=',1) ->get(); - - $cawangan = Cawangan::all(); // dd($cawangan); @@ -164,7 +162,7 @@ class SimulasiController extends Controller $simmarhun->berat = $marhun->berat; $simmarhun->harga = $karat->harga; $simmarhun->n_marhun = $marhun->berat * $karat->harga; - $simmarhun->hargaasas = floatval(number_format($val,2)); + $simmarhun->hargaasas = $val; $simmarhun->save(); } } @@ -185,10 +183,10 @@ class SimulasiController extends Controller } elseif($request->caw && $request->caw != 'all') { - $caw = $cawangan->where('id','=',$request->caw)->first(); + $caw = Cawangan::where('id','=',$request->caw)->first(); $caw_simulasi = new CawanganSimulasi; $caw_simulasi->simulasi_id = $simulasi->id; - $caw_simulasi->caw_id = $request->caw; + $caw_simulasi->caw_id = $caw->id; $caw_simulasi->online = 'Online'; $caw_simulasi->lokasi = $caw->lokasi; $caw_simulasi->save(); @@ -199,7 +197,7 @@ class SimulasiController extends Controller { $simulasibid = new SimulasiBid; $simulasibid->simulasi_id = $simulasi->id; - $simulasibid->caw_id = $caw_simulasi->id; + $simulasibid->caw_id = $caw->id; $simulasibid->kodcaw = $data->kodcaw; $simulasibid->norujukan = $data->norujukan; $simulasibid->t_lelong = $t_lelong; @@ -242,6 +240,7 @@ class SimulasiController extends Controller $berat = $berat + $marhun->berat; $simmarhun = new SimulasiBidMarhun; + $simmarhun->simulasibid_id = $simulasibid->id; $simmarhun->bil = $marhun->bil; $simmarhun->marhun = $marhun->marhun; $simmarhun->nota = $marhun->nota; @@ -249,7 +248,7 @@ class SimulasiController extends Controller $simmarhun->berat = $marhun->berat; $simmarhun->harga = $karat->harga; $simmarhun->n_marhun = $marhun->berat * $karat->harga; - $simmarhun->hargaasas = floatval(number_format($val,2)); + $simmarhun->hargaasas = $val; $simmarhun->save(); } } @@ -272,8 +271,6 @@ class SimulasiController extends Controller dd('error'); } - - return redirect()->route('analisa.show',$simulasi->id); } @@ -320,7 +317,7 @@ class SimulasiController extends Controller foreach($cawangansim as $cawsim) { $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first(); - $databid = SimulasiBid::where('caw_id','=',$cawsim->caw_id)->get(); + $databid = SimulasiBid::where('simulasi_id','=',$simulasi_id)->get(); $packet = 0; $berat = 0; diff --git a/app/Models/Lelong.php b/app/Models/Lelong.php index 8242f695..1b53360d 100644 --- a/app/Models/Lelong.php +++ b/app/Models/Lelong.php @@ -18,5 +18,6 @@ class Lelong extends Model 'harga_emas_asas', 'jbg', 'cajlelong', + 'sts_lelong' ]; } diff --git a/config/auth.php b/config/auth.php index e29a3f7d..3fc94731 100644 --- a/config/auth.php +++ b/config/auth.php @@ -40,6 +40,10 @@ return [ 'driver' => 'session', 'provider' => 'users', ], + 'api' => [ + 'driver' => 'session', + 'provider' => 'users', + ], ], /* diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index fecc3c2d..5e66c61c 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -23,6 +23,7 @@ class CreateLelongsTable extends Migration $table->string('harga_emas_asas'); $table->string('jbg'); $table->integer('cajlelong'); + $table->integer('sts_lelong')->default(0); $table->timestamps(); }); diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 8cf67dd7..49b66163 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -36,7 +36,7 @@ {{ $lel->cajlelong }} @hasrole('jurulelong') - + @if(!$lel->masatamat_lelong) @else diff --git a/routes/api.php b/routes/api.php index eb6fa48c..f93b0396 100644 --- a/routes/api.php +++ b/routes/api.php @@ -15,5 +15,46 @@ use Illuminate\Support\Facades\Route; */ Route::middleware('auth:sanctum')->get('/user', function (Request $request) { - return $request->user(); + // dd(); + return response()->json($request->user()); }); + +Route::post('/login', function (Request $request) { + $request->validate([ + 'username' => 'required|string', + 'password' => 'required|string', + ]); + + $credentials = $request->only('username', 'password'); + + + if (Auth::guard('api')->attempt($credentials,true)) { + $auth_user = Auth::guard('api')->user(); + + // dd($auth_user); + $user_login['name'] = $auth_user['name']; + $user_login['username'] = $auth_user['username']; + $user_login['password'] = $auth_user['password']; + $user_login['icno'] = $auth_user['nokp']; + $user_login['apitoken'] = $auth_user['remember_token']; + return response()->json([ + 'success' => true, + 'user' => $user_login + ]); + } else { + //if authentication is unsuccessfull, notice how I return json parameters + return response()->json([ + 'success' => false, + 'message' => 'Invalid Email or Password', + ], 401); + } +}); + +Route::get('/item','ApiController@biditem'); + +// Route::get('/item',['as'=>'lelong.biditem','uses'=>'LelongController@biditem']); +// Route::get('/lelongstop/{id}',['as'=>'lelong.stop','uses'=>'LelongController@stop']); + + + + diff --git a/routes/web.php b/routes/web.php index 2cc91100..3d56d08e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -76,7 +76,7 @@ Route::group(['prefix'=>'lelong'], function () { }); Route::group(['middleware' => ['permission:import']], function () { - Route::get('/refresh',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']); + Route::get('/refresh/{id}',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']); }); Route::group(['middleware' => ['permission:kemaskinihargaasas']], function () {