terminada modificacion

This commit is contained in:
2025-04-04 17:03:08 +02:00
parent a0cb703991
commit cddf64b025
9 changed files with 129 additions and 58 deletions

View File

@ -44,13 +44,13 @@
<dt class="col-5 fw-normal text-end">Coste de envío</dt>
<dd class="col-6 text-end py-1 "><span id="costeEnvios"
class="autonumeric-resumen-currency"></span></sp>
<dt class="col-5 fw-normal text-end">Precio de envío</dt>
<dd class="col-6 text-end py-1 "><span id="precioEnvios"
class="autonumeric-resumen-currency"></span></sp>
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Margen envío</dt>
<dd class="col-6 text-end py-1 "><span id="margenEnvios"
class="autonumeric-resumen-currency"></span></sp>
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">Total envío base</dt>
<dd class="col-6 text-end py-1 "><span id="precioEnvios"
class="autonumeric-resumen-currency"></span></dd>
</dl>
<hr class="mx-n4">
@ -69,7 +69,7 @@
<hr class="mx-n4">
<dl class="row mb-0">
<dt class="col-5 fw-normal text-end">Total</dt>
<dt class="col-5 fw-normal text-end">Total antes de descuento</dt>
<dd class="col-6 text-end"><span id="totalAntesDescuento"
class="autonumeric-resumen-currency"></span></span>
<dt class="col-5 py-1 fw-normal text-end">Descuento (%)</dt>
@ -118,28 +118,41 @@
<div class="col-xl-12 mt-3">
<div class="card border border-secondary-subtle rounded-3">
<div class="card-body">
<div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none" role="alert">
<span class="alert-icon alert-icon-lg text-primary me-2">
<i class="ti ti-ban ti-sm"></i>
</span>
<div class="d-flex flex-column ps-1">
<h5 id="error_recalcular_margen" class="alert-heading mb-2"></h5>
</div>
</div>
<div class="row">
<p>El total aceptado y revisado tiene que ser mayor que total costes + precio de envío
</p>
</div>
<div class="row">
<div class="col-sm-6 mb-md-0 mb-2">
<label for="total_aceptado_revisado" class="form-label">Total aceptado y
revisado</label>
<input <?= ($presupuestoEntity->estado_id == 2)? "disabled":"" ?> type="text" class="autonumeric-currency form-control text-center fs-5"
id="total_aceptado_revisado">
<input <?= ($presupuestoEntity->estado_id == 2) ? "disabled" : "" ?> type="text"
class="autonumeric-currency form-control text-center fs-5"
id="total_aceptado_revisado"></input>
</div>
<div class="col-sm-6 d-flex align-items-end mb-md-0 mb-2">
<button type="button" id="btn_aceptar_revisado"
<button type="button" id="btn_ajustar_revisado"
class="btn btn-primary w-100">Ajustar</button>
</div>
</div>
<?php if ($presupuestoEntity->estado_id == 2): ?>
<?php /*if ($presupuestoEntity->estado_id == 2): ?>
<div class="row">
<div class="mb-1">
<div class="col-sm-6 mb-1">
<label for="totalAceptado"
class="form-label"><?= lang('Presupuestos.totalAceptado') ?></label>
<input disabled type="text" id="totalAceptado" name="totalAceptado"
class="form-control autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
class="form-control text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
</div>
</div>
<?php endif; ?>
<?php endif; */?>
<div class="row">
<p>
<span id="aprobado_by_at"></span>
@ -149,10 +162,6 @@
</div> <!-- //.card-body -->
</div> <!-- //.card -->
</div> <!-- //.col-xl-12 -->
</div> <!-- //.accordion-body -->
</div> <!-- //.accordion-collapse -->
</div> <!-- //.accordion-item -->
</div> <!-- //.accordion -->
</div> <!-- //.accordion-item -->