jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/varios_presupuesto_admin' into 'main'

Browse Source 
arreglado calculo de credito total y vista en euros del toast del total de presupuesto en admin

See merge request jjimenez/safekat!626
This commit is contained in:
Jaime Jimenez Ortega
2025-03-30 08:30:08 +00:00
parent 4810ab99c1 5a5ce4835b
commit f553641818
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Models/Clientes/ClienteModel.php
View File

@ -577,7 +577,6 @@ class ClienteModel extends \App\Models\BaseModel
$result['total_pendiente'] = $result['total_pendiente'] =
$result['total_facturas_sin_pagar'] $result['total_facturas_sin_pagar']
- $result['total_facturas_pagadas']
+ $result['total_pedidos_produccion'] + $result['total_pedidos_produccion']
+ $result['total_pedidos_finalizados']; + $result['total_pedidos_finalizados'];
$result['total_pendiente'] = round(floatval($result['total_pendiente']), 2); $result['total_pendiente'] = round(floatval($result['total_pendiente']), 2);

2
httpdocs/assets/js/safekat/components/alerts/sweetAlert.js
View File

@ -65,7 +65,7 @@ export const toastPresupuestoSummary = (value, target = 'body') => {
html: ` html: `
<div class="d-flex flex-column p-0 m-0"> <div class="d-flex flex-column p-0 m-0">
<p class="m-0">Total presupuesto</p> <p class="m-0">Total presupuesto</p>
<span class="badge badge-label-primary fs-small">${value}</span> <span class="badge badge-label-primary fs-small autonumeric-resumen-currency">${value}</span>
</div>`, </div>`,
customClass: { customClass: {
popup: 'bg-primary text-white', popup: 'bg-primary text-white',