From d5cf5c70f29aa27bc5874fdc5dcdc4e00c42aaac Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 16 May 2024 02:14:55 +0000 Subject: [PATCH] Test fixes --- Controller/ApiController.php | 2 +- Docs/Dev/en/structure.md | 5 ----- Models/SalesRep.php | 6 ------ Models/SalesRepMapper.php | 7 +++---- Theme/Backend/Lang/Navigation.de.lang.php | 6 +++--- Theme/Backend/Lang/Navigation.en.lang.php | 6 +++--- Theme/Backend/Lang/de.lang.php | 6 +++--- Theme/Backend/Lang/en.lang.php | 6 +++--- Theme/Backend/rep-view.tpl.php | 4 ++-- info.json | 2 +- 10 files changed, 19 insertions(+), 31 deletions(-) delete mode 100755 Docs/Dev/en/structure.md diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 5363b44..1727257 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -92,7 +92,7 @@ final class ApiController extends Controller { $rep = new SalesRep(); $rep->code = $request->getDataString('code') ?? ''; - $rep->main = $request->hasData('main') ? new NullAccount((int) $request->getData('main')) : null;; + $rep->main = $request->hasData('main') ? new NullAccount((int) $request->getData('main')) : null; return $rep; } diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md deleted file mode 100755 index 3dcea4a..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,5 +0,0 @@ -# Structure - -## ER - -![ER](Modules/Sales/Docs/Dev/img/er.png) \ No newline at end of file diff --git a/Models/SalesRep.php b/Models/SalesRep.php index 6e36202..5520218 100644 --- a/Models/SalesRep.php +++ b/Models/SalesRep.php @@ -15,12 +15,6 @@ declare(strict_types=1); namespace Modules\Sales\Models; use Modules\Admin\Models\Account; -use Modules\Admin\Models\NullAccount; -use Modules\Editor\Models\EditorDoc; -use Modules\Payment\Models\Payment; -use Modules\Profile\Models\Profile; -use phpOMS\Stdlib\Base\Address; -use phpOMS\Stdlib\Base\NullAddress; /** * Sales rep class. diff --git a/Models/SalesRepMapper.php b/Models/SalesRepMapper.php index 151b8b3..5b8685f 100644 --- a/Models/SalesRepMapper.php +++ b/Models/SalesRepMapper.php @@ -15,7 +15,6 @@ declare(strict_types=1); namespace Modules\Sales\Models; use Modules\Admin\Models\AccountMapper; -use Modules\Media\Models\MediaMapper; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** @@ -38,9 +37,9 @@ final class SalesRepMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'sales_rep_id' => ['name' => 'sales_rep_id', 'type' => 'int', 'internal' => 'id'], - 'sales_rep_code' => ['name' => 'sales_rep_code', 'type' => 'string', 'internal' => 'code'], - 'sales_rep_main' => ['name' => 'sales_rep_main', 'type' => 'int', 'internal' => 'main'], + 'sales_rep_id' => ['name' => 'sales_rep_id', 'type' => 'int', 'internal' => 'id'], + 'sales_rep_code' => ['name' => 'sales_rep_code', 'type' => 'string', 'internal' => 'code'], + 'sales_rep_main' => ['name' => 'sales_rep_main', 'type' => 'int', 'internal' => 'main'], ]; /** diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index 16e3d1a..8337b52 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -13,8 +13,8 @@ declare(strict_types=1); return ['Navigation' => [ - 'Sales' => 'Verkauf', - 'SalesReps' => 'Verkäufer', - 'List' => 'Liste', + 'Sales' => 'Verkauf', + 'SalesReps' => 'Verkäufer', + 'List' => 'Liste', 'Create' => 'Erstellen', ]]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 1b00318..3ae82ed 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,8 +13,8 @@ declare(strict_types=1); return ['Navigation' => [ - 'Sales' => 'Sales', - 'SalesReps' => 'Sales Reps', - 'List' => 'List', + 'Sales' => 'Sales', + 'SalesReps' => 'Sales Reps', + 'List' => 'List', 'Create' => 'Create', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 21a5fea..ec12e9d 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -103,7 +103,7 @@ return ['Sales' => [ 'Turnover' => 'Umsatz', 'Type' => 'Typ', 'ZipCode' => 'Postleitzahl', - 'Code' => 'Kodierung', - 'SalesRep' => 'Verkäufer', - 'SalesReps' => 'Verkäufer', + 'Code' => 'Kodierung', + 'SalesRep' => 'Verkäufer', + 'SalesReps' => 'Verkäufer', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 33f0182..2f3834c 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -103,7 +103,7 @@ return ['Sales' => [ 'Turnover' => 'Turnover', 'Type' => 'Type', 'ZipCode' => 'Zip Code', - 'Code' => 'Code', - 'SalesRep' => 'Sales Rep', - 'SalesReps' => 'Sales Reps', + 'Code' => 'Code', + 'SalesRep' => 'Sales Rep', + 'SalesReps' => 'Sales Reps', ]]; diff --git a/Theme/Backend/rep-view.tpl.php b/Theme/Backend/rep-view.tpl.php index 98612d0..3c933d9 100644 --- a/Theme/Backend/rep-view.tpl.php +++ b/Theme/Backend/rep-view.tpl.php @@ -16,10 +16,10 @@ use Modules\Sales\Models\NullSalesRep; use phpOMS\Uri\UriFactory; /** - * @var \phpOMS\Views\View $this + * @var \phpOMS\Views\View $this * @var \Modules\Sales\Models\SalesRep $rep */ -$rep = $this->data['rep'] ?? new NullSalesRep(); +$rep = $this->data['rep'] ?? new NullSalesRep(); $isNew = $rep->id === 0; echo $this->data['nav']->render(); ?> diff --git a/info.json b/info.json index 2d98ef4..854d41e 100755 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "Sales module.", "directory": "Sales",