Fixed merge conflicts

This commit is contained in:
Bernd Bestel 2021-06-18 20:37:38 +02:00
parent f6e3546d3f
commit 5a3d3eae21
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 509 additions and 72 deletions

View File

@ -12,6 +12,8 @@
"erusev/parsedown": "^1.7", "erusev/parsedown": "^1.7",
"gumlet/php-image-resize": "^1.9", "gumlet/php-image-resize": "^1.9",
"ezyang/htmlpurifier": "^4.13", "ezyang/htmlpurifier": "^4.13",
"jucksearm/php-barcode": "^1.0",
"guzzlehttp/guzzle": "^7.0",
"mike42/escpos-php": "^3.0" "mike42/escpos-php": "^3.0"
}, },
"autoload": { "autoload": {
@ -24,5 +26,8 @@
"files": [ "files": [
"helpers/extensions.php" "helpers/extensions.php"
] ]
},
"config": {
"platform-check": false
} }
} }

524
composer.lock generated
View File

@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "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": "471e23edacb0f4338b5e6920d6e6f0c0", "content-hash": "b8b8e77618038c44c21edac2c31c4b67",
"packages": [ "packages": [
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
@ -86,6 +86,20 @@
"issues": "https://github.com/doctrine/inflector/issues", "issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/1.4.x" "source": "https://github.com/doctrine/inflector/tree/1.4.x"
}, },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
"type": "tidelift"
}
],
"time": "2020-05-29T07:19:59+00:00" "time": "2020-05-29T07:19:59+00:00"
}, },
{ {
@ -494,6 +508,239 @@
}, },
"time": "2019-01-01T13:53:00+00:00" "time": "2019-01-01T13:53:00+00:00"
}, },
{
"name": "guzzlehttp/guzzle",
"version": "7.3.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "7008573787b430c1c1f650e3722d9bba59967628"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/7008573787b430c1c1f650e3722d9bba59967628",
"reference": "7008573787b430c1c1f650e3722d9bba59967628",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.4",
"guzzlehttp/psr7": "^1.7 || ^2.0",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0"
},
"provide": {
"psr/http-client-implementation": "1.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-curl": "*",
"php-http/client-integration-tests": "^3.0",
"phpunit/phpunit": "^8.5.5 || ^9.3.5",
"psr/log": "^1.1"
},
"suggest": {
"ext-curl": "Required for CURL handler support",
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "7.3-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com",
"homepage": "https://sagikazarmark.hu"
}
],
"description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/",
"keywords": [
"client",
"curl",
"framework",
"http",
"http client",
"psr-18",
"psr-7",
"rest",
"web service"
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.3.0"
},
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://github.com/Nyholm",
"type": "github"
},
{
"url": "https://github.com/alexeyshockov",
"type": "github"
},
{
"url": "https://github.com/gmponos",
"type": "github"
}
],
"time": "2021-03-23T11:33:13+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
"reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
"shasum": ""
},
"require": {
"php": ">=5.5"
},
"require-dev": {
"symfony/phpunit-bridge": "^4.4 || ^5.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Guzzle promises library",
"keywords": [
"promise"
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/1.4.1"
},
"time": "2021-03-07T09:25:29+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "dc960a912984efb74d0a90222870c72c87f10c91"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
"reference": "dc960a912984efb74d0a90222870c72c87f10c91",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"psr/http-message": "~1.0",
"ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"ext-zlib": "*",
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Psr7\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Tobias Schultze",
"homepage": "https://github.com/Tobion"
}
],
"description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
"http",
"message",
"psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.2"
},
"time": "2021-04-26T09:17:50+00:00"
},
{ {
"name": "illuminate/container", "name": "illuminate/container",
"version": "v5.8.36", "version": "v5.8.36",
@ -815,102 +1062,56 @@
"time": "2019-06-20T13:13:59+00:00" "time": "2019-06-20T13:13:59+00:00"
}, },
{ {
"name": "mike42/escpos-php", "name": "jucksearm/php-barcode",
"version": "v3.0", "version": "1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mike42/escpos-php.git", "url": "https://github.com/jucksearm/php-barcode.git",
"reference": "dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3" "reference": "066a58776ec9e94dd6d5843c0fb9a3ff95e74d8b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mike42/escpos-php/zipball/dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3", "url": "https://api.github.com/repos/jucksearm/php-barcode/zipball/066a58776ec9e94dd6d5843c0fb9a3ff95e74d8b",
"reference": "dcb569a123d75f9f6a4a927aae7625ca6b7fdcf3", "reference": "066a58776ec9e94dd6d5843c0fb9a3ff95e74d8b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-intl": "*", "php": ">=5.4.0"
"ext-json": "*",
"ext-zlib": "*",
"mike42/gfx-php": "^0.6",
"php": ">=7.0.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.5", "phpunit/phpunit": "^6.1"
"squizlabs/php_codesniffer": "^3.3"
},
"suggest": {
"ext-gd": "Used for image printing if present.",
"ext-imagick": "Will be used for image printing if present. Required for PDF printing or use of custom fonts."
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Mike42\\": "src/Mike42" "jucksearm\\barcode\\": ""
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "LGPLv3"
], ],
"authors": [ "authors": [
{ {
"name": "Michael Billington", "name": "jucksearm",
"email": "michael.billington@gmail.com" "email": "jucksearm.bkk@gmail.com"
} }
], ],
"description": "PHP receipt printer library for use with ESC/POS-compatible thermal and impact printers", "description": "Barcode Generation Package inspired by Nicola Asuni.",
"homepage": "https://github.com/mike42/escpos-php",
"keywords": [ "keywords": [
"Epson", "CODE 128",
"barcode", "barcode",
"escpos", "datamatrix",
"printer", "pdf417",
"receipt-printer" "php barcode",
"qr code",
"qrcode"
], ],
"time": "2019-10-13T06:27:43+00:00" "support": {
}, "issues": "https://github.com/jucksearm/php-barcode/issues",
{ "source": "https://github.com/jucksearm/php-barcode/tree/1.0.0"
"name": "mike42/gfx-php",
"version": "v0.6",
"source": {
"type": "git",
"url": "https://github.com/mike42/gfx-php.git",
"reference": "ed9ded2a9298e4084a9c557ab74a89b71e43dbdb"
}, },
"dist": { "time": "2017-06-05T04:41:51+00:00"
"type": "zip",
"url": "https://api.github.com/repos/mike42/gfx-php/zipball/ed9ded2a9298e4084a9c557ab74a89b71e43dbdb",
"reference": "ed9ded2a9298e4084a9c557ab74a89b71e43dbdb",
"shasum": ""
},
"require": {
"php": ">=7.0.0"
},
"require-dev": {
"phpbench/phpbench": "@dev",
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^3.3.1"
},
"type": "library",
"autoload": {
"psr-4": {
"Mike42\\": "src/Mike42"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-2.1-or-later"
],
"authors": [
{
"name": "Michael Billington",
"email": "michael.billington@gmail.com"
}
],
"description": "The pure PHP graphics library",
"homepage": "https://github.com/mike42/gfx-php",
"time": "2019-10-05T02:44:33+00:00"
}, },
{ {
"name": "morris/lessql", "name": "morris/lessql",
@ -1046,6 +1247,16 @@
"issues": "https://github.com/briannesbitt/Carbon/issues", "issues": "https://github.com/briannesbitt/Carbon/issues",
"source": "https://github.com/briannesbitt/Carbon" "source": "https://github.com/briannesbitt/Carbon"
}, },
"funding": [
{
"url": "https://opencollective.com/Carbon",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
"type": "tidelift"
}
],
"time": "2020-12-17T20:55:32+00:00" "time": "2020-12-17T20:55:32+00:00"
}, },
{ {
@ -1255,6 +1466,12 @@
"issues": "https://github.com/PHP-DI/Invoker/issues", "issues": "https://github.com/PHP-DI/Invoker/issues",
"source": "https://github.com/PHP-DI/Invoker/tree/2.2.0" "source": "https://github.com/PHP-DI/Invoker/tree/2.2.0"
}, },
"funding": [
{
"url": "https://github.com/mnapoli",
"type": "github"
}
],
"time": "2020-10-12T12:15:50+00:00" "time": "2020-10-12T12:15:50+00:00"
}, },
{ {
@ -1321,6 +1538,16 @@
"issues": "https://github.com/PHP-DI/PHP-DI/issues", "issues": "https://github.com/PHP-DI/PHP-DI/issues",
"source": "https://github.com/PHP-DI/PHP-DI/tree/6.3.0" "source": "https://github.com/PHP-DI/PHP-DI/tree/6.3.0"
}, },
"funding": [
{
"url": "https://github.com/mnapoli",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/php-di/php-di",
"type": "tidelift"
}
],
"time": "2020-10-12T14:39:15+00:00" "time": "2020-10-12T14:39:15+00:00"
}, },
{ {
@ -1418,6 +1645,58 @@
}, },
"time": "2017-02-14T16:28:37+00:00" "time": "2017-02-14T16:28:37+00:00"
}, },
{
"name": "psr/http-client",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
"reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
"reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
"shasum": ""
},
"require": {
"php": "^7.0 || ^8.0",
"psr/http-message": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Client\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for HTTP clients",
"homepage": "https://github.com/php-fig/http-client",
"keywords": [
"http",
"http-client",
"psr",
"psr-18"
],
"support": {
"source": "https://github.com/php-fig/http-client/tree/master"
},
"time": "2020-06-29T06:28:15+00:00"
},
{ {
"name": "psr/http-factory", "name": "psr/http-factory",
"version": "1.0.1", "version": "1.0.1",
@ -2099,6 +2378,16 @@
"source": "https://github.com/slimphp/Slim", "source": "https://github.com/slimphp/Slim",
"wiki": "https://github.com/slimphp/Slim/wiki" "wiki": "https://github.com/slimphp/Slim/wiki"
}, },
"funding": [
{
"url": "https://opencollective.com/slimphp",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/slim/slim",
"type": "tidelift"
}
],
"time": "2020-12-01T19:41:22+00:00" "time": "2020-12-01T19:41:22+00:00"
}, },
{ {
@ -2154,6 +2443,20 @@
"support": { "support": {
"source": "https://github.com/symfony/debug/tree/v4.4.18" "source": "https://github.com/symfony/debug/tree/v4.4.18"
}, },
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-12-10T16:34:26+00:00" "time": "2020-12-10T16:34:26+00:00"
}, },
{ {
@ -2201,6 +2504,20 @@
"support": { "support": {
"source": "https://github.com/symfony/finder/tree/v4.4.18" "source": "https://github.com/symfony/finder/tree/v4.4.18"
}, },
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-12-08T16:59:59+00:00" "time": "2020-12-08T16:59:59+00:00"
}, },
{ {
@ -2264,6 +2581,23 @@
"portable", "portable",
"shim" "shim"
], ],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-10-23T14:02:19+00:00" "time": "2020-10-23T14:02:19+00:00"
}, },
{ {
@ -2330,6 +2664,23 @@
"portable", "portable",
"shim" "shim"
], ],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-10-23T14:02:19+00:00" "time": "2020-10-23T14:02:19+00:00"
}, },
{ {
@ -2409,6 +2760,20 @@
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v5.2.1" "source": "https://github.com/symfony/translation/tree/v5.2.1"
}, },
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-12-08T17:03:37+00:00" "time": "2020-12-08T17:03:37+00:00"
}, },
{ {
@ -2473,6 +2838,20 @@
"support": { "support": {
"source": "https://github.com/symfony/translation-contracts/tree/v2.3.0" "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
}, },
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-09-28T13:05:58+00:00" "time": "2020-09-28T13:05:58+00:00"
} }
], ],
@ -2485,5 +2864,6 @@
"platform": { "platform": {
"php": ">=7.4" "php": ">=7.4"
}, },
"platform-dev": [] "platform-dev": [],
"plugin-api-version": "2.1.0"
} }

View File

@ -2078,6 +2078,58 @@ msgstr ""
msgid "A product or a note is required" msgid "A product or a note is required"
msgstr "" msgstr ""
msgid "grocycode"
msgstr ""
msgid "Download"
msgstr ""
msgid "Download stock entry grocycode"
msgstr ""
msgid "Download product grocycode"
msgstr ""
msgid "grocycode is a unique referer to this product in your grocy instance - print it onto a label and scan it like any other barcode"
msgstr ""
# Abbreviation for "due date"
msgid "DD"
msgstr ""
msgid "Print on label printer"
msgstr ""
msgid "Stock entry label"
msgstr ""
msgid "No label"
msgstr ""
msgid "Single label"
msgstr ""
msgid "Label per unit"
msgstr ""
msgid "Allow label printing per unit"
msgstr ""
msgid "Allow printing of one label per unit on purchase (after conversion) - e.g. 1 purchased pack adding 10 pieces of stock would print 10 labels"
msgstr ""
msgid "Error while executing WebHook"
msgstr ""
msgid "Print product grocycode on label printer"
msgstr ""
msgid "Print stock entry grocycode on label printer"
msgstr ""
msgid "Open stock entry print label in new window"
msgstr ""
msgid "Thermal printer" msgid "Thermal printer"
msgstr "" msgstr ""