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

update
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-08-17 00:21:45 +00:00
parent f5950c180d
commit 422b5b80fe
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/ApiController.php
View File

@ -165,7 +165,8 @@ final class ApiController extends Controller
{
$paymentL11n = new BaseStringL11n();
$paymentL11n->ref = $request->getDataInt('type') ?? 0;
$paymentL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$paymentL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language'))
?? $request->header->l11n->language;
$paymentL11n->content = $request->getDataString('title') ?? '';
return $paymentL11n;
@ -300,7 +301,8 @@ final class ApiController extends Controller
{
$shippingL11n = new BaseStringL11n();
$shippingL11n->ref = $request->getDataInt('type') ?? 0;
$shippingL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$shippingL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language'))
?? $request->header->l11n->language;
$shippingL11n->content = $request->getDataString('title') ?? '';
return $shippingL11n;

25
Controller/CliController.php
View File

@ -20,6 +20,7 @@ use Modules\Billing\Models\BillMapper;
use Modules\Billing\Models\BillTypeMapper;
use Modules\Billing\Models\InvoiceRecognition;
use Modules\Billing\Models\NullBillType;
use Modules\Billing\Models\Price\Price;
use Modules\Billing\Models\Price\PriceMapper;
use Modules\ItemManagement\Models\Item;
use Modules\ItemManagement\Models\NullItem;
@ -249,12 +250,24 @@ final class CliController extends Controller
$item = new NullItem();
if ($bill->supplier->id !== 0) {
$possibleItems = PriceMapper::getAll()
$prices = PriceMapper::getAll()
->with('item')
->with('item/l11n')
->with('item/l11n/type')
->with('item/attributes')
->with('item/attributes/type')
->where('supplier', $bill->supplier->id)
->where('item/l11n/type/title', ['name1', 'name2', 'internal_matchcodes', 'description_short'])
->where('item/attributes/type/name', ['bill_match_pattern'])
->executeGetArray();
$possibleItems = \array_map(
function (Price $price) {
return $price->item;
},
$prices
);
$item = $this->matchItem($content, $possibleItems);
}
@ -262,8 +275,18 @@ final class CliController extends Controller
$billElement->item = $item;
$billElement->itemNumber = $item->number;
$billElement->itemName = $item->getL11n('name1')->content;
if (!empty($item->getL11n('description_short')->content)) {
$billElement->itemDescription = $item->getL11n('description_short')->content;
} elseif (!empty($description)) {
$billElement->itemDescription = $description;
}
} else {
$billElement->itemName = \trim($itemLine['description']);
if (!empty($description)) {
$billElement->itemDescription = $description;
}
}
}