kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Upgraded to PHP 8.1

Browse Source
This commit is contained in:
Bernd Bestel 2022-12-10 15:19:11 +01:00
parent 84e3707f4f
commit 38a4ad8ec4
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
9 changed files with 124 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -43,7 +43,7 @@ Alternatively clone this repository (the `release` branch always references the
### Platform support ### Platform support
- PHP 8.0 (with SQLite 3.27.2+) - PHP 8.1 (with SQLite 3.34.0+)
- Required PHP extensions: `fileinfo`, `pdo_sqlite`, `gd`, `ctype`, `json`, `intl`, `zlib`, `mbstring` - Required PHP extensions: `fileinfo`, `pdo_sqlite`, `gd`, `ctype`, `json`, `intl`, `zlib`, `mbstring`
## How to run using Docker ## How to run using Docker

2
changelog/70_UNRELEASED_xxxx.xx.xx.md
View File

@ -1,4 +1,4 @@
> ⚠️ The minimum required SQLite version is now 3.34.0. > ⚠️ PHP 8.1 (with SQLite 3.34.0+) is from now on the only supported runtime version.
> ❗ xxxImportant upgrade informationXXX > ❗ xxxImportant upgrade informationXXX

16
composer.json
View File

@ -1,13 +1,13 @@
{ {
"require": { "require": {
"php": "^8.0", "php": "8.1",
"slim/slim": "^4.0", "slim/slim": "^4.0",
"slim/psr7": "^1.0", "slim/psr7": "^1.0",
"slim/http": "^1.0", "slim/http": "^1.0",
"php-di/php-di": "^6.0", "php-di/php-di": "^6.0",
"berrnd/slim-blade-view": "^1.0.0", "berrnd/slim-blade-view": "^1.0.0",
"morris/lessql": "^1.0", "morris/lessql": "dev-php81",
"gettext/gettext": "^4.8", "gettext/gettext": "dev-php81",
"eluceo/ical": "^2.2.0", "eluceo/ical": "^2.2.0",
"erusev/parsedown": "^1.7", "erusev/parsedown": "^1.7",
"gumlet/php-image-resize": "^2.0", "gumlet/php-image-resize": "^2.0",
@ -16,6 +16,16 @@
"guzzlehttp/guzzle": "^7.0", "guzzlehttp/guzzle": "^7.0",
"mike42/escpos-php": "^3.0" "mike42/escpos-php": "^3.0"
}, },
"repositories": [
{
"type": "vcs",
"url": "https://github.com/berrnd/lessql"
},
{
"type": "vcs",
"url": "https://github.com/berrnd/Gettext"
}
],
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Grocy\\Services\\": "services/", "Grocy\\Services\\": "services/",

157
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "fbb8697ed7fdfe6f0f9c69d81ecafe9f", "content-hash": "069e021ac1267d3e67aa41fd6008ceed",
"packages": [ "packages": [
{ {
"name": "berrnd/slim-blade-view", "name": "berrnd/slim-blade-view",
@ -443,16 +443,16 @@
}, },
{ {
"name": "gettext/gettext", "name": "gettext/gettext",
"version": "v4.8.7", "version": "dev-php81",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-gettext/Gettext.git", "url": "https://github.com/berrnd/Gettext.git",
"reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0" "reference": "505003f167881bd01b5991ee7762592b244e827e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-gettext/Gettext/zipball/3f7bc5ef23302a9059e64934f3d59e454516bec0", "url": "https://api.github.com/repos/berrnd/Gettext/zipball/505003f167881bd01b5991ee7762592b244e827e",
"reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0", "reference": "505003f167881bd01b5991ee7762592b244e827e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -479,7 +479,17 @@
"Gettext\\": "src" "Gettext\\": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "autoload-dev": {
"psr-4": {
"Gettext\\Tests\\": "tests"
}
},
"scripts": {
"test": [
"phpunit",
"phpcs"
]
},
"license": [ "license": [
"MIT" "MIT"
], ],
@ -494,9 +504,9 @@
"description": "PHP gettext manager", "description": "PHP gettext manager",
"homepage": "https://github.com/oscarotero/Gettext", "homepage": "https://github.com/oscarotero/Gettext",
"keywords": [ "keywords": [
"JS",
"gettext", "gettext",
"i18n", "i18n",
"js",
"mo", "mo",
"po", "po",
"translation" "translation"
@ -504,23 +514,23 @@
"support": { "support": {
"email": "oom@oscarotero.com", "email": "oom@oscarotero.com",
"issues": "https://github.com/oscarotero/Gettext/issues", "issues": "https://github.com/oscarotero/Gettext/issues",
"source": "https://github.com/php-gettext/Gettext/tree/v4.8.7" "source": "https://github.com/berrnd/Gettext/tree/php81"
}, },
"funding": [ "funding": [
{ {
"url": "https://paypal.me/oscarotero", "type": "github",
"type": "custom" "url": "https://github.com/oscarotero"
}, },
{ {
"url": "https://github.com/oscarotero", "type": "patreon",
"type": "github" "url": "https://www.patreon.com/misteroom"
}, },
{ {
"url": "https://www.patreon.com/misteroom", "type": "custom",
"type": "patreon" "url": "https://paypal.me/oscarotero"
} }
], ],
"time": "2022-08-02T09:42:10+00:00" "time": "2022-12-10T14:11:03+00:00"
}, },
{ {
"name": "gettext/languages", "name": "gettext/languages",
@ -988,7 +998,7 @@
}, },
{ {
"name": "illuminate/bus", "name": "illuminate/bus",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/bus.git", "url": "https://github.com/illuminate/bus.git",
@ -1041,7 +1051,7 @@
}, },
{ {
"name": "illuminate/collections", "name": "illuminate/collections",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/collections.git", "url": "https://github.com/illuminate/collections.git",
@ -1095,7 +1105,7 @@
}, },
{ {
"name": "illuminate/container", "name": "illuminate/container",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/container.git", "url": "https://github.com/illuminate/container.git",
@ -1146,7 +1156,7 @@
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/contracts.git", "url": "https://github.com/illuminate/contracts.git",
@ -1194,7 +1204,7 @@
}, },
{ {
"name": "illuminate/events", "name": "illuminate/events",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/events.git", "url": "https://github.com/illuminate/events.git",
@ -1249,7 +1259,7 @@
}, },
{ {
"name": "illuminate/filesystem", "name": "illuminate/filesystem",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/filesystem.git", "url": "https://github.com/illuminate/filesystem.git",
@ -1311,7 +1321,7 @@
}, },
{ {
"name": "illuminate/macroable", "name": "illuminate/macroable",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/macroable.git", "url": "https://github.com/illuminate/macroable.git",
@ -1357,7 +1367,7 @@
}, },
{ {
"name": "illuminate/pipeline", "name": "illuminate/pipeline",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/pipeline.git", "url": "https://github.com/illuminate/pipeline.git",
@ -1405,7 +1415,7 @@
}, },
{ {
"name": "illuminate/support", "name": "illuminate/support",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/support.git", "url": "https://github.com/illuminate/support.git",
@ -1473,7 +1483,7 @@
}, },
{ {
"name": "illuminate/view", "name": "illuminate/view",
"version": "v8.83.26", "version": "v8.83.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/view.git", "url": "https://github.com/illuminate/view.git",
@ -1806,16 +1816,16 @@
}, },
{ {
"name": "morris/lessql", "name": "morris/lessql",
"version": "1.0.0", "version": "dev-php81",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/morris/lessql.git", "url": "https://github.com/berrnd/lessql.git",
"reference": "86eff1d9faef067bd6682f5d291ee08a4b61e7b8" "reference": "210577d9f36ec7cf4b9347e45713ddb3596e49e1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/morris/lessql/zipball/86eff1d9faef067bd6682f5d291ee08a4b61e7b8", "url": "https://api.github.com/repos/berrnd/lessql/zipball/210577d9f36ec7cf4b9347e45713ddb3596e49e1",
"reference": "86eff1d9faef067bd6682f5d291ee08a4b61e7b8", "reference": "210577d9f36ec7cf4b9347e45713ddb3596e49e1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1831,7 +1841,14 @@
"LessQL\\": "src/LessQL" "LessQL\\": "src/LessQL"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "scripts": {
"test": [
"vendor/bin/phpunit --bootstrap=tests/sqlite.php --coverage-html=coverage tests"
],
"format": [
"vendor/bin/php-cs-fixer fix ."
]
},
"license": [ "license": [
"MIT" "MIT"
], ],
@ -1851,23 +1868,22 @@
"sql" "sql"
], ],
"support": { "support": {
"issues": "https://github.com/morris/lessql/issues", "source": "https://github.com/berrnd/lessql/tree/php81"
"source": "https://github.com/morris/lessql/tree/1.0.0"
}, },
"time": "2020-05-09T16:42:12+00:00" "time": "2022-12-10T13:56:17+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.63.0", "version": "2.64.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "ad35dd71a6a212b98e4b87e97389b6fa85f0e347" "reference": "889546413c97de2d05063b8cb7b193c2531ea211"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/889546413c97de2d05063b8cb7b193c2531ea211",
"reference": "ad35dd71a6a212b98e4b87e97389b6fa85f0e347", "reference": "889546413c97de2d05063b8cb7b193c2531ea211",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1878,7 +1894,7 @@
"symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
}, },
"require-dev": { "require-dev": {
"doctrine/dbal": "^2.0 || ^3.0", "doctrine/dbal": "^2.0 || ^3.1.4",
"doctrine/orm": "^2.7", "doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^3.0", "friendsofphp/php-cs-fixer": "^3.0",
"kylekatarnls/multi-tester": "^2.0", "kylekatarnls/multi-tester": "^2.0",
@ -1956,7 +1972,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-30T18:34:28+00:00" "time": "2022-11-26T17:36:00+00:00"
}, },
{ {
"name": "nikic/fast-route", "name": "nikic/fast-route",
@ -3095,25 +3111,25 @@
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
"version": "v3.0.2", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git", "url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.0.2" "php": ">=8.1"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "3.0-dev" "dev-main": "3.3-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/contracts", "name": "symfony/contracts",
@ -3142,7 +3158,7 @@
"description": "A generic function and convention to trigger deprecation notices", "description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
}, },
"funding": [ "funding": [
{ {
@ -3158,7 +3174,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-01-02T09:55:41+00:00" "time": "2022-11-25T10:21:52+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
@ -3470,20 +3486,20 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v6.0.14", "version": "v6.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "6f99eb179aee4652c0a7cd7c11f2a870d904330c" "reference": "c08de62caead8357244efcb809d0b1a2584f2198"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/6f99eb179aee4652c0a7cd7c11f2a870d904330c", "url": "https://api.github.com/repos/symfony/translation/zipball/c08de62caead8357244efcb809d0b1a2584f2198",
"reference": "6f99eb179aee4652c0a7cd7c11f2a870d904330c", "reference": "c08de62caead8357244efcb809d0b1a2584f2198",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.0.2", "php": ">=8.1",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^2.3|^3.0" "symfony/translation-contracts": "^2.3|^3.0"
}, },
@ -3499,6 +3515,7 @@
"symfony/translation-implementation": "2.3|3.0" "symfony/translation-implementation": "2.3|3.0"
}, },
"require-dev": { "require-dev": {
"nikic/php-parser": "^4.13",
"psr/log": "^1|^2|^3", "psr/log": "^1|^2|^3",
"symfony/config": "^5.4|^6.0", "symfony/config": "^5.4|^6.0",
"symfony/console": "^5.4|^6.0", "symfony/console": "^5.4|^6.0",
@ -3508,10 +3525,12 @@
"symfony/http-kernel": "^5.4|^6.0", "symfony/http-kernel": "^5.4|^6.0",
"symfony/intl": "^5.4|^6.0", "symfony/intl": "^5.4|^6.0",
"symfony/polyfill-intl-icu": "^1.21", "symfony/polyfill-intl-icu": "^1.21",
"symfony/routing": "^5.4|^6.0",
"symfony/service-contracts": "^1.1.2|^2|^3", "symfony/service-contracts": "^1.1.2|^2|^3",
"symfony/yaml": "^5.4|^6.0" "symfony/yaml": "^5.4|^6.0"
}, },
"suggest": { "suggest": {
"nikic/php-parser": "To use PhpAstExtractor",
"psr/log-implementation": "To use logging capability in translator", "psr/log-implementation": "To use logging capability in translator",
"symfony/config": "", "symfony/config": "",
"symfony/yaml": "" "symfony/yaml": ""
@ -3545,7 +3564,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v6.0.14" "source": "https://github.com/symfony/translation/tree/v6.2.0"
}, },
"funding": [ "funding": [
{ {
@ -3561,24 +3580,24 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-07T08:02:12+00:00" "time": "2022-11-02T09:08:04+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
"version": "v3.0.2", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation-contracts.git", "url": "https://github.com/symfony/translation-contracts.git",
"reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282" "reference": "68cce71402305a015f8c1589bfada1280dc64fe7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282", "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/68cce71402305a015f8c1589bfada1280dc64fe7",
"reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282", "reference": "68cce71402305a015f8c1589bfada1280dc64fe7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.0.2" "php": ">=8.1"
}, },
"suggest": { "suggest": {
"symfony/translation-implementation": "" "symfony/translation-implementation": ""
@ -3586,7 +3605,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "3.0-dev" "dev-main": "3.3-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/contracts", "name": "symfony/contracts",
@ -3596,7 +3615,10 @@
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Symfony\\Contracts\\Translation\\": "" "Symfony\\Contracts\\Translation\\": ""
} },
"exclude-from-classmap": [
"/Test/"
]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -3623,7 +3645,7 @@
"standards" "standards"
], ],
"support": { "support": {
"source": "https://github.com/symfony/translation-contracts/tree/v3.0.2" "source": "https://github.com/symfony/translation-contracts/tree/v3.2.0"
}, },
"funding": [ "funding": [
{ {
@ -3639,7 +3661,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-06-27T17:10:44+00:00" "time": "2022-11-25T10:21:52+00:00"
}, },
{ {
"name": "voku/portable-ascii", "name": "voku/portable-ascii",
@ -3719,7 +3741,10 @@
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {
"morris/lessql": 20,
"gettext/gettext": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {

1
services/DatabaseService.php
View File

@ -69,6 +69,7 @@ class DatabaseService
{ {
$pdo = new \PDO('sqlite:' . $this->GetDbFilePath()); $pdo = new \PDO('sqlite:' . $this->GetDbFilePath());
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
$pdo->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, true);
$pdo->sqliteCreateFunction('regexp', function ($pattern, $value) { $pdo->sqliteCreateFunction('regexp', function ($pattern, $value) {
mb_regex_encoding('UTF-8'); mb_regex_encoding('UTF-8');

2
services/LocalizationService.php
View File

@ -223,7 +223,7 @@ class LocalizationService
$translation = new Translation('', $quantityUnit['name']); $translation = new Translation('', $quantityUnit['name']);
$translation->setTranslation($quantityUnit['name']); $translation->setTranslation($quantityUnit['name']);
$translation->setPlural($quantityUnit['name_plural']); $translation->setPlural($quantityUnit['name_plural']);
$translation->setPluralTranslations(preg_split('/\r\n|\r|\n/', $quantityUnit['plural_forms'])); $translation->setPluralTranslations(preg_split('/\r\n|\r|\n/', $quantityUnit['plural_forms'] ?? ''));
$this->PoQu[] = $translation; $this->PoQu[] = $translation;
} }

3
views/recipes.blade.php
View File

@ -10,7 +10,6 @@
max-height: 250px !important; max-height: 250px !important;
object-fit: cover !important; object-fit: cover !important;
} }
</style> </style>
@endpush @endpush
@ -520,7 +519,7 @@
@endif @endif
@if(!empty($selectedRecipePosition->note)) @if(!empty($selectedRecipePosition->note))
<div class="text-muted">{!! nl2br($selectedRecipePosition->note) !!}</div> <div class="text-muted">{!! nl2br($selectedRecipePosition->note ?? '') !!}</div>
@endif @endif
</li> </li>
@php $lastProductGroup = $selectedRecipePosition->product_group; @endphp @php $lastProductGroup = $selectedRecipePosition->product_group; @endphp

6
views/shoppinglist.blade.php
View File

@ -235,7 +235,7 @@
</td> </td>
<td class="product-name-cell cursor-link" <td class="product-name-cell cursor-link"
data-product-id="{{ $listItem->product_id }}"> data-product-id="{{ $listItem->product_id }}">
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em> @if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note ?? '') !!}</em>
</td> </td>
@if(!empty($listItem->product_id)) @if(!empty($listItem->product_id))
@php @php
@ -383,7 +383,7 @@
@foreach($listItems as $listItem) @foreach($listItems as $listItem)
<tr> <tr>
<td> <td>
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em> @if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note ?? '') !!}</em>
</td> </td>
<td> <td>
<span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, $listItem->qu_name, $listItem->qu_name_plural, true) }}@endif <span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, $listItem->qu_name, $listItem->qu_name_plural, true) }}@endif
@ -411,7 +411,7 @@
@foreach($listItems as $listItem) @foreach($listItems as $listItem)
<div class="py-0"> <div class="py-0">
<span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, $listItem->qu_name, $listItem->qu_name_plural, true) }}@endif <span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, $listItem->qu_name, $listItem->qu_name_plural, true) }}@endif
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em> @if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note ?? '') !!}</em>
</div><br> </div><br>
@endforeach @endforeach
</div> </div>

24
yarn.lock
View File

@ -34,9 +34,9 @@
integrity sha512-pBKuG/g7pMv1dCJ+x3piXqRfWuE/quPlPYaeGf3FwKUBGZyHl4LvM4bA8YmSlQzoMvH/MhcnvVHBhQ5x0fhseA== integrity sha512-pBKuG/g7pMv1dCJ+x3piXqRfWuE/quPlPYaeGf3FwKUBGZyHl4LvM4bA8YmSlQzoMvH/MhcnvVHBhQ5x0fhseA==
"@fortawesome/fontawesome-free@^6.1.1": "@fortawesome/fontawesome-free@^6.1.1":
version "6.2.0" version "6.2.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304"
integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==
ajv@^6.12.3: ajv@^6.12.3:
version "6.12.6" version "6.12.6"
@ -108,9 +108,9 @@ bootstrap@^4.5.2, bootstrap@^4.6.1:
integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ== integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
bwip-js@^3.0.1: bwip-js@^3.0.1:
version "3.1.0" version "3.2.1"
resolved "https://registry.yarnpkg.com/bwip-js/-/bwip-js-3.1.0.tgz#4ab493f747d08240e7fab1e294377e0a1883cbae" resolved "https://registry.yarnpkg.com/bwip-js/-/bwip-js-3.2.1.tgz#bbb424ad31757e7e532fe7d517e351e6b67ce49f"
integrity sha512-H+4s1/25kC/ybwt+o0zhFkbTL4nGrzZV7KW44luWqT/ClmCzhXVqVgaNx8d9YoOUVKR461xDmLt3eGDRtGqRag== integrity sha512-5f/MxGYfYCg+PS94Fm9fNhNr3YlLEtR8dfelI+v2kBcvbEj6DA0xX5HpzddW18EFNGkcRIcsmeYZRIw6fvNU2Q==
caseless@~0.12.0: caseless@~0.12.0:
version "0.12.0" version "0.12.0"
@ -532,9 +532,9 @@ mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
mime-db "1.52.0" mime-db "1.52.0"
moment-timezone@^0.5.34: moment-timezone@^0.5.34:
version "0.5.38" version "0.5.39"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.38.tgz#9674a5397b8be7c13de820fd387d8afa0f725aad" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz#342625a3b98810f04c8f4ea917e448d3525e600b"
integrity sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q== integrity sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w==
dependencies: dependencies:
moment ">= 2.9.0" moment ">= 2.9.0"
@ -627,9 +627,9 @@ qs@~6.5.2:
integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
regenerator-runtime@^0.13.4: regenerator-runtime@^0.13.4:
version "0.13.10" version "0.13.11"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw== integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
request@^2.44.0: request@^2.44.0:
version "2.88.2" version "2.88.2"