From 54478d1a6a3b87eca1445bf2985bfe41d15865e5 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 24 Apr 2020 23:28:43 +0300 Subject: [PATCH 001/102] prevent csv injection --- app/Abstracts/Export.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Abstracts/Export.php b/app/Abstracts/Export.php index 9b640281a..bbd434f7f 100644 --- a/app/Abstracts/Export.php +++ b/app/Abstracts/Export.php @@ -35,6 +35,8 @@ abstract class Export implements FromCollection, ShouldAutoSize, WithHeadings, W $date_fields = ['paid_at', 'invoiced_at', 'billed_at', 'due_at', 'issued_at', 'created_at']; + $evil_chars = ['=', '+', '-', '@']; + foreach ($this->fields() as $field) { $value = $model->$field; @@ -42,6 +44,11 @@ abstract class Export implements FromCollection, ShouldAutoSize, WithHeadings, W $value = Date::parse($value)->format('Y-m-d'); } + // Prevent CSV injection https://security.stackexchange.com/a/190848 + if (Str::startsWith($value, $evil_chars)) { + $value = "'" . $value; + } + $map[] = $value; } From 20935b5626219bf15a0a81cd006e8a8179d826ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Apr 2020 23:39:30 +0300 Subject: [PATCH 002/102] update composer.lock file --- composer.lock | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index 0bf1a75b3..e840e5cbb 100644 --- a/composer.lock +++ b/composer.lock @@ -1400,16 +1400,16 @@ }, { "name": "doctrine/annotations", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb" + "reference": "b9d758e831c70751155c698c2f7df4665314a1cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5eb79f3dbdffed6544e1fc287572c0f462bd29bb", - "reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb", + "reference": "b9d758e831c70751155c698c2f7df4665314a1cb", "shasum": "" }, "require": { @@ -1465,7 +1465,7 @@ "docblock", "parser" ], - "time": "2020-04-02T12:33:25+00:00" + "time": "2020-04-20T09:18:32+00:00" }, { "name": "doctrine/cache", @@ -2989,16 +2989,16 @@ }, { "name": "laravel/framework", - "version": "v7.6.2", + "version": "v7.8.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "695be25d84b5cedd0026c428d4e9697fe8cd06f9" + "reference": "cdc6d7e6c744f4d8f7d61102aea9b111550cd297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/695be25d84b5cedd0026c428d4e9697fe8cd06f9", - "reference": "695be25d84b5cedd0026c428d4e9697fe8cd06f9", + "url": "https://api.github.com/repos/laravel/framework/zipball/cdc6d7e6c744f4d8f7d61102aea9b111550cd297", + "reference": "cdc6d7e6c744f4d8f7d61102aea9b111550cd297", "shasum": "" }, "require": { @@ -3102,6 +3102,7 @@ "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", "symfony/cache": "Required to PSR-6 cache bridge (^5.0).", + "symfony/filesystem": "Required to create relative storage directory symbolic links (^5.0).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, @@ -3136,7 +3137,7 @@ "framework", "laravel" ], - "time": "2020-04-15T20:57:47+00:00" + "time": "2020-04-24T17:21:56+00:00" }, { "name": "laravel/tinker", @@ -3327,16 +3328,16 @@ }, { "name": "league/commonmark", - "version": "1.4.0", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "517cbe1c6faf90afeb38a0e917c73acc6d3051ce" + "reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/517cbe1c6faf90afeb38a0e917c73acc6d3051ce", - "reference": "517cbe1c6faf90afeb38a0e917c73acc6d3051ce", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9e780d972185e4f737a03bade0fd34a9e67bbf31", + "reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31", "shasum": "" }, "require": { @@ -3397,7 +3398,7 @@ "md", "parser" ], - "time": "2020-04-18T20:46:13+00:00" + "time": "2020-04-24T13:39:56+00:00" }, { "name": "league/flysystem", @@ -3826,16 +3827,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.16.1", + "version": "v1.16.2", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "58998b818c6567fac01e35b8a4b70c1a64530556" + "reference": "40f375504a4dd8e59f779c3f3cac524777ddcde5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/58998b818c6567fac01e35b8a4b70c1a64530556", - "reference": "58998b818c6567fac01e35b8a4b70c1a64530556", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/40f375504a4dd8e59f779c3f3cac524777ddcde5", + "reference": "40f375504a4dd8e59f779c3f3cac524777ddcde5", "shasum": "" }, "require": { @@ -3883,7 +3884,7 @@ "debug", "debugbar" ], - "time": "2019-11-24T09:46:11+00:00" + "time": "2020-04-16T09:05:52+00:00" }, { "name": "misterphilip/maintenance-mode", @@ -8447,16 +8448,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.3", + "version": "8.5.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "67750516bc02f300e2742fed2f50177f8f37bedf" + "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67750516bc02f300e2742fed2f50177f8f37bedf", - "reference": "67750516bc02f300e2742fed2f50177f8f37bedf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23", + "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23", "shasum": "" }, "require": { @@ -8526,7 +8527,7 @@ "testing", "xunit" ], - "time": "2020-03-31T08:52:04+00:00" + "time": "2020-04-23T04:39:42+00:00" }, { "name": "scrivo/highlight.php", From 0162c4c3cfb1ae1560efed3ca794c2b0cc84646e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Apr 2020 23:40:14 +0300 Subject: [PATCH 003/102] update package-lock.json --- package-lock.json | 118 +++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 644c39382..ba5d6a59a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1042,9 +1042,9 @@ "dev": true }, "@types/node": { - "version": "13.13.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.0.tgz", - "integrity": "sha512-WE4IOAC6r/yBZss1oQGM5zs2D7RuKR6Q+w+X2SouPofnWn+LbCqClRyhO3ZE7Ix8nmFgo/oVuuE01cJT2XB13A==", + "version": "13.13.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz", + "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==", "dev": true }, "@types/normalize-package-data": { @@ -2167,9 +2167,9 @@ } }, "babel-plugin-dynamic-import-node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", - "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { "object.assign": "^4.1.0" @@ -2536,13 +2536,13 @@ } }, "browserslist": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz", - "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001038", - "electron-to-chromium": "^1.3.390", + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", "node-releases": "^1.1.53", "pkg-up": "^2.0.0" } @@ -2745,9 +2745,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001043", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001043.tgz", - "integrity": "sha512-MrBDRPJPDBYwACtSQvxg9+fkna5jPXhJlKmuxenl/ml9uf8LHKlDmLpElu+zTW/bEz7lC1m0wTDD7jiIB+hgFg==", + "version": "1.0.30001046", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz", + "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==", "dev": true }, "case-sensitive-paths-webpack-plugin": { @@ -3101,9 +3101,9 @@ "dev": true }, "collect.js": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.23.0.tgz", - "integrity": "sha512-EjdXlyRdvISTEXBWzpNEtygkfJGyUVkOuNYblBvcgjdbWnAs7xb4f5rE22HKHHBFKLkgeRwhvNPBbyldTut1VQ==", + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.25.0.tgz", + "integrity": "sha512-Wk+cWM9iQouzCe2RulakcE6BKweADOHYcz3pVcO2e6jRPfTuZWiLmAjJ2+lI3K9ldFyp77GZVheKjaGnoTAofw==", "dev": true }, "collection-visit": { @@ -3846,9 +3846,9 @@ "dev": true }, "d3": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.1.tgz", - "integrity": "sha512-Xu9gT6Lm0jH3wWJJSRomFwqnGGi3YAfWIfxNFl4++YVgYOjo3F8V2idAG3nJBgpZOkD0/RHPZX6F4k6tzgOvYw==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz", + "integrity": "sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==", "requires": { "d3-array": "1", "d3-axis": "1", @@ -3920,9 +3920,9 @@ "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" }, "d3-color": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz", - "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", + "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" }, "d3-contour": { "version": "1.3.2", @@ -4667,9 +4667,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.413", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.413.tgz", - "integrity": "sha512-Jm1Rrd3siqYHO3jftZwDljL2LYQafj3Kki5r+udqE58d0i91SkjItVJ5RwlJn9yko8i7MOcoidVKjQlgSdd1hg==", + "version": "1.3.416", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.416.tgz", + "integrity": "sha512-fmSrpOQC1dEXzsznzAMXbhQLkpAr21WtaUfRXnIbh8kblZIaMwSL6A8u2RZHAzZliSoSOM3FzS2z/j8tVqrAAw==", "dev": true }, "element-ui": { @@ -8779,18 +8779,18 @@ "dev": true }, "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", "dev": true }, "mime-types": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", - "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", "dev": true, "requires": { - "mime-db": "1.43.0" + "mime-db": "1.44.0" } }, "mimic-fn": { @@ -8970,9 +8970,9 @@ } }, "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", "dev": true }, "nanomatch": { @@ -9132,9 +9132,9 @@ "dev": true }, "node-sass": { - "version": "4.13.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz", - "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz", + "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -11318,9 +11318,9 @@ "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" }, "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "requires": { "path-parse": "^1.0.6" } @@ -11547,9 +11547,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.26.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.3.tgz", - "integrity": "sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==", + "version": "1.26.5", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz", + "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" @@ -12278,9 +12278,9 @@ } }, "source-map-support": { - "version": "0.5.17", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.17.tgz", - "integrity": "sha512-bwdKOBZ5L0gFRh4KOxNap/J/MpvX9Yxsq9lFDx65s3o7F/NiHy7JRaGIS8MwW6tZPAq9UXE207Il0cfcb5yu/Q==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -12304,9 +12304,9 @@ } }, "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", "dev": true }, "spdx-expression-parse": { @@ -12846,9 +12846,9 @@ } }, "terser": { - "version": "4.6.11", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz", - "integrity": "sha512-76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==", + "version": "4.6.12", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.12.tgz", + "integrity": "sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==", "dev": true, "requires": { "commander": "^2.20.0", @@ -13649,16 +13649,16 @@ } }, "webpack": { - "version": "4.42.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz", - "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==", + "version": "4.43.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz", + "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/wasm-edit": "1.9.0", "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.2.1", + "acorn": "^6.4.1", "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", "chrome-trace-event": "^1.0.2", @@ -13675,7 +13675,7 @@ "schema-utils": "^1.0.0", "tapable": "^1.1.3", "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.6.0", + "watchpack": "^1.6.1", "webpack-sources": "^1.4.1" }, "dependencies": { From 16092f657c5ecd29c837a3650616edd815e42e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Apr 2020 23:41:23 +0300 Subject: [PATCH 004/102] version update 2.0.9 to 2.0.10 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index 586104334..b4921ec6d 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '0', - 'patch' => '9', + 'patch' => '10', 'build' => '', 'status' => 'Stable', - 'date' => '20-April-2020', + 'date' => '24-April-2020', - 'time' => '13:00', + 'time' => '22:00', 'zone' => 'GMT +3', From 6a11f130c2dc51f45e923b97ba64802de34dbff4 Mon Sep 17 00:00:00 2001 From: Ethan Brace Date: Sun, 26 Apr 2020 06:07:27 -0400 Subject: [PATCH 005/102] use config helper instead of env in application code --- app/Console/Kernel.php | 4 ++-- app/Exceptions/Handler.php | 2 +- app/Http/Controllers/Auth/Login.php | 2 +- app/Http/Controllers/Install/Database.php | 4 +++- app/Http/ViewComposers/Notifications.php | 2 +- app/Http/ViewComposers/Suggestions.php | 6 +++--- app/Listeners/Update/V20/Version207.php | 2 +- app/Providers/App.php | 4 ++-- app/Traits/DateTime.php | 2 +- app/Utilities/Info.php | 2 +- app/Utilities/Installer.php | 6 +++--- config/app.php | 4 ++++ resources/views/partials/admin/head.blade.php | 2 +- resources/views/partials/auth/head.blade.php | 2 +- resources/views/partials/modules/head.blade.php | 2 +- resources/views/partials/portal/head.blade.php | 2 +- resources/views/partials/signed/head.blade.php | 2 +- resources/views/partials/wizard/head.blade.php | 2 +- 18 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 23f1ab7a0..6a4c03cbf 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -23,11 +23,11 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { // Not installed yet - if (!env('APP_INSTALLED')) { + if (!config('app.installed')) { return; } - $schedule_time = env('APP_SCHEDULE_TIME', '09:00'); + $schedule_time = config('app.schedule_time'); $schedule->command('reminder:invoice')->dailyAt($schedule_time); $schedule->command('reminder:bill')->dailyAt($schedule_time); diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index e24768d9f..4092f98d8 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -54,7 +54,7 @@ class Handler extends ExceptionHandler */ public function render($request, Throwable $exception) { - if (env('APP_DEBUG') === false) { + if (config('app.debug') === false) { return $this->handleExceptions($request, $exception); } diff --git a/app/Http/Controllers/Auth/Login.php b/app/Http/Controllers/Auth/Login.php index dde57b182..d9a188986 100644 --- a/app/Http/Controllers/Auth/Login.php +++ b/app/Http/Controllers/Auth/Login.php @@ -115,7 +115,7 @@ class Login extends Controller auth()->logout(); // Session destroy is required if stored in database - if (env('SESSION_DRIVER') == 'database') { + if (config('session.driver') == 'database') { $request = app('Illuminate\Http\Request'); $request->session()->getHandler()->destroy($request->session()->getId()); } diff --git a/app/Http/Controllers/Install/Database.php b/app/Http/Controllers/Install/Database.php index fb15816fa..aa5ecff3a 100644 --- a/app/Http/Controllers/Install/Database.php +++ b/app/Http/Controllers/Install/Database.php @@ -27,8 +27,10 @@ class Database extends Controller */ public function store(Request $request) { + $connection = config('database.default','mysql'); + $host = $request['hostname']; - $port = env('DB_PORT', '3306'); + $port = config("database.connections.$connection.port", '3306'); $database = $request['database']; $username = $request['username']; $password = $request['password']; diff --git a/app/Http/ViewComposers/Notifications.php b/app/Http/ViewComposers/Notifications.php index da0d56f10..cb7b5ba80 100644 --- a/app/Http/ViewComposers/Notifications.php +++ b/app/Http/ViewComposers/Notifications.php @@ -19,7 +19,7 @@ class Notifications public function compose(View $view) { // No need to add suggestions in console - if (app()->runningInConsole() || !env('APP_INSTALLED') || !user()) { + if (app()->runningInConsole() || !config('app.installed') || !user()) { return; } diff --git a/app/Http/ViewComposers/Suggestions.php b/app/Http/ViewComposers/Suggestions.php index 25c568e34..ef60b0adf 100644 --- a/app/Http/ViewComposers/Suggestions.php +++ b/app/Http/ViewComposers/Suggestions.php @@ -20,7 +20,7 @@ class Suggestions public function compose(View $view) { // No need to add suggestions in console - if (app()->runningInConsole() || !env('APP_INSTALLED')) { + if (app()->runningInConsole() || !config('app.installed')) { return; } @@ -31,10 +31,10 @@ class Suggestions if ($path) { $suggestions = $this->getSuggestions($path); - + if ($suggestions) { $suggestion_modules = $suggestions->modules; - + foreach ($suggestion_modules as $key => $module) { $installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first(); diff --git a/app/Listeners/Update/V20/Version207.php b/app/Listeners/Update/V20/Version207.php index 178b008c3..97f4af5c7 100644 --- a/app/Listeners/Update/V20/Version207.php +++ b/app/Listeners/Update/V20/Version207.php @@ -26,7 +26,7 @@ class Version207 extends Listener // Update .env file Installer::updateEnv([ - 'MAIL_MAILER' => env('MAIL_DRIVER'), + 'MAIL_MAILER' => config('mail.default'), ]); } } diff --git a/app/Providers/App.php b/app/Providers/App.php index 990b6d9ae..e3a0d8f8e 100644 --- a/app/Providers/App.php +++ b/app/Providers/App.php @@ -31,11 +31,11 @@ class App extends Provider */ public function register() { - if (env('APP_INSTALLED') && env('APP_DEBUG')) { + if (config('app.installed') && config('app.debug')) { $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class); } - if (env('APP_ENV') !== 'production') { + if (config('app.env') !== 'production') { $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class); } } diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index f3a81838d..5c4ec6ded 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -17,7 +17,7 @@ trait DateTime $default = 'd M Y'; // Make sure it's installed - if (!env('APP_INSTALLED') && (env('APP_ENV') !== 'testing')) { + if (!config('app.installed') && (config('app.env') !== 'testing')) { return $default; } diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php index 157605abe..ccebe9d3c 100644 --- a/app/Utilities/Info.php +++ b/app/Utilities/Info.php @@ -33,7 +33,7 @@ class Info public static function mysqlVersion() { - if (env('DB_CONNECTION') === 'mysql') { + if (config('database.default') === 'mysql') { return DB::selectOne('select version() as mversion')->mversion; } diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index e671b3b60..cd44b82c6 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -183,8 +183,8 @@ class Installer 'database' => $database, 'username' => $username, 'password' => $password, - 'driver' => env('DB_CONNECTION', 'mysql'), - 'charset' => env('DB_CHARSET', 'utf8mb4'), + 'driver' => $connection = config('database.default', 'mysql'), + 'charset' => config("database.connections.$connection.charset", 'utf8mb4'), ]); try { @@ -213,7 +213,7 @@ class Installer 'DB_PREFIX' => $prefix, ]); - $con = env('DB_CONNECTION', 'mysql'); + $con = config('database.default', 'mysql'); // Change current connection $db = Config::get('database.connections.' . $con); diff --git a/config/app.php b/config/app.php index 58edec322..d8831bcbb 100644 --- a/config/app.php +++ b/config/app.php @@ -14,6 +14,10 @@ return [ 'name' => env('APP_NAME', 'Akaunting'), + 'installed' => env('APP_INSTALLED', false), + + 'schedule_time' => env('APP_SCHEDULE_TIME', '9:00'), + /* |-------------------------------------------------------------------------- | Application Environment diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php index 223ff0781..391d2811b 100644 --- a/resources/views/partials/admin/head.blade.php +++ b/resources/views/partials/admin/head.blade.php @@ -33,7 +33,7 @@ @stack('js') diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php index 573476d90..35aa6f139 100644 --- a/resources/views/partials/auth/head.blade.php +++ b/resources/views/partials/auth/head.blade.php @@ -28,7 +28,7 @@ @stack('js') diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php index 8a2b3b2b0..ec22e4ee5 100644 --- a/resources/views/partials/modules/head.blade.php +++ b/resources/views/partials/modules/head.blade.php @@ -31,7 +31,7 @@ @stack('js') diff --git a/resources/views/partials/portal/head.blade.php b/resources/views/partials/portal/head.blade.php index d6d121250..5e0fac33d 100644 --- a/resources/views/partials/portal/head.blade.php +++ b/resources/views/partials/portal/head.blade.php @@ -30,7 +30,7 @@ @stack('js') diff --git a/resources/views/partials/signed/head.blade.php b/resources/views/partials/signed/head.blade.php index d6d121250..5e0fac33d 100644 --- a/resources/views/partials/signed/head.blade.php +++ b/resources/views/partials/signed/head.blade.php @@ -30,7 +30,7 @@ @stack('js') diff --git a/resources/views/partials/wizard/head.blade.php b/resources/views/partials/wizard/head.blade.php index 4e9272c4b..c73198260 100644 --- a/resources/views/partials/wizard/head.blade.php +++ b/resources/views/partials/wizard/head.blade.php @@ -30,7 +30,7 @@ @stack('js') From ace9c26464433530709ed4b4430e0b90075e5a90 Mon Sep 17 00:00:00 2001 From: Ethan Brace Date: Sun, 26 Apr 2020 06:27:38 -0400 Subject: [PATCH 006/102] call config:cache after updating the env file --- app/Utilities/Installer.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index cd44b82c6..ebc741f5e 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -309,6 +309,8 @@ class Installer file_put_contents(base_path('.env'), $env); + Artisan::call('config:cache'); + return true; } } From 648841c2a5742014f057a6bf9f2e76c4433e2466 Mon Sep 17 00:00:00 2001 From: Ethan Brace Date: Sun, 26 Apr 2020 06:34:27 -0400 Subject: [PATCH 007/102] grab the default value from config if this isnt set to avoid setting this variable to null --- app/Listeners/Update/V20/Version207.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Listeners/Update/V20/Version207.php b/app/Listeners/Update/V20/Version207.php index 97f4af5c7..c783ac319 100644 --- a/app/Listeners/Update/V20/Version207.php +++ b/app/Listeners/Update/V20/Version207.php @@ -26,7 +26,7 @@ class Version207 extends Listener // Update .env file Installer::updateEnv([ - 'MAIL_MAILER' => config('mail.default'), + 'MAIL_MAILER' => env('MAIL_DRIVER', config('mail.default')), ]); } } From b639c691a9097e064bd2414b6052efd1ec15316f Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Mon, 27 Apr 2020 11:46:16 +0300 Subject: [PATCH 008/102] texts overlapping the title on widgets is fixed --- resources/views/partials/widgets/standard_header.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/widgets/standard_header.blade.php b/resources/views/partials/widgets/standard_header.blade.php index b56ee13d0..986728f56 100644 --- a/resources/views/partials/widgets/standard_header.blade.php +++ b/resources/views/partials/widgets/standard_header.blade.php @@ -2,11 +2,11 @@
-
-

{{ $class->model->name }}

+
+

{{ $class->model->name }}

-
{!! Form::open(['route' => 'apps.search', 'role' => 'form', 'method' => 'GET', 'class' => 'm-0']) !!} - + {!! Form::close() !!}
From af66baa22638b8aecab211d81a22d036feb22afb Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 14 May 2020 21:04:39 +0300 Subject: [PATCH 034/102] renamed module events --- .../Stubs/Modules/listeners/install.stub | 2 +- ...stallModule.php => FinishInstallation.php} | 2 +- ...mentMethod.php => ShowAsPaymentMethod.php} | 2 +- ...ShowSetting.php => ShowInSettingsPage.php} | 2 +- modules/OfflinePayments/Providers/Event.php | 12 +++++------ ...mentMethod.php => ShowAsPaymentMethod.php} | 2 +- modules/PaypalStandard/Providers/Event.php | 20 +++++++++++++++++++ modules/PaypalStandard/Providers/Main.php | 12 ----------- modules/PaypalStandard/module.json | 1 + 9 files changed, 32 insertions(+), 23 deletions(-) rename modules/OfflinePayments/Listeners/{InstallModule.php => FinishInstallation.php} (96%) rename modules/OfflinePayments/Listeners/{ShowPaymentMethod.php => ShowAsPaymentMethod.php} (94%) rename modules/OfflinePayments/Listeners/{ShowSetting.php => ShowInSettingsPage.php} (95%) rename modules/PaypalStandard/Listeners/{ShowPaymentMethod.php => ShowAsPaymentMethod.php} (93%) create mode 100644 modules/PaypalStandard/Providers/Event.php diff --git a/app/Console/Stubs/Modules/listeners/install.stub b/app/Console/Stubs/Modules/listeners/install.stub index a7276dd59..a762c4e8f 100644 --- a/app/Console/Stubs/Modules/listeners/install.stub +++ b/app/Console/Stubs/Modules/listeners/install.stub @@ -5,7 +5,7 @@ namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners; use App\Events\Module\Installed as Event; use App\Traits\Permissions; -class InstallModule +class FinishInstallation { use Permissions; diff --git a/modules/OfflinePayments/Listeners/InstallModule.php b/modules/OfflinePayments/Listeners/FinishInstallation.php similarity index 96% rename from modules/OfflinePayments/Listeners/InstallModule.php rename to modules/OfflinePayments/Listeners/FinishInstallation.php index 2308f0b4d..89a7804ef 100644 --- a/modules/OfflinePayments/Listeners/InstallModule.php +++ b/modules/OfflinePayments/Listeners/FinishInstallation.php @@ -5,7 +5,7 @@ namespace Modules\OfflinePayments\Listeners; use App\Events\Module\Installed as Event; use App\Traits\Permissions; -class InstallModule +class FinishInstallation { use Permissions; diff --git a/modules/OfflinePayments/Listeners/ShowPaymentMethod.php b/modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php similarity index 94% rename from modules/OfflinePayments/Listeners/ShowPaymentMethod.php rename to modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php index ea7e776a7..66fa8f26d 100644 --- a/modules/OfflinePayments/Listeners/ShowPaymentMethod.php +++ b/modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php @@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Listeners; use App\Events\Module\PaymentMethodShowing as Event; -class ShowPaymentMethod +class ShowAsPaymentMethod { /** * Handle the event. diff --git a/modules/OfflinePayments/Listeners/ShowSetting.php b/modules/OfflinePayments/Listeners/ShowInSettingsPage.php similarity index 95% rename from modules/OfflinePayments/Listeners/ShowSetting.php rename to modules/OfflinePayments/Listeners/ShowInSettingsPage.php index 7e8c06138..a69afc123 100644 --- a/modules/OfflinePayments/Listeners/ShowSetting.php +++ b/modules/OfflinePayments/Listeners/ShowInSettingsPage.php @@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Listeners; use App\Events\Module\SettingShowing as Event; -class ShowSetting +class ShowInSettingsPage { /** * Handle the event. diff --git a/modules/OfflinePayments/Providers/Event.php b/modules/OfflinePayments/Providers/Event.php index 81c49182b..a83f4d980 100644 --- a/modules/OfflinePayments/Providers/Event.php +++ b/modules/OfflinePayments/Providers/Event.php @@ -3,9 +3,9 @@ namespace Modules\OfflinePayments\Providers; use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider; -use Modules\OfflinePayments\Listeners\InstallModule; -use Modules\OfflinePayments\Listeners\ShowPaymentMethod; -use Modules\OfflinePayments\Listeners\ShowSetting; +use Modules\OfflinePayments\Listeners\FinishInstallation; +use Modules\OfflinePayments\Listeners\ShowAsPaymentMethod; +use Modules\OfflinePayments\Listeners\ShowInSettingsPage; class Event extends Provider { @@ -16,13 +16,13 @@ class Event extends Provider */ protected $listen = [ \App\Events\Module\Installed::class => [ - InstallModule::class, + FinishInstallation::class, ], \App\Events\Module\PaymentMethodShowing::class => [ - ShowPaymentMethod::class, + ShowAsPaymentMethod::class, ], \App\Events\Module\SettingShowing::class => [ - ShowSetting::class, + ShowInSettingsPage::class, ], ]; } diff --git a/modules/PaypalStandard/Listeners/ShowPaymentMethod.php b/modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php similarity index 93% rename from modules/PaypalStandard/Listeners/ShowPaymentMethod.php rename to modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php index 9d11bb115..76fc7e445 100644 --- a/modules/PaypalStandard/Listeners/ShowPaymentMethod.php +++ b/modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php @@ -4,7 +4,7 @@ namespace Modules\PaypalStandard\Listeners; use App\Events\Module\PaymentMethodShowing as Event; -class ShowPaymentMethod +class ShowAsPaymentMethod { /** * Handle the event. diff --git a/modules/PaypalStandard/Providers/Event.php b/modules/PaypalStandard/Providers/Event.php new file mode 100644 index 000000000..ee4fa3008 --- /dev/null +++ b/modules/PaypalStandard/Providers/Event.php @@ -0,0 +1,20 @@ + [ + ShowAsPaymentMethod::class, + ], + ]; +} diff --git a/modules/PaypalStandard/Providers/Main.php b/modules/PaypalStandard/Providers/Main.php index e98704dab..e046d9eca 100644 --- a/modules/PaypalStandard/Providers/Main.php +++ b/modules/PaypalStandard/Providers/Main.php @@ -3,7 +3,6 @@ namespace Modules\PaypalStandard\Providers; use Illuminate\Support\ServiceProvider as Provider; -use Modules\PaypalStandard\Listeners\ShowPaymentMethod; class Main extends Provider { @@ -16,7 +15,6 @@ class Main extends Provider { $this->loadTranslations(); $this->loadViews(); - $this->loadEvents(); } /** @@ -49,16 +47,6 @@ class Main extends Provider $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'paypal-standard'); } - /** - * Load events. - * - * @return void - */ - public function loadEvents() - { - $this->app['events']->listen(\App\Events\Module\PaymentMethodShowing::class, ShowPaymentMethod::class); - } - /** * Load routes. * diff --git a/modules/PaypalStandard/module.json b/modules/PaypalStandard/module.json index fc7ed3410..a4a262a9e 100644 --- a/modules/PaypalStandard/module.json +++ b/modules/PaypalStandard/module.json @@ -5,6 +5,7 @@ "category": "payment-method", "active": 1, "providers": [ + "Modules\\PaypalStandard\\Providers\\Event", "Modules\\PaypalStandard\\Providers\\Main" ], "aliases": {}, From ce84e47705fb009d2fdda20d4c80017d7e0045fb Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 16 May 2020 11:37:56 +0300 Subject: [PATCH 035/102] removed tax from profit & loss --- app/Abstracts/Report.php | 4 ++-- app/Reports/ProfitLoss.php | 12 ++++++------ app/Reports/TaxSummary.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index 9b16044a3..d4206499f 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -329,7 +329,7 @@ abstract class Report event(new RowsShowing($this)); } - public function setTotals($items, $date_field, $check_type = false, $table = 'default') + public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true) { foreach ($items as $item) { // Make groups extensible @@ -347,7 +347,7 @@ abstract class Report continue; } - $amount = $item->getAmountConvertedToDefault(); + $amount = $item->getAmountConvertedToDefault(false, $with_tax); $type = (($item instanceof Invoice) || (($item instanceof Transaction) && ($item->type == 'income'))) ? 'income' : 'expense'; diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index 2169a61a6..f96aac242 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -47,33 +47,33 @@ class ProfitLoss extends Report case 'cash': // Revenues $revenues = $income_transactions->get(); - $this->setTotals($revenues, 'paid_at', true, $this->tables['income']); + $this->setTotals($revenues, 'paid_at', true, $this->tables['income'], false); // Payments $payments = $expense_transactions->get(); - $this->setTotals($payments, 'paid_at', true, $this->tables['expense']); + $this->setTotals($payments, 'paid_at', true, $this->tables['expense'], false); break; default: // Invoices $invoices = $this->applyFilters(Invoice::accrued(), ['date_field' => 'invoiced_at'])->get(); Recurring::reflect($invoices, 'invoiced_at'); - $this->setTotals($invoices, 'invoiced_at', true, $this->tables['income']); + $this->setTotals($invoices, 'invoiced_at', true, $this->tables['income'], false); // Revenues $revenues = $income_transactions->isNotDocument()->get(); Recurring::reflect($revenues, 'paid_at'); - $this->setTotals($revenues, 'paid_at', true, $this->tables['income']); + $this->setTotals($revenues, 'paid_at', true, $this->tables['income'], false); // Bills $bills = $this->applyFilters(Bill::accrued(), ['date_field' => 'billed_at'])->get(); Recurring::reflect($bills, 'bill', 'billed_at'); - $this->setTotals($bills, 'billed_at', true, $this->tables['expense']); + $this->setTotals($bills, 'billed_at', true, $this->tables['expense'], false); // Payments $payments = $expense_transactions->isNotDocument()->get(); Recurring::reflect($payments, 'paid_at'); - $this->setTotals($payments, 'paid_at', true, $this->tables['expense']); + $this->setTotals($payments, 'paid_at', true, $this->tables['expense'], false); break; } diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 007d294e8..15baa5679 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -70,7 +70,7 @@ class TaxSummary extends Report } } - public function setTotals($items, $date_field, $check_type = false, $table = 'default') + public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true) { foreach ($items as $item) { // Make groups extensible From 26d84e9ec4f703aa109110fe7319c2b333b5aeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 16 May 2020 11:45:16 +0300 Subject: [PATCH 036/102] Progress text style fixed.. --- resources/views/install/updates/edit.blade.php | 2 +- resources/views/modules/item/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/install/updates/edit.blade.php b/resources/views/install/updates/edit.blade.php index 824b7ca28..b37f2ec92 100644 --- a/resources/views/install/updates/edit.blade.php +++ b/resources/views/install/updates/edit.blade.php @@ -16,7 +16,7 @@

-

+
{{ Form::hidden('page', 'update', ['id' => 'page']) }} {{ Form::hidden('name', $name, ['id' => 'name']) }} diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 09bebbdde..224c0bd9e 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -263,7 +263,7 @@
-
+