mirror of
https://github.com/Karaka-Management/oms-Finance.git
synced 2026-02-14 04:18:41 +00:00
bug fixes
This commit is contained in:
parent
abb607bccc
commit
0bb381dcd9
|
|
@ -83,7 +83,7 @@ final class Installer extends InstallerAbstract
|
||||||
$request->setData('percentage_input_tax', $data['percentage_input_tax'] ?? 0);
|
$request->setData('percentage_input_tax', $data['percentage_input_tax'] ?? 0);
|
||||||
$request->setData('tax1', $data['tax1_account'] ?? null);
|
$request->setData('tax1', $data['tax1_account'] ?? null);
|
||||||
$request->setData('tax2', $data['tax2_account'] ?? null);
|
$request->setData('tax2', $data['tax2_account'] ?? null);
|
||||||
$request->setData('title', \reset($data['l11n'])['title'] ?? '');
|
$request->setData('content', \reset($data['l11n'])['title'] ?? '');
|
||||||
$request->setData('short', \reset($data['l11n'])['short'] ?? '');
|
$request->setData('short', \reset($data['l11n'])['short'] ?? '');
|
||||||
$request->setData('long', \reset($data['l11n'])['long'] ?? '');
|
$request->setData('long', \reset($data['l11n'])['long'] ?? '');
|
||||||
$request->setData('language', \array_keys($data['l11n'])[0]);
|
$request->setData('language', \array_keys($data['l11n'])[0]);
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ final class ApiController extends Controller
|
||||||
{
|
{
|
||||||
$val = [];
|
$val = [];
|
||||||
if (($val['abbr'] = !$request->hasData('abbr'))
|
if (($val['abbr'] = !$request->hasData('abbr'))
|
||||||
|| ($val['title'] = !$request->hasData('title'))
|
|| ($val['content'] = !$request->hasData('content'))
|
||||||
) {
|
) {
|
||||||
return $val;
|
return $val;
|
||||||
}
|
}
|
||||||
|
|
@ -100,8 +100,8 @@ final class ApiController extends Controller
|
||||||
$code->taxAccount1 = $request->getDataString('tax1');
|
$code->taxAccount1 = $request->getDataString('tax1');
|
||||||
$code->taxAccount2 = $request->getDataString('tax2');
|
$code->taxAccount2 = $request->getDataString('tax2');
|
||||||
|
|
||||||
if ($request->hasData('title')) {
|
if ($request->hasData('content')) {
|
||||||
$code->l11n->title = $request->getDataString('title') ?? '';
|
$code->l11n->title = $request->getDataString('content') ?? '';
|
||||||
$code->l11n->short = $request->getDataString('short') ?? '';
|
$code->l11n->short = $request->getDataString('short') ?? '';
|
||||||
$code->l11n->long = $request->getDataString('long') ?? '';
|
$code->l11n->long = $request->getDataString('long') ?? '';
|
||||||
$code->l11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? 'en';
|
$code->l11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? 'en';
|
||||||
|
|
@ -122,7 +122,7 @@ final class ApiController extends Controller
|
||||||
private function validateTaxCodeL11nCreate(RequestAbstract $request) : array
|
private function validateTaxCodeL11nCreate(RequestAbstract $request) : array
|
||||||
{
|
{
|
||||||
$val = [];
|
$val = [];
|
||||||
if (($val['title'] = !$request->hasData('title'))
|
if (($val['content'] = !$request->hasData('content'))
|
||||||
|| ($val['code'] = !$request->hasData('code'))
|
|| ($val['code'] = !$request->hasData('code'))
|
||||||
) {
|
) {
|
||||||
return $val;
|
return $val;
|
||||||
|
|
@ -170,7 +170,7 @@ final class ApiController extends Controller
|
||||||
private function createTaxCodeL11nFromRequest(RequestAbstract $request) : TaxCodeL11n
|
private function createTaxCodeL11nFromRequest(RequestAbstract $request) : TaxCodeL11n
|
||||||
{
|
{
|
||||||
$l11n = new TaxCodeL11n();
|
$l11n = new TaxCodeL11n();
|
||||||
$l11n->title = $request->getDataString('title') ?? '';
|
$l11n->title = $request->getDataString('content') ?? '';
|
||||||
$l11n->short = $request->getDataString('short') ?? '';
|
$l11n->short = $request->getDataString('short') ?? '';
|
||||||
$l11n->long = $request->getDataString('long') ?? '';
|
$l11n->long = $request->getDataString('long') ?? '';
|
||||||
$l11n->code = $request->getDataInt('code') ?? 0;
|
$l11n->code = $request->getDataInt('code') ?? 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user