double checking all plan changes.. need to pass full plan info to update

3 files changed, 8 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/site/EditSubscriptionModal.js b/public/assets/javascripts/ui/site/EditSubscriptionModal.js
index 55ff3b5..c276354 100644
--- a/public/assets/javascripts/ui/site/EditSubscriptionModal.js
+++ b/public/assets/javascripts/ui/site/EditSubscriptionModal.js
@@ -224,14 +224,13 @@ var EditSubscriptionModal = ModalView.extend({
 		var is_changed = false
 		var diff = {}
 		"plan_type basic_layouts pro_layouts".split(" ").forEach(function(field){
+			diff[field] = this.tempSubscriber[field]
 			if (this.tempSubscriber[field] != this.subscriber[field]) {
-				diff[field] = this.tempSubscriber[field]
 				is_changed = true
 			}
 		}.bind(this))
 		
 		if (is_changed) {
-			diff.plan_type = this.tempSubscriber.plan_type
 			this.update(diff)
 		}
 		this.subscriber = this.tempSubscriber
diff --git a/server/lib/api/subscription.js b/server/lib/api/subscription.js
index 7e9221a..9c2d6ef 100644
--- a/server/lib/api/subscription.js
+++ b/server/lib/api/subscription.js
@@ -142,6 +142,7 @@ var subscription = module.exports = {
     var plan_type = req.body.plan_type
     var basic_layouts = Math.max(0, parseInt(req.body.basic_layouts || 0, 10))
     var pro_layouts = Math.max(0, parseInt(req.body.pro_layouts || 0, 10))
+    if (plan_type != "pro") { pro_layouts = 0 }
     
     if (plan_type == subscription.plan_type
 			&& basic_layouts == subscriber.basic_layouts
@@ -149,15 +150,14 @@ var subscription = module.exports = {
     	return res.json(subscriber)
     }
 
-    var data = {}
+    var data = { subscription_add_ons: [] }
     data.plan_code = plan_type + "-monthly"
-    data.subscription_add_ons = []
     
-    if (plan_levels[plan_type] > 0) {
+    if (plan_levels[plan_type] > 0 && basic_layouts > 0) {
       data.subscription_add_ons.push({ add_on_code: "extra-basic-layout", quantity: basic_layouts })
     }
     
-    if (plan_type == "pro") {
+    if (plan_type == "pro" && pro_layouts > 0) {
       data.subscription_add_ons.push({ add_on_code: "extra-pro-layout", quantity: pro_layouts })
     }
     
@@ -165,7 +165,9 @@ var subscription = module.exports = {
     // data.subscription_add_ons = []
     //   add_on.add_on_code
     //   add_on.quantity
+    console.log(data)
     recurly.subscriptions.update(subscriber.uuid, data, function(err, data){
+    	console.log("got response from RECURLY ...")
     	if (err) {
     		console.log("error updating recurly subscription", err)
     		return res.json({ error: err })
diff --git a/views/staff/_nav.ejs b/views/staff/_nav.ejs
index e79ff69..a607638 100644
--- a/views/staff/_nav.ejs
+++ b/views/staff/_nav.ejs
@@ -4,5 +4,5 @@
   <a href="/staff/projects">projects</a>
   <a href="/staff/media">media</a>
   <a href="/staff/plans">plans</a>
-  <a href="/staff/subscriptions">subscriptions</a>
+<!-- <a href="/staff/subscriptions">subscriptions</a> -->
 </nav>
\ No newline at end of file