Jingga/oms-Billing
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Billing.git synced 2026-02-10 13:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

style fixes, bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-28 01:13:22 +00:00
parent cf73c37e21
commit 9590395067
9 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ $pdf->attributes['city'] = $this->getData('bill_company_city') ?? '61206 Woells
$pdf->attributes['ceo'] = $this->getData('bill_company_ceo') ?? 'Dennis Eichhorn';
$pdf->attributes['tax_office'] = $this->getData('bill_company_tax_office') ?? 'HRB ???';
$pdf->attributes['tax_number'] = $this->getData('bill_company_tax_id') ?? '123456789';
$pdf->attributes['terms'] = $this->getData('bill_company_terms') ?? 'https://jingga.app/terms';
$pdf->attributes['bank_name'] = $this->getData('bill_company_bank_name') ?? 'Volksbank Mittelhessen';
$pdf->attributes['swift'] = $this->getData('bill_company_swift') ?? '.....';
@ -282,7 +283,7 @@ $pdf->Ln();
// @todo: fix terms
$pdf->setFont('helvetica', 'B', 8);
$pdf->Write(0, $lang[$pdf->language]['Terms'] . ': https://jingga.app/terms', '', 0, 'L', false, 0, false, false, 0);
$pdf->Write(0, $lang[$pdf->language]['Terms'] . ': ' . $pdf->attributes['terms'], '', 0, 'L', false, 0, false, false, 0);
$pdf->Ln();
$pdf->setFont('helvetica', 'B', 8);

38
Controller/ApiBillController.php
View File

@ -731,24 +731,6 @@ final class ApiBillController extends Controller
$view->setData('bill_title', $request->getDataString('bill_title'));
$view->setData('bill_subtitle', $request->getDataString('bill_subtitle'));
$view->setData('keywords', $request->getDataString('keywords'));
$view->setData('bill_logo_name', $request->getDataString('bill_logo_name'));
$view->setData('bill_slogan', $request->getDataString('bill_slogan'));
$view->setData('legal_company_name', $request->getDataString('legal_company_name'));
$view->setData('bill_company_address', $request->getDataString('bill_company_address'));
$view->setData('bill_company_city', $request->getDataString('bill_company_city'));
$view->setData('bill_company_ceo', $request->getDataString('bill_company_ceo'));
$view->setData('bill_company_website', $request->getDataString('bill_company_website'));
$view->setData('bill_company_email', $request->getDataString('bill_company_email'));
$view->setData('bill_company_phone', $request->getDataString('bill_company_phone'));
$view->setData('bill_company_tax_office', $request->getDataString('bill_company_tax_office'));
$view->setData('bill_company_tax_id', $request->getDataString('bill_company_tax_id'));
$view->setData('bill_company_vat_id', $request->getDataString('bill_company_vat_id'));
$view->setData('bill_company_bank_name', $request->getDataString('bill_company_bank_name'));
$view->setData('bill_company_bic', $request->getDataString('bill_company_bic'));
$view->setData('bill_company_iban', $request->getDataString('bill_company_iban'));
$view->setData('bill_type_name', $request->getDataString('bill_type_name'));
@ -761,6 +743,26 @@ final class ApiBillController extends Controller
$view->setData('bill_taxes', $request->getDataString('bill_taxes'));
$view->setData('bill_currency', $request->getDataString('bill_currency'));
// Unit specifc settings
$view->setData('bill_logo_name', $request->getDataString('bill_logo_name'));
$view->setData('bill_slogan', $request->getDataString('bill_slogan'));
$view->setData('legal_company_name', $request->getDataString('legal_company_name'));
$view->setData('bill_company_address', $request->getDataString('bill_company_address'));
$view->setData('bill_company_city', $request->getDataString('bill_company_city'));
$view->setData('bill_company_ceo', $request->getDataString('bill_company_ceo'));
$view->setData('bill_company_website', $request->getDataString('bill_company_website'));
$view->setData('bill_company_email', $request->getDataString('bill_company_email'));
$view->setData('bill_company_phone', $request->getDataString('bill_company_phone'));
$view->setData('bill_company_terms', $request->getDataString('bill_company_terms'));
$view->setData('bill_company_tax_office', $request->getDataString('bill_company_tax_office'));
$view->setData('bill_company_tax_id', $request->getDataString('bill_company_tax_id'));
$view->setData('bill_company_vat_id', $request->getDataString('bill_company_vat_id'));
$view->setData('bill_company_bank_name', $request->getDataString('bill_company_bank_name'));
$view->setData('bill_company_swift', $request->getDataString('bill_company_swift'));
$view->setData('bill_company_bank_account', $request->getDataString('bill_company_bank_account'));
$pdf = $view->render();
$response->set('', $pdf);

6
Models/Bill.php
View File

@ -100,15 +100,15 @@ class Bill implements \JsonSerializable
/**
* Bill created at.
*
* @var \DateTime
* @var null|\DateTime
* @since 1.0.0
*/
public \DateTime $billDate;
public ?\DateTime $billDate = null;
/**
* Bill created at.
*
* @var \DateTime
* @var null|\DateTime
* @since 1.0.0
*/
public ?\DateTime $performanceDate = null;

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

@ -257,7 +257,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="lni lni-download download btn end-xs"></i></div>
<table
id="invoiceElements"
class="default sticky"
@ -370,7 +370,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12 col-simple">
<section id="mediaFile" class="portlet col-simple">
<div class="portlet-body col-simple">
<iframe class="col-simple" id="iHelperFrame" src="Resources/mozilla/Pdf/web/viewer.html?file=<?= \urlencode(UriFactory::build('{/api}bill/render?id=' . $archive->id)); ?>" loading="lazy" allowfullscreen></iframe>
<iframe class="col-simple" id="iBillArchive" src="Resources/mozilla/Pdf/web/viewer.html?file=<?= \urlencode(UriFactory::build('{/api}bill/render?id=' . $archive->id)); ?>" loading="lazy" allowfullscreen></iframe>
</div>
</section>
</div>
@ -515,7 +515,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Logs'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Logs'); ?><i class="lni lni-download download btn end-xs"></i></div>
<table class="default">
<thead>
<tr>

2
Theme/Backend/purchase-bill-list.tpl.php
View File

@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="lni lni-download download btn end-xs"></i></div>
<div class="slider">
<table id="billList" class="default sticky">
<thead>

4
Theme/Backend/purchase-bill.tpl.php
View File

@ -147,7 +147,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="lni lni-download download btn end-xs"></i></div>
<div class="slider">
<table class="default" id="invoice-item-list">
<thead>
@ -289,7 +289,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12 col-md-6 col-lg-8">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="lni lni-download download btn end-xs"></i></div>
<table class="default" id="invoice-item-list">
<thead>
<tr>

2
Theme/Backend/sales-bill-list.tpl.php
View File

@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="lni lni-download download btn end-xs"></i></div>
<div class="slider">
<table id="billList" class="default sticky">
<thead>

2
Theme/Backend/user-purchase-bill-dashboard.tpl.php
View File

@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="lni lni-download download btn end-xs"></i></div>
<div class="slider">
<table id="billList" class="default sticky">
<thead>

4
Theme/Backend/user-purchase-bill.tpl.php
View File

@ -147,7 +147,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="lni lni-download download btn end-xs"></i></div>
<table class="default" id="invoice-item-list">
<thead>
<tr>
@ -287,7 +287,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12 col-md-6 col-lg-8">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="fa fa-download floatRight download btn"></i></div>
<div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="lni lni-download download btn end-xs"></i></div>
<table class="default" id="invoice-item-list">
<thead>
<tr>