Jingga/oms-Billing
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Billing.git synced 2026-01-11 15:18:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

continue with getter/setter removal

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 04:15:33 +02:00
parent 3758770718
commit ae7b7d2999
7 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/Media/bill.pdf.php
View File

@ -41,7 +41,7 @@ $pdf->setAuthor($this->getData('bill_creator') ?? 'Jingga');
$pdf->setTitle($this->getData('bill_title') ?? $bill->type->getL11n());
$pdf->setSubject($this->getData('bill_subtitle') ?? '');
$pdf->setKeywords(\implode(', ', $this->getData('keywords') ?? []));
$pdf->language = $bill->getLanguage();
$pdf->language = $bill->language;
$pdf->attributes['legal_name'] = $this->getData('legal_company_name') ?? 'Jingga e.K.';
$pdf->attributes['address'] = $this->getData('bill_company_address') ?? 'Gartenstr. 26';

4
Controller/ApiAttributeController.php
View File

@ -162,7 +162,7 @@ final class ApiAttributeController extends Controller
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('type') ?? 0;
$attrL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
$request->getDataString('language') ?? $request->header->l11n->language
);
$attrL11n->content = $request->getDataString('title') ?? '';
@ -387,7 +387,7 @@ final class ApiAttributeController extends Controller
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('value') ?? 0;
$attrL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
$request->getDataString('language') ?? $request->header->l11n->language
);
$attrL11n->content = $request->getDataString('title') ?? '';

8
Controller/ApiBillController.php
View File

@ -303,7 +303,7 @@ final class ApiBillController extends Controller
*/
public function createBaseBillElement(Client $client, Item $item, Bill $bill, RequestAbstract $request) : BillElement
{
$taxCode = $this->app->moduleManager->get('Billing', 'ApiTax')->getTaxCodeFromClientItem($client, $item, $request->getCountry());
$taxCode = $this->app->moduleManager->get('Billing', 'ApiTax')->getTaxCodeFromClientItem($client, $item, $request->header->l11n->country);
$element = BillElement::fromItem(
$item,
@ -586,7 +586,7 @@ final class ApiBillController extends Controller
->with('l11n/type')
->where('id', $request->getDataInt('item') ?? 0)
->where('l11n/type/title', ['name1', 'name2', 'name3'], 'IN')
->where('l11n/language', $bill->getLanguage())
->where('l11n/language', $bill->language)
->execute();
$element = $this->createBaseBillElement($bill->client, $item, $bill, $request);
@ -802,7 +802,7 @@ final class ApiBillController extends Controller
->with('type/defaultTemplate')
->with('elements')
->where('id', $request->getDataInt('bill') ?? 0)
->where('type/l11n/language', $bill->getLanguage())
->where('type/l11n/language', $bill->language)
->execute();
$templateId = $request->getDataInt('bill_template');
@ -918,7 +918,7 @@ final class ApiBillController extends Controller
? $tmp
: $client->account->getEmail();
$this->sendBillEmail($media, $email, $response->getLanguage());
$this->sendBillEmail($media, $email, $response->header->l11n->language);
}
// Add type to media

2
Controller/ApiBillTypeController.php
View File

@ -157,7 +157,7 @@ final class ApiBillTypeController extends Controller
$billTypeL11n = new BaseStringL11n();
$billTypeL11n->ref = $request->getDataInt('type') ?? 0;
$billTypeL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
$request->getDataString('language') ?? $request->header->l11n->language
);
$billTypeL11n->content = $request->getDataString('title') ?? '';

16
Controller/BackendController.php
View File

@ -68,7 +68,7 @@ final class BackendController extends Controller
->with('type/l11n')
->with('client')
->where('type/transferType', BillTransferType::SALES)
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->sort('id', OrderType::DESC)
->limit(25);
@ -170,7 +170,7 @@ final class BackendController extends Controller
->with('l11n')
->where('isTemplate', false)
->where('transferType', BillTransferType::SALES)
->where('l11n/language', $request->getLanguage())
->where('l11n/language', $request->header->l11n->language)
->execute();
$view->setData('billtypes', $billTypes);
@ -255,21 +255,21 @@ final class BackendController extends Controller
$mapperQuery
->where('id', $request->getDataInt('id') ?? 0, '<')
->where('supplier', null, '!=')
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->execute()
);
} elseif ($request->getData('ptype') === 'n') {
$view->setData('bills',
$mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')
->where('supplier', null, '!=')
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->execute()
);
} else {
$view->setData('bills',
$mapperQuery->where('id', 0, '>')
->where('supplier', null, '!=')
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->execute()
);
}
@ -765,19 +765,19 @@ final class BackendController extends Controller
$view->setData('bills',
$mapperQuery
->where('id', $request->getDataInt('id') ?? 0, '<')
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->execute()
);
} elseif ($request->getData('ptype') === 'n') {
$view->setData('bills',
$mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->execute()
);
} else {
$view->setData('bills',
$mapperQuery->where('id', 0, '>')
->where('type/l11n/language', $response->getLanguage())
->where('type/l11n/language', $response->header->l11n->language)
->execute()
);
}

26
Models/Bill.php
View File

@ -610,32 +610,6 @@ class Bill implements \JsonSerializable
return $this->currency;
}
/**
* Set language.
*
* @param string $language Language
*
* @return void
*
* @since 1.0.0
*/
public function setLanguage(string $language) : void
{
$this->language = $language;
}
/**
* Get language.
*
* @return string
*
* @since 1.0.0
*/
public function getLanguage() : string
{
return $this->language;
}
/**
* Get vouchers.
*

2
Theme/Backend/bill-create.tpl.php
View File

@ -71,7 +71,7 @@ echo $this->getData('nav')->render(); ?>
<label for="iLanguage"><?= $this->getHtml('Language'); ?></label>
<select id="iLanguage" name="bill_language"<?= $disabled; ?>>
<?php foreach ($languages as $code => $language) : $code = \strtolower(\substr($code, 1)); ?>
<option value="<?= $this->printHtml($code); ?>"<?= $code === $bill->getLanguage() ? ' selected' : ''; ?>><?= $this->printHtml($language); ?>
<option value="<?= $this->printHtml($code); ?>"<?= $code === $bill->language ? ' selected' : ''; ?>><?= $this->printHtml($language); ?>
<?php endforeach; ?>
</select>
</div>