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 'fix/arreglar_resumen_cliente_vs_admin'

Browse Source 
Main

See merge request jjimenez/safekat!678
This commit is contained in:
Ignacio Martinez Navajas
2025-04-07 22:43:25 +00:00
parent 644ad41001 982b008ada
commit ab4afe7492
3 changed files with 170 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ci4/app/Config/Routes.php
View File

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

36
ci4/app/Views/themes/vuexy/form/compras/proveedores/_proveedorFormItems.php
View File

@ -4,28 +4,32 @@
<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) ?>">
<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) ?>">
<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) ?>">
<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) ?>">
<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">
@ -47,7 +51,8 @@
<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) ?>">
<input type="email" id="email" name="email" tabindex="11" maxLength="255" class="form-control"
value="<?= old('email', $proveedorEntity->email) ?>">
</div><!--//.mb-3 -->
</div><!--//.col -->
@ -72,21 +77,24 @@
<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) ?>">
<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) ?>">
<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%;" >
<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): ?>
@ -102,14 +110,16 @@
<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) ?>">
<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) ?>">
<input type="text" id="telefono" name="telefono" tabindex="12" maxLength="60" class="form-control"
value="<?= old('telefono', $proveedorEntity->telefono) ?>">
</div><!--//.mb-3 -->
</div><!--//.col -->
@ -122,7 +132,8 @@
<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' : ''; ?>>
<input type="checkbox" id="cajas" name="cajas" value="1" class="form-check-input"
<?= $proveedorEntity->cajas == true ? 'checked' : ''; ?>>
<?= lang('Proveedores.cajas') ?>
</label>
</div><!--//.form-check -->
@ -132,7 +143,8 @@
<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' : ''; ?>>
<input type="checkbox" id="palets" name="palets" value="1" class="form-check-input"
<?= $proveedorEntity->palets == true ? 'checked' : ''; ?>>
<?= lang('Proveedores.palets') ?>
</label>
</div><!--//.form-check -->

5
ci4/app/Views/themes/vuexy/form/compras/proveedores/viewProveedorForm.php
View File

@ -8,13 +8,12 @@
<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 -->
<div class="pt-4">
<input type="submit"