Terminado modulo proveedores

This commit is contained in:
Jaime Jiménez
2023-08-05 17:51:32 +02:00
parent 121b270dd0
commit 2e820fb12b
3 changed files with 7 additions and 2 deletions

View File

@ -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']);

View File

@ -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');

View File

@ -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