th.guenther/mareike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved handling for new invoices

Browse Source
This commit is contained in:
Thomas Günther
2026-04-18 23:42:39 +02:00
parent 33a9271013
commit 4878f750bd
16 changed files with 206 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Domains/Invoice/Controllers/NewInvoiceController.php
View File

@@ -64,31 +64,32 @@ class NewInvoiceController extends CommonController {
case InvoiceType::INVOICE_TYPE_TRAVELLING:
if ($uploadedFile !== null) {
$amount = Amount::fromString($request->get('amount'))->getAmount();
$amount = Amount::fromString($request->input('amount'))->getAmount();
$distance = null;
} else {
$distance = Amount::fromString($request->get('amount'))->getRoundedAmount();
$distance = Amount::fromString($request->input('amount'))->getRoundedAmount();
$amount = $distance * $costUnit->distance_allowance;
}
$createInvoiceRequest = new CreateInvoiceRequest(
$costUnit,
$request->get('name'),
$request->input('name'),
InvoiceType::INVOICE_TYPE_TRAVELLING,
$amount,
$uploadedFile,
'donation' === $request->get('decision') ? true : false,
'donation' === $request->input('decision') ? true : false,
$this->users->getCurrentUserDetails()['userId'],
$request->get('contactEmail'),
$request->get('telephone'),
$request->get('accountOwner'),
$request->get('accountIban'),
$request->input('email'),
$request->input('telephone'),
$request->input('accountOwner'),
$request->input('accountIban'),
null,
$request->get('otherText'),
$request->input('otherText'),
$distance,
$request->get('havePassengers'),
$request->get('materialTransportation'),
$request->input('havePassengers'),
$request->input('materialTransportation'),
$request->input('travelReason'),
);
break;
@@ -96,21 +97,22 @@ class NewInvoiceController extends CommonController {
default:
$createInvoiceRequest = new CreateInvoiceRequest(
$costUnit,
$request->get('name'),
$request->input('name'),
$invoiceType,
Amount::fromString($request->get('amount'))->getAmount(),
Amount::fromString($request->input('amount'))->getAmount(),
$uploadedFile,
'donation' === $request->get('decision') ? true : false,
'donation' === $request->input('decision') ? true : false,
$this->users->getCurrentUserDetails()['userId'],
$request->get('contactEmail'),
$request->get('telephone'),
$request->get('accountOwner'),
$request->get('accountIban'),
$request->get('otherText'),
$request->input('email'),
$request->input('telephone'),
$request->input('accountOwner'),
$request->input('accountIban'),
$request->input('otherText'),
null,
null,
$request->get('havePassengers'),
$request->get('materialTransportation'),
$request->input('havePassengers'),
$request->input('materialTransportation'),
null
);
break;
@@ -124,15 +126,10 @@ class NewInvoiceController extends CommonController {
'success'
);
return response()->json([
'status' => 'success',
'message' => 'Alright'
]);
}
dd($request->all());
}
}