op_cart 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0c424060ed4b6f0739040d08dd189e67199c5a
-  data.tar.gz: 86b5699ad0f4ba34a46e1512aa6b20e6444693ce
+  metadata.gz: 9b3f63a006094e5d32cc7a4def31e9ebff2ea42b
+  data.tar.gz: d16646e931c1e6c3cae3919b46ee9bc4b7204fc0
 SHA512:
-  metadata.gz: adcf403857d3529c60dac9c3739004d41d49198cafbe58ff840373eecddd549a6e060eb4a391932304d9d05314a9017035939f66b1bfd2d2b359c9cc3ab12628
-  data.tar.gz: bbd5e30eb7c5717b346398dfe09ffdc6fc14f3c672e8adbc355c4fe96abe0c7cbc9edb33e764acacee7e650a8fddd90ea9350435adce5bd3eb240e41dd2ac478
+  metadata.gz: ec51a4e9afeb2076c0c74fb2b51e5af79441b245a2123fcbcb6c74e30ab43004b1e59f16dac594142a1aef133a0c0cbd177d333632fc60128064d0c0e61cdf4f
+  data.tar.gz: 4eccb7a658c896fda9e50e7140f6352ad944ca682f7240af8dc0c74fbd49f16e81300e3a52172954cd926f27330a356a555c4bf2c1f46fac5c828049bdead220

data/app/models/op_cart/order.rb

@@ -81,7 +81,12 @@ module OpCart
     def create_subscriptions
       line_items.each do |li|
         if li.sellable.is_a? Plan
-          subscriptions.new customer: customer, plan: li.sellable, quantity: li.quantity
+          es = existing_subscription = customer.subscriptions.where(plan: li.sellable).first
+          if existing_subscription.present?
+            es.update_attributes quantity: es.quantity + li.quantity
+          else
+            subscriptions.new customer: customer, plan: li.sellable, quantity: li.quantity
+          end
         end
       end
     end

data/app/models/op_cart/subscription.rb

@@ -37,11 +37,11 @@ module OpCart
     end
 
     def update_subscription
-      subscriptions_attributes = {}
-      subscriptions_attributes[:quantity] = quantity if quantity_changed?
-      subscriptions_attributes[:trial_end] = trial_ended_at.to_i if trial_ended_at_changed?
-      subscriptions_attributes[:plan] = plan.processor_token if plan_id_changed?
-      update_local_object customer.processor_object.subscriptions.create(subscriptions_attributes)
+      subscription = customer.processor_object.subscriptions.retrieve(processor_token)
+      subscription.quantity = quantity if quantity_changed?
+      subscription.trial_end = trial_ended_at.to_i if trial_ended_at_changed?
+      subscription.plan = plan.processor_token if plan_id_changed?
+      update_local_object subscription.save
     rescue Stripe::InvalidRequestError => e
       if e.param
         self.errors.add e.param, e.message

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails