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/presupuesto_cliente_2'

Browse Source 
Main

See merge request jjimenez/safekat!240
This commit is contained in:
Jaime Jimenez Ortega
2024-05-08 18:45:04 +00:00
parent feebbed24d b0731379c0
commit e04c978c38
210 changed files with 886 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,7 +301,7 @@ class ClienteModel extends \App\Models\BaseModel
->orLike("t1.soporte_id", $search)
->orLike("t1.forma_pago_id", $search)
->orLike("t1.vencimiento", $search)
->orLike("t5.id_user", $search)
->orLike("t5.id", $search)
->orLike("t5.first_name", $search)
->orLike("t5.last_name", $search)
->orLike("t7.id", $search)

2
ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
View File

@ -48,7 +48,7 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
public function getPrecioTarifa($tarifa_acabado_id, $tirada, $POD){
$modelTarifa = model('App\Models\Tarifas\TarifaacabadoModel');
$modelTarifa = model('App\Models\Tarifas\Acabados\TarifaAcabadoModel');
$tarifa_value = $modelTarifa->getTarifaPresupuestoAcabado($tarifa_acabado_id, $tirada);
if (count($tarifa_value)>0) {

2
ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php → ci4/app/Models/Tarifas/Acabados/TarifaAcabadoLineaModel.php Executable file → Normal file
View File

@ -1,5 +1,5 @@
<?php
namespace App\Models\Tarifas;
namespace App\Models\Tarifas\Acabados;
class TarifaAcabadoLineaModel extends \App\Models\BaseModel
{

6
ci4/app/Models/Tarifas/TarifaacabadoModel.php → ci4/app/Models/Tarifas/Acabados/TarifaAcabadoModel.php Executable file → Normal file
View File

@ -1,7 +1,7 @@
<?php
namespace App\Models\tarifas;
namespace App\Models\Tarifas\Acabados;
class TarifaacabadoModel extends \App\Models\BaseModel
class TarifaAcabadoModel extends \App\Models\BaseModel
{
protected $table = "lg_tarifa_acabado";
@ -31,7 +31,7 @@ class TarifaacabadoModel extends \App\Models\BaseModel
"user_created_id",
"user_updated_id",
];
protected $returnType = 'App\Entities\Tarifas\TarifaacabadoEntity';
protected $returnType = 'App\Entities\Tarifas\Acabados\TarifaAcabadoEntity';
protected $useTimestamps = true;
protected $useSoftDeletes = false;