From 295ede2d776c2ca66312892079c3c5578059ed2f Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sun, 4 Apr 2021 15:13:07 +0000 Subject: [PATCH] Automated formatting changes --- Controller/ApiController.php | 6 +++--- Models/Bill.php | 16 ++++++++++------ Models/BillElement.php | 4 +++- Models/BillType.php | 4 +++- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index d9f0ca4..5ef79b3 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -92,10 +92,10 @@ final class ApiController extends Controller } /* @var \Modules\Account\Models\Account $account */ - $bill = new Bill(); + $bill = new Bill(); $bill->createdBy = new NullAccount($request->header->account); - $bill->number = '{y}-{id}'; // @todo: use admin defined format - $bill->billTo = $request->getData('billto') + $bill->number = '{y}-{id}'; // @todo: use admin defined format + $bill->billTo = $request->getData('billto') ?? ($account->profile->account->name1 . (!empty($account->profile->account->name2) ? ', ' . $account->profile->account->name2 : '')); // @todo: use defaultInvoiceAddress or mainAddress. also consider to use billto1, billto2, billto3 (for multiple lines e.g. name2, fao etc.) $bill->billZip = $request->getData('billtopostal') ?? $account->mainAddress->postal; $bill->billCity = $request->getData('billtocity') ?? $account->mainAddress->city; diff --git a/Models/Bill.php b/Models/Bill.php index 6874743..58b2412 100755 --- a/Models/Bill.php +++ b/Models/Bill.php @@ -16,9 +16,9 @@ namespace Modules\Billing\Models; use Modules\Admin\Models\Account; use Modules\Admin\Models\NullAccount; +use Modules\ClientManagement\Models\Client; use Modules\Media\Models\Media; use Modules\Media\Models\NullMedia; -use Modules\ClientManagement\Models\Client; use Modules\SupplierManagement\Models\Supplier; use phpOMS\Localization\ISO4217CharEnum; use phpOMS\Localization\Money; @@ -99,9 +99,13 @@ class Bill implements \JsonSerializable */ public Account $createdBy; - public int | Client $client = 0; + public int | - public int | Supplier $supplier = 0; + Client $client = 0; + + public int | + + Supplier $supplier = 0; /** * Receiver. @@ -271,9 +275,9 @@ class Bill implements \JsonSerializable $this->costs = new Money(0); $this->profit = new Money(0); - $this->createdAt = new \DateTimeImmutable(); - $this->performanceDate = new \DateTime(); - $this->createdBy = new NullAccount(); + $this->createdAt = new \DateTimeImmutable(); + $this->performanceDate = new \DateTime(); + $this->createdBy = new NullAccount(); $this->referral = new NullAccount(); } diff --git a/Models/BillElement.php b/Models/BillElement.php index 7d393cc..4e8a75c 100755 --- a/Models/BillElement.php +++ b/Models/BillElement.php @@ -79,7 +79,9 @@ class BillElement implements \JsonSerializable public $promotion = 0; - public int | Bill $bill = 0; + public int | + + Bill $bill = 0; public function __construct() { diff --git a/Models/BillType.php b/Models/BillType.php index d6239f2..06e3042 100755 --- a/Models/BillType.php +++ b/Models/BillType.php @@ -43,7 +43,9 @@ class BillType * * @var string|BillTypeL11n */ - protected string | BillTypeL11n $l11n; + protected string | + + BillTypeL11n $l11n; /** * Constructor.