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

code fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-03-15 20:24:38 +00:00
parent f8289db5d5
commit 43b7eaf6a3
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Controller/ApiController.php
View File

@ -453,6 +453,19 @@ final class ApiController extends Controller
$this->createStandardCreateResponse($request, $response, $element); $this->createStandardCreateResponse($request, $response, $element);
} }
/**
* Api method to create expense element from an upload
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param array $data Generic data
*
* @return void
*
* @api
*
* @since 1.0.0
*/
public function apiExpenseElementFromUploadCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiExpenseElementFromUploadCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
if (!empty($val = $this->validateExpenseElementCreate($request))) { if (!empty($val = $this->validateExpenseElementCreate($request))) {
@ -761,7 +774,7 @@ final class ApiController extends Controller
} }
// Is invoice // Is invoice
if ($request->getDataString('file_type') === MediaType::BILL if ($request->getDataInt('file_type') === MediaType::BILL
&& \count($uploaded) + \count($mediaFiles) === 1 && \count($uploaded) + \count($mediaFiles) === 1
&& $this->app->moduleManager->isActive('Billing') && $this->app->moduleManager->isActive('Billing')
&& $expense->net->value !== 0 && $expense->net->value !== 0
@ -793,7 +806,7 @@ final class ApiController extends Controller
$elementObj->net = $bill->netSales; $elementObj->net = $bill->netSales;
$elementObj->taxP = $bill->taxP; $elementObj->taxP = $bill->taxP;
$elementObj->gross = $bill->grossSales; $elementObj->gross = $bill->grossSales;
$elementObj->supplier = $bill->supplier->id === 0 ? $bill->billTo : null; $elementObj->supplier = $bill->supplier;
$elementObj->country = $bill->billCountry; $elementObj->country = $bill->billCountry;
$this->updateModel($request->header->account, $oldElement, $elementObj, ExpenseElementMapper::class, 'expense_element', $request->getOrigin()); $this->updateModel($request->header->account, $oldElement, $elementObj, ExpenseElementMapper::class, 'expense_element', $request->getOrigin());