check form input

1 files changed, 11 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/site/EditSubscriptionModal.js b/public/assets/javascripts/ui/site/EditSubscriptionModal.js
index b9abd75..384460d 100644
--- a/public/assets/javascripts/ui/site/EditSubscriptionModal.js
+++ b/public/assets/javascripts/ui/site/EditSubscriptionModal.js
@@ -27,7 +27,9 @@ var EditSubscriptionModal = ModalView.extend({
 		"click [data-role=saveQuantity]": "saveQuantity",
 
 		"change [name=planRadio]": "updatePlan",
-		"click [data-role=changePlan]": "savePlan",
+		"click [data-role=savePlan]": "savePlan",
+		
+		"submit form": "preventDefault",
 	},
 
 	initialize: function(){
@@ -148,7 +150,7 @@ var EditSubscriptionModal = ModalView.extend({
 	},
 	calculateTotals: function(subscriber, plan){
 		var t = {}
-		t.is_pro             = plan.name == "pro"
+		t.is_pro             = subscriber.plan_type == "pro"
 		t.is_monthly         = subscriber.plan_period == "monthly"
 		t.plan_price         = t.is_monthly ? plan.monthly_price : plan.yearly_price
 		t.basic_layout_price = t.is_monthly ? plan.basic_layout_monthly_price : plan.basic_layout_yearly_price
@@ -197,16 +199,19 @@ var EditSubscriptionModal = ModalView.extend({
 		this.$basicLayoutInput.val( this.subscriber.basic_layouts )
 		this.$proLayoutInput.val( this.subscriber.pro_layouts )
 		this.$basicLayoutRow.show()
-		this.$proLayoutRow.toggle(this.subscriber.plan_name == "pro")
+		this.$proLayoutRow.toggle(this.subscriber.plan_type == "pro")
 	},
 	updateQuantity: function(e){
 		e && e.preventDefault()
 		var plan = this.getPlan( this.tempSubscriber.plan_type )
-		this.tempSubscriber.basic_layouts = this.$basicLayoutInput.int()
-		this.tempSubscriber.pro_layouts = this.$proLayoutInput.int()
+		this.tempSubscriber.basic_layouts = clamp( this.$basicLayoutInput.int() || 0, 0, 100)
+		this.tempSubscriber.pro_layouts = clamp( this.$proLayoutInput.int() || 0, 0, 100)
+		
+		this.$basicLayoutInput.val(this.tempSubscriber.basic_layouts)
+		this.$proLayoutInput.val(this.tempSubscriber.pro_layouts)
 		this.displayTotals(this.tempSubscriber, plan)
 		this.$basicLayoutRow.show()
-		this.$proLayoutRow.toggle(plan.name == "pro")
+		this.$proLayoutRow.toggle(this.tempSubscriber.plan_type == "pro")
 	},
 	saveQuantity: function(e){
 		e && e.preventDefault()
@@ -233,7 +238,6 @@ var EditSubscriptionModal = ModalView.extend({
 	savePlan: function(e){
 		e && e.preventDefault()
 		this.subscriber.plan_type = this.$("[name=planRadio]:checked").val()
-		this.subscriber = this.tempSubscriber
 		this.resetMode()
 		// blabla.. save
 	},