From 6f157d5960a1f9880c0510a962c4ec684d2abb64 Mon Sep 17 00:00:00 2001 From: Ibrahim Khail Shakil Date: Mon, 18 Dec 2023 13:14:39 +0600 Subject: [PATCH] added changes to cart and checkout page --- app/Http/Controllers/CartController.php | 2 +- .../Students/DashboardController.php | 2 +- .../Students/ProfileController.php | 13 +++---- resources/views/frontend/cart.blade.php | 5 ++- resources/views/frontend/checkout.blade.php | 37 +++++++++++++------ resources/views/students/dashboard.blade.php | 4 +- routes/web.php | 22 ++--------- 7 files changed, 42 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 9e38cdd..0e0fb26 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -111,6 +111,6 @@ public function coupon_check(Request $request){ ); session()->put('cart_details', $coupondata); } - return redirect()->back()->with('success', 'Product added to cart successfully!'); + return redirect()->back()->with('success', 'Coupon Applied successfully!'); } } diff --git a/app/Http/Controllers/Students/DashboardController.php b/app/Http/Controllers/Students/DashboardController.php index 4d1eb1d..f79adf0 100644 --- a/app/Http/Controllers/Students/DashboardController.php +++ b/app/Http/Controllers/Students/DashboardController.php @@ -14,7 +14,7 @@ class DashboardController extends Controller public function index() { $student_info = Student::find(currentUserId()); - $enrollment = Enrollment::get(); + $enrollment = Enrollment::where('student_id', currentUserId())->get(); $course = Course::get(); $checkout = Checkout::get(); // $purchaseHistory = Enrollment::with(['course', 'checkout'])->orderBy('enrollment_date', 'desc')->get(); diff --git a/app/Http/Controllers/Students/ProfileController.php b/app/Http/Controllers/Students/ProfileController.php index edf964c..6a5ca9d 100644 --- a/app/Http/Controllers/Students/ProfileController.php +++ b/app/Http/Controllers/Students/ProfileController.php @@ -11,14 +11,14 @@ class ProfileController extends Controller { public function index() { - $student_info=Student::find(currentUserId()); - return view('students.profile',compact('student_info')); + $student_info = Student::find(currentUserId()); + return view('students.profile', compact('student_info')); } public function save_profile(Request $request) { try { - $data=Student::find(currentUserId()); + $data = Student::find(currentUserId()); $data->name_en = $request->fullName_en; $data->contact_en = $request->contactNumber_en; $data->email = $request->emailAddress; @@ -36,7 +36,7 @@ public function save_profile(Request $request) $request->image->move(public_path('uploads/students'), $imageName); $data->image = $imageName; } - if ($data->save()){ + if ($data->save()) { $this->setSession($data); return redirect()->back()->with('success', 'Data Saved'); } @@ -55,7 +55,7 @@ public function change_password(Request $request) if (!Hash::check($request->current_password, $data->password)) { return redirect()->back()->with('error', 'Current password is incorrect.'); } - + // Proceed with password change $data->password = Hash::make($request->password); $data->language = 'en'; @@ -77,7 +77,7 @@ public function setSession($student) 'userName' => encryptor('encrypt', $student->name_en), 'emailAddress' => encryptor('encrypt', $student->email), 'studentLogin' => 1, - 'image' => $student->image ?? 'No Image Found' + 'image' => $student->image ?? 'No Image Found' ] ); } @@ -103,5 +103,4 @@ public function changeImage(Request $request) return redirect()->back()->with('error', 'An error occurred. Please try again.'); } } - } diff --git a/resources/views/frontend/cart.blade.php b/resources/views/frontend/cart.blade.php index b3b80de..21dcefa 100644 --- a/resources/views/frontend/cart.blade.php +++ b/resources/views/frontend/cart.blade.php @@ -36,7 +36,7 @@

By {{$details['instructor']}}

-

{{$details['quantity']}} +

{{$details['price'] ? '$' . $details['price'] : 'Free'}} {{$details['old_price'] ? '$' . $details['old_price'] : ''}}

@@ -61,9 +61,10 @@
Coupon Discount ({{session('cart_details')['discount'] ?? 0.00}}%)

{{'$' . number_format((float) isset(session('cart_details')['discount_amount']) ? session('cart_details')['discount_amount']: 0.00 , 2)}}

+ {{ array_key_exists('discount_amount', session('cart_details')) ?number_format(session('cart_details')['discount_amount'], 2) : ' 0.00' }}
-
Taxes
+
Taxes (15%)

{{'$' . number_format((float) session('cart_details')['tax'] , 2)}}

diff --git a/resources/views/frontend/checkout.blade.php b/resources/views/frontend/checkout.blade.php index dd4a66f..e6694bc 100644 --- a/resources/views/frontend/checkout.blade.php +++ b/resources/views/frontend/checkout.blade.php @@ -15,12 +15,12 @@
- +
@if(request()->session()->get('studentLogin')) - +
Checkout
@@ -31,13 +31,14 @@
@csrf
-
-
-
@@ -83,19 +84,31 @@

  • Subtotal

    -

    {{'$' . number_format((float) session('cart_details')['cart_total'] , 2)}}

    + {{--

    {{'$' . number_format((float) session('cart_details')['cart_total'] , 2)}} +

    --}} + {{ '$' . (session('cart_details') && array_key_exists('cart_total', + session('cart_details')) ? number_format(session('cart_details')['cart_total'], 2) : + '0.00') }}
  • -

    Coupon Discount ({{session('cart_details')['discount'] ?? 0.00}}%)

    -

    {{'$' . number_format((float) isset(session('cart_details')['discount_amount']) ? session('cart_details')['discount_amount']: 0.00 , 2)}}

    +

    Coupon Discount ({{session('cart_details')['discount'] ?? 0.00}}%)

    +

    {{'$' . number_format((float) isset(session('cart_details')['discount_amount']) ? + session('cart_details')['discount_amount']: 0.00 , 2)}}

  • -

    taxes

    -

    {{'$' . number_format((float) session('cart_details')['tax'] , 2)}}

    +

    Taxes (15%)

    + {{--

    {{'$' . number_format((float) session('cart_details')['tax'] , 2)}}

    --}} + {{ '$' . (session('cart_details') && array_key_exists('tax', + session('cart_details')) ? number_format(session('cart_details')['tax'], 2) : + '0.00') }}

  • Total:

    -

    {{'$' . number_format((float) session('cart_details')['total_amount'] , 2)}}

    + {{--

    {{'$' . + number_format((float)session('cart_details')['total_amount'] , 2)}}

    --}} + {{ '$' . (session('cart_details') && array_key_exists('total_amount', + session('cart_details')) ? number_format(session('cart_details')['total_amount'], 2) + : '0.00') }}
diff --git a/resources/views/students/dashboard.blade.php b/resources/views/students/dashboard.blade.php index 2890de4..a91e5bd 100644 --- a/resources/views/students/dashboard.blade.php +++ b/resources/views/students/dashboard.blade.php @@ -208,8 +208,8 @@ class="contentCard-user d-flex align-items-center">
@empty -
-
+
+

You haven't enrolled any course yet

diff --git a/routes/web.php b/routes/web.php index 8b3bac8..467e20f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -88,9 +88,6 @@ Route::post('/profile/savePass', [stu_profile::class, 'change_password'])->name('change_password'); Route::post('/change-image', [stu_profile::class, 'changeImage'])->name('change_image'); - /* ssl payment */ - Route::post('/payment/ssl/notify', [sslcz::class, 'notify'])->name('payment.ssl.notify'); - Route::post('/payment/ssl/cancel', [sslcz::class, 'cancel'])->name('payment.ssl.cancel'); // ssl Routes Route::post('/payment/ssl/submit', [sslcz::class,'store'])->name('payment.ssl.submit'); }); @@ -103,21 +100,23 @@ Route::get('watchCourse/{id}', [course::class, 'watchCourse'])->name('watchCourse'); - Route::get('instructorProfile/{id}', [instructor::class, 'frontShow'])->name('instructorProfile'); Route::get('checkout', [checkout::class, 'index'])->name('checkout'); Route::post('checkout', [checkout::class, 'store'])->name('checkout.store'); - // Cart Route::get('/cart_page', [CartController::class, 'index']); Route::get('cart', [CartController::class, 'cart'])->name('cart'); Route::get('add-to-cart/{id}', [CartController::class, 'addToCart'])->name('add.to.cart'); Route::patch('update-cart', [CartController::class, 'update'])->name('update.cart'); Route::delete('remove-from-cart', [CartController::class, 'remove'])->name('remove.from.cart'); + // Coupon Route::post('coupon_check', [CartController::class, 'coupon_check'])->name('coupon_check'); +/* ssl payment */ +Route::post('/payment/ssl/notify', [sslcz::class, 'notify'])->name('payment.ssl.notify'); +Route::post('/payment/ssl/cancel', [sslcz::class, 'cancel'])->name('payment.ssl.cancel'); Route::get('/about', function () { return view('frontend.about'); @@ -126,16 +125,3 @@ Route::get('/contact', function () { return view('frontend.contact'); })->name('contact'); - -// Route::get('/cart', function () { -// return view('frontend.cart'); -// })->name('cart'); - -// Route::get('/instructorProfile', function () { -// return view('frontend.instructorProfile'); -// })->name('instructorProfile'); - - - // Route::get('/studentProfile', function () { - // return view('frontend.studentProfile'); - // })->name('studentProfile'); \ No newline at end of file