Skip to content
Code-Schnipsel Gruppen Projekte
Commit 4ccf0a10 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

feat: Currency Switch use the reworked version of... 

feat: Currency Switch use the reworked version of package/quiqqer/currency/bin/controls/Switch #86
Übergeordneter de113b1a
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/css/style.css
+ 32
− 0
Zeige Datei @ 4ccf0a10
......@@ -607,6 +607,7 @@ a.toTop:before {
/******************************/
.topbar-right > .quiqqer-bricks-languageswitch-dropdown {
height: 100%;
flex-shrink: 0;
}
/*
......@@ -620,6 +621,37 @@ a.toTop:before {
height: 100%;
}
.quiqqer-control-languageswitch-dropdown-dd-entry:hover {
color: inherit;
}
.quiqqer-control-languageswitch-dropdown-dd {
box-shadow: 0 7px 22px -5px rgba(48, 60, 72, 0.2);
}
/*******************/
/* Currency switch */
/*******************/
/*
1. because `.cologne-header` has z-index 99, we must set this control to 100
*/
.topbar-right .quiqqer-currency-switch {
z-index: 100; /* 1 */
height: 100%;
display: flex;
align-items: center;
padding-right: 0.5em;
position: relative;
}
.quiqqer-currency-switch-dd {
box-shadow: 0 7px 22px -5px rgba(48, 60, 72, 0.2);
}
.quiqqer-currency-switch-sign {
font-size: 1.2rem;
}
/***************************/
/* template product search */
/***************************/
......
src/QUI/TemplateCologne/Controls/CurrencySwitch.css
+ 14
− 106
Zeige Datei @ 4ccf0a10
.currency-switch {
align-items: center;
display: inline-flex;
height: 100%;
position: relative;
}
.lcs-button {
cursor: pointer;
white-space: nowrap;
}
.lcs-button.lcs-button__no-hover {
/**********/
/* button */
/**********/
.quiqqer-currency-switch-display.placeholder {
opacity: 0.5;
cursor: default;
}
.lcs-button.lcs-button__no-hover:hover {
color: inherit;
}
.lcs-button.lcs-button__no-hover:hover .lcs-button-currency-code.text-muted {
color: #9ba3ad;
}
.lcs-button.lcs-button__no-hover .fa {
display: none;
}
.lcs-button-flag {
border-right: 1px solid #ddd;
padding: 0 1rem;
}
.lcs-button-currency {
font-weight: 300;
margin: 0 1rem;
}
.lcs-button-currency-sign {
}
/* loader */
.qui-loader-inner > div {
align-items: center;
display: flex;
justify-content: center;
}
.qui-loader-inner .qui-loader-inner-fa-circle-o-notch .fa-spin,
.qui-loader-inner .qui-loader-inner-fa-gear .fa-spin,
.qui-loader-inner .qui-loader-inner-fa-refresh .fa-spin,
.qui-loader-inner .qui-loader-inner-fa-spinner .fa-spin {
font-size: 1.5rem;
position: initial;
top: 0;
}
/********/
/* menu */
/********/
.lcs-menu-wrapper {
bottom: 0;
position: absolute;
right: 0;
}
.lcs-menu {
background: #fff;
border: 1px solid rgb(221, 221, 221);
box-shadow: 0 7px 22px -5px rgba(48, 60, 72, 0.2);
min-width: 200px;
padding: 16px 20px;
/* custom loader */
.quiqqer-currency-switch-customLoader {
position: absolute;
right: 0;
z-index: 1001;
}
.lcs-menu:focus {
border: 1px solid red !important;
}
/* currency */
.lcs-menu .quiqqer-currency-switch {
border: 1px solid #ddd;
border-radius: 0.25rem;
display: flex;
float: none;
position: relative;
/*line-height: 40px;*/
/*height: 40px;*/
}
.quiqqer-currency-switch.button {
align-items: center;
display: flex;
padding: 0 10px;
width: 100%;
}
.quiqqer-currency-switch .quiqqer-currency-switch-arrow {
margin-left: auto;
position: initial;
font-size: 1.5em;
left: calc(50% - 0.75em);
}
/* currency */
.quiqqer-currency-switch-dd {
border: 1px solid rgb(221, 221, 221) !important;
box-shadow: 0 7px 22px -5px rgba(48, 60, 72, 0.2) !important;
display: none;
/* styling from: packages/quiqqer/currency/bin/controls/Switch.css to avoid jumping effect */
.quiqqer-currency-switch-sign.placeholder {
margin-right: 0.5em;
}
.quiqqer-currency-switch-dd:after {
display: none;
.quiqqer-currency-switch-display.placeholder {
display: inline;
}
\ No newline at end of file
src/QUI/TemplateCologne/Controls/CurrencySwitch.html
+ 7
− 14
Zeige Datei @ 4ccf0a10
<div class="lcs-button">
{if $currencySwitch}
<span class="lcs-button-currency" title="{$DefaultCurrency->getText()}">
<span class="lcs-button-currency-sign">{$DefaultCurrency->getSign()}</span>
<span class="lcs-button-currency-code text-muted">{$DefaultCurrency->getCode()}</span>
</span>
{/if}
{if $enableChange}
<span class="fa fa-caret-down"></span>
{/if}
</div>
<div class="lcs-menu-wrapper"></div>
\ No newline at end of file
{strip}
<div class="quiqqer-currency-switch-display placeholder" title="{$DefaultCurrency->getText()}">
<span class="quiqqer-currency-switch-sign placeholder">{$DefaultCurrency->getSign()}</span>
<span class="quiqqer-currency-switch-code placeholder">{$DefaultCurrency->getCode()}</span>
</div>
{* <span class="fa fa-spinner fa-pulse fa-fw quiqqer-currency-switch-customLoader"></span>*}
{/strip}
\ No newline at end of file
src/QUI/TemplateCologne/Controls/CurrencySwitch.php
+ 11
− 19
Zeige Datei @ 4ccf0a10
......@@ -21,12 +21,11 @@ class CurrencySwitch extends QUI\Control
public function __construct($attributes = [])
{
$this->setAttributes([
'class' => 'currency-switch',
// 'data-qui' => 'package/quiqqer/template-cologne/bin/javascript/controls/CurrencySwitch',
'class' => 'quiqqer-currency-switch',
'userRelatedCurrency' => 1, // 1 / 0 -> is user allowed to change currency?
]);
$this->addCSSFile(dirname(__FILE__) . '/CurrencySwitch.css');
$this->addCSSFile(dirname(__FILE__).'/CurrencySwitch.css');
parent::__construct($attributes);
}
......@@ -40,32 +39,27 @@ public function __construct($attributes = [])
*/
public function getBody()
{
$Engine = QUI::getTemplateManager()->getEngine();
$enableChange = false;
$Engine = QUI::getTemplateManager()->getEngine();
// is user allowed to change currency?
$currencySwitch = false;
$userrelatedcurrency = 0;
$this->setJavaScriptControlOption('buttonshowsign', 1);
$this->setJavaScriptControlOption('dropdownshowsign', 1);
$this->setJavaScriptControlOption('showarrow', 0);
$this->setJavaScriptControlOption('showloader', 0);
$this->setJavaScriptControlOption('dropdownposition', 'right');
// is user allowed to change currency?
if ($this->isCurrencySwitchAllowed()) {
try {
$Package = QUI::getPackage('quiqqer/erp');
$Config = $Package->getConfig();
if ($Config->getValue('general', 'userRelatedCurrency')) {
$userrelatedcurrency = 1;
$currencySwitch = true;
$this->setJavaScriptControl('package/quiqqer/currency/bin/controls/Switch');
}
} catch (QUI\Exception $Exception) {
QUI\System\Log::writeException($Exception);
}
}
$this->setJavaScriptControlOption('userrelatedcurrency', $userrelatedcurrency);
if ($currencySwitch) {
$enableChange = true;
}
$Currency = QUI\ERP\Currency\Handler::getDefaultCurrency();
......@@ -75,12 +69,10 @@ public function getBody()
$Engine->assign([
'this' => $this,
'currencySwitch' => $currencySwitch,
'DefaultCurrency' => $Currency,
'enableChange' => $enableChange
]);
return $Engine->fetch(dirname(__FILE__) . '/CurrencySwitch.html');
return $Engine->fetch(dirname(__FILE__).'/CurrencySwitch.html');
}
/**
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab