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 'main' into 'dev/resumen_lateral'

Browse Source 
Main

See merge request jjimenez/safekat!371
This commit is contained in:
Jaime Jimenez Ortega
2024-11-12 18:49:14 +00:00
parent c32ebc153f 66cf7ec99e
commit 6b8ebba4e2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -396,14 +396,16 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
for ($i = 0; $i < count($tirada); $i++) { for ($i = 0; $i < count($tirada); $i++) {
$coste_envio = 0.0; $coste_envio = 0.0;
$primer_envio = false;
foreach ($direcciones as $direccion) { foreach ($direcciones as $direccion) {
$coste_direccion = $this->getCosteEnvio( $coste_direccion = $this->getCosteEnvio(
$direccion['id'], $direccion['id'],
$return_data['peso'][$i], $return_data['peso'][$i],
$direccion['unidades'], !$primer_envio? intval($tirada[$i]) : $direccion['unidades'],
$direccion['entregaPalets'] == 'true' ? 1 : 0 $direccion['entregaPalets'] == 'true' ? 1 : 0
)[0]; )[0];
$primer_envio = true;
if (!property_exists($coste_direccion, 'coste')) { if (!property_exists($coste_direccion, 'coste')) {

4
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/items/_datosGenerales.php
View File

@ -49,7 +49,7 @@
</div> </div>
<div class="col-sm-5 mb-3 d-flex flex-column align-items-center"> <div class="col-sm-5 mb-3 d-flex flex-column align-items-center <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " d-none" : "" ?>" >
<label <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?> <label <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?>
id="label_clienteId" for="clienteId" class="form-label"> id="label_clienteId" for="clienteId" class="form-label">
Cliente* Cliente*
@ -64,7 +64,7 @@
</div> </div>
<div class="row col-sm-5 mb-3 d-flex flex-column align-items-center"> <div class="col-sm-5 mb-3 d-flex flex-column align-items-center <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " d-none" : "" ?>" >
<div class="form-check form-switch mb-2"> <div class="form-check form-switch mb-2">
<input <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?> <input <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?>
class="calcular-presupuesto form-check-input" type="checkbox" id="excluirRotativa" class="calcular-presupuesto form-check-input" type="checkbox" id="excluirRotativa"

2
httpdocs/assets/js/safekat/pages/presupuestoCliente/direcciones.js
View File

@ -136,7 +136,7 @@ class Direcciones {
this.direcciones.forEach(direccion => { this.direcciones.forEach(direccion => {
total_envio += parseInt(direccion.getUnidades()); total_envio += parseInt(direccion.getUnidades());
}); });
if (total_envio < unidades) { if (total_envio <= unidades) {
return true; return true;
} }
} }