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

static fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-12-26 23:26:32 +01:00
parent acca610798
commit 46b950ba2e
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Controller/ApiController.php
View File

@ -201,15 +201,15 @@ final class ApiController extends Controller
$bill->type = $billType; $bill->type = $billType;
$bill->numberFormat = $billType->numberFormat; $bill->numberFormat = $billType->numberFormat;
// @todo: use defaultInvoiceAddress or mainAddress. also consider to use billto1, billto2, billto3 (for multiple lines e.g. name2, fao etc.) // @todo: use defaultInvoiceAddress or mainAddress. also consider to use billto1, billto2, billto3 (for multiple lines e.g. name2, fao etc.)
$bill->billTo = $request->getData('billto') $bill->billTo = (string) ($request->getData('billto')
?? ($account->profile->account->name1 . (!empty($account->profile->account->name2) ?? ($account->profile->account->name1 . (!empty($account->profile->account->name2)
? ', ' . $account->profile->account->name2 ? ', ' . $account->profile->account->name2
: '' : ''
)); )));
$bill->billAddress = $request->getData('billaddress') ?? $account->mainAddress->address; $bill->billAddress = (string) ($request->getData('billaddress') ?? $account->mainAddress->address);
$bill->billZip = $request->getData('billtopostal') ?? $account->mainAddress->postal; $bill->billZip = (string) ($request->getData('billtopostal') ?? $account->mainAddress->postal);
$bill->billCity = $request->getData('billtocity') ?? $account->mainAddress->city; $bill->billCity = (string) ($request->getData('billtocity') ?? $account->mainAddress->city);
$bill->billCountry = $request->getData('billtocountry') ?? $account->mainAddress->getCountry(); $bill->billCountry = (string) ($request->getData('billtocountry') ?? $account->mainAddress->getCountry());
$bill->client = !$request->hasData('client') ? null : $account; $bill->client = !$request->hasData('client') ? null : $account;
$bill->supplier = !$request->hasData('supplier') ? null : $account; $bill->supplier = !$request->hasData('supplier') ? null : $account;
$bill->performanceDate = new \DateTime($request->getData('performancedate') ?? 'now'); $bill->performanceDate = new \DateTime($request->getData('performancedate') ?? 'now');
@ -425,10 +425,15 @@ final class ApiController extends Controller
} }
/** @var \Modules\ItemManagement\Models\Item $item */ /** @var \Modules\ItemManagement\Models\Item $item */
$item = ItemMapper::get()->with('l11n')->where('id', $element->item)->where('l11n/language', $response->getLanguage())->execute(); $item = ItemMapper::get()
->with('l11n')
->where('id', $element->item)
->where('l11n/language', $response->getLanguage())
->execute();
$element->itemNumber = $item->number; $element->itemNumber = $item->number;
$element->itemName = $item->getL11n('name1')->description; $element->itemName = $item->getL11n('name1')->description;
$element->quantity = $request->getData('quantity', 'int'); $element->quantity = (int) ($request->getData('quantity') ?? 0);
$element->singleSalesPriceNet = new Money($request->getData('singlesalespricenet', 'int') ?? $item->salesPrice->getInt()); $element->singleSalesPriceNet = new Money($request->getData('singlesalespricenet', 'int') ?? $item->salesPrice->getInt());
$element->totalSalesPriceNet = clone $element->singleSalesPriceNet; $element->totalSalesPriceNet = clone $element->singleSalesPriceNet;
@ -436,8 +441,13 @@ final class ApiController extends Controller
// discounts // discounts
if ($request->getData('discount_percentage') !== null) { if ($request->getData('discount_percentage') !== null) {
$element->singleSalesPriceNet->sub((int) ($element->singleSalesPriceNet->getInt() / 100 * $request->getData('discount_percentage', 'int'))); $discount = (int) $request->getData('discount_percentage');
$element->totalSalesPriceNet->sub((int) ($element->totalSalesPriceNet->getInt() / 100 * $request->getData('discount_percentage', 'int')));
$element->singleSalesPriceNet
->sub((int) ($element->singleSalesPriceNet->getInt() / 100 * $discount));
$element->totalSalesPriceNet
->sub((int) ($element->totalSalesPriceNet->getInt() / 100 * $discount));
} }
$element->singlePurchasePriceNet = new Money($item->purchasePrice->getInt()); $element->singlePurchasePriceNet = new Money($item->purchasePrice->getInt());
@ -512,10 +522,11 @@ final class ApiController extends Controller
->where('id', $request->getData('bill') ?? 0) ->where('id', $request->getData('bill') ?? 0)
->execute(); ->execute();
$previewType = (int) $this->app->appSettings->get( /** @var \Model\Setting $previewType */
$previewType = $this->app->appSettings->get(
names: SettingsEnum::PREVIEW_MEDIA_TYPE, names: SettingsEnum::PREVIEW_MEDIA_TYPE,
module: self::NAME module: self::NAME
)->content; );
$template = $bill->type->template; $template = $bill->type->template;
@ -556,7 +567,7 @@ final class ApiController extends Controller
], ],
$request->header->account, $request->header->account,
$path, $path,
$previewType (int) $previewType->content
); );
$this->createModelRelation( $this->createModelRelation(

2
Models/SalesBillMapper.php
View File

@ -127,7 +127,7 @@ final class SalesBillMapper extends BillMapper
->execute() ->execute()
?->fetch(); ?->fetch();
return new Money($result === false || $result[1] ?? 0 === 0 ? 0 : (int) (((int) $result[0] ?? 0) / ((int) $result[1] ?? 1))); return new Money($result === false || ((int) ($result[1] ?? 0)) === 0 ? 0 : (int) (((int) $result[0] ?? 0) / ((int) $result[1])));
} }
/** /**