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

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

fix: only show cancel btn in correct circumstances; use correct verification class for cancel abort

See merge request !21
Übergeordnete 1ddc952f b7cce748
Branches main
Tags 2.1.5
2 Merge Requests!21fix: only show cancel btn in correct circumstances; use correct verification class for cancel abort,!19Update 'next-3.x' with latest changes from 'main'
Pipeline #16032 mit Warnungen bestanden mit Phase
in 56 Sekunden
......@@ -228,7 +228,7 @@ define('package/quiqqer/memberships/bin/controls/profile/UserProfile', [
}
// if autoextend and not cancelled -> hide endDate
if (Membership.cancelStatus == 0) {
if (!Membership.cancelled && Membership.cancelStatus == 0) {
var CancelContainer = MembershipElm.getElement('.quiqqer-memberships-profile-userprofile-btn');
// cancel btn
......
......@@ -1223,7 +1223,7 @@ protected function createAbortCancelVerification(): LinkVerification
{
return $this->verificationFactory->createLinkVerification(
'quiqqer-memberships-users-cancel-abort-' . $this->id,
new CancelVerification(),
new AbortCancelVerification(),
[
'membershipUserId' => $this->id
],
......
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