From 2e820fb12b40ff6fb8bb6e520289d6204a0f24ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Sat, 5 Aug 2023 17:51:32 +0200 Subject: [PATCH] Terminado modulo proveedores --- ci4/app/Config/Routes.php | 2 +- ci4/app/Controllers/Compras/Proveedores.php | 2 +- ci4/app/Models/Compras/ProveedorModel.php | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index f15b815d..dc4faebe 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -385,7 +385,7 @@ $routes->group('proveedores', ['namespace' => 'App\Controllers\Compras'], functi $routes->post('add', 'Proveedores::add', ['as' => 'createProveedor']); $routes->post('create', 'Proveedores::create', ['as' => 'ajaxCreateProveedor']); $routes->put('(:num)/update', 'Proveedores::update/$1', ['as' => 'ajaxUpdateProveedor']); - $routes->post('(:num)/edit', 'Proveedores::edit/$1', ['as' => 'updateProveedor']); + $routes->post('edit/(:num)', 'Proveedores::edit/$1', ['as' => 'updateProveedor']); $routes->post('datatable', 'Proveedores::datatable', ['as' => 'dataTableOfProveedores']); $routes->post('allmenuitems', 'Proveedores::allItemsSelect', ['as' => 'select2ItemsOfProveedores']); $routes->post('menuitems', 'Proveedores::menuItems', ['as' => 'menuItemsOfProveedores']); diff --git a/ci4/app/Controllers/Compras/Proveedores.php b/ci4/app/Controllers/Compras/Proveedores.php index 6950f26f..6c524d49 100644 --- a/ci4/app/Controllers/Compras/Proveedores.php +++ b/ci4/app/Controllers/Compras/Proveedores.php @@ -204,7 +204,7 @@ class Proveedores extends \App\Controllers\GoBaseResourceController { $this->viewData['provinciaList'] = $this->getProvinciaListItems($proveedorEntity->provincia_id ?? null); $this->viewData['paisList'] = $this->getPaisListItems(); - $this->viewData['formAction'] = route_to('updateProveedor', $id); + $this->viewData['formAction'] = route_to('updateProveedor', $id); $this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('Proveedores.moduleTitle').' '.lang('Basic.global.edit3'); diff --git a/ci4/app/Models/Compras/ProveedorModel.php b/ci4/app/Models/Compras/ProveedorModel.php index b5d5896a..0d21344f 100644 --- a/ci4/app/Models/Compras/ProveedorModel.php +++ b/ci4/app/Models/Compras/ProveedorModel.php @@ -31,6 +31,8 @@ class ProveedorModel extends \App\Models\GoBaseModel "persona_contacto", "email", "telefono", + "is_deleted", + "deleted_at" ]; protected $returnType = "App\Entities\Compras\ProveedorEntity"; @@ -159,6 +161,9 @@ class ProveedorModel extends \App\Models\GoBaseModel $builder->join("lg_provincias t3", "t1.provincia_id = t3.id", "left"); $builder->join("lg_paises t4", "t1.pais_id = t4.id", "left"); + //JJO + $builder->where("t1.is_deleted", 0); + return empty($search) ? $builder : $builder