Skip to content
Code-Schnipsel Gruppen Projekte
Commit 6c55aa3b erstellt von Patrick Müller's avatar Patrick Müller
Dateien durchsuchen

Merge branch 'next-2.x' into 'main' 

Next 2.x

See merge request !60
Übergeordnete 9b0da5c5 a622ed92
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!60Next 2.x,!50Update 'next-3.x' with latest changes from 'main'
Pipeline-Nr. 14918 mit Warnungen bestanden
Phase: lint
Leerzeichenänderungen ausblenden
Inline Nebeneinander
werden angezeigt mit 33 Ergänzungen und 97 Löschungen
bin/frontend/controls/address/Manager.js
+ 3
− 76
Zeige Datei @ 6c55aa3b
......@@ -25,8 +25,6 @@ define('package/quiqqer/frontend-users/bin/frontend/controls/address/Manager', [
'$editClick',
'$deleteClick',
'$addClick',
'$openContainer',
'$closeContainer',
'$clickCreateSubmit',
'$clickEditSave'
],
......@@ -167,7 +165,7 @@ define('package/quiqqer/frontend-users/bin/frontend/controls/address/Manager', [
const Form = new Element('form', {
'class': 'quiqqer-frontendUsers-controls-profile-control default-content',
html: result,
dataName: 'address-container'
'data-name': 'address-container'
});
QUI.parse(Form).then(function() {
......@@ -293,7 +291,7 @@ define('package/quiqqer/frontend-users/bin/frontend/controls/address/Manager', [
const Form = new Element('form', {
'class': 'quiqqer-frontendUsers-controls-profile-control default-content',
html: result,
dataName: 'address-container'
'data-name': 'address-container'
});
QUI.parse(Form).then(function() {
......@@ -397,7 +395,7 @@ define('package/quiqqer/frontend-users/bin/frontend/controls/address/Manager', [
const Form = new Element('form', {
'class': 'quiqqer-frontendUsers-controls-profile-control default-content',
html: result,
dataName: 'address-container'
'data-name': 'address-container'
});
QUI.parse(Form).then(function() {
......@@ -494,77 +492,6 @@ define('package/quiqqer/frontend-users/bin/frontend/controls/address/Manager', [
//endregion
/**
* Open a div container with effect
*
* @return {Promise}
*/
$openContainer: function(Parent) {
const self = this;
const Container = new Element('div', {
'class': 'quiqqer-frontend-users-address-container',
html: '<div class="quiqqer-frontend-users-address-container-header" data-name="header"></div>' +
'<div class="quiqqer-frontend-users-address-container-content" data-name="content"></div>',
tabIndex: -1,
dataName: 'address-container'
}).inject(Parent);
new Element('span', {
'class': 'fa fa-close quiqqer-frontend-users-address-container-close',
events: {
click: function() {
self.$closeContainer(Container);
}
}
}).inject(Container, 'top');
return new Promise(function(resolve) {
moofx(Container).animate({
left: 0,
opacity: 1
}, {
duration: 250,
callback: function() {
// no scroll animation because after address edit is open
// there may be an animation depend on selected option in "businessType" select
self.getElm().scrollIntoView();
resolve(Container);
}
});
});
},
/**
* Close a div container with effect
*
* @param {HTMLDivElement} Container
* @return {Promise}
*/
$closeContainer: function(Container) {
const self = this;
return new Promise(function(resolve) {
moofx(Container).animate({
left: -50,
opacity: 0
}, {
duration: 250,
callback: function() {
Container.destroy();
self.getElm().setStyle('height', null);
if (self.$Profile) {
self.$Profile.getElm().setStyle('overflow', null);
}
self.resize();
resolve();
}
});
});
},
$removeUnusedNodes: function(Node) {
if (Node.querySelector('button')) {
Node.querySelector('button').destroy();
......
src/QUI/FrontendUsers/Controls/Address/Address.css
+ 14
− 2
Zeige Datei @ 6c55aa3b
/* popup */
.qui-window-popup--frontendUsers-profile {
--_qui-frontend-users-profile__popup__bg-color: var(--qui-frontend-users-profile__popup__bg-color, #f5f5f5);
--_qui-frontend-users-profile__popup__radius: var(--qui-frontend-users-profile__popup__radius, 0.5rem);
--_qui-frontend-users-profile__popup__conten-maxWidth: var(--qui-frontend-users-profile__popup__conten-maxWidth, 30rem);
}
/***********/
/* General */
/***********/
.quiqqer-frontendUsers-manager,
.quiqqer-frontend-users-address {
position: relative;
......@@ -96,8 +106,10 @@
/*****************/
/* Address popup */
/*****************/
.qui-window-popup--frontendUsers-profile .quiqqer-frontend-users-address-create {
max-width: 500px;
.qui-window-popup--frontendUsers-profile .quiqqer-frontend-users-address-create,
.qui-window-popup--frontendUsers-profile .quiqqer-frontend-users-address-edit {
max-width: var(--_qui-frontend-users-profile__popup__conten-maxWidth);
margin-inline: auto;
}
/************************/
/* Address delete popup */
......
src/QUI/FrontendUsers/Controls/Address/Address.html
+ 10
− 12
Zeige Datei @ 6c55aa3b
......@@ -23,18 +23,16 @@
{foreach $addresses as $Address}
<div class="quiqqer-frontend-users-address-list-entry" data-name="address">
<header>
<label>
<span class="fa fa-address-card-o"></span>
{if $Address->getUUID() == $User->getAttribute('address')}
{locale group="quiqqer/frontend-users" var="control.address.header.defaultAddress.title"}
{else}
{locale group="quiqqer/frontend-users" var="control.address.header.title"}
{/if}
<input type="hidden"
name="address"
value="{$Address->getUUID()}"
>
</label>
<span class="fa fa-address-card-o"></span>
{if $Address->getUUID() == $User->getAttribute('address')}
{locale group="quiqqer/frontend-users" var="control.address.header.defaultAddress.title"}
{else}
{locale group="quiqqer/frontend-users" var="control.address.header.title"}
{/if}
<input type="hidden"
name="address"
value="{$Address->getUUID()}"
>
</header>
{$Address->render()}
......
src/QUI/FrontendUsers/Controls/Profile.css
+ 0
− 6
Zeige Datei @ 6c55aa3b
......@@ -33,12 +33,6 @@
}
}
/* popup */
.qui-window-popup--frontendUsers-profile {
--_qui-frontend-users-profile__popup__bg-color: var(--qui-frontend-users-profile__popup__bg-color, #f5f5f5);
--_qui-frontend-users-profile__popup__radius: var(--qui-frontend-users-profile__popup__radius, 0.5rem);
}
/* general */
address {
font-style: normal;
......
src/QUI/FrontendUsers/Controls/Profile.html
+ 1
− 1
Zeige Datei @ 6c55aa3b
......@@ -53,7 +53,7 @@
{if $currentCategory == $category.name && $currentSetting == $setting.name}
{assign var=active value="selected"}
{/if}
<option value="{$category.name}:{$setting.name}" {$active} data-test="{$currentCategory} - {$category.name}" >
<option value="{$category.name}:{$setting.name}" {$active}>
{$setting.title}
</option>
{/foreach}
......
src/QUI/FrontendUsers/EmailVerification.php
+ 5
− 0
Zeige Datei @ 6c55aa3b
......@@ -40,6 +40,11 @@ public function onSuccess(LinkVerification $verification): void
$User = QUI::getUsers()->get($verification->getCustomDataEntry('uuid'));
$email = $verification->getCustomDataEntry('email');
// Set primary email as verified
if ($email === $User->getAttribute('email')) {
Utils::setDefaultUserEmailVerified($User);
}
Utils::setEmailAddressAsVerfifiedForUser($email, $User);
} catch (\Exception $Exception) {
QUI\System\Log::writeException($Exception);
......
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