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

use getDataArray

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-28 01:33:29 +00:00
parent 98f2554ef6
commit 7c646ee14b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiBillController.php
View File

@ -1173,7 +1173,7 @@ final class ApiBillController extends Controller
} }
/** @var \Modules\Editor\Models\EditorDoc $model */ /** @var \Modules\Editor\Models\EditorDoc $model */
$model = $response->get($request->uri->__toString())['response']; $model = $response->getDataArray($request->uri->__toString())['response'];
$this->createModelRelation($request->header->account, $request->getDataInt('id'), $model->id, BillMapper::class, 'bill_note', '', $request->getOrigin()); $this->createModelRelation($request->header->account, $request->getDataInt('id'), $model->id, BillMapper::class, 'bill_note', '', $request->getOrigin());
} }

4
Controller/ApiPurchaseController.php
View File

@ -81,7 +81,7 @@ final class ApiPurchaseController extends Controller
$this->app->moduleManager->get('Billing', 'Api')->apiBillCreate($billRequest, $billResponse, $data); $this->app->moduleManager->get('Billing', 'Api')->apiBillCreate($billRequest, $billResponse, $data);
$billId = $billResponse->get('')['response']->id; $billId = $billResponse->getDataArray('')['response']->id;
// Upload and assign document to bill // Upload and assign document to bill
$mediaRequest = new HttpRequest(); $mediaRequest = new HttpRequest();
@ -98,7 +98,7 @@ final class ApiPurchaseController extends Controller
$this->app->moduleManager->get('Billing', 'Api')->apiMediaAddToBill($mediaRequest, $mediaResponse, $data); $this->app->moduleManager->get('Billing', 'Api')->apiMediaAddToBill($mediaRequest, $mediaResponse, $data);
/** @var \Modules\Media\Models\Media[] $uploaded */ /** @var \Modules\Media\Models\Media[] $uploaded */
$uploaded = $mediaResponse->get('')['response']['upload']; $uploaded = $mediaResponse->getDataArray('')['response']['upload'];
if (empty($uploaded)) { if (empty($uploaded)) {
throw new \Exception(); throw new \Exception();
} }

2
Controller/ApiTaxController.php
View File

@ -107,7 +107,7 @@ final class ApiTaxController extends Controller
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
* @param mixed $data Data * @param array $data Data
* *
* @return void * @return void
* *

4
Models/BillElement.php
View File

@ -273,12 +273,12 @@ class BillElement implements \JsonSerializable
$element->singleProfitGross->setInt($element->singleSalesPriceGross->getInt() - $element->singlePurchasePriceGross->getInt()); $element->singleProfitGross->setInt($element->singleSalesPriceGross->getInt() - $element->singlePurchasePriceGross->getInt());
$element->totalProfitGross->setInt($element->quantity * ($element->totalSalesPriceGross->getInt() - $element->totalPurchasePriceGross->getInt())); $element->totalProfitGross->setInt($element->quantity * ($element->totalSalesPriceGross->getInt() - $element->totalPurchasePriceGross->getInt()));
if (!empty($element->bill) if ($element->bill->id !== 0
&& $item->getAttribute('subscription')->value->getValue() === 1 && $item->getAttribute('subscription')->value->getValue() === 1
&& $element->item !== null && $element->item !== null
) { ) {
$element->subscription = new Subscription(); $element->subscription = new Subscription();
$element->subscription->bill = $element->bill; $element->subscription->bill = $element->bill->id;
$element->subscription->item = $element->item; $element->subscription->item = $element->item;
$element->subscription->start = new \DateTime('now'); // @todo: change to bill performanceDate $element->subscription->start = new \DateTime('now'); // @todo: change to bill performanceDate
$element->subscription->end = new SmartDateTime('now'); // @todo: depends on subscription type $element->subscription->end = new SmartDateTime('now'); // @todo: depends on subscription type

6
Models/SalesBillMapper.php
View File

@ -122,7 +122,7 @@ final class SalesBillMapper extends BillMapper
{ {
$query = new Builder(self::$db); $query = new Builder(self::$db);
/** @var false|array $result */ /** @var array $result */
$result = $query->select('SUM(billing_bill_element_single_netsalesprice)', 'COUNT(billing_bill_element_total_netsalesprice)') $result = $query->select('SUM(billing_bill_element_single_netsalesprice)', 'COUNT(billing_bill_element_total_netsalesprice)')
->from(self::TABLE) ->from(self::TABLE)
->leftJoin(BillElementMapper::TABLE) ->leftJoin(BillElementMapper::TABLE)
@ -131,9 +131,9 @@ final class SalesBillMapper extends BillMapper
->andWhere(self::TABLE . '.billing_bill_performance_date', '>=', $start) ->andWhere(self::TABLE . '.billing_bill_performance_date', '>=', $start)
->andWhere(self::TABLE . '.billing_bill_performance_date', '<=', $end) ->andWhere(self::TABLE . '.billing_bill_performance_date', '<=', $end)
->execute() ->execute()
?->fetch() ?? false; ?->fetch() ?? [];
return new FloatInt($result === false || ((int) ($result[1] ?? 0)) === 0 ? 0 : (int) (((int) $result[0] ?? 0) / ((int) $result[1]))); return new FloatInt(((int) ($result[1] ?? 0)) === 0 ? 0 : (int) (((int) ($result[0] ?? 0)) / ((int) $result[1])));
} }
/** /**