diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 87f2ed38..b76dfd01 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -7,7 +7,10 @@ use App\Models\Lelong; use App\Models\LelongBid; use App\Models\LelongBidder; use App\Models\LelongBidMarhun; +use App\Models\Payment; use App\Models\User; +use Carbon\Carbon; +use Illuminate\Support\Facades\Auth; class PaymentController extends Controller { @@ -85,13 +88,15 @@ class PaymentController extends Controller } public function paymentdenokaunter(Request $request){ - //status_payment = 1 ->update deno into payment - dd($request->all()); + // dd($request->all()); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); $user = Auth::user(); $bid_id = explode(",", $request->eachbid); - // dd($bid_id); + foreach($bid_id as $bid){ $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -104,15 +109,16 @@ class PaymentController extends Controller 'lelongbidder.id as lelongbidder_id' ) ->first(); - // dd($eachbid); + $payment = Payment::create([ 'user_id' => $request->user_id, 'lelongbidder_id' => $eachbid->lelongbidder_id, 'lelongbid_id' => $bid, 'kodcaw' => $user->kodcaw, 'status_payment_opt' => 1, - 'status' => 'PAID', + 'status' => 2, 'remark' => 'BAYARAN DI KAUNTER', + 'resit_id' => 1, 'total_payment' => $request->amaunkiraan, '1sen' => $request->ambilansen1, '5sen' => $request->ambilansen5, @@ -125,14 +131,19 @@ class PaymentController extends Controller 'rm20' => $request->ambilanring20, 'rm50' => $request->ambilanring50, 'rm100' => $request->ambilanring100, + 'disahkan_oleh' => $user->id, + 'disahkan_pada' => $currentdate ]); + $updatelelbidbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->update(array( + 'lelongbid.status_jual' => 1, + 'lelongbid.t_jual' => $currentdate + )); } - // $payment = new Payment; - // $payment->ambilan - // + return redirect()->route('pembayaran.SenaraiLelongBayar'); } public function pengesahanPembayaran(Request $request){ diff --git a/app/Models/payment.php b/app/Models/payment.php index c15ecd7a..08a23d51 100644 --- a/app/Models/payment.php +++ b/app/Models/payment.php @@ -16,7 +16,6 @@ class payment extends Model 'lelongbidder_id', 'lelongbid_id', 'kodcaw', - 'total_payment', 'back_acc_pembeli', 'bank_acc_no_pembeli', 'nama_bank_acc_caw', @@ -24,6 +23,20 @@ class payment extends Model 'status_payment_opt', 'resit_id', 'status', - 'remark' + 'remark', + '1sen', + '5sen', + '10sen', + '20sen', + '50sen', + 'rm1', + 'rm5', + 'rm10', + 'rm20', + 'rm50', + 'rm100', + 'total_payment', + 'disahkan_pada', + 'disahkan_oleh' ]; } 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 8497ce96..2808a919 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -27,18 +27,20 @@ class CreatePaymentTable extends Migration $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); - $table->integer('1sen'); - $table->integer('5sen'); - $table->integer('10sen'); - $table->integer('20sen'); - $table->integer('50sen'); - $table->integer('rm1'); - $table->integer('rm5'); - $table->integer('rm10'); - $table->integer('rm20'); - $table->integer('rm50'); - $table->integer('rm100'); + $table->integer('1sen')->nullable(); + $table->integer('5sen')->nullable(); + $table->integer('10sen')->nullable(); + $table->integer('20sen')->nullable(); + $table->integer('50sen')->nullable(); + $table->integer('rm1')->nullable(); + $table->integer('rm5')->nullable(); + $table->integer('rm10')->nullable(); + $table->integer('rm20')->nullable(); + $table->integer('rm50')->nullable(); + $table->integer('rm100')->nullable(); $table->decimal('total_payment', $precision = 11, $scale = 2); + $table->datetime('disahkan_pada')->nullable(); + $table->integer('disahkan_oleh')->nullable(); $table->timestamps(); $table->foreign('user_id') diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 87354b7c..925d8758 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -49,10 +49,10 @@ class RolesSeeder extends Seeder ]); //teller - Permission::create([ - 'name' => 'pengesahanbayarancash', - 'description' => 'Pengesahan bayaran pembida di cawangan (cash)' - ]); + // Permission::create([ + // 'name' => 'pengesahanbayarancash', + // 'description' => 'Pengesahan bayaran pembida di cawangan (cash)' + // ]); //pengurus cawangan Permission::create([ @@ -64,8 +64,8 @@ class RolesSeeder extends Seeder 'description' => 'Jana Notis Lelong' ]); Permission::create([ - 'name' => 'pengesahanpembayaranpc', - 'description' => 'Pengesahan Pembayaran Bagi PC' + 'name' => 'pengesahanbayarancash', + 'description' => 'Pengesahan bayaran pembida di cawangan (cash)' ]); //jurulelong @@ -132,12 +132,13 @@ class RolesSeeder extends Seeder $role2->givePermissionTo('kemaskinimarhun'); $role3 = Role::create(['name' => 'teller']); - $role3->givePermissionTo('pengesahanbayarancash'); + // $role3->givePermissionTo('pengesahanbayarancash'); $role4 = Role::create(['name' => 'pengurus-cawangan']); $role4->givePermissionTo('pendaftaranpembida'); $role4->givePermissionTo('jananotis'); - $role4->givePermissionTo('pengesahanpembayaranpc'); + $role4->givePermissionTo('pengesahanbayarancash'); + $role5 = Role::create(['name' => 'jurulelong']); $role5->givePermissionTo('pendaftaranbatch'); diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index f0fe981b..00956dd2 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -158,12 +158,19 @@ +