Merge branch 'dev'

bin/controls/backend/settings/BillingPlans.js

@@ -6,10 +6,10 @@
  */
 define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlans', [
 
+    'qui/QUI',
     'qui/controls/Control',
     'qui/controls/loader/Loader',
     'qui/controls/windows/Confirm',
-    'qui/controls/buttons/Button',
     'controls/grid/Grid',
     'package/quiqqer/payment-stripe/bin/Stripe',
 
@@ -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'
 
-], function (QUIControl, QUILoader, QUIConfirm, QUIButton, Grid, Stripe, QUILocale) {
+], function (QUI, QUIControl, QUILoader, QUIConfirm, Grid, Stripe, QUILocale) {
     "use strict";
 
     var lg = 'quiqqer/payment-stripe';
@@ -42,6 +42,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
             this.$Content = null;
             this.Loader   = new QUILoader();
             this.$startId = null;
+            this.$Panel   = null;
 
             this.addEvents({
                 onCreate: this.$onCreate,
@@ -75,7 +76,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
                 if (result.data.length && result.data[0].isSandbox) {
                     detailsUrl = 'https://dashboard.stripe.com/test/plans/';
                 } else {
-                    detailsUrl = 'https://dashboard.stripe.com/plans/'
+                    detailsUrl = 'https://dashboard.stripe.com/plans/';
                 }
 
                 var $onDetailsClick = function (event) {
@@ -119,10 +120,10 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
 
             this.Loader.inject(this.$Content);
 
-            this.$Content.getParent('form').setStyle('height', '100%');
-            this.$Content.getParent('table').setStyle('height', '100%');
-            this.$Content.getParent('tbody').setStyle('height', '100%');
-            this.$Content.getParent('.field-container').setStyle('height', '100%');
+            this.$Content.getParent('form').setStyle('height', 'calc(100% - 40px)');
+            this.$Content.getParent('table').setStyle('height', 'calc(100% - 40px)');
+            this.$Content.getParent('tbody').setStyle('height', 'calc(100% - 40px)');
+            this.$Content.getParent('.field-container').setStyle('height', 'calc(100% - 40px)');
 
             this.create();
             this.$onCreate();
@@ -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();
         },
 
@@ -215,10 +219,12 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/BillingPlan
                 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.setWidth(size.x - 20);
+            this.$Grid.setHeight(size.y - 140);
+            this.$Grid.setWidth(size.x - 60);
             this.$Grid.resize();
         },
 

bin/controls/backend/settings/Subscriptions.js

@@ -44,6 +44,7 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
 
             this.$search      = false;
             this.$SearchInput = null;
+            this.$Panel       = null;
 
             this.addEvents({
                 onCreate: this.$onCreate,
@@ -145,10 +146,10 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
 
             this.Loader.inject(this.$Content);
 
-            this.$Content.getParent('form').setStyle('height', '100%');
-            this.$Content.getParent('table').setStyle('height', '100%');
-            this.$Content.getParent('tbody').setStyle('height', '100%');
-            this.$Content.getParent('.field-container').setStyle('height', '100%');
+            this.$Content.getParent('form').setStyle('height', 'calc(100% - 40px)');
+            this.$Content.getParent('table').setStyle('height', 'calc(100% - 40px)');
+            this.$Content.getParent('tbody').setStyle('height', 'calc(100% - 40px)');
+            this.$Content.getParent('.field-container').setStyle('height', 'calc(100% - 40px)');
 
             this.create();
             this.$onCreate();
@@ -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();
         },
 
@@ -269,10 +273,12 @@ define('package/quiqqer/payment-stripe/bin/controls/backend/settings/Subscriptio
                 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.setWidth(size.x - 20);
+            this.$Grid.setHeight(size.y - 180);
+            this.$Grid.setWidth(size.x - 60);
             this.$Grid.resize();
         },
 

settings.xml

@@ -151,6 +151,10 @@
                     </title>
 
                     <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>
                     </settings>
@@ -164,6 +168,10 @@
                     </title>
 
                     <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>
                     </settings>