From 9505599fbf9c0404840f62a6588d2e93572f2a7f Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 27 Feb 2022 14:13:38 +0800 Subject: [PATCH 01/19] update payment migration --- app/Http/Controllers/LelongController.php | 2 +- database/migrations/2022_01_25_010223_create_payment_table.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d3aa8cec..7af9ff84 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -488,7 +488,7 @@ class LelongController extends Controller $resit->lelong_id = $id; $resit->reference_no = $reference_no; $resit->billplz_id = ''; - $resit->total_payment = ''; + $resit->total_payment = '0.00'; $resit->resit_type = 2; // 1 = fee , 2 = bid $resit->save(); } diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php index 5daf633c..c48d6756 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -67,7 +67,7 @@ class CreatePaymentTable extends Migration $table->unsignedBigInteger('lelong_id')->unsigned(); $table->string('reference_no')->nullable(); $table->string('billplz_id'); - $table->decimal('total_payment', $precision = 9, $scale = 2); + $table->decimal('total_payment', $precision = 11, $scale = 2); $table->string('resit_type'); // 1 = fee , 2 = bid $table->string('status')->nullable(); //status => 1 = paid , 2 = pending $table->timestamp('paid_at')->nullable(); From a49375d8af378355a6329334d9c18d6da81bd38c Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 27 Feb 2022 17:01:14 +0800 Subject: [PATCH 02/19] add sahbayaronline acc --- app/Http/Controllers/AccountController.php | 81 +++++++++++++ .../views/account/listbayaranonline.blade.php | 106 ++++++++++++++++++ .../views/account/sahsagonline.blade.php | 98 ++++++++++++++++ .../views/account/senarailelongan.blade.php | 92 +++++++++++++++ resources/views/includes/sidebar.blade.php | 3 + routes/web.php | 13 ++- 6 files changed, 391 insertions(+), 2 deletions(-) create mode 100644 app/Http/Controllers/AccountController.php create mode 100644 resources/views/account/listbayaranonline.blade.php create mode 100644 resources/views/account/sahsagonline.blade.php create mode 100644 resources/views/account/senarailelongan.blade.php diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php new file mode 100644 index 00000000..5446db60 --- /dev/null +++ b/app/Http/Controllers/AccountController.php @@ -0,0 +1,81 @@ +join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong.sts_lelong', 3) + ->get(); + + return view('account.senarailelongan',compact('senarai')); + } + + public function listbayaranonline($lelong_id){ + + $listwinner = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id') + ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('payment.user_id' + ) + ->groupBy('payment.user_id') + ->get(); + + foreach($listwinner as $index1=>$winner){ + + $userdetails = User::where('id', $winner['user_id'])->first(); + $SAGWin = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id') + ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id') + ->where('payment.user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->get(); + + $total_payment = 0; + foreach($SAGWin as $SAG){ + $payment = Payment::where('lelongbid_id', $SAG->lelongbid_id) + ->first(); + + if($payment){ + $total_payment = $total_payment + $payment->total_payment; + } + } + + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + $listwinner[$index1]['totalPay'] = $total_payment; + + } + + + return view('account.listbayaranonline',compact('listwinner','lelong_id')); + } + + public function sahsagonline($lelong_id, $user_id){ + + $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) + ->get(); + + return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id')); + } +} diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php new file mode 100644 index 00000000..a51870bc --- /dev/null +++ b/resources/views/account/listbayaranonline.blade.php @@ -0,0 +1,106 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + + + + + @foreach($listwinner as $winner) + + + + + + + + + + + + @endforeach + +
NoNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Bidaan(RM)Jumlah Pembayaran(RM)Penyata BayaranAction
{{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['nokp']}}{{ $winner['details']['notelbimbit']}}{{ $winner['total_surat']}}{{ $winner['totalBid']}}{{ $winner['totalPay']}} + + + +
+
+
+
+ + + +@endsection + diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php new file mode 100644 index 00000000..55099f87 --- /dev/null +++ b/resources/views/account/sahsagonline.blade.php @@ -0,0 +1,98 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + + + @foreach($senaraisag as $senaraisag) + + + + + + + + + + @endforeach + +
NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanAction
{{ $loop->iteration }} {{ $senaraisag['norujukan']}}{{ $senaraisag['t_lelong']}}{{ $senaraisag['hargaasas']}}{{ $senaraisag['hargabida']}}{{ $senaraisag['masa_bidaan']}} + +
+
+ Kembali +
+
+
+
+ + + +@endsection diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php new file mode 100644 index 00000000..81f91816 --- /dev/null +++ b/resources/views/account/senarailelongan.blade.php @@ -0,0 +1,92 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + @foreach($senarai as $data) + + + + + + + + @endforeach + +
NoKod CawanganTarikh LelongStatus LelongAction
{{$loop->iteration}}{{ $data->caw_code }}{{ $data->tarikh_lelong }}{{ $data->sts_lelong }} + +
+
+
+
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 88fc44a0..ce029f8f 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -115,6 +115,9 @@ {{--
  • Home
    • --}} +
  • + List Bayaran Online +
    • @endhasrole @hasrole('pembida') {{--
  • diff --git a/routes/web.php b/routes/web.php index 13d51b20..2e18c6fe 100644 --- a/routes/web.php +++ b/routes/web.php @@ -146,8 +146,7 @@ Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], funct Route::get('/senaraibid/{user_id}/{lelong_id}',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']); }); - - +// Pengurus Cawangan Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pembayaran'], function () { Route::get('/kaunterpembayaran/{lelong_id}', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); @@ -155,6 +154,16 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe Route::post('/paymentdenokaunter', ['as'=>'pembayaran.paymentdenokaunter','uses'=>'PaymentController@paymentdenokaunter']); }); +// Pengurus Cawangan + +// Account +Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'account'], function () { + Route::get('/senarailelongan', ['as'=>'account.senarailelongan','uses'=>'AccountController@senarailelongan']); + Route::get('/listbayaranonline/{lelong_id}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']); + Route::get('/sahsagonline/{lelong_id}/{user_id}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']); + +}); +// Account Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () { Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']); From 6f4f1e75a6f4e3b8b0343942f47486fed3308a2d Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Mon, 28 Feb 2022 16:29:31 +0800 Subject: [PATCH 03/19] update gadai migration --- ...21_12_13_053311_create_cawangans_table.php | 145 +++++++++++++++--- 1 file changed, 125 insertions(+), 20 deletions(-) diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index f369b89b..8df5c559 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -84,37 +84,142 @@ class CreateCawangansTable extends Migration Schema::create('gadai', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('kodcaw'); + $table->string('kodcaw')->nullable(); $table->string('norujukan'); - $table->string('nokp'); - $table->decimal('jbg', $precision = 7, $scale = 2); - $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable(); - $table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable(); - $table->decimal('ansuran', $precision = 11, $scale = 2)->nullable(); + $table->string('prkod')->nullable(); + $table->string('nopelanggan'); + $table->string('nokp')->nullable(); + $table->date('t_gadai'); + $table->time('masa')->nullable(); + $table->int('sirig')->nullable(); $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->nullable(); + $table->decimal('n_marhuns', $precision = 9, $scale = 2)->nullable(); + $table->decimal('berat', $precision = 7, $scale = 2)->nullable(); $table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable(); + $table->decimal('telahbayar', $precision = 7, $scale = 2)->nullable(); + $table->decimal('upahtelahbyr', $precision = 7, $scale = 2)->nullable(); + $table->decimal('cajtelahbyr', $precision = 7, $scale = 2)->nullable(); + $table->decimal('ansuran', $precision = 9, $scale = 2)->nullable(); + $table->decimal('ansupah', $precision = 7, $scale = 2)->nullable(); + $table->decimal('kadarupah', $precision = 5, $scale = 2)->nullable(); + $table->decimal('tempoh', $precision = 10, $scale = 2)->nullable(); + $table->date('t_lanjut1')->nullable(); + $table->date('t_lanjut2')->nullable(); + $table->date('t_matang')->nullable(); + $table->date('t_matang1')->nullable(); + $table->date('t_matang2')->nullable(); + $table->date('t_notis1')->nullable(); + $table->date('t_notis2')->nullable(); + $table->date('t_notis3')->nullable(); + $table->date('t_lelong')->nullable(); + $table->date('t_hapus')->nullable(); + $table->string('sttebus'); + $table->string('terima')->nullable(); + $table->integer('cetak')->nullable(); + $table->string('tncek')->nullable(); + $table->string('nocek')->nullable(); + $table->string('bkcode')->nullable(); + $table->string('glcode')->nullable(); + $table->string('teller')->nullable(); + $table->string('pelulus')->nullable(); + $table->string('pelulust')->nullable(); + $table->string('disburseid')->nullable(); + $table->time('disbursetime')->nullable(); + $table->string('cancelid')->nullable(); + $table->time('canceltime')->nullable(); + $table->string('f_lulus')->nullable(); + $table->string('tag')->nullable(); + $table->decimal('jbg', $precision = 9, $scale = 2); + $table->decimal('bakijpm', $precision = 7, $scale = 2); $table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable(); $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable(); - $table->decimal('baki', $precision = 9, $scale = 2)->nullable(); - $table->decimal('berat', $precision = 7, $scale = 2)->nullable(); $table->string('marhun')->nullable(); - $table->decimal('gst_hj', $precision = 7, $scale = 2)->default(0.00); - $table->decimal('gst_cl', $precision = 7, $scale = 2)->default(0.00); - $table->decimal('percent', $precision = 7, $scale = 2)->nullable(); - $table->integer('mora_upah')->default(0); - $table->date('t_gadai')->nullable(); - $table->date('t_matang')->nullable(); - $table->integer('sttebus')->nullable(); - $table->integer('tagpalsu')->nullable(); - $table->integer('tagpalsu2')->nullable(); + $table->string('jenisupah')->nullable(); + $table->decimal('cajkhidmat', $precision = 7, $scale = 2)->nullable(); + $table->integer('stcajkhidmat')->nullable(); + $table->string('kodgl')->nullable(); $table->integer('taglel')->nullable(); + $table->integer('instno')->nullable(); + $table->integer('currlnstno')->nullable(); + $table->decimal('ansakhir', $precision = 7, $scale = 2)->nullable(); + $table->decimal('ansupahakhir', $precision = 7, $scale = 2)->nullable(); + $table->decimal('jumupahaz', $precision = 7, $scale = 2)->nullable(); + $table->decimal('tunggakan', $precision = 7, $scale = 2)->nullable(); + $table->date('t_update'); + $table->string('jantina')->nullable(); + $table->string('bangsa')->nullable(); + $table->integer('sirit')->nullable(); + $table->integer('jenisansur')->nullable(); + $table->string('nokotak')->nullable(); + $table->integer('tiada')->nullable(); + $table->integer('tiada')->nullable(); + $table->integer('tagtbaki')->nullable(); + $table->string('penilai')->nullable(); + $table->string('namapenilai')->nullable(); + $table->integer('tagserah')->nullable(); + $table->date('tempTarikhAging')->nullable(); + $table->string('jenistebus')->nullable(); + $table->string('namapelulus')->nullable(); + $table->decimal('percentpinj', $precision = 9, $scale = 2)->nullable(); + $table->integer('kuantiti')->nullable(); + $table->string('namateller')->nullable(); + $table->decimal('jumtebus', $precision = 11, $scale = 2)->nullable(); + $table->decimal('upahnotis', $precision = 9, $scale = 2)->nullable(); + $table->decimal('upahpercuma', $precision = 11, $scale = 2)->nullable(); + $table->integer('tagpalsu')->nullable(); + $table->decimal('upahdibayar', $precision = 10, $scale = 2)->nullable(); + $table->integer('tagcetak')->nullable(); + $table->integer('tag_sms')->nullable(); + $table->string('semakbarcode')->nullable(); + $table->integer('wangkeluarteller')->nullable(); + $table->integer('semakpetibesi')->nullable(); + $table->integer('semakaudit')->nullable(); + $table->string('historygadaian')->nullable(); + $table->integer('tagkiratebus')->nullable(); + $table->integer('checkbp')->nullable(); + $table->decimal('pampasan', $precision = 9, $scale = 2)->nullable(); + $table->integer('lel1stop')->nullable(); + $table->string('tellernew')->nullable(); + $table->string('idjompay')->nullable(); + $table->integer('tangguh')->nullable(); + $table->integer('tangguh')->nullable(); + $table->date('tebus')->nullable(); + $table->decimal('upahSim', $precision = 7, $scale = 2)->nullable(); + $table->decimal('jbgakru', $precision = 5, $scale = 2)->nullable(); + $table->decimal('upahakru', $precision = 7, $scale = 2)->nullable(); + $table->integer('tagpalsu2')->nullable(); + $table->integer('tagcall')->nullable(); + $table->decimal('upah_semasa', $precision = 11, $scale = 2)->nullable(); + $table->decimal('simulasi_hargaasas', $precision = 11, $scale = 2)->nullable(); + $table->decimal('simulasi_cajlelong', $precision = 11, $scale = 2)->nullable(); + $table->decimal('simulasi_bakilelong', $precision = 11, $scale = 2)->nullable(); + $table->decimal('sim_hargaasas', $precision = 9, $scale = 2)->nullable(); + $table->decimal('sim_cajlelong', $precision = 9, $scale = 2)->nullable(); + $table->decimal('sim_upahlelong', $precision = 9, $scale = 2)->nullable(); + $table->decimal('sim_bakilelong', $precision = 9, $scale = 2)->nullable(); + $table->decimal('percentrebet', $precision = 9, $scale = 2)->nullable(); + $table->decimal('rebet', $precision = 9, $scale = 2)->nullable(); + $table->decimal('upahlpsrebet', $precision = 9, $scale = 2)->nullable(); + $table->integer('taguploadslip')->nullable(); + $table->integer('tagsahupahonline')->nullable(); + $table->decimal('bayarupahonline', $precision = 9, $scale = 2)->nullable(); + $table->date('tbayaronline')->nullable(); + $table->decimal('upahsebenar', $precision = 9, $scale = 2)->nullable(); + $table->integer('tagupdatedbonline')->nullable(); + $table->decimal('bayarpinjamanonline', $precision = 9, $scale = 2)->nullable(); + $table->string('jenis_bayaran')->nullable(); + $table->decimal('upah12', $precision = 9, $scale = 2)->nullable(); + $table->decimal('hargajualan', $precision = 9, $scale = 2)->nullable(); + $table->decimal('bakihargajualan', $precision = 9, $scale = 2)->nullable(); + $table->integer('tagkomuditi')->nullable(); $table->integer('lelong_tawarruq')->nullable(); + $table->float('tempohbayar', $precision = 10, $scale = 2)->nullable(); $table->timestamps(); }); Schema::create('gadaimarhun', function (Blueprint $table) { $table->bigIncrements('id'); - $table->unsignedBigInteger('gadai_id')->unsigned(); + $table->string('norujukan')->unsigned(); $table->decimal('bil', $precision = 3, $scale = 0); $table->string('marhun'); $table->string('nota'); @@ -122,8 +227,8 @@ class CreateCawangansTable extends Migration $table->decimal('berat', $precision = 7, $scale = 2); $table->timestamps(); - $table->foreign('gadai_id') - ->references('id')->on('gadai') + $table->foreign('norujukan') + ->references('norujukan')->on('gadai') ->onDelete('cascade'); }); } From ec9d4333bf39c40e1d4779cebb677520073550ad Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 1 Mar 2022 11:38:39 +0800 Subject: [PATCH 04/19] update --- app/Http/Controllers/AccountController.php | 82 ++++++++++++++++++- app/Http/Controllers/LelongController.php | 15 ++-- app/Http/Controllers/PaymentController.php | 62 ++++++++------ .../views/account/listbayaranonline.blade.php | 8 -- .../views/account/sahsagonline.blade.php | 79 ++++++++++-------- .../views/pembayaran/SAGBidItem.blade.php | 2 +- .../pembayaran/senarailelongbayaran.blade.php | 2 +- routes/web.php | 3 +- 8 files changed, 173 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 5446db60..59142949 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -12,9 +13,11 @@ use App\Models\Lelong; use App\Models\Payment; use App\Models\LelongBid; use App\Models\LelongBidder; +use App\Models\Resit; class AccountController extends Controller { + public function senarailelongan(){ $user = Auth::user(); @@ -72,10 +75,87 @@ class AccountController extends Controller public function sahsagonline($lelong_id, $user_id){ $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id') ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + ->where('payment.status_payment_opt', 2) + ->get()->toArray(); + + // dd($senaraisag); + + $total_payment = 0; + foreach($senaraisag as $index1=>$sagbid){ + + if($sagbid['total_payment']){ + $total_payment = $total_payment +$sagbid['total_payment']; + } + + // $senaraisag[$index1]['totalPay'] = $total_payment; + } + // dd($senaraisag); + return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment')); + } + + public function sahbayaronline($lelong_id, $user_id){ + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $user = Auth::user(); + + $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + ->where('payment.status_payment_opt', 2) ->get(); - return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id')); + $total_payment = 0; + foreach($senaraisag as $sag) + { + $payment = Payment::where('lelong_id', $lelong_id) + ->where('user_id', $user_id) + ->where('lelongbid_id',$sag->lelongbid_id) + ->first(); + $payment->disahkan_oleh = $user->id; + $payment->disahkan_pada = $currentdate; + $payment->save(); + + $total_payment = $total_payment + $payment->total_payment; + + $updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) + ->first(); + $updatelelbidbidder->status_payment = 1; + $updatelelbidbidder->save(); + + $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first(); + $eachbid->status_jual = 1; + $eachbid->t_jual = $currentdate; + $eachbid->save(); + + + + } + + $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidder.user_id', $user_id) + ->where('lelongbidder.status_bidder', 1) + ->get(); + // dd($senaraisagallpayment); + $resit = Resit::where('id',$payment->resit_id)->first(); + $resit->total_payment = $resit->total_payment + $total_payment; + + if($resit->total_payment >= $senaraisagallpayment->sum('hargabida')) + { + $resit->status = 'PAID'; + $resit->paid_at = $currentdate; + } + $resit->save(); + + return redirect()->route('account.senarailelongan')->with('success','Pembayaran Berjaya'); + } } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 7af9ff84..bd5befaa 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -448,11 +448,13 @@ class LelongController extends Controller $lelongbid = LelongBid::where('lelong_id','=',$id)->get(); foreach($lelongbid as $bid) { - $highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.hargabida DESC' )->get(); + $highestprice = LelongBidder::where('lelongbid_id','=',139)->orderBy('lelongbidder.hargabida','DESC' )->first(); + // dd($highestprice->hargabida); if($highestprice) { - foreach($highestprice as $price){ - $bidders = LelongBidder::where('hargabida','=',$price->hargabida)->MIN('lelongbidder.masa_bidaan' )->get(); + // foreach($highestprice as $price){ + $bidders = LelongBidder::where('lelongbid_id','=',139)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get(); + // dd($bidders); $count = 0; foreach($bidders as $bidder) { @@ -460,11 +462,12 @@ class LelongController extends Controller if($count == 1) { $pemenang = LelongBidder::where('id','=',$bidder->id) - ->first(); + ->first(); $pemenang->status_bidder = 1; $pemenang->save(); - + $updatebid = LelongBid::where('id','=',$bid->id)->first(); + // dd($updatebid); $updatebid->hargajual = $bidder->hargabida; $updatebid->nopembeli = $bidder->user_id; $updatebid->status_jual = 1; @@ -501,7 +504,7 @@ class LelongController extends Controller $kalah->save(); } } - } + // } } else diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 8ba01372..9e9c856a 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -87,25 +87,22 @@ class PaymentController extends Controller 'users.alamat' ) ->first(); - - // foreach($SAGBidItem as $eachbid){ - $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->join('users', 'lelongbidder.user_id', '=', 'users.id') - ->where('lelongbidder.status_bidder', 1) - ->where('users.id', $user_id) - ->where('lelongbid.lelong_id', $lelong_id) - ->select('lelongbidder.hargabida', - 'lelongbid.hargaasas', - 'lelongbid.norujukan', - 'lelongbidder.lelongbid_id', - 'lelongbidder.status_payment' - ) - ->get(); + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.hargabida', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.status_payment' + ) + ->get(); - // } - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id')); + return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id')); } public function paymentdenokaunter(Request $request){ @@ -119,6 +116,7 @@ class PaymentController extends Controller $bid_id = explode(",", $request->eachbid); $resit = Resit::where('lelong_id', $request->lelong_id) + ->where('user_id',$request->user_id) ->first(); $total_hargabida = 0; @@ -135,8 +133,9 @@ class PaymentController extends Controller 'lelongbid.lelong_id as lelong_id' ) ->first(); - + $total_hargabida = $total_hargabida + $eachbid->hargabida; + // dd($total_hargabida); $payment = Payment::create([ 'user_id' => $request->user_id, 'lelongbidder_id' => $eachbid->lelongbidder_id, @@ -166,18 +165,29 @@ class PaymentController extends Controller $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id) ->first(); $updatelelbidbidder->status_payment = 1; - $updatelelbidbidder->update(); + $updatelelbidbidder->save(); - $eachbid->status_jual = 1; - $eachbid->t_jual = $currentdate; - $eachbid->update(); + $eachbidupdate = LelongBid::where('id',$bid)->first(); + $eachbidupdate->status_jual = 1; + $eachbidupdate->t_jual = $currentdate; + $eachbidupdate->save(); } - if($request->amaunkiraan == $total_hargabida){ - $resit->total_payment = $total_hargabida; - $resit->status = 'PAID'; - $resit->paid_at = $currentdate; - $resit->update(); + $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id', $request->lelong_id) + ->where('lelongbidder.user_id', $request->user_id) + ->where('lelongbidder.status_bidder', 1) + ->get(); + // dd(floatval($request->amaunkiraan)); + if(floatval($request->amaunkiraan) == $total_hargabida){ + // dd('hye'); + $resit->total_payment = $resit->total_payment + $total_hargabida; + if($resit->total_payment >= $senaraisagallpayment->sum('hargabida')) + { + $resit->status = 'PAID'; // $resit->status = 'PAID'; when hargabida >= total_payment di resit + $resit->paid_at = $currentdate; + } + $resit->save(); } return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya'); } diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php index a51870bc..eda9db20 100644 --- a/resources/views/account/listbayaranonline.blade.php +++ b/resources/views/account/listbayaranonline.blade.php @@ -20,7 +20,6 @@ Bilangan Surat Jumlah Bidaan(RM) Jumlah Pembayaran(RM) - Penyata Bayaran Action @@ -34,9 +33,6 @@ {{ $winner['total_surat']}} {{ $winner['totalBid']}} {{ $winner['totalPay']}} - - - @@ -58,10 +54,6 @@ { "targets": 7, "orderable": false - }, - { - "targets": 8, - "orderable": false } ], order: [[1, 'asc']], diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php index 55099f87..1d0113e2 100644 --- a/resources/views/account/sahsagonline.blade.php +++ b/resources/views/account/sahsagonline.blade.php @@ -4,48 +4,57 @@
    -
    - @if ($message = Session::get('success')) -
    -

    {{ $message }}

    -
    - @endif - - - - - - - - - - - - - - @foreach($senaraisag as $senaraisag) +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanAction
    + - - - - - - - + + + + + + + - @endforeach - -
    {{ $loop->iteration }} {{ $senaraisag['norujukan']}}{{ $senaraisag['t_lelong']}}{{ $senaraisag['hargaasas']}}{{ $senaraisag['hargabida']}}{{ $senaraisag['masa_bidaan']}} - - NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanStatus
    -
    - Kembali -
    + + + @foreach($senaraisag as $sag) + + {{ $loop->iteration }} + {{ $sag['norujukan'] }} + {{ $sag['t_lelong'] }} + {{ $sag['hargaasas'] }} + {{ $sag['hargabida'] }} + {{ $sag['masa_bidaan'] }} + + PAID + + + @endforeach + + + + Jumlah Bayaran + + RM + + + +
    + Kembali + Sahkan +
    + +@endsection \ No newline at end of file diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php index cce798af..d0880847 100644 --- a/resources/views/marhun/senaraimarhun.blade.php +++ b/resources/views/marhun/senaraimarhun.blade.php @@ -38,6 +38,9 @@ +
    + Kembali +
    diff --git a/routes/web.php b/routes/web.php index f2696643..1e5c568a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -89,7 +89,6 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); - }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { @@ -116,9 +115,10 @@ Route::group(['prefix'=>'lelong'], function () { - +//Khazanah Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () { - Route::get('/senaraimarhun',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); + Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); + Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); Route::get('/deletemarhun/{id}',['as'=>'marhun.delete','uses'=>'MarhunController@delete']); @@ -128,6 +128,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim }); +//Khazanah Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembida'], function () { Route::get('/senaraipembida',['as'=>'pembida.senaraipembida','uses'=>'PembidaController@index']); From 21b90f4fb654bba48258c59866c11e2a50e5cf2a Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:16:52 +0800 Subject: [PATCH 11/19] Update LelongMobileController.php --- .../Mobile/LelongMobileController.php | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 049d0842..a94fc04d 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -53,7 +53,7 @@ class LelongMobileController extends Controller } else { - $lelong[0]['lelongbid'] = []; + $lelong[0]['lelongbid'] = 0; } return response()->json($lelong); @@ -87,7 +87,8 @@ class LelongMobileController extends Controller 'lelongbid.t_lelong', 'lelongbid.nilaimarhun', 'lelongbid.cajlelong', - 'carts.hargabida') + 'carts.hargabida', + 'carts.id as cart_id') ->get(); // dd($selectBid[0]->hargabida); @@ -105,14 +106,28 @@ class LelongMobileController extends Controller $lelongBidder->nilaimarhun = $cart->nilaimarhun; $lelongBidder->cajlelong = $cart->cajlelong; $lelongBidder->masa_bidaan = $currentdate; - $lelongBidder->save(); + if($lelongBidder->save()) + { + $delincart = Cart::where('id',$cart->cart_id)->first(); + $delincart->delete(); + } } - return response()->json("success", 201); + $response = [ + 'success' => "success", + 'message' => "Bidder berjaya disimpan" + ]; + + return response()->json($response, 201); } else if($feepayment == null){ - return response()->json("unsuccess", 201); + + $errors = [ + 'success' => "error", + 'message' => "Something wrong with the server" + ]; + return response()->json($response, 201); } } From 052dfdc205258ff186bd5cd295b05e47ae6758e5 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 1 Mar 2022 17:00:04 +0800 Subject: [PATCH 12/19] add toggle --- resources/views/account/listbayaranonline.blade.php | 7 ++++++- resources/views/account/senarailelongan.blade.php | 7 ++++++- resources/views/lelong/senarailelong.blade.php | 6 +++--- resources/views/lelong/senaraipemenang.blade.php | 7 ++++++- resources/views/lelong/senaraisagpemenang.blade.php | 4 ---- resources/views/marhun/marhun.blade.php | 12 ++++++++++-- resources/views/marhun/senarailelongmarhun.blade.php | 7 ++++++- resources/views/marhun/senaraimarhun.blade.php | 8 ++++++-- resources/views/pengurusanpengguna/index.blade.php | 6 +++++- routes/web.php | 4 ++++ 10 files changed, 52 insertions(+), 16 deletions(-) diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php index eda9db20..9d27bcbf 100644 --- a/resources/views/account/listbayaranonline.blade.php +++ b/resources/views/account/listbayaranonline.blade.php @@ -34,7 +34,7 @@ {{ $winner['totalBid']}} {{ $winner['totalPay']}} - + @endforeach @@ -45,6 +45,11 @@ +@endsection diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php new file mode 100644 index 00000000..8045420a --- /dev/null +++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php @@ -0,0 +1,134 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + +
    + @csrf + + + + + + + + + + + + + + + @foreach ($alluser as $user) + + + + + + + + + @endforeach + + +
    NamaNumber PhoneEmailStatusAction
    {{ $user->name }}{{ $user->notelbimbit }}{{ $user->email }} + @if ($user->status =='active') + + @elseif ($user->status =='banned') + + @else ($user->status == null) + Menunggu Pengesahan Operasi + @endif + + +
    +
    +
    + +
    +
    + + +@endsection From cc808507963b9000bdc501b326c9fa93cded8b81 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 2 Mar 2022 11:24:54 +0800 Subject: [PATCH 14/19] add tooltip --- app/Http/Controllers/LelongController.php | 5 ++--- resources/views/jananotis/notislelong.blade.php | 10 ++++++++-- resources/views/jananotis/senarainotis.blade.php | 3 +++ resources/views/lelong/lelongtaklaku.blade.php | 14 +++++++++++--- resources/views/lelong/senarailelong.blade.php | 2 +- .../views/lelong/senarailelongtaklaku.blade.php | 7 ++++++- resources/views/pembayaran/SAGBidItem.blade.php | 1 + .../views/pembayaran/kaunterpembayaran.blade.php | 8 ++++++-- .../pembayaran/senarailelongbayaran.blade.php | 6 +++++- resources/views/pembida/senaraipembida.blade.php | 7 ++++++- .../pembida/senaraipembidakeseluruhan.blade.php | 9 +++++++-- .../views/pengurusandatabase/senaraidb.blade.php | 8 ++++++-- resources/views/pengurusandatabase/show.blade.php | 4 ++++ resources/views/pengurusanpengguna/index.blade.php | 2 +- resources/views/pengurusanpengguna/roles.blade.php | 8 ++++++-- resources/views/pengurusanpengguna/taraf.blade.php | 8 ++++++-- resources/views/serahan/laporanserahan.blade.php | 11 ++++++++++- resources/views/serahan/pembayaran.blade.php | 11 +++++++++-- resources/views/simulasi/senaraisimulasi.blade.php | 8 ++++++-- routes/web.php | 1 + 20 files changed, 105 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 53ad1b72..28290951 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -566,11 +566,8 @@ class LelongController extends Controller public function senarailelongtaklaku(Request $request){ - $user = Auth::user(); - $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) ->get(); return view('lelong.senarailelongtaklaku',compact('senarai')); @@ -583,6 +580,7 @@ class LelongController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->whereNull('t_jual') ->select( + 'lelongbid.norujukan', 'lelongbid.t_lelong', 'lelongbid.kodcaw', 'cawangan.caw_name', @@ -601,6 +599,7 @@ class LelongController extends Controller $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') ->where('lelongbid.lelong_id', $lelong_id) + ->where('status_jual', '=', 1) ->whereNull('t_jual') ->get(); diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php index 77fddc7b..192be8f6 100644 --- a/resources/views/jananotis/notislelong.blade.php +++ b/resources/views/jananotis/notislelong.blade.php @@ -29,8 +29,8 @@ {{ $bid->lelong_id}} {{ $bid->tarikh_lelong }} - - + + @endforeach @@ -43,4 +43,10 @@ + @endsection diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index 80aff8a2..8edaeb09 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -35,6 +35,9 @@ @endforeach +
    + Kembali +
    diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 82d12758..d3780795 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -17,7 +17,7 @@ No Tarikh Lelong - Kod Cawangan + No Rujukan Nama Cawangan Bilangan Pinjaman (RM) @@ -38,7 +38,7 @@ {{ $loop->iteration }} {{ $leltaklaku->t_lelong }} - {{ $leltaklaku->kodcaw }} + {{ $leltaklaku->norujukan }} {{ $leltaklaku->caw_name }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }} @@ -64,7 +64,7 @@ TIDAK LAKU @endif - + @@ -76,12 +76,20 @@ +
    + Kembali +
    + @endsection diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php index e3666b03..594ec942 100644 --- a/resources/views/serahan/pembayaran.blade.php +++ b/resources/views/serahan/pembayaran.blade.php @@ -32,8 +32,8 @@ {{ $pay['totalBid']}} {{-- --}} - - + + @@ -42,10 +42,17 @@ @endforeach +
    + Kembali +
    @endsection diff --git a/routes/web.php b/routes/web.php index 6cb554b9..0ccc9249 100644 --- a/routes/web.php +++ b/routes/web.php @@ -139,7 +139,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/sahkanpembida/{id}',['as'=>'pembida.sah','uses'=>'PembidaController@sah']); Route::post('/reject',['as'=>'pembida.reject','uses'=>'PembidaController@reject']); Route::get('/kemaskini/{id}',['as'=>'pembida.kemaskini','uses'=>'PembidaController@kemaskini']); - Route::post('/update/{id}',['as'=>'pembida.update','uses'=>'PembidaController@update']); + Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']); }); //Operasi From f523a15e7ec6d5e00c61b2172de28c9f51689e84 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 2 Mar 2022 14:52:28 +0800 Subject: [PATCH 17/19] update table gadai --- .../migrations/2021_12_13_053311_create_cawangans_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index 402b4012..af308e8d 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -130,7 +130,7 @@ class CreateCawangansTable extends Migration $table->string('f_lulus')->nullable(); $table->string('tag')->nullable(); $table->decimal('jbg', $precision = 9, $scale = 2); - $table->decimal('bakijpm', $precision = 7, $scale = 2); + $table->decimal('bakipjm', $precision = 7, $scale = 2); $table->decimal('bakiupah', $precision = 7, $scale = 2)->nullable(); $table->decimal('cajlain', $precision = 7, $scale = 2)->nullable(); $table->string('marhun')->nullable(); From 2623c78ba3875a45f0b169caf455960c7b097996 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Wed, 2 Mar 2022 14:54:17 +0800 Subject: [PATCH 18/19] Update LelongMobileController.php --- app/Http/Controllers/Mobile/LelongMobileController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index a94fc04d..164d78df 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -53,7 +53,7 @@ class LelongMobileController extends Controller } else { - $lelong[0]['lelongbid'] = 0; + $lelong[0]['lelongbid'] = []; } return response()->json($lelong); From c172974aff585add4c1cd123fa299151bc1c0ead Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 2 Mar 2022 15:00:33 +0800 Subject: [PATCH 19/19] update table --- .../migrations/2021_12_13_053311_create_cawangans_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index af308e8d..7dadcf22 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -140,7 +140,7 @@ class CreateCawangansTable extends Migration $table->string('kodgl')->nullable(); $table->integer('taglel')->nullable(); $table->integer('instno')->nullable(); - $table->integer('currlnstno')->nullable(); + $table->integer('currInstno')->nullable(); $table->decimal('ansakhir', $precision = 7, $scale = 2)->nullable(); $table->decimal('ansupahakhir', $precision = 7, $scale = 2)->nullable(); $table->decimal('jumupahaz', $precision = 7, $scale = 2)->nullable();