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

fix phpstan/phpcs

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-06-26 14:38:08 +02:00
parent b01877046c
commit f4c3e8c882
8 changed files with 165 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -202,10 +202,10 @@ final class ApiController extends Controller
*/
private function createClientAttributeFromRequest(RequestAbstract $request) : ClientAttribute
{
$attribute = new ClientAttribute();
$attribute->client = (int) $request->getData('client');
$attribute->type = new NullClientAttributeType((int) $request->getData('type'));
$attribute->value = new NullClientAttributeValue((int) $request->getData('value'));
$attribute = new ClientAttribute();
$attribute->client = (int) $request->getData('client');
$attribute->type = new NullClientAttributeType((int) $request->getData('type'));
$attribute->value = new NullClientAttributeValue((int) $request->getData('value'));
return $attribute;
}

12
Models/ClientAttributeType.php
View File

@ -68,9 +68,7 @@ class ClientAttributeType implements \JsonSerializable, ArrayableInterface
*
* @var string | ClientAttributeTypeL11n
*/
protected string |
ClientAttributeTypeL11n $l11n;
protected string|ClientAttributeTypeL11n $l11n;
/**
* Possible default attribute values
@ -113,16 +111,16 @@ class ClientAttributeType implements \JsonSerializable, ArrayableInterface
*
* @since 1.0.0
*/
public function setL11n($l11n, string $lang = ISO639x1Enum::_EN) : void
public function setL11n(string|ClientAttributeTypeL11n $l11n, string $lang = ISO639x1Enum::_EN) : void
{
if ($l11n instanceof ClientAttributeTypeL11n) {
$this->l11n = $l11n;
} elseif (\is_string($l11n)) {
} elseif ($this->l11n instanceof ClientAttributeTypeL11n) {
$this->l11n->title = $l11n;
} else {
$this->l11n = new ClientAttributeTypeL11n();
$this->l11n->title = $l11n;
$this->l11n->setLanguage($lang);
} elseif ($this->l11n instanceof ClientAttributeTypeL11n && \is_string($l11n)) {
$this->l11n->title = $l11n;
}
}

4
Models/ClientAttributeTypeL11n.php
View File

@ -41,9 +41,7 @@ class ClientAttributeTypeL11n implements \JsonSerializable, ArrayableInterface
* @var int|ClientAttributeType
* @since 1.0.0
*/
protected int |
ClientAttributeType $type = 0;
protected int|ClientAttributeType $type = 0;
/**
* Language.

7
Models/ClientAttributeValue.php
View File

@ -153,6 +153,13 @@ class ClientAttributeValue implements \JsonSerializable, ArrayableInterface
}
}
/**
* Get value
*
* @return null|int|string|float|\DateTimeInterface
*
* @since 1.0.0
*/
public function getValue() : mixed
{
if (!empty($this->valueStr)) {

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

@ -13,7 +13,7 @@
declare(strict_types=1);
return ['Navigation' => [
'Client' => 'Client',
'Region' => 'Region',
'SalesRep' => 'SalesRep',
'Client' => 'Client',
'Region' => 'Region',
'SalesRep' => 'SalesRep',
]];

274
Theme/Backend/client-analysis.tpl.php
View File

@ -37,11 +37,11 @@ echo $this->getData('nav')->render();
<div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="row">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<form>
<div class="portlet-head"><?= $this->getHtml('Filter'); ?></div>
<form>
<div class="portlet-head"><?= $this->getHtml('Filter'); ?></div>
<div class="portlet-body">
<div class="form-group">
<label for="iId"><?= $this->getHtml('Client'); ?></label>
@ -89,23 +89,23 @@ echo $this->getData('nav')->render();
</div>
<div class="portlet-foot"><input id="iSubmitGeneral" name="submitGeneral" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>"></div>
</form>
</section>
</div>
</div>
</section>
</div>
</div>
</div>
<input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="row">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">
Sales / Customers - Monthly
<?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
</div>
<div class="portlet-head">
Sales / Customers - Monthly
<?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
</div>
<?php $salesCustomer = $this->getData('monthlySalesCustomer'); ?>
<div class="portlet-body">
<canvas id="sales-region" data-chart='{
<canvas id="sales-region" data-chart='{
"type": "bar",
"data": {
"labels": [
@ -157,10 +157,10 @@ echo $this->getData('nav')->render();
]
},
"options": {
"title": {
"display": false,
"text": "Sales / Customers"
},
"title": {
"display": false,
"text": "Sales / Customers"
},
"scales": {
"yAxes": [
{
@ -184,42 +184,42 @@ echo $this->getData('nav')->render();
}
}
}'></canvas>
<div class="more-container">
<input id="more-customer-sales" type="checkbox">
<label for="more-customer-sales">
<span>Data</span>
<i class="fa fa-chevron-right expand"></i>
</label>
<div>
<table class="default">
<thead>
<tr>
<td>Month
<td>Sales
<td>Customer count
<tbody>
<?php
$sum1 = 0;
$sum2 = 0;
foreach ($salesCustomer as $values) :
$sum1 += ((int) $values['net_sales']) / 1000;
$sum2 += ((int) $values['customers']);
?>
<tr>
<td><?= $values['month'] . '/' . \substr((string) $values['year'], -2); ?>
<td><?= (new Money(((int) $values['net_sales']) / 1000))->getCurrency(); ?>
<td><?= ((int) $values['customers']); ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= (new Money($sum1))->getCurrency(); ?>
<td><?= (int) ($sum2 / 12); ?>
</table>
</div>
</div>
</div>
</section>
</div>
<div class="more-container">
<input id="more-customer-sales" type="checkbox">
<label for="more-customer-sales">
<span>Data</span>
<i class="fa fa-chevron-right expand"></i>
</label>
<div>
<table class="default">
<thead>
<tr>
<td>Month
<td>Sales
<td>Customer count
<tbody>
<?php
$sum1 = 0;
$sum2 = 0;
foreach ($salesCustomer as $values) :
$sum1 += ((int) $values['net_sales']) / 1000;
$sum2 += ((int) $values['customers']);
?>
<tr>
<td><?= $values['month'] . '/' . \substr((string) $values['year'], -2); ?>
<td><?= (new Money(((int) $values['net_sales']) / 1000))->getCurrency(); ?>
<td><?= ((int) $values['customers']); ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= (new Money($sum1))->getCurrency(); ?>
<td><?= (int) ($sum2 / 12); ?>
</table>
</div>
</div>
</div>
</section>
</div>
<div class="col-xs-12 col-lg-6">
<section class="portlet">
@ -337,15 +337,15 @@ echo $this->getData('nav')->render();
</section>
</div>
<div class="col-xs-12 col-lg-6">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">
Customers per Region - Current
<?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
</div>
<?php $customerRegion = $this->getData('currentCustomerRegion'); ?>
<?php $customerRegion = $this->getData('currentCustomerRegion'); ?>
<div class="portlet-body">
<canvas id="sales-region" data-chart='{
<canvas id="sales-region" data-chart='{
"type": "pie",
"data": {
"labels": [
@ -371,11 +371,11 @@ echo $this->getData('nav')->render();
}]
},
"options": {
"title": {
"display": false,
"text": "Customers per Region - Currently"
}
}
"title": {
"display": false,
"text": "Customers per Region - Currently"
}
}
}'></canvas>
<div class="more-container">
@ -386,27 +386,27 @@ echo $this->getData('nav')->render();
</label>
<div>
<table class="default">
<thead>
<tr>
<td>Region
<td>Customer count
<tbody>
<?php
$sum = 0;
foreach ($customerRegion as $region => $values) : $sum += $values; ?>
<tr>
<td><?= $region; ?>
<td><?= $values; ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= $sum; ?>
<thead>
<tr>
<td>Region
<td>Customer count
<tbody>
<?php
$sum = 0;
foreach ($customerRegion as $region => $values) : $sum += $values; ?>
<tr>
<td><?= $region; ?>
<td><?= $values; ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= $sum; ?>
</table>
</div>
</div>
</div>
</section>
</div>
</section>
</div>
<div class="col-xs-12 col-lg-6">
<section class="portlet">
@ -605,15 +605,15 @@ echo $this->getData('nav')->render();
</section>
</div>
<div class="col-xs-12 col-lg-6">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">
Customers per Rep - Current
<?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
</div>
<?php $customersRep = $this->getData('currentCustomersRep'); ?>
<?php $customersRep = $this->getData('currentCustomersRep'); ?>
<div class="portlet-body">
<canvas id="sales-region" data-chart='{
<canvas id="sales-region" data-chart='{
"type": "horizontalBar",
"data": {
"labels": [
@ -646,10 +646,10 @@ echo $this->getData('nav')->render();
]
},
"options": {
"title": {
"display": false,
"text": "Customers per rep"
}
"title": {
"display": false,
"text": "Customers per rep"
}
}
}'></canvas>
@ -680,8 +680,8 @@ echo $this->getData('nav')->render();
</div>
</div>
</div>
</section>
</div>
</section>
</div>
<div class="col-xs-12 col-lg-6">
<section class="portlet">
@ -717,15 +717,15 @@ echo $this->getData('nav')->render();
</section>
</div>
<div class="col-xs-12 col-lg-6">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">
Customers per Country - Current
<?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
</div>
<?php $customersCountry = $this->getData('currentCustomersCountry'); ?>
<?php $customersCountry = $this->getData('currentCustomersCountry'); ?>
<div class="portlet-body">
<canvas height="400px" id="sales-region" data-chart='{
<canvas height="400px" id="sales-region" data-chart='{
"type": "horizontalBar",
"data": {
"labels": [
@ -758,10 +758,10 @@ echo $this->getData('nav')->render();
]
},
"options": {
"title": {
"display": false,
"text": "Customers per country"
}
"title": {
"display": false,
"text": "Customers per country"
}
}
}'></canvas>
@ -773,27 +773,27 @@ echo $this->getData('nav')->render();
</label>
<div>
<table class="default">
<thead>
<tr>
<td>Country
<td>Customer count
<tbody>
<?php
$sum = 0;
foreach ($customersCountry as $country => $values) : $sum += $values['customers']; ?>
<tr>
<td><?= $country; ?>
<td><?= $values['customers']; ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= $sum; ?>
<thead>
<tr>
<td>Country
<td>Customer count
<tbody>
<?php
$sum = 0;
foreach ($customersCountry as $country => $values) : $sum += $values['customers']; ?>
<tr>
<td><?= $country; ?>
<td><?= $values['customers']; ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= $sum; ?>
</table>
</div>
</div>
</div>
</section>
</div>
</section>
</div>
<div class="col-xs-12 col-lg-6">
<section class="portlet">
@ -831,13 +831,13 @@ echo $this->getData('nav')->render();
</section>
</div>
<div class="col-xs-12 col-lg-6">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">
Customer per Attribute - Current
<?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
</div>
<?php $customerGroups = $this->getData('customerGroups'); ?>
<?php $customerGroups = $this->getData('customerGroups'); ?>
<div class="portlet-body">
<div class="form-group">
<label for="iOname"><?= $this->getHtml('Attribute'); ?></label>
@ -847,7 +847,7 @@ echo $this->getData('nav')->render();
</div>
<div>
<canvas id="sales-region" data-chart='{
<canvas id="sales-region" data-chart='{
"type": "pie",
"data": {
"labels": [
@ -880,11 +880,11 @@ echo $this->getData('nav')->render();
}]
},
"options": {
"title": {
"display": false,
"text": "Customers per group"
}
}
"title": {
"display": false,
"text": "Customers per group"
}
}
}'></canvas>
</div>
@ -896,27 +896,27 @@ echo $this->getData('nav')->render();
</label>
<div>
<table class="default">
<thead>
<tr>
<td>Groups
<td>Customer count
<tbody>
<?php
$sum = 0;
foreach ($customerGroups as $groups => $values) : $sum += $values['customers']; ?>
<tr>
<td><?= $groups; ?>
<td><?= $values['customers']; ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= $sum; ?>
<thead>
<tr>
<td>Groups
<td>Customer count
<tbody>
<?php
$sum = 0;
foreach ($customerGroups as $groups => $values) : $sum += $values['customers']; ?>
<tr>
<td><?= $groups; ?>
<td><?= $values['customers']; ?>
<?php endforeach; ?>
<tr>
<td>Total
<td><?= $sum; ?>
</table>
</div>
</div>
</div>
</section>
</div>
</section>
</div>
<div class="col-xs-12 col-lg-6">
<section class="portlet">
@ -1218,7 +1218,7 @@ echo $this->getData('nav')->render();
<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="row">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">
@ -2283,7 +2283,7 @@ echo $this->getData('nav')->render();
<input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<div class="row">
<div class="col-xs-12 col-lg-6">
<section class="portlet">
<div class="portlet-head">

14
Theme/Backend/client-profile-items.tpl.php
View File

@ -128,14 +128,14 @@ $items = $this->getData('items') ?? [];
</label>
<tbody>
<?php
$count = 0;
foreach ($items as $key => $value) :
if ($value->itemNumber === '') {
continue;
}
$count = 0;
foreach ($items as $key => $value) :
if ($value->itemNumber === '') {
continue;
}
++$count;
$url = UriFactory::build('{/prefix}sales/item/profile?{?}&id=' . $value->getId());
++$count;
$url = UriFactory::build('{/prefix}sales/item/profile?{?}&id=' . $value->getId());
?>
<tr data-href="<?= $url; ?>">
<td><label class="checkbox" for="iSalesItemSelect-<?= $key; ?>">

2
composer.json
View File

@ -9,7 +9,7 @@
],
"require-dev": {
"phpunit/phpunit": ">=9.4",
"friendsofphp/php-cs-fixer": ">=2.18",
"friendsofphp/php-cs-fixer": ">=3.0",
"squizlabs/php_codesniffer": ">=3.5",
"phpmd/phpmd": ">=2.9",
"phpstan/phpstan": ">=0.12.58",