Test fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
CI / general_module_workflow_php (push) Has been cancelled
CI / general_module_workflow_js (push) Has been cancelled

This commit is contained in:
Dennis Eichhorn 2024-05-16 02:14:55 +00:00
parent 984c0af12e
commit d5cf5c70f2
10 changed files with 19 additions and 31 deletions

View File

@ -92,7 +92,7 @@ final class ApiController extends Controller
{ {
$rep = new SalesRep(); $rep = new SalesRep();
$rep->code = $request->getDataString('code') ?? ''; $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; return $rep;
} }

View File

@ -1,5 +0,0 @@
# Structure
## ER
![ER](Modules/Sales/Docs/Dev/img/er.png)

View File

@ -15,12 +15,6 @@ declare(strict_types=1);
namespace Modules\Sales\Models; namespace Modules\Sales\Models;
use Modules\Admin\Models\Account; 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. * Sales rep class.

View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace Modules\Sales\Models; namespace Modules\Sales\Models;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Media\Models\MediaMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**
@ -38,9 +37,9 @@ final class SalesRepMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'sales_rep_id' => ['name' => 'sales_rep_id', 'type' => 'int', 'internal' => 'id'], 'sales_rep_id' => ['name' => 'sales_rep_id', 'type' => 'int', 'internal' => 'id'],
'sales_rep_code' => ['name' => 'sales_rep_code', 'type' => 'string', 'internal' => 'code'], 'sales_rep_code' => ['name' => 'sales_rep_code', 'type' => 'string', 'internal' => 'code'],
'sales_rep_main' => ['name' => 'sales_rep_main', 'type' => 'int', 'internal' => 'main'], 'sales_rep_main' => ['name' => 'sales_rep_main', 'type' => 'int', 'internal' => 'main'],
]; ];
/** /**

View File

@ -13,8 +13,8 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'Sales' => 'Verkauf', 'Sales' => 'Verkauf',
'SalesReps' => 'Verkäufer', 'SalesReps' => 'Verkäufer',
'List' => 'Liste', 'List' => 'Liste',
'Create' => 'Erstellen', 'Create' => 'Erstellen',
]]; ]];

View File

@ -13,8 +13,8 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'Sales' => 'Sales', 'Sales' => 'Sales',
'SalesReps' => 'Sales Reps', 'SalesReps' => 'Sales Reps',
'List' => 'List', 'List' => 'List',
'Create' => 'Create', 'Create' => 'Create',
]]; ]];

View File

@ -103,7 +103,7 @@ return ['Sales' => [
'Turnover' => 'Umsatz', 'Turnover' => 'Umsatz',
'Type' => 'Typ', 'Type' => 'Typ',
'ZipCode' => 'Postleitzahl', 'ZipCode' => 'Postleitzahl',
'Code' => 'Kodierung', 'Code' => 'Kodierung',
'SalesRep' => 'Verkäufer', 'SalesRep' => 'Verkäufer',
'SalesReps' => 'Verkäufer', 'SalesReps' => 'Verkäufer',
]]; ]];

View File

@ -103,7 +103,7 @@ return ['Sales' => [
'Turnover' => 'Turnover', 'Turnover' => 'Turnover',
'Type' => 'Type', 'Type' => 'Type',
'ZipCode' => 'Zip Code', 'ZipCode' => 'Zip Code',
'Code' => 'Code', 'Code' => 'Code',
'SalesRep' => 'Sales Rep', 'SalesRep' => 'Sales Rep',
'SalesReps' => 'Sales Reps', 'SalesReps' => 'Sales Reps',
]]; ]];

View File

@ -16,10 +16,10 @@ use Modules\Sales\Models\NullSalesRep;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
* @var \Modules\Sales\Models\SalesRep $rep * @var \Modules\Sales\Models\SalesRep $rep
*/ */
$rep = $this->data['rep'] ?? new NullSalesRep(); $rep = $this->data['rep'] ?? new NullSalesRep();
$isNew = $rep->id === 0; $isNew = $rep->id === 0;
echo $this->data['nav']->render(); ?> echo $this->data['nav']->render(); ?>

View File

@ -12,7 +12,7 @@
}, },
"creator": { "creator": {
"name": "Jingga", "name": "Jingga",
"website": "jingga.app" "website": "https://jingga.app"
}, },
"description": "Sales module.", "description": "Sales module.",
"directory": "Sales", "directory": "Sales",