op_cart 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f02ef8a5af017815cb06b3d09db56e03c57c59f
-  data.tar.gz: bad1b5aa4977f437499b51ede718d5f9335cb3df
+  metadata.gz: 189c8a856cf652828be2f78169e4bbfbde69c979
+  data.tar.gz: 1ce823a4230ccc8393aabfcdbdc583f9b79bff50
 SHA512:
-  metadata.gz: bb81f925457e7f4d9b2b83f836b6806e1dc65388b3e376d539decbf7378367ba87a529fe7654ddd52b8ff97ca324c5159d5c4d134af6b619d3e306e0b4f0d9af
-  data.tar.gz: 5161278ed86bd456df1aaac29b435700da74363a672b5fd9b8b01dff3457457b3234f247a4c6d44e54ca644c652d6b2058074772a967871c5c0e542bb48056b0
+  metadata.gz: 85c558b86db26f6a03321828d2deeddd5789e021940932bf66b1a0d9e9d4e9f7db235c8710737e86fff3a2ff63c4e264a7b65e8cb61820ba14037780a999c165
+  data.tar.gz: 3bbec259b17a6e3ac46c19573cde8c10c8b0bc610c4a911e378a49abf52e119a77c3406addad883114b5a7740eba0be1152eece9329e56ca58cdcccf532c56e5

data/app/controllers/op_cart/orders_controller.rb

@@ -73,7 +73,7 @@ module OpCart
         li_quantities_json.each do |plan_id, quantity|
           plan = Plan.find plan_id
           @order.line_items << LineItem.new(sellable: plan, quantity: quantity)
-          plan.plan_addons.each do |addon|
+          plan.plan_addons.purchasable.each do |addon|
             @order.line_items << LineItem.new(sellable: addon.product, quantity: quantity)
           end
         end

data/app/models/op_cart/order.rb

@@ -30,7 +30,7 @@ module OpCart
 
     def validate_plan_addons_included
       unless line_items.flat_map do |li|
-        if li.sellable.is_a?(Plan) && (addons = li.sellable.plan_addons).present?
+        if li.sellable.is_a?(Plan) && (addons = li.sellable.plan_addons.purchasable).present?
           addons.map do |addon|
             addon_li = line_items.select{|pali| pali.sellable == addon.product }
             addon_li.count == 1 && addon_li[0].quantity == li.quantity

data/app/models/op_cart/plan.rb

@@ -23,7 +23,7 @@ module OpCart
     end
 
     def addons_price
-      plan_addons.reduce(0) { |total, addon| total += addon.product.price }
+      plan_addons.purchasable.reduce(0) { |total, addon| total += addon.product.price }
     end
 
     private

data/app/models/op_cart/plan_addon.rb

@@ -3,5 +3,7 @@ module OpCart
     belongs_to :plan
     belongs_to :product
     belongs_to :user
+
+    scope :purchasable, -> { joins(:product).where op_cart_products: { allow_purchases: true } }
   end
 end

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

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