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

template fixes + bug fixes + style fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:47 +00:00
parent f24eb6ab66
commit f27b00d6b1
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/ApiController.php
View File

@ -95,7 +95,7 @@ final class ApiController extends Controller
$code = new TaxCode(); $code = new TaxCode();
$code->abbr = $request->getDataString('abbr') ?? ''; $code->abbr = $request->getDataString('abbr') ?? '';
$code->percentageInvoice = $request->getDataInt('percentage_invoice') ?? 0; $code->percentageInvoice = $request->getDataInt('percentage_invoice') ?? 0;
$code->percentageOutput = $request->getDataInt('percentage_sales_tax') ?? 0; $code->percentageOutput = $request->getDataInt('percentage_sales_tax') ?? 0;
$code->percentageInput = $request->getDataInt('percentage_input_tax') ?? 0; $code->percentageInput = $request->getDataInt('percentage_input_tax') ?? 0;
$code->taxAccount1 = $request->getDataString('tax1'); $code->taxAccount1 = $request->getDataString('tax1');
$code->taxAccount2 = $request->getDataString('tax2'); $code->taxAccount2 = $request->getDataString('tax2');
@ -225,7 +225,7 @@ final class ApiController extends Controller
{ {
$new->abbr = $request->getDataString('abbr') ?? $new->abbr; $new->abbr = $request->getDataString('abbr') ?? $new->abbr;
$new->percentageInvoice = $request->getDataInt('percentage_invoice') ?? $new->percentageInvoice; $new->percentageInvoice = $request->getDataInt('percentage_invoice') ?? $new->percentageInvoice;
$new->percentageOutput = $request->getDataInt('percentage_sales_tax') ?? $new->percentageOutput; $new->percentageOutput = $request->getDataInt('percentage_sales_tax') ?? $new->percentageOutput;
$new->percentageInput = $request->getDataInt('percentage_input_tax') ?? $new->percentageInput; $new->percentageInput = $request->getDataInt('percentage_input_tax') ?? $new->percentageInput;
return $new; return $new;

1
Controller/BackendController.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace Modules\Finance\Controller; namespace Modules\Finance\Controller;
use Modules\Finance\Models\TaxCodeMapper; use Modules\Finance\Models\TaxCodeMapper;
use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;

8
Theme/Backend/Lang/de.lang.php
View File

@ -103,9 +103,9 @@ return ['Finance' => [
'Turnover' => 'Umsatz', 'Turnover' => 'Umsatz',
'Type' => 'Typ', 'Type' => 'Typ',
'ZipCode' => 'Postleitzahl', 'ZipCode' => 'Postleitzahl',
'TaxCodes' => 'Steuerkz.', 'TaxCodes' => 'Steuerkz.',
'TaxCode' => 'Steuerkz.', 'TaxCode' => 'Steuerkz.',
'Purchase' => 'Einkauf', 'Purchase' => 'Einkauf',
'Tax1Account' => 'Steuerkonto 1', 'Tax1Account' => 'Steuerkonto 1',
'Tax2Account' => 'Steyerkonto 2', 'Tax2Account' => 'Steyerkonto 2',
]]; ]];

8
Theme/Backend/Lang/en.lang.php
View File

@ -103,9 +103,9 @@ return ['Finance' => [
'Turnover' => 'Turnover', 'Turnover' => 'Turnover',
'Type' => 'Type', 'Type' => 'Type',
'ZipCode' => 'Zip Code', 'ZipCode' => 'Zip Code',
'TaxCodes' => 'Tax Codes', 'TaxCodes' => 'Tax Codes',
'TaxCode' => 'Tax Code', 'TaxCode' => 'Tax Code',
'Purchase' => 'Purchase', 'Purchase' => 'Purchase',
'Tax1Account' => 'Tax Account 1', 'Tax1Account' => 'Tax Account 1',
'Tax2Account' => 'Tax Account 2', 'Tax2Account' => 'Tax Account 2',
]]; ]];

4
Theme/Backend/finance-taxcode-list.tpl.php
View File

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$taxcode = $this->data['taxcode']; $taxcode = $this->data['taxcode'];
$previous = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&id=' . \reset($taxcode)->id . '&ptype=p'; $previous = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&offset=' . \reset($taxcode)->id . '&ptype=p';
$next = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&id=' . \end($taxcode)->id . '&ptype=n'; $next = empty($taxcode) ? '{/base}/finance/tax/code/list' : '{/base}/finance/tax/code/list?{?}&offset=' . \end($taxcode)->id . '&ptype=n';
echo $this->data['nav']->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">