op_cart 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39966542011d55c929999e9579b07ae23f6026a0
-  data.tar.gz: 6d9934377f63d12b8e08c8378d489ac4c4f8f369
+  metadata.gz: a055877b518c695c504b0910b9ee3b53d7dee695
+  data.tar.gz: b09e9b447b40d0185ef69a7f108a2807798ae29e
 SHA512:
-  metadata.gz: 585762254b5f9536f437adb23ddc5bcbb58248e706a281ac93ffcb6aca2cdfcd45452f6964cbeaf0a638d73831f4c7391500e2cc77d33baffdc63f38322d15cf
-  data.tar.gz: 75e659902be830d751e14fb5ce7cc75cbefdf6a03ff79ceb6e025973e3ca4315eeb970fb4fb3c7027072f6948914694cf2692e25ddb5fa7400e595cd1325d8a5
+  metadata.gz: de05c032008bf45018a3e243bfa6dea54f4dae090fcce0213625b60c8bcffa1f661af8a1a983674cd41373c00e7ba7a43930db10dad57d5cb01b7a733164a7da
+  data.tar.gz: 8fe5ab19e078945cfe0b34b1ddbd062a26718a9390f3b71058ef4489fcfd4005e1e41ed7e4f2b324b4c7b5ff8469e39688c76c4d79d6f23ed27c00d6f705f486

data/app/controllers/op_cart/orders_controller.rb

@@ -6,6 +6,8 @@ module OpCart
     def new
       @products = Product.all
       @order = Order.new
+      @order.line_items << LineItem.new
+      @plan = Plan.purchasable.find(params[:plan_id]) if params[:plan_id]
       @user = current_user || User.new
       @card = current_user.try(:customer).try :default_card
       @shipping_address = @user.shipping_addresses.first || @user.shipping_addresses.new
@@ -59,9 +61,12 @@ module OpCart
       @line_items = OpenStruct.new(quantities_json: line_items_params[:quantities_json] || {})
       if @line_items.quantities_json.present?
         li_quantities_json = JSON.parse @line_items.quantities_json
-        li_quantities_json.each do |product_id, quantity|
-          @order.line_items <<
-            LineItem.new(sellable: Product.find(product_id), quantity: quantity)
+        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|
+            @order.line_items << LineItem.new(sellable: addon.product, quantity: quantity)
+          end
         end
       end
     end

data/app/controllers/op_cart/plans_controller.rb

@@ -0,0 +1,7 @@
+module OpCart
+  class PlansController < ApplicationController
+    def index
+      @plans = Plan.purchasable
+    end
+  end
+end

data/app/models/op_cart/line_item.rb

@@ -13,7 +13,11 @@ module OpCart
     before_validation :snapshot_sellable
 
     def total
-      (unit_price || sellable.price) * quantity
+      if sellable.is_a? Plan
+        0
+      else
+        (unit_price || sellable.price) * quantity
+      end
     end
 
     private

data/app/models/op_cart/order.rb

@@ -14,6 +14,7 @@ module OpCart
     validates :line_items, presence: true
     validates :shipping_address, associated: true
     validates :user, presence: true
+    validate :validate_plan_addons_included
 
     before_validation :set_total
     before_validation -> { self.status = :pending }, unless: :status?
@@ -25,6 +26,19 @@ module OpCart
       self.total = line_items.reduce(0) { |total, line_item| total += line_item.total }
     end
 
+    def validate_plan_addons_included
+      unless line_items.flat_map do |li|
+        if li.sellable.is_a?(Plan) && (addons = li.sellable.plan_addons).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
+          end
+        end
+      end.compact.all?
+        self.errors.add :base, 'Plan addon(s) missing'
+      end
+    end
+
     def charge_customer
       customer = Customer.find_or_create_by user: user
       if processor_token.present?

data/app/models/op_cart/plan.rb

@@ -1,5 +1,6 @@
 module OpCart
   class Plan < ActiveRecord::Base
+    has_many :plan_addons
     belongs_to :user
 
     before_validation -> { self.interval_count = 1 }, unless: :interval_count?
@@ -21,6 +22,10 @@ module OpCart
       @processor_object ||= Stripe::Plan.retrieve processor_token
     end
 
+    def addons_price
+      plan_addons.reduce(0) { |total, addon| total += addon.product.price }
+    end
+
     private
 
     def create_plan

data/app/models/op_cart/plan_addon.rb

@@ -0,0 +1,7 @@
+module OpCart
+  class PlanAddon < ActiveRecord::Base
+    belongs_to :plan
+    belongs_to :product
+    belongs_to :user
+  end
+end

data/config/routes.rb

@@ -1,3 +1,4 @@
 OpCart::Engine.routes.draw do
+  resources :plans
   resources :orders
 end

data/db/migrate/20150203043805_create_op_cart_plan_addons.rb

@@ -0,0 +1,12 @@
+class CreateOpCartPlanAddons < ActiveRecord::Migration
+  def change
+    create_table :op_cart_plan_addons do |t|
+      t.boolean :recurring
+      t.references :plan, index: true
+      t.references :product, index: true
+      t.references :user, index: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/seeds.rb

@@ -21,3 +21,28 @@ product2_attrs = {
 }
 
 product2 = OpCart::Product.where(sku: product2_attrs[:sku]).first_or_create product2_attrs
+
+rand_plan_no = rand 10**9
+plan1_attrs = {
+  name: "Gold Plan #{rand_plan_no}",
+  processor_token: "gold-#{rand_plan_no}",
+  interval: 'month',
+  interval_count: 1,
+  price: '1500',
+  description: 'Better than Silver.',
+  image_url: 'http://example.com/example.png',
+  trial_period_days: 30,
+  allow_purchases: true,
+  user: User.first,
+}
+
+plan1 = OpCart::Plan.where(name: plan1_attrs[:name]).first_or_create plan1_attrs
+
+plan_addon1_attrs = {
+  recurring: false,
+  product: product1,
+  plan: plan1,
+  user: User.first,
+}
+
+plan_addon1 = OpCart::PlanAddon.first_or_create plan_addon1_attrs

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,11 +78,13 @@ files:
 - Rakefile
 - app/controllers/op_cart/application_controller.rb
 - app/controllers/op_cart/orders_controller.rb
+- app/controllers/op_cart/plans_controller.rb
 - app/models/op_cart/card.rb
 - app/models/op_cart/customer.rb
 - app/models/op_cart/line_item.rb
 - app/models/op_cart/order.rb
 - app/models/op_cart/plan.rb
+- app/models/op_cart/plan_addon.rb
 - app/models/op_cart/product.rb
 - app/models/op_cart/shipping_address.rb
 - config/initializers/stripe.rb
@@ -95,6 +97,7 @@ files:
 - db/migrate/20150131000000_create_op_cart_customers.rb
 - db/migrate/20150131000001_create_op_cart_cards.rb
 - db/migrate/20150201033629_create_op_cart_plans.rb
+- db/migrate/20150203043805_create_op_cart_plan_addons.rb
 - db/seeds.rb
 - lib/op_cart.rb
 - lib/op_cart/engine.rb