From ab6763aeaa2a334d4442fa44723826b4e75af38c Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Mon, 4 Dec 2023 20:50:58 +0100 Subject: [PATCH] terminando servicios manipulados y preimpresion --- ci4/app/Config/Routes.php | 9 +- .../Presupuestos/Cosidotapablanda.php | 4 + .../Presupuestos/PresupuestoManipulados.php | 123 - .../PresupuestoPreimpresiones.php | 117 - .../Presupuestos/Presupuestoacabados.php | 4 +- .../Presupuestos/Presupuestomanipulados.php | 89 + .../Presupuestopreimpresiones.php | 83 + .../Tarifaencuadernacionlineashoras.php | 0 .../TarifaEncuadernacionLineaHoras.php | 0 .../Tarifas/TarifapreimpresionEntity.php | 4 +- ci4/app/Language/en/Tarifapreimpresion.php | 2 +- ci4/app/Language/es/Presupuestos.php | 3 + ci4/app/Language/es/Tarifapreimpresion.php | 2 +- .../PresupuestoManipuladosModel.php | 95 + .../PresupuestoPreimpresionesModel.php | 86 +- .../TarifaEncuadernacionLineaHorasModel.php | 0 .../Models/Tarifas/TarifaManipuladoModel.php | 37 + .../Tarifas/TarifapreimpresionModel.php | 36 +- .../cosidotapablanda/_datosServiciosItems.php | 644 +- .../_tarifapreimpresionFormItems.php | 6 +- .../viewTarifapreimpresionList.php | 2 +- .../vuexy/img/illustrations/add-new-roles.png | Bin 12544 -> 0 bytes ...auth-forgot-password-illustration-dark.png | Bin 49459 -> 0 bytes ...uth-forgot-password-illustration-light.png | Bin 48508 -> 0 bytes .../auth-login-illustration-dark.png | Bin 57789 -> 0 bytes .../auth-login-illustration-light.png | Bin 55767 -> 0 bytes .../auth-register-illustration-dark.png | Bin 89300 -> 0 bytes .../auth-register-illustration-light.png | Bin 90351 -> 0 bytes .../auth-register-multisteps-illustration.png | Bin 33754 -> 0 bytes .../auth-reset-password-illustration-dark.png | Bin 45127 -> 0 bytes ...auth-reset-password-illustration-light.png | Bin 45817 -> 0 bytes .../auth-two-step-illustration-dark.png | Bin 52283 -> 0 bytes .../auth-two-step-illustration-light.png | Bin 67640 -> 0 bytes .../auth-verify-email-illustration-dark.png | Bin 60363 -> 0 bytes .../auth-verify-email-illustration-light.png | Bin 60830 -> 0 bytes .../img/illustrations/bg-shape-image-dark.png | Bin 1902 -> 0 bytes .../illustrations/bg-shape-image-light.png | Bin 1756 -> 0 bytes .../illustrations/boy-verify-email-dark.png | Bin 59443 -> 0 bytes .../illustrations/boy-verify-email-light.png | Bin 61073 -> 0 bytes .../illustrations/boy-with-laptop-dark.png | Bin 39546 -> 0 bytes .../illustrations/boy-with-laptop-light.png | Bin 36429 -> 0 bytes .../illustrations/boy-with-rocket-dark.png | Bin 52989 -> 0 bytes .../illustrations/boy-with-rocket-light.png | Bin 52270 -> 0 bytes .../img/illustrations/card-advance-sale.png | Bin 14740 -> 0 bytes .../card-website-analytics-1.png | Bin 24539 -> 0 bytes .../card-website-analytics-2.png | Bin 37015 -> 0 bytes .../card-website-analytics-3.png | Bin 26761 -> 0 bytes .../illustrations/girl-doing-yoga-dark.png | Bin 190544 -> 0 bytes .../illustrations/girl-doing-yoga-light.png | Bin 33100 -> 0 bytes .../girl-sitting-with-laptop.png | Bin 28370 -> 0 bytes .../girl-unlock-password-dark.png | Bin 30693 -> 0 bytes .../girl-unlock-password-light.png | Bin 27173 -> 0 bytes .../girl-verify-password-dark.png | Bin 34568 -> 0 bytes .../girl-verify-password-light.png | Bin 37593 -> 0 bytes .../illustrations/girl-with-laptop-dark.png | Bin 32904 -> 0 bytes .../illustrations/girl-with-laptop-light.png | Bin 183173 -> 0 bytes .../img/illustrations/girl-with-laptop.png | Bin 23862 -> 0 bytes .../img/illustrations/page-misc-error.png | Bin 34200 -> 0 bytes .../page-misc-launching-soon.png | Bin 33046 -> 0 bytes .../page-misc-under-maintenance.png | Bin 97471 -> 0 bytes .../page-misc-you-are-not-authorized.png | Bin 30627 -> 0 bytes .../img/illustrations/page-pricing-basic.png | Bin 9472 -> 0 bytes .../illustrations/page-pricing-enterprise.png | Bin 9395 -> 0 bytes .../illustrations/page-pricing-standard.png | Bin 12102 -> 0 bytes .../wizard-create-deal-confirm.png | Bin 10325 -> 0 bytes ...zard-create-deal-girl-with-laptop-dark.png | Bin 39166 -> 0 bytes ...ard-create-deal-girl-with-laptop-light.png | Bin 39166 -> 0 bytes .../themes/vuexy/js/app-access-permission.js | 195 - httpdocs/themes/vuexy/js/app-access-roles.js | 258 - .../themes/vuexy/js/app-calendar-events.js | 123 - httpdocs/themes/vuexy/js/app-calendar.js | 571 -- httpdocs/themes/vuexy/js/app-chat.js | 208 - httpdocs/themes/vuexy/js/app-email.js | 380 - httpdocs/themes/vuexy/js/app-invoice-add.js | 127 - httpdocs/themes/vuexy/js/app-invoice-edit.js | 134 - httpdocs/themes/vuexy/js/app-invoice-list.js | 297 - httpdocs/themes/vuexy/js/app-invoice-print.js | 9 - httpdocs/themes/vuexy/js/app-kanban.js | 471 -- httpdocs/themes/vuexy/js/app-user-list.js | 516 -- .../themes/vuexy/js/app-user-view-account.js | 378 - .../themes/vuexy/js/app-user-view-billing.js | 57 - .../themes/vuexy/js/app-user-view-security.js | 63 - httpdocs/themes/vuexy/js/app-user-view.js | 89 - httpdocs/themes/vuexy/js/cards-actions.js | 114 - httpdocs/themes/vuexy/js/cards-advance.js | 166 - httpdocs/themes/vuexy/js/cards-analytics.js | 1000 --- httpdocs/themes/vuexy/js/cards-statistics.js | 1585 ---- httpdocs/themes/vuexy/js/charts-apex.js | 1134 --- httpdocs/themes/vuexy/js/charts-chartjs.js | 1122 --- httpdocs/themes/vuexy/js/config.js | 113 - .../themes/vuexy/js/dashboards-analytics.js | 662 -- httpdocs/themes/vuexy/js/dashboards-crm.js | 859 --- .../themes/vuexy/js/dashboards-ecommerce.js | 984 --- .../js/datatables-editor/dataTables.editor.js | 6830 ----------------- .../dataTables.editor.min.js | 6 - .../dataTables.editor.min.mjs | 6 - .../datatables-editor/dataTables.editor.mjs | 6789 ---------------- .../js/datatables-editor/editor.bootstrap.js | 272 - .../datatables-editor/editor.bootstrap.min.js | 4 - .../editor.bootstrap.min.mjs | 4 - .../js/datatables-editor/editor.bootstrap.mjs | 228 - .../js/datatables-editor/editor.bootstrap4.js | 264 - .../editor.bootstrap4.min.js | 4 - .../editor.bootstrap4.min.mjs | 4 - .../datatables-editor/editor.bootstrap4.mjs | 220 - .../js/datatables-editor/editor.bootstrap5.js | 315 - .../editor.bootstrap5.min.js | 4 - .../editor.bootstrap5.min.mjs | 4 - .../datatables-editor/editor.bootstrap5.mjs | 271 - .../js/datatables-editor/editor.bulma.js | 216 - .../js/datatables-editor/editor.bulma.min.js | 4 - .../js/datatables-editor/editor.bulma.min.mjs | 4 - .../js/datatables-editor/editor.bulma.mjs | 172 - .../js/datatables-editor/editor.dataTables.js | 59 - .../editor.dataTables.min.js | 4 - .../editor.dataTables.min.mjs | 4 - .../datatables-editor/editor.dataTables.mjs | 15 - .../js/datatables-editor/editor.foundation.js | 171 - .../editor.foundation.min.js | 4 - .../editor.foundation.min.mjs | 4 - .../datatables-editor/editor.foundation.mjs | 127 - .../js/datatables-editor/editor.jqueryui.js | 186 - .../datatables-editor/editor.jqueryui.min.js | 4 - .../datatables-editor/editor.jqueryui.min.mjs | 4 - .../js/datatables-editor/editor.jqueryui.mjs | 142 - .../js/datatables-editor/editor.semanticui.js | 256 - .../editor.semanticui.min.js | 4 - .../editor.semanticui.min.mjs | 4 - .../datatables-editor/editor.semanticui.mjs | 212 - .../themes/vuexy/js/extended-ui-blockui.js | 504 -- .../vuexy/js/extended-ui-drag-and-drop.js | 92 - .../vuexy/js/extended-ui-media-player.js | 10 - .../vuexy/js/extended-ui-misc-clipboardjs.js | 23 - .../vuexy/js/extended-ui-misc-idle-timer.js | 212 - .../vuexy/js/extended-ui-misc-numeraljs.js | 37 - .../vuexy/js/extended-ui-perfect-scrollbar.js | 37 - .../vuexy/js/extended-ui-star-ratings.js | 170 - .../vuexy/js/extended-ui-sweetalert2.js | 558 -- .../themes/vuexy/js/extended-ui-timeline.js | 16 - httpdocs/themes/vuexy/js/extended-ui-tour.js | 194 - .../themes/vuexy/js/extended-ui-treeview.js | 440 -- httpdocs/themes/vuexy/js/form-basic-inputs.js | 11 - httpdocs/themes/vuexy/js/form-layouts.js | 115 - httpdocs/themes/vuexy/js/form-validation.js | 343 - httpdocs/themes/vuexy/js/form-wizard-icons.js | 164 - .../themes/vuexy/js/form-wizard-numbered.js | 155 - .../themes/vuexy/js/form-wizard-validation.js | 282 - httpdocs/themes/vuexy/js/forms-editors.js | 93 - httpdocs/themes/vuexy/js/forms-extras.js | 164 - httpdocs/themes/vuexy/js/forms-file-upload.js | 53 - httpdocs/themes/vuexy/js/forms-pickers.js | 419 - httpdocs/themes/vuexy/js/forms-selects.js | 51 - httpdocs/themes/vuexy/js/forms-sliders.js | 328 - httpdocs/themes/vuexy/js/forms-tagify.js | 301 - httpdocs/themes/vuexy/js/forms-typeahead.js | 283 - httpdocs/themes/vuexy/js/main.js | 585 -- httpdocs/themes/vuexy/js/maps-leaflet.js | 4595 ----------- .../themes/vuexy/js/modal-add-new-address.js | 73 - httpdocs/themes/vuexy/js/modal-add-new-cc.js | 107 - .../themes/vuexy/js/modal-add-permission.js | 35 - httpdocs/themes/vuexy/js/modal-add-role.js | 44 - httpdocs/themes/vuexy/js/modal-create-app.js | 86 - httpdocs/themes/vuexy/js/modal-edit-cc.js | 79 - .../themes/vuexy/js/modal-edit-permission.js | 35 - httpdocs/themes/vuexy/js/modal-edit-user.js | 103 - httpdocs/themes/vuexy/js/modal-enable-otp.js | 53 - .../themes/vuexy/js/modal-share-project.js | 41 - .../themes/vuexy/js/modal-two-factor-auth.js | 21 - .../themes/vuexy/js/offcanvas-add-payment.js | 30 - .../themes/vuexy/js/offcanvas-send-invoice.js | 14 - .../js/pages-account-settings-account.js | 189 - .../js/pages-account-settings-billing.js | 194 - .../js/pages-account-settings-security.js | 125 - .../themes/vuexy/js/pages-auth-multisteps.js | 305 - .../themes/vuexy/js/pages-auth-two-steps.js | 77 - httpdocs/themes/vuexy/js/pages-auth.js | 115 - httpdocs/themes/vuexy/js/pages-pricing.js | 39 - httpdocs/themes/vuexy/js/pages-profile.js | 201 - .../vuexy/js/tables-datatables-advanced.js | 299 - .../vuexy/js/tables-datatables-basic.js | 796 -- .../vuexy/js/tables-datatables-extensions.js | 401 - httpdocs/themes/vuexy/js/ui-app-brand.js | 79 - httpdocs/themes/vuexy/js/ui-carousel.js | 185 - httpdocs/themes/vuexy/js/ui-menu.js | 142 - httpdocs/themes/vuexy/js/ui-modals.js | 57 - httpdocs/themes/vuexy/js/ui-navbar.js | 19 - httpdocs/themes/vuexy/js/ui-popover.js | 12 - httpdocs/themes/vuexy/js/ui-toasts.js | 211 - .../themes/vuexy/js/wizard-ex-checkout.js | 217 - .../themes/vuexy/js/wizard-ex-create-deal.js | 243 - .../vuexy/js/wizard-ex-property-listing.js | 316 - .../formvalidation/dist/js/locales/ar_MA.js | 389 - .../dist/js/locales/ar_MA.min.js | 1 - .../formvalidation/dist/js/locales/bg_BG.js | 389 - .../dist/js/locales/bg_BG.min.js | 1 - .../formvalidation/dist/js/locales/ca_ES.js | 389 - .../dist/js/locales/ca_ES.min.js | 1 - .../formvalidation/dist/js/locales/cs_CZ.js | 389 - .../dist/js/locales/cs_CZ.min.js | 1 - .../formvalidation/dist/js/locales/da_DK.js | 389 - .../dist/js/locales/da_DK.min.js | 1 - .../formvalidation/dist/js/locales/de_DE.js | 389 - .../dist/js/locales/de_DE.min.js | 1 - .../formvalidation/dist/js/locales/el_GR.js | 389 - .../dist/js/locales/el_GR.min.js | 1 - .../formvalidation/dist/js/locales/en_US.js | 389 - .../dist/js/locales/en_US.min.js | 1 - .../formvalidation/dist/js/locales/es_CL.js | 389 - .../dist/js/locales/es_CL.min.js | 1 - .../formvalidation/dist/js/locales/es_ES.js | 389 - .../dist/js/locales/es_ES.min.js | 1 - .../formvalidation/dist/js/locales/eu_ES.js | 389 - .../dist/js/locales/eu_ES.min.js | 1 - .../formvalidation/dist/js/locales/fa_IR.js | 389 - .../dist/js/locales/fa_IR.min.js | 1 - .../formvalidation/dist/js/locales/fi_FI.js | 389 - .../dist/js/locales/fi_FI.min.js | 1 - .../formvalidation/dist/js/locales/fr_BE.js | 389 - .../dist/js/locales/fr_BE.min.js | 1 - .../formvalidation/dist/js/locales/fr_FR.js | 389 - .../dist/js/locales/fr_FR.min.js | 1 - .../formvalidation/dist/js/locales/he_IL.js | 389 - .../dist/js/locales/he_IL.min.js | 1 - .../formvalidation/dist/js/locales/hi_IN.js | 389 - .../dist/js/locales/hi_IN.min.js | 1 - .../formvalidation/dist/js/locales/hu_HU.js | 389 - .../dist/js/locales/hu_HU.min.js | 1 - .../formvalidation/dist/js/locales/id_ID.js | 389 - .../dist/js/locales/id_ID.min.js | 1 - .../formvalidation/dist/js/locales/it_IT.js | 389 - .../dist/js/locales/it_IT.min.js | 1 - .../formvalidation/dist/js/locales/ja_JP.js | 389 - .../dist/js/locales/ja_JP.min.js | 1 - .../formvalidation/dist/js/locales/nl_BE.js | 389 - .../dist/js/locales/nl_BE.min.js | 1 - .../formvalidation/dist/js/locales/nl_NL.js | 389 - .../dist/js/locales/nl_NL.min.js | 1 - .../formvalidation/dist/js/locales/no_NO.js | 389 - .../dist/js/locales/no_NO.min.js | 1 - .../formvalidation/dist/js/locales/pl_PL.js | 389 - .../dist/js/locales/pl_PL.min.js | 1 - .../formvalidation/dist/js/locales/pt_BR.js | 389 - .../dist/js/locales/pt_BR.min.js | 1 - .../formvalidation/dist/js/locales/pt_PT.js | 389 - .../dist/js/locales/pt_PT.min.js | 1 - .../formvalidation/dist/js/locales/ro_RO.js | 389 - .../dist/js/locales/ro_RO.min.js | 1 - .../formvalidation/dist/js/locales/ru_RU.js | 389 - .../dist/js/locales/ru_RU.min.js | 1 - .../formvalidation/dist/js/locales/sk_SK.js | 389 - .../dist/js/locales/sk_SK.min.js | 1 - .../formvalidation/dist/js/locales/sq_AL.js | 389 - .../dist/js/locales/sq_AL.min.js | 1 - .../formvalidation/dist/js/locales/sr_RS.js | 389 - .../dist/js/locales/sr_RS.min.js | 1 - .../formvalidation/dist/js/locales/sv_SE.js | 389 - .../dist/js/locales/sv_SE.min.js | 1 - .../formvalidation/dist/js/locales/th_TH.js | 389 - .../dist/js/locales/th_TH.min.js | 1 - .../formvalidation/dist/js/locales/tr_TR.js | 389 - .../dist/js/locales/tr_TR.min.js | 1 - .../formvalidation/dist/js/locales/ua_UA.js | 389 - .../dist/js/locales/ua_UA.min.js | 1 - .../formvalidation/dist/js/locales/vi_VN.js | 389 - .../dist/js/locales/vi_VN.min.js | 1 - .../formvalidation/dist/js/locales/zh_CN.js | 389 - .../dist/js/locales/zh_CN.min.js | 1 - .../formvalidation/dist/js/locales/zh_TW.js | 389 - .../dist/js/locales/zh_TW.min.js | 1 - .../libs/quill/fonts/KaTeX_AMS-Regular.ttf | Bin 63632 -> 0 bytes .../libs/quill/fonts/KaTeX_AMS-Regular.woff | Bin 33516 -> 0 bytes .../libs/quill/fonts/KaTeX_AMS-Regular.woff2 | Bin 28076 -> 0 bytes .../quill/fonts/KaTeX_Caligraphic-Bold.ttf | Bin 12368 -> 0 bytes .../quill/fonts/KaTeX_Caligraphic-Bold.woff | Bin 7716 -> 0 bytes .../quill/fonts/KaTeX_Caligraphic-Bold.woff2 | Bin 6912 -> 0 bytes .../quill/fonts/KaTeX_Caligraphic-Regular.ttf | Bin 12344 -> 0 bytes .../fonts/KaTeX_Caligraphic-Regular.woff | Bin 7656 -> 0 bytes .../fonts/KaTeX_Caligraphic-Regular.woff2 | Bin 6908 -> 0 bytes .../libs/quill/fonts/KaTeX_Fraktur-Bold.ttf | Bin 19584 -> 0 bytes .../libs/quill/fonts/KaTeX_Fraktur-Bold.woff | Bin 13296 -> 0 bytes .../libs/quill/fonts/KaTeX_Fraktur-Bold.woff2 | Bin 11348 -> 0 bytes .../quill/fonts/KaTeX_Fraktur-Regular.ttf | Bin 19572 -> 0 bytes .../quill/fonts/KaTeX_Fraktur-Regular.woff | Bin 13208 -> 0 bytes .../quill/fonts/KaTeX_Fraktur-Regular.woff2 | Bin 11316 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Bold.ttf | Bin 51336 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Bold.woff | Bin 29912 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Bold.woff2 | Bin 25324 -> 0 bytes .../quill/fonts/KaTeX_Main-BoldItalic.ttf | Bin 32968 -> 0 bytes .../quill/fonts/KaTeX_Main-BoldItalic.woff | Bin 19412 -> 0 bytes .../quill/fonts/KaTeX_Main-BoldItalic.woff2 | Bin 16780 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Italic.ttf | Bin 33580 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Italic.woff | Bin 19676 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Italic.woff2 | Bin 16988 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Regular.ttf | Bin 53580 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Regular.woff | Bin 30772 -> 0 bytes .../libs/quill/fonts/KaTeX_Main-Regular.woff2 | Bin 26272 -> 0 bytes .../quill/fonts/KaTeX_Math-BoldItalic.ttf | Bin 31196 -> 0 bytes .../quill/fonts/KaTeX_Math-BoldItalic.woff | Bin 18668 -> 0 bytes .../quill/fonts/KaTeX_Math-BoldItalic.woff2 | Bin 16400 -> 0 bytes .../libs/quill/fonts/KaTeX_Math-Italic.ttf | Bin 31308 -> 0 bytes .../libs/quill/fonts/KaTeX_Math-Italic.woff | Bin 18748 -> 0 bytes .../libs/quill/fonts/KaTeX_Math-Italic.woff2 | Bin 16440 -> 0 bytes .../libs/quill/fonts/KaTeX_SansSerif-Bold.ttf | Bin 24504 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Bold.woff | Bin 14408 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Bold.woff2 | Bin 12216 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Italic.ttf | Bin 22364 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Italic.woff | Bin 14112 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Italic.woff2 | Bin 12028 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Regular.ttf | Bin 19436 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Regular.woff | Bin 12316 -> 0 bytes .../quill/fonts/KaTeX_SansSerif-Regular.woff2 | Bin 10344 -> 0 bytes .../libs/quill/fonts/KaTeX_Script-Regular.ttf | Bin 16648 -> 0 bytes .../quill/fonts/KaTeX_Script-Regular.woff | Bin 10588 -> 0 bytes .../quill/fonts/KaTeX_Script-Regular.woff2 | Bin 9644 -> 0 bytes .../libs/quill/fonts/KaTeX_Size1-Regular.ttf | Bin 12228 -> 0 bytes .../libs/quill/fonts/KaTeX_Size1-Regular.woff | Bin 6496 -> 0 bytes .../quill/fonts/KaTeX_Size1-Regular.woff2 | Bin 5468 -> 0 bytes .../libs/quill/fonts/KaTeX_Size2-Regular.ttf | Bin 11508 -> 0 bytes .../libs/quill/fonts/KaTeX_Size2-Regular.woff | Bin 6188 -> 0 bytes .../quill/fonts/KaTeX_Size2-Regular.woff2 | Bin 5208 -> 0 bytes .../libs/quill/fonts/KaTeX_Size3-Regular.ttf | Bin 7588 -> 0 bytes .../libs/quill/fonts/KaTeX_Size3-Regular.woff | Bin 4420 -> 0 bytes .../quill/fonts/KaTeX_Size3-Regular.woff2 | Bin 3624 -> 0 bytes .../libs/quill/fonts/KaTeX_Size4-Regular.ttf | Bin 10364 -> 0 bytes .../libs/quill/fonts/KaTeX_Size4-Regular.woff | Bin 5980 -> 0 bytes .../quill/fonts/KaTeX_Size4-Regular.woff2 | Bin 4928 -> 0 bytes .../quill/fonts/KaTeX_Typewriter-Regular.ttf | Bin 27556 -> 0 bytes .../quill/fonts/KaTeX_Typewriter-Regular.woff | Bin 16028 -> 0 bytes .../fonts/KaTeX_Typewriter-Regular.woff2 | Bin 13568 -> 0 bytes 329 files changed, 811 insertions(+), 59359 deletions(-) delete mode 100755 ci4/app/Controllers/Presupuestos/PresupuestoManipulados.php delete mode 100755 ci4/app/Controllers/Presupuestos/PresupuestoPreimpresiones.php create mode 100755 ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php create mode 100755 ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php mode change 100644 => 100755 ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php mode change 100644 => 100755 ci4/app/Entities/Tarifas/TarifaEncuadernacionLineaHoras.php mode change 100644 => 100755 ci4/app/Models/Tarifas/TarifaEncuadernacionLineaHorasModel.php delete mode 100755 httpdocs/themes/vuexy/img/illustrations/add-new-roles.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-forgot-password-illustration-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-forgot-password-illustration-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-login-illustration-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-login-illustration-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-register-illustration-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-register-illustration-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-register-multisteps-illustration.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-reset-password-illustration-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-reset-password-illustration-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-two-step-illustration-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-two-step-illustration-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-verify-email-illustration-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/auth-verify-email-illustration-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/bg-shape-image-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/bg-shape-image-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/boy-verify-email-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/boy-verify-email-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/boy-with-laptop-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/boy-with-laptop-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/boy-with-rocket-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/boy-with-rocket-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/card-advance-sale.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/card-website-analytics-1.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/card-website-analytics-2.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/card-website-analytics-3.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-doing-yoga-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-doing-yoga-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-sitting-with-laptop.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-unlock-password-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-unlock-password-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-verify-password-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-verify-password-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-with-laptop-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-with-laptop-light.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/girl-with-laptop.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-misc-error.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-misc-launching-soon.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-misc-under-maintenance.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-misc-you-are-not-authorized.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-pricing-basic.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-pricing-enterprise.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/page-pricing-standard.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/wizard-create-deal-confirm.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/wizard-create-deal-girl-with-laptop-dark.png delete mode 100755 httpdocs/themes/vuexy/img/illustrations/wizard-create-deal-girl-with-laptop-light.png delete mode 100755 httpdocs/themes/vuexy/js/app-access-permission.js delete mode 100755 httpdocs/themes/vuexy/js/app-access-roles.js delete mode 100755 httpdocs/themes/vuexy/js/app-calendar-events.js delete mode 100755 httpdocs/themes/vuexy/js/app-calendar.js delete mode 100755 httpdocs/themes/vuexy/js/app-chat.js delete mode 100755 httpdocs/themes/vuexy/js/app-email.js delete mode 100755 httpdocs/themes/vuexy/js/app-invoice-add.js delete mode 100755 httpdocs/themes/vuexy/js/app-invoice-edit.js delete mode 100755 httpdocs/themes/vuexy/js/app-invoice-list.js delete mode 100755 httpdocs/themes/vuexy/js/app-invoice-print.js delete mode 100755 httpdocs/themes/vuexy/js/app-kanban.js delete mode 100755 httpdocs/themes/vuexy/js/app-user-list.js delete mode 100755 httpdocs/themes/vuexy/js/app-user-view-account.js delete mode 100755 httpdocs/themes/vuexy/js/app-user-view-billing.js delete mode 100755 httpdocs/themes/vuexy/js/app-user-view-security.js delete mode 100755 httpdocs/themes/vuexy/js/app-user-view.js delete mode 100755 httpdocs/themes/vuexy/js/cards-actions.js delete mode 100755 httpdocs/themes/vuexy/js/cards-advance.js delete mode 100755 httpdocs/themes/vuexy/js/cards-analytics.js delete mode 100755 httpdocs/themes/vuexy/js/cards-statistics.js delete mode 100755 httpdocs/themes/vuexy/js/charts-apex.js delete mode 100755 httpdocs/themes/vuexy/js/charts-chartjs.js delete mode 100755 httpdocs/themes/vuexy/js/config.js delete mode 100755 httpdocs/themes/vuexy/js/dashboards-analytics.js delete mode 100755 httpdocs/themes/vuexy/js/dashboards-crm.js delete mode 100755 httpdocs/themes/vuexy/js/dashboards-ecommerce.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/dataTables.editor.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/dataTables.editor.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/dataTables.editor.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/dataTables.editor.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap4.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap4.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap4.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap4.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap5.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap5.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap5.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bootstrap5.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bulma.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bulma.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bulma.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.bulma.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.dataTables.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.dataTables.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.dataTables.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.dataTables.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.foundation.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.foundation.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.foundation.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.foundation.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.jqueryui.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.jqueryui.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.jqueryui.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.jqueryui.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.semanticui.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.semanticui.min.js delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.semanticui.min.mjs delete mode 100755 httpdocs/themes/vuexy/js/datatables-editor/editor.semanticui.mjs delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-blockui.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-drag-and-drop.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-media-player.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-misc-clipboardjs.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-misc-idle-timer.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-misc-numeraljs.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-perfect-scrollbar.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-star-ratings.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-sweetalert2.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-timeline.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-tour.js delete mode 100755 httpdocs/themes/vuexy/js/extended-ui-treeview.js delete mode 100755 httpdocs/themes/vuexy/js/form-basic-inputs.js delete mode 100755 httpdocs/themes/vuexy/js/form-layouts.js delete mode 100755 httpdocs/themes/vuexy/js/form-validation.js delete mode 100755 httpdocs/themes/vuexy/js/form-wizard-icons.js delete mode 100755 httpdocs/themes/vuexy/js/form-wizard-numbered.js delete mode 100755 httpdocs/themes/vuexy/js/form-wizard-validation.js delete mode 100755 httpdocs/themes/vuexy/js/forms-editors.js delete mode 100755 httpdocs/themes/vuexy/js/forms-extras.js delete mode 100755 httpdocs/themes/vuexy/js/forms-file-upload.js delete mode 100755 httpdocs/themes/vuexy/js/forms-pickers.js delete mode 100755 httpdocs/themes/vuexy/js/forms-selects.js delete mode 100755 httpdocs/themes/vuexy/js/forms-sliders.js delete mode 100755 httpdocs/themes/vuexy/js/forms-tagify.js delete mode 100755 httpdocs/themes/vuexy/js/forms-typeahead.js delete mode 100755 httpdocs/themes/vuexy/js/main.js delete mode 100755 httpdocs/themes/vuexy/js/maps-leaflet.js delete mode 100755 httpdocs/themes/vuexy/js/modal-add-new-address.js delete mode 100755 httpdocs/themes/vuexy/js/modal-add-new-cc.js delete mode 100755 httpdocs/themes/vuexy/js/modal-add-permission.js delete mode 100755 httpdocs/themes/vuexy/js/modal-add-role.js delete mode 100755 httpdocs/themes/vuexy/js/modal-create-app.js delete mode 100755 httpdocs/themes/vuexy/js/modal-edit-cc.js delete mode 100755 httpdocs/themes/vuexy/js/modal-edit-permission.js delete mode 100755 httpdocs/themes/vuexy/js/modal-edit-user.js delete mode 100755 httpdocs/themes/vuexy/js/modal-enable-otp.js delete mode 100755 httpdocs/themes/vuexy/js/modal-share-project.js delete mode 100755 httpdocs/themes/vuexy/js/modal-two-factor-auth.js delete mode 100755 httpdocs/themes/vuexy/js/offcanvas-add-payment.js delete mode 100755 httpdocs/themes/vuexy/js/offcanvas-send-invoice.js delete mode 100755 httpdocs/themes/vuexy/js/pages-account-settings-account.js delete mode 100755 httpdocs/themes/vuexy/js/pages-account-settings-billing.js delete mode 100755 httpdocs/themes/vuexy/js/pages-account-settings-security.js delete mode 100755 httpdocs/themes/vuexy/js/pages-auth-multisteps.js delete mode 100755 httpdocs/themes/vuexy/js/pages-auth-two-steps.js delete mode 100755 httpdocs/themes/vuexy/js/pages-auth.js delete mode 100755 httpdocs/themes/vuexy/js/pages-pricing.js delete mode 100755 httpdocs/themes/vuexy/js/pages-profile.js delete mode 100755 httpdocs/themes/vuexy/js/tables-datatables-advanced.js delete mode 100755 httpdocs/themes/vuexy/js/tables-datatables-basic.js delete mode 100755 httpdocs/themes/vuexy/js/tables-datatables-extensions.js delete mode 100755 httpdocs/themes/vuexy/js/ui-app-brand.js delete mode 100755 httpdocs/themes/vuexy/js/ui-carousel.js delete mode 100755 httpdocs/themes/vuexy/js/ui-menu.js delete mode 100755 httpdocs/themes/vuexy/js/ui-modals.js delete mode 100755 httpdocs/themes/vuexy/js/ui-navbar.js delete mode 100755 httpdocs/themes/vuexy/js/ui-popover.js delete mode 100755 httpdocs/themes/vuexy/js/ui-toasts.js delete mode 100755 httpdocs/themes/vuexy/js/wizard-ex-checkout.js delete mode 100755 httpdocs/themes/vuexy/js/wizard-ex-create-deal.js delete mode 100755 httpdocs/themes/vuexy/js/wizard-ex-property-listing.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ar_MA.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ar_MA.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/bg_BG.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/bg_BG.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ca_ES.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ca_ES.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/cs_CZ.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/cs_CZ.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/da_DK.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/da_DK.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/de_DE.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/de_DE.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/el_GR.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/el_GR.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/en_US.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/en_US.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/es_CL.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/es_CL.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/es_ES.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/es_ES.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/eu_ES.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/eu_ES.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fa_IR.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fa_IR.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fi_FI.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fi_FI.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fr_BE.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fr_BE.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fr_FR.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/fr_FR.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/he_IL.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/he_IL.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/hi_IN.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/hi_IN.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/hu_HU.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/hu_HU.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/id_ID.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/id_ID.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/it_IT.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/it_IT.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ja_JP.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ja_JP.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/nl_BE.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/nl_BE.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/nl_NL.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/nl_NL.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/no_NO.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/no_NO.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/pl_PL.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/pl_PL.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/pt_BR.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/pt_BR.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/pt_PT.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/pt_PT.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ro_RO.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ro_RO.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ru_RU.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ru_RU.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sk_SK.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sk_SK.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sq_AL.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sq_AL.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sr_RS.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sr_RS.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sv_SE.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/sv_SE.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/th_TH.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/th_TH.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/tr_TR.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/tr_TR.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ua_UA.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/ua_UA.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/vi_VN.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/vi_VN.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/zh_CN.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/zh_CN.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/zh_TW.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/formvalidation/dist/js/locales/zh_TW.min.js delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_AMS-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_AMS-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_AMS-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Caligraphic-Bold.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Caligraphic-Bold.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Caligraphic-Bold.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Caligraphic-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Caligraphic-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Caligraphic-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Fraktur-Bold.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Fraktur-Bold.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Fraktur-Bold.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Fraktur-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Fraktur-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Fraktur-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Bold.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Bold.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Bold.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-BoldItalic.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-BoldItalic.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-BoldItalic.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Italic.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Italic.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Italic.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Main-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Math-BoldItalic.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Math-BoldItalic.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Math-BoldItalic.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Math-Italic.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Math-Italic.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Math-Italic.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Bold.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Bold.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Bold.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Italic.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Italic.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Italic.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_SansSerif-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Script-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Script-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Script-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size1-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size1-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size1-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size2-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size2-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size2-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size3-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size3-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size3-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size4-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size4-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Size4-Regular.woff2 delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Typewriter-Regular.ttf delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Typewriter-Regular.woff delete mode 100755 httpdocs/themes/vuexy/vendor/libs/quill/fonts/KaTeX_Typewriter-Regular.woff2 diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 6a551a25..441371f2 100755 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -494,7 +494,6 @@ $routes->resource('cosidotapablanda', ['namespace' => 'App\Controllers\Presupue $routes->group('serviciosacabados', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) { $routes->post('datatable', 'Presupuestoacabados::datatable', ['as' => 'dataTableOfPresupuestoAcabados']); - $routes->get('delete/(:num)', 'Presupuestoacabados::delete/$1', ['as' => 'deletePresupuestoAcabado']); $routes->post('edit/(:num)', 'Presupuestoacabados::edit/$1', ['as' => 'updatePresupuestoacabados']); }); @@ -507,13 +506,13 @@ $routes->group('serviciosencuadernaciones', ['namespace' => 'App\Controllers\Pre }); $routes->group('serviciosmanipulados', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) { - $routes->post('datatable', 'PresupuestoManipulados::datatable', ['as' => 'dataTableOfPresupuestoManipulados']); - $routes->post('datatable_editor', 'PresupuestoManipulados::datatable_editor', ['as' => 'editorOfPresupuestoManipulados']); + $routes->post('datatable', 'Presupuestomanipulados::datatable', ['as' => 'dataTableOfPresupuestoManipulados']); + $routes->post('edit/(:num)', 'Presupuestomanipulados::edit/$1', ['as' => 'updatePresupuestomanipulados']); }); $routes->group('serviciospreimpresiones', ['namespace' => 'App\Controllers\Presupuestos'], function ($routes) { - $routes->post('datatable', 'PresupuestoPreimpresiones::datatable', ['as' => 'dataTableOfPresupuestoPreimpresiones']); - $routes->post('datatable_editor', 'PresupuestoPreimpresiones::datatable_editor', ['as' => 'editorOfPresupuestoPreimpresiones']); + $routes->post('datatable', 'Presupuestopreimpresiones::datatable', ['as' => 'dataTableOfPresupuestoPreimpresiones']); + $routes->post('edit/(:num)', 'Presupuestopreimpresiones::edit/$1', ['as' => 'updatePresupuestopreimpresiones']); }); $routes->group('printpresupuestos', ['namespace' => 'App\Controllers\Pdf'], function ($routes) { diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php index f4812f10..f90eb06b 100755 --- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php +++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php @@ -12,6 +12,8 @@ use App\Models\Presupuestos\PresupuestoModel; use App\Models\Presupuestos\PresupuestoEncuadernacionesModel; use App\Models\Presupuestos\PresupuestoAcabadosModel; +use App\Models\Presupuestos\PresupuestoManipuladosModel; +use App\Models\Presupuestos\PresupuestoPreimpresionesModel; use App\Services\PresupuestoService; use App\Models\Configuracion\PapelImpresionModel; @@ -284,6 +286,8 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController $this->viewData['serviciosManipulado'] = $this->getServiciosManipulado(); $this->viewData['serviciosEncuadernacionList'] = (new PresupuestoEncuadernacionesModel())->getResource($id)->get()->getResultObject(); $this->viewData['serviciosAcabadosList'] = (new PresupuestoAcabadosModel())->getResource($id)->get()->getResultObject(); + $this->viewData['serviciosManipuladoList'] = (new PresupuestoManipuladosModel())->getResource($id)->get()->getResultObject(); + $this->viewData['serviciosPreimpresionList'] = (new PresupuestoPreimpresionesModel())->getResource($id)->get()->getResultObject(); $this->viewData['POD'] = $this->getPOD(); diff --git a/ci4/app/Controllers/Presupuestos/PresupuestoManipulados.php b/ci4/app/Controllers/Presupuestos/PresupuestoManipulados.php deleted file mode 100755 index 4dcfed56..00000000 --- a/ci4/app/Controllers/Presupuestos/PresupuestoManipulados.php +++ /dev/null @@ -1,123 +0,0 @@ -request->isAJAX()) { - $reqData = $this->request->getPost(); - if (!isset($reqData['draw']) || !isset($reqData['columns'])) { - $errstr = 'No data available in response to this specific request.'; - $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr); - return $response; - } - $start = $reqData['start'] ?? 0; - $length = $reqData['length'] ?? 5; - $requestedOrder = $reqData['order']['0']['column'] ?? 1; - $order = PresupuestoManipuladosModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1]; - $dir = $reqData['order']['0']['dir'] ?? 'asc'; - - $id_P = $reqData['id_presupuesto'] ?? -1; - - $resourceData = $this->model->getResource($id_P)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); - - return $this->respond(Collection::datatable( - $resourceData, - $this->model->getResource()->countAllResults(), - $this->model->getResource($id_P)->countAllResults() - )); - } else { - return $this->failUnauthorized('Invalid request', 403); - } - } - - public function datatable_editor() { - if ($this->request->isAJAX()) { - - include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php"); - - // Build our Editor instance and process the data coming from _POST - $response = Editor::inst( $db, 'presupuesto_manipulados' ) - ->fields( - Field::inst( 'tarifa_manipulado_id' ) - ->validator( 'Validate::notEmpty',array( - 'message' => 'Selecciones servicios de acabado' ) - ), - Field::inst( 'precio_unidad' ) - ->validator( 'Validate::notEmpty',array( - 'message' => 'Falta precio unitario' ) - ), - Field::inst( 'precio_total' ) - ->validator( 'Validate::notEmpty',array( - 'message' => 'Falta precio total' ) - ), - - Field::inst( 'presupuesto_id' ), - - ) - ->validator( function($editor, $action, $data){ - if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT){ - //return $response; - /*foreach ($data['data'] as $pkey => $values ){ - // No se pueden duplicar valores al crear o al editar - if (!empty($response)){ - return $response; - } - }*/ - } - }) - ->debug(true) - ->process( $_POST ) - ->data(); - - $newTokenHash = csrf_hash(); - $csrfTokenName = csrf_token(); - - $response[$csrfTokenName] = $newTokenHash; - - echo json_encode($response); - - } else { - return $this->failUnauthorized('Invalid request', 403); - } - } - - - -} diff --git a/ci4/app/Controllers/Presupuestos/PresupuestoPreimpresiones.php b/ci4/app/Controllers/Presupuestos/PresupuestoPreimpresiones.php deleted file mode 100755 index 7142c642..00000000 --- a/ci4/app/Controllers/Presupuestos/PresupuestoPreimpresiones.php +++ /dev/null @@ -1,117 +0,0 @@ -request->isAJAX()) { - $reqData = $this->request->getPost(); - if (!isset($reqData['draw']) || !isset($reqData['columns'])) { - $errstr = 'No data available in response to this specific request.'; - $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr); - return $response; - } - $start = $reqData['start'] ?? 0; - $length = $reqData['length'] ?? 5; - $requestedOrder = $reqData['order']['0']['column'] ?? 1; - $order = PresupuestoPreimpresionesModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1]; - $dir = $reqData['order']['0']['dir'] ?? 'asc'; - - $id_P = $reqData['id_presupuesto'] ?? -1; - - $resourceData = $this->model->getResource($id_P)->orderBy($order, $dir)->limit(50, $start)->get()->getResultObject(); - - return $this->respond(Collection::datatable( - $resourceData, - $this->model->getResource()->countAllResults(), - $this->model->getResource($id_P)->countAllResults() - )); - } else { - return $this->failUnauthorized('Invalid request', 403); - } - } - - public function datatable_editor() { - if ($this->request->isAJAX()) { - - include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php"); - - // Build our Editor instance and process the data coming from _POST - $response = Editor::inst( $db, 'presupuesto_preimpresiones' ) - ->fields( - Field::inst( 'tarifa_preimpresion_id' ) - ->validator( 'Validate::notEmpty',array( - 'message' => 'Selecciones servicios de acabado' ) - ), - Field::inst( 'precio_unidad' ) - ->validator( 'Validate::notEmpty',array( - 'message' => 'Falta precio unitario' ) - ), - Field::inst( 'precio_total' ) - ->validator( 'Validate::notEmpty',array( - 'message' => 'Falta precio total' ) - ), - - Field::inst( 'presupuesto_id' ), - - ) - ->validator( function($editor, $action, $data){ - if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT){ - //return $response; - /*foreach ($data['data'] as $pkey => $values ){ - // No se pueden duplicar valores al crear o al editar - if (!empty($response)){ - return $response; - } - }*/ - } - }) - ->debug(true) - ->process( $_POST ) - ->data(); - - $newTokenHash = csrf_hash(); - $csrfTokenName = csrf_token(); - - $response[$csrfTokenName] = $newTokenHash; - - echo json_encode($response); - - } else { - return $this->failUnauthorized('Invalid request', 403); - } - } - - - -} diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php index c451649a..84c46feb 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php @@ -7,9 +7,7 @@ use App\Models\Collection; use App\Models\Presupuestos\PresupuestoAcabadosModel; -use DataTables\Editor; -use DataTables\Editor\Field; -use DataTables\Editor\Validate; + class Presupuestoacabados extends \App\Controllers\GoBaseResourceController diff --git a/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php b/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php new file mode 100755 index 00000000..db77861b --- /dev/null +++ b/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php @@ -0,0 +1,89 @@ +request->getJSON(); + $tarifas = array_column($postData->datos, 'tarifa_id'); + if(count($tarifas)>0){ + $this->model->deleteServiciosNotInArray($requestedId, $tarifas); + } + else{ + $this->model->deleteAllServicios($requestedId); + } + + $this->model->updateTarifas($requestedId, $postData->datos); + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + $data = [ + $csrfTokenName => $newTokenHash + ]; + + return $this->respond($data); + } + + public function datatable() + { + if ($this->request->isAJAX()) { + $reqData = $this->request->getPost(); + + $tarifa_manipulado_id = $reqData['tarifa_manipulado_id'] ?? 0; + $tirada = $reqData['tirada'] ?? 0; + $POD = $reqData['POD'] ?? 0; + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + + $values = $this->model->getPrecioTarifa($tarifa_manipulado_id, $tirada, $POD); + + $data = [ + 'values' => $values, + $csrfTokenName => $newTokenHash + ]; + + return $this->respond($data); + + } else { + return $this->failUnauthorized('Invalid request', 403); + } + } + +} diff --git a/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php b/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php new file mode 100755 index 00000000..2c9a1e6f --- /dev/null +++ b/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php @@ -0,0 +1,83 @@ +request->getJSON(); + $tarifas = array_column($postData->datos, 'tarifa_id'); + if(count($tarifas)>0){ + $this->model->deleteServiciosNotInArray($requestedId, $tarifas); + } + else{ + $this->model->deleteAllServicios($requestedId); + } + + $this->model->updateTarifas($requestedId, $postData->datos); + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + $data = [ + $csrfTokenName => $newTokenHash + ]; + + return $this->respond($data); + } + + public function datatable() + { + if ($this->request->isAJAX()) { + $reqData = $this->request->getPost(); + + $tarifa_preimpresion_id = $reqData['tarifa_preimpresion_id'] ?? 0; + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + + $values = $this->model->getPrecioTarifa($tarifa_preimpresion_id); + + $data = [ + 'values' => $values, + $csrfTokenName => $newTokenHash + ]; + + return $this->respond($data); + + } else { + return $this->failUnauthorized('Invalid request', 403); + } + } + +} diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php old mode 100644 new mode 100755 diff --git a/ci4/app/Entities/Tarifas/TarifaEncuadernacionLineaHoras.php b/ci4/app/Entities/Tarifas/TarifaEncuadernacionLineaHoras.php old mode 100644 new mode 100755 diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php index 7c3f9d0a..3f749913 100755 --- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php @@ -8,7 +8,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity protected $attributes = [ "id" => null, "nombre" => null, - "precio_pagina" => null, + "precio" => null, "precio_min" => 0, "importe_fijo" => 0, "margen" => 0, @@ -21,7 +21,7 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity "updated_at" => null, ]; protected $casts = [ - "precio_pagina" => "float", + "precio" => "float", "precio_min" => "float", "importe_fijo" => "float", "margen" => "float", diff --git a/ci4/app/Language/en/Tarifapreimpresion.php b/ci4/app/Language/en/Tarifapreimpresion.php index 5d3070bc..6afb8095 100755 --- a/ci4/app/Language/en/Tarifapreimpresion.php +++ b/ci4/app/Language/en/Tarifapreimpresion.php @@ -8,7 +8,7 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Preprinting rates', 'nombre' => 'Name', - 'precio' => 'Price per page', + 'precio' => 'Price', 'precioMin' => 'Min Price', 'importeFijo' => 'Fixed amount', 'margen' => 'Margin', diff --git a/ci4/app/Language/es/Presupuestos.php b/ci4/app/Language/es/Presupuestos.php index 2f711d42..d1a3b96f 100755 --- a/ci4/app/Language/es/Presupuestos.php +++ b/ci4/app/Language/es/Presupuestos.php @@ -153,6 +153,8 @@ return [ 'servicioEncuadernado' => 'Servicio de encuadernación', 'servicioEncuadernadoList' => 'Servicios de encuadernación', 'servicioAcabadoList' => 'Servicios de acabado', + 'servicioManipuladoList' => 'Servicios de manipulado', + 'servicioPreimpresionList' => 'Servicios de preimpresion', 'servicioManipulado' => 'Servicio de manipulado', 'comentarios' => 'Comentarios', @@ -168,6 +170,7 @@ return [ 'confirmar' => 'Confirmar presupuesto', // Servicios + 'precio' => 'Precio', 'precioUnidad' => 'Precio unitario', 'precioTotal' => 'Precio total', 'serviciosEncDefault' => 'Servicios Enc. por defecto', diff --git a/ci4/app/Language/es/Tarifapreimpresion.php b/ci4/app/Language/es/Tarifapreimpresion.php index 5107424b..d8be90cb 100755 --- a/ci4/app/Language/es/Tarifapreimpresion.php +++ b/ci4/app/Language/es/Tarifapreimpresion.php @@ -7,7 +7,7 @@ return [ 'id' => 'ID', 'moduleTitle' => 'Tarifas Preimpresión', 'nombre' => 'Nombre', - 'precio' => 'Precio/página', + 'precio' => 'Precio', 'precioMin' => 'Precio Mínimo', 'importeFijo' => 'Importe Fijo', 'mostrar_en_presupuesto' => 'Mostrar en presupuesto', diff --git a/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php b/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php index e45976e8..7bdadf3e 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php @@ -45,6 +45,101 @@ class PresupuestoManipuladosModel extends \App\Models\GoBaseModel ]; + public function getPrecioTarifa($tarifa_manipulado_id, $tirada, $POD){ + + $modelTarifa = model('App\Models\Tarifas\TarifaManipuladoModel'); + $tarifa_value = $modelTarifa->getTarifaPresupuestoManipulado($tarifa_manipulado_id, $tirada); + if (count($tarifa_value)>0) { + + $result_data = $this->calcularTarifa($tarifa_value[0], $tirada, $POD<$tirada?false:true); + $ret_array[] = (object)[ + 'tarifa_id'=> $tarifa_value[0]->tarifa_manipulado_id, + 'tarifa_nombre'=> $tarifa_value[0]->tarifa_manipulado_nombre, + 'precio_unidad'=> $result_data[0], + 'total'=> $result_data[1], + ]; + return $ret_array; + } + else{ + $ret_array[] = (object)[ + 'tarifa_id'=> $tarifa_manipulado_id, + 'tarifa_nombre'=> $modelTarifa->getNombreTarifaManipulado($tarifa_manipulado_id)[0]->nombre, + 'precio_unidad' => 0, + 'total'=> 0, + ]; + return $ret_array; + } + return []; + } + + private function calcularTarifa($tarifa, $tirada, $is_POD=false){ + + $precio_unidad = floatval($tarifa->precio_min) - (floatval($tarifa->precio_min) - floatval($tarifa->precio_max))/($tarifa->tirada_max - $tarifa->tirada_min) * ($tirada - $tarifa->tirada_min); + if ($tirada > $tarifa->tirada_max) + $precio_unidad = $tarifa->precio_max; + $precio_unidad = $precio_unidad* (1+ floatval($tarifa->margen)/100.0); + + $total = $precio_unidad * $tirada; + + if (!$is_POD){ + $total += floatval($tarifa->tarifa_importe_fijo); + } + + return [$precio_unidad, $total]; + } + + public function deleteAllServicios($presupuesto_id){ + + $this->db + ->table($this->table . " t1") + ->where('presupuesto_id', $presupuesto_id) + ->delete(); + } + + public function deleteServiciosNotInArray($presupuesto_id, $tarifas_id){ + + $builder = $this->db + ->table($this->table . " t1"); + $builder->where('presupuesto_id', $presupuesto_id); + foreach($tarifas_id as $id){ + $builder->where('tarifa_manipulado_id !=', $id); + } + $builder->delete(); + } + + public function updateTarifas($presupuesto_id, $tarifas){ + + foreach($tarifas as $tarifa){ + + $builder = $this->db + ->table($this->table . " t1"); + $builder->select("id"); + $builder->where('presupuesto_id', $presupuesto_id); + $builder->where('tarifa_manipulado_id', $tarifa->tarifa_id); + $result = $builder->get()->getResultObject(); + if(count($result)>0){ + $this->db + ->table($this->table . " t1") + ->where('presupuesto_id', $presupuesto_id) + ->where('tarifa_manipulado_id', $tarifa->tarifa_id) + ->set('precio_unidad', $tarifa->precio_unidad) + ->set('precio_total', $tarifa->precio_total) + ->update(); + + + } + else{ + $this->db + ->table($this->table . " t1") + ->set('presupuesto_id', $presupuesto_id) + ->set('tarifa_manipulado_id', $tarifa->tarifa_id) + ->set('precio_unidad', $tarifa->precio_unidad) + ->set('precio_total', $tarifa->precio_total) + ->insert(); + } + } + } + /** * Get resource data. * diff --git a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php index 2cc3627b..65089ebc 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php @@ -45,6 +45,90 @@ class PresupuestoPreimpresionesModel extends \App\Models\GoBaseModel ]; + public function getPrecioTarifa($tarifa_preimpresion_id){ + + $modelTarifa = model('App\Models\Tarifas\TarifapreimpresionModel'); + $tarifa_value = $modelTarifa->getTarifaPresupuestoPreimpresion($tarifa_preimpresion_id); + if (count($tarifa_value)>0) { + + $result_data = $this->calcularTarifa($tarifa_value[0]); + $ret_array[] = (object)[ + 'tarifa_id'=> $tarifa_value[0]->tarifa_preimpresion_id, + 'tarifa_nombre'=> $tarifa_value[0]->tarifa_preimpresion_nombre, + 'precio'=> $result_data, + ]; + return $ret_array; + } + else{ + $ret_array[] = (object)[ + 'tarifa_id'=> $tarifa_preimpresion_id, + 'tarifa_nombre'=> $modelTarifa->getNombreTarifaPreimpresion($tarifa_preimpresion_id)[0]->nombre, + 'precio' => 0, + ]; + return $ret_array; + } + return []; + } + + private function calcularTarifa($tarifa){ + + $precio = floatval($tarifa->precio); + $precio = $precio * (1+ floatval($tarifa->margen)/100.0); + + return $precio; + } + + public function deleteAllServicios($presupuesto_id){ + + $this->db + ->table($this->table . " t1") + ->where('presupuesto_id', $presupuesto_id) + ->delete(); + } + + public function deleteServiciosNotInArray($presupuesto_id, $tarifas_id){ + + $builder = $this->db + ->table($this->table . " t1"); + $builder->where('presupuesto_id', $presupuesto_id); + foreach($tarifas_id as $id){ + $builder->where('tarifa_preimpresion_id !=', $id); + } + $builder->delete(); + } + + public function updateTarifas($presupuesto_id, $tarifas){ + + foreach($tarifas as $tarifa){ + + $builder = $this->db + ->table($this->table . " t1"); + $builder->select("id"); + $builder->where('presupuesto_id', $presupuesto_id); + $builder->where('tarifa_preimpresion_id', $tarifa->tarifa_id); + $result = $builder->get()->getResultObject(); + if(count($result)>0){ + $this->db + ->table($this->table . " t1") + ->where('presupuesto_id', $presupuesto_id) + ->where('tarifa_preimpresion_id', $tarifa->tarifa_id) + ->set('precio', $tarifa->precio) + ->update(); + + + } + else{ + $this->db + ->table($this->table . " t1") + ->set('presupuesto_id', $presupuesto_id) + ->set('tarifa_preimpresion_id', $tarifa->tarifa_id) + ->set('precio', $tarifa->precio) + ->insert(); + } + } + } + + /** * Get resource data. * @@ -57,7 +141,7 @@ class PresupuestoPreimpresionesModel extends \App\Models\GoBaseModel $builder = $this->db ->table($this->table . " t1") ->select( - "t1.id AS id, t1.tarifa_preimpresion_id AS tarifa_preimpresion_id, t1.precio_unidad AS precio_unidad, t1.precio_total AS precio_total, t2.nombre AS nombre" + "t1.id AS id, t1.tarifa_preimpresion_id AS tarifa_preimpresion_id, t1.precio AS precio, t2.nombre AS nombre" ); $builder->where('t1.presupuesto_id', $presupuesto_id); diff --git a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaHorasModel.php b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaHorasModel.php old mode 100644 new mode 100755 diff --git a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php index 33c1607f..320c43cf 100755 --- a/ci4/app/Models/Tarifas/TarifaManipuladoModel.php +++ b/ci4/app/Models/Tarifas/TarifaManipuladoModel.php @@ -109,4 +109,41 @@ class TarifaManipuladoModel extends \App\Models\GoBaseModel return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject(); } + + public function getTarifaPresupuestoManipulado($tarifa_id, $tirada){ + + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.id AS tarifa_manipulado_id, t1.nombre AS tarifa_manipulado_nombre, t1.precio_min AS tarifa_precio_min, t1.importe_fijo AS tarifa_importe_fijo, + t2.id AS tarifa_linea_id, t2.tirada_min AS tirada_min, t2.tirada_max AS tirada_max, + t2.precio_min AS precio_min, t2.precio_max AS precio_max, t2.margen AS margen" + ) + ->join("tarifa_manipulado_lineas t2", "t1.id = t2.tarifa_manipulado_id", "left") + ->where("t1.is_deleted", 0) + //->where("t1.mostrar_en_presupuesto", 1) + ->where("t2.is_deleted", 0); + + $builder->where('t1.id =', $tarifa_id); + $builder->where('t2.tirada_min <=', $tirada); + $builder->where('t2.tirada_max >', $tirada); + + return $builder->get()->getResultObject(); + } + + public function getNombreTarifaManipulado($id=-1) + { + /* + Todos los servicios de encuadernacion activas que se pueden usar en presupuestos + */ + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.nombre AS nombre" + ) + ->where("t1.id", $id) + ->where("t1.is_deleted", 0); + + return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject(); + } } diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php index 7d94e40d..78082d7b 100755 --- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php +++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php @@ -14,7 +14,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel protected $allowedFields = [ "nombre", - "precio_pagina", + "precio", "precio_min", "importe_fijo", "margen", @@ -39,7 +39,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "label" => "Tarifapreimpresion.nombre", "rules" => "trim|required|max_length[255]", ], - "precio_pagina" => [ + "precio" => [ "label" => "Tarifapreimpresion.precio", "rules" => "required|decimal", ], @@ -62,7 +62,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel "max_length" => "Tarifapreimpresion.validation.nombre.max_length", "required" => "Tarifapreimpresion.validation.nombre.required", ], - "precio_pagina" => [ + "precio" => [ "decimal" => "Tarifapreimpresion.validation.precio.decimal", "required" => "Tarifapreimpresion.validation.precio.required", ], @@ -96,5 +96,35 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject(); } + public function getTarifaPresupuestoPreimpresion($tarifa_id){ + + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.id AS tarifa_preimpresion_id, t1.nombre AS tarifa_preimpresion_nombre, t1.precio AS precio, t1.margen AS margen" + ) + ->where("t1.is_deleted", 0); + //->where("t1.mostrar_en_presupuesto", 1) + + $builder->where('t1.id =', $tarifa_id); + + return $builder->get()->getResultObject(); + } + + public function getNombreTarifaPreimpresion($id=-1) + { + /* + Todos los servicios de encuadernacion activas que se pueden usar en presupuestos + */ + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.nombre AS nombre" + ) + ->where("t1.id", $id) + ->where("t1.is_deleted", 0); + + return $builder->orderBy("t1.nombre", "asc")->get()->getResultObject(); + } } diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php index e2acac24..00ba3c86 100755 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php @@ -83,7 +83,7 @@
-