diff --git a/ci4/app/Config/RBAC/permissionMatrix.php b/ci4/app/Config/RBAC/permissionMatrix.php index adc25c5b..e0b0fec1 100644 --- a/ci4/app/Config/RBAC/permissionMatrix.php +++ b/ci4/app/Config/RBAC/permissionMatrix.php @@ -29,6 +29,8 @@ const SK_PERMISSION_MATRIX = [ "pedidos-cancelados.menu", "pedidos-todos.view", "pedidos-todos.menu", + "pedidos-gestion.toprod", + "pedidos-gestion.menu", "tarifa-preimpresion.create", "tarifa-preimpresion.edit", "tarifa-preimpresion.delete", @@ -169,6 +171,29 @@ const SK_PERMISSION_MATRIX = [ "token.menu", ], "director" => [ + "clientes.create", + "clientes.edit", + "clientes.menu", + "plantilla-tarifa.create", + "plantilla-tarifa.edit", + "plantilla-tarifa.menu", + "direcciones.create", + "direcciones.edit", + "direcciones.menu", + "presupuesto.create", + "presupuesto.edit", + "presupuesto.menu", + "presupuesto-cliente.create", + "presupuesto-cliente.edit", + "presupuesto-cliente.menu", + "pedidos-activos.view", + "pedidos-activos.menu", + "pedidos-finalizados.view", + "pedidos-finalizados.menu", + "pedidos-cancelados.view", + "pedidos-cancelados.menu", + "pedidos-todos.view", + "pedidos-todos.menu", "tarifa-preimpresion.create", "tarifa-preimpresion.edit", "tarifa-preimpresion.menu", @@ -190,6 +215,11 @@ const SK_PERMISSION_MATRIX = [ "servicio-acabado.create", "servicio-acabado.edit", "servicio-acabado.menu", + "proveedores.create", + "proveedores.edit", + "proveedores.menu", + "tickets.edit", + "tickets.menu", ], "contabilidad" => [ "token.token", diff --git a/ci4/app/Config/RBAC/permissions.php b/ci4/app/Config/RBAC/permissions.php index ac95e36a..b38701ba 100644 --- a/ci4/app/Config/RBAC/permissions.php +++ b/ci4/app/Config/RBAC/permissions.php @@ -29,6 +29,8 @@ const SK_PERMISSIONS = [ 'pedidos-cancelados.menu' => 'Menu shall be visualize', 'pedidos-todos.view' => 'Can view', 'pedidos-todos.menu' => 'Menu shall be visualize', + 'pedidos-gestion.toprod' => 'Can toprod', + 'pedidos-gestion.menu' => 'Menu shall be visualize', 'tarifa-preimpresion.create' => 'Can create', 'tarifa-preimpresion.edit' => 'Can edit', 'tarifa-preimpresion.delete' => 'Can delete', diff --git a/ci4/app/Config/RBAC/roles.php b/ci4/app/Config/RBAC/roles.php index 5ce300a9..d39a912a 100644 --- a/ci4/app/Config/RBAC/roles.php +++ b/ci4/app/Config/RBAC/roles.php @@ -31,7 +31,7 @@ const SK_ROLES = [ ], 'director' => [ 'title' => 'Director', - 'description' => '', + 'description' => 'Para los directores de área', ], 'contabilidad' => [ 'title' => 'Contabilidad', diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index ce84fa2a..45716364 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -747,6 +747,7 @@ $routes->group('pedidos', ['namespace' => 'App\Controllers\Pedidos'], function ( $routes->post('getlineas', 'Pedido::getLineas', ['as' => 'tablaLineasPedido']); $routes->post('cambiarestado', 'Pedido::cambiarEstado', ['as' => 'cambiarEstadoPedido']); $routes->post('update/(:any)', 'Pedido::update/$1', ['as' => 'actualizarPedido']); + $routes->post('insertfactura', 'Pedido::addFactura'); $routes->get('xml/(:num)', 'Pedido::get_xml_pedido/$1', ['as' => 'getXMLPedido']); $routes->post('produccion/(:num)', 'Pedido::to_produccion/$1', ['as' => 'toProduccion']); }); diff --git a/ci4/app/Controllers/Facturacion/Facturas.php b/ci4/app/Controllers/Facturacion/Facturas.php index 76ccccc6..fd5416c4 100755 --- a/ci4/app/Controllers/Facturacion/Facturas.php +++ b/ci4/app/Controllers/Facturacion/Facturas.php @@ -7,6 +7,7 @@ use App\Entities\Facturas\FacturaEntity; use App\Models\Clientes\ClienteModel; use App\Models\Collection; use Hermawan\DataTables\DataTable; +use Exception; class Facturas extends \App\Controllers\BaseResourceController { @@ -463,6 +464,37 @@ class Facturas extends \App\Controllers\BaseResourceController } } + public function delete($id = null) + { + + $user_id = auth()->user()->id; + $datetime = (new \CodeIgniter\I18n\Time("now")); + $rawResult = $this->model->where('id', $id) + ->set([ + 'deleted_at' => $datetime->format('Y-m-d H:i:s'), + 'user_updated_id' => $user_id, + ]) + ->update(); + if (!$rawResult) { + return $this->failNotFound(lang('Basic.global.deleteError', [$objName])); + } + + $modelLineas = model('\App\Models\Facturas\FacturaLineaModel'); + $rawResult = $modelLineas->where('factura_id', $id) + ->set([ + 'deleted_at' => $datetime->format('Y-m-d H:i:s'), + 'user_updated_id' => $user_id, + ]) + ->update(); + + $this->model->db->query('DELETE FROM facturas_pedidos_lineas WHERE factura_id=' . $id); + + // $message = lang('Basic.global.deleteSuccess', [$objName]); IMN commented + $message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]); + $response = $this->respondDeleted(['id' => $id, 'msg' => $message]); + return $response; + } + public function menuPedidosPendientes($cliente_id) { @@ -608,81 +640,102 @@ class Facturas extends \App\Controllers\BaseResourceController } } - public function addLineaPedidoImpresion($factura_id) + public function addLineaPedidoImpresion($factura_id, $data = -1) { - if ($this->request->isAJAX()) { - $model_pedido_linea = model('\App\Models\Pedidos\PedidoLineaModel'); - $model_presupuesto = model('\App\Models\Presupuestos\PresupuestoModel'); - $model_factura_linea = model('\App\Models\Facturas\FacturaLineaModel'); - - try { + if ($this->request) { + if ($this->request->isAJAX()) $pedido_linea_id = $this->request->getPost('lineaPedido') ?? 0; - $linea = $model_pedido_linea->find($pedido_linea_id); + } else { + if ($data == -1) { + return "Error: sin datos"; + } + $pedido_linea_id = $data; + } - $factura = $this->model->find($factura_id); + $model_pedido_linea = model('\App\Models\Pedidos\PedidoLineaModel'); + $model_presupuesto = model('\App\Models\Presupuestos\PresupuestoModel'); + $model_factura_linea = model('\App\Models\Facturas\FacturaLineaModel'); + $model_factura = model('\App\Models\Facturas\FacturaModel'); - if ($factura) { + try { - if ($linea) { - $presupuesto = $model_presupuesto->find($linea->presupuesto_id); + $linea = $model_pedido_linea->find($pedido_linea_id); - if ($presupuesto) { - // Se añade la linea de factura - $descripcion = $model_presupuesto->generarLineaPedido($presupuesto->id, true, $linea->pedido_id); - $cantidad = intval($presupuesto->tirada) - intval($this->model->getCantidadLineaPedidoFacturada($linea->id)); - $base = $cantidad * floatval($presupuesto->total_precio_unidad); - $base = round($base, 2); - $total_iva = $base * ($presupuesto->iva_reducido == 1 ? 0.04 : 0.21); - // se redondea a dos decimales - $total_iva = round($total_iva, 2); - $total = $base + $total_iva; + $factura = $model_factura->find($factura_id); - $data = (object) [ - 'factura_id' => $factura_id, - 'pedido_linea_impresion_id' => $linea->pedido_id, - 'descripcion' => $descripcion[0]->concepto, - 'cantidad' => $cantidad, - 'precio_unidad' => $presupuesto->total_precio_unidad, - 'iva' => $presupuesto->iva_reducido == 1 ? 4 : 21, - 'base' => $base, - 'total_iva' => $total_iva, - 'total' => $total, - 'user_updated_id' => auth()->user()->id, + if ($factura) { + + if ($linea) { + $presupuesto = $model_presupuesto->find($linea->presupuesto_id); + + if ($presupuesto) { + // Se añade la linea de factura + $descripcion = $model_presupuesto->generarLineaPedido($presupuesto->id, true, $linea->pedido_id); + $cantidad = intval($presupuesto->tirada) - intval($model_factura->getCantidadLineaPedidoFacturada($linea->id)); + $base = $cantidad * floatval($presupuesto->total_precio_unidad); + $base = round($base, 2); + $total_iva = $base * ($presupuesto->iva_reducido == 1 ? 0.04 : 0.21); + // se redondea a dos decimales + $total_iva = round($total_iva, 2); + $total = $base + $total_iva; + + $data = (object) [ + 'factura_id' => $factura_id, + 'pedido_linea_impresion_id' => $linea->pedido_id, + 'descripcion' => $descripcion[0]->concepto, + 'cantidad' => $cantidad, + 'precio_unidad' => $presupuesto->total_precio_unidad, + 'iva' => $presupuesto->iva_reducido == 1 ? 4 : 21, + 'base' => $base, + 'total_iva' => $total_iva, + 'total' => $total, + 'user_updated_id' => auth()->user()->id, + ]; + + $model_factura_linea->insert($data); + + $id = $model_factura_linea->getInsertID(); + + if ($id) { + + $model_factura_linea->addFacturaPedidoLinea($factura_id, $linea->id, $cantidad); + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + + $data = [ + 'error' => 0, + 'id' => $id, + $csrfTokenName => $newTokenHash ]; - - $model_factura_linea->insert($data); - - $id = $model_factura_linea->getInsertID(); - - if ($id) { - - $model_factura_linea->addFacturaPedidoLinea($factura_id, $linea->id, $cantidad); - - $newTokenHash = csrf_hash(); - $csrfTokenName = csrf_token(); - $data = [ - 'error' => 0, - 'id' => $id, - $csrfTokenName => $newTokenHash - ]; - return $this->respond($data); + if ($this->request) { + if ($this->request->isAJAX()) + return $this->respond($data); + } else { + // remove csrf token + unset($data[$csrfTokenName]); + return $data; } } } } - } catch (Exception $e) { - } - + } catch (Exception $e) { $newTokenHash = csrf_hash(); $csrfTokenName = csrf_token(); $data = [ + 'error' => 1, + 'error_text' => $e->getMessage(), $csrfTokenName => $newTokenHash ]; - return $this->respond($data); - } else { - return $this->failUnauthorized('Invalid request', 403); + if ($this->request) { + if ($this->request->isAJAX()) + return $this->respond($data); + } else { + unset($data[$csrfTokenName]); + return $data; + } } } diff --git a/ci4/app/Controllers/Pedidos/Pedido.php b/ci4/app/Controllers/Pedidos/Pedido.php index 864933e1..08fd9325 100755 --- a/ci4/app/Controllers/Pedidos/Pedido.php +++ b/ci4/app/Controllers/Pedidos/Pedido.php @@ -2,6 +2,7 @@ namespace App\Controllers\Pedidos; use App\Controllers\BaseController; +use App\Controllers\Facturacion\Facturas; use App\Entities\Pedidos\PedidoEntity; use App\Models\Collection; use App\Models\Pedidos\PedidoModel; @@ -366,6 +367,74 @@ class Pedido extends \App\Controllers\BaseResourceController } } + + public function addFactura(){ + + if($this->request->isAJAX()){ + + + $modelFactura = model('App\Models\Facturas\FacturaModel'); + $modelFacturaLinea = model('App\Models\Facturas\FacturaLineaModel'); + + $pedido_id = $this->request->getPost('pedido_id'); + $serie_id = $this->request->getPost('serie_id'); + + $datosFactura = $this->model->obtenerDatosForFactura($pedido_id); + + if(count($datosFactura) == 0){ + return $this->respond(['status' => 'error', 'message' => 'Error obteniendo datos de factura']); + } + + $datosFactura = $datosFactura[0]; + + $modelFactura->insert([ + 'cliente_id' => $datosFactura->cliente_id, + 'serie_id' => $serie_id, + 'estado' => 'borrador', + 'estado_pago' => 'pendiente', + 'fecha_factura_at' => date('Y-m-d'), + 'cliente_nombre' => $datosFactura->cliente_nombre, + 'cliente_cif' => $datosFactura->cliente_cif, + 'cliente_pais' => $datosFactura->cliente_pais, + 'cliente_address' => $datosFactura->cliente_direccion, + 'cliente_cp' => $datosFactura->cliente_cp, + 'cliente_cuidad' => $datosFactura->cliente_ciudad, + 'cliente_provincia' => $datosFactura->cliente_provincia, + 'user_created_id' => auth()->user()->id, + 'user_updated_id' => auth()->user()->id + ]); + + $factura_id = $modelFactura->getInsertID(); + + if($factura_id){ + + $model_pedido_linea = model('\App\Models\Pedidos\PedidoLineaModel'); + $lineas = $model_pedido_linea->where('pedido_id', $pedido_id)->first(); + $facturas = new Facturas(); + $result = $facturas->addLineaPedidoImpresion($factura_id, $lineas->id); + if($result['error'] == 0){ + // Se actualiza el precio total de la factura obtenido de la linea añadida + $linea_added = $modelFacturaLinea->where('factura_id', $factura_id)->first(); + $modelFactura->set([ + 'base' => $linea_added->base, + 'total' => $linea_added->total, + 'pendiente' => $linea_added->total, + ])->where('id', $factura_id)->update(); + return $this->respond(['status' => 'success', 'id' => $factura_id, 'message' => lang('Basic.global.success')]); + }else{ + return $this->respond(['status' => 'error', 'message' => 'Error insertando lineas de factura']); + } + } + + return $this->respond(['status' => 'error', 'message' => 'Error insertando factura']); + + }else{ + return $this->failUnauthorized('Invalid request', 403); + } + + } + + private function obtenerDatosFormulario(&$pedidoEntity){ $datos = $this->model->obtenerDatosForm($pedidoEntity->id); diff --git a/ci4/app/Language/es/Facturas.php b/ci4/app/Language/es/Facturas.php index 15ffc70b..9be71bb4 100644 --- a/ci4/app/Language/es/Facturas.php +++ b/ci4/app/Language/es/Facturas.php @@ -71,6 +71,7 @@ return [ "fechaVencimiento" => "Fecha Vencimiento", "fechaCobro" => "Fecha Cobro", "cantidad" => "Cantidad", + "ejemplares" => "Ejemplares", "addPago" => "Añadir Pago", "facturaPagada" => "Factura rectificativa ya abonada", diff --git a/ci4/app/Language/es/Pedidos.php b/ci4/app/Language/es/Pedidos.php index 25de0a9c..bb9fc447 100644 --- a/ci4/app/Language/es/Pedidos.php +++ b/ci4/app/Language/es/Pedidos.php @@ -77,10 +77,12 @@ return [ 'facturas' => 'Facturas', + 'addFactura' => 'Añadir Factura', 'showTotal' => 'Mostrar totales', - 'validation' => [ + 'validation' => [ + 'errorCantidadAlbaranes' => 'Total en albaranes {0} no coincide con la tirada {1}', ], diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php index 9fbe24ba..9964d943 100644 --- a/ci4/app/Language/es/RolesPermisos.php +++ b/ci4/app/Language/es/RolesPermisos.php @@ -24,6 +24,8 @@ return [ 'editPermission' => 'Editar', 'deletePermission' => 'Eliminar', + 'toprodPermission' => 'Pasar a Producción', + // System sections 'clientesSection' => 'Clientes', 'plantillaTarifaSection' => 'Plantilla de tarifas', @@ -35,6 +37,7 @@ return [ 'pedidosFinalizadosSection' => 'Finalizados', 'pedidosCanceladosSection' => 'Cancelados', 'pedidosTodosSection' => 'Todos', + 'pedidosGestionSection' => 'Gestion', 'tarifaPreimpresionSection' => 'Tarifas de preimpresión', 'tarifaManipuladoSection' => 'Tarifas de manipulado', 'tarifaAcabadoSection' => 'Tarifas de acabado', diff --git a/ci4/app/Models/Facturas/FacturaLineaModel.php b/ci4/app/Models/Facturas/FacturaLineaModel.php index 2abb52e2..0254c301 100644 --- a/ci4/app/Models/Facturas/FacturaLineaModel.php +++ b/ci4/app/Models/Facturas/FacturaLineaModel.php @@ -49,7 +49,8 @@ class FacturaLineaModel extends \App\Models\BaseModel { ->join("albaranes t5", "t5.pedido_id = t2.pedido_id", "left") ->join("albaranes_lineas t6", "t6.albaran_id = t5.id", "left") ->where("t1.factura_id", $factura_id) - ->where("t1.deleted_at", null); + ->where("t1.deleted_at", null) + ->groupBy('t1.id'); return $builder; } diff --git a/ci4/app/Models/Facturas/FacturaModel.php b/ci4/app/Models/Facturas/FacturaModel.php index b9f34a61..718f94f6 100644 --- a/ci4/app/Models/Facturas/FacturaModel.php +++ b/ci4/app/Models/Facturas/FacturaModel.php @@ -29,9 +29,11 @@ class FacturaModel extends \App\Models\BaseModel const SORTABLE_PEDIDOS = [ 1 => "t1.numero", 2 => "t2.nombre", - 3 => "t1.estado", - 4 => "t1.fecha_factura_at", - 5 => "t1.total", + 3 => "t4.cantidad", + 4 => "t2.nombre", + 5 => "t1.estado", + 6 => "t1.fecha_factura_at", + 7 => "t1.total", ]; // Lista de columnas basada en los campos de la tabla, para asignación masiva @@ -185,6 +187,7 @@ class FacturaModel extends \App\Models\BaseModel ->table($this->table . " t1") ->select( "t1.id AS id, t1.numero AS numero, t2.nombre AS serie, t1.estado AS estado, + t4.cantidad AS ejemplares, DATE_FORMAT(t1.fecha_factura_at, '%d/%m/%Y') AS fecha_factura_at, t1.total AS total" ); diff --git a/ci4/app/Models/Pedidos/PedidoModel.php b/ci4/app/Models/Pedidos/PedidoModel.php index e8431542..7f267388 100644 --- a/ci4/app/Models/Pedidos/PedidoModel.php +++ b/ci4/app/Models/Pedidos/PedidoModel.php @@ -76,6 +76,36 @@ class PedidoModel extends \App\Models\BaseModel return $builder->get()->getResultObject(); } + public function obtenerDatosForFactura($pedido_id = -1){ + + $builder = $this->db + ->table($this->table . " t1") + ->select(" + t3.cliente_id, t4.nombre as cliente_nombre, t4.cif as cliente_cif, t4.direccion as cliente_direccion, + t5.nombre as cliente_pais, t4.cp as cliente_cp, t4.ciudad as cliente_ciudad, t6.nombre as cliente_provincia + " + ) + ->join("pedidos_linea t2", "t2.pedido_id = t1.id", "left") + ->join("presupuestos t3", "t2.presupuesto_id = t3.id", "left") + ->join("clientes t4", "t4.id = t3.cliente_id", "left") + ->join("lg_paises t5", "t5.id = t4.pais_id", "left") + ->join("lg_provincias t6", "t6.id = t4.provincia_id", "left"); + + $builder->where("t1.id", $pedido_id); + return $builder->get()->getResultObject(); + } + + public function addFacturaPedidoLinea($pedido_id, $factura_id, $cantidad) + { + return $this->db + ->table("facturas_pedidos_lineas") + ->insert([ + "factura_id" => $factura_id, + "pedido_id" => $pedido_id, + "cantidad" => $cantidad + ]); + } + public function obtenerLineasPedido($pedido_id) { $builder = $this->db @@ -91,6 +121,7 @@ class PedidoModel extends \App\Models\BaseModel foreach ($builder->get()->getResultObject() as $row) { array_push($lineasPresupuesto, $model_presupuesto->generarLineaPedido($row->presupuesto_id)[0]); } + $builder->groupBy("t1.id"); return $lineasPresupuesto; } diff --git a/ci4/app/Views/themes/vuexy/form/facturas/_addPedidosItems.php b/ci4/app/Views/themes/vuexy/form/facturas/_addPedidosItems.php index 453074b7..c2db9dba 100644 --- a/ci4/app/Views/themes/vuexy/form/facturas/_addPedidosItems.php +++ b/ci4/app/Views/themes/vuexy/form/facturas/_addPedidosItems.php @@ -120,8 +120,7 @@ $('#addNewPedidoImpresion').on('click', function(){ // se ajustan el ancho de las columnas $('#pedidoImpresion').val(null).trigger('change'); // Se actualiza la tabla de lineas de factura - tableLineas.clearPipeline(); - $('#tableOfLineasFactura').DataTable().columns.adjust().draw(); + $('#tableOfLineasFactura').DataTable().clearPipeline().draw(); } }); }); diff --git a/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php b/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php index cf98966d..3ef7a7d4 100644 --- a/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php +++ b/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php @@ -17,12 +17,12 @@ id - - - - - - + + + + + + @@ -395,6 +395,10 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({ } ], + drawCallback: function() { + $(this.api().table().container()).find('table').css('width', '100%'); + this.api().columns.adjust(); + }, footerCallback: function (row, data, start, end, display) { updateFooterLineas(this.api()); } diff --git a/ci4/app/Views/themes/vuexy/form/pedidos/_albaranesItems.php b/ci4/app/Views/themes/vuexy/form/pedidos/_albaranesItems.php index d9306818..12049a0f 100644 --- a/ci4/app/Views/themes/vuexy/form/pedidos/_albaranesItems.php +++ b/ci4/app/Views/themes/vuexy/form/pedidos/_albaranesItems.php @@ -10,7 +10,11 @@
- +
@@ -31,6 +35,8 @@ section('additionalInlineJs') ?> + + $('#generar_albaranes').on('click', function(){ var lineasPedido = $('#tableOfLineasPedido').DataTable(); @@ -51,6 +57,7 @@ $('#generar_albaranes').on('click', function(){ generarAlbaran(item); }); } + calcular_cantidades_albaranes(); } }); }) @@ -163,7 +170,7 @@ function generarAlbaran(item){ `; const table = $('', - { id: 'tablaAlbaran' + item.albaran.id, width:'100%', class: 'table table-responsive table-striped table-hover' }) + { id: 'tablaAlbaran' + item.albaran.id, width:'100%', class: 'table table-responsive table-striped table-hover table-albaran' }) .css({ 'width': '100%', }).append( @@ -238,7 +245,6 @@ function generarAlbaran(item){ $('#bonotes_albaranes').before(accordion); - const datatableAlbaran = new DataTable('#tablaAlbaran' + item.albaran.id,{ scrollX: true, searching: false, @@ -264,7 +270,7 @@ function generarAlbaran(item){ var input = $('', { id: 'cantidad_' + row.id, name: 'cantidad_' + row.id, - class: 'lp-cell lp-input albaran_linea', + class: 'lp-cell lp-input albaran_linea cantidad-albaran', albaran: item.albaran.numero_albaran, type: 'text', value: data, @@ -434,38 +440,6 @@ function generarAlbaran(item){ } }, - footerCallback: function (row, data, start, end, display) { - - /* - let api = this.api(); - var numColumns = api.columns().count(); - - if(item.albaran.mostrar_precios == 1){ - - // Remove the formatting to get integer data for summation - let intVal = function (i) { - return typeof i === 'string' - ? i.replace(/[\$,]/g, '') * 1 - : typeof i === 'number' - ? i - : 0; - }; - - // Total over all pages - total = api - .column(9) - .data() - .reduce((a, b) => intVal(a) + intVal(b), 0); - - // Update footer - api.column(numColumns-1).footer().innerHTML = - 'Total: ' + total.toFixed(2); - } - else{ - api.column(numColumns-1).footer().innerHTML = ''; - } - */ - }, }); // Añadir la nueva fila a la tabla @@ -474,6 +448,17 @@ function generarAlbaran(item){ datatableAlbaran.row.add(linea).draw(); }); } + + + $(document).on('change', '#tablaAlbaran' + item.albaran.id + ' .cantidad-albaran', function(){ + let table = $('#tablaAlbaran' + item.albaran.id).DataTable(); + let row = $(this).closest('tr'); // Encuentra la fila actual + let rowIndex = table.row(row).index(); // Obtiene el índice de la fila + let newValue = $(this).val(); // Obtiene el nuevo valor del input + // Actualiza el DataTable + table.cell(rowIndex, 2).data(newValue); + calcular_cantidades_albaranes(); + }); } $(document).on('click', '.accordion-button', function(){ @@ -712,7 +697,6 @@ $(document).on('click', '.imprimir-albaran', function(){ var albaran_id = $(this).attr('id').split('_').slice(-1)[0]; - //NACHO AQUI window.open('' + albaran_id, '_blank'); }); @@ -726,7 +710,37 @@ $.ajax({ Object.values(response.data).forEach(function(item){ generarAlbaran(item); }); + + calcular_cantidades_albaranes(); } } }); + + +function calcular_cantidades_albaranes(){ + let cantidad_albaranes = 0; + const tablas = $('.table.table-albaran'); + for(var i = 0; i < tablas.length; i++){ + var table = $(tablas[i]).DataTable(); + table.rows().every(function(){ + cantidad_albaranes += parseInt(this.data().cantidad) || 0; + }); + } + check_cantidad_albaranes(cantidad_albaranes); +} + +function check_cantidad_albaranes(unidades_albaranes){ + if(unidades_albaranes != parseInt($('#total_tirada').val()) ){ + $('#alert-albaranes').removeClass('d-none'); + $('#error-albaranes'). + html('' + .replace('{0}', unidades_albaranes) + .replace('{1}', $('#total_tirada').val())); + } + else{ + $('#alert-albaranes').addClass('d-none'); + $('#error-albaranes').html(''); + } +} + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/pedidos/_cabeceraItems.php b/ci4/app/Views/themes/vuexy/form/pedidos/_cabeceraItems.php index 3f255b31..9af77005 100644 --- a/ci4/app/Views/themes/vuexy/form/pedidos/_cabeceraItems.php +++ b/ci4/app/Views/themes/vuexy/form/pedidos/_cabeceraItems.php @@ -152,6 +152,12 @@ + estado == 'validacion' && auth()->user()->can('pedidos-gestion.toprod')) : ?> +
+ + +
+ diff --git a/ci4/app/Views/themes/vuexy/form/pedidos/_facturasItems.php b/ci4/app/Views/themes/vuexy/form/pedidos/_facturasItems.php index 03c61bc5..75d792a8 100644 --- a/ci4/app/Views/themes/vuexy/form/pedidos/_facturasItems.php +++ b/ci4/app/Views/themes/vuexy/form/pedidos/_facturasItems.php @@ -10,12 +10,19 @@
+ estado == 'finalizado') : ?> +
+ +
+ +
+ @@ -43,7 +50,7 @@ const actionBtns_facturas = function(data) { `; }; -tablaFacturasPedido = $('#tableOfFacturas').DataTable({ +window.tablaFacturasPedido = $('#tableOfFacturas').DataTable({ processing: true, serverSide: true, autoWidth: true, @@ -75,6 +82,7 @@ tablaFacturasPedido = $('#tableOfFacturas').DataTable({ { 'data': actionBtns_facturas }, { 'data': 'id' }, { 'data': 'numero' }, + { 'data': 'ejemplares'}, { 'data': 'serie' }, { 'data': 'estado', render: function(data, type, row, meta) { diff --git a/ci4/app/Views/themes/vuexy/form/pedidos/_lineasItems.php b/ci4/app/Views/themes/vuexy/form/pedidos/_lineasItems.php index 89399796..3f23051b 100644 --- a/ci4/app/Views/themes/vuexy/form/pedidos/_lineasItems.php +++ b/ci4/app/Views/themes/vuexy/form/pedidos/_lineasItems.php @@ -96,6 +96,10 @@ var tableOfLineasPedido = new DataTable('#tableOfLineasPedido',{ orderable: false, }, ], + drawCallback: function(){ + $(this.api().table().container()).find('table').css('width', '100%'); + this.api().columns.adjust(); + }, footerCallback: function (row, data, start, end, display) { let api = this.api(); @@ -124,7 +128,7 @@ var tableOfLineasPedido = new DataTable('#tableOfLineasPedido',{ $(document).on('click', '.btn-view', function(e) { - user()->inGroup('admin') || auth()->user()->inGroup('beta')): ?> + user()->inGroup('cliente-admin') && !auth()->user()->inGroup('cliente-editor')): ?> var url = ''; var url = ''; diff --git a/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidoForm.php b/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidoForm.php index d9c4e92c..be518321 100644 --- a/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidoForm.php +++ b/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidoForm.php @@ -31,11 +31,6 @@
"btn btn-secondary float-start"]) ?>
- estado == 'finalizado') : ?> -
- -
-
@@ -70,6 +65,7 @@ href=""> + endSection() ?> @@ -89,4 +85,6 @@ + + endSection() ?> \ No newline at end of file diff --git a/httpdocs/assets/js/safekat/pages/cliente/cliente.js b/httpdocs/assets/js/safekat/pages/cliente/cliente.js index a49e68ca..329c7726 100644 --- a/httpdocs/assets/js/safekat/pages/cliente/cliente.js +++ b/httpdocs/assets/js/safekat/pages/cliente/cliente.js @@ -61,9 +61,12 @@ class Cliente { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); - - + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['ClienteContactos', 'ClientePrecios'] }, {}, function(translations) { diff --git a/httpdocs/assets/js/safekat/pages/cliente/clienteList.js b/httpdocs/assets/js/safekat/pages/cliente/clienteList.js index 69b67ea9..6170c326 100644 --- a/httpdocs/assets/js/safekat/pages/cliente/clienteList.js +++ b/httpdocs/assets/js/safekat/pages/cliente/clienteList.js @@ -147,7 +147,12 @@ class ClienteList { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Clientes', 'FormasPago', 'Users'] }, {}, function (translations) { diff --git a/httpdocs/assets/js/safekat/pages/maquinas/maquinasList.js b/httpdocs/assets/js/safekat/pages/maquinas/maquinasList.js index da6760c3..8dac7849 100644 --- a/httpdocs/assets/js/safekat/pages/maquinas/maquinasList.js +++ b/httpdocs/assets/js/safekat/pages/maquinas/maquinasList.js @@ -182,7 +182,12 @@ class MaquinasList { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Maquinas'] }, {}, function (translations) { diff --git a/httpdocs/assets/js/safekat/pages/plantillasTarifasCliente/edit.js b/httpdocs/assets/js/safekat/pages/plantillasTarifasCliente/edit.js index fdabc5ab..81d5952f 100644 --- a/httpdocs/assets/js/safekat/pages/plantillasTarifasCliente/edit.js +++ b/httpdocs/assets/js/safekat/pages/plantillasTarifasCliente/edit.js @@ -775,10 +775,13 @@ class PlantillasTarifasClienteForm { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); - - - + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } + new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['ClientePrecios'] }, {}, function (translations) { window.language = JSON.parse(translations); diff --git a/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminAdd.js b/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminAdd.js index 03f8cf38..d911e1dc 100644 --- a/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminAdd.js +++ b/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminAdd.js @@ -152,7 +152,7 @@ class PresupuestoAdminAdd { datos.papel_formato_alto = this.altoPersonalizado.val() } datos.selectedTirada = this.tirada.val(); - + return datos; } @@ -161,9 +161,9 @@ class PresupuestoAdminAdd { const tirada = parseInt($('#tirada').val()); const POD = parseInt($('#POD').val()); let merma = 0; - + merma = tirada * 0.1 <= POD ? tirada * 0.1 : POD; - + $('#mermacubierta').val(parseInt(merma)) $('#merma').val(parseInt(merma)) } @@ -172,8 +172,13 @@ class PresupuestoAdminAdd { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); - + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } + new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Presupuestos', 'PresupuestosDirecciones'] }, {}, function (translations) { window.language = JSON.parse(translations); diff --git a/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminEdit.js b/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminEdit.js index 60ffaa21..1784b657 100644 --- a/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminEdit.js +++ b/httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminEdit.js @@ -640,7 +640,12 @@ class PresupuestoAdminEdit { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } $(document).on("keydown", "textarea", function (event) { if (event.key === "Enter" && !event.shiftKey) { diff --git a/httpdocs/assets/js/safekat/pages/presupuestoCliente/presupuestoCliente.js b/httpdocs/assets/js/safekat/pages/presupuestoCliente/presupuestoCliente.js index fa45b210..f7d474c9 100644 --- a/httpdocs/assets/js/safekat/pages/presupuestoCliente/presupuestoCliente.js +++ b/httpdocs/assets/js/safekat/pages/presupuestoCliente/presupuestoCliente.js @@ -992,7 +992,12 @@ document.addEventListener('DOMContentLoaded', function () { } } - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } new Ajax('/translate/getTranslation', { locale: locale, translationFile: 'Presupuestos' }, {}, initialize, diff --git a/httpdocs/assets/js/safekat/pages/soporte/tickets.js b/httpdocs/assets/js/safekat/pages/soporte/tickets.js index c442772f..f140db83 100644 --- a/httpdocs/assets/js/safekat/pages/soporte/tickets.js +++ b/httpdocs/assets/js/safekat/pages/soporte/tickets.js @@ -293,7 +293,12 @@ class Ticket { document.addEventListener('DOMContentLoaded', function () { - const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); + const dropdown = document.querySelector(".dropdown-language"); + const activeItem = dropdown.querySelector(".dropdown-menu .dropdown-item"); + let locale = 'es'; + if (activeItem) { + locale = activeItem.getAttribute("data-language"); + } new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Tickets', 'datePicker'] }, {}, function (translations) {
ID