From ff676aeb93ee5163c3994141f8fca73e79920d9d Mon Sep 17 00:00:00 2001 From: objecttothis Date: Mon, 11 Dec 2023 16:38:12 +0400 Subject: [PATCH] Fixes - Removed XLSX export format due to errors. - Upgraded Fakerphp to try to resolve datepicker issues. - Attempted to fix datepicker language issues. - Removed duplicate Sunday in the picker. --- app/Views/configs/system_info.php | 2 +- app/Views/partial/datepicker_locale.php | 7 ++--- app/Views/partial/daterangepicker.php | 6 ++-- app/Views/reports/tabular.php | 2 +- app/Views/reports/tabular_details.php | 2 +- composer.json | 2 +- composer.lock | 39 +++++++++++++------------ public/js/manage_tables.js | 2 +- 8 files changed, 30 insertions(+), 32 deletions(-) diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php index 8e5b67e6c..daae92b63 100644 --- a/app/Views/configs/system_info.php +++ b/app/Views/configs/system_info.php @@ -71,7 +71,7 @@ $uploads = FCPATH . 'uploads/'; $images = FCPATH . 'uploads/item_pics/'; $import = '../import_items.csv'; //TODO: These two are probably incorrect paths because CI4 has a different folder structure - $importcustomers = '../import_customers.csv'; //TODO: This variable does not follow naming conventions for the project. + $importcustomers = WRITEPATH . '/uploads/import_customers.csv'; //TODO: This variable does not follow naming conventions for the project. if(is_writable($logs)) { diff --git a/app/Views/partial/datepicker_locale.php b/app/Views/partial/datepicker_locale.php index 9e83e902d..d66573e53 100644 --- a/app/Views/partial/datepicker_locale.php +++ b/app/Views/partial/datepicker_locale.php @@ -9,7 +9,7 @@ var pickerconfig = function(config) { showMeridian: true, @@ -28,7 +28,7 @@ var pickerconfig = function(config) { todayHighlight: true, bootcssVer: 3, language: "" - }, ); + }, ); }; $.fn.datetimepicker.dates[''] = { @@ -39,8 +39,7 @@ $.fn.datetimepicker.dates[''] = { "", "", "", - "", - "" + "" ], daysShort: [ "", diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php index dc4939944..a42d63cad 100644 --- a/app/Views/partial/daterangepicker.php +++ b/app/Views/partial/daterangepicker.php @@ -84,8 +84,7 @@ "", "", "", - "", - "" + "" ], "monthNames": [ "", @@ -194,8 +193,7 @@ "", "", "", - "", - "" + "" ], "monthNames": [ "", diff --git a/app/Views/reports/tabular.php b/app/Views/reports/tabular.php index 04586e541..69f5d1d9c 100644 --- a/app/Views/reports/tabular.php +++ b/app/Views/reports/tabular.php @@ -59,7 +59,7 @@ sortable: true, showExport: true, exportDataType: 'all', - exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'xlsx', 'pdf'], + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'], pagination: true, showColumns: true, data: , diff --git a/app/Views/reports/tabular_details.php b/app/Views/reports/tabular_details.php index 654ef8aa4..c055e7f00 100644 --- a/app/Views/reports/tabular_details.php +++ b/app/Views/reports/tabular_details.php @@ -71,7 +71,7 @@ uniqueId: 'id', showExport: true, exportDataType: 'all', - exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'xlsx', 'pdf'], + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'], data: , iconSize: 'sm', paginationVAlign: 'bottom', diff --git a/composer.json b/composer.json index b7caa482c..fac49b4e1 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "require-dev": { "codeigniter/coding-standard": "^1.5", "codeigniter4/devkit": "v1.1.0", - "fakerphp/faker": "^1.9", + "fakerphp/faker": "^1.23.0", "friendsofphp/php-cs-fixer": "3.13.0", "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", diff --git a/composer.lock b/composer.lock index c06210f24..b2d20a406 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4bc57bf1ba2d85188f8ed45ec687c971", + "content-hash": "09f07a5f051e75365e7dfe41ebd45753", "packages": [ { "name": "codeigniter4/framework", @@ -2167,16 +2167,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -2217,9 +2217,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "openlss/lib-array2xml", @@ -2646,16 +2646,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.47", + "version": "1.10.48", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39" + "reference": "087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", - "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6", + "reference": "087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6", "shasum": "" }, "require": { @@ -2704,7 +2704,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T15:19:17+00:00" + "time": "2023-12-08T14:34:28+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -3447,12 +3447,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "498a07ca22004364fc54bc909b77de792a10c127" + "reference": "29a3b9cc1fea4208522caed1bbe9f6ed6acd0015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/498a07ca22004364fc54bc909b77de792a10c127", - "reference": "498a07ca22004364fc54bc909b77de792a10c127", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/29a3b9cc1fea4208522caed1bbe9f6ed6acd0015", + "reference": "29a3b9cc1fea4208522caed1bbe9f6ed6acd0015", "shasum": "" }, "conflict": { @@ -3800,7 +3800,7 @@ "open-web-analytics/open-web-analytics": "<1.7.4", "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<=19.5|>=20,<=20.1", + "openmage/magento-lts": "<20.2", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", @@ -3994,6 +3994,7 @@ "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", "symfony/webhook": ">=6.3,<6.3.8", "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", + "symphonycms/symphony-2": "<2.6.4", "t3/dce": "<0.11.5|>=2.2,<2.6.2", "t3g/svg-sanitizer": "<1.0.3", "tastyigniter/tastyigniter": "<3.3", @@ -4033,7 +4034,7 @@ "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", "ua-parser/uap-php": "<3.8", "uasoft-indonesia/badaso": "<=2.9.7", - "unisharp/laravel-filemanager": "<=2.5.1", + "unisharp/laravel-filemanager": "<2.6.4", "userfrosting/userfrosting": ">=0.3.1,<4.6.3", "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", "uvdesk/community-skeleton": "<=1.1.1", @@ -4114,7 +4115,7 @@ "zf-commons/zfc-user": "<1.2.2", "zfcampus/zf-apigility-doctrine": "<1.0.3", "zfr/zfr-oauth2-server-module": "<0.1.2", - "zoujingli/thinkadmin": "<6.0.22" + "zoujingli/thinkadmin": "<=6.1.53" }, "default-branch": true, "type": "metapackage", @@ -4152,7 +4153,7 @@ "type": "tidelift" } ], - "time": "2023-12-06T18:04:43+00:00" + "time": "2023-12-08T22:04:07+00:00" }, { "name": "sebastian/cli-parser", diff --git a/public/js/manage_tables.js b/public/js/manage_tables.js index 0058683e5..0125f56ac 100644 --- a/public/js/manage_tables.js +++ b/public/js/manage_tables.js @@ -226,7 +226,7 @@ clickToSelect: true, showExport: true, exportDataType: 'basic', - exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'xlsx', 'pdf'], + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel', 'pdf'], exportOptions: { fileName: options.resource.replace(/.*\/(.*?)$/g, '$1') },