Skip to content
Code-Schnipsel Gruppen Projekte
Commit 7000827d erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

feat: #67 - global invoice text

Übergeordneter e6166794
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
......@@ -463,6 +463,19 @@
<en><![CDATA[Cancellation invoice]]></en>
</locale>
<locale name="global.invoice.text">
<de><![CDATA[]]></de>
<en><![CDATA[]]></en>
</locale>
<locale name="invoice.settings.invoice.globalInvoiceText">
<de><![CDATA[Globaler Rechnungstext]]></de>
<en><![CDATA[Global invoice text]]></en>
</locale>
<locale name="invoice.settings.invoice.globalInvoiceText.description">
<de><![CDATA[Dieser Text wird in jeder Rechnung als zusätzlicher Text angezeigt.]]></de>
<en><![CDATA[This text is displayed in every invoice as additional text.]]></en>
</locale>
</groups>
<groups name="quiqqer/invoice" datatype="js">
......
......@@ -24,6 +24,9 @@
<type><![CDATA[integer]]></type>
<defaultvalue><![CDATA[1]]></defaultvalue>
</conf>
<conf name="globalInvoiceText">
<type><![CDATA[string]]></type>
</conf>
</section>
<section name="temporaryInvoice">
......@@ -123,6 +126,22 @@
var="invoice.settings.invoice.openPrintDialogAfterPost.description"/>
</description>
</input>
<input type="hidden"
data-qui="package/quiqqer/translator/bin/controls/Update"
data-qui-options-group="quiqqer/invoice"
data-qui-options-package="quiqqer/invoice"
data-qui-options-var="global.invoice.text"
>
<text>
<locale group="quiqqer/invoice"
var="invoice.settings.invoice.globalInvoiceText"/>
</text>
<description>
<locale group="quiqqer/invoice"
var="invoice.settings.invoice.globalInvoiceText.description"/>
</description>
</input>
</settings>
<settings title="invoiceDownload" name="invoiceDownload">
......
......@@ -160,17 +160,25 @@ public static function getTemplateData($entityId)
$InvoiceView->setAttributes($Invoice->getAttributes());
// global invoice text
$globalInvoiceText = '';
if (QUI::getLocale()->get('quiqqer/invoice', 'global.invoice.text') !== '') {
$globalInvoiceText = QUI::getLocale()->get('quiqqer/invoice', 'global.invoice.text');
}
return [
'this' => $InvoiceView,
'ArticleList' => $Articles,
'Customer' => $Customer,
'Editor' => $Editor,
'Address' => $Address,
'DeliveryAddress' => $DeliveryAddress,
'Payment' => $Invoice->getPayment(),
'transaction' => $InvoiceView->getTransactionText(),
'projectName' => $Invoice->getAttribute('project_name'),
'useShipping' => QUI::getPackageManager()->isInstalled('quiqqer/shipping')
'this' => $InvoiceView,
'ArticleList' => $Articles,
'Customer' => $Customer,
'Editor' => $Editor,
'Address' => $Address,
'DeliveryAddress' => $DeliveryAddress,
'Payment' => $Invoice->getPayment(),
'transaction' => $InvoiceView->getTransactionText(),
'projectName' => $Invoice->getAttribute('project_name'),
'useShipping' => QUI::getPackageManager()->isInstalled('quiqqer/shipping'),
'globalInvoiceText' => $globalInvoiceText
];
}
......@@ -198,6 +206,7 @@ public static function hasDownloadPermission($entityId, User $User)
return $User->getId() === $Customer->getId();
} catch (\Exception $Exception) {
QUI\System\Log::writeException($Exception);
return false;
}
}
......@@ -279,6 +288,7 @@ protected static function getCompanyName()
$company = $Conf->get('company', 'name');
} catch (\Exception $Exception) {
QUI\System\Log::writeException($Exception);
return '';
}
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren