Compare commits

..

No commits in common. "9a23e75f5b338d62bfadcb9f81461fc6b30e673c" and "8c21d4dc7c9ee2cfd5526dc1c1b18b2da0bf63c6" have entirely different histories.

6 changed files with 353 additions and 823 deletions

View File

@ -16,7 +16,7 @@ class CartController extends Controller
$count = $repository->getCount($request->input('location_id')); $count = $repository->getCount($request->input('location_id'));
return response()->json([ return response()->json([
'count' => $count, 'count' => $count
]); ]);
} }
@ -79,18 +79,4 @@ class CartController extends Controller
return redirect()->route('cart.index'); return redirect()->route('cart.index');
} }
public function clear(MemberCartRepository $repository)
{
$repository->clearAll();
if (request()->expectsJson()) {
return response()->json([
'success' => true,
'message' => 'Cart cleared successfully'
]);
}
return redirect()->route('cart.index');
}
} }

View File

@ -13,19 +13,9 @@ class MemberCartRepository
$location = $locationId ?? session('location_id', 22); $location = $locationId ?? session('location_id', 22);
return Cart::where('user_id', auth()->user()->id) return Cart::where('user_id', auth()->user()->id)
->where('location_id', $location) ->where('location_id', $location)
->sum('qty'); ->count();
} }
static public function clearAll($locationId = null)
{
$location = $locationId ?? session('location_id', 22);
return Cart::where('user_id', auth()->user()->id)
->where('location_id', $location)
->delete();
}
public function getList($request) public function getList($request)
{ {
$location = (int) $request->input("location_id"); $location = (int) $request->input("location_id");

View File

@ -56,42 +56,27 @@
<th scope="col" class="py-0 px-0"> <th scope="col" class="py-0 px-0">
<div class="nav justify-content-end"> <div class="nav justify-content-end">
<button type="button" <button type="button"
class="nav-link d-inline-block text-decoration-underline text-nowrap py-3 px-0" class="nav-link d-inline-block text-decoration-underline text-nowrap py-3 px-0">Clear
onclick="clearCart()">Clear
cart</button> cart</button>
</div> </div>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody class="align-middle"> <tbody class="align-middle">
@if ($carts->count() == 0)
<tr>
<td colspan="5" class="text-center py-5">
<div class="py-4">
<i class="ci-shopping-bag text-muted" style="font-size: 3rem;"></i>
<h5 class="mt-3 mb-2">Your cart is empty</h5>
<p class="text-muted mb-4">Looks like you haven't added any items to your
cart yet.</p>
<a href="{{ route('home') }}" class="btn btn-primary">
<i class="ci-shopping-bag me-2"></i>Start Shopping
</a>
</div>
</td>
</tr>
@else
@foreach ($carts as $key => $cart) @foreach ($carts as $key => $cart)
<tr data-cart-id="{{ $cart->id }}"> <tr>
<td class="py-3 ps-0"> <td class="py-3 ps-0">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<a class="flex-shrink-0" <a class="flex-shrink-0"
href="{{ route('product.detail', $cart->itemVariant->item->slug) }}"> href="{{ route('second', ['shop', 'product-general-electronics']) }}">
<img src="{{ $cart->itemReference->item->image_url ?? '' }}" <img src="{{ $cart->itemReference->item->image_url ?? '' }}" width="110"
width="110" alt="{{ $cart->name ?? 'Product' }}"> alt="{{ $cart->name ?? 'Product' }}">
</a> </a>
<div class="w-100 min-w-0 ps-2 ps-xl-3"> <div class="w-100 min-w-0 ps-2 ps-xl-3">
<h5 class="d-flex animate-underline mb-2"> <h5 class="d-flex animate-underline mb-2">
<a class="d-block fs-sm fw-medium text-truncate animate-target" <a class="d-block fs-sm fw-medium text-truncate animate-target"
href="{{ $cart->itemVariant->item->slug != null ? route('product.detail', [$cart->item->slug]) : '#' }}">{{ $cart->itemVariant->display_name ?? ($cart->itemVariant->description ?? 'Product Name') }}</a> href="{{ $cart->itemVariant->item->slug != null ? route('product.detail', [$cart->item->slug]) : '#' }}">{{ $cart->itemVariant->display_name ?? $cart->itemVariant->description ?? 'Product Name' }}</a>
</h5> </h5>
{{-- <ul class="list-unstyled gap-1 fs-xs mb-0"> {{-- <ul class="list-unstyled gap-1 fs-xs mb-0">
<li><span class="text-body-secondary">Color:</span> <span <li><span class="text-body-secondary">Color:</span> <span
@ -104,14 +89,14 @@
</li> </li>
</ul> --}} </ul> --}}
<div class="count-input rounded-2 d-md-none mt-3"> <div class="count-input rounded-2 d-md-none mt-3">
<button type="button" class="btn btn-sm btn-icon" <button type="button" class="btn btn-sm btn-icon" data-decrement
data-decrement aria-label="Decrement quantity"> aria-label="Decrement quantity">
<i class="ci-minus"></i> <i class="ci-minus"></i>
</button> </button>
<input type="number" class="form-control form-control-sm" <input type="number" class="form-control form-control-sm"
value="{{ $cart->qty ?? 1 }}" readonly> value="{{ $cart->qty ?? 1 }}" readonly>
<button type="button" class="btn btn-sm btn-icon" <button type="button" class="btn btn-sm btn-icon" data-increment
data-increment aria-label="Increment quantity"> aria-label="Increment quantity">
<i class="ci-plus"></i> <i class="ci-plus"></i>
</button> </button>
</div> </div>
@ -119,32 +104,24 @@
</div> </div>
</td> </td>
<td class="h6 py-3 d-none d-xl-table-cell" > <td class="h6 py-3 d-none d-xl-table-cell" >
<input type="hidden" id="price_{{ $cart->id }}" <input type="hidden" id="price_{{ $cart->id }}" value="{{ $cart->itemVariant->display_price ?? 0 }}">
value="{{ $cart->itemVariant->display_price ?? 0 }}"> Rp {{ number_format($cart->itemVariant->display_price ?? 0, 0,",",".") }}</td>
Rp {{ number_format($cart->itemVariant->display_price ?? 0, 0, ',', '.') }}
</td>
<td class="py-3 d-none d-md-table-cell"> <td class="py-3 d-none d-md-table-cell">
<div class="count-input"> <div class="count-input">
<button type="button" class="btn btn-icon" data-decrement <button type="button" class="btn btn-icon" data-decrement
aria-label="Decrement quantity" aria-label="Decrement quantity" onclick="updateCartItem({{ $cart->id }}, 'decrement', this)">
onclick="updateCartItem({{ $cart->id }}, 'decrement', this)">
<i class="ci-minus"></i> <i class="ci-minus"></i>
</button> </button>
<input type="number" class="form-control" <input type="number" class="form-control" value="{{ $cart->qty ?? 1 }}" readonly>
value="{{ $cart->qty ?? 1 }}" readonly>
<button type="button" class="btn btn-icon" data-increment <button type="button" class="btn btn-icon" data-increment
aria-label="Increment quantity" aria-label="Increment quantity" onclick="updateCartItem({{ $cart->id }}, 'increment', this)">
onclick="updateCartItem({{ $cart->id }}, 'increment', this)">
<i class="ci-plus"></i> <i class="ci-plus"></i>
</button> </button>
</div> </div>
</td> </td>
<td class="h6 py-3 d-none d-md-table-cell total-row">Rp <td class="h6 py-3 d-none d-md-table-cell total-row">Rp {{ number_format(($cart->display_price ?? 0) * ($cart->qty ?? 1), 0,",",".") }}</td>
{{ number_format(($cart->display_price ?? 0) * ($cart->qty ?? 1), 0, ',', '.') }}
</td>
<td class="text-end py-3 px-0"> <td class="text-end py-3 px-0">
<form action="{{ route('cart.delete', $cart->id) }}" method="POST" <form action="{{ route('cart.delete', $cart->id) }}" method="POST" onsubmit="deleteCartItem(event, this, {{ $cart->id }})">
onsubmit="deleteCartItem(event, this, {{ $cart->id }})">
@csrf @csrf
@method('DELETE') @method('DELETE')
<button type="submit" class="btn-close fs-sm" data-bs-toggle="tooltip" <button type="submit" class="btn-close fs-sm" data-bs-toggle="tooltip"
@ -154,13 +131,13 @@
</td> </td>
</tr> </tr>
@endforeach @endforeach
@endif
</tbody> </tbody>
</table> </table>
<div class="nav position-relative z-2 mb-4 mb-lg-0"> <div class="nav position-relative z-2 mb-4 mb-lg-0">
<a class="nav-link animate-underline px-0" href="{{ route('home') }}"> <a class="nav-link animate-underline px-0"
href="{{ route('second', ['shop', 'catalog-electronics']) }}'">
<i class="ci-chevron-left fs-lg me-1"></i> <i class="ci-chevron-left fs-lg me-1"></i>
<span class="animate-target">Continue shopping</span> <span class="animate-target">Continue shopping</span>
</a> </a>
@ -170,7 +147,6 @@
<!-- Order summary (sticky sidebar) --> <!-- Order summary (sticky sidebar) -->
@if ($carts->count() > 0)
<aside class="col-lg-4" style="margin-top: -100px"> <aside class="col-lg-4" style="margin-top: -100px">
<div class="position-sticky top-0" style="padding-top: 100px"> <div class="position-sticky top-0" style="padding-top: 100px">
<div class="bg-body-tertiary rounded-5 p-4 mb-3"> <div class="bg-body-tertiary rounded-5 p-4 mb-3">
@ -178,18 +154,16 @@
<h5 class="border-bottom pb-4 mb-4">Order summary</h5> <h5 class="border-bottom pb-4 mb-4">Order summary</h5>
<ul class="list-unstyled fs-sm gap-3 mb-0"> <ul class="list-unstyled fs-sm gap-3 mb-0">
<li class="d-flex justify-content-between"> <li class="d-flex justify-content-between">
<div>Subtotal (<span Subtotal (3 items):
class="cart-count">{{ auth()->check() ? \App\Repositories\Member\Cart\MemberCartRepository::getCount() : 0 }}</span> <span class="text-dark-emphasis fw-medium">$2,427.00</span>
items):</div>
<span class="text-dark-emphasis fw-medium" id="cart-subtotal">Rp 0</span>
</li> </li>
<li class="d-flex justify-content-between"> <li class="d-flex justify-content-between">
Saving: Saving:
<span class="text-danger fw-medium">Rp 0</span> <span class="text-danger fw-medium">-$110.00</span>
</li> </li>
<li class="d-flex justify-content-between" id="tax-row" style="display: none;"> <li class="d-flex justify-content-between">
Tax collected: Tax collected:
<span class="text-dark-emphasis fw-medium">Rp 0</span> <span class="text-dark-emphasis fw-medium">$73.40</span>
</li> </li>
<li class="d-flex justify-content-between"> <li class="d-flex justify-content-between">
Shipping: Shipping:
@ -199,19 +173,19 @@
<div class="border-top pt-4 mt-4"> <div class="border-top pt-4 mt-4">
<div class="d-flex justify-content-between mb-3"> <div class="d-flex justify-content-between mb-3">
<span class="fs-sm">Estimated total:</span> <span class="fs-sm">Estimated total:</span>
<span class="h5 mb-0" id="cart-estimated-total">$0.00</span> <span class="h5 mb-0">$2,390.40</span>
</div> </div>
<a class="btn btn-lg btn-primary w-100" <a class="btn btn-lg btn-primary w-100"
href="{{ route('second', ['checkout', 'v1-delivery-1']) }}"> href="{{ route('second', ['checkout', 'v1-delivery-1']) }}">
Proceed to checkout Proceed to checkout
<i class="ci-chevron-right fs-lg ms-1 me-n1"></i> <i class="ci-chevron-right fs-lg ms-1 me-n1"></i>
</a> </a>
{{-- <div class="nav justify-content-center fs-sm mt-3"> <div class="nav justify-content-center fs-sm mt-3">
<a class="nav-link text-decoration-underline p-0 me-1" href="#authForm" <a class="nav-link text-decoration-underline p-0 me-1" href="#authForm"
data-bs-toggle="offcanvas" role="button">Create an account</a> data-bs-toggle="offcanvas" role="button">Create an account</a>
and get and get
<span class="text-dark-emphasis fw-medium ms-1">239 bonuses</span> <span class="text-dark-emphasis fw-medium ms-1">239 bonuses</span>
</div> --}} </div>
</div> </div>
</div> </div>
</div> </div>
@ -231,10 +205,9 @@
<div class="accordion-body pt-3 pb-2 ps-sm-2 px-lg-0 px-xl-2"> <div class="accordion-body pt-3 pb-2 ps-sm-2 px-lg-0 px-xl-2">
<form class="needs-validation d-flex gap-2" novalidate> <form class="needs-validation d-flex gap-2" novalidate>
<div class="position-relative w-100"> <div class="position-relative w-100">
<input type="text" class="form-control" <input type="text" class="form-control" placeholder="Enter promo code"
placeholder="Enter promo code" required> required>
<div class="invalid-tooltip bg-transparent py-0">Enter a valid promo <div class="invalid-tooltip bg-transparent py-0">Enter a valid promo code!
code!
</div> </div>
</div> </div>
<button type="submit" class="btn btn-dark">Apply</button> <button type="submit" class="btn btn-dark">Apply</button>
@ -245,7 +218,6 @@
</div> </div>
</div> </div>
</aside> </aside>
@endif
</div> </div>
</section> </section>
@ -756,54 +728,6 @@
</section> </section>
</main> </main>
<!-- Clear Cart Confirmation Modal -->
<div class="modal fade" id="clearCartModal" tabindex="-1" aria-labelledby="clearCartModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header border-0">
<h5 class="modal-title" id="clearCartModalLabel">Clear Cart</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body text-center py-4">
<div class="mb-4">
<i class="ci-trash text-danger" style="font-size: 3rem;"></i>
</div>
<h6 class="mb-3">Are you sure you want to clear your entire cart?</h6>
<p class="text-muted mb-4">This action cannot be undone. All items will be removed from your cart.</p>
</div>
<div class="modal-footer border-0 justify-content-center">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" id="confirmClearCart">Clear Cart</button>
</div>
</div>
</div>
</div>
<!-- Delete Item Confirmation Modal -->
<div class="modal fade" id="deleteItemModal" tabindex="-1" aria-labelledby="deleteItemModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header border-0">
<h5 class="modal-title" id="deleteItemModalLabel">Remove Item</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body text-center py-4">
<div class="mb-4">
<i class="ci-trash text-warning" style="font-size: 3rem;"></i>
</div>
<h6 class="mb-3">Are you sure you want to remove this item from cart?</h6>
<p class="text-muted mb-4">This action cannot be undone. The item will be removed from your cart.</p>
</div>
<div class="modal-footer border-0 justify-content-center">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-warning" id="confirmDeleteItem">Remove Item</button>
</div>
</div>
</div>
</div>
@include('layouts.partials/footer') @include('layouts.partials/footer')
@endsection @endsection
@ -857,8 +781,7 @@
method: 'PUT', method: 'PUT',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute( 'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute('content'),
'content'),
'Accept': 'application/json' 'Accept': 'application/json'
}, },
body: JSON.stringify({ body: JSON.stringify({
@ -896,82 +819,16 @@
async function deleteCartItem(event, form, cartId) { async function deleteCartItem(event, form, cartId) {
event.preventDefault(); event.preventDefault();
// Store the cart ID and form for later use if (!confirm('Are you sure you want to remove this item from cart?')) {
window.pendingDelete = { return;
cartId,
form
};
// Show Bootstrap modal instead of native confirm
showDeleteItemModal();
} }
// Function to show the delete item modal
function showDeleteItemModal() {
// Try to use Bootstrap Modal if available
if (typeof bootstrap !== 'undefined' && bootstrap.Modal) {
const modal = new bootstrap.Modal(document.getElementById('deleteItemModal'));
modal.show();
} else {
// Fallback: manually show the modal
const modalElement = document.getElementById('deleteItemModal');
if (modalElement) {
modalElement.style.display = 'block';
modalElement.classList.add('show');
modalElement.setAttribute('aria-modal', 'true');
modalElement.setAttribute('role', 'dialog');
// Add backdrop
const backdrop = document.createElement('div');
backdrop.className = 'modal-backdrop fade show';
backdrop.id = 'deleteItemBackdrop';
document.body.appendChild(backdrop);
// Handle close buttons
const closeButtons = modalElement.querySelectorAll('[data-bs-dismiss="modal"]');
closeButtons.forEach(button => {
button.onclick = hideDeleteItemModal;
});
// Handle backdrop click
backdrop.onclick = hideDeleteItemModal;
}
}
}
// Function to hide the delete item modal
function hideDeleteItemModal() {
const modalElement = document.getElementById('deleteItemModal');
const backdrop = document.getElementById('deleteItemBackdrop');
if (modalElement) {
modalElement.style.display = 'none';
modalElement.classList.remove('show');
modalElement.removeAttribute('aria-modal');
modalElement.removeAttribute('role');
}
if (backdrop) {
backdrop.remove();
}
}
// Function to actually delete the item (called when confirm button is clicked)
async function executeDeleteItem() {
if (!window.pendingDelete) return;
const {
cartId,
form
} = window.pendingDelete;
try { try {
const response = await fetch(`cart/${cartId}`, { const response = await fetch(`cart/${cartId}`, {
method: 'DELETE', method: 'DELETE',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute( 'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute('content'),
'content'),
'Accept': 'application/json' 'Accept': 'application/json'
} }
}); });
@ -979,9 +836,6 @@
if (response.ok) { if (response.ok) {
const result = await response.json(); const result = await response.json();
if (result.success) { if (result.success) {
// Hide modal first
hideDeleteItemModal();
// Remove the row from the table // Remove the row from the table
const row = form.closest('tr'); const row = form.closest('tr');
row.remove(); row.remove();
@ -989,11 +843,8 @@
// Update cart count in header // Update cart count in header
updateCartCount(); updateCartCount();
// Recalculate totals // Optionally reload the page to update cart summary
calculateCartTotals(); // window.location.reload();
// Clear pending delete
window.pendingDelete = null;
} }
} else { } else {
console.error('Error deleting cart item:', await response.json()); console.error('Error deleting cart item:', await response.json());
@ -1002,6 +853,8 @@
console.error('Network error:', error); console.error('Network error:', error);
} }
} }
// Function to update cart count in header
async function updateCartCount() { async function updateCartCount() {
try { try {
const response = await fetch('cart/count', { const response = await fetch('cart/count', {
@ -1018,215 +871,10 @@
cartCountElements.forEach(element => { cartCountElements.forEach(element => {
element.textContent = result.count; element.textContent = result.count;
}); });
} }
} catch (error) { } catch (error) {
console.error('Error updating cart count:', error); console.error('Error updating cart count:', error);
} }
} }
// Function to calculate and update cart totals
function calculateCartTotals() {
let subtotal = 0;
let itemCount = 0;
// Get all cart item rows
const cartRows = document.querySelectorAll('tbody tr[data-cart-id]');
console.log('Found cart rows:', cartRows.length);
cartRows.forEach(row => {
const cartId = row.dataset.cartId;
const priceInput = document.getElementById(`price_${cartId}`);
const quantityInput = row.querySelector('input[type="number"]');
console.log('Processing cart ID:', cartId, 'Price input:', priceInput, 'Quantity input:',
quantityInput);
if (priceInput && quantityInput) {
const price = parseFloat(priceInput.value);
const quantity = parseInt(quantityInput.value);
subtotal += price * quantity;
itemCount += quantity;
console.log('Price:', price, 'Quantity:', quantity, 'Running subtotal:', subtotal);
}
});
console.log('Final subtotal:', subtotal, 'Item count:', itemCount);
// Update subtotal display
const subtotalElement = document.getElementById('cart-subtotal');
if (subtotalElement) {
subtotalElement.textContent = `Rp ${number_format(subtotal, 0, ',', '.')}`;
console.log('Updated subtotal element:', subtotalElement.textContent);
}
// Calculate estimated total (subtotal - savings + tax)
const savings = 0; // Fixed savings amount
const tax = 0; // Fixed tax amount
const estimatedTotal = subtotal - savings + tax;
// Show/hide tax row based on tax amount
const taxRow = document.getElementById('tax-row');
if (taxRow) {
if (tax > 0) {
taxRow.style.display = 'flex';
taxRow.querySelector('span').textContent = `Rp ${number_format(tax, 0, ',', '.')}`;
} else {
taxRow.style.display = 'none';
}
}
// Update estimated total display
const estimatedTotalElement = document.getElementById('cart-estimated-total');
if (estimatedTotalElement) {
estimatedTotalElement.textContent = `Rp ${number_format(estimatedTotal, 0, ',', '.')}`;
console.log('Updated estimated total element:', estimatedTotalElement.textContent);
}
// Update items count
const cartCalcElement = document.getElementById('cart-calc');
if (cartCalcElement) {
cartCalcElement.textContent = itemCount;
console.log('Updated item count:', cartCalcElement.textContent);
}
}
// Initialize cart totals on page load
document.addEventListener('DOMContentLoaded', function() {
calculateCartTotals();
// Add event listener for clear cart confirm button
const confirmClearButton = document.getElementById('confirmClearCart');
if (confirmClearButton) {
confirmClearButton.addEventListener('click', executeClearCart);
}
// Add event listener for delete item confirm button
const confirmDeleteButton = document.getElementById('confirmDeleteItem');
if (confirmDeleteButton) {
confirmDeleteButton.addEventListener('click', executeDeleteItem);
}
});
// Update cart totals when cart items are updated
const originalUpdateCartItem = updateCartItem;
window.updateCartItem = async function(cartId, action, button) {
await originalUpdateCartItem(cartId, action, button);
// Recalculate totals after successful update
setTimeout(() => {
calculateCartTotals();
}, 500);
}
// Update cart totals when cart items are deleted
const originalDeleteCartItem = deleteCartItem;
window.deleteCartItem = async function(event, form, cartId) {
await originalDeleteCartItem(event, form, cartId);
// Recalculate totals after successful deletion
setTimeout(() => {
calculateCartTotals();
}, 500);
}
// Function to clear entire cart
function clearCart() {
// Show Bootstrap modal instead of native confirm
showModal();
}
// Function to show the clear cart modal
function showModal() {
// Try to use Bootstrap Modal if available
if (typeof bootstrap !== 'undefined' && bootstrap.Modal) {
const modal = new bootstrap.Modal(document.getElementById('clearCartModal'));
modal.show();
} else {
// Fallback: manually show the modal
const modalElement = document.getElementById('clearCartModal');
if (modalElement) {
modalElement.style.display = 'block';
modalElement.classList.add('show');
modalElement.setAttribute('aria-modal', 'true');
modalElement.setAttribute('role', 'dialog');
// Add backdrop
const backdrop = document.createElement('div');
backdrop.className = 'modal-backdrop fade show';
backdrop.id = 'clearCartBackdrop';
document.body.appendChild(backdrop);
// Handle close buttons
const closeButtons = modalElement.querySelectorAll('[data-bs-dismiss="modal"]');
closeButtons.forEach(button => {
button.onclick = hideModal;
});
// Handle backdrop click
backdrop.onclick = hideModal;
}
}
}
// Function to hide the clear cart modal
function hideModal() {
const modalElement = document.getElementById('clearCartModal');
const backdrop = document.getElementById('clearCartBackdrop');
if (modalElement) {
modalElement.style.display = 'none';
modalElement.classList.remove('show');
modalElement.removeAttribute('aria-modal');
modalElement.removeAttribute('role');
}
if (backdrop) {
backdrop.remove();
}
}
// Function to actually clear the cart (called when confirm button is clicked)
async function executeClearCart() {
try {
const response = await fetch('cart/clear', {
method: 'DELETE',
headers: {
'Content-Type': 'application/json',
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute(
'content'),
'Accept': 'application/json'
}
});
if (response.ok) {
const result = await response.json();
if (result.success) {
// Hide modal first
hideModal();
// Remove all cart rows from the table
const cartRows = document.querySelectorAll('tbody tr[data-cart-id]');
cartRows.forEach(row => row.remove());
// Update cart count in header
updateCartCount();
// Recalculate totals (should be zero now)
calculateCartTotals();
// Optionally show a success message
console.log('Cart cleared successfully');
}
} else {
console.error('Error clearing cart:', await response.json());
}
} catch (error) {
console.error('Network error:', error);
}
}
</script> </script>
@endsection @endsection

View File

@ -134,8 +134,7 @@
<div class="offcanvas offcanvas-top" id="searchBox" data-bs-backdrop="static" tabindex="-1"> <div class="offcanvas offcanvas-top" id="searchBox" data-bs-backdrop="static" tabindex="-1">
<div class="offcanvas-header border-bottom p-0 py-lg-1"> <div class="offcanvas-header border-bottom p-0 py-lg-1">
<form class="container d-flex align-items-center"> <form class="container d-flex align-items-center">
<input type="search" id="searchInput" <input type="search" id="searchInput" class="form-control form-control-lg fs-lg border-0 rounded-0 py-3 ps-0"
class="form-control form-control-lg fs-lg border-0 rounded-0 py-3 ps-0"
placeholder="Search the products" data-autofocus="offcanvas"> placeholder="Search the products" data-autofocus="offcanvas">
<button type="reset" class="btn-close fs-lg" data-bs-dismiss="offcanvas" <button type="reset" class="btn-close fs-lg" data-bs-dismiss="offcanvas"
aria-label="Close"></button> aria-label="Close"></button>
@ -249,7 +248,7 @@
</a> </a>
<!-- Cart button --> <!-- Cart button -->
{{-- <button type="button" <button type="button"
class="btn btn-icon btn-lg fs-xl btn-outline-secondary position-relative border-0 rounded-circle animate-scale" class="btn btn-icon btn-lg fs-xl btn-outline-secondary position-relative border-0 rounded-circle animate-scale"
data-bs-toggle="offcanvas" data-bs-target="#shoppingCart" aria-controls="shoppingCart" data-bs-toggle="offcanvas" data-bs-target="#shoppingCart" aria-controls="shoppingCart"
aria-label="Shopping cart"> aria-label="Shopping cart">
@ -257,17 +256,7 @@
class="position-absolute top-0 start-100 badge fs-xs text-bg-primary rounded-pill mt-1 ms-n4 z-2 cart-count" class="position-absolute top-0 start-100 badge fs-xs text-bg-primary rounded-pill mt-1 ms-n4 z-2 cart-count"
style="--cz-badge-padding-y: .25em; --cz-badge-padding-x: .42em">{{ auth()->check() ? \App\Repositories\Member\Cart\MemberCartRepository::getCount() : 0 }}</span> style="--cz-badge-padding-y: .25em; --cz-badge-padding-x: .42em">{{ auth()->check() ? \App\Repositories\Member\Cart\MemberCartRepository::getCount() : 0 }}</span>
<i class="ci-shopping-bag animate-target me-1"></i> <i class="ci-shopping-bag animate-target me-1"></i>
</button> --}} </button>
<a type="button" href="{{ route('cart.index') }}"
class="btn btn-icon btn-lg fs-xl btn-outline-secondary position-relative border-0 rounded-circle animate-scale"
aria-label="Shopping cart">
@if (auth()->check() && \App\Repositories\Member\Cart\MemberCartRepository::getCount() > 0)
<span
class="position-absolute top-0 start-100 badge fs-xs text-bg-primary rounded-pill mt-1 ms-n4 z-2 cart-count"
style="--cz-badge-padding-y: .25em; --cz-badge-padding-x: .42em">{{ auth()->check() ? \App\Repositories\Member\Cart\MemberCartRepository::getCount() : 0 }}</span>
@endif
<i class="ci-shopping-bag animate-target me-1"></i>
</a>
</div> </div>
</div> </div>

View File

@ -28,33 +28,6 @@
</button> </button>
</div> </div>
<!-- Login Dialog Modal -->
<div class="modal fade" id="loginDialogModal" tabindex="-1" aria-labelledby="loginDialogLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header border-0">
<h5 class="modal-title" id="loginDialogLabel">Login Required</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body text-center py-4">
<div class="mb-4">
<i class="ci-user-circle text-primary" style="font-size: 3rem;"></i>
</div>
<h6 class="mb-3">Please login to add items to cart</h6>
<p class="text-muted mb-4">You need to be logged in to add items to your shopping cart and proceed with checkout.</p>
<div class="d-grid gap-2">
<a href="{{ route('login') }}" class="btn btn-primary">
<i class="ci-login me-2"></i>Login to Continue
</a>
<a href="{{ route('register') }}" class="btn btn-outline-primary">
<i class="ci-user-plus me-2"></i>Create Account
</a>
</div>
</div>
</div>
</div>
</div>
<script> <script>
function incrementQuantity(button) { function incrementQuantity(button) {
const input = button.parentElement.querySelector('input[type="number"]'); const input = button.parentElement.querySelector('input[type="number"]');
@ -128,13 +101,8 @@
} else { } else {
const error = await response.json(); const error = await response.json();
console.error('Error adding to cart:', error); console.error('Error adding to cart:', error);
// Check if error is due to unauthenticated user
if (error.message && error.message.toLowerCase().includes('unauthenticated') || response.status === 401) {
showLoginDialog();
} else {
// You could show an error message here // You could show an error message here
} }
}
} catch (error) { } catch (error) {
console.error('Network error:', error); console.error('Network error:', error);
// You could show an error message here // You could show an error message here
@ -168,54 +136,4 @@
console.error('Error updating cart count:', error); console.error('Error updating cart count:', error);
} }
} }
// Function to show login dialog
function showLoginDialog() {
// Try to use Bootstrap Modal if available
if (typeof bootstrap !== 'undefined' && bootstrap.Modal) {
const modal = new bootstrap.Modal(document.getElementById('loginDialogModal'));
modal.show();
} else {
// Fallback: manually show the modal
const modalElement = document.getElementById('loginDialogModal');
if (modalElement) {
modalElement.style.display = 'block';
modalElement.classList.add('show');
modalElement.setAttribute('aria-modal', 'true');
modalElement.setAttribute('role', 'dialog');
// Add backdrop
const backdrop = document.createElement('div');
backdrop.className = 'modal-backdrop fade show';
backdrop.id = 'loginDialogBackdrop';
document.body.appendChild(backdrop);
// Handle close buttons
const closeButtons = modalElement.querySelectorAll('[data-bs-dismiss="modal"]');
closeButtons.forEach(button => {
button.onclick = hideLoginDialog;
});
// Handle backdrop click
backdrop.onclick = hideLoginDialog;
}
}
}
// Function to hide login dialog
function hideLoginDialog() {
const modalElement = document.getElementById('loginDialogModal');
const backdrop = document.getElementById('loginDialogBackdrop');
if (modalElement) {
modalElement.style.display = 'none';
modalElement.classList.remove('show');
modalElement.removeAttribute('aria-modal');
modalElement.removeAttribute('role');
}
if (backdrop) {
backdrop.remove();
}
}
</script> </script>

View File

@ -91,7 +91,6 @@ Route::middleware(['auth'])->prefix('/cart')->group(function () {
Route::get('/', [CartController::class, 'index'])->name('cart.index'); Route::get('/', [CartController::class, 'index'])->name('cart.index');
Route::post('/', [CartController::class, 'add'])->name('cart.add'); Route::post('/', [CartController::class, 'add'])->name('cart.add');
Route::put('/{id}', [CartController::class, 'update'])->name('cart.update'); Route::put('/{id}', [CartController::class, 'update'])->name('cart.update');
Route::delete('/clear', [CartController::class, 'clear'])->name('cart.clear');
Route::delete('/{id}', [CartController::class, 'delete'])->name('cart.delete'); Route::delete('/{id}', [CartController::class, 'delete'])->name('cart.delete');
Route::get('/count', [CartController::class, 'count'])->name('cart.count'); Route::get('/count', [CartController::class, 'count'])->name('cart.count');
}); });