Jingga/oms-Billing
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Billing.git synced 2026-02-18 09:18:40 +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:07 +02:00
parent 64c48dbb34
commit 1dfa2f81f1
15 changed files with 781 additions and 849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Models/Bill.php
View File

@ -55,9 +55,7 @@ class Bill implements \JsonSerializable
* @var int|BillType
* @since 1.0.0
*/
public int |
BillType $type = 0;
public int|BillType $type = 0;
/**
* Bill status.
@ -225,15 +223,15 @@ class Bill implements \JsonSerializable
public string $info = '';
public $payment = 0;
public int $payment = 0;
public string $paymentText = '';
public $terms = 0;
public int $terms = 0;
public string $termsText = '';
public $shipping = 0;
public int $shipping = 0;
public string $shippingText = '';
@ -825,31 +823,6 @@ class Bill implements \JsonSerializable
return $this->info;
}
/**
* Set payment term.
*
* @param int $payment Payment term
*
* @return void
*
* @since 1.0.0
*/
public function setPayment(int $payment) : void
{
$this->payment = $payment;
}
/**
* Get payment term.
*
* @return null|int
*
* @since 1.0.0
*/
public function getPayment() : ?int
{
return $this->payment;
}
/**
* Set payment text.

77
Models/BillElement.php
View File

@ -75,14 +75,29 @@ class BillElement implements \JsonSerializable
public ?FloatInt $totalSalesPriceGross = null;
public $event = 0;
/**
* Event assigned to this element.
*
* @var int
* @since 1.0.0
*/
public int $event = 0;
public $promotion = 0;
/**
* Promotion assigned to this element.
*
* @var int
* @since 1.0.0
*/
public int $promotion = 0;
public int |
Bill $bill = 0;
public int|Bill $bill = 0;
/**
* Constructor.
*
* @since 1.0.0
*/
public function __construct()
{
$this->singleSalesPriceNet = new Money();
@ -104,58 +119,6 @@ class BillElement implements \JsonSerializable
return $this->id;
}
/**
* Set event.
*
* @param int $event Event
*
* @return void
*
* @since 1.0.0
*/
public function setEvent(int $event) : void
{
$this->event = $event;
}
/**
* Get event.
*
* @return mixed
*
* @since 1.0.0
*/
public function getEvent()
{
return $this->event;
}
/**
* Set promotion.
*
* @param int $promotion Promotion
*
* @return void
*
* @since 1.0.0
*/
public function setPromotion(int $promotion) : void
{
$this->promotion = $promotion;
}
/**
* Get promotion.
*
* @return string
*
* @since 1.0.0
*/
public function getPromotion()
{
return $this->promotion;
}
/**
* Set order.
*

10
Models/BillType.php
View File

@ -43,9 +43,7 @@ class BillType
*
* @var string|BillTypeL11n
*/
protected string |
BillTypeL11n $l11n;
protected string|BillTypeL11n $l11n;
/**
* Constructor.
@ -85,12 +83,12 @@ class BillType
{
if ($l11n instanceof BillTypeL11n) {
$this->l11n = $l11n;
} elseif (\is_string($l11n)) {
} elseif ($this->l11n instanceof BillTypeL11n) {
$this->l11n->name = $l11n;
} else {
$this->l11n = new BillTypeL11n();
$this->l11n->name = $l11n;
$this->l11n->setLanguage($lang);
} elseif ($this->l11n instanceof BillTypeL11n && \is_string($l11n)) {
$this->l11n->name = $l11n;
}
}

4
Models/BillTypeL11n.php
View File

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

36
Models/PurchaseBillMapper.php
View File

@ -49,7 +49,7 @@ final class PurchaseBillMapper extends BillMapper
) : array
{
$query = self::getQuery(null, [], $relations, $depth);
$query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::PURCHASE);
$query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::PURCHASE);
return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
@ -65,7 +65,7 @@ final class PurchaseBillMapper extends BillMapper
) : array
{
$query = self::getQuery(null, [], $relations, $depth);
$query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::PURCHASE);
$query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::PURCHASE);
return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
@ -165,15 +165,15 @@ final class PurchaseBillMapper extends BillMapper
// @todo: limit is not working correctly... only returns / 2 or something like that?. Maybe because bills arent unique?
$query ??= self::getQuery(null, [], RelationType::ALL, $depth);
$query->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_' . $depth)
->on(self::$table . '_' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_item', '=', $id)
$query->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_d' . $depth)
->on(self::$table . '_d' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_item', '=', $id)
->limit($limit);
if (!empty(self::$createdAt)) {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
} else {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
}
return self::getAllByQuery($query, RelationType::ALL, $depth);
@ -186,13 +186,13 @@ final class PurchaseBillMapper extends BillMapper
// @todo: limit is not working correctly... only returns / 2 or something like that?. Maybe because bills arent unique?
$query ??= self::getQuery(null, [], RelationType::ALL, $depth);
$query->where(self::$table . '_' . $depth . '.billing_bill_supplier', '=', $id)
$query->where(self::$table . '_d' . $depth . '.billing_bill_supplier', '=', $id)
->limit($limit);
if (!empty(self::$createdAt)) {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
} else {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
}
return self::getAllByQuery($query, RelationType::ALL, $depth);
@ -204,16 +204,16 @@ final class PurchaseBillMapper extends BillMapper
$query ??= SupplierMapper::getQuery(null, [], RelationType::ALL, $depth);
$query->selectAs('SUM(billing_bill_element_total_purchaseprice_net)', 'net_purchase')
->leftJoin(self::$table, self::$table . '_' . $depth)
->on(SupplierMapper::getTable() . '_' . $depth . '.suppliermgmt_supplier_id', '=', self::$table . '_' . $depth . '.billing_bill_supplier')
->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_' . $depth)
->on(self::$table . '_' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_item', '=', $id)
->andWhere(self::$table . '_' . $depth . '.billing_bill_performance_date', '>=', $start)
->andWhere(self::$table . '_' . $depth . '.billing_bill_performance_date', '<=', $end)
->leftJoin(self::$table, self::$table . '_d' . $depth)
->on(SupplierMapper::getTable() . '_d' . $depth . '.suppliermgmt_supplier_id', '=', self::$table . '_d' . $depth . '.billing_bill_supplier')
->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_d' . $depth)
->on(self::$table . '_d' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_item', '=', $id)
->andWhere(self::$table . '_d' . $depth . '.billing_bill_performance_date', '>=', $start)
->andWhere(self::$table . '_d' . $depth . '.billing_bill_performance_date', '<=', $end)
->orderBy('net_purchase', 'DESC')
->limit($limit)
->groupBy(SupplierMapper::getTable() . '_' . $depth . '.suppliermgmt_supplier_id');
->groupBy(SupplierMapper::getTable() . '_d' . $depth . '.suppliermgmt_supplier_id');
$suppliers = SupplierMapper::getAllByQuery($query, RelationType::ALL, $depth);
$data = SupplierMapper::getDataLastQuery();

56
Models/SalesBillMapper.php
View File

@ -49,7 +49,7 @@ final class SalesBillMapper extends BillMapper
) : array
{
$query = self::getQuery(null, [], $relations, $depth);
$query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::SALES);
$query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::SALES);
return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
@ -65,7 +65,7 @@ final class SalesBillMapper extends BillMapper
) : array
{
$query = self::getQuery(null, [], $relations, $depth);
$query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::SALES);
$query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::SALES);
return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
@ -165,15 +165,15 @@ final class SalesBillMapper extends BillMapper
// @todo: limit is not working correctly... only returns / 2 or something like that?. Maybe because bills arent unique?
$query ??= self::getQuery(null, [], RelationType::ALL, $depth);
$query->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_' . $depth)
->on(self::$table . '_' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_item', '=', $id)
$query->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_d' . $depth)
->on(self::$table . '_d' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_item', '=', $id)
->limit($limit);
if (!empty(self::$createdAt)) {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
} else {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
}
return self::getAllByQuery($query, RelationType::ALL, $depth);
@ -186,13 +186,13 @@ final class SalesBillMapper extends BillMapper
// @todo: limit is not working correctly... only returns / 2 or something like that?. Maybe because bills arent unique?
$query ??= self::getQuery(null, [], RelationType::ALL, $depth);
$query->where(self::$table . '_' . $depth . '.billing_bill_client', '=', $id)
$query->where(self::$table . '_d' . $depth . '.billing_bill_client', '=', $id)
->limit($limit);
if (!empty(self::$createdAt)) {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
} else {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
}
return self::getAllByQuery($query, RelationType::ALL, $depth);
@ -204,16 +204,16 @@ final class SalesBillMapper extends BillMapper
$query ??= ClientMapper::getQuery(null, [], RelationType::ALL, $depth);
$query->selectAs('SUM(billing_bill_element_total_salesprice_net)', 'net_sales')
->leftJoin(self::$table, self::$table . '_' . $depth)
->on(ClientMapper::getTable() . '_' . $depth . '.clientmgmt_client_id', '=', self::$table . '_' . $depth . '.billing_bill_client')
->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_' . $depth)
->on(self::$table . '_' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_item', '=', $id)
->andWhere(self::$table . '_' . $depth . '.billing_bill_performance_date', '>=', $start)
->andWhere(self::$table . '_' . $depth . '.billing_bill_performance_date', '<=', $end)
->leftJoin(self::$table, self::$table . '_d' . $depth)
->on(ClientMapper::getTable() . '_d' . $depth . '.clientmgmt_client_id', '=', self::$table . '_d' . $depth . '.billing_bill_client')
->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_d' . $depth)
->on(self::$table . '_d' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_item', '=', $id)
->andWhere(self::$table . '_d' . $depth . '.billing_bill_performance_date', '>=', $start)
->andWhere(self::$table . '_d' . $depth . '.billing_bill_performance_date', '<=', $end)
->orderBy('net_sales', 'DESC')
->limit($limit)
->groupBy(ClientMapper::getTable() . '_' . $depth . '.clientmgmt_client_id');
->groupBy(ClientMapper::getTable() . '_d' . $depth . '.clientmgmt_client_id');
$clients = ClientMapper::getAllByQuery($query, RelationType::ALL, $depth);
$data = ClientMapper::getDataLastQuery();
@ -228,15 +228,15 @@ final class SalesBillMapper extends BillMapper
// @todo: limit is not working correctly... only returns / 2 or something like that?. Maybe because bills arent unique?
$query ??= self::getQuery(null, [], RelationType::ALL, $depth);
$query->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_' . $depth)
->on(self::$table . '_' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_item', '=', $id)
$query->leftJoin(BillElementMapper::getTable(), BillElementMapper::getTable() . '_d' . $depth)
->on(self::$table . '_d' . $depth . '.billing_bill_id', '=', BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_bill')
->where(BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_item', '=', $id)
->limit($limit = 10);
if (!empty(self::$createdAt)) {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
} else {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
}
return self::getAllByQuery($query, RelationType::ALL, $depth);
@ -249,15 +249,15 @@ final class SalesBillMapper extends BillMapper
// @todo: limit is not working correctly... only returns / 2 or something like that?. Maybe because bills arent unique?
$query ??= BillElementMapper::getQuery(null, [], RelationType::ALL, $depth);
$query->leftJoin(self::$table, self::$table . '_' . $depth)
->on(BillElementMapper::getTable() . '_' . $depth . '.billing_bill_element_bill', '=', self::$table . '_' . $depth . '.billing_bill_id')
->where(self::$table . '_' . $depth . '.billing_bill_client', '=', $client)
$query->leftJoin(self::$table, self::$table . '_d' . $depth)
->on(BillElementMapper::getTable() . '_d' . $depth . '.billing_bill_element_bill', '=', self::$table . '_d' . $depth . '.billing_bill_id')
->where(self::$table . '_d' . $depth . '.billing_bill_client', '=', $client)
->limit($limit = 10);
if (!empty(self::$createdAt)) {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$createdAt]['name'], 'DESC');
} else {
$query->orderBy(self::$table . '_' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
$query->orderBy(self::$table . '_d' . $depth . '.' . self::$columns[self::$primaryField]['name'], 'DESC');
}
return BillElementMapper::getAllByQuery($query, RelationType::ALL, $depth);

4
Models/StockBillMapper.php
View File

@ -46,7 +46,7 @@ final class StockBillMapper extends BillMapper
) : array
{
$query = self::getQuery(null, [], $relations, $depth);
$query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
$query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}
@ -62,7 +62,7 @@ final class StockBillMapper extends BillMapper
) : array
{
$query = self::getQuery(null, [], $relations, $depth);
$query->where(BillTypeMapper::getTable() . '_' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
$query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
}

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",