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

Merge branch 'dev'

Übergeordnete f85b3e57 4a50bda5
No related branches found
No related tags found
2 Merge Requests!6feat!: quiqqer v2,!5feat!: quiqqer v2
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
*/ */
define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans', [ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans', [
'qui/QUI',
'qui/controls/Control', 'qui/controls/Control',
'qui/controls/loader/Loader', 'qui/controls/loader/Loader',
'qui/controls/windows/Confirm', 'qui/controls/windows/Confirm',
'qui/controls/buttons/Button',
'controls/grid/Grid', 'controls/grid/Grid',
'package/quiqqer/payment-stripe/bin/Stripe', 'package/quiqqer/payment-stripe/bin/Stripe',
...@@ -17,7 +17,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan ...@@ -17,7 +17,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
'css!package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans.css' 'css!package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans.css'
], function (QUIControl, QUILoader, QUIConfirm, QUIButton, Grid, Stripe, QUILocale) { ], function (QUI, QUIControl, QUILoader, QUIConfirm, Grid, Stripe, QUILocale) {
"use strict"; "use strict";
var lg = 'quiqqer/payment-stripe'; var lg = 'quiqqer/payment-stripe';
...@@ -42,6 +42,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan ...@@ -42,6 +42,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
this.$Content = null; this.$Content = null;
this.Loader = new QUILoader(); this.Loader = new QUILoader();
this.$startId = null; this.$startId = null;
this.$Panel = null;
this.addEvents({ this.addEvents({
onCreate: this.$onCreate, onCreate: this.$onCreate,
...@@ -75,7 +76,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan ...@@ -75,7 +76,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
if (result.data.length && result.data[0].isSandbox) { if (result.data.length && result.data[0].isSandbox) {
detailsUrl = 'https://dashboard.stripe.com/test/plans/'; detailsUrl = 'https://dashboard.stripe.com/test/plans/';
} else { } else {
detailsUrl = 'https://dashboard.stripe.com/plans/' detailsUrl = 'https://dashboard.stripe.com/plans/';
} }
var $onDetailsClick = function (event) { var $onDetailsClick = function (event) {
...@@ -119,10 +120,10 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan ...@@ -119,10 +120,10 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
this.Loader.inject(this.$Content); this.Loader.inject(this.$Content);
this.$Content.getParent('form').setStyle('height', '100%'); this.$Content.getParent('form').setStyle('height', 'calc(100% - 40px)');
this.$Content.getParent('table').setStyle('height', '100%'); this.$Content.getParent('table').setStyle('height', 'calc(100% - 40px)');
this.$Content.getParent('tbody').setStyle('height', '100%'); this.$Content.getParent('tbody').setStyle('height', 'calc(100% - 40px)');
this.$Content.getParent('.field-container').setStyle('height', '100%'); this.$Content.getParent('.field-container').setStyle('height', 'calc(100% - 40px)');
this.create(); this.create();
this.$onCreate(); this.$onCreate();
...@@ -204,6 +205,9 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan ...@@ -204,6 +205,9 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
} }
}); });
this.$Panel = QUI.Controls.getById(this.getElm().getParent('.qui-panel').get('data-quiid'));
this.$Panel.addEvent('onResize', this.$onResize);
this.$onResize(); this.$onResize();
}, },
...@@ -215,10 +219,12 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan ...@@ -215,10 +219,12 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
return; return;
} }
var size = this.$Content.getSize(); var size = this.$Panel.getContent().getSize();
this.$Content.setStyle('width', size.x - 60);
this.$Grid.setHeight(size.y - 20); this.$Grid.setHeight(size.y - 140);
this.$Grid.setWidth(size.x - 20); this.$Grid.setWidth(size.x - 60);
this.$Grid.resize(); this.$Grid.resize();
}, },
......
...@@ -44,6 +44,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio ...@@ -44,6 +44,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
this.$search = false; this.$search = false;
this.$SearchInput = null; this.$SearchInput = null;
this.$Panel = null;
this.addEvents({ this.addEvents({
onCreate: this.$onCreate, onCreate: this.$onCreate,
...@@ -145,10 +146,10 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio ...@@ -145,10 +146,10 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
this.Loader.inject(this.$Content); this.Loader.inject(this.$Content);
this.$Content.getParent('form').setStyle('height', '100%'); this.$Content.getParent('form').setStyle('height', 'calc(100% - 40px)');
this.$Content.getParent('table').setStyle('height', '100%'); this.$Content.getParent('table').setStyle('height', 'calc(100% - 40px)');
this.$Content.getParent('tbody').setStyle('height', '100%'); this.$Content.getParent('tbody').setStyle('height', 'calc(100% - 40px)');
this.$Content.getParent('.field-container').setStyle('height', '100%'); this.$Content.getParent('.field-container').setStyle('height', 'calc(100% - 40px)');
this.create(); this.create();
this.$onCreate(); this.$onCreate();
...@@ -258,6 +259,9 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio ...@@ -258,6 +259,9 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
} }
}); });
this.$Panel = QUI.Controls.getById(this.getElm().getParent('.qui-panel').get('data-quiid'));
this.$Panel.addEvent('onResize', this.$onResize);
this.$onResize(); this.$onResize();
}, },
...@@ -269,10 +273,12 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio ...@@ -269,10 +273,12 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
return; return;
} }
var size = this.$Content.getSize(); var size = this.$Panel.getContent().getSize();
this.$Content.setStyle('width', size.x - 60);
this.$Grid.setHeight(size.y - 20); this.$Grid.setHeight(size.y - 180);
this.$Grid.setWidth(size.x - 20); this.$Grid.setWidth(size.x - 60);
this.$Grid.resize(); this.$Grid.resize();
}, },
......
...@@ -151,6 +151,10 @@ ...@@ -151,6 +151,10 @@
</title> </title>
<settings name="stripe_billing_plans" title="stripe_billing_plans"> <settings name="stripe_billing_plans" title="stripe_billing_plans">
<title>
<locale group="quiqqer/payment-stripe" var="settings.category.stripe_billing_plans.title"/>
</title>
<input type="hidden" data-qui="package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans" label="false"> <input type="hidden" data-qui="package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans" label="false">
</input> </input>
</settings> </settings>
...@@ -164,6 +168,10 @@ ...@@ -164,6 +168,10 @@
</title> </title>
<settings name="stripe_billing_plan_subscriptions" title="stripe_billing_plan_subscriptions"> <settings name="stripe_billing_plan_subscriptions" title="stripe_billing_plan_subscriptions">
<title>
<locale group="quiqqer/payment-stripe" var="settings.category.stripe_billing_plan_subscriptions.title"/>
</title>
<input type="hidden" data-qui="package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptions" label="false"> <input type="hidden" data-qui="package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptions" label="false">
</input> </input>
</settings> </settings>
......
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