This commit is contained in:
Bayu Lukman Yusuf 2026-01-26 08:44:25 +07:00
parent 8c21d4dc7c
commit 156978e669
5 changed files with 303 additions and 113 deletions

View File

@ -14,9 +14,9 @@ class CartController extends Controller
public function count(Request $request, MemberCartRepository $repository) public function count(Request $request, MemberCartRepository $repository)
{ {
$count = $repository->getCount($request->input('location_id')); $count = $repository->getCount($request->input('location_id'));
return response()->json([ return response()->json([
'count' => $count 'count' => $count,
]); ]);
} }

View File

@ -13,9 +13,11 @@ 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)
->count(); ->sum('qty');
} }
public function getList($request) public function getList($request)
{ {
$location = (int) $request->input("location_id"); $location = (int) $request->input("location_id");

View File

@ -65,7 +65,7 @@
<tbody class="align-middle"> <tbody class="align-middle">
@foreach ($carts as $key => $cart) @foreach ($carts as $key => $cart)
<tr> <tr data-cart-id="{{ $cart->id }}">
<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"
@ -137,7 +137,7 @@
<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" <a class="nav-link animate-underline px-0"
href="{{ route('second', ['shop', 'catalog-electronics']) }}'"> href="{{ route('home') }}">
<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>
@ -154,16 +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">
Subtotal (3 items): <div>Subtotal (<span class="cart-count">{{ auth()->check() ? \App\Repositories\Member\Cart\MemberCartRepository::getCount() : 0 }}</span> items):</div>
<span class="text-dark-emphasis fw-medium">$2,427.00</span> <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">-$110.00</span> <span class="text-danger fw-medium">Rp 0</span>
</li> </li>
<li class="d-flex justify-content-between"> <li class="d-flex justify-content-between" id="tax-row" style="display: none;">
Tax collected: Tax collected:
<span class="text-dark-emphasis fw-medium">$73.40</span> <span class="text-dark-emphasis fw-medium">Rp 0</span>
</li> </li>
<li class="d-flex justify-content-between"> <li class="d-flex justify-content-between">
Shipping: Shipping:
@ -173,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">$2,390.40</span> <span class="h5 mb-0" id="cart-estimated-total">$0.00</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>
@ -871,10 +871,106 @@ async function updateCartCount() {
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();
});
// 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);
}
</script> </script>
@endsection @endsection

View File

@ -134,7 +134,8 @@
<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" class="form-control form-control-lg fs-lg border-0 rounded-0 py-3 ps-0" <input type="search" id="searchInput"
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>
@ -248,7 +249,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">
@ -256,7 +257,16 @@
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">
<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>
<i class="ci-shopping-bag animate-target me-1"></i>
</a>
</div> </div>
</div> </div>
@ -317,39 +327,39 @@
</div> </div>
<script> <script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const searchInput = document.getElementById('searchInput'); const searchInput = document.getElementById('searchInput');
const searchResults = document.getElementById('searchResults'); const searchResults = document.getElementById('searchResults');
let searchTimeout; let searchTimeout;
if (searchInput && searchResults) { if (searchInput && searchResults) {
// Show default state initially // Show default state initially
showDefaultSearch();
// Handle search input with debouncing
searchInput.addEventListener('input', function() {
clearTimeout(searchTimeout);
const query = this.value.trim();
if (query.length < 2) {
showDefaultSearch();
return;
}
// Debounce search
searchTimeout = setTimeout(() => {
performSearch(query);
}, 300);
});
// Clear search when input is cleared
searchInput.addEventListener('reset', function() {
showDefaultSearch(); showDefaultSearch();
});
}
function showDefaultSearch() { // Handle search input with debouncing
searchResults.innerHTML = ` searchInput.addEventListener('input', function() {
clearTimeout(searchTimeout);
const query = this.value.trim();
if (query.length < 2) {
showDefaultSearch();
return;
}
// Debounce search
searchTimeout = setTimeout(() => {
performSearch(query);
}, 300);
});
// Clear search when input is cleared
searchInput.addEventListener('reset', function() {
showDefaultSearch();
});
}
function showDefaultSearch() {
searchResults.innerHTML = `
<div class="container text-center py-5"> <div class="container text-center py-5">
<svg class="text-body-tertiary opacity-60 mb-4" xmlns="http://www.w3.org/2000/svg" width="60" <svg class="text-body-tertiary opacity-60 mb-4" xmlns="http://www.w3.org/2000/svg" width="60"
viewBox="0 0 512 512" fill="currentColor"> viewBox="0 0 512 512" fill="currentColor">
@ -359,11 +369,11 @@ document.addEventListener('DOMContentLoaded', function() {
<p class="fs-sm mb-0">Start typing in the search field above to see instant search results.</p> <p class="fs-sm mb-0">Start typing in the search field above to see instant search results.</p>
</div> </div>
`; `;
} }
function performSearch(query) { function performSearch(query) {
// Show loading state // Show loading state
searchResults.innerHTML = ` searchResults.innerHTML = `
<div class="container text-center py-5"> <div class="container text-center py-5">
<div class="spinner-border text-primary" role="status"> <div class="spinner-border text-primary" role="status">
<span class="visually-hidden">Loading...</span> <span class="visually-hidden">Loading...</span>
@ -372,39 +382,39 @@ document.addEventListener('DOMContentLoaded', function() {
</div> </div>
`; `;
fetch(`{{ route('search.ajax') }}?q=${encodeURIComponent(query)}`, { fetch(`{{ route('search.ajax') }}?q=${encodeURIComponent(query)}`, {
headers: { headers: {
'X-Requested-With': 'XMLHttpRequest', 'X-Requested-With': 'XMLHttpRequest',
'Accept': 'application/json' 'Accept': 'application/json'
} }
}) })
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
if (data.success) { if (data.success) {
displaySearchResults(data.results, data.query); displaySearchResults(data.results, data.query);
} else { } else {
showError('Search failed. Please try again.'); showError('Search failed. Please try again.');
} }
}) })
.catch(error => { .catch(error => {
console.error('Search error:', error); console.error('Search error:', error);
showError('Search failed. Please try again.'); showError('Search failed. Please try again.');
}); });
} }
function displaySearchResults(results, query) { function displaySearchResults(results, query) {
let html = '<div class="container py-4">'; let html = '<div class="container py-4">';
// Products section // Products section
if (results.products && results.products.length > 0) { if (results.products && results.products.length > 0) {
html += ` html += `
<div class="mb-4"> <div class="mb-4">
<h6 class="text-uppercase fs-xs fw-bold mb-3">Products</h6> <h6 class="text-uppercase fs-xs fw-bold mb-3">Products</h6>
<div class="row g-3"> <div class="row g-3">
`; `;
results.products.forEach(product => { results.products.forEach(product => {
html += ` html += `
<div class="col-6 col-md-3"> <div class="col-6 col-md-3">
<a href="${product.route}" class="text-decoration-none"> <a href="${product.route}" class="text-decoration-none">
<div class="card border-0 shadow-sm"> <div class="card border-0 shadow-sm">
@ -416,66 +426,66 @@ document.addEventListener('DOMContentLoaded', function() {
</a> </a>
</div> </div>
`; `;
}); });
html += '</div></div>';
}
// Categories section html += '</div></div>';
if (results.categories && results.categories.length > 0) { }
html += `
// Categories section
if (results.categories && results.categories.length > 0) {
html += `
<div class="mb-4"> <div class="mb-4">
<h6 class="text-uppercase fs-xs fw-bold mb-3">Categories</h6> <h6 class="text-uppercase fs-xs fw-bold mb-3">Categories</h6>
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
`; `;
results.categories.forEach(category => { results.categories.forEach(category => {
html += ` html += `
<a href="${category.route}" <a href="${category.route}"
class="btn btn-outline-secondary btn-sm"> class="btn btn-outline-secondary btn-sm">
${category.name} ${category.name}
</a> </a>
`; `;
}); });
html += '</div></div>';
}
// Genders section html += '</div></div>';
if (results.genders && results.genders.length > 0) { }
html += `
// Genders section
if (results.genders && results.genders.length > 0) {
html += `
<div class="mb-4"> <div class="mb-4">
<h6 class="text-uppercase fs-xs fw-bold mb-3">Genders</h6> <h6 class="text-uppercase fs-xs fw-bold mb-3">Genders</h6>
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
`; `;
results.genders.forEach(gender => { results.genders.forEach(gender => {
html += ` html += `
<a href="${gender.route}" <a href="${gender.route}"
class="btn btn-outline-secondary btn-sm"> class="btn btn-outline-secondary btn-sm">
${gender.name} ${gender.name}
</a> </a>
`; `;
}); });
html += '</div></div>';
}
// No results html += '</div></div>';
if (Object.keys(results).length === 0) { }
html += `
// No results
if (Object.keys(results).length === 0) {
html += `
<div class="text-center py-5"> <div class="text-center py-5">
<p class="text-muted mb-0">No results found for "${query}"</p> <p class="text-muted mb-0">No results found for "${query}"</p>
</div> </div>
`; `;
}
html += '</div>';
searchResults.innerHTML = html;
} }
html += '</div>'; function showError(message) {
searchResults.innerHTML = html; searchResults.innerHTML = `
}
function showError(message) {
searchResults.innerHTML = `
<div class="container text-center py-5"> <div class="container text-center py-5">
<div class="text-danger mb-3"> <div class="text-danger mb-3">
<i class="ci-alert-circle fs-1"></i> <i class="ci-alert-circle fs-1"></i>
@ -483,6 +493,6 @@ document.addEventListener('DOMContentLoaded', function() {
<p class="text-muted mb-0">${message}</p> <p class="text-muted mb-0">${message}</p>
</div> </div>
`; `;
} }
}); });
</script> </script>

View File

@ -28,6 +28,33 @@
</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"]');
@ -101,7 +128,12 @@
} 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);
// You could show an error message here // 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
}
} }
} catch (error) { } catch (error) {
console.error('Network error:', error); console.error('Network error:', error);
@ -136,4 +168,54 @@
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>