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_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/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')
+) {
?>
\ No newline at end of file
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);
}
}