Merge branch 'fix/compras_proveedores' into 'main'

Arreglado menu compras/proveedores

See merge request jjimenez/safekat!677
This commit is contained in:
Ignacio Martinez Navajas
2025-04-07 22:42:27 +00:00
3 changed files with 170 additions and 154 deletions

View File

@ -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',
[

View File

@ -1,141 +1,153 @@
<div class="row">
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<label for="nombre" class="form-label">
<?=lang('Proveedores.nombre') ?>*
</label>
<input type="text" id="nombre" name="nombre" tabindex="1" maxLength="255" class="form-control" value="<?=old('nombre', $proveedorEntity->nombre) ?>">
</div><!--//.mb-3 -->
<div class="row">
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<label for="nombre" class="form-label">
<?= lang('Proveedores.nombre') ?>*
</label>
<input type="text" id="nombre" name="nombre" tabindex="1" maxLength="255" class="form-control"
value="<?= old('nombre', $proveedorEntity->nombre) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="razonSocial" class="form-label">
<?=lang('Proveedores.razonSocial') ?>
</label>
<input type="text" id="razonSocial" name="razon_social" tabindex="3" maxLength="255" class="form-control" value="<?=old('razon_social', $proveedorEntity->razon_social) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="razonSocial" class="form-label">
<?= lang('Proveedores.razonSocial') ?>
</label>
<input type="text" id="razonSocial" name="razon_social" tabindex="3" maxLength="255" class="form-control"
value="<?= old('razon_social', $proveedorEntity->razon_social) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="direccion" class="form-label">
<?=lang('Proveedores.direccion') ?>
</label>
<input type="text" id="direccion" name="direccion" tabindex="5" maxLength="255" class="form-control" value="<?=old('direccion', $proveedorEntity->direccion) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="direccion" class="form-label">
<?= lang('Proveedores.direccion') ?>
</label>
<input type="text" id="direccion" name="direccion" tabindex="5" maxLength="255" class="form-control"
value="<?= old('direccion', $proveedorEntity->direccion) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="ciudad" class="form-label">
<?=lang('Proveedores.ciudad') ?>
</label>
<input type="text" id="ciudad" name="ciudad" tabindex="7" maxLength="255" class="form-control" value="<?=old('ciudad', $proveedorEntity->ciudad) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="ciudad" class="form-label">
<?= lang('Proveedores.ciudad') ?>
</label>
<input type="text" id="ciudad" name="ciudad" tabindex="7" maxLength="255" class="form-control"
value="<?= old('ciudad', $proveedorEntity->ciudad) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="paisId" class="form-label">
<?=lang('Proveedores.paisId') ?>
</label>
<select id="paisId" name="pais_id" tabindex="9" class="form-control select2bs" style="width: 100%;" >
<option value=""><?=lang('Basic.global.pleaseSelectA', [lang('Proveedores.paisId')]) ?></option>
<div class="mb-3">
<label for="paisId" class="form-label">
<?= lang('Proveedores.paisId') ?>
</label>
<select id="paisId" name="pais_id" tabindex="9" class="form-control select2bs" style="width: 100%;">
<option value=""><?= lang('Basic.global.pleaseSelectA', [lang('Proveedores.paisId')]) ?></option>
<?php foreach ($paisList as $item) : ?>
<option value="<?=$item->id ?>"<?=$item->id==$proveedorEntity->pais_id ? ' selected':'' ?>>
<?=$item->nombre ?>
</option>
<?php endforeach; ?>
</select>
</div><!--//.mb-3 -->
<?php foreach ($paisList as $item): ?>
<option value="<?= $item->id ?>" <?= $item->id == $proveedorEntity->pais_id ? ' selected' : '' ?>>
<?= $item->nombre ?>
</option>
<?php endforeach; ?>
</select>
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="email" class="form-label">
<?=lang('Proveedores.email') ?>
</label>
<input type="email" id="email" name="email" tabindex="11" maxLength="255" class="form-control" value="<?=old('email', $proveedorEntity->email) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="email" class="form-label">
<?= lang('Proveedores.email') ?>
</label>
<input type="email" id="email" name="email" tabindex="11" maxLength="255" class="form-control"
value="<?= old('email', $proveedorEntity->email) ?>">
</div><!--//.mb-3 -->
</div><!--//.col -->
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<label for="tipoId" class="form-label">
<?=lang('Proveedores.tipoId') ?>*
</label>
<select id="tipoId" name="tipo_id" tabindex="2" class="form-control select2bs2" style="width: 100%;" >
</div><!--//.col -->
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<label for="tipoId" class="form-label">
<?= lang('Proveedores.tipoId') ?>*
</label>
<select id="tipoId" name="tipo_id" tabindex="2" class="form-control select2bs2" style="width: 100%;">
<?php if ( isset($proveedorTipoList) && is_array($proveedorTipoList) && !empty($proveedorTipoList) ) :
foreach ($proveedorTipoList as $k => $v) : ?>
<option value="<?=$k ?>"<?=$k==$proveedorEntity->tipo_id ? ' selected':'' ?>>
<?=$v ?>
</option>
<?php endforeach;
endif; ?>
</select>
</div><!--//.mb-3 -->
<?php if (isset($proveedorTipoList) && is_array($proveedorTipoList) && !empty($proveedorTipoList)):
foreach ($proveedorTipoList as $k => $v): ?>
<option value="<?= $k ?>" <?= $k == $proveedorEntity->tipo_id ? ' selected' : '' ?>>
<?= $v ?>
</option>
<?php endforeach;
endif; ?>
</select>
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="cif" class="form-label">
<?=lang('Proveedores.cif') ?>
</label>
<input type="text" id="cif" name="cif" tabindex="4" maxLength="15" class="form-control" value="<?=old('cif', $proveedorEntity->cif) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="cif" class="form-label">
<?= lang('Proveedores.cif') ?>
</label>
<input type="text" id="cif" name="cif" tabindex="4" maxLength="15" class="form-control"
value="<?= old('cif', $proveedorEntity->cif) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="cp" class="form-label">
<?=lang('Proveedores.cp') ?>
</label>
<input type="text" id="cp" name="cp" tabindex="6" maxLength="10" class="form-control" value="<?=old('cp', $proveedorEntity->cp) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="cp" class="form-label">
<?= lang('Proveedores.cp') ?>
</label>
<input type="text" id="cp" name="cp" tabindex="6" maxLength="10" class="form-control"
value="<?= old('cp', $proveedorEntity->cp) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="provinciaId" class="form-label">
<?=lang('Proveedores.provinciaId') ?>
</label>
<select id="provinciaId" name="provincia_id" tabindex="8" class="form-control select2bs2" style="width: 100%;" >
<div class="mb-3">
<label for="provinciaId" class="form-label">
<?= lang('Proveedores.provinciaId') ?>
</label>
<select id="provinciaId" name="provincia_id" tabindex="8" class="form-control select2bs2"
style="width: 100%;">
<?php if ( isset($provinciaList) && is_array($provinciaList) && !empty($provinciaList) ) :
foreach ($provinciaList as $k => $v) : ?>
<option value="<?=$k ?>"<?=$k==$proveedorEntity->provincia_id ? ' selected':'' ?>>
<?=$v ?>
</option>
<?php endforeach;
endif; ?>
</select>
</div><!--//.mb-3 -->
<?php if (isset($provinciaList) && is_array($provinciaList) && !empty($provinciaList)):
foreach ($provinciaList as $k => $v): ?>
<option value="<?= $k ?>" <?= $k == $proveedorEntity->provincia_id ? ' selected' : '' ?>>
<?= $v ?>
</option>
<?php endforeach;
endif; ?>
</select>
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="personaContacto" class="form-label">
<?=lang('Proveedores.personaContacto') ?>
</label>
<input type="text" id="personaContacto" name="persona_contacto" tabindex="10" maxLength="255" class="form-control" value="<?=old('persona_contacto', $proveedorEntity->persona_contacto) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="personaContacto" class="form-label">
<?= lang('Proveedores.personaContacto') ?>
</label>
<input type="text" id="personaContacto" name="persona_contacto" tabindex="10" maxLength="255"
class="form-control" value="<?= old('persona_contacto', $proveedorEntity->persona_contacto) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="telefono" class="form-label">
<?=lang('Proveedores.telefono') ?>
</label>
<input type="text" id="telefono" name="telefono" tabindex="12" maxLength="60" class="form-control" value="<?=old('telefono', $proveedorEntity->telefono) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<label for="telefono" class="form-label">
<?= lang('Proveedores.telefono') ?>
</label>
<input type="text" id="telefono" name="telefono" tabindex="12" maxLength="60" class="form-control"
value="<?= old('telefono', $proveedorEntity->telefono) ?>">
</div><!--//.mb-3 -->
</div><!--//.col -->
</div><!--//.col -->
</div><!-- //.row -->
</div><!-- //.row -->
<div class="row" id="row_transporte" style="display:none;">
<div class="row" id="row_transporte" style="display:none;">
<div class="mb-3">
<div class="form-check">
<div class="mb-3">
<div class="form-check">
<label for="cajas" class="form-check-label">
<input type="checkbox" id="cajas" name="cajas" value="1" class="form-check-input" <?= $proveedorEntity->cajas == true ? 'checked' : ''; ?>>
<?= lang('Proveedores.cajas') ?>
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="form-check">
<label for="cajas" class="form-check-label">
<input type="checkbox" id="cajas" name="cajas" value="1" class="form-check-input"
<?= $proveedorEntity->cajas == true ? 'checked' : ''; ?>>
<?= lang('Proveedores.cajas') ?>
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<label for="palets" class="form-check-label">
<input type="checkbox" id="palets" name="palets" value="1" class="form-check-input" <?= $proveedorEntity->palets == true ? 'checked' : ''; ?>>
<?= lang('Proveedores.palets') ?>
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
</div><!-- //.row -->
<div class="mb-3">
<div class="form-check">
<label for="palets" class="form-check-label">
<input type="checkbox" id="palets" name="palets" value="1" class="form-check-input"
<?= $proveedorEntity->palets == true ? 'checked' : ''; ?>>
<?= lang('Proveedores.palets') ?>
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
</div><!-- //.row -->

View File

@ -8,22 +8,21 @@
<div class="card-header">
<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
</div><!--//.card-header -->
<form id="proveedorForm" method="post" action="<?= $formAction ?>">
<form id="proveedorForm" class="card-body" method="post" action="<?= $formAction ?>">
<?= csrf_field() ?>
<div class="card-body">
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/vuexy/form/compras/proveedores/_proveedorFormItems") ?>
</div><!-- /.card-body -->
<?= view("themes/vuexy/form/compras/proveedores/_proveedorFormItems") ?>
<div class="pt-4">
<input type="submit"
class="btn btn-primary float-start me-sm-3 me-1"
name="save"
value="<?= lang("Basic.global.Save") ?>"
/>
<?= anchor(route_to("proveedorList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
</div><!-- /.card-footer -->
<div class="pt-4">
<input type="submit"
class="btn btn-primary float-start me-sm-3 me-1"
name="save"
value="<?= lang("Basic.global.Save") ?>"
/>
<?= anchor(route_to("proveedorList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
</div><!-- /.card-footer -->
</form>
</div><!-- //.card -->