From 90bfb08dc5d9c1317d188c59d6cb8ebc7a554e20 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Thu, 21 Nov 2024 21:19:17 +0100 Subject: [PATCH 1/3] =?UTF-8?q?A=C3=B1adido=20control=20de=20permisos=20en?= =?UTF-8?q?=20Pedidos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/safekat.iml | 3 - ci4/app/Language/es/RolesPermisos.php | 5 ++ .../themes/vuexy/main/menu_impresion.php | 2 - .../themes/vuexy/main/menus/pedidos_menu.php | 55 ++++++++++++------- .../main/menus/presupuesto_cliente_menu.php | 43 --------------- 5 files changed, 39 insertions(+), 69 deletions(-) delete mode 100644 ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php diff --git a/.idea/safekat.iml b/.idea/safekat.iml index 0a9466d6..db9597c8 100755 --- a/.idea/safekat.iml +++ b/.idea/safekat.iml @@ -7,9 +7,6 @@ - - - diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php index d17f9cef..0df0eed0 100644 --- a/ci4/app/Language/es/RolesPermisos.php +++ b/ci4/app/Language/es/RolesPermisos.php @@ -19,6 +19,7 @@ return [ 'adminRolTooltip' => 'Permitir acceso completo al sistema', // System permissions + 'viewPermission' => 'Visualizar', 'createPermission' => 'Crear', 'editPermission' => 'Editar', 'deletePermission' => 'Eliminar', @@ -30,6 +31,10 @@ return [ 'direccionesSection' => 'Direcciones', 'presupuestoSection' => 'Presupuestos', 'presupuestoClienteSection' => 'Presupuestos', + 'pedidosActivosSection' => 'Activos', + 'pedidosFinalizadosSection' => 'Finalizados', + 'pedidosCanceladosSection' => 'Cancelados', + 'pedidosTodosSection' => 'Todos', 'tarifaPreimpresionSection' => 'Tarifas de preimpresión', 'tarifaManipuladoSection' => 'Tarifas de manipulado', 'tarifaAcabadoSection' => 'Tarifas de acabado', diff --git a/ci4/app/Views/themes/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/vuexy/main/menu_impresion.php index 36488675..2ba24ff5 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_impresion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_impresion.php @@ -28,8 +28,6 @@ require "menus/pedidos_menu.php"; - require "menus/pedidos_cliente_menu.php"; - require "menus/produccion_menu.php"; require "menus/importacion_menu.php"; diff --git a/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php b/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php index 30c38ad4..7601ec50 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/pedidos_menu.php @@ -2,7 +2,12 @@ /** * MENU PEDIDOS */ -if (auth()->user()->inGroup('beta')) { +if ( + auth()->user()->can('pedidos-activos.menu') || + auth()->user()->can('pedidos-finalizados.menu') || + auth()->user()->can('pedidos-cancelados.menu') || + auth()->user()->can('pedidos-todos.menu') +) { ?>
  • @@ -11,26 +16,34 @@ if (auth()->user()->inGroup('beta')) {
    • \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php b/ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php deleted file mode 100644 index 4b367bfc..00000000 --- a/ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php +++ /dev/null @@ -1,43 +0,0 @@ -user()->inGroup('cliente-admin') - || auth()->user()->inGroup('cliente-editor') - || auth()->user()->inGroup('admin') -) { - - if (auth()->user()->can('presupuesto-cliente.menu') || auth()->user()->inGroup('admin')) { - ?> -
  • - - - user()->inGroup('admin') ? - lang("App.menu_presupuestos_clientes") : - lang("App.menu_presupuestos") - ); - ?> - - user()->can('presupuesto-cliente.create')) { ?> - - - -
    • - - From 63aab4a27b309df63ab4b89860c209ffa0bb3c15 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Thu, 21 Nov 2024 21:48:26 +0100 Subject: [PATCH 2/3] Arreglado bug archivo borrado en presupuesto_cliente_menu --- .../vuexy/main/menus/pedidos_cliente_menu.php | 36 ---------------- .../main/menus/presupuesto_cliente_menu.php | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 36 deletions(-) delete mode 100644 ci4/app/Views/themes/vuexy/main/menus/pedidos_cliente_menu.php create mode 100644 ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php diff --git a/ci4/app/Views/themes/vuexy/main/menus/pedidos_cliente_menu.php b/ci4/app/Views/themes/vuexy/main/menus/pedidos_cliente_menu.php deleted file mode 100644 index 2f6f41fc..00000000 --- a/ci4/app/Views/themes/vuexy/main/menus/pedidos_cliente_menu.php +++ /dev/null @@ -1,36 +0,0 @@ -user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) { - ?> - -
  • - - - - - -
    • - \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php b/ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php new file mode 100644 index 00000000..4b367bfc --- /dev/null +++ b/ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php @@ -0,0 +1,43 @@ +user()->inGroup('cliente-admin') + || auth()->user()->inGroup('cliente-editor') + || auth()->user()->inGroup('admin') +) { + + if (auth()->user()->can('presupuesto-cliente.menu') || auth()->user()->inGroup('admin')) { + ?> +
  • + + + user()->inGroup('admin') ? + lang("App.menu_presupuestos_clientes") : + lang("App.menu_presupuestos") + ); + ?> + + user()->can('presupuesto-cliente.create')) { ?> + + + +
    • + + From 3548be722ec543adafd7563747ad98c71e806efc Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Fri, 22 Nov 2024 11:43:37 +0100 Subject: [PATCH 3/3] arreglada cota en solapas tapa blanda --- httpdocs/assets/js/safekat/pages/preview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httpdocs/assets/js/safekat/pages/preview.js b/httpdocs/assets/js/safekat/pages/preview.js index 32757a75..e7eada9d 100644 --- a/httpdocs/assets/js/safekat/pages/preview.js +++ b/httpdocs/assets/js/safekat/pages/preview.js @@ -134,8 +134,8 @@ class previewFormas { previewEC.makeText("Solapa 1", origenEC.x + anchoLibro + (lomoLibro + anchoSolapa) / 2, origenEC.y, stylesSolapa); previewEC.makeText("Solapa 2", origenEC.x - anchoLibro - (lomoLibro + anchoSolapa) / 2, origenEC.y, stylesSolapa); // Textos Cotas Solapas - previewEC.makeText(anchoSolapa.toFixed(1) + " mm", origenEC.x - anchoLibro - (lomoLibro + anchoSolapa) / 2, origenEC.y - (altoLibro / 3) + 15, styleCotas); - previewEC.makeText(anchoSolapa.toFixed(1) + " mm", origenEC.x + anchoLibro + (lomoLibro + anchoSolapa) / 2, origenEC.y - (altoLibro / 3) + 15, styleCotas); + previewEC.makeText(this.solapa.toFixed(1) + " mm", origenEC.x - anchoLibro - (lomoLibro + anchoSolapa) / 2, origenEC.y - (altoLibro / 3) + 15, styleCotas); + previewEC.makeText(this.solapa.toFixed(1) + " mm", origenEC.x + anchoLibro + (lomoLibro + anchoSolapa) / 2, origenEC.y - (altoLibro / 3) + 15, styleCotas); } }