mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
Merge branch 'main' into fix/permisos-mensajeria-sidebar
This commit is contained in:
amazuecos
@ -2,14 +2,12 @@
|
||||
<div class="card accordion-item active">
|
||||
<h2 class="accordion-header" id="headingOne">
|
||||
<button type="button" class="accordion-button" data-bs-toggle="collapse"
|
||||
data-bs-target="#accordionResumenTip" aria-expanded="false"
|
||||
aria-controls="accordionResumenTip">
|
||||
data-bs-target="#accordionResumenTip" aria-expanded="false" aria-controls="accordionResumenTip">
|
||||
<h4><?= lang("Presupuestos.resumen") ?></h4>
|
||||
</button>
|
||||
</h2>
|
||||
|
||||
<div id="accordionResumenTip" class="accordion-collapse collapse show"
|
||||
data-bs-parent="#accordionResumen">
|
||||
<div id="accordionResumenTip" class="accordion-collapse collapse show" data-bs-parent="#accordionResumen">
|
||||
<div class="accordion-body">
|
||||
|
||||
<div class="col-xl-12">
|
||||
@ -18,63 +16,88 @@
|
||||
<!-- Price Details -->
|
||||
<dl class="row mb-0">
|
||||
<dt class="col-5 py-1 fw-normal text-end">Coste papel</dt>
|
||||
<dd class="py-1 col-6 text-end"><span id="totalCostePapel" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="py-1 col-6 text-end"><span id="totalCostePapel"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
<dt class="col-5 py-1 fw-normal text-end">Margen papel</dt>
|
||||
<dd class="col-3 text-end py-1"><span id="porcentajeMargenPapel" class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="margenPapel" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="porcentajeMargenPapel"
|
||||
class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="margenPapel"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
|
||||
<dt class="col-5 fw-normal text-end">Coste impresión</dt>
|
||||
<dd class="col-6 text-end py-1"><span id="totalCosteImpresion" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="col-6 text-end py-1"><span id="totalCosteImpresion"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
<dt class="col-5 py-1 fw-normal text-end">Margen impresión</dt>
|
||||
<dd class="col-3 text-end py-1"><span id="porcentajeMargenImpresion" class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="margenImpresion" class="autonumeric-resumen-currency"></span></d>
|
||||
<dd class="col-3 text-end py-1"><span id="porcentajeMargenImpresion"
|
||||
class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="margenImpresion"
|
||||
class="autonumeric-resumen-currency"></span></d>
|
||||
|
||||
<dt class="col-5 fw-normal text-end">Coste servicios</dt>
|
||||
<dd class="col-6 text-end py-1 "><span id="totalServicios" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="col-6 text-end py-1 "><span id="totalServicios"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
<dt class="col-5 fw-normal text-end">Margen servicios</dt>
|
||||
<dd class="col-3 text-end py-1 "><span id="porcentajeMargenServicios" class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1 "><span id="margenServicios" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="col-3 text-end py-1 "><span id="porcentajeMargenServicios"
|
||||
class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1 "><span id="margenServicios"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
|
||||
<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>
|
||||
<dd class="col-6 text-end py-1 "><span id="costeEnvios"
|
||||
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>
|
||||
<dd class="col-6 text-end py-1 "><span id="margenEnvios"
|
||||
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">
|
||||
|
||||
<dl class="row mb-0">
|
||||
<dt class="col-5 fw-normal text-end">Total Costes</dt>
|
||||
<dd class="col-6 text-end "><span id="totalCostes" class="autonumeric-resumen-currency"></span></span>
|
||||
<dd class="col-6 text-end "><span id="totalCostes"
|
||||
class="autonumeric-resumen-currency"></span></span>
|
||||
<dt class="col-5 fw-normal text-end">Total Margen</dt>
|
||||
<dd class="col-3 text-end py-1"><span id="porcentajeMargen" class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="totalMargenes" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="porcentajeMargen"
|
||||
class="autonumeric-resumen-percent"></span></dd>
|
||||
<dd class="col-3 text-end py-1"><span id="totalMargenes"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
</dl>
|
||||
|
||||
<hr class="mx-n4">
|
||||
|
||||
<dl class="row mb-0">
|
||||
<dt class="col-5 fw-normal text-end">Total</dt>
|
||||
<dd class="col-6 text-end"><span id="totalAntesDescuento" class="autonumeric-resumen-currency"></span></span>
|
||||
<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>
|
||||
<dd id="dd" class="col-3 text-end py-1"><input id="total_descuentoPercent" type="number" value="" class="update-totales form-control" style="width:100% !important;"></dd>
|
||||
<dd class="col-3 py-1 text-end "><span id="descuentoTotal" class="autonumeric-resumen-currency"></span></dd>
|
||||
<dd id="dd" class="col-3 text-end py-1"><input id="total_descuentoPercent" type="number"
|
||||
value="" class="update-totales form-control" style="width:100% !important;"></dd>
|
||||
<dd class="col-3 py-1 text-end "><span id="descuentoTotal"
|
||||
class="autonumeric-resumen-currency"></span></dd>
|
||||
<dt class="col-5 text-end">Total presupuesto</dt>
|
||||
<dd class="col-6 text-end"><span id="totalDespuesDecuento" class="fw-semibold autonumeric-resumen-currency"></span></dd>
|
||||
<dd class="col-6 text-end"><span id="totalDespuesDecuento"
|
||||
class="fw-semibold autonumeric-resumen-currency"></span></dd>
|
||||
<dt class="col-5 fw-normal text-end">Precio unidad</dt>
|
||||
<dd class="col-6 text-end mb-2"><span id="precioUnidadPresupuesto" class="autonumeric-resumen-currency-4"></span></dd>
|
||||
<dd class="col-6 text-end mb-2"><span id="precioUnidadPresupuesto"
|
||||
class="autonumeric-resumen-currency-4"></span></dd>
|
||||
<dt class="col-5 fw-normal text-end" style="font-size: smaller !important;">Factor</dt>
|
||||
<dd class="col-6 text-end mb-2 "><span id="factor" class="autonumeric-resumen-2" style="font-size: smaller !important;"></span></dd>
|
||||
<dt class="col-5 fw-normal text-end" style="font-size: smaller !important;">Factor Ponderado</dt>
|
||||
<dd class="col-6 text-end mb-0"><span id="factor_ponderado" class="autonumeric-resumen-2" style="font-size: smaller !important;"></span></dd>
|
||||
<dd class="col-6 text-end mb-2 "><span id="factor" class="autonumeric-resumen-2"
|
||||
style="font-size: smaller !important;"></span></dd>
|
||||
<dt class="col-5 fw-normal text-end" style="font-size: smaller !important;">Factor Ponderado
|
||||
</dt>
|
||||
<dd class="col-6 text-end mb-0"><span id="factor_ponderado" class="autonumeric-resumen-2"
|
||||
style="font-size: smaller !important;"></span></dd>
|
||||
</dl>
|
||||
</div>
|
||||
<div class="d-grid float-end mb-4">
|
||||
<div class="form-check form-switch mb-2">
|
||||
<input class="form-check-input" <?= $presupuestoEntity->estado_id == 2 ? 'onclick="return false;"' : ''; ?> type="checkbox" id="confirmar_presupuesto" name="confirmar_presupuesto" value="1" <?= $presupuestoEntity->estado_id == 2 ? 'checked' : ''; ?>>
|
||||
<label class="form-check-label" for="confirmar_presupuesto"><?= $presupuestoEntity->estado_id == 2 ? lang('Presupuestos.confirmado') : lang('Presupuestos.confirmar'); ?></label>
|
||||
<input class="form-check-input" <?= $presupuestoEntity->estado_id == 2 ? 'onclick="return false;"' : ''; ?> type="checkbox" id="confirmar_presupuesto"
|
||||
name="confirmar_presupuesto" value="1" <?= $presupuestoEntity->estado_id == 2 ? 'checked' : ''; ?>>
|
||||
<label class="form-check-label"
|
||||
for="confirmar_presupuesto"><?= $presupuestoEntity->estado_id == 2 ? lang('Presupuestos.confirmado') : lang('Presupuestos.confirmar'); ?></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -92,18 +115,53 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<?php if ($presupuestoEntity->estado_id == 2): ?>
|
||||
<div class="row mt-5">
|
||||
<div class="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' : '' ?>>
|
||||
</div><!--//.mb-3 -->
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
</div> <!-- //.accordion-body -->
|
||||
</div> <!-- //.accordion-collapse -->
|
||||
</div> <!-- //.accordion-item -->
|
||||
</div> <!-- //.accordion -->
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-sm-6 d-flex align-items-end mb-md-0 mb-2">
|
||||
<button type="button" id="btn_ajustar_revisado"
|
||||
class="btn btn-primary w-100">Ajustar</button>
|
||||
</div>
|
||||
</div>
|
||||
<?php /*if ($presupuestoEntity->estado_id == 2): ?>
|
||||
<div class="row">
|
||||
<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 text-center fs-5 autonumeric-resumen-currency" value="" <?php echo ($tipo_impresion_id == 21) ? ' max=80' : '' ?>>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; */?>
|
||||
<div class="row">
|
||||
<p>
|
||||
<span id="aprobado_by_at"></span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- //.card-body -->
|
||||
</div> <!-- //.card -->
|
||||
</div> <!-- //.col-xl-12 -->
|
||||
</div> <!-- //.accordion-body -->
|
||||
</div> <!-- //.accordion-collapse -->
|
||||
</div> <!-- //.accordion-item -->
|
||||
Reference in New Issue
Block a user