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

terminado importador

Browse Source
This commit is contained in:
Jaime Jiménez
2025-03-18 20:19:54 +01:00
parent daafdf2d5a
commit e9c889624d
8 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1765,7 +1765,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$direccion['direccion'],
$peso_libro,
$direccion['unidades'],
$direccion['entregaPalets'] == 'false' ? 0 : 1,
($direccion['entregaPalets'] == 'false' || $direccion['entregaPalets'] == 0) ? 0 : 1,
false
);
@ -1776,7 +1776,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
unset($data->id);
$data->precio = $data->coste;
unset($data->coste);
$data->entregaPieCalle = $direccion['entregaPalets'] == 'false' ? 0 : 1;
$data->entregaPieCalle = ($direccion['entregaPalets'] == 'false' || $direccion['entregaPalets'] == 0) ? 0 : 1;
unset($data->tipo);
$data->peso = $peso_envio;
$data->cantidad = $unidades;
@ -1887,15 +1887,21 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$margen = $tarifas_envio[$i]->margen;
}
$tarifa_envio_final = null;
if (count($tarifas_envio) > 1) {
$tarifa_final = array_reduce($tarifas_envio, function ($previous, $current) {
$tarifa_envio_final = array_reduce($tarifas_envio, function ($previous, $current) {
return $current->precio < $previous->precio ? $current : $previous;
});
$coste = $tarifa_final->precio;
} else {
if (count($tarifas_envio) > 0)
$coste = $tarifas_envio[0]->precio;
$margen = $tarifas_envio[0]->margen;
if (count($tarifas_envio) > 0){
$tarifa_envio_final = $tarifas_envio[0];
}
}
$coste = $tarifa_envio_final->precio;
$margen = $tarifa_envio_final->margen;
if(!isset($return_data['id'])){
$return_data['id'] = $tarifa_envio_final->id;
}
$return_data['coste'] = $coste;