diff --git a/Admin/Install/taxcodes.json b/Admin/Install/taxcodes.json index b27c01d..c5d7d06 100755 --- a/Admin/Install/taxcodes.json +++ b/Admin/Install/taxcodes.json @@ -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": { "abbr": "S0", "percentage_invoice": 0, @@ -15,6 +41,11 @@ "title": "S0", "short": "", "long": "" + }, + "en": { + "title": "S0", + "short": "", + "long": "" } } }, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 7d3199d..ca7b49d 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -19,10 +19,8 @@ use Modules\Finance\Models\TaxCodeL11n; use Modules\Finance\Models\TaxCodeL11nMapper; use Modules\Finance\Models\TaxCodeMapper; use phpOMS\Message\Http\RequestStatusCode; -use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; -use phpOMS\Model\Message\FormValidation; /** * Finance class. @@ -71,16 +69,15 @@ final class ApiController extends Controller public function apiTaxCodeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { 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; } $code = $this->createTaxCodeFromRequest($request); $this->createModel($request->header->account, $code, TaxCodeMapper::class, 'tax_code', $request->getOrigin()); - - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Code', 'Tax code successfully created', $code); + $this->createStandardCreateResponse($request, $response, $code); } /** @@ -147,16 +144,15 @@ final class ApiController extends Controller public function apiTaxCodeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { 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; } $l11nCode = $this->createTaxCodeL11nFromRequest($request); $this->createModel($request->header->account, $l11nCode, TaxCodeL11nMapper::class, 'tax_code_l11n', $request->getOrigin()); - - $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Localization', 'Localization successfully created', $l11nCode); + $this->createStandardCreateResponse($request, $response, $l11nCode); } /**