v2.0.1

Author: peter

.gitignore

@@ -18,3 +18,4 @@ yarn.lock
 *.js
 package-lock.json
 .npmignore
+_config.yml

app/localWebServer.ts

@@ -714,7 +714,7 @@ export default class localServer {
 				const file = Uuid.v4() + '.mp4'
 				const viode = Buffer.from ( data, 'base64' )
 				return Fs.writeFile ( Path.join ( Tool.QTGateVideo, file ), viode, err => {
-					m.QTDownload = `/videoTemp/${ file }`
+					m.QTDownload = `/tempfile/videoTemp/${ file }`
 					console.log (`save video file: [${ file }]`)
 					return CallBack ()
 				})

app/public/scripts/CoGate.ts

@@ -1,6 +1,6 @@
 declare const Cleave
 declare const StripeCheckout
-const Stripe_publicKey = 'pk_test_uV27MTvcPM147KFo3HazbunU'
+const Stripe_publicKey = 'pk_live_VwEPmqkSAjDyjdia7xn4rAK9'
 
 class coGateRegion {
 	public QTConnectData = ko.observable ( null )
@@ -452,10 +452,12 @@ class CoGateClass {
 			self.showCards ( true )
 			if ( payment ) {
 				const uuuu = self.QTTransferData()
-				uuuu.totalMonth = payment.totalMonth
-				uuuu.productionPackage = payment.productionPackage
-				uuuu.expire = payment.expire
-				uuuu.paidAmount = payment.paidAmount
+				uuuu.totalMonth = payment.totalMonth || uuuu.totalMonth
+				uuuu.productionPackage = payment.productionPackage || uuuu.productionPackage
+				uuuu.expire = payment.expire || uuuu.expire
+				uuuu.paidAmount = payment.paidAmount || uuuu.paidAmount
+
+				uuuu.automatically = payment.paidAmount > 0 ? true : uuuu.automatically
 				self.QTTransferData ( uuuu )
 			}
 			return self.CoGateAccount ( uu = null )
@@ -465,107 +467,13 @@ class CoGateClass {
 
 }
 
-interface PlanArray {
-	name: string
-}
-
-const planArray = [
-    {
-		name:'free',
-		showName: ['免费用户','無料ユーザー','FREE USER','免費用戶'],
-        monthlyPay: '0',
-		annually: '0',
-		annuallyMonth: '0',
-        next:'p1',
-        share: 0,
-		internet: 0,
-		tail: ko.observable ( false ),
-        multi_gateway:0,
-		showNote: false,
-		showButton: ko.observable ( false ),
-		features: [{
-			title: ['代理区域','エリア','Region','代理區域'],
-			detail: ['巴黎','パリ','Paris','巴黎'],
-		},{
-			title: ['服务器','サーバー','Server','伺服器'],
-			detail: ['共享','共有','Share','共享'],
-		},{
-			title: ['月流量限制','月データ制限','Bandwidth','月流量限制'],
-			detail: ['无限制','無制限','Unlimited','無限制'],
-		},{
-			title: ['多代理','マルチプロクシ','Multi-Gateway','多代理'],
-			detail: ['1','1','1','1'],
-		},{
-			title: ['客户端数','端末数','Devices','客戶端數'],
-			detail: ['无限制','無制限','Unlimited','無限制'],
-		}]
-
-    },{
-		name:'p1',
-		showName: ['普通用户','普通ユーザー','NORMAL USER','普通用戶'],
-        monthlyPay: '5.88',
-		annually: '59.88',
-		annuallyMonth:'4.99',
-        next:'p2',
-        share: 0,
-		internet: 0,
-		tail: ko.observable ( false ),
-        multi_gateway:0,
-		showNote: false,
-		showButton: ko.observable ( false ),
-		features: [{
-			title: ['代理区域','エリア','Region','代理區域'],
-			detail: ['全球16区域','グローバル16区域','16 regions worldwide ','全球16區域'],
-		},{
-			title: ['服务器','サーバー','Server','伺服器'],
-			detail: ['共享','共有','Share','共享'],
-		},{
-			title: ['月流量限制','月データ制限','Bandwidth','月流量限制'],
-			detail: ['无限制','無制限','Unlimited','無限制'],
-		},{
-			title: ['多代理','マルチプロクシ','Multi-Gateway','多代理'],
-			detail: ['2','2','2','2'],
-		},{
-			title: ['客户端数','端末数','Devices','客戶端數'],
-			detail: ['无限制','無制限','Unlimited','無限制'],
-		}]
-    },{
-		name:'p2',
-		showName: ['超级用户','スーパーユーザー','POWER USER','超級用戶'],
-        monthlyPay: '19.88',
-		annually: '199.99',
-		annuallyMonth: '16.67',
-        share: 0,
-        internet: 0,
-        multi_gateway:0,
-		showNote: false,
-		tail: ko.observable ( false ),
-		showButton: ko.observable ( false ),
-		features: [{
-			title: ['代理区域','エリア','Region','代理區域'],
-			detail: ['全球16区域','グローバル16区域','16 regions worldwide ','全球16區域'],
-		},{
-			title: ['服务器','サーバー','Server','伺服器'],
-			detail: ['独占','独占','Dedicated','獨占'],
-		},{
-			title: ['月流量限制','月データ制限','Bandwidth','月流量限制'],
-			detail: ['无限制','無制限','Unlimited','無限制'],
-		},{
-			title: ['多代理','マルチプロクシ','Multi-Gateway','多代理'],
-			detail: ['4','4','4','4'],
-		},{
-			title: ['客户端数','端末数','Devices','客戶端數'],
-			detail: ['无限制','無制限','Unlimited','無限制'],
-		}]
-    }
-]
 
 
 class planUpgrade {
 
-	public annually: string
-	public annuallyMonth: string 
-	public totalAmount: KnockoutComputed< string >
+	public annually: number
+	public annuallyMonth: number 
+	public totalAmount = ko.observable (0)
 	public currentPromoIndex: number
 
 
@@ -580,10 +488,10 @@ class planUpgrade {
 
 
 	//public annually = this.promo ? Math.round ( this.promoPrice * this.plan.annually * 100 )/100 : this.plan.annually
-	public planExpiration: string
+	
 	public monthlyPay = this.plan.monthlyPay
 	public showCancel = ko.observable ( false )
-	public showCurrentPlanBalance = null
+	public CurrentPlanBalance = ko.observable (-1)
 	public cardNumberFolder_Error = ko.observable ( false )
 	public cvcNumber_Error = ko.observable ( false )
 	public postcode_Error = ko.observable ( false )
@@ -607,6 +515,7 @@ class planUpgrade {
 	public paymentError = ko.observable ( false )
 	public oldPlanUpgrade = ko.observable ( null )
 	public paymentData = null
+	public isAutomaticallyAgain = ko.observable ( false )
 	private clearPaymentError () {
 		this.cardNumberFolder_Error ( false )
 		this.cvcNumber_Error ( false )
@@ -627,44 +536,23 @@ class planUpgrade {
 			this.currentPromo ( this._promo )
 		}
 
-		this.annually = this.currentPromo() ?  ( Math.round (parseInt ( this.plan.annually * 100 ) * this.currentPromo().pricePromo) / 100 ).toString() : this.plan.annually
+		this.annually = this.currentPromo() ?  Math.round ( this.plan.annually * this.currentPromo().pricePromo ) : this.plan.annually
 		const month = this.currentPromo() ? 12 * this.currentPromo().datePromo : 12
-		this.annuallyMonth = ( Math.round ( parseInt ( this.annually * 100 ) / month ) / 100 ).toString ()
-
+		this.annuallyMonth = Math.round ( this.annually / month )
+		this.annually = this.annually
 		this.currentPlan ( planArray [ planArray.findIndex ( function ( n ) { 
 			return n.name === self.dataTransfer.productionPackage
 		})])
-
+		
 		if ( planNumber === 2 ) {
 			this.showNote ( true )
-			if ( this.currentPlan().name === 'p1' ) {
-				const oldPlanUpgrade = {
-					oldPlanBalanceMonths: getRemainingMonth ( dataTransfer.expire ),
-					oldPlanMonthlyCost: dataTransfer.paidAmount * 100 / dataTransfer.totalMonth
-					
-				}
+			if ( this.currentPlan().name === 'p1' && dataTransfer.isAnnual ) {
+				
 			}
 
 		}
 		this.samePlan ( this.currentPlan().name === planNumber )
-
-
-		this.showCurrentPlanBalance = ko.computed (function (){
-			if ( /free/i.test (dataTransfer.productionPackage )) {
-				return null
-			}
-			return getCurrentPlanUpgradelBalance ( dataTransfer.expire, dataTransfer.productionPackage, dataTransfer.isAnnual )
-
-		})
-
-		this.totalAmount = ko.computed ( function () {
-			const amount = ( Math.round (( self.payment() - self.showCurrentPlanBalance()) * 100 ) / 100 ).toString ()
-            if ( !/\./.test( amount )) {
-                return amount + '.00'
-            }
-            return amount
-		})
-
+		
 		socketIo.on ( 'cardToken', function ( err, res: QTGateAPIRequestCommand ) {
 			const data = res.Args[0]
 			self.doingPayment ( false )
@@ -684,14 +572,29 @@ class planUpgrade {
 
 	public showPayment ( payment: number, annually: boolean ) {
 		this.detailArea ( false )
-		this.payment ( payment )
+		this.payment ( payment/100 )
 		this.paymentAnnually ( annually )
 		const currentPro = this.currentPromo().datePromo || 1
 		let month = annually ? 12 * currentPro : 1
-		if ( this.currentPlan().name !== 'free' ) {
-			
-		}
-		const expir = getExpireWithMonths ( month )
+
+		
+		let expir = getExpireWithMonths ( month )
+		//		check is stoped monthly again
+		if ( this.dataTransfer.productionPackage !== 'free') {
+			if ( this.dataTransfer.isAnnual ) {
+				const monthly = this.dataTransfer.paidAmount / this.dataTransfer.totalMonth
+				this.CurrentPlanBalance ( getRemainingMonth ( this.dataTransfer.expire ) * monthly )
+			} else {
+				this.CurrentPlanBalance ( this.currentPlan().monthlyPay )
+			}
+		} 
+
+		if ( !annually ) {
+			if ( this.plan.name === this.currentPlan().name ) {
+				this.isAutomaticallyAgain ( true )
+				expir = new Date ( this.dataTransfer.expire )
+			} 
+		} 
 		this.newPlanExpirationYear ( expir.getFullYear ().toString())
 		const _month = expir.getMonth () + 1
 		if ( _month < 10 ) {
@@ -701,7 +604,12 @@ class planUpgrade {
 		}
 
 		this.newPlanExpirationDay ( expir.getDate ().toString())
-
+		if ( this.CurrentPlanBalance() > -1 ) {
+			this.totalAmount ( this.payment() - this.CurrentPlanBalance()/100)
+		} else {
+			this.totalAmount ( this.payment())
+		}
+		
 	}
 
 	private showWaitPaymentFinished () {
@@ -782,7 +690,7 @@ class planUpgrade {
 		const self = this
 		this.clearPaymentError ()
 		let handler = null
-		const amount = Math.round (( this.payment() - this.showCurrentPlanBalance()) * 100 )
+		const amount = this.totalAmount() * 100
 		if ( StripeCheckout && typeof StripeCheckout.configure === 'function' ){
 			handler = StripeCheckout.configure ({
 				key: Stripe_publicKey,
@@ -838,15 +746,15 @@ class planUpgrade {
 }
 
 class cancelPlan {
-	public passedMonth = getPassedMonth ( this.startDay )
+	public passedMonth = getPassedMonth ( this.startDay ) + 1
 	public passedCost = this.passedMonth * this.normailMonthPrice
 	public balance = this.amount - this.passedCost
 	public cancelProcess = ko.observable ( false )
 	private doingProcessBarTime = null
 	public showError = ko.observable ( false )
 
 	constructor ( public planName: string, public totalMonth, public amount, private startDay: string, public expir: string, public isAnnual , 
-		private normailMonthPrice: string, private exit: ( payment ) => void ) {
+		private normailMonthPrice: number, private exit: ( payment ) => void ) {
 			const self = this
 
 		}
@@ -997,12 +905,17 @@ class CoGateAccount {
 
 
 		let plus1 = 1
-		if ( !this.dataTransfer.automatically && this.currentPlan.name !== 'free') {
+		if ( this.currentPlan.name === 'free') {
 			plus1 = 0
 		}
+		
 		this.planArray()[ 1 + plus1 ].tail ( true )
-		for ( let i = plan + plus1; i < planArray.length; i ++ ) {
-			this.planArray()[i].showButton ( true )
+		if ( this.dataTransfer.productionPackage === 'p1') {
+			this.planArray()[1].showButton (false )
+		}
+		if ( this.dataTransfer.productionPackage === 'p2') {
+			this.planArray()[1].showButton (false )
+			this.planArray()[2].showButton (false )
 		}
 		const date = new Date ( dataTransfer.expire )
 		this.currentPlanExpirationYear ( date.getFullYear().toString() )
@@ -1014,7 +927,7 @@ class CoGateAccount {
 	public selectPlan1 ( n: number ) {
 		let uu = null
 		const self = this
-		this.planUpgrade ( uu = new planUpgrade ( n, this.dataTransfer.isAnnual, this.dataTransfer, function ( payment ) {
+		return this.planUpgrade ( uu = new planUpgrade ( n, this.dataTransfer.isAnnual, this.dataTransfer, function ( payment ) {
 			self.planUpgrade ( uu = null )
 			self.exit ( payment )
 		}))
@@ -1056,7 +969,6 @@ class CoGateAccount {
 
 		})
 
-		return false
 	}
 
 	private showWaitPaymentFinished () {
@@ -1085,7 +997,7 @@ class CoGateAccount {
 		let uu = null
 		const self = this
 		this.doingPayment ( true )
-		this.cancelPlanData ( uu = new cancelPlan ( dataTransfer.productionPackage, dataTransfer.totalMonth, dataTransfer.paidAmount, dataTransfer.startDate, dataTransfer.expire, dataTransfer.isAnnual, this.currentPlan.monthlyPay, 
+		return this.cancelPlanData ( uu = new cancelPlan ( dataTransfer.productionPackage, dataTransfer.totalMonth, dataTransfer.paidAmount, dataTransfer.startDate, dataTransfer.expire, dataTransfer.isAnnual, this.currentPlan.monthlyPay, 
 			function exit ( payment ) {
 				self.cancelPlanData ( uu = null )
 				self.exit ( payment )

app/public/scripts/home.js

@@ -272,6 +272,9 @@ var view_layout;
                 if (stage === 4) {
                     this.connectToCoNET(false);
                     this.connectedCoNET(true);
+                    if (this.showCoGate()) {
+                        this.homeClick();
+                    }
                 }
             }
         }
@@ -441,8 +444,10 @@ var view_layout;
                         return self.imapSetupClassExit(imapData);
                     }));
                 }
+                this.connectedCoNET(true);
                 //self.showCoGate ( showCoGate )
                 if (showCoGate) {
+                    self.showCoGate(true);
                     return self.homeClick();
                 }
                 self.AppList(true);
@@ -456,14 +461,7 @@ var view_layout;
             }));
         }
         reFreshLocalServer() {
-            const self = this;
-            socketIo.once('connect', function () {
-                return location.reload();
-            });
-            socketIo.once('connect_error', function () {
-                return self.refresh();
-            });
-            socketIo.connect();
+            location.reload();
         }
         homeClick() {
             this.AppList(true);