Merge branch 'dev' of DragonFrame-Plugins/MinecraftPayment into master

MinecraftPayment.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

mithril/components/MinecraftUsers.class.js

-// MLQRequire: { "Plugin": "Minecraft-Payment", "Type": "Service", "Name": "MinecraftPayService" }
-class MinecraftUsers {
-    constructor() {
-        this.user = {};
-        this.subscriptionsStates = new Map();
-    }
-    onview(vnode) {
-        if (typeof (MinecraftUser) !== 'function')
-            LoadQueue.Start(() => { });
-        else
-            this.loadUser();
-    }
-    loadUser() {
-        var id = m.route.param('id');
-        if (id.match(/^[0-9]+$/))
-            id = +id;
-        else
-            return;
-        if (this.user.ID !== id) {
-            this.user = $.extend(true, new MinecraftUser(), MinecraftPayService.Users.find(o => o.ID === id)) || this.user;
-            if (this.user.ID) {
-                MinecraftPayAPI.GetAllSubscriptionStates({ params: { id } }).then(map => {
-                    this.subscriptionsStates = map || this.subscriptionsStates;
-                });
-            }
-            m.redraw();
-        }
-    }
-    UnlockServer(serverId) {
-        if (!this.subscriptionsStates.get(serverId)) {
-            Modal.YesNo('Delete minecraft user', __('Do you really want to unlock this server for this minecraft user?'), (c, e) => this.unlockServer(this.user.ID, serverId, c)).Show();
-        }
-    }
-    unlockServer(userId, serverId, confirmed) {
-        if (confirmed) {
-            MinecraftPayAPI.SubscribeServer({ params: { id: userId, serverId } }).then(r => {
-                this.subscriptionsStates.set(serverId, r.Obj);
-                Toasts.Messaged(r.Message, Toast.Load({ Type: r.Success ? 'success' : 'danger' }));
-            });
-        }
-        return undefined;
-    }
-}
+// MLQRequire: { "Plugin": "Minecraft-Payment", "Type": "Service", "Name": "MinecraftPayService" }
+class MinecraftUsers {
+    constructor() {
+        this.user = {};
+        this.subscriptionsStates = new Map();
+    }
+    onview(vnode) {
+        if (typeof (MinecraftUser) !== 'function')
+            LoadQueue.Start(() => {
+            });
+        else
+            this.loadUser();
+    }
+    loadUser() {
+        var id = m.route.param('id');
+        if (id.match(/^[0-9]+$/))
+            id = +id;
+        else
+            return;
+        if (this.user.ID !== id) {
+            this.user = $.extend(true, new MinecraftUser(), MinecraftPayService.Users.find(o => o.ID === id)) || this.user;
+            if (this.user.ID) {
+                MinecraftPayAPI.GetAllSubscriptionStates({ params: { id } }).then(map => {
+                    this.subscriptionsStates = map || this.subscriptionsStates;
+                });
+            }
+            m.redraw();
+        }
+    }
+    UnlockServer(serverId) {
+        if (!this.subscriptionsStates.get(serverId)) {
+            Modal.YesNo('Delete minecraft user', __('Do you really want to unlock this server for this minecraft user?'), (c, e) => this.unlockServer(this.user.ID, serverId, c)).Show();
+        }
+    }
+    unlockServer(userId, serverId, confirmed) {
+        if (confirmed) {
+            MinecraftPayAPI.SubscribeServer({ params: { id: userId, serverId } }).then(r => {
+                this.subscriptionsStates.set(serverId, r.Obj);
+                Toasts.Messaged(r.Message, Toast.Load({ Type: r.Success ? 'success' : 'danger' }));
+            });
+        }
+        return undefined;
+    }
+}

mithril/components/Settings.class.js

-// MLQRequire: { "Plugin": "Minecraft-Payment", "Type": "Service", "Name": "MinecraftPayService" }
-class Settings {
-    constructor() {
-        this.settings = {};
-    }
-    onview(vnode) {
-        if (typeof (MinecraftServer) !== 'function')
-            LoadQueue.Start(() => { });
-        else
-            this.loadServer();
-    }
-    loadServer() {
-        var id = m.route.param('id');
-        if (id.match(/^[0-9]+$/))
-            id = parseInt(id);
-        else
-            return;
-        if (this.settings.ID !== id) {
-            this.settings = $.extend(true, new MinecraftServer(), MinecraftPayService.Servers.find(o => o.ID === id)) || this.settings;
-            m.redraw();
-        }
-    }
-    saveServer() {
-        MinecraftPayService.UpdateServer(this.settings.ID, this.settings);
-    }
-}
+// MLQRequire: { "Plugin": "Minecraft-Payment", "Type": "Service", "Name": "MinecraftPayService" }
+class Settings {
+    constructor() {
+        this.settings = {};
+    }
+    onview(vnode) {
+        if (typeof (MinecraftServer) !== 'function')
+            LoadQueue.Start(() => {
+            });
+        else
+            this.loadServer();
+    }
+    loadServer() {
+        var id = m.route.param('id');
+        if (id.match(/^[0-9]+$/))
+            id = parseInt(id);
+        else
+            return;
+        if (this.settings.ID !== id) {
+            this.settings = $.extend(true, new MinecraftServer(), MinecraftPayService.Servers.find(o => o.ID === id)) || this.settings;
+            m.redraw();
+        }
+    }
+    saveServer() {
+        MinecraftPayService.UpdateServer(this.settings.ID, this.settings);
+    }
+}

orm_schemas/MinecraftServer.class.php

     public $MaxPerMonthPrice = null;
     /**
      * @DB-Relation
-     * @Field     ID
-     * @FieldName SubscriptionID
+     * @Field     ConcerningServer
+     * @FieldName ID
      * @OneToMany
      * @OnUpdate  CASCADE
      * @OnDelete  CASCADE

orm_schemas/MinecraftUser.class.php

     public $Username;
     /**
      * @DB-Relation
-     * @Field     ID
-     * @FieldName SubscriptionID
+     * @Field     UnlockedUser
+     * @FieldName ID
      * @OneToMany
      * @OnUpdate  CASCADE
      * @OnDelete  CASCADE
-     * @var MinecraftServer[]
+     * @var MinecraftServerSubscription[]
      */
     public $Subscriptions;
     /**