fix pay now option

Author: itsemon245

app/Http/Controllers/PaymentController.php

@@ -21,15 +21,16 @@ public function index(): View
     {
         return view('frontend.payment.index');
     }
-    public function create(string $model, string $id): View
+    public function create(string $model, string $id, $purchase_id = null): View
     {
         $table          = str(str($model)->snake())->plural();
         $record         = DB::table($table)->find($id);
         $incomeSources  = IncomeSource::latest()->get();
         $paymentMethods = Setting::select('payment')->first()->pluck('payment')[ 0 ];
-        return view('frontend.pages.payment.create', compact('model', 'id', 'record', 'incomeSources', 'paymentMethods'));
+        $purchase = Purchase::find($purchase_id);
+        return view('frontend.pages.payment.create', compact('model', 'id', 'record', 'incomeSources', 'paymentMethods', 'purchase'));
     }
-    public function store(Request $request)
+    public function store(Request $request, $purchase_id = null)
     {
         $request->validate([
             'purchasable_type' => 'required',
@@ -125,7 +126,10 @@ public function store(Request $request)
                 $status = 'partial';
             }
 
-            Purchase::create([
+            Purchase::updateOrCreate([
+                'id' => $request->purchase_id
+            ],
+                [
                 'user_id'                => auth()->id(),
                 'name'                   => $request->name,
                 'promo_code_id'          => $promoCode->id ?? null,

app/Providers/RouteServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Models\Purchase;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Cache\RateLimiting\Limit;
@@ -41,6 +42,16 @@ public function boot(): void
             Route::middleware('web')
                 ->group(base_path('routes/web.php'));
         });
+
+        Route::bind('purchase_id', function (string $value) {
+            $purchaseId = $value;
+            try{
+                $purchaseId = decrypt($value);
+            }catch(\Exception $e){
+                $purchaseId = $value;
+            }
+            return $purchaseId;
+        });
     }
 
     /**

resources/views/frontend/pages/payment/create.blade.php

@@ -33,7 +33,7 @@
     </style>
 @endPushOnce
 @section('main')
-    <form action="{{ route('payment.store') }}" method="post" class="my-3">
+    <form action="{{ route('payment.store', ['purchase_id' => encrypt($purchase?->id)]) }}" method="post" class="my-3">
         @csrf
 
         @if ($model === Product::class)
@@ -143,7 +143,7 @@ class="badge bg-soft-success text-success mb-0">{{ $model }}</span>
                                         <div class="row my-2">
                                             <label for="amoutn-to-pay" class="d-block fs-3 fw-medium">Amount To Pay</label>
                                             <input id="amount-to-pay" name="paid_amount" type="text"
-                                                value="{{ $record->price }}"
+                                                value="{{ $purchase ? $purchase->due : $record->price }}"
                                                 class=" text-center border-success rounded-3 fs-2 fw-bold py-5">
                                         </div>
 
@@ -154,7 +154,8 @@ class=" text-center border-success rounded-3 fs-2 fw-bold py-5">
                                         <div class="row">
                                             <div class="col-12">
                                                 @if (auth()->user() === null)
-                                                    <h6 class="text-success text-center fw-bold fs-5">Please create an account to
+                                                    <h6 class="text-success text-center fw-bold fs-5">Please create an
+                                                        account to
                                                         perform this action</h6>
                                                 @endif
                                             </div>

resources/views/frontend/pages/purchasesItems/purchases.blade.php

@@ -13,26 +13,20 @@
             @forelse ($purchaseItem  as $item)
                 <div class="h-100" style="width: max-content;">
                     <div class="w-100 h-100 rounded-2 h-100" style="overflow: hidden;">
-                        <div class="align-items-center border p-3">
+                        <div class="align-items-center border p-3 h-100">
                             <div class="row gap-4 align-items-center justify-content-center mb-3">
-                                <div style="width: max-content;">
+                                <div
+                                    class="d-flex {{ $item->due >= 1 ? 'justify-content-between gap-2' : 'justify-content-center' }}  align-items-center">
                                     <div
-                                        class="ms-auto fw-bold mb-2 text-center {{ $item->approved == 1 ? 'text-success' : 'text-danger' }}">
-                                        {{ $item->approved == 1 ? 'Approved.' : 'Waiting for Approval.' }}
+                                        class="py-2 fw-bold text-center {{ $item->approved == 1 ? 'text-success' : 'text-danger' }}">
+                                        {{ $item->approved == 1 ? 'Approved' : ($item->due >= 1 ? 'Waiting for Payment' : 'Waiting for Approval') }}
                                     </div>
-                                    @if ($item->due > 0)
-                                        <form action="{{ route('payment.pay.now', $item) }}" method="post"
-                                            class="d-flex gap-4 align-items-center">
-                                            @csrf
-                                            <input class="form-control px-3 py-2 border-focus-2" style="width: 150px;"
-                                                name="trx_id" label="Trx ID" placeholder="Trx ID" required />
-                                            @error('trx_id')
-                                                <div class="text-danger">{{ $message }}</div>
-                                            @enderror
-                                            <button class="btn btn-primary text-white" style="font-weight: 500;">Pay
-                                                Now</button>
-                                        </form>
+                                    @if ($item->due >= 1)
+                                        <a href="{{ route('payment.create', ['model' => $item->purchasable_type, 'id' => $item->purchasable_id, 'purchase_id' => encrypt($item->id)]) }}"
+                                            class="btn btn-primary text-white" style="font-weight: 500;">Pay
+                                            Now</a>
                                     @endif
+
                                 </div>
                             </div>
                             <div class="text-muted text-start">

routes/frontend.php

@@ -173,12 +173,12 @@
     ->name('payment.')
     ->controller(PaymentController::class)
     ->group(function () {
-        Route::get('create/{model}/{id}', 'create')->name('create');
-        Route::post('store/', 'store')->name('store');
+        Route::get('create/{model}/{id}/{purchase_id?}', 'create')->name('create');
+        Route::post('store/{purchase_id?}', 'store')->name('store');
         Route::post('later/', 'later')->name('later');
         Route::get('success/{model}/{id}', 'success')->name('success');
         Route::get('cancel', 'cancel')->name('cancel');
-        Route::post('pay-now/{purchase}', 'payNow')->name('pay.now');
+        // Route::post('pay-now/{purchase_id?}', 'payNow')->name('pay.now');
     });