Add next bill info to payment page

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -1745,8 +1745,9 @@ export class Message {
             if (Util.IsNullUndefinded(msg.userid)) msg.userid = cli.user._id;
             var users = await Config.db.query({ _id: msg.userid, _type: "user" }, null, 1, 0, null, "users", msg.jwt);
             if (users.length == 0) throw new Error("Unknown userid");
-            var user = users[0];
+            var user: User = users[0] as any;
             var dirty: boolean = false;
+            var hasbilling: boolean = false;
 
             var billings = await Config.db.query<Billing>({ userid: msg.userid, _type: "billing" }, null, 1, 0, null, "users", rootjwt);
             var billing: Billing;
@@ -1905,6 +1906,12 @@ export class Message {
                     billing = await Config.db._UpdateOne(null, billing, "users", 3, true, rootjwt);
                 }
             }
+
+            hasbilling = (customer != null);
+            if (user._hasbilling != hasbilling) {
+                user._hasbilling = hasbilling;
+                await Config.db._UpdateOne(null, user, "users", 3, true, rootjwt);
+            }
             msg.customer = customer;
 
         } catch (error) {

OpenFlow/src/User.ts

@@ -30,6 +30,7 @@ export class User extends Base {
     _lastclientversion: string;
     _lastopenrpaclientversion: string;
     _lastnoderedclientversion: string;
+    _hasbilling: boolean;
     username: string;
     passwordhash: string;
     sid: string;

OpenFlow/src/public/Controllers.ts

@@ -3125,7 +3125,7 @@ module openflow {
         public supportplans: stripe_plan[] = [];
         public supporthoursplans: stripe_plan[] = [];
 
-        public nextbill: string;
+        public nextbill: stripe_invoice;
 
         constructor(
             public $scope: ng.IScope,
@@ -3322,10 +3322,16 @@ module openflow {
                 }
 
 
-                // if (this.stripe_customer && this.stripe_customer) {
-                //     this.nextbill = (await this.api.Stripe<stripe_invoice>("GET", "invoices_upcoming", this.stripe_customer.id, null, null) as any);
-                //     console.log(this.nextbill);
-                // }
+                if (this.stripe_customer && this.stripe_customer) {
+                    try {
+                        this.nextbill = (await this.api.Stripe<stripe_invoice>("GET", "invoices_upcoming", this.stripe_customer.id, null, null) as any);
+                        console.log(this.nextbill);
+                        this.nextbill.dtperiod_start = new Date(this.nextbill.period_start * 1000);
+                        this.nextbill.dtperiod_end = new Date(this.nextbill.period_end * 1000);
+                    } catch (error) {
+                        console.error(error);
+                    }
+                }
 
             } catch (error) {
                 console.error(error);

OpenFlow/src/public/Message.ts

@@ -516,6 +516,10 @@ module openflow {
         public currency: string;
         public customer: string;
         public lines: stripe_list<stripe_invoice_line>;
+        public period_start: number;
+        public period_end: number;
+        public dtperiod_start: Date;
+        public dtperiod_end: Date;
     }
 
     export class Message {

OpenFlow/src/public/Payment.html

@@ -40,6 +40,7 @@ <h1 translate lib="web">robots</h1>
       <th></th>
       <th></th>
       <th></th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -66,11 +67,16 @@ <h1 translate lib="web">robots</h1>
             class="fas fa-user-secret" style="color: #007bff;"></i></a>
       </td>
       <td class="btn-cell">
-        <a href ng-click="ctrl.OpenNodered(model)" ng-show="model.hasnodered==true" class="table-btn">nodered</a>
+        <a href ng-click="ctrl.OpenNodered(model)" ng-show="model.hasnodered==true" class="table-btn"><i
+            class="fas fa-project-diagram"></i></a>
+      </td>
+      <td class="btn-cell">
+        <a ng-href="#/Payment/{{model._id}}" class="table-btn"
+          ng-show="menuctrl.WebSocketClient.stripe_api_key != '' && menuctrl.hasrole('admins') && model._hasbilling == true"><i
+            class="fas fa-money-bill-wave"></i></a>
       </td>
       <td class="btn-cell">
-        <!-- <a href ng-click="ctrl.ManageNodered(model)" class="table-btn">manage</a> -->
-        <a ng-href="#/Nodered/{{model._id}}" class="table-btn">manage</a>
+        <a ng-href="#/Nodered/{{model._id}}" class="table-btn"><i class="fas fa-tools"></i></a>
       </td>
       <td class="btn-cell">
         <a ng-href="#/Entity/{{ctrl.collection}}/{{model._id}}" class="table-btn"><i class="az-edit"></i></a>

OpenFlow/src/public/Robots.html

@@ -24,6 +24,7 @@ <h1 translate lib="web">users</h1>
       <th></th>
       <th></th>
       <th></th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -41,6 +42,11 @@ <h1 translate lib="web">users</h1>
           chart-labels="model.chart.labels" chart-series="model.chart.series" height="40px" width="200">
         </canvas>
       </td> -->
+      <td class="btn-cell">
+        <a ng-href="#/Payment/{{model._id}}" class="table-btn"
+          ng-show="menuctrl.WebSocketClient.stripe_api_key != '' && menuctrl.hasrole('admins') && model._hasbilling == true">
+          <i class="fas fa-money-bill-wave"></i></a>
+      </td>
       <td class="btn-cell">
         <a ng-href ng-click="ctrl.Impersonate(model)" ng-show="model._id != ctrl.WebSocketClient.user._id"><i
             class="fas fa-user-secret" style="color: #007bff;"></i></a>

OpenFlow/src/public/Users.html

@@ -1 +1 @@
-0.0.566
+0.0.567