jjimenez/erp-imprimelibros
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/erp-imprimelibros.git synced 2026-01-21 08:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminado carrito

Browse Source
This commit is contained in:
Jaime Jiménez
2025-10-31 11:36:03 +01:00
parent 90c191d8f8
commit 40dc719e89
13 changed files with 234 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/i18n/cart_es.properties
View File

@ -44,6 +44,7 @@ cart.pass-to.customer.warning=Advertencia: Esta acción no se puede deshacer y s
cart.pass-to.select-customer=Seleccione un cliente
cart.pass-to.button=Mover cesta
cart.pass-to.success=Cesta movida correctamente al cliente {0}.
cart.pass-to.customer.error=Debe seleccionar un cliente para mover la cesta.
cart.pass-to.customer.error-move=Error al mover la cesta de la compra
cart.errors.update-cart=Error al actualizar la cesta de la compra: {0}
cart.errors.shipping=No se puede calcular el coste del envío para alguna de las direcciones seleccionadas. Por favor, póngase en contacto con el servicio de atención al cliente.

121
src/main/resources/static/assets/js/pages/imprimelibros/cart/cart.js
View File

@ -16,10 +16,10 @@ $(() => {
$(this).find('.direccion-id').attr('name', 'direcciones[' + i + '].id');
$(this).find('.direccion-cp').attr('name', 'direcciones[' + i + '].cp');
$(this).find('.direccion-pais-code3').attr('name', 'direcciones[' + i + '].paisCode3');
if($(this).find('.presupuesto-id').length > 0 && $(this).find('.presupuesto-id').val() !== null
&& $(this).find('.presupuesto-id').val() !== "")
if ($(this).find('.presupuesto-id').length > 0 && $(this).find('.presupuesto-id').val() !== null
&& $(this).find('.presupuesto-id').val() !== "")
$(this).find('.presupuesto-id').attr('name', 'direcciones[' + i + '].presupuestoId');
if($(this).find('.item-tirada').length > 0 && $(this).find('.item-tirada').val() !== null
if ($(this).find('.item-tirada').length > 0 && $(this).find('.item-tirada').val() !== null
&& $(this).find('.item-tirada').val() !== "")
$(this).find('.item-tirada').attr('name', 'direcciones[' + i + '].unidades');
});
@ -31,15 +31,28 @@ $(() => {
}).always(() => {
hideLoader();
});
checkAddressesForItems();
});
checkAddressesForItems();
function checkAddressesForItems(){
if($('#onlyOneShipment').is(':checked')){
if($("#shippingAddressesContainer .direccion-card").length === 0){
function checkAddressesForItems() {
if ($('.product').length === 0) {
$("#alert-empty").removeClass("d-none");
$('.cart-content').addClass('d-none');
return;
}
else {
$('.cart-content').removeClass('d-none');
$("#alert-empty").addClass("d-none");
// check if select2 is initialized
if ($('#select-customer').length && !$('#select-customer').hasClass('select2-hidden-accessible')) {
initMoveCartToCustomer();
}
}
if ($('#onlyOneShipment').is(':checked')) {
if ($("#shippingAddressesContainer .direccion-card").length === 0) {
$(".alert-shipment").removeClass("d-none");
$('#btn-checkout').prop('disabled', true);
return;
@ -47,42 +60,42 @@ $(() => {
$(".alert-shipment").addClass("d-none");
$('#btn-checkout').prop('disabled', false);
}
else{
else {
const items = $(".product");
let errorFound = false;
for(let i=0; i<items.length; i++){
for (let i = 0; i < items.length; i++) {
let errorFoundItem = false;
const item = $(items[i]);
const tirada = parseInt(item.find(".item-tirada").val()) || 0;
const direcciones = item.find(".direccion-card");
let totalUnidades = 0;
direcciones.each(function(){
direcciones.each(function () {
const unidades = parseInt($(this).find(".item-tirada").val()) || 0;
totalUnidades += unidades;
});
if(totalUnidades < tirada){
if (totalUnidades < tirada) {
errorFoundItem = true;
}
if(item.find(".shipping-addresses-sample")){
if (item.find(".shipping-addresses-sample")) {
const container = item.find(".shipping-addresses-sample");
if(container.find('.direccion-card').toArray().length === 0){
if (container.find('.direccion-card').toArray().length === 0) {
errorFoundItem = true;
}
}
if(errorFoundItem){
if (errorFoundItem) {
errorFound = true;
item.find(".alert-icon-shipment").removeClass("d-none");
}
else{
else {
item.find(".alert-icon-shipment").addClass("d-none");
}
}
if(errorFound){
if (errorFound) {
$(".alert-shipment").removeClass("d-none");
$('#btn-checkout').prop('disabled', true);
}
else{
else {
$(".alert-shipment").addClass("d-none");
$('#btn-checkout').prop('disabled', false);
}
@ -92,7 +105,7 @@ $(() => {
$(document).on("click", ".delete-item", async function (event) {
event.preventDefault();
const cartItemId = $(this).data("cart-item-id");
const presupuestoId = $(this).data("cart-item-id");
const card = $(this).closest('.card.product');
// CSRF (Spring Security)
@ -100,7 +113,7 @@ $(() => {
const csrfHeader = document.querySelector('meta[name="_csrf_header"]')?.content || 'X-CSRF-TOKEN';
try {
const res = await fetch(`/cart/delete/item/${cartItemId}`, {
const res = await fetch(`/cart/delete/item/${presupuestoId}`, {
method: 'DELETE',
headers: { [csrfHeader]: csrfToken }
});
@ -111,11 +124,79 @@ $(() => {
}
else {
card?.remove();
updateTotal();
$(document).trigger('updateCart');
}
} catch (err) {
console.error('Error en la solicitud:', err);
}
});
function initMoveCartToCustomer() {
if ($('#select-customer').length) {
$('#moveCart').on('click', async function (e) {
e.preventDefault();
const customerId = $('#select-customer').val();
if (!customerId) {
// set text and show alert
$('#alert-select-customer').text(window.languageBundle['cart.pass-to.customer.error'] || 'Debe seleccionar un cliente para mover la cesta.');
$('#alert-select-customer').removeClass('d-none').hide().fadeIn();
setTimeout(() => {
$('#alert-select-customer').fadeOut(function () {
$(this).addClass('d-none');
});
}, 5000);
return;
}
// CSRF (Spring Security)
const csrfToken = document.querySelector('meta[name="_csrf"]')?.content || '';
const csrfHeader = document.querySelector('meta[name="_csrf_header"]')?.content || 'X-CSRF-TOKEN';
try {
const res = await fetch(`/cart/pass-to-customer/${customerId}`, {
method: 'POST',
headers: { [csrfHeader]: csrfToken }
});
if (!res.ok) {
$('#alert-select-customer').text(window.languageBundle['cart.pass-to.customer.move.error'] || 'Error al mover la cesta de la compra');
$('#alert-select-customer').removeClass('d-none').hide().fadeIn();
setTimeout(() => {
$('#alert-select-customer').fadeOut(function () {
$(this).addClass('d-none');
});
}, 5000);
return;
}
else {
window.location.href = '/cart';
}
} catch (err) {
console.error('Error en la solicitud:', err);
$('#alert-select-customer').text(window.languageBundle['cart.errors.move-cart'] || 'Error al mover la cesta de la compra');
$('#alert-select-customer').removeClass('d-none').hide().fadeIn();
setTimeout(() => {
$('#alert-select-customer').fadeOut(function () {
$(this).addClass('d-none');
});
}, 5000);
}
});
$('#select-customer').select2({
width: '100%',
ajax: {
url: 'users/api/get-users',
dataType: 'json',
delay: 250,
},
allowClear: true
});
}
}
initMoveCartToCustomer();
});

11
src/main/resources/templates/imprimelibros/cart/_cartContent.html
View File

@ -1,4 +1,4 @@
<div th:fragment="cartContent(items, cartId)" class="cart-content container-fluid row gy-4">
<div th:fragment="cartContent(items, cartId)" th:class="${'cart-content container-fluid row gy-4' + (items.isEmpty() ? ' d-none' : '')}">
<div id="sectionLoader" class="position-absolute top-0 start-0 w-100 h-100 d-none justify-content-center align-items-center
bg-body bg-opacity-75" style="z-index:10;">
@ -7,11 +7,10 @@
</div>
</div>
<div th:if="${items.isEmpty()}">
<div class="alert alert-info" role="alert" th:text="#{cart.empty}"></div>
</div>
<div id="errorEnvio" th:class="${'alert alert-danger' + (errorEnvio ? '' : ' d-none')}" role="alert" th:text="#{cart.errors.shipping}"></div>
<div th:if="${errorMessage}" class="alert alert-danger " role="alert" th:text="${errorMessage}"></div>
<div id="errorEnvio" th:class="${'alert alert-danger' + (errorEnvio ? '' : ' d-none')}" role="alert"
th:text="#{cart.errors.shipping}"></div>
<div th:if="${!#strings.isEmpty(errorMessage) and items != null and !items.isEmpty()}" class="alert alert-danger "
role="alert" th:text="${errorMessage}"></div>
<div class="alert alert-danger alert-shipment d-none" role="alert"
th:text="#{cart.shipping.errors.fillAddressesItems}"></div>

2
src/main/resources/templates/imprimelibros/cart/_cartItem.html
View File

@ -198,7 +198,7 @@
<!-- Botón eliminar -->
<div>
<a href="javascript:void(0);" class="d-block text-body p-1 px-2 delete-item"
th:attr="data-cart-item-id=${item.cartItemId}">
th:attr="data-cart-item-id=${item.presupuestoId}">
<i class="ri-delete-bin-fill text-muted align-bottom me-1"></i> Eliminar
</a>
</div>

32
src/main/resources/templates/imprimelibros/cart/_cartSummary.html
View File

@ -25,7 +25,9 @@
<td class="text-end" id="iva-21-cesta" th:text="${summary.iva21}"></td>
</tr>
<tr id="tr-iva-21">
<td><span th:text="#{cart.resumen.descuento} + ' (' + ${summary.fidelizacion} + ')'"></span> : </td>
<td><span
th:text="#{cart.resumen.descuento} + ' (' + ${summary.fidelizacion} + ')'"></span>
: </td>
<td class="text-end" id="descuento-cesta" th:text="${summary.descuento}"></td>
</tr>
<tr class="table-active">
@ -37,8 +39,8 @@
</tbody>
</table>
<form th:action="@{/pagos/redsys/crear}" method="post">
<input type="hidden" name="order" value="123456789012"/>
<input type="hidden" name="amountCents" value="12525"/>
<input type="hidden" name="order" value="123456789012" />
<input type="hidden" name="amountCents" value="12525" />
<button id="btn-checkout" type="submit" class="btn btn-secondary w-100 mt-2"
th:text="#{cart.resumen.tramitar}">Checkout</button>
</form>
@ -47,25 +49,27 @@
</div>
</div>
<div class="card">
<div sec:authorize="isAuthenticated() and hasAnyRole('SUPERADMIN','ADMIN')" class="card">
<div class="card-header border-bottom-dashed">
<h5 th:text="#{cart.pass-to.customer}" class="card-title mb-0"></h5>
</div>
<div class="card-body pt-2">
<div class="alert alert-info" role="alert" th:text="#{cart.pass-to.customer.info}"></div>
<div class="alert alert-warning" role="alert" th:text="#{cart.pass-to.customer.warning}"></div>
<form th:action="@{/cart/pass-to-customer}" method="post">
<div class="mb-3">
<label for="select-customer" class="form-label" th:text="#{cart.pass-to.select-customer}"></label>
<select id="select-customer" name="customerId" class="form-select" required>
</select>
</div>
<button type="submit" class="btn btn-secondary w-100"
th:text="#{cart.pass-to.button}">Mover cesta</button>
<div id="alert-select-customer" class="alert alert-danger d-none" role="alert"
th:text="#{cart.pass-to.customer.error}"></div>
<div class="mb-3">
<label for="select-customer" class="form-label" th:text="#{cart.pass-to.select-customer}"></label>
<select id="select-customer" name="customerId" class="form-select" required>
</select>
</div>
<div class="mb-3">
<button id="moveCart" class="btn btn-secondary w-100" th:text="#{cart.pass-to.button}">Mover
cesta</button>
</div>
</div>
</div>
</div>
<!-- end stickey -->

4
src/main/resources/templates/imprimelibros/cart/cart.html
View File

@ -36,6 +36,10 @@
</nav>
</div>
<div th:if="${items.isEmpty()}">
<div id="alert-empty"class="alert alert-info" role="alert" th:text="#{cart.empty}"></div>
</div>
<div th:insert="~{imprimelibros/cart/_cartContent :: cartContent(${items}, ${cartId})}"></div>
</th:block>