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

fix default respone generation

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-07-26 09:18:05 +00:00
parent 130f28862f
commit b1ceb3ba50
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Admin/Install/taxcodes.json
View File

@ -1,4 +1,30 @@
{ {
"SBIZ_0": {
"abbr": "SBIZ_0",
"percentage_invoice": 0,
"percentage_sales_tax": 0,
"percentage_input_tax": 0,
"tax_report": {
"base": null,
"amount": 43
},
"markers": [
],
"l11n": {
"de": {
"title": "Kleinunternehmen § 19 UStG",
"short": "",
"long": "",
"invoice_msg": "Im ausgewiesenen Rechnungsbetrag ist gemäß § 19 UStG keine Umsatzsteuer enthalten."
},
"en": {
"title": "Small business § 19 UStG",
"short": "",
"long": "",
"invoice_msg": "In accordance with § 19 UStG, the invoice amount shown does not include sales tax."
}
}
},
"S0": { "S0": {
"abbr": "S0", "abbr": "S0",
"percentage_invoice": 0, "percentage_invoice": 0,
@ -15,6 +41,11 @@
"title": "S0", "title": "S0",
"short": "", "short": "",
"long": "" "long": ""
},
"en": {
"title": "S0",
"short": "",
"long": ""
} }
} }
}, },

16
Controller/ApiController.php
View File

@ -19,10 +19,8 @@ use Modules\Finance\Models\TaxCodeL11n;
use Modules\Finance\Models\TaxCodeL11nMapper; use Modules\Finance\Models\TaxCodeL11nMapper;
use Modules\Finance\Models\TaxCodeMapper; use Modules\Finance\Models\TaxCodeMapper;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
/** /**
* Finance class. * Finance class.
@ -71,16 +69,15 @@ final class ApiController extends Controller
public function apiTaxCodeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiTaxCodeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateTaxCodeCreate($request))) { if (!empty($val = $this->validateTaxCodeCreate($request))) {
$response->data['tax_code_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400;
$response->header->status = RequestStatusCode::R_400; $this->createInvalidCreateResponse($request, $response, $val);
return; return;
} }
$code = $this->createTaxCodeFromRequest($request); $code = $this->createTaxCodeFromRequest($request);
$this->createModel($request->header->account, $code, TaxCodeMapper::class, 'tax_code', $request->getOrigin()); $this->createModel($request->header->account, $code, TaxCodeMapper::class, 'tax_code', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $code);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Code', 'Tax code successfully created', $code);
} }
/** /**
@ -147,16 +144,15 @@ final class ApiController extends Controller
public function apiTaxCodeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiTaxCodeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateTaxCodeL11nCreate($request))) { if (!empty($val = $this->validateTaxCodeL11nCreate($request))) {
$response->data['tax_code_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400;
$response->header->status = RequestStatusCode::R_400; $this->createInvalidCreateResponse($request, $response, $val);
return; return;
} }
$l11nCode = $this->createTaxCodeL11nFromRequest($request); $l11nCode = $this->createTaxCodeL11nFromRequest($request);
$this->createModel($request->header->account, $l11nCode, TaxCodeL11nMapper::class, 'tax_code_l11n', $request->getOrigin()); $this->createModel($request->header->account, $l11nCode, TaxCodeL11nMapper::class, 'tax_code_l11n', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $l11nCode);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Localization', 'Localization successfully created', $l11nCode);
} }
/** /**