bump

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -3236,11 +3236,13 @@ export class PaymentCtrl extends entityCtrl<Billing> {
                 this.stripe_plans = (await NoderedUtil.Stripe("GET", "plans", null, null, null, null) as any);
                 for (var x = 0; x < this.stripe_plans.data.length; x++) {
                     var stripeplan = this.stripe_plans.data[x];
-                    if (stripeplan.metadata.openflowuser == "true") {
-                        this.openflowplans.push(stripeplan);
-                    }
-                    if (stripeplan.metadata.supportplan == "true") {
-                        this.supportplans.push(stripeplan);
+                    if ((stripeplan as any).active == true) {
+                        if (stripeplan.metadata.openflowuser == "true") {
+                            this.openflowplans.push(stripeplan);
+                        }
+                        if (stripeplan.metadata.supportplan == "true") {
+                            this.supportplans.push(stripeplan);
+                        }
                     }
                 }
                 for (var y = 0; y < this.supportplans.length; y++) {

OpenFlowNodeRED/src/Config.ts

@@ -32,6 +32,7 @@ export class Config {
         Config.port = parseInt(Config.getEnv("port", "1880"));
         Config.nodered_port = parseInt(Config.getEnv("nodered_port", "0"));
         Config.domain = Config.getEnv("domain", "localhost");
+        Config.domain_use_ip_from_network = Config.getEnv("domain_use_ip_from_network", ""); // grab ip address from this adaptor and use for domain
         Config.protocol = Config.getEnv("protocol", "http");
         Config.nodered_domain_schema = Config.getEnv("nodered_domain_schema", "");
         Config.noderedusers = Config.getEnv("noderedusers", "");

docker-compose-toolbox.yml

@@ -107,7 +107,7 @@ services:
       #      - noderedadmins=nodered1admins
 
       - api_ws_url=ws://web
-      - amqp_url=amqp://admin:demo2018@rabbitmq
+      # - amqp_url=amqp://admin:demo2018@rabbitmq
 
       - api_credential_cache_seconds=300
       - api_allow_anonymous=false

docker-compose-traefik-letsencrypt.yml

@@ -132,7 +132,7 @@ services:
       #      - noderedadmins=nodered1admins
 
       - api_ws_url=ws://web
-      - amqp_url=amqp://admin:demo2018@rabbitmq
+      # - amqp_url=amqp://admin:demo2018@rabbitmq
 
       - api_credential_cache_seconds=300
       - api_allow_anonymous=false

docker-compose-traefik.yml

@@ -107,7 +107,7 @@ services:
       #      - noderedadmins=nodered1admins
 
       - api_ws_url=ws://web
-      - amqp_url=amqp://admin:demo2018@rabbitmq
+      # - amqp_url=amqp://admin:demo2018@rabbitmq
 
       - api_credential_cache_seconds=300
       - api_allow_anonymous=false

docker-compose.yml

@@ -76,7 +76,7 @@ services:
       #      - noderedadmins=nodered1admins
 
       - api_ws_url=ws://web
-      - amqp_url=amqp://admin:demo2018@rabbitmq
+      # - amqp_url=amqp://admin:demo2018@rabbitmq
 
       - api_credential_cache_seconds=300
       - api_allow_anonymous=false