op_cart 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad47e8c3658d30668cbfaf4e1ad60ca64cf5806c
-  data.tar.gz: d97883ff84bdc92bf310c5fb40370a07ab995e90
+  metadata.gz: b2e3218ad0131f81758ccc3f33a8cc3800bb8c68
+  data.tar.gz: 83a9efdfe925a67a27221b7f2f006191c54ef928
 SHA512:
-  metadata.gz: b9be7bdaf88cb70f5c5880c8eadbdd082f168b2944c8bf6a0b9ef2a7653b926c54a837a7bfb415fe19ec471ce2041075141ab4e00e6e5e9b06e9aaf96bd8bb2d
-  data.tar.gz: c746e0aa7b34e09c8ef9d53410a19ea69e0ea6ea9aaad4cfcce7546457e4046b3d440e6a69b5809cf7e6a69932442a3c0d47509d21af3fa7ffc74d1a4cb43e7d
+  metadata.gz: d77f1f76b0edf91a31c891498ffe2434e151967e3105c37153d3bd37794ceff3904b76a97a096112996143eb7890fbf1a5aceaeaf5cd268d2c7f655f57ed6a49
+  data.tar.gz: db45bf60426be0d7669cbd356ed671e19b06678186dd7036c86d7780c67891721f837f38399b723f80be1fe456fc2f79ac3eeee8289a9b41c82cd29bce3aecb6

data/app/controllers/op_cart/orders_controller.rb

@@ -3,22 +3,31 @@ module OpCart
     before_action :authenticate_user!, only: [:show, :edit, :update, :destroy]
     before_action :set_order, only: [:show, :edit, :update, :destroy]
     if defined? decorates_assigned
-      decorates_assigned :order, :orders, :products, :plan, :user, :card, :shipping_address
+      decorates_assigned :order, :orders, :plan, :card
     end
 
     def new
-      @products = Product.all
+      if params[:plan_id]
+        @plan = Plan.purchasable.find(params[:plan_id])
+      else
+        return redirect_to plans_path
+      end
+
       @order = Order.new
+      @order.user = current_user || User.new
       @order.line_items << LineItem.new
-      @plan = Plan.purchasable.find(params[:plan_id]) if params[:plan_id]
-      @user = current_user || User.new
+      @order.shipping_address = @order.user.shipping_addresses.first || @order.user.shipping_addresses.new
       @card = current_user.try(:customer).try :default_card
-      @shipping_address = @user.shipping_addresses.first || @user.shipping_addresses.new
     end
 
     def create
+      if params[:plan_id]
+        @plan = Plan.purchasable.find(params[:plan_id])
+      else
+        return redirect_to plans_path
+      end
+
       @order = Order.new order_params
-      @user = current_user || @order.user
       add_user
       add_line_items
       add_shipping_address
@@ -27,9 +36,7 @@ module OpCart
         sign_in @order.user
         redirect_to @order, notice: 'Thank you for your purchase'
       else
-        @products = Product.all
-        @user = User.new user_params unless signed_in?
-        @card = current_user.try(:customer).try :default_card
+        @order.user ||= User.new email: user_params[:email]
         render :new
       end
     end
@@ -46,18 +53,17 @@ module OpCart
       params.require(:order).permit :email, :password, :processor_token
     end
 
-
     def line_items_params
       params.require(:line_items).permit :quantities_json
     end
 
     def shipping_address_params
-      params.require(:shipping_address).permit :full_name, :street, :postal_code,
+      params[:order].require(:shipping_address).permit :full_name, :street, :postal_code,
         :locality, :region
     end
 
     def user_params
-      params.require(:user).permit :email, :password
+      params[:order].require(:user).permit :email, :password
     end
 
     def add_line_items
@@ -78,12 +84,12 @@ module OpCart
       if !signed_in? && !@order.user
         if user = find_user
           if valid_password? user
-            @order.user = @user = user
+            @order.user = user
           else
             flash.now[:alert] = 'A user with that email already exists. Please sign in or pick another email.'
           end
         else
-          @order.user = @user = new_user
+          @order.user = new_user
         end
       else
         @order.user = current_user
@@ -91,11 +97,11 @@ module OpCart
     end
 
     def find_user
-      User.find_by email: params[:user][:email]
+      User.find_by email: params[:order][:user][:email]
     end
 
     def valid_password? user
-      user.valid_password? params[:user][:password]
+      user.valid_password? params[:order][:user][:password]
     end
 
     def new_user
@@ -103,12 +109,11 @@ module OpCart
         name: shipping_address_params[:full_name],
         password_confirmation: user_params[:password]
       ))
-      user.valid? && user
     end
 
     def add_shipping_address
-      @order.shipping_address = @shipping_address = ShippingAddress.new(
-        shipping_address_params.merge user: @user
+      @order.shipping_address = ShippingAddress.new(
+        shipping_address_params.merge user: @order.user
       )
     end
   end

data/app/models/op_cart/order.rb

@@ -14,7 +14,7 @@ module OpCart
     validates :status, presence: true
     validates :line_items, presence: true
     validates :shipping_address, associated: true
-    validates :user, presence: true
+    validates :user, associated: true
     validate :validate_plan_addons_included
 
     before_validation :set_total

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.4.6"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Eric Boehs