From bc997656abfd8bb17896ff3c2b04e5ee91b69d33 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Thu, 21 Apr 2022 10:33:13 +0800 Subject: [PATCH 1/6] update senarai tangguhlelong --- app/Http/Controllers/MarhunController.php | 48 +++++++++++++++---- .../views/pengesahan/lelbidmarhun.blade.php | 36 +++++++------- .../pengesahan/senaraitangguhlelong.blade.php | 7 ++- routes/web.php | 2 +- 4 files changed, 60 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index aeab4529..6234b622 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -665,6 +665,20 @@ class MarhunController extends Controller { $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id') ->where('tangguhlelong.lelong_id', $id) + ->select('tangguhlelong.id as tangguhlelong_id', + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.ditangguh_pada', + 'tangguhlelong.ditangguh_oleh', + 'tangguhlelong.nota', + 'lelong.id as lelong_id', + 'lelong.tarikh_lelong', + 'lelong.harga_emas_asas', + 'lelong.jbg', + 'lelong.cajlelong', + 'lelong.sts_lelong' + ) ->get(); foreach($tangguhlelong as $index1=>$tanguhlel) @@ -673,22 +687,38 @@ class MarhunController extends Controller ->where('lelong_id', $id) ->first(); - $tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name; + $tangguhlelong[$index1]['details'] = $tanguhlel; + $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; } return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); } - public function lelbidmarhun($id, $norujukan) + public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) { - $marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') - ->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan') - ->where('tangguhlelong.norujukan', $norujukan) + $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') + ->where('gadaimarhun.norujukan', $norujukan) + ->where('tangguhlelong.id', $tangguhlelong_id) + ->select('tangguhlelong.id as tangguhlelong_id', + 'tangguhlelong.lelong_id', + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.pinjaman', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.nota as tangguh_nota', + 'tangguhlelong.pinjaman', + 'gadaimarhun.id as gadaimarhun_id', + 'gadaimarhun.bil', + 'gadaimarhun.marhun', + 'gadaimarhun.nota as gadai_nota', + 'gadaimarhun.karat', + 'gadaimarhun.berat', + 'gadaimarhun.harga', + 'gadaimarhun.n_marhun' + ) ->get(); - - $status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first(); - - return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status')); + + return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan')); } diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php index 8c77ba14..47b5d0d3 100644 --- a/resources/views/pengesahan/lelbidmarhun.blade.php +++ b/resources/views/pengesahan/lelbidmarhun.blade.php @@ -10,42 +10,40 @@

{{ $message }}

@endif + +
+
+
+

Norujukan : {{ $tangguhlelong[0]['norujukan'] }}

+

Pembiayaan : {{ $tangguhlelong[0]['pinjaman'] }}

+

Remark : {{ $tangguhlelong[0]['tangguh_nota'] }}

+
+
+
- - - @foreach ($marhuns as $marhun) + @foreach ($tangguhlelong as $index1=>$tangguhlel) - - - - - - - - + + + + + + @endforeach diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php index 660370bb..78c5f1e4 100644 --- a/resources/views/pengesahan/senaraitangguhlelong.blade.php +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -17,23 +17,22 @@ - + - @foreach ($tangguhlelong as $tangguhlel) - + @endforeach diff --git a/routes/web.php b/routes/web.php index 5b5d0fed..21c2360a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -193,7 +193,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']); Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']); Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); - Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); + Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); }); Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () { From baf696a580e4a328e72fcf5c0ab8b75bb2bbe108 Mon Sep 17 00:00:00 2001 From: AmalinTamizi <84703825+amalintamizi@users.noreply.github.com> Date: Thu, 21 Apr 2022 13:57:02 +0800 Subject: [PATCH 2/6] update new pengguna --- app/Http/Controllers/PenggunaController.php | 40 ++++++++++- .../views/pengurusanpengguna/index.blade.php | 70 ++++++++++++++++++- routes/web.php | 1 + 3 files changed, 108 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index 1c031025..9cb1335c 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; +use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Auth; use App\Models\User; use Carbon\Carbon; @@ -37,6 +38,7 @@ class PenggunaController extends Controller return view('pengurusanpengguna.index',compact('alluser','allroles')); } + public function show(Request $request, $userid) { // dd($userid); @@ -44,12 +46,45 @@ class PenggunaController extends Controller $userroles = $user->getRoleNames()->toArray(); $allroles = Role::all()->pluck('name'); + + // $active = User::where('id','=',$userid)->update('status', 1); return view('pengurusanpengguna.show',compact('user','allroles','userroles')); } + public function storepengguna(Request $request) + { + //dd($request->all()); + $validator = Validator::make($request->all(), [ + 'email' => 'required|string|unique:users|email' + ]); + + if ($validator->fails()) { + $errors = [ + 'success' => "error", + //'message' => $validator->errors() + + ]; + + return redirect()->route('pengguna.index') + ->with('success', 'Sila Masukkan Email Yang Sah'); } + + $user = new User; + $user->name = $request->name; + $user->username = $request->username; + $user->kodcaw = $request->kod_cawangan; + $user->email = $request->email; + $user->password = 123; + $user->user_type = 1; + $user->save(); + + return redirect()->route('pengguna.index') + ->with('success', 'Pengguna Berjaya Disimpan'); + } + public function store(Request $request) { + // dd($request->all()); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); @@ -76,6 +111,9 @@ class PenggunaController extends Controller { $status = 'banned'; } + // else if(!($request->has('status'))){ + // $status = 'active'; + // } else { $status = 'inactive'; @@ -83,7 +121,7 @@ class PenggunaController extends Controller $user = User::where('id','=',$request->userid)->first(); // dd($user); - $user->email = $request->email; + $user->email = $request->emel; $user->notelbimbit = $request->notelbimbit; $user->nokp = $request->nokp; $user->updated_at = $currentdate; diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index ec2abb21..2ba8106d 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -1,6 +1,9 @@ @extends('layouts.app') @section('content') + + +
@@ -34,6 +37,7 @@
+
BilNo Rujukan Marhun Karat Berat Harga (RM) Nilai Marhun NotaStatus
{{ $loop->iteration }}{{ $marhun->norujukan }}{{ $marhun->marhun }}{{ $marhun->karat }}{{ $marhun->berat }}{{ $marhun->harga }}{{ $marhun->n_marhun }}{{ $marhun->nota }} - @if($status->status_ubah == 1) - - @elseif($status->status_ubah == 2) - - @elseif($status->status_ubah == 3) - - @endif - {{ $tangguhlel->marhun }}{{ $tangguhlel->karat }}{{ $tangguhlel->berat }}{{ $tangguhlel->harga }}{{ $tangguhlel->n_marhun }}{{ $tangguhlel->gadai_nota }}
Bil Nama CawanganTarikh Lelong AsalTarikh Lelong Tarikh Tangguh No Rujukan Action
{{ $loop->iteration }}{{ $tangguhlel['nama_caw'] }}{{ $tangguhlel['nama_caw']['caw_name'] }} {{ $tangguhlel->tarikh_lelong }} {{ $tangguhlel->tarikhtangguh }} {{ $tangguhlel->norujukan }} - +
{{ $user->name }} {{ $user->email }} @foreach ($user->roles as $taraf) @@ -42,6 +46,8 @@ @if ($user->status =='active') + @elseif ($user->status == 'inactive') + @elseif ($user->status =='banned') @endif @@ -61,6 +67,56 @@ + + + + -@endsection +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 21c2360a..86b1f14c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -41,6 +41,7 @@ Route::get('/pembayaran/bidbackend', 'ApiController@bidbackend')->name('pay.bidc Route::group(['middleware' => ['permission:pengguna'],'prefix'=>'pengguna'], function () { Route::get('/listpengguna',['as'=>'pengguna.index','uses'=>'PenggunaController@index']); Route::get('/listpengguna/{userid}',['as'=>'pengguna.show','uses'=>'PenggunaController@show']); + Route::post('/storepengguna',['as'=>'pengguna.storepengguna','uses'=>'PenggunaController@storepengguna']); Route::post('/store',['as'=>'pengguna.store','uses'=>'PenggunaController@store']); Route::get('/delete/{userid}',['as'=>'pengguna.delete','uses'=>'PenggunaController@delete']); From 7e77ddcf56def20b831b4493a75df41309a91fe2 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 24 Apr 2022 15:58:03 +0800 Subject: [PATCH 3/6] update taraf --- app/Http/Controllers/PenggunaController.php | 5 ++++- .../views/pengurusanpengguna/index.blade.php | 17 +++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index 9cb1335c..ae1293dd 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -11,6 +11,8 @@ use App\Models\User; use Carbon\Carbon; use PDF; +use App\Models\Cawangan; + class PenggunaController extends Controller { /** @@ -33,9 +35,10 @@ class PenggunaController extends Controller // $alluser = User::all(); $alluser = User::with('roles')->get(); $allroles = Role::all()->pluck('name'); + $caw = Cawangan::all(); // $user = Auth::user(); // $user->assignRole('admin'); - return view('pengurusanpengguna.index',compact('alluser','allroles')); + return view('pengurusanpengguna.index',compact('alluser','allroles','caw')); } diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index 2ba8106d..b84a485d 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -94,13 +94,18 @@
- - - + +
+
+`
From 1b3d9cde52bd4563e08dbecb0153ab3e55eb0799 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 24 Apr 2022 16:23:40 +0800 Subject: [PATCH 4/6] update taraf 2 --- app/Http/Controllers/PenggunaController.php | 6 +++++- resources/views/pengurusanpengguna/index.blade.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php index ae1293dd..dfebf494 100644 --- a/app/Http/Controllers/PenggunaController.php +++ b/app/Http/Controllers/PenggunaController.php @@ -57,6 +57,8 @@ class PenggunaController extends Controller public function storepengguna(Request $request) { + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); //dd($request->all()); $validator = Validator::make($request->all(), [ 'email' => 'required|string|unique:users|email' @@ -75,7 +77,9 @@ class PenggunaController extends Controller $user = new User; $user->name = $request->name; $user->username = $request->username; - $user->kodcaw = $request->kod_cawangan; + $user->kodcaw = $request->caw; + $user->status = 'active'; + $user->t_daftar = $currentdate; $user->email = $request->email; $user->password = 123; $user->user_type = 1; diff --git a/resources/views/pengurusanpengguna/index.blade.php b/resources/views/pengurusanpengguna/index.blade.php index b84a485d..25a331b0 100644 --- a/resources/views/pengurusanpengguna/index.blade.php +++ b/resources/views/pengurusanpengguna/index.blade.php @@ -99,7 +99,7 @@ @foreach ($caw as $item) @@ -104,14 +103,19 @@ -
-`
- -
+
+
+ +
+
+ +
+
+
diff --git a/resources/views/pengurusanpengguna/show.blade.php b/resources/views/pengurusanpengguna/show.blade.php index 2c9bc628..e8b35f4e 100644 --- a/resources/views/pengurusanpengguna/show.blade.php +++ b/resources/views/pengurusanpengguna/show.blade.php @@ -33,7 +33,7 @@ @endforeach
- @if($user->user_type == 2) + @if($user->user_type == 1)
@@ -44,15 +44,6 @@
-
-
- -
-
- -
-
@endif
From 725d63898c759724c91b09933ab092638747dec5 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 25 Apr 2022 14:25:13 +0800 Subject: [PATCH 6/6] update tarikh tamat kontrak --- app/Http/Controllers/TamatKontController.php | 29 +++++++++++++++---- .../views/jananotis/senaraitemp.blade.php | 20 +++++++++++-- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php index c491eed6..11b9c9a8 100644 --- a/app/Http/Controllers/TamatKontController.php +++ b/app/Http/Controllers/TamatKontController.php @@ -12,6 +12,8 @@ use App\Models\GadaiMarhun; use App\Models\Cawangan; use App\Models\TransaksiKeuntungan; +use DateTime; + class TamatKontController extends Controller { //PC @@ -62,7 +64,9 @@ class TamatKontController extends Controller $tarikh_lelong = Carbon::parse($t_lelong); - $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); + $t_anggaran = ($tarikh_lelong->subMonths(1))->format('d/m/Y'); + + // $t_anggaran = date('d-m-Y', strtotime('-1 months', strtotime($tarikh_lelong))); foreach($getsurat as $index1=>$surats) { @@ -80,6 +84,7 @@ class TamatKontController extends Controller 't_lelong', 'user', 't_gadais', + 't_gadaisehingga', 't_anggaran', 'bil_lelongcaw' )); @@ -106,6 +111,12 @@ class TamatKontController extends Controller public function senaraitemp(Request $request) { $t_lelong = $request->tarikh_lelong; + $tarikh_lelong = Carbon::parse($t_lelong); + $t_lelongdisplay = $tarikh_lelong->format('d-m-Y'); + $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y'); + $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y'); + + if($t_lelong != null) { @@ -131,8 +142,12 @@ class TamatKontController extends Controller ->whereNotNull('upah12') ->orderBy('t_gadai') ->select('t_gadai') - ->first(); - + ->first(); + // $t_gadais = $request->t_gadai; + // $t_gadaisehingga = Carbon::parse($t_gadais); + // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); + +// $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') ->where('gadai.t_matang1', '<', $t_lelong) ->where('gadai.sttebus', '=', '') @@ -147,8 +162,7 @@ class TamatKontController extends Controller sum(pinjaman) as total_pembiayaan, sum(bakipjm) as total_bakipjm, gadai.kodcaw, - cawangan.caw_name as caw_name' - ) + cawangan.caw_name as caw_name') ->get(); $bil_lelong = sizeof($getsurat); @@ -156,7 +170,10 @@ class TamatKontController extends Controller return view('jananotis.senaraitemp', compact( 't_lelong', 'getsurat', 'senarai', - 't_gadais' + 't_gadais', + 't_anggaran', + 't_daftarlelong', + 't_lelongdisplay' )); } else diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php index 217e1bce..19800d73 100644 --- a/resources/views/jananotis/senaraitemp.blade.php +++ b/resources/views/jananotis/senaraitemp.blade.php @@ -14,9 +14,23 @@
-

Tarikh Lelong : {{ $t_lelong }}

-

Tarikh Gadai Sehingga : {{ $t_gadais->t_gadai }}

-

Anggaran Tarikh Daftar Lelong : {{ $t_anggaran }}

+ +

Tarikh Lelong : {{ $t_lelongdisplay }}

+

Tarikh Gadai Sehingga : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp

+

Tarikh Perlu Blast Notis SMS(30 Hari) : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); + $datez1 = $myDateTime->modify('-1 month')->format('d-m-Y'); + echo($datez1); + @endphp

+

Tarikh Perlu Daftar Batch Lelong(20 Hari) : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong ); + $datez1 = $myDateTime->modify('-20 days')->format('d-m-Y'); + echo($datez1); + @endphp