From b6b001d05e05676cb7f8573d5ad0e10024e92fce Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 30 Sep 2023 17:40:10 +0000 Subject: [PATCH 1/9] add coverage upload --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dacd12..e1e05f8 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,3 +18,5 @@ jobs: secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_PAT: ${{ secrets.GH_PAT }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + From fb7061d29c8919133ba6e0775914207fbbed7f8c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 1 Oct 2023 03:14:35 +0000 Subject: [PATCH 2/9] change db credentials --- tests/Bootstrap.php | 89 +++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index f817e99..85f23f2 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -7,7 +7,10 @@ declare(strict_types=1); \error_reporting(\E_ALL); \setlocale(\LC_ALL, 'en_US.UTF-8'); -require_once __DIR__ . '/../vendor/autoload.php'; +if (\is_file(__DIR__ . '/../vendor/autoload.php')) { + require_once __DIR__ . '/../vendor/autoload.php'; +} + require_once __DIR__ . '/Autoloader.php'; use phpOMS\DataStorage\Database\DatabasePool; @@ -71,9 +74,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -81,9 +84,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -91,9 +94,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -101,9 +104,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -111,9 +114,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -121,9 +124,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -133,9 +136,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -143,9 +146,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -153,9 +156,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -163,9 +166,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -173,9 +176,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -183,9 +186,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -235,7 +238,7 @@ $CONFIG = [ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -245,7 +248,7 @@ $CONFIG = [ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -255,7 +258,7 @@ $CONFIG = [ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -265,7 +268,7 @@ $CONFIG = [ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -275,7 +278,7 @@ $CONFIG = [ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -285,7 +288,7 @@ $CONFIG = [ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], From 76f5a6bb329cea45f329cd3526512bd476108ff0 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 1 Oct 2023 03:57:09 +0000 Subject: [PATCH 3/9] add autoloading path NO_CI --- tests/Autoloader.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Autoloader.php b/tests/Autoloader.php index b2e3ec3..c8432c1 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -36,6 +36,7 @@ final class Autoloader __DIR__ . '/../', __DIR__ . '/../MainRepository/', __DIR__ . '/../../', + __DIR__ . '/../../Karaka/', ]; /** From 955a2767d7989385c3fa8df2c61544d91e5f4f87 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 1 Oct 2023 20:47:08 +0000 Subject: [PATCH 4/9] fix mssql login/password --- tests/Bootstrap.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 85f23f2..ddc049d 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -236,7 +236,7 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ @@ -246,7 +246,7 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ @@ -256,7 +256,7 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ @@ -266,7 +266,7 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ @@ -276,7 +276,7 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ @@ -286,7 +286,7 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ From daddda82092d5abc6879014694e310edc1ab53ec Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 1 Oct 2023 22:48:36 +0000 Subject: [PATCH 5/9] use default redme text --- README.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a206fa5..af4f138 100755 --- a/README.md +++ b/README.md @@ -1 +1,75 @@ -# Warehousing # +

Logo

+ +The Karaka software is a modular web application for small to mid sized companies that need CRM, ERP, Intranet and/or CMS functionalities and much more. + +With Karaka you have one partner who can provide many tools and software solutions you are used to at fair and reasonable prices even for small organizations and companies/startups. Our solutions can be used independently from each other or fully integrated with other solutions we provide. By choosing Karaka as your partner you'll be able to adjust your software based on the changes in your requirements without worrying about integration and workflow optimization. + +## Table of Contents + +- [Table of Contents](#table-of-contents) +- [Requirements](#requirements) + - [Developer tools](#developer-tools) +- [Installation](#installation) +- [Philosophy & Demo](#philosophy--demo) +- [Development status](#development-status) +- [Tech stack](#tech-stack) +- [Become a contributor](#become-a-contributor) +- [Misc](#misc) + +## Requirements + +* PHP 8.1 +* PHP extension: php8.1-dev php8.1-cli php8.1-common php8.1-mysql php8.1-pgsql php8.1-xdebug php8.1-opcache php8.1-pdo php8.1-sqlite php8.1-mbstring php8.1-curl php8.1-imap php8.1-bcmath php8.1-zip php8.1-dom php8.1-xml php8.1-phar php8.1-gd php-pear +* apache2 (recommended) or nginx +* mysql-server (recommended) or postgresql postgresql-contrib +* Tools: tesseract-ocr, pdftotext, pdftoppm +* Make sure that URL rewriting is active! + +### Developer tools + +* Php extension: xdebug +* Tools: Composer, Npm +* Composer tools: phpstan, phpunit, phpcs +* Npm tools: eslint + +## Installation + +Detailed installation instructions can be found at: + +* [Developer Setup](https://github.com/Karaka-Management/Developer-Guide/blob/develop/general/setup.md) +* [User Setup](https://github.com/Karaka-Management/User-Guide/blob/develop/setup/install.md) + +## Philosophy & Demo + +We believe software should support a business in it's daily tasks and growth in a very efficient way without frustration. In order to achieve this we constantly take feedback from our customers and expand and improve our software solutions. + +You can find a freely available online demo at https://demo.karaka.app (user: admin, pass: orange) without any registration or inquiry. + +## Development status + +Currently Karaka is still developing the first Alpha version. As soon as we have a running Beta version we are allowing external testers to use our software and a selected amount of inhouse developed modules. + +General updates can be found in our info section at https://jingga.app/info and developer updates can be found in our developer section at https://jingga.app/dev. In our developer section you can also check out the automatically generated reports such as code coverage, code style, static analysis etc. as well as our code style guide lines and developer documentation. + +* [Project Status](https://github.com/Karaka-Management/Organization-Guide/blob/master/Project/PROJECT.md) + +## Tech stack + +* Language: php, js, c/c++, c#, html, css, markdown, shell script +* Database: Maria/MySQL, PostgreSQL, MSSQL/SQLSrv, SQLite +* Webserver: apache2, nginx +* Cache: Redis, Memcached + +## Become a contributor + +Karaka has a very open culture and we always welcome new people who share our philosophy in providing create solutions which just work. You can find the development process description which also describes how to become a contributer in the [Organization documentation](https://github.com/Karaka-Management/Organization-Guide/blob/master/Processes/Development.md). + +## Misc + +* End-User documentation: https://github.com/Karaka-Management/Documentation +* Developer documentation: https://github.com/Karaka-Management/Developer-Guide +* Organization documentation: https://github.com/Karaka-Management/Organization-Guide +* Website: [https://jingga.app](https://jingga.app) +* Demo: [https://jingga.app](https://jingga.app) (user: admin, pass: orange) +* Dev: [https://jingga.app/dev](https://jingga.app/dev) +* Contact: info@jingga.app From 135ac7b067c894ea863bcf480bd90e03c8538e08 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 2 Oct 2023 02:56:47 +0000 Subject: [PATCH 6/9] fix autoloading --- tests/Autoloader.php | 3 +-- tests/phpunit_default.xml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Autoloader.php b/tests/Autoloader.php index c8432c1..7cf411e 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -36,7 +36,6 @@ final class Autoloader __DIR__ . '/../', __DIR__ . '/../MainRepository/', __DIR__ . '/../../', - __DIR__ . '/../../Karaka/', ]; /** @@ -80,7 +79,7 @@ final class Autoloader $class = \strtr($class, '_\\', '//'); if (\stripos($class, 'Web/Backend') !== false || \stripos($class, 'Web/Api') !== false) { - $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'Karaka/Web/', $class); + $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'MainRepository/Web/', $class); } $class2 = $class; diff --git a/tests/phpunit_default.xml b/tests/phpunit_default.xml index ad47a51..d350430 100755 --- a/tests/phpunit_default.xml +++ b/tests/phpunit_default.xml @@ -7,6 +7,7 @@ ../vendor* ../MainRepository* + ../Karaka* ../Admin/Install/Application* ../phpOMS* ../tests* From e870e01d7aa27144ac053f9022679130fb26804e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 4 Oct 2023 15:52:16 +0000 Subject: [PATCH 7/9] Force public member variables or mapper changes --- Models/StockMovement.php | 2 +- Models/StockType.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Models/StockMovement.php b/Models/StockMovement.php index dfb3c9c..2dc4966 100755 --- a/Models/StockMovement.php +++ b/Models/StockMovement.php @@ -59,7 +59,7 @@ class StockMovement * @var Account * @since 1.0.0 */ - protected Account $createdBy; + public Account $createdBy; /** * Created. diff --git a/Models/StockType.php b/Models/StockType.php index 43edddb..b1d7b0c 100644 --- a/Models/StockType.php +++ b/Models/StockType.php @@ -48,7 +48,7 @@ class StockType * * @var string|BaseStringL11n */ - protected string | BaseStringL11n $l11n; + public string | BaseStringL11n $l11n; /** * Set l11n From 96051d1b1fddc24549c6f13f94c6e6ac756cb372 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 9 Oct 2023 22:06:39 +0000 Subject: [PATCH 8/9] update --- Admin/Installer.php | 2 +- Controller/ApiAttributeController.php | 8 ++++---- Theme/Backend/Lang/ar.lang.php | 4 ++-- Theme/Backend/Lang/cs.lang.php | 4 ++-- Theme/Backend/Lang/da.lang.php | 4 ++-- Theme/Backend/Lang/de.lang.php | 4 ++-- Theme/Backend/Lang/el.lang.php | 4 ++-- Theme/Backend/Lang/es.lang.php | 4 ++-- Theme/Backend/Lang/fi.lang.php | 4 ++-- Theme/Backend/Lang/fr.lang.php | 4 ++-- Theme/Backend/Lang/hu.lang.php | 4 ++-- Theme/Backend/Lang/it.lang.php | 4 ++-- Theme/Backend/Lang/ja.lang.php | 4 ++-- Theme/Backend/Lang/ko.lang.php | 4 ++-- Theme/Backend/Lang/no.lang.php | 4 ++-- Theme/Backend/Lang/pl.lang.php | 4 ++-- Theme/Backend/Lang/pt.lang.php | 4 ++-- Theme/Backend/Lang/ru.lang.php | 4 ++-- Theme/Backend/Lang/sv.lang.php | 4 ++-- Theme/Backend/Lang/th.lang.php | 4 ++-- Theme/Backend/Lang/tr.lang.php | 4 ++-- Theme/Backend/Lang/uk.lang.php | 4 ++-- Theme/Backend/Lang/zh.lang.php | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index df9b630..d86ca99 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -117,7 +117,7 @@ final class Installer extends InstallerAbstract $module->apiStockTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index aec55f4..0d4d477 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -82,11 +82,11 @@ final class ApiAttributeController extends Controller $attribute->ref = (int) $request->getData('ref'); $attribute->type = new NullAttributeType((int) $request->getData('type')); - if ($request->hasData('value')) { - $attribute->value = new NullAttributeValue((int) $request->getData('value')); + if ($request->hasData('value_id')) { + $attribute->value = new NullAttributeValue((int) $request->getData('value_id')); } else { $newRequest = clone $request; - $newRequest->setData('value', $request->getData('custom'), true); + $newRequest->setData('value', $request->getData('value'), true); $value = $this->createLotAttributeValueFromRequest($newRequest); @@ -109,7 +109,7 @@ final class ApiAttributeController extends Controller { $val = []; if (($val['type'] = !$request->hasData('type')) - || ($val['value'] = (!$request->hasData('value') && !$request->hasData('custom'))) + || ($val['value'] = (!$request->hasData('value') && !$request->hasData('value_id'))) || ($val['lot'] = !$request->hasData('lot')) ) { return $val; diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index e77dbce..6a62e89 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'موقع', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'رمز مطابق', 'Month' => 'شهر', 'Name' => 'اسم', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'شحن', 'Statistics' => 'إحصائيات', 'Stock' => 'المخزون', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'شارع', 'Today' => 'اليوم', 'Type' => 'نوع', diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index b4ca466..3cd9e3c 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Umístění', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'MatchCode.', 'Month' => 'Měsíc', 'Name' => 'název', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Lodní doprava', 'Statistics' => 'Statistika', 'Stock' => 'Skladem', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'ulice', 'Today' => 'Dnes', 'Type' => 'Typ', diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index 31b15e9..46f64e1 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Beliggenhed', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'MatchCode.', 'Month' => 'Måned', 'Name' => 'Navn', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Forsendelse', 'Statistics' => 'Statistikker', 'Stock' => 'Lager', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Gade', 'Today' => 'I dag', 'Type' => 'Type', diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index b6f43db..72b1243 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Ort', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Matchcode', 'Month' => 'Monat', 'Name' => 'Name', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Versand', 'Statistics' => 'Statistiken', 'Stock' => 'Aktie', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Straße', 'Today' => 'Heute', 'Type' => 'Typ', diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index 1bcc5c0..d2e4a59 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Τοποθεσία', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Matchcode', 'Month' => 'Μήνας', 'Name' => 'Ονομα', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Αποστολή', 'Statistics' => 'Στατιστική', 'Stock' => 'Στοκ', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Δρόμος', 'Today' => 'Σήμερα', 'Type' => 'Τύπος', diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 57dd99f..4f2bd86 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Ubicación', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Código de asociación', 'Month' => 'Mes', 'Name' => 'Nombre', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Transporte', 'Statistics' => 'Estadísticas', 'Stock' => 'Valores', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'calle', 'Today' => 'Hoy dia', 'Type' => 'Escribe', diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 50b44cc..9de2a2a 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Sijainti', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Matchcode', 'Month' => 'Kuukausi', 'Name' => 'Nimi', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'laivaus', 'Statistics' => 'Tilastot', 'Stock' => 'Varasto', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Katu', 'Today' => 'Tänään', 'Type' => 'Tyyppi', diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index b58d0d0..412fd45 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Emplacement', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Encadrement', 'Month' => 'Mois', 'Name' => 'Nom', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Expédition', 'Statistics' => 'Statistiques', 'Stock' => 'Stocker', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'rue', 'Today' => 'Aujourd\'hui', 'Type' => 'Taper', diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index aa8c6f1..c4af5ca 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Elhelyezkedés', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Matchcode', 'Month' => 'Hónap', 'Name' => 'Név', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Szállítás', 'Statistics' => 'Statisztika', 'Stock' => 'Készlet', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'utca', 'Today' => 'Ma', 'Type' => 'típus', diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index 7fc7185..f003ddb 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Posizione', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Matchcode.', 'Month' => 'Mese', 'Name' => 'Nome', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Spedizione', 'Statistics' => 'Statistiche', 'Stock' => 'Azione', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'strada', 'Today' => 'Oggi', 'Type' => 'Tipo', diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index c3964ff..25d16f2 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => '位置', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'マッチコード', 'Month' => '月', 'Name' => '名前', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => '運送', 'Statistics' => '統計学', 'Stock' => 'ストック', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => '街', 'Today' => '今日', 'Type' => 'タイプ', diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index b5801a2..6b13740 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => '위치', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => '매치 코드', 'Month' => '월', 'Name' => '이름', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => '배송', 'Statistics' => '통계', 'Stock' => '재고', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => '거리', 'Today' => '오늘', 'Type' => '유형', diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index bb016bd..d45ba78 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'plassering', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'MatchCode.', 'Month' => 'Måned', 'Name' => 'Navn', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Shipping', 'Statistics' => 'Statistikk', 'Stock' => 'Lager', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'gate', 'Today' => 'I dag', 'Type' => 'Type', diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 68e8e83..98770ba 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Lokalizacja', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'MatchCode.', 'Month' => 'Miesiąc', 'Name' => 'Nazwa', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Wysyłka', 'Statistics' => 'Statystyka', 'Stock' => 'Magazyn', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Ulica', 'Today' => 'Dziś', 'Type' => 'Rodzaj', diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index d24bf85..6555c0e 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Localização', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Código de combinação', 'Month' => 'Mês', 'Name' => 'Nome', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Envio', 'Statistics' => 'Estatisticas', 'Stock' => 'Estoque', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'rua', 'Today' => 'Hoje', 'Type' => 'Modelo', diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 0810796..95806a7 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Место расположения', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'MatchCode.', 'Month' => 'Месяц', 'Name' => 'Имя', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Перевозки', 'Statistics' => 'Статистика', 'Stock' => 'Склад', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'улица', 'Today' => 'Сегодня', 'Type' => 'Тип', diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 2624aa0..c44bce8 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Plats', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Matchcode', 'Month' => 'Månad', 'Name' => 'namn', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Frakt', 'Statistics' => 'Statistik', 'Stock' => 'Stock', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Gata', 'Today' => 'I dag', 'Type' => 'Typ', diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 902c700..1bd8201 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'ที่ตั้ง', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'การจับคู่', 'Month' => 'เดือน', 'Name' => 'ชื่อ', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'การส่งสินค้า', 'Statistics' => 'สถิติ', 'Stock' => 'คลังสินค้า', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'ถนน', 'Today' => 'วันนี้', 'Type' => 'พิมพ์', diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 7231bf9..b63a8b5 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Konum', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Maç Kodu', 'Month' => 'Ay', 'Name' => 'İsim', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Nakliye', 'Statistics' => 'İstatistik', 'Stock' => 'Stoklamak', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'sokak', 'Today' => 'Bugün', 'Type' => 'Tip', diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 8a76816..e3f1554 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => 'Місцезнаходження', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => 'Матч', 'Month' => 'Місяць', 'Name' => 'Назва', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => 'Доставка', 'Statistics' => 'Статистика', 'Stock' => 'Запас', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => 'Вулиця', 'Today' => 'Сьогодні', 'Type' => 'Тип', diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index f26e0ff..b17320a 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -29,7 +29,7 @@ return ['WarehouseManagement' => [ 'Localization' => '', 'Localizations' => '', 'Location' => '地点', - 'Locations' => '#VALUE!', + 'Locations' => '', 'Matchcode' => '匹配码', 'Month' => '月', 'Name' => '名称', @@ -39,7 +39,7 @@ return ['WarehouseManagement' => [ 'Shipping' => '船运', 'Statistics' => '统计数据', 'Stock' => '库存', - 'Stocks' => '#VALUE!', + 'Stocks' => '', 'Street' => '街道', 'Today' => '今天', 'Type' => '类型', From a785fff5e719db3c222091b0b36bb58a95d8c3ff Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 12 Oct 2023 22:49:21 +0000 Subject: [PATCH 9/9] todos fixed --- Controller/ApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c94aaf5..005df1a 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -126,7 +126,7 @@ final class ApiController extends Controller return; } - // @todo: check if old element existex -> removed/changed item + // @todo: check if old element existed -> removed/changed item // @todo: we cannot have transaction->to and transaction->from be the id of client/supplier because the IDs can overlap $transaction = new StockMovement();