Jingga/oms-ClientManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ClientManagement.git synced 2026-01-11 15:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

auto fixes + some impl.

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-01-26 22:53:59 +00:00
parent 7f0824a5e7
commit 16aec56e72
26 changed files with 628 additions and 816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Admin/Install/db.json
View File

@ -213,6 +213,11 @@
"type": "TINYINT(1)",
"null": false
},
"clientmgmt_attr_type_internal": {
"name": "clientmgmt_attr_type_internal",
"type": "TINYINT(1)",
"null": false
},
"clientmgmt_attr_type_required": {
"description": "Every item must have this attribute type if set to true.",
"name": "clientmgmt_attr_type_required",
@ -423,7 +428,7 @@
},
"clientmgmt_client_account_account": {
"name": "clientmgmt_client_account_account",
"type": "VARCHAR(50)",
"type": "VARCHAR(10)",
"null": false
},
"clientmgmt_client_account_client": {

25
Admin/Installer.php
View File

@ -20,7 +20,6 @@ use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Module\InstallerAbstract;
use phpOMS\Module\ModuleInfo;
use phpOMS\Uri\HttpUri;
/**
* Installer class.
@ -47,8 +46,6 @@ final class Installer extends InstallerAbstract
{
parent::install($app, $info, $cfgHandler);
\Modules\Admin\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Install/Admin.install.json']);
/* Attributes */
$fileContent = \file_get_contents(__DIR__ . '/Install/attributes.json');
if ($fileContent === false) {
@ -64,6 +61,16 @@ final class Installer extends InstallerAbstract
$attrTypes = self::createClientAttributeTypes($app, $attributes);
$attrValues = self::createClientAttributeValues($app, $attrTypes, $attributes);
$data = \json_decode(\file_get_contents(__DIR__ . '/Install/Admin.install.json'), true);
$content = \json_decode($data[0]['content'], true);
foreach ($content as $type => $_) {
$content[$type] = \reset($attrValues[$type])['id'];
}
$data[0]['content'] = \json_encode($content);
\Modules\Admin\Admin\Installer::createSettings($app, $data[0]);
/* Localizations */
$fileContent = \file_get_contents(__DIR__ . '/Install/localizations.json');
if ($fileContent === false) {
@ -99,7 +106,7 @@ final class Installer extends InstallerAbstract
foreach ($l11ns as $l11n) {
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('title', $l11n['name']);
@ -141,13 +148,15 @@ final class Installer extends InstallerAbstract
/** @var array $attribute */
foreach ($attributes as $attribute) {
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('name', $attribute['name'] ?? '');
$request->setData('title', \reset($attribute['l11n']));
$request->setData('language', \array_keys($attribute['l11n'])[0] ?? 'en');
$request->setData('is_required', $attribute['is_required'] ?? false);
$request->setData('repeatable', $attribute['repeatable'] ?? false);
$request->setData('internal', $attribute['internal'] ?? false);
$request->setData('custom', $attribute['is_custom_allowed'] ?? false);
$request->setData('validation_pattern', $attribute['validation_pattern'] ?? '');
$request->setData('datatype', (int) $attribute['value_type']);
@ -171,7 +180,7 @@ final class Installer extends InstallerAbstract
}
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('title', $l11n);
@ -210,7 +219,7 @@ final class Installer extends InstallerAbstract
/** @var array $value */
foreach ($attribute['values'] as $value) {
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('value', $value['value'] ?? '');
@ -244,7 +253,7 @@ final class Installer extends InstallerAbstract
}
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('title', $l11n);

2
Admin/Routes/Web/Api.php
View File

@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/client/find.*$' => [
'^.*/client/find(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\ApiController:apiClientFind',
'verb' => RouteVerb::GET,

14
Admin/Routes/Web/Backend.php
View File

@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/sales/client/attribute/type/list.*$' => [
'^.*/sales/client/attribute/type/list(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementAttributeTypeList',
'verb' => RouteVerb::GET,
@ -29,7 +29,7 @@ return [
],
],
],
'^.*/sales/client/attribute/type\?.*$' => [
'^.*/sales/client/attribute/type(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementAttributeType',
'verb' => RouteVerb::GET,
@ -40,7 +40,7 @@ return [
],
],
],
'^.*/sales/client/list.*$' => [
'^.*/sales/client/list(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientList',
'verb' => RouteVerb::GET,
@ -51,7 +51,7 @@ return [
],
],
],
'^.*/sales/client/create.*$' => [
'^.*/sales/client/create(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientCreate',
'verb' => RouteVerb::GET,
@ -62,9 +62,9 @@ return [
],
],
],
'^.*/sales/client/profile.*$' => [
'^.*/sales/client/view(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientProfile',
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientView',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::NAME,
@ -73,7 +73,7 @@ return [
],
],
],
'^.*/sales/client/analysis.*$' => [
'^.*/sales/client/analysis(\?.*$|$)' => [
[
'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientAnalysis',
'verb' => RouteVerb::GET,

16
Controller/ApiAttributeController.php
View File

@ -61,12 +61,15 @@ final class ApiAttributeController extends Controller
return;
}
$type = ClientAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute();
$type = $data['type'] ?? ClientAttributeTypeMapper::get()
->with('defaults')
->where('id', (int) $request->getData('type'))
->execute();
if (!$type->repeatable) {
$attr = ClientAttributeMapper::count()
->with('type')
->where('type/id', (int) $request->getData('type'))
->where('type/id', $type->id)
->where('ref', (int) $request->getData('ref'))
->execute();
@ -164,13 +167,20 @@ final class ApiAttributeController extends Controller
->where('id', $request->getDataInt('type') ?? 0)
->execute();
if ($type->isInternal) {
$response->header->status = RequestStatusCode::R_403;
$this->createInvalidCreateResponse($request, $response, $val);
return;
}
$attrValue = $this->createAttributeValueFromRequest($request, $type);
$this->createModel($request->header->account, $attrValue, ClientAttributeValueMapper::class, 'attr_value', $request->getOrigin());
if ($attrValue->isDefault) {
$this->createModelRelation(
$request->header->account,
(int) $request->getData('type'),
$type->id,
$attrValue->id,
ClientAttributeTypeMapper::class, 'defaults', '', $request->getOrigin()
);

244
Controller/ApiController.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace Modules\ClientManagement\Controller;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\AddressMapper;
use Modules\Admin\Models\NullAccount;
use Modules\Auditor\Models\Audit;
@ -31,11 +32,10 @@ use Modules\Media\Models\PathSettings;
use Modules\Organization\Models\UnitMapper;
use phpOMS\Account\PermissionType;
use phpOMS\Api\EUVAT\EUVATVies;
use phpOMS\Api\Geocoding\Nominatim;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\BaseStringL11nType;
use phpOMS\Localization\ISO3166CharEnum;
use phpOMS\Localization\ISO3166TwoEnum;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\NullBaseStringL11nType;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
@ -44,8 +44,6 @@ use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\Stdlib\Base\Address;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\StringUtils;
/**
@ -68,7 +66,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function findClientForAccount(int $account, int $unit = null) : ?Client
public function findClientForAccount(int $account, ?int $unit = null) : ?Client
{
$clientMapper = ClientMapper::get()
->where('account', $account);
@ -83,6 +81,90 @@ final class ApiController extends Controller
return $client->id === 0 ? null : $client;
}
public function setVAT(RequestAbstract $request, Client $client) : void
{
/** @var \Modules\Attribute\Models\AttributeType $type */
$type = ClientAttributeTypeMapper::get()->with('defaults')->where('name', 'vat_id')->execute();
$internalRequest = new HttpRequest();
$internalResponse = new HttpResponse();
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('ref', $client->id);
$internalRequest->setData('type', $type->id);
$internalRequest->setData('value', $request->getDataString('vat_id'));
$this->app->moduleManager->get('ClientManagement', 'ApiAttribute')
->apiClientAttributeCreate($internalRequest, $internalResponse);
}
public function validateVAT(RequestAbstract $request, Client $client) : array
{
/** @var \Modules\Organization\Models\Unit $unit */
$unit = UnitMapper::get()
->with('attributes')
->where('id', $this->app->unitId)
->execute();
$validate = ['status' => -1];
if (\in_array($client->mainAddress->country, ISO3166CharEnum::getRegion('eu'))) {
$validate = EUVATVies::validateQualified(
$request->getDataString('vat_id') ?? '',
$unit->getAttribute('vat_id')->value->valueStr ?? '',
$client->account->name1,
$client->mainAddress->city,
$client->mainAddress->postal,
$client->mainAddress->address
);
}
$audit = new Audit(
new NullAccount($request->header->account),
null,
(string) ($validate['status'] ?? ''),
StringUtils::intHash(EUVATVies::class),
'vat_validation',
self::NAME,
(string) $client->id,
(string) \json_encode($validate),
(int) \ip2long($request->getOrigin())
);
AuditMapper::create()->execute($audit);
return $validate;
}
public function defineTaxCode(RequestAbstract $request, Client $client) : void
{
/** @var \Modules\Organization\Models\Unit $unit */
$unit = UnitMapper::get()
->with('mainAddress')
->where('id', $this->app->unitId)
->execute();
/** @var \Modules\Attribute\Models\AttributeType $type */
$type = ClientAttributeTypeMapper::get()
->with('defaults')
->where('name', 'sales_tax_code')
->execute();
$value = $this->app->moduleManager->get('Billing', 'ApiTax')
->getClientTaxCode($client, $unit->mainAddress);
$internalRequest = new HttpRequest();
$internalResponse = new HttpResponse();
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('ref', $client->id);
$internalRequest->setData('type', $type->id);
$internalRequest->setData('value_id', $value->id);
$this->app->moduleManager->get('ClientManagement', 'ApiAttribute')
->apiClientAttributeCreate($internalRequest, $internalResponse, ['type' => $type]);
}
/**
* Api method to create news article
*
@ -107,42 +189,32 @@ final class ApiController extends Controller
$client = $this->createClientFromRequest($request);
$this->createModel($request->header->account, $client, ClientMapper::class, 'client', $request->getOrigin());
// Set VAT Id
// @todo move to separate function
if ($request->hasData('vat_id')) {
/** @var \Modules\Organization\Models\Unit $unit */
$unit = UnitMapper::get()
->with('attributes')
->where('id', $this->app->unitId)
->execute();
$validate = ['status' => -1];
if (\in_array($client->mainAddress->getCountry(), ISO3166CharEnum::getRegion('eu'))) {
$validate = EUVATVies::validateQualified(
$request->getDataString('vat_id') ?? '',
$unit->getAttribute('vat_id')->value->valueStr ?? '',
$client->account->name1,
$client->mainAddress->city,
$client->mainAddress->postal,
$client->mainAddress->address
$this->createModelRelation(
$client->account->id,
$client->account->id,
[$client->mainAddress->id],
AccountMapper::class,
'addresses',
'account',
$request->getOrigin()
);
// Create stock
if ($this->app->moduleManager->isActive('WarehouseManagement')) {
$internalResponse = new HttpResponse();
$internalRequest = new HttpRequest($request->uri);
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('name', $client->number);
$internalRequest->setData('client', $client->id);
$this->app->moduleManager->get('WarehouseManagement', 'Api')
->apiStockCreate($internalRequest, $internalResponse);
}
$audit = new Audit(
new NullAccount($request->header->account),
null,
(string) ($validate['status'] ?? ''),
StringUtils::intHash(EUVATVies::class),
'vat_validation',
self::NAME,
(string) $client->id,
(string) \json_encode($validate),
(int) \ip2long($request->getOrigin())
);
AuditMapper::create()->execute($audit);
// Set VAT Id
if ($request->hasData('vat_id')) {
$validate = $this->validateVAT($request, $client);
if (($validate['status'] === 0
&& $validate['vat'] === 'A'
@ -150,48 +222,13 @@ final class ApiController extends Controller
&& $validate['city'] === 'A')
|| $validate['status'] !== 0 // Api out of order -> accept it -> test it during invoice creation
) {
/** @var \Modules\Attribute\Models\AttributeType $type */
$type = ClientAttributeTypeMapper::get()->with('defaults')->where('name', 'vat_id')->execute();
$internalRequest = new HttpRequest(new HttpUri(''));
$internalResponse = new HttpResponse();
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('ref', $client->id);
$internalRequest->setData('type', $type->id);
$internalRequest->setData('value', $request->getDataString('vat_id'));
$this->app->moduleManager->get('ClientManagement', 'ApiAttribute')
->apiClientAttributeCreate($internalRequest, $internalResponse);
$this->setVAT($request, $client);
}
}
// Find tax code
// Find and set tax code
if ($this->app->moduleManager->isActive('Billing')) {
/** @var \Modules\Organization\Models\Unit $unit */
$unit = UnitMapper::get()
->with('mainAddress')
->where('id', $this->app->unitId)
->execute();
/** @var \Modules\Attribute\Models\AttributeType $type */
$type = ClientAttributeTypeMapper::get()
->where('name', 'sales_tax_code')
->execute();
$value = $this->app->moduleManager->get('Billing', 'ApiTax')
->getClientTaxCode($client, $unit->mainAddress);
$internalRequest = new HttpRequest(new HttpUri(''));
$internalResponse = new HttpResponse();
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('ref', $client->id);
$internalRequest->setData('type', $type->id);
$internalRequest->setData('value', $value->id);
$this->app->moduleManager->get('ClientManagement', 'ApiAttribute')
->apiClientAttributeCreate($internalRequest, $internalResponse);
$this->defineTaxCode($request, $client);
}
$this->createClientSegmentation($request, $response, $client);
@ -209,13 +246,13 @@ final class ApiController extends Controller
return;
}
$types = ClientAttributeTypeMapper::get()
$types = ClientAttributeTypeMapper::getAll()
->where('name', \array_keys($segmentation), 'IN')
->execute();
foreach ($types as $type) {
$internalResponse = clone $response;
$internalRequest = new HttpRequest(new HttpUri(''));
$internalRequest = new HttpRequest();
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('ref', $client->id);
@ -251,23 +288,8 @@ final class ApiController extends Controller
$client->account = $account;
$client->unit = $request->getDataInt('unit') ?? 1;
// Handle main address
$addr = new Address();
$addr->address = $request->getDataString('address') ?? '';
$addr->postal = $request->getDataString('postal') ?? '';
$addr->city = $request->getDataString('city') ?? '';
$addr->state = $request->getDataString('state') ?? '';
$addr->setCountry($request->getDataString('country') ?? ISO3166TwoEnum::_XXX);
$client->mainAddress = $addr;
// Try to find lat/lon through external API
$geocoding = Nominatim::geocoding($addr->country, $addr->city, $addr->address);
if ($geocoding === ['lat' => 0.0, 'lon' => 0.0]) {
$geocoding = Nominatim::geocoding($addr->country, $addr->city);
}
$client->mainAddress->lat = $geocoding['lat'];
$client->mainAddress->lon = $geocoding['lon'];
$request->setData('name', null, true);
$client->mainAddress = $this->app->moduleManager->get('Admin', 'Api')->createAddressFromRequest($request);
return $client;
}
@ -315,7 +337,7 @@ final class ApiController extends Controller
return;
}
$clientMapper = $client = ClientMapper::get()
$clientMapper = ClientMapper::get()
->with('mainAddress');
if ($request->hasData('account')) {
@ -332,8 +354,8 @@ final class ApiController extends Controller
$client = $clientMapper->execute();
$old = $client->mainAddress;
$new = $this->app->moduleManager->get('Admin', 'Api')->updateAddressFromRequest($request, clone $old);
$new = $this->updateMainAddressFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, AddressMapper::class, 'address', $request->getOrigin());
$this->createStandardUpdateResponse($request, $response, $new);
}
@ -358,30 +380,6 @@ final class ApiController extends Controller
return [];
}
/**
* Method to update an account from a request
*
* @param RequestAbstract $request Request
* @param Address $address Address
*
* @return Address
*
* @since 1.0.0
*/
private function updateMainAddressFromRequest(RequestAbstract $request, Address $address) : Address
{
$address->name = $request->getDataString('name') ?? $address->name;
$address->fao = $request->getDataString('fao') ?? $address->fao;
$address->address = $request->getDataString('address') ?? $address->address;
$address->addressAddition = $request->getDataString('addition') ?? $address->addressAddition;
$address->postal = $request->getDataString('postal') ?? $address->postal;
$address->city = $request->getDataString('city') ?? $address->city;
$address->state = $request->getDataString('state') ?? $address->state;
$address->setCountry($request->getDataString('country') ?? $address->getCountry());
return $address;
}
/**
* Api method to create client l11n
*
@ -423,9 +421,7 @@ final class ApiController extends Controller
$clientL11n = new BaseStringL11n();
$clientL11n->ref = $request->getDataInt('client') ?? 0;
$clientL11n->type = new NullBaseStringL11nType($request->getDataInt('type') ?? 0);
$clientL11n->setLanguage(
$request->getDataString('language') ?? $request->header->l11n->language
);
$clientL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$clientL11n->content = $request->getDataString('description') ?? '';
return $clientL11n;

82
Controller/BackendController.php
View File

@ -14,13 +14,7 @@ declare(strict_types=1);
namespace Modules\ClientManagement\Controller;
use Modules\Admin\Models\LocalizationMapper;
use Modules\Admin\Models\SettingsEnum;
use Modules\Auditor\Models\AuditMapper;
use Modules\Billing\Models\Price\PriceMapper;
use Modules\Billing\Models\Price\PriceType;
use Modules\Billing\Models\SalesBillMapper;
use Modules\ClientManagement\Models\Attribute\ClientAttributeMapper;
use Modules\ClientManagement\Models\Attribute\ClientAttributeTypeL11nMapper;
use Modules\ClientManagement\Models\Attribute\ClientAttributeTypeMapper;
use Modules\ClientManagement\Models\Attribute\ClientAttributeValueL11nMapper;
@ -36,10 +30,8 @@ use phpOMS\Contract\RenderableInterface;
use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\DataStorage\Database\Query\OrderType;
use phpOMS\DataStorage\Database\Query\Where;
use phpOMS\Localization\Money;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Stdlib\Base\SmartDateTime;
use phpOMS\Utils\StringUtils;
use phpOMS\Views\View;
@ -210,7 +202,7 @@ final class BackendController extends Controller
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewClientManagementClientProfile(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
public function viewClientManagementClientView(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$head = $response->data['Content']->head;
$nonce = $this->app->appSettings->getOption('script-nonce');
@ -221,13 +213,21 @@ final class BackendController extends Controller
$head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']);
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-profile');
$view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-view');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response);
/** @var \Modules\ClientManagement\Models\Client $client */
$client = ClientMapper::get()
$pkType = 'id';
$pkValue = $request->getDataInt('id');
if ($pkValue === null) {
$pkType = 'number';
$pkValue = $request->getDataString('number');
}
/** @var \Modules\ClientManagement\Models\Client */
$view->data['client'] = ClientMapper::get()
->with('account')
->with('contactElements')
->with('account/addresses')
->with('account/contacts')
->with('mainAddress')
->with('files')->limit(5, 'files')->sort('files/id', OrderType::DESC)
->with('notes')->limit(5, 'notes')->sort('notes/id', OrderType::DESC)
@ -236,8 +236,10 @@ final class BackendController extends Controller
->with('attributes/type/l11n')
->with('attributes/value')
//->with('attributes/value/l11n')
->where('id', (int) $request->getData('id'))
//->with('attributes/value/l11n')
->where($pkType, $pkValue)
->where('attributes/type/l11n/language', $response->header->l11n->language)
//->where('attributes/value/l11n/language', $response->header->l11n->language)
/*
->where('attributes/value/l11n', (new Where($this->app->dbPool->get()))
->where(ClientAttributeValueL11nMapper::getColumnByMember('ref'), '=', null)
@ -245,22 +247,15 @@ final class BackendController extends Controller
*/
->execute();
$view->data['client'] = $client;
/** @var \Model\Setting $settings */
$settings = $this->app->appSettings->get(null, SettingsEnum::DEFAULT_LOCALIZATION);
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
$view->data['attributeView']->data['default_localization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
$view->data['attributeView']->data['default_localization'] = $this->app->l11nServer;
/** @var \Modules\Attribute\Models\AttributeType[] $attributeTypes */
$attributeTypes = ClientAttributeTypeMapper::getAll()
/** @var \Modules\Attribute\Models\AttributeType[] */
$view->data['attributeTypes'] = ClientAttributeTypeMapper::getAll()
->with('l11n')
->where('l11n/language', $response->header->l11n->language)
->execute();
$view->data['attributeTypes'] = $attributeTypes;
// Get item profile image
// It might not be part of the 5 newest item files from above
// @todo It would be nice to have something like this as a default method in the model e.g.
@ -277,17 +272,15 @@ final class BackendController extends Controller
->on(MediaMapper::TABLE . '.' . MediaMapper::PRIMARYFIELD, '=', MediaMapper::HAS_MANY['types']['table'] . '.' . MediaMapper::HAS_MANY['types']['self'])
->leftJoin(MediaTypeMapper::TABLE)
->on(MediaMapper::HAS_MANY['types']['table'] . '.' . MediaMapper::HAS_MANY['types']['external'], '=', MediaTypeMapper::TABLE . '.' . MediaTypeMapper::PRIMARYFIELD)
->where(ClientMapper::HAS_MANY['files']['self'], '=', $client->id)
->where(ClientMapper::HAS_MANY['files']['self'], '=', $view->data['client']->id)
->where(MediaTypeMapper::TABLE . '.' . MediaTypeMapper::getColumnByMember('name'), '=', 'client_profile_image');
$clientImage = MediaMapper::get()
$view->data['clientImage'] = MediaMapper::get()
->with('types')
->where('id', $results)
->limit(1)
->execute();
$view->data['clientImage'] = $clientImage;
$businessStart = UnitAttributeMapper::get()
->with('type')
->with('value')
@ -297,13 +290,15 @@ final class BackendController extends Controller
$view->data['business_start'] = $businessStart->id === 0 ? 1 : $businessStart->value->getValue();
/** @var \Modules\Billing\Models\Price\Price[] $prices */
$prices = PriceMapper::getAll()
->where('client', $client->id)
->where('type', PriceType::SALES)
->execute();
$view->data['hasBilling'] = $this->app->moduleManager->isActive('Billing');
$view->data['prices'] = $prices;
/** @var \Modules\Billing\Models\Price\Price[] */
$view->data['prices'] = $view->data['hasBilling']
? \Modules\Billing\Models\Price\PriceMapper::getAll()
->where('client', $view->data['client']->id)
->where('type', \Modules\Billing\Models\Price\PriceType::SALES)
->execute()
: [];
$tmp = ItemAttributeTypeMapper::getAll()
->with('defaults')
@ -343,30 +338,27 @@ final class BackendController extends Controller
$view->data['clientSegmentationTypes'] = $clientSegmentationTypes;
/** @var \Modules\Auditor\Models\Audit[] $audits */
$audits = AuditMapper::getAll()
/** @var \Modules\Auditor\Models\Audit[] */
$view->data['audits'] = AuditMapper::getAll()
->where('type', StringUtils::intHash(ClientMapper::class))
->where('module', 'ClientManagement')
->where('ref', (string) $client->id)
->where('ref', (string) $view->data['client']->id)
->execute();
// @todo join audit with files, attributes, localization, prices, notes, ...
$view->data['audits'] = $audits;
/** @var \Modules\Media\Models\Media[] $files */
$files = MediaMapper::getAll()
/** @var \Modules\Media\Models\Media[] */
$view->data['files'] = MediaMapper::getAll()
->with('types')
->join('id', ClientMapper::class, 'files') // id = media id, files = client relations
->on('id', $client->id, relation: 'files') // id = item id
->on('id', $view->data['client']->id, relation: 'files') // id = item id
->execute();
$view->data['files'] = $files;
$view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$view->data['note'] = new \Modules\Editor\Theme\Backend\Components\Note\BaseView($this->app->l11nManager, $request, $response);
$view->data['hasBilling'] = $this->app->moduleManager->isActive('Billing');
$view->data['address-component'] = new \Modules\Admin\Theme\Backend\Components\AddressEditor\AddressView($this->app->l11nManager, $request, $response);
$view->data['contact-component'] = new \Modules\Admin\Theme\Backend\Components\ContactEditor\ContactView($this->app->l11nManager, $request, $response);
return $view;
}

131
Models/Client.php
View File

@ -17,8 +17,6 @@ namespace Modules\ClientManagement\Models;
use Modules\Admin\Models\Account;
use Modules\Editor\Models\EditorDoc;
use Modules\Payment\Models\Payment;
use Modules\Profile\Models\ContactElement;
use Modules\Profile\Models\NullContactElement;
use Modules\Profile\Models\Profile;
use phpOMS\Stdlib\Base\Address;
use phpOMS\Stdlib\Base\NullAddress;
@ -189,70 +187,6 @@ class Client
$this->mainAddress = new NullAddress();
}
/**
* Get id.
*
* @return int Model id
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get status.
*
* @return int
*
* @since 1.0.0
*/
public function getStatus() : int
{
return $this->status;
}
/**
* Set status.
*
* @param int $status Status
*
* @return void
*
* @since 1.0.0
*/
public function setStatus(int $status) : void
{
$this->status = $status;
}
/**
* Get type.
*
* @return int
*
* @since 1.0.0
*/
public function getType() : int
{
return $this->type;
}
/**
* Set type.
*
* @param int $type Type
*
* @return void
*
* @since 1.0.0
*/
public function setType(int $type) : void
{
$this->type = $type;
}
/**
* Add doc to item
*
@ -343,7 +277,7 @@ class Client
$payments = [];
foreach ($this->payments as $payment) {
if ($payment->getType() === $type) {
if ($payment->type === $type) {
$payments[] = $payment;
}
}
@ -351,69 +285,6 @@ class Client
return $payments;
}
/**
* Get contacts.
*
* @return array
*
* @since 1.0.0
*/
public function getContactElements() : array
{
return $this->contactElements;
}
/**
* Order contact elements
*
* @param ContactElement $a Element
* @param ContactElement $b Element
*
* @return int
*
* @since 1.0.0
*/
private function orderContactElements(ContactElement $a, ContactElement $b) : int
{
return $a->order <=> $b->order;
}
/**
* Get the main contact element by type
*
* @param int $type Contact element type
*
* @return ContactElement
*
* @since 1.0.0
*/
public function getMainContactElement(int $type) : ContactElement
{
\uasort($this->contactElements, [$this, 'orderContactElements']);
foreach ($this->contactElements as $element) {
if ($element->getType() === $type) {
return $element;
}
}
return new NullContactElement();
}
/**
* Add contact element
*
* @param int|ContactElement $element Contact element
*
* @return void
*
* @since 1.0.0
*/
public function addContactElement($element) : void
{
$this->contactElements[] = $element;
}
/**
* {@inheritdoc}
*/

9
Models/ClientMapper.php
View File

@ -20,10 +20,7 @@ use Modules\ClientManagement\Models\Attribute\ClientAttributeMapper;
use Modules\Editor\Models\EditorDocMapper;
use Modules\Media\Models\MediaMapper;
use Modules\Payment\Models\PaymentMapper;
use Modules\Profile\Models\ContactElementMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\Stdlib\Base\FloatInt;
/**
* Client mapper class.
@ -117,12 +114,6 @@ final class ClientMapper extends DataMapperFactory
'external' => 'clientmgmt_client_note_dst',
'self' => 'clientmgmt_client_note_src',
],
'contactElements' => [
'mapper' => ContactElementMapper::class,
'table' => 'clientmgmt_client_contactelement',
'external' => 'clientmgmt_client_contactelement_dst',
'self' => 'clientmgmt_client_contactelement_src',
],
'payments' => [
'mapper' => PaymentMapper::class,
'table' => 'clientmgmt_client_payment',

6
Theme/Backend/Lang/en.lang.php
View File

@ -13,13 +13,14 @@
declare(strict_types=1);
return ['ClientManagement' => [
'Account' => 'Account',
'Accounting' => 'Accounting',
'Addition' => 'Addition',
'Address' => 'Address',
'Bill' => 'Bill',
'Addresses' => 'Addresses',
'AreaManager' => 'Area Manager',
'Articlegroup' => 'Articlegroup',
'Articlegroup' => 'Article group',
'AttributeTypes' => 'Attribute Types',
'Balance' => 'Balance',
'Bills' => 'Bills',
@ -31,6 +32,7 @@ return ['ClientManagement' => [
'Contact' => 'Contact',
'Country' => 'Country',
'Created' => 'Created',
'CreateBill' => 'Create Bill',
'CreatedAt' => 'Created at',
'Creditcard' => 'Creditcard',
'DSO' => 'DSO',
@ -72,7 +74,7 @@ return ['ClientManagement' => [
'Postal' => 'Postal',
'Price' => 'Price',
'Prices' => 'Prices',
'Productgroup' => 'Productgroup',
'Productgroup' => 'Product group',
'Profile' => 'Profile',
'Purchase' => 'Purchase',
'Quantity' => 'Quantity',

2
Theme/Backend/attribute-type.tpl.php
View File

@ -86,7 +86,7 @@ echo $this->data['nav']->render(); ?>
<tr>
<td><a href="#"><i class="g-icon">close</i></a>
<td><a href="#"><i class="g-icon">settings</i></a>
<td><?= ISO639Enum::getByName('_' . \strtoupper($value->getLanguage())); ?>
<td><?= ISO639Enum::getByName('_' . \strtoupper($value->language)); ?>
<td><?= $value->content; ?>
<?php endforeach; ?>
<?php if ($c === 0) : ?>

4
Theme/Backend/client-list.tpl.php
View File

@ -102,7 +102,7 @@ echo $this->data['nav']->render(); ?>
<tbody>
<?php $count = 0;
foreach ($clients as $key => $value) : ++$count;
$url = UriFactory::build('{/base}/sales/client/profile?{?}&id=' . $value->id);
$url = UriFactory::build('{/base}/sales/client/view?{?}&id=' . $value->id);
?>
<tr data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->number); ?></a>
@ -110,7 +110,7 @@ echo $this->data['nav']->render(); ?>
<td data-label="<?= $this->getHtml('City'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->mainAddress->city); ?></a>
<td data-label="<?= $this->getHtml('Zip'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->mainAddress->postal); ?></a>
<td data-label="<?= $this->getHtml('Address'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->mainAddress->address); ?></a>
<td data-label="<?= $this->getHtml('Country'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->mainAddress->getCountry()); ?></a>
<td data-label="<?= $this->getHtml('Country'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->mainAddress->country); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

170
Theme/Backend/client-profile.tpl.php → Theme/Backend/client-view.tpl.php Executable file → Normal file
View File

@ -28,23 +28,16 @@ use phpOMS\Stdlib\Base\SmartDateTime;
use phpOMS\Uri\UriFactory;
$countryCodes = ISO3166TwoEnum::getConstants();
$regions = RegionEnum::getConstants();
$countries = ISO3166CharEnum::getConstants();
$currencies = ISO4217CharEnum::getConstants();
$languages = ISO639Enum::getConstants();
/**
* @var \Modules\ClientManagement\Models\Client $client
*/
$client = $this->data['client'];
$notes = $client->notes;
$files = $client->files;
$clientImage = $this->getData('clientImage') ?? new NullMedia();
$attributeView = $this->data['attributeView'];
$languages = ISO639Enum::getConstants();
$clientImage = $this->data['clientImage'] ?? new NullMedia();
/**
* @var \phpOMS\Views\View $this
@ -74,7 +67,7 @@ echo $this->data['nav']->render();
<div class="col-xs-12 col-lg-3 last-lg">
<div class="box">
<?php if(true) : ?>
<a class="button" href="<?= UriFactory::build('{/base}/sales/bill/create?client=' . $client->id); ?>"><?= $this->getHtml('CreateBill', 'Billing'); ?></a>
<a class="button" href="<?= UriFactory::build('{/base}/sales/bill/create?client=' . $client->id); ?>"><?= $this->getHtml('CreateBill'); ?></a>
<?php endif; ?>
<?php if (false) : ?>
<a class="button"><?= $this->getHtml('ViewAccount', 'Accounting'); ?></a>
@ -86,7 +79,7 @@ echo $this->data['nav']->render();
<div class="portlet-body">
<div class="form-group">
<label for="iId"><?= $this->getHtml('ID', '0', '0'); ?></label>
<span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="number" id="iId" min="1" name="id" value="<?= $this->printHtml($client->number); ?>" disabled></span>
<span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" id="iId" min="1" name="id" value="<?= $this->printHtml($client->number); ?>" disabled></span>
</div>
<div class="form-group">
@ -118,17 +111,17 @@ echo $this->data['nav']->render();
<div class="portlet-body">
<div class="form-group">
<label for="iPhone"><?= $this->getHtml('Phone'); ?></label>
<input type="text" id="iPhone" name="name1" value="<?= $this->printHtml($client->getMainContactElement(ContactType::PHONE)->content); ?>">
<input type="text" id="iPhone" name="name1" value="<?= $this->printHtml($client->account->getContactByType(ContactType::PHONE)->content); ?>">
</div>
<div class="form-group">
<label for="iEmail"><?= $this->getHtml('Email'); ?></label>
<input type="text" id="iEmail" name="name1" value="<?= $this->printHtml($client->getMainContactElement(ContactType::EMAIL)->content); ?>">
<input type="text" id="iEmail" name="name1" value="<?= $this->printHtml($client->account->getContactByType(ContactType::EMAIL)->content); ?>">
</div>
<div class="form-group">
<label for="iWebsite"><?= $this->getHtml('Website'); ?></label>
<input type="text" id="iWebsite" name="name1" value="<?= $this->printHtml($client->getMainContactElement(ContactType::WEBSITE)->content); ?>">
<input type="text" id="iWebsite" name="name1" value="<?= $this->printHtml($client->account->getContactByType(ContactType::WEBSITE)->content); ?>">
</div>
</div>
</section>
@ -191,7 +184,7 @@ echo $this->data['nav']->render();
<label for="iCountry"><?= $this->getHtml('Country'); ?></label>
<select id="iCountry" name="country">
<?php foreach ($countryCodes as $code3 => $code2) : ?>
<option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $client->mainAddress->getCountry() ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
<option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $client->mainAddress->country ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
<?php endforeach; ?>
</select>
</div>
@ -219,7 +212,7 @@ echo $this->data['nav']->render();
</section>
</div>
<div class="col-xs-12 col-lg-9 plain-grid">
<?php if (!empty($notes) && ($warning = $client->getEditorDocByTypeName('client_backend_warning'))->id !== 0) : ?>
<?php if (!empty($client->notes) && ($warning = $client->getEditorDocByTypeName('client_backend_warning'))->id !== 0) : ?>
<!-- If note warning exists -->
<div class="row">
<div class="col-xs-12">
@ -290,13 +283,19 @@ echo $this->data['nav']->render();
<td class="wf-100"><?= $this->getHtml('Title'); ?>
<td><?= $this->getHtml('CreatedAt'); ?>
<tbody>
<?php foreach ($notes as $note) :
$url = UriFactory::build('{/base}/editor/single?{?}&id=' . $note->id);
<?php
$count = 0;
foreach ($client->notes as $note) :
++$count;
$url = UriFactory::build('{/base}/editor/view?{?}&id=' . $note->id);
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $note->title; ?></a>
<td><a href="<?= $url; ?>"><?= $note->createdAt->format('Y-m-d'); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>
</table>
</div>
</section>
@ -313,14 +312,20 @@ echo $this->data['nav']->render();
<td>
<td><?= $this->getHtml('CreatedAt'); ?>
<tbody>
<?php foreach ($files as $file) :
$url = UriFactory::build('{/base}/media/single?{?}&id=' . $file->id);
<?php
$count = 0;
foreach ($client->files as $file) :
++$count;
$url = UriFactory::build('{/base}/media/view?{?}&id=' . $file->id);
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $file->name; ?></a>
<td><a href="<?= $url; ?>"><?= $file->extension; ?></a>
<td><a href="<?= $url; ?>"><?= $file->createdAt->format('Y-m-d'); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>
</table>
</div>
</section>
@ -332,6 +337,7 @@ echo $this->data['nav']->render();
<div class="col-xs-12">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('RecentInvoices'); ?></div>
<div class="slider">
<table id="iSalesItemList" class="default sticky">
<thead>
<tr>
@ -352,18 +358,25 @@ echo $this->data['nav']->render();
->limit(5)
->execute();
$count = 0;
/** @var \Modules\Billing\Models\Bill $invoice */
foreach ($newestInvoices as $invoice) :
++$count;
$url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->id);
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $invoice->getNumber(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->type->getL11n(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->billTo; ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($invoice->netSales); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($invoice->netSales, symbol: ''); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->createdAt->format('Y-m-d'); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>
</table>
</div>
</section>
</div>
</div>
@ -404,7 +417,7 @@ echo $this->data['nav']->render();
<?php
$temp = [];
foreach ($monthlySalesCosts as $monthly) {
$temp[] = \round(((((int) $monthly['net_sales']) - ((int) $monthly['net_costs'])) / ((int) $monthly['net_sales'])) * 100, 2);
$temp[] = \round(((int) $monthly['net_sales']) === 0 ? 0 : ((((int) $monthly['net_sales']) - ((int) $monthly['net_costs'])) / ((int) $monthly['net_sales'])) * 100, 2);
}
?>
<?= \implode(',', $temp); ?>
@ -468,71 +481,13 @@ echo $this->data['nav']->render();
</div>
</div>
</div>
<input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="col-xs-12 col-md-6 col-lg-4">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Address'); ?></div>
<div class="portlet-body">
<form>
<table class="layout wf-100">
<tr><td><label for="iAType"><?= $this->getHtml('Type'); ?></label>
<tr><td><select id="iAType" name="atype">
<option><?= $this->getHtml('Default'); ?>
<option><?= $this->getHtml('Delivery'); ?>
<option><?= $this->getHtml('Invoice'); ?>
</select>
<tr><td><label for="iAddress"><?= $this->getHtml('Address'); ?></label>
<tr><td><input type="text" id="iAddress" name="address">
<tr><td><label for="iZip"><?= $this->getHtml('Zip'); ?></label>
<tr><td><input type="text" id="iZip" name="zip">
<tr><td><label for="iCountry"><?= $this->getHtml('Country'); ?></label>
<tr><td><input type="text" id="iCountry" name="country">
<tr><td><label for="iAInfo"><?= $this->getHtml('Info'); ?></label>
<tr><td><input type="text" id="iAInfo" name="ainfo">
<tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getHtml('IsDefault'); ?></label></span>
<tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
</table>
</form>
</div>
</section>
</div>
<?= $this->data['contact-component']->render('client-contact', 'contacts', $client->account->contacts); ?>
<?= $this->data['address-component']->render('client-address', 'addresses', $client->account->addresses); ?>
</div>
<div class="row">
<div class="col-xs-12 col-md-6 col-lg-4">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Contact'); ?></div>
<div class="portlet-body">
<form>
<table class="layout wf-100">
<tr><td><label for="iCType"><?= $this->getHtml('Type'); ?></label>
<tr><td><select id="iCType" name="actype">
<option><?= $this->getHtml('Email'); ?>
<option><?= $this->getHtml('Fax'); ?>
<option><?= $this->getHtml('Phone'); ?>
</select>
<tr><td><label for="iCStype"><?= $this->getHtml('Subtype'); ?></label>
<tr><td><select id="iCStype" name="acstype">
<option><?= $this->getHtml('Office'); ?>
<option><?= $this->getHtml('Sales'); ?>
<option><?= $this->getHtml('Purchase'); ?>
<option><?= $this->getHtml('Accounting'); ?>
<option><?= $this->getHtml('Support'); ?>
</select>
<tr><td><label for="iCInfo"><?= $this->getHtml('Info'); ?></label>
<tr><td><input type="text" id="iCInfo" name="cinfo">
<tr><td><label for="iCData"><?= $this->getHtml('Contact'); ?></label>
<tr><td><input type="text" id="iCData" name="cdata">
<tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
</table>
</form>
</div>
</section>
</div>
</div>
</div>
<input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
@ -562,7 +517,7 @@ echo $this->data['nav']->render();
<div class="portlet-body">
<form>
<table class="layout wf-100">
<tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
<tr><td><label for="iSource"><?= $this->getHtml('ID', '0', '0'); ?></label>
<tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iSource" name="source" type="text" placeholder=""></span>
<tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
<tr><td><input id="iSegment" name="segment" type="text" placeholder="">
@ -616,7 +571,7 @@ echo $this->data['nav']->render();
<div class="fixed">
<select id="iPriceCurrency" name="currency" data-tpl-text="/currency" data-tpl-value="/currency">
<?php foreach ($currencies as $currency) : ?>
<option value="<?= $currency; ?>"<?= $attributeView->data['default_localization']->currency === $currency ? ' selected' : ''; ?>><?= $this->printHtml($currency); ?>
<option value="<?= $currency; ?>"<?= $this->data['attributeView']->data['default_localization']->currency === $currency ? ' selected' : ''; ?>><?= $this->printHtml($currency); ?>
<?php endforeach; ?>
</select>
</div>
@ -895,7 +850,7 @@ echo $this->data['nav']->render();
<tr data-id="<?= $value->id; ?>">
<td>
<i class="g-icon btn update-form">settings</i>
<?php if ($value->name !== 'base') : ?>
<?php if ($value->name !== 'default') : ?>
<input id="clientSalesPriceTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
<label for="clientSalesPriceTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
<span class="checked-visibility">
@ -906,12 +861,12 @@ echo $this->data['nav']->render();
<td data-tpl-text="/id" data-tpl-value="/id"><?= $value->id; ?>
<td data-tpl-text="/name" data-tpl-value="/name"><?= $this->printHtml($value->name); ?>
<td data-tpl-text="/promocode" data-tpl-value="/promocode"><?= $this->printHtml($value->promocode); ?>
<td data-tpl-text="/price" data-tpl-value="/price"><?= $this->printHtml($value->price->getAmount()); ?>
<td data-tpl-text="/price" data-tpl-value="/price"><?= $value->price->getAmount(); ?>
<td data-tpl-text="/currency" data-tpl-value="/currency"><?= $this->printHtml($value->currency); ?>
<td data-tpl-text="/quantity" data-tpl-value="/quantity"><?= $this->printHtml((string) $value->quantity); ?>
<td data-tpl-text="/discount" data-tpl-value="/discount"><?= $this->printHtml((string) $value->discount); ?>
<td data-tpl-text="/discountp" data-tpl-value="/discountp"><?= $this->printHtml((string) $value->discountPercentage); ?>
<td data-tpl-text="/bonus" data-tpl-value="/bonus"><?= $this->printHtml((string) $value->bonus); ?>
<td data-tpl-text="/quantity" data-tpl-value="/quantity"><?= $value->quantity->getAmount(); ?>
<td data-tpl-text="/discount" data-tpl-value="/discount"><?= $value->discount->getAmount(); ?>
<td data-tpl-text="/discountp" data-tpl-value="/discountp"><?= $this->getPercentage($value->discountPercentage->value / 10000 / 100); ?>
<td data-tpl-text="/bonus" data-tpl-value="/bonus"><?= $value->bonus->getAmount(); ?>
<td data-tpl-text="/item_item" data-tpl-value="/item_item"><?= $this->printHtml((string) $value->item); ?>
<td data-tpl-text="/item_segment" data-tpl-value="/item_segment"><?= $this->printHtml((string) $value->itemsegment->getL11n()); ?>
<td data-tpl-text="/item_section" data-tpl-value="/item_section"><?= $this->printHtml((string) $value->itemsection->getL11n()); ?>
@ -940,7 +895,7 @@ echo $this->data['nav']->render();
<input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<?= $attributeView->render(
<?= $this->data['attributeView']->render(
$client->attributes,
$this->data['attributeTypes'] ?? [],
$this->data['units'] ?? [],
@ -962,6 +917,7 @@ echo $this->data['nav']->render();
<div class="col-xs-12">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('RecentInvoices'); ?></div>
<div class="slider">
<table id="iSalesItemList" class="default sticky">
<thead>
<tr>
@ -974,18 +930,24 @@ echo $this->data['nav']->render();
<?php
$allInvoices = SalesBillMapper::getClientBills($client->id, SmartDateTime::startOfYear($this->data['business_start']), new SmartDateTime('now'));
$count = 0;
/** @var \Modules\Billing\Models\Bill $invoice */
foreach ($allInvoices as $invoice) :
++$count;
$url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->id);
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><?= $invoice->getNumber(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->type->getL11n(); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->billTo; ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($invoice->netSales); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($invoice->netSales, symbol: ''); ?></a>
<td><a href="<?= $url; ?>"><?= $invoice->createdAt->format('Y-m-d'); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>
</table>
</div>
</section>
</div>
</div>
@ -1011,7 +973,7 @@ echo $this->data['nav']->render();
<?php
$attr = $this->data['clientSegmentationTypes']['sales_tax_code'] ?? null;
foreach ($attr?->defaults ?? [] as $value) : ?>
<option value="<?= $value->id ?>"><?= $this->printHtml((string) $value->getValue()); ?>
<option value="<?= $value->id; ?>"><?= $this->printHtml((string) $value->getValue()); ?>
<?php endforeach; ?>
</select>
</div>
@ -1169,7 +1131,7 @@ echo $this->data['nav']->render();
}
++$count;
$url = UriFactory::build('{/base}/sales/item/profile?{?}&id=' . $value->id);
$url = UriFactory::build('{/base}/sales/item/view?{?}&id=' . $value->id);
?>
<tr data-href="<?= $url; ?>">
<td><label class="checkbox" for="iSalesItemSelect-<?= $key; ?>">
@ -1180,15 +1142,15 @@ echo $this->data['nav']->render();
<td><?= $this->printHtml($value->bill->getNumber()); ?>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->itemNumber); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->itemName); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml((string) $value->getQuantity()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->singleSalesPriceNet); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->singleDiscountP); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getPercentage($value->singleDiscountR?->toInt() ?? 0); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getNumeric($value->discountQ?->toInt() ?? 0); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->totalSalesPriceNet); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml((string) $value->quantity->getAmount()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->singleSalesPriceNet, symbol: ''); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->singleDiscountP, symbol: ''); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getPercentage($value->singleDiscountR?->value ?? 0); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getNumeric($value->discountQ?->value ?? 0); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->totalSalesPriceNet, symbol: ''); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<tr><td colspan="11" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>
</table>
</div>
@ -1207,7 +1169,7 @@ echo $this->data['nav']->render();
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="portlet-head"><?= $this->getHtml('Logs', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider">
<table class="default sticky">
<colgroup>
@ -1238,7 +1200,7 @@ echo $this->data['nav']->render();
$next = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \end($audits)->id . '&ptype=n#{\#}';
foreach ($audits as $key => $audit) : ++$count;
$url = UriFactory::build('{/base}/admin/audit/single?{?}&id=' . $audit->id); ?>
$url = UriFactory::build('{/base}/admin/audit/view?{?}&id=' . $audit->id); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><?= $audit->id; ?>
<td><?= $this->printHtml($audit->module); ?>

11
tests/Bootstrap.php
View File

@ -1,4 +1,15 @@
<?php
/**
* Jingga
*
* PHP Version 8.1
*
* @package Modules\ClientManagement\tests
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
\ini_set('memory_limit', '2048M');

23
tests/Controller/Api/ApiControllerAttributeTrait.php
View File

@ -19,7 +19,6 @@ use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Uri\HttpUri;
trait ApiControllerAttributeTrait
{
@ -30,7 +29,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeTypeCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('title', 'EN:1');
@ -48,7 +47,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeTypeL11nCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('title', 'DE:2');
@ -66,7 +65,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeValueIntCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('default', '1');
@ -86,7 +85,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeValueStrCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('value', '1');
@ -105,7 +104,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeValueFloatCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('value', '1.1');
@ -124,7 +123,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeValueDatCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('value', '2020-08-02');
@ -143,7 +142,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('ref', '1');
@ -161,7 +160,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeValueCreateInvalidData() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('invalid', '1');
@ -177,7 +176,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeTypeCreateInvalidData() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('invalid', '1');
@ -193,7 +192,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeTypeL11nCreateInvalidData() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('invalid', '1');
@ -209,7 +208,7 @@ trait ApiControllerAttributeTrait
public function testApiClientAttributeCreateInvalidData() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('invalid', '1');

13
tests/Controller/Api/ApiControllerClientTrait.php
View File

@ -19,7 +19,6 @@ use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\System\MimeType;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\TestUtils;
trait ApiControllerClientTrait
@ -42,7 +41,7 @@ trait ApiControllerClientTrait
public function testApiClientCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('number', '123456');
@ -65,7 +64,7 @@ trait ApiControllerClientTrait
public function testApiClientCreateInvalidData() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('invalid', '1');
@ -81,7 +80,7 @@ trait ApiControllerClientTrait
public function testApiClientProfileImageCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
\copy(__DIR__ . '/m_icon.png', __DIR__ . '/m_icon_tmp.png');
@ -112,7 +111,7 @@ trait ApiControllerClientTrait
public function testApiClientFileCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
\copy(__DIR__ . '/Test file.txt', __DIR__ . '/Test file_tmp.txt');
@ -142,7 +141,7 @@ trait ApiControllerClientTrait
public function testApiClientNoteCreate() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
@ -163,7 +162,7 @@ trait ApiControllerClientTrait
public function testApiFileCreateInvalidData() : void
{
$response = new HttpResponse();
$request = new HttpRequest(new HttpUri(''));
$request = new HttpRequest();
$request->header->account = 1;
$request->setData('invalid', '1');

45
tests/Models/ClientTest.php
View File

@ -17,7 +17,6 @@ namespace Modules\ClientManagement\tests\Models;
use Modules\ClientManagement\Models\Client;
use Modules\ClientManagement\Models\ClientStatus;
use Modules\Editor\Models\EditorDoc;
use Modules\Profile\Models\ContactElement;
/**
* @internal
@ -44,47 +43,13 @@ final class ClientTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->client->number);
self::assertEquals('', $this->client->numberReverse);
self::assertEquals('', $this->client->info);
self::assertEquals(ClientStatus::ACTIVE, $this->client->getStatus());
self::assertEquals(0, $this->client->getType());
self::assertEquals(ClientStatus::ACTIVE, $this->client->status);
self::assertEquals(0, $this->client->type);
self::assertEquals([], $this->client->getNotes());
self::assertEquals([], $this->client->files);
self::assertEquals([], $this->client->getAddresses());
self::assertEquals([], $this->client->getContactElements());
self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->client->createdAt->format('Y-m-d'));
self::assertInstanceOf('\Modules\Admin\Models\Account', $this->client->account);
self::assertInstanceOf('\Modules\Admin\Models\Address', $this->client->mainAddress);
self::assertInstanceOf('\Modules\Profile\Models\NullContactElement', $this->client->getMainContactElement(0));
}
/**
* @covers Modules\ClientManagement\Models\Client
* @group module
*/
public function testStatusInputOutput() : void
{
$this->client->setStatus(ClientStatus::INACTIVE);
self::assertEquals(ClientStatus::INACTIVE, $this->client->getStatus());
}
/**
* @covers Modules\ClientManagement\Models\Client
* @group module
*/
public function testTypeInputOutput() : void
{
$this->client->setType(2);
self::assertEquals(2, $this->client->getType());
}
/**
* @covers Modules\ClientManagement\Models\Client
* @group module
*/
public function testContactElementInputOutput() : void
{
$this->client->addContactElement($temp = new ContactElement());
self::assertCount(1, $this->client->getContactElements());
self::assertEquals($temp, $this->client->getMainContactElement(0));
self::assertInstanceOf('\phpOMS\Stdlib\Base\Address', $this->client->mainAddress);
}
/**
@ -105,8 +70,8 @@ final class ClientTest extends \PHPUnit\Framework\TestCase
{
$this->client->number = '123456';
$this->client->numberReverse = '654321';
$this->client->setStatus(ClientStatus::INACTIVE);
$this->client->setType(2);
$this->client->status = ClientStatus::INACTIVE;
$this->client->type = 2;
$this->client->info = 'Test info';
self::assertEquals(