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

feat: global ERP logo implemented

Übergeordneter d0a431e9
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
......@@ -505,6 +505,22 @@
<de><![CDATA[B2C und B2B]]></de>
<en><![CDATA[B2C and B2B]]></en>
</locale>
<locale name="shop.settings.logo">
<de><![CDATA[E-COYN Logo]]></de>
<en><![CDATA[E-COYN Logo]]></en>
</locale>
<locale name="shop.settings.logo.description">
<de><![CDATA[
Das E-COYN Logo wird für verschiedene Shop Aufgaben verwendet.
Wie unter anderem für E-Mails von Bestellungen, Rechnungen und weiteren ERP Modulen.
Wenn kein E-COYN Logo verwendet wird, wird das standard Logo des standard Projektes verwendet.
]]></de>
<en><![CDATA[
The E-COYN logo is used for various shop tasks.
Among other things, for e-mails of orders, invoices and other ERP modules.
If no E-COYN logo is used, the standard logo of the standard project is used.
]]></en>
</locale>
<locale name="control.profile.CustomerData.businessType">
<de><![CDATA[Konto-Typ]]></de>
......
......@@ -19,6 +19,9 @@
<conf name="customerRequestWindow">
<type>string</type>
</conf>
<conf name="logo">
<type>string</type>
</conf>
</section>
<section name="company">
......@@ -159,6 +162,18 @@
<locale group="quiqqer/erp" var="shop.settings.general.precision.description"/>
</description>
</input>
<input type="hidden"
conf="general.logo"
data-qui="controls/projects/project/media/Input"
>
<text>
<locale group="quiqqer/erp" var="shop.settings.logo"/>
</text>
<description>
<locale group="quiqqer/erp" var="shop.settings.logo.description"/>
</description>
</input>
</settings>
<settings>
......
......@@ -36,7 +36,7 @@ class Defaults
* @return QUI\ERP\Areas\Area
* @throws QUI\Exception
*/
public static function getArea()
public static function getArea(): Areas\Area
{
$Areas = new QUI\ERP\Areas\Handler();
$Package = QUI::getPackage('quiqqer/tax');
......@@ -54,7 +54,7 @@ public static function getArea()
*
* @return QUI\Countries\Country
*/
public static function getCountry()
public static function getCountry(): QUI\Countries\Country
{
return QUI\Countries\Manager::getDefaultCountry();
}
......@@ -64,7 +64,7 @@ public static function getCountry()
*
* @return Currency\Currency
*/
public static function getCurrency()
public static function getCurrency(): Currency\Currency
{
return QUI\ERP\Currency\Handler::getDefaultCurrency();
}
......@@ -75,7 +75,7 @@ public static function getCurrency()
* @param QUI\Interfaces\Users\User $User
* @return Currency\Currency|null
*/
public static function getUserCurrency($User = null)
public static function getUserCurrency($User = null): ?Currency\Currency
{
if (self::$userRelatedCurrency !== null) {
if (self::$userRelatedCurrency) {
......@@ -105,7 +105,7 @@ public static function getUserCurrency($User = null)
*
* @return int
*/
public static function getBruttoNettoStatus()
public static function getBruttoNettoStatus(): int
{
try {
$Package = QUI::getPackage('quiqqer/tax');
......@@ -190,9 +190,9 @@ public static function getTimestampFormat($lang = false)
* Return the main date format
*
* @param bool|string $lang
* @return mixed
* @return string
*/
public static function getDateFormat($lang = false)
public static function getDateFormat($lang = false): string
{
if ($lang === false) {
$lang = QUI::getLocale()->getCurrent();
......@@ -221,4 +221,25 @@ public static function getDateFormat($lang = false)
return self::$dateFormat[$lang];
}
/**
* Return the ERP logo
* - if no logo is set, the default logo of the default project will be used
*
* @return false|QUI\Projects\Media\Image|string
*/
public static function getLogo()
{
try {
$Config = QUI::getPackage('quiqqer/erp')->getConfig();
$logo = $Config->get('general', 'logo');
if (!empty($logo)) {
return QUI\Projects\Media\Utils::getImageByUrl($logo);
}
} catch (QUI\Exception $Exception) {
}
return QUI::getProjectManager()->getStandard()->getMedia()->getLogoImage();
}
}
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