From cdb0b290033a97ed3dba57f6a8a13b14fec209d7 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Fri, 2 Jun 2023 14:45:12 +0200 Subject: [PATCH] Creando Menu_impresion --- .idea/workspace.xml | 52 +- ci4/.env | 28 +- ci4/app/Controllers/Catalogo/Catalogo.php | 14 +- ci4/app/Controllers/Compras/Compras.php | 26 + ci4/app/Controllers/Compras/Productos.php | 22 + .../{Proveedores => Compras}/Proveedor.php | 11 +- .../Controllers/Envioslogistica/Logistica.php | 14 +- ci4/app/Controllers/Facturacion/Factura.php | 13 +- ci4/app/Controllers/Importacion/Importar.php | 36 + ci4/app/Controllers/Pedidos/Pedido.php | 24 +- .../Controllers/Produccion/Ordentrabajo.php | 17 +- ci4/app/Filters/LoginAuthFilter.php | 2 + ci4/app/Language/en/App.php | 30 +- ci4/app/Language/es/App.php | 34 +- .../backend/vuexy/form/settings/index.php | 2 +- .../Views/themes/backend/vuexy/main/all.php | 2 +- .../backend/vuexy/main/defaultlayout.php | 2 +- .../backend/vuexy/main/menu_impresion.php | 697 ++++++++++++++++++ 18 files changed, 963 insertions(+), 63 deletions(-) create mode 100644 ci4/app/Controllers/Compras/Compras.php create mode 100644 ci4/app/Controllers/Compras/Productos.php rename ci4/app/Controllers/{Proveedores => Compras}/Proveedor.php (63%) create mode 100644 ci4/app/Controllers/Importacion/Importar.php create mode 100644 ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 21bbd9a6..3eace43c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,16 +5,24 @@ + + + + - + + + + + + + - + - - - - + + - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "last_opened_file_path": "C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/form/settings", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "preferences.pluginManager", - "vue.rearranger.settings.migration": "true" + +}]]> - + @@ -98,6 +106,8 @@ + + 1682339938559 diff --git a/ci4/.env b/ci4/.env index 8ff726fd..51699b0d 100644 --- a/ci4/.env +++ b/ci4/.env @@ -22,8 +22,8 @@ CI_ENVIRONMENT = development # APP #-------------------------------------------------------------------- -app.baseURL = 'https://sk-jjo.imnavajas.es' -# app.baseURL = 'https://sk-imn.imnavajas.es' +# app.baseURL = 'https://sk-jjo.imnavajas.es' +app.baseURL = 'https://sk-imn.imnavajas.es' # app.baseURL = "http://safekat.test/" # app.forceGlobalSecureRequests = false @@ -41,22 +41,22 @@ app.baseURL = 'https://sk-jjo.imnavajas.es' # DATABASE #-------------------------------------------------------------------- -database.default.hostname = localhost -database.default.database = sk_jjo -database.default.username = sk_jjo -database.default.password = 61tv&G1Zf^XY -database.default.DBDriver = MySQLi -database.default.DBPrefix = -database.default.dump = - # database.default.hostname = localhost -# database.default.database = sk_imn -# database.default.username = sk_imn -# database.default.password = Uyia19_87 +# database.default.database = sk_jjo +# database.default.username = sk_jjo +# database.default.password = 61tv&G1Zf^XY # database.default.DBDriver = MySQLi -# database.default.DBPrefix = +# database.default.DBPrefix = # database.default.dump = +database.default.hostname = localhost +database.default.database = sk_imn +database.default.username = sk_imn +database.default.password = Uyia19_87 +database.default.DBDriver = MySQLi +database.default.DBPrefix = +database.default.dump = + # database.tests.hostname = localhost # database.tests.database = ci4 # database.tests.username = root diff --git a/ci4/app/Controllers/Catalogo/Catalogo.php b/ci4/app/Controllers/Catalogo/Catalogo.php index d1e9bd0b..2e0d71b3 100644 --- a/ci4/app/Controllers/Catalogo/Catalogo.php +++ b/ci4/app/Controllers/Catalogo/Catalogo.php @@ -13,12 +13,22 @@ class Catalogo extends BaseController public function index() { - echo 'Hola2'; + echo 'Catalogo Libros'; } - public function import() + public function importar() { + echo 'Importar Catalogo Libros'; + } + public function nuevo() + { + echo 'Nuevo Catalogo Libros'; + } + + public function categorias() + { + echo 'Categorias de Catalogo de Libros'; } public function delete() diff --git a/ci4/app/Controllers/Compras/Compras.php b/ci4/app/Controllers/Compras/Compras.php new file mode 100644 index 00000000..c775b03c --- /dev/null +++ b/ci4/app/Controllers/Compras/Compras.php @@ -0,0 +1,26 @@ + "Dashboard", + "menu_dashboard" => "Control Panel", "menu_clientes" => "Customers", - "menu_tarifacliente" => "Customer Fee", + "menu_tarifacliente" => "Fees", "menu_configuration" => "Settings", "menu_calendario" => "Calendar", @@ -692,22 +692,46 @@ return [ "menu_trabajo" => "Works", "menu_trabajo" => "Tipologies", - "menu_digitalizacion" => "Digitalisation", + "menu_digitalizacion" => "Digitalisation", + + "menu_importacion" => "Import", + + "menu_catalogo" => "Catalogue", + "menu_catalogo_libros" => "Books", + "menu_catalogo_nuevo" => "New", + "menu_catalogo_categorias" => "Categories", + "menu_catalogo_categorias" => "Import", "menu_logistica" => "Logistics", + "menu_logistica_envios" => "Envíos conjuntos", + "menu_logistica_etiquetas" => "Labels", + "menu_logistica_tracking" => "Tracking", + "menu_facturación" => "Billing", "menu_albaran" => "Delivery notes", "menu_facturas" => "Invoices", + "menu_facturas_vencimiento" => "Vencimiento", + "menu_facturas_nueva" => "New Invoice", "menu_informes" => "Reports", "menu_pedidos" => "Orders", + "menu_pedidos_activos" => "Actives", + "menu_pedidos_finalizados" => "Finished", + "menu_pedidos_cancelados" => "Cancelled", + "menu_pedidos_manuales" => "Manual", "menu_presupuestos" => "Budgets", + "menu_presupuesto" => "Books", "menu_presupuestomaquetacion" => "Layout budgets", "menu_produccion" => "Production", + "menu_orden_trabajo" => "WOs", + "menu_orden_trabajo_100" => "WOs 100%", + "menu_orden_trabajo_finalizados" => "WOs finalised", + "menu_orden_trabajo_pendientes" => "WOs pending", + "menu_ordentrabajomaquetacion" => "Layout work order", "menu_ordenmaquina" => "Machine order", "menu_pedidoproduccion" => "Orders", diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index d7fe13c2..59f5b4cc 100644 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -669,10 +669,10 @@ return [ // MENUS - "menu_dashboard" => "Panel", + "menu_dashboard" => "Panel de control", "menu_clientes" => "Clientes", - "menu_tarifacliente" => "Tarifa Clientes", + "menu_tarifacliente" => "Tarifas", "menu_configuration" => "Configuracion", "menu_calendario" => "Calendario", @@ -692,22 +692,48 @@ return [ "menu_trabajo" => "Trabajos", "menu_tipologias" => "Tipologías", - "menu_digitalizacion" => "Digitalización", + "menu_digitalizacion" => "Digitalización", + + "menu_importacion" => "Importación", + + "menu_catalogo" => "Catálogo", + "menu_catalogo_libros" => "Libros", + "menu_catalogo_nuevo" => "Nuevo", + "menu_catalogo_categorias" => "Categorías", + "menu_catalogo_importar" => "Importar", + + + "menu_logistica" => "Logística", + "menu_logistica_envios" => "Envíos conjuntos", + "menu_logistica_etiquetas" => "Etiquetas", + "menu_logistica_tracking" => "Tracking", + - "menu_logistica" => "Logistica", "menu_facturación" => "Facturación", "menu_albaran" => "Albaranes", "menu_facturas" => "Facturas", + "menu_facturas_vencimiento" => "Vencimiento", + "menu_facturas_nueva" => "Nueva Factura", "menu_informes" => "Informes", "menu_pedidos" => "Pedidos", + "menu_pedidos_activos" => "Activos", + "menu_pedidos_finalizados" => "Finalizados", + "menu_pedidos_cancelados" => "Cancelados", + "menu_pedidos_manuales" => "Manuales", "menu_presupuestos" => "Presupuestos", + "menu_presupuesto" => "Libros", "menu_presupuestomaquetacion" => "Presupuestos maquetación", "menu_produccion" => "Producción", + "menu_orden_trabajo" => "OTs", + "menu_orden_trabajo_100" => "OTs 100%", + "menu_orden_trabajo_finalizados" => "OTs finalizados", + "menu_orden_trabajo_pendientes" => "OTs pendientes", + "menu_ordentrabajomaquetacion" => "Orden de trabajo maquetación", "menu_ordenmaquina" => "Orden máquina", "menu_pedidoproduccion" => "Pedidos", diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php index 3818b102..0ad9d8f1 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php @@ -1333,7 +1333,7 @@ } ]; let order = [[2, "desc"]]; - let translate = '/themes/focus2/vendor/datatables/locales/.json'; + let translate = '/themes/vuexy/vendor/datatables/locales/.json'; let button = ["","","",""]; let columns = [{ data: 'routine' },{ data: 'error' },{ data: 'created_at' }]; loadDataTableAjax('table-grid', '', translate, true, true, order, columns,dataFormat, button); diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index 8b7f76a6..2f1bcbe2 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -96,7 +96,7 @@ if (!empty($token) && $tfa == false) {
- +
diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index f28f070e..ab97b7ae 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -99,7 +99,7 @@ if (!empty($token) && $tfa == false) {
- +
diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php new file mode 100644 index 00000000..82e5465d --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php @@ -0,0 +1,697 @@ + + + + + + + +
+
+ +
+
+ + */ +?> \ No newline at end of file