diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 02543965..eb781603 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -63,7 +63,7 @@ $routes->group('tarifas', ['namespace' => 'App\Controllers\Tarifas'], function ( $routes->get('encuadernacion/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_encuadernacion_maquina/$1'); $routes->get('extra/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_extra_maquina/$1'); }); - + /* Acabados */ $routes->group('acabados', ['namespace' => 'App\Controllers\Tarifas\Acabados'], function ($routes) { @@ -331,7 +331,7 @@ $routes->group('maquinas', ['namespace' => 'App\Controllers\Configuracion'], fun $routes->post('allmenuitems', 'Maquinas::allItemsSelect', ['as' => 'select2ItemsOfMaquinas']); $routes->post('menuitems', 'Maquinas::menuItems', ['as' => 'menuItemsOfMaquinas']); $routes->post('duplicate/(:num)', 'Maquinas::duplicate/$1', ['as' => 'duplicateMaquina']); - $routes->get('(:num)','Maquinas::find_maquina/$1',['as' => 'findMaquina']); + $routes->get('(:num)', 'Maquinas::find_maquina/$1', ['as' => 'findMaquina']); $routes->get('select', 'Maquinas::select', ['as' => 'selectMaquinas']); }); $routes->resource('maquinas', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Maquinas', 'except' => 'show,new,create,update']); @@ -592,18 +592,23 @@ $routes->group('tarifasenvioszonas', ['namespace' => 'App\Controllers\Tarifas'], }); $routes->resource('tarifasenvioszonas', ['namespace' => 'App\Controllers\Tarifas', 'controller' => 'Tarifasenvioszonas', 'except' => 'show,new,create,update']); - -$routes->group('proveedores', ['namespace' => 'App\Controllers\Compras'], function ($routes) { - $routes->get('', 'Proveedores::index', ['as' => 'proveedorList']); - $routes->get('add', 'Proveedores::add', ['as' => 'newProveedor']); - $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('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']); +/* Compras */ +$routes->group('compras', ['namespace' => 'App\Controllers\Compras'], function ($routes) { + $routes->group('proveedores', ['namespace' => 'App\Controllers\Compras'], function ($routes) { + $routes->get('', 'Proveedores::index', ['as' => 'proveedorList']); + $routes->get('add', 'Proveedores::add', ['as' => 'newProveedor']); + $routes->post('add', 'Proveedores::add', ['as' => 'createProveedor']); + $routes->post('create', 'Proveedores::create', ['as' => 'ajaxCreateProveedor']); + $routes->put('(:num)/update', 'Proveedores::update/$1', ['as' => 'ajaxUpdateProveedor']); + $routes->get('edit/(:num)', 'Proveedores::edit/$1', ['as' => 'editProveedor']); + $routes->post('edit/(:num)', 'Proveedores::edit/$1', ['as' => 'updateProveedor']); + $routes->post('datatable', 'Proveedores::datatable', ['as' => 'dataTableOfProveedores']); + $routes->get('delete/(:num)', 'Proveedores::delete/$1', ['as' => 'deleteProveedores']); + $routes->post('allmenuitems', 'Proveedores::allItemsSelect', ['as' => 'select2ItemsOfProveedores']); + $routes->post('menuitems', 'Proveedores::menuItems', ['as' => 'menuItemsOfProveedores']); + }); }); + $routes->resource('proveedores', ['namespace' => 'App\Controllers\Compras', 'controller' => 'Proveedores', 'except' => 'show,new,create,update']); $routes->group('proveedorestipos', ['namespace' => 'App\Controllers\Compras'], function ($routes) { @@ -954,7 +959,7 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->post('hebra/(:num)', 'ChatController::update_hebra/$1', ['as' => 'updateHebra']); $routes->get('hebra/(:alpha)/(:num)', "ChatController::get_hebra/$1/$2", ["as" => "getHebra"]); - $routes->get('users/message/notifications-unviewed/(:num)','ChatController::get_notifications_not_viewed_from_message/$1'); + $routes->get('users/message/notifications-unviewed/(:num)', 'ChatController::get_notifications_not_viewed_from_message/$1'); }); @@ -1014,11 +1019,11 @@ $routes->group('produccion', ['namespace' => 'App\Controllers\Produccion'], func $routes->get('pdf/(:num)', 'Ordentrabajo::get_pdf/$1'); $routes->get('portada/(:num)', 'Ordentrabajo::get_portada_img/$1'); $routes->group('planning', ['namespace' => 'App\Controllers\Produccion'], function ($routes) { - $routes->get('select/maquina/rotativa','Ordentrabajo::select_maquina_planning_rot'); - $routes->get('select/papel/rotativa','Ordentrabajo::select_papel_planning_rot'); - $routes->get('select/maquina/plana','Ordentrabajo::select_maquina_planning_plana'); - $routes->get('select/maquina/padre/plana','Ordentrabajo::select_maquina_padre_planning_plana'); - $routes->get('select/papel/plana','Ordentrabajo::select_papel_planning_plana'); + $routes->get('select/maquina/rotativa', 'Ordentrabajo::select_maquina_planning_rot'); + $routes->get('select/papel/rotativa', 'Ordentrabajo::select_papel_planning_rot'); + $routes->get('select/maquina/plana', 'Ordentrabajo::select_maquina_planning_plana'); + $routes->get('select/maquina/padre/plana', 'Ordentrabajo::select_maquina_padre_planning_plana'); + $routes->get('select/papel/plana', 'Ordentrabajo::select_papel_planning_plana'); $routes->get('rotativa', 'Ordentrabajo::index_planning_rotativa'); $routes->get('papel/datatable', 'Ordentrabajo::papel_gramaje_datatable'); $routes->get('papel/plana/datatable', 'Ordentrabajo::papel_pliego_datatable'); @@ -1032,7 +1037,7 @@ $routes->group('produccion', ['namespace' => 'App\Controllers\Produccion'], func }); $routes->group('logistica', ['namespace' => 'App\Controllers\Logistica'], function ($routes) { - $routes->get('print/label/test','LogisticaController::print_test_label'); + $routes->get('print/label/test', 'LogisticaController::print_test_label'); }); /* @@ -1041,7 +1046,7 @@ $routes->group('logistica', ['namespace' => 'App\Controllers\Logistica'], functi * -------------------------------------------------------------------- */ $routes->post('auth/jwt', '\App\Controllers\Sistema\AuthAPIController::jwtLogin'); - + $routes->group( 'api', [ diff --git a/ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php b/ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php index 9ac985b2..3dd57b41 100644 --- a/ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php @@ -1,141 +1,153 @@ -
-
-
- - -
+
+
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - + - - - - -
+ + + + +
-
- - -
+
+ + +
-
-
-
- - - $v) : ?> - - - -
+ $v): ?> + + + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - - $v) : ?> - - - -
+ $v): ?> + + + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
+ - + - \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php b/ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php index 79a5d7ba..bc4b8433 100644 --- a/ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php +++ b/ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php @@ -8,22 +8,21 @@

-
+ + -
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - -
+ -
- " - /> - "btn btn-secondary float-start"]) ?> -
+
+ " + /> + "btn btn-secondary float-start"]) ?> +