op_cart 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4784222186a87a804618584469de28a04472da24
-  data.tar.gz: c2f44cdac74ff12e11461da43d66d3d4aba580a3
+  metadata.gz: e69269d8c9a1152b5369129c8c9d50713d4aabb7
+  data.tar.gz: 9dd208f2ca331e1e8ed47abdc4fec93c02849782
 SHA512:
-  metadata.gz: 3e9d15cde05165f7850269b4b05f5a2385b3e74de9981306f217359ceb9b8061712185dcdb6113a4a4c9483aa07d33070d6a601bc7302b52fcb6b8c851908178
-  data.tar.gz: 4368bd5bf33eb1373ea83fd50976f1a19ae54a409d0ff9e79074b992574c386c6640dd639a492ea4c69e094933cd2042e151093c6db9ceaab56a37b8bbfae968
+  metadata.gz: 53cd8e80758bfc5eec306927376e07f885eaec0cba12c648befeaf47bac85f6a64d251b109da038875006e66a3e9287933d50472a224581c33c1a40da0f1a45b
+  data.tar.gz: d3bcec702719717a4fd3859543b223af70d3dbfa95db1fae5fbcb6331124342cace0a285a20324ae43e007e49fd6d1c45362589d05670fd558a45a248f7b85ac

data/app/controllers/op_cart/orders_controller.rb

@@ -4,24 +4,27 @@ module OpCart
     before_action :set_order, only: [:show, :edit, :update, :destroy]
 
     def new
-      @products = Product.all #TODO: Move to find_products
+      @products = Product.all
       @order = Order.new
-      if signed_in?
-        @shipping_address = current_user.shipping_addresses.first
-      end
+      @user = current_user || User.new
+      @card = current_user.try(:customer).try :default_card
+      @shipping_address = @user.shipping_addresses.first || @user.shipping_addresses.new
     end
 
     def create
-      @products = Product.all
-      @order = Order.new order_params #TODO: Move to set_order
+      @order = Order.new order_params
+      @user = current_user || @order.user
       add_user
       add_line_items
       add_shipping_address
 
-      if signed_in? && @order.save
+      if @order.save
+        sign_in @order.user
         redirect_to @order, notice: 'Thank you for your purchase'
       else
-        # TODO Set flash w/ error
+        @products = Product.all
+        @user = User.new user_params unless signed_in?
+        @card = current_user.try(:customer).try :default_card
         render :new
       end
     end
@@ -38,6 +41,7 @@ module OpCart
       params.require(:order).permit :email, :password, :processor_token
     end
 
+
     def line_items_params
       params.require(:line_items).permit :quantities_json
     end
@@ -47,36 +51,56 @@ module OpCart
         :locality, :region
     end
 
+    def user_params
+      params.require(:user).permit :email, :password
+    end
+
     def add_line_items
       @line_items = OpenStruct.new(quantities_json: line_items_params[:quantities_json] || {})
-      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)
+      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)
+        end
       end
     end
 
     def add_user
-      if current_user.blank? && user = User.find_by(email: params[:user][:email])
-        if user.valid_password? params[:user][:password]
-          sign_in user
+      if !signed_in? && !@order.user
+        if user = find_user
+          if valid_password? user
+            @order.user = @user = user
+          else
+            flash.now[:alert] = 'A user with that email already exists. Please sign in or pick another email.'
+          end
         else
-          flash[:alert] = 'A user with that email already exists. Please sign in or pick another email.'
-          return false
+          @order.user = @user = new_user
         end
+      else
+        @order.user = current_user
       end
+    end
 
-      unless signed_in?
-        sign_in User.create name: params[:shipping_address][:full_name],
-          email: params[:user][:email], password: params[:user][:password],
-          password_confirmation: params[:user][:password]
-      end
-      @order.user = current_user
+    def find_user
+      User.find_by email: params[:user][:email]
+    end
+
+    def valid_password? user
+      user.valid_password? params[:user][:password]
+    end
+
+    def new_user
+      user = User.new(user_params.merge(
+        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.create(
-        shipping_address_params.merge user_id: current_user.try(:id)
+      @order.shipping_address = @shipping_address = ShippingAddress.new(
+        shipping_address_params.merge user_id: @user.try(:id)
       )
     end
   end

data/app/models/op_cart/order.rb

@@ -11,11 +11,13 @@ module OpCart
     validates :tax_amount, numericality:
       { only_integer: true, greater_than_or_equal_to: 0 }, if: :tax_amount?
     validates :status, presence: true
+    validates :line_items, presence: true
+    validates :shipping_address, associated: true
     validates :user, presence: true
 
     before_validation :set_total
-    before_validation -> { self.status = :new }, unless: :status?
-    before_save :charge_customer
+    before_validation -> { self.status = :pending }, unless: :status?
+    before_save :charge_customer, if: -> { self.status == 'pending' }
 
     private
 
@@ -25,20 +27,32 @@ module OpCart
 
     def charge_customer
       customer = Customer.find_or_create_by user: user
-      customer.update_card processor_token
+      if processor_token.present?
+        customer.update_card processor_token
+        processor_token = nil
+      end
 
-      # TODO Create shipping address
-
-      charge = Stripe::Charge.create(
+      self.processor_response = Stripe::Charge.create(
         amount: total,
         currency: "usd",
         customer: customer.processor_token
-      )
-      #TODO: Mark order as charged
-      # update_attribute :charged, true if charge.captured
-    rescue Stripe::CardError => e
-      # The card has been declined or some other error has occurred
-      self.errors.add e
+      ).to_hash
+      self.status = :paid if processor_response['captured']
+    rescue Stripe::InvalidRequestError, Stripe::CardError => e
+      if e.try(:code) == 'card_declined'
+        self.status = :payment_declined
+      end
+
+      self.processor_response = {
+        customer_token: customer.processor_token, error: e.json_body
+      }
+
+      if e.message.include? "Stripe token more than once"
+        message = 'There was a problem with the request. Sorry about that. Try entering your card again.'
+      end
+
+      self.errors.add :card_error, (message || e.message)
+      false
     end
   end
 end

data/app/models/op_cart/shipping_address.rb

@@ -4,6 +4,7 @@ module OpCart
     belongs_to :user
 
     validates :full_name, :street, :locality, :region, :postal_code, presence: true
+    validates :postal_code, format: { with: /\A\d{5}\z/ }
     validates :user, presence: true
   end
 end

data/config/locales/op_cart.en.yml

@@ -13,3 +13,11 @@ en:
         locality: "City"
         region: "State"
         postal_code: "Zip Code"
+
+  activerecord:
+    errors:
+      models:
+        op_cart/order:
+          attributes:
+            line_items:
+              blank: "You must add at least one item to your order."

data/db/migrate/20140829200318_create_op_cart_orders.rb

@@ -4,6 +4,7 @@ class CreateOpCartOrders < ActiveRecord::Migration
       t.integer :total,                null: false
       t.integer :tax_amount,        default: 0
       t.string :status,                null: false
+      t.json :processor_response,      null: false
       t.references :shipping_address, index: true, null: false
       t.references :user, index: true, null: false
 

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails