updates on nodered billing

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -771,7 +771,6 @@ export class Message {
         } catch (error) {
             this.data = "";
             cli._logger.error(error);
-            console.log(JSON.stringify(error, null, 2));
             //msg.error = JSON.stringify(error, null, 2);
             if (msg !== null && msg !== undefined) msg.error = "Request failed!"
         }
@@ -1115,23 +1114,30 @@ export class Message {
                 for (var i = 0; i < list.body.items.length; i++) {
                     if (!Util.IsNullEmpty(Config.stripe_api_secret)) {
                         var item = list.body.items[i];
+                        var name = item.metadata.name;
                         var create = item.metadata.creationTimestamp;
                         var billed = item.metadata.labels.billed;
                         var image = item.spec.containers[0].image
                         var userid = item.metadata.labels.userid;
+                        var date = new Date();
+                        var a: number = (date as any) - (create as any);
+                        // var diffminutes = a / (1000 * 60);
+                        var diffhours = a / (1000 * 60 * 60);
                         if (image.indexOf("openflownodered") > 0 && !Util.IsNullEmpty(userid)) {
                             try {
-                                var date = new Date();
-                                var a: number = (date as any) - (create as any);
-                                // var diffminutes = a / (1000 * 60);
-                                var diffhours = a / (1000 * 60 * 60);
                                 if (billed != "true" && diffhours > 24) {
-                                    cli._logger.debug("[" + cli.user.username + "] Remove un billed nodered instance " + item.metadata.name + " that has been running for " + diffhours + " hours");
-                                    await this._DeleteNoderedInstance(userid, cli.user._id, cli.user.username, rootjwt);
+                                    cli._logger.debug("[" + cli.user.username + "] Remove un billed nodered instance " + name + " that has been running for " + diffhours + " hours");
+                                    // await this._DeleteNoderedInstance(userid, cli.user._id, cli.user.username, rootjwt);
                                 }
-                                // console.log(item.metadata.name + " " + diffminutes + " min / " + diffhours + " hours");
+                                // console.log(name + " " + diffminutes + " min / " + diffhours + " hours");
                             } catch (error) {
                             }
+                        } else if (image.indexOf("openflownodered") > 0) {
+                            if (billed != "true" && diffhours > 24) {
+                                console.log("unbilled " + name + " with no userid, should be removed, it has been running for " + diffhours + " hours");
+                            } else {
+                                console.log("unbilled " + name + " with no userid, has been running for " + diffhours + " hours");
+                            }
                         }
                     }
 
@@ -1822,7 +1828,6 @@ export class Message {
                     customer = await this.Stripe<stripe_customer>("GET", "customers", null, null, billing.stripeid);
                 }
             }
-            console.log(JSON.stringify(customer.discount, null, 2))
             if (customer != null && Util.IsNullEmpty(billing.coupon) && customer.discount != null) {
                 var payload: any = { coupon: "" };
                 customer = await this.Stripe<stripe_customer>("POST", "customers", billing.stripeid, payload, null);

OpenFlow/src/public/Controllers.ts

@@ -3223,7 +3223,7 @@ module openflow {
                 }
                 //if (this.allowopenflowsignup || this.allowsupportsignup) {
                 this.model.taxrate = "";
-                if (this.openflowplans.length == 0) {
+                if (this.openflowplans.length == 0 && this.supportplans.length == 0) {
                     this.stripe_plans = (await this.api.Stripe("GET", "plans", null, null, null) as any);
                     for (var x = 0; x < this.stripe_plans.data.length; x++) {
                         var stripeplan = this.stripe_plans.data[x];

OpenFlow/src/public/Payment.html

@@ -336,7 +336,7 @@
         <div class="col">
             <label class="control-label" translate lib="web">Coupon</label>
             <div class="col-sm-8">
-                <input type="text" class='form-control' ng-model="ctrl.model.coupon"></input>
+                <input type="password" class='form-control' ng-model="ctrl.model.coupon"></input>
             </div>
         </div>
     </div>

VERSION

@@ -1 +1 @@
-0.0.564
+0.0.565

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:0.0.563"
+    image: "cloudhack/openflow:0.0.565"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:0.0.563"
+    image: "cloudhack/openflownodered:0.0.565"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:0.0.563"
+    image: "cloudhack/openflow:0.0.565"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:0.0.563"
+    image: "cloudhack/openflownodered:0.0.565"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:0.0.563"
+    image: "cloudhack/openflow:0.0.565"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:0.0.563"
+    image: "cloudhack/openflownodered:0.0.565"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1