Merge pull request openiap#48 from skadefro/master

bump

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -1959,6 +1959,11 @@ export class Message {
             }
 
         }
+        if (object == "invoices_upcoming") {
+            if (Util.IsNullEmpty(customerid)) throw new Error("Need customer to work with invoices_upcoming");
+            url = "https://api.stripe.com/v1/invoices/upcoming?customer=" + customerid;
+        }
+
         var auth = "Basic " + new Buffer(Config.stripe_api_secret + ":").toString("base64");
 
         var options = {
@@ -2008,10 +2013,11 @@ export class Message {
                 //     msg.object != "checkout.sessions" && msg.object != "tax_rates"
                 //     && msg.object != "subscriptions" && msg.object != "subscription_items"
                 //     && msg.object != "usage_records") throw new Error("Access to " + msg.object + " is not allowed");
-                if (msg.object != "plans" && msg.object != "subscription_items") throw new Error("Access to " + msg.object + " is not allowed");
+                if (msg.object != "plans" && msg.object != "subscription_items" && msg.object != "invoices_upcoming") throw new Error("Access to " + msg.object + " is not allowed");
 
                 if (msg.object == "subscription_items" && msg.method != "POST") throw new Error("Access to " + msg.object + " is not allowed");
                 if (msg.object == "plans" && msg.method != "GET") throw new Error("Access to " + msg.object + " is not allowed");
+                if (msg.object == "invoices_upcoming" && msg.method != "GET") throw new Error("Access to " + msg.object + " is not allowed");
             }
             msg.payload = await this.Stripe(msg.method, msg.object, msg.id, msg.payload, msg.customerid);
         } catch (error) {

OpenFlow/src/public/Controllers.ts

@@ -3125,6 +3125,7 @@ module openflow {
         public supportplans: stripe_plan[] = [];
         public supporthoursplans: stripe_plan[] = [];
 
+        public nextbill: string;
 
         constructor(
             public $scope: ng.IScope,
@@ -3319,6 +3320,13 @@ module openflow {
                         // this.loadData();
                     }
                 }
+
+
+                // 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);
+                // }
+
             } catch (error) {
                 console.error(error);
                 this.cardmessage = error;

OpenFlow/src/public/Message.ts

@@ -485,6 +485,38 @@ module openflow {
         public tax_ids: stripe_list<stripe_tax_id>;
         public items: stripe_list<stripe_subscription_item>;
     }
+    export class stripe_period {
+        public end: number;
+        public start: number;
+    }
+    export class stripe_invoice_line extends stripe_base {
+        public amount: number;
+        public currency: string;
+        public description: string;
+        public discountable: boolean;
+        public period: stripe_period;
+        public subplan: stripeplan;
+        public proration: boolean;
+        public quantity: number;
+        public type: string;
+        public unique_id: string;
+    }
+    export class stripe_invoice extends stripe_base {
+        public account_country: string;
+        public account_name: string;
+        public amount_due: number;
+        public amount_paid: number;
+        public amount_remaining: number;
+        public application_fee_amount: number;
+        public attempt_count: number;
+        public attempted: boolean;
+        public billing: string;
+        public billing_reason: string;
+        public collection_method: string;
+        public currency: string;
+        public customer: string;
+        public lines: stripe_list<stripe_invoice_line>;
+    }
 
     export class Message {
         public id: string;

OpenFlow/src/public/Payment.html

@@ -376,6 +376,9 @@
     Please contact us if you wish to have more users or click <a href
         ng-click="ctrl.CancelPlan(ctrl.openflowplan.id)">here to cancel</a> this subscription
 </div>
+<!-- <div ng-show="(ctrl.supportplan!=null || ctrl.openflowplan!=null) && ctrl.loading==false" class="alert alert-primary">
+    {{ctrl.nextbill}}
+</div> -->
 <div ng-show="ctrl.cardmessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.cardmessage}}</div>
 <div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
 <pre ng-show="ctrl.messages!=''" class=" alert alert-primary" role="alert">{{ ctrl.messages }}</pre>