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

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2021-04-04 15:13:07 +00:00
parent c5d7a7ceaa
commit 295ede2d77
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/ApiController.php
View File

@ -92,10 +92,10 @@ final class ApiController extends Controller
} }
/* @var \Modules\Account\Models\Account $account */ /* @var \Modules\Account\Models\Account $account */
$bill = new Bill(); $bill = new Bill();
$bill->createdBy = new NullAccount($request->header->account); $bill->createdBy = new NullAccount($request->header->account);
$bill->number = '{y}-{id}'; // @todo: use admin defined format $bill->number = '{y}-{id}'; // @todo: use admin defined format
$bill->billTo = $request->getData('billto') $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.) ?? ($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->billZip = $request->getData('billtopostal') ?? $account->mainAddress->postal;
$bill->billCity = $request->getData('billtocity') ?? $account->mainAddress->city; $bill->billCity = $request->getData('billtocity') ?? $account->mainAddress->city;

16
Models/Bill.php
View File

@ -16,9 +16,9 @@ namespace Modules\Billing\Models;
use Modules\Admin\Models\Account; use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\ClientManagement\Models\Client;
use Modules\Media\Models\Media; use Modules\Media\Models\Media;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use Modules\ClientManagement\Models\Client;
use Modules\SupplierManagement\Models\Supplier; use Modules\SupplierManagement\Models\Supplier;
use phpOMS\Localization\ISO4217CharEnum; use phpOMS\Localization\ISO4217CharEnum;
use phpOMS\Localization\Money; use phpOMS\Localization\Money;
@ -99,9 +99,13 @@ class Bill implements \JsonSerializable
*/ */
public Account $createdBy; public Account $createdBy;
public int | Client $client = 0; public int |
public int | Supplier $supplier = 0; Client $client = 0;
public int |
Supplier $supplier = 0;
/** /**
* Receiver. * Receiver.
@ -271,9 +275,9 @@ class Bill implements \JsonSerializable
$this->costs = new Money(0); $this->costs = new Money(0);
$this->profit = new Money(0); $this->profit = new Money(0);
$this->createdAt = new \DateTimeImmutable(); $this->createdAt = new \DateTimeImmutable();
$this->performanceDate = new \DateTime(); $this->performanceDate = new \DateTime();
$this->createdBy = new NullAccount(); $this->createdBy = new NullAccount();
$this->referral = new NullAccount(); $this->referral = new NullAccount();
} }

4
Models/BillElement.php
View File

@ -79,7 +79,9 @@ class BillElement implements \JsonSerializable
public $promotion = 0; public $promotion = 0;
public int | Bill $bill = 0; public int |
Bill $bill = 0;
public function __construct() public function __construct()
{ {

4
Models/BillType.php
View File

@ -43,7 +43,9 @@ class BillType
* *
* @var string|BillTypeL11n * @var string|BillTypeL11n
*/ */
protected string | BillTypeL11n $l11n; protected string |
BillTypeL11n $l11n;
/** /**
* Constructor. * Constructor.