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

fix phpstan lvl 9 bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-12-26 20:52:57 +01:00
parent 7aa594c7ac
commit b4e3214dc3
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Controller/ApiController.php
View File

@ -27,6 +27,7 @@ use Modules\Billing\Models\BillTypeMapper;
use Modules\Billing\Models\SettingsEnum; use Modules\Billing\Models\SettingsEnum;
use Modules\ClientManagement\Models\ClientMapper; use Modules\ClientManagement\Models\ClientMapper;
use Modules\ItemManagement\Models\ItemMapper; use Modules\ItemManagement\Models\ItemMapper;
use Modules\ItemManagement\Models\NullItem;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullCollection;
@ -169,8 +170,10 @@ final class ApiController extends Controller
*/ */
public function createBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : Bill public function createBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : Bill
{ {
/** @var \Modules\ClientManagement\Models\Client|\Modules\SupplierManagement\Models\Supplier $account */
$account = null; $account = null;
if ($request->getData('client') !== null) { if ($request->getData('client') !== null) {
/** @var \Modules\ClientManagement\Models\Client $account */
$account = ClientMapper::get() $account = ClientMapper::get()
->with('profile') ->with('profile')
->with('profile/account') ->with('profile/account')
@ -178,8 +181,10 @@ final class ApiController extends Controller
->where('id', (int) $request->getData('client')) ->where('id', (int) $request->getData('client'))
->execute(); ->execute();
} elseif (((int) ($request->getData('supplier') ?? -1)) === 0) { } elseif (((int) ($request->getData('supplier') ?? -1)) === 0) {
/** @var \Modules\SupplierManagement\Models\Supplier $account */
$account = new NullSupplier(); $account = new NullSupplier();
} elseif ($request->getData('supplier') !== null) { } elseif ($request->getData('supplier') !== null) {
/** @var \Modules\SupplierManagement\Models\Supplier $account */
$account = SupplierMapper::get() $account = SupplierMapper::get()
->with('profile') ->with('profile')
->with('profile/account') ->with('profile/account')
@ -206,8 +211,8 @@ final class ApiController extends Controller
$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;
$bill->billCountry = $request->getData('billtocountry') ?? $account->mainAddress->getCountry(); $bill->billCountry = $request->getData('billtocountry') ?? $account->mainAddress->getCountry();
$bill->client = $request->getData('client') === null ? null : $account; $bill->client = !$request->hasData('client') ? null : $account;
$bill->supplier = $request->getData('supplier') === null ? 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');
$bill->setStatus((int) ($request->getData('status') ?? BillStatus::ACTIVE)); $bill->setStatus((int) ($request->getData('status') ?? BillStatus::ACTIVE));
@ -414,7 +419,7 @@ final class ApiController extends Controller
{ {
$element = new BillElement(); $element = new BillElement();
$element->bill = (int) $request->getData('bill'); $element->bill = (int) $request->getData('bill');
$element->item = $request->getData('item', 'int'); $element->item = (int) ($request->getData('item') ?? 0);
if ($element->item === null) { if ($element->item === null) {
return $element; return $element;

35
Controller/BackendController.php
View File

@ -120,12 +120,13 @@ final class BackendController extends Controller
$view->setData('bill', $bill); $view->setData('bill', $bill);
$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; );
$view->setData('previewType', $previewType); $view->setData('previewType', (int) $previewType->content);
return $view; return $view;
} }
@ -273,19 +274,21 @@ final class BackendController extends Controller
$view->setData('bill', $bill); $view->setData('bill', $bill);
$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; );
$view->setData('previewType', $previewType); $view->setData('previewType', (int) $previewType->content);
$originalType = (int) $this->app->appSettings->get( /** @var \Model\Setting $originalType */
$originalType = $this->app->appSettings->get(
names: SettingsEnum::ORIGINAL_MEDIA_TYPE, names: SettingsEnum::ORIGINAL_MEDIA_TYPE,
module: self::NAME module: self::NAME
)->content; );
$view->setData('originalType', $originalType); $view->setData('originalType', (int) $originalType->content);
return $view; return $view;
} }
@ -778,19 +781,21 @@ final class BackendController extends Controller
$view->setData('bill', $bill); $view->setData('bill', $bill);
$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; );
$view->setData('previewType', $previewType); $view->setData('previewType', (int) $previewType->content);
$originalType = (int) $this->app->appSettings->get( /** @var \Model\Setting $originalType */
$originalType = $this->app->appSettings->get(
names: SettingsEnum::ORIGINAL_MEDIA_TYPE, names: SettingsEnum::ORIGINAL_MEDIA_TYPE,
module: self::NAME module: self::NAME
)->content; );
$view->setData('originalType', $originalType); $view->setData('originalType', (int) $originalType->content);
return $view; return $view;
} }

6
Models/SalesBillMapper.php
View File

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