From f2feefe3bbd2a0b5c31907c27970a7af65d2f10e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 6 May 2023 11:42:05 +0000 Subject: [PATCH] make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ... --- Admin/Installer.php | 2 +- Models/TaxCode.php | 2 +- Models/TaxCodeL11n.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 11585d3..d559cfc 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -96,7 +96,7 @@ final class Installer extends InstallerAbstract /** @var \Modules\Finance\Models\TaxCode $code */ $code = $responseData['response']; - $id = $code->getId(); + $id = $code->id; $isFirst = true; foreach ($data['l11n'] as $lang => $l11n) { diff --git a/Models/TaxCode.php b/Models/TaxCode.php index ec6094b..3aa1ed6 100755 --- a/Models/TaxCode.php +++ b/Models/TaxCode.php @@ -30,7 +30,7 @@ class TaxCode implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; public string $abbr = ''; diff --git a/Models/TaxCodeL11n.php b/Models/TaxCodeL11n.php index 54a0738..b76a3cc 100755 --- a/Models/TaxCodeL11n.php +++ b/Models/TaxCodeL11n.php @@ -32,7 +32,7 @@ class TaxCodeL11n implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Tax code ID. diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 48fdd7d..bbf32df 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,9 +13,12 @@ declare(strict_types=1); return ['Navigation' => [ + 'Finance' => 'Finance', + 'Account' => 'Account', 'Analysis' => 'Analysis', - 'Articles' => 'Articles', + 'Items' => 'Items', 'Clients' => 'Clients', + 'Suppliers' => 'Suppliers', 'Create' => 'Create', 'Invoice' => 'Invoice', 'Invoices' => 'Invoices',