op_cart 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb4504eab944521ca26e80d782e55b6c943aa7c7
-  data.tar.gz: a6c332fdbd12c6d11d5e94ac470b55f1a8b36c43
+  metadata.gz: 32b387aaa77d790a4531b2632ee96549d64e9e19
+  data.tar.gz: f9d4749e1df95fa59d4e958afcfc6e1e8858791e
 SHA512:
-  metadata.gz: e8f24610a0805d6de1a5238e848fc221e843313870c8cbfccaf4240d548cd8e3c0ddd1046823db46f2c1cfab86ffa0b74c3250a6802f32c879ab5e46ed6ec02f
-  data.tar.gz: 5ec244260b96dd7ed28c8dbcb15d1d2bf5bedc520cdf6053c48c96b57fd582c1620b810b723a6aef1bc93f1f2f99d6711bde30caf40a5e4ae0dc7eab4075166d
+  metadata.gz: d15243927655156b24360107719bf6e2c08edb8f03d3c3332a3f8601416c4b51fde9f3eeb33b26d3c394a484deccda34e96d01fd4cf904c97931c33c897bc5ac
+  data.tar.gz: f9db8fd0ba1c303c0c76b95aa0badd6fc870ae5d577345eb899a6442dbb372593be8f749c6dd15e23267f54ea7124082fe9397dc9ca038c8894263360529f245

data/app/assets/javascripts/op_cart/orders.js.coffee

@@ -1,33 +1,37 @@
 @OpCart =
   ready: ->
     if $('body').is '.op_cart-orders-new, .op_cart-orders-create'
-      $city   = $ '#order_shipping_address_city'
-      $state  = $ '#order_shipping_address_state'
-      $zip    = $ '#order_shipping_address_zip_code'
-
-      $number = $ '#order_credit_cards_number'
-      $expiry = $ '#order_credit_cards_expiry'
-      $cvc    = $ '#order_credit_cards_cvc'
-
-      $zip.change ->
-        if $zip.val().length == 5
-          $.ziptastic $zip.val(), (country, state, state_short, city, zip) ->
-            $city.val city
-            $state.val state
-          $city.prop "disabled", false
-          $state.prop "disabled", false
-
-      if $('#card_details')
+      $number = $ '#credit_card_number'
+      $expiry = $ '#credit_card_expiry'
+      $cvc    = $ '#credit_card_cvc'
+
+      if $('#card_form_inputs')
         $number.payment 'formatCardNumber'
         $expiry.payment 'formatCardExpiry'
         $cvc.payment 'formatCardCVC'
 
+      $('#shipping_address_postal_code').change => @updateZipFields()
+
+      @updateZipFields()
       @updateDisplayedQuantities()
       @stripeCreateToken()
 
   load: ->
     OpCart.ready()
 
+  updateZipFields: ->
+    $locality = $ '#shipping_address_locality'
+    $region   = $ '#shipping_address_region'
+    $zip      = $ '#shipping_address_postal_code'
+
+    if $zip.val().length == 5
+      $.ziptastic $zip.val(), (country, region, region_short, locality, zip) ->
+        $locality.val locality
+        $region.val region
+      $locality.prop "disabled", false
+      $region.prop "disabled", false
+
+
   stripeCreateToken: ->
     $("#new_order").submit (event) ->
       $form = $(this)
@@ -35,11 +39,11 @@
 
       Stripe.setPublishableKey $form.data("stripe-key")
 
-      expiration = $("#order_credit_cards_expiry").payment "cardExpiryVal"
+      expiration = $("#credit_card_expiry").payment "cardExpiryVal"
 
       Stripe.card.createToken
-        number: $("#order_credit_cards_number").val()
-        cvc: $("#order_credit_cards_cvc").val()
+        number: $("#credit_card_number").val()
+        cvc: $("#credit_card_cvc").val()
         exp_month: expiration.month || 0
         exp_year: expiration.year || 0
       , OpCart.stripeResponseHandler
@@ -78,7 +82,7 @@
     $quantity.html @lineItemQuantity(productId)
 
   lineItemQuantity: (productId, quantity) ->
-    $liQuantities = $ '#line_items_quantities'
+    $liQuantities = $ '#line_items_quantities_json'
     liQuantities = JSON.parse $liQuantities.val() || "{}"
 
     if quantity >= 0

data/app/controllers/op_cart/orders_controller.rb

@@ -4,65 +4,80 @@ module OpCart
     before_action :set_order, only: [:show, :edit, :update, :destroy]
 
     def new
-      @products = Product.all
+      @products = Product.all #TODO: Move to find_products
       @order = Order.new
+      if signed_in?
+        @shipping_address = current_user.shipping_addresses.first
+      end
     end
 
     def create
       @products = Product.all
-      @order = Order.new order_params
-      if current_user.blank? && user = User.find_by(email: params[:user][:email])
-        if user.valid_password? params[:user][:password]
-          sign_in user
-        else
-          flash[:alert] = 'A user with that email already exists. Please sign in or pick another email.'
-          return render :new
-        end
-      end
-      sign_in create_user unless signed_in?
-      @order.user = current_user
+      @order = Order.new order_params #TODO: Move to set_order
+      add_user
       add_line_items
+      add_shipping_address
 
-      if @order.save
+      if signed_in? && @order.save
         redirect_to @order, notice: 'Thank you for your purchase'
       else
+        # TODO Set flash w/ error
         render :new
       end
     end
 
-    def show
-    end
+    def show; end
 
     private
 
-    def create_user
-      User.create name: params[:order][:shipping_address][:full_name], email: params[:user][:email],
-        password: params[:user][:password], password_confirmation: params[:user][:password]
-    end
-
     def set_order
-      # TODO prevent viewing of others' orders
-      # @order = current_user.orders.find params[:id]
-      @order = Order.find params[:id]
+      @order = current_user.orders.find params[:id]
     end
 
     def order_params
-      params.require(:order).permit(:email, :password, :card_token#,
-        # { shipping_address: [ :full_name, :address, :zip_code, :city, :state ] },
-      )
+      params.require(:order).permit :email, :password, :card_token
     end
 
     def line_items_params
-      params.require(:line_items).permit :quantities
+      params.require(:line_items).permit :quantities_json
+    end
+
+    def shipping_address_params
+      params.require(:shipping_address).permit :full_name, :street, :postal_code,
+        :locality, :region
     end
 
     def add_line_items
-      li_quantities_json = JSON.parse line_items_params[:quantities]
+      @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)
       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
+        else
+          flash[:alert] = 'A user with that email already exists. Please sign in or pick another email.'
+          return false
+        end
+      end
+
+      unless signed_in?
+        sign_in User.create name: params[:order][:shipping_address][:full_name],
+          email: params[:user][:email], password: params[:user][:password],
+          password_confirmation: params[:user][:password]
+      end
+      @order.user = current_user
+    end
+
+    def add_shipping_address
+      @order.shipping_address = @shipping_address ||= ShippingAddress.create(
+        shipping_address_params.merge user_id: current_user.try(:id)
+      )
+    end
   end
 end

data/app/models/op_cart/order.rb

@@ -1,7 +1,7 @@
 module OpCart
   class Order < ActiveRecord::Base
     has_many :line_items
-    has_one :shipping_address
+    belongs_to :shipping_address
     belongs_to :user
 
     accepts_nested_attributes_for :line_items

data/app/models/op_cart/shipping_address.rb

@@ -0,0 +1,9 @@
+module OpCart
+  class ShippingAddress < ActiveRecord::Base
+    has_many :orders
+    belongs_to :user
+
+    validates :full_name, :street, :locality, :region, :postal_code, presence: true
+    validates :user, presence: true
+  end
+end

data/app/views/op_cart/orders/new.html.slim

@@ -26,7 +26,7 @@
     span.payment-errors
     p
       h2 Your Information
-      - if current_user.present?
+      - if signed_in?
         strong Email: 
         span = current_user.email
       - else
@@ -36,25 +36,28 @@
 
     p
       h2 Shipping Address
-      = f.simple_fields_for :shipping_address do |sa|
-        = sa.input :full_name, input_html: { autocomplete: 'name' }
-        = sa.input :address, input_html: { autocomplete: 'street-address' }
-        = sa.input :zip_code, input_html: { autocomplete: 'postal-code' }
-        = sa.input :city, disabled: true, input_html: { autocomplete: 'city' }
-        = sa.input :state, disabled: true, input_html: { autocomplete: 'state' }
+      = simple_fields_for :shipping_address do |sa|
+        - focus_name = signed_in? ? true : false
+        = sa.input :full_name, autofocus: focus_name, input_html: { autocomplete: 'name' }
+        = sa.input :street, input_html: { autocomplete: 'street-address' }
+        = sa.input :postal_code, input_html: { autocomplete: 'postal-code' }
+        = sa.input :locality, disabled: true, input_html: { autocomplete: 'city' }
+        = sa.input :region, disabled: true, input_html: { autocomplete: 'state' }
 
-    p#card_details
+    p
       h2 Card Details
       - if f.object.card_token.present?
         span Card information already provided.
       - else
-        = f.simple_fields_for :credit_cards do |c|
-          = c.input :number, input_html: { autocomplete: 'cc-number' }
-          = c.input :expiry, input_html: { autocomplete: 'cc-exp' }
-          = c.input :cvc, input_html: { autocomplete: 'cc-csc' }
+        #card_form_inputs
+          = simple_fields_for :credit_card do |c|
+            = c.input :number, input_html: { autocomplete: 'cc-number' }
+            = c.input :expiry, input_html: { autocomplete: 'cc-exp' }
+            = c.input :cvc, input_html: { autocomplete: 'cc-csc' }
 
+    = simple_fields_for :line_items do |li|
+      = li.input :quantities_json, as: :hidden
     = f.input :card_token, as: :hidden
-    = hidden_field :line_items, :quantities, value: params.fetch(:line_items, {}).fetch(:quantities, {})
 
     .form-actions
       = f.button :button, "Submit Payment"

data/app/views/op_cart/orders/show.html.slim

@@ -18,5 +18,7 @@
     = @order.user.email
   p
     h2 Shipping Address
-    p 123 N Todo Street
-    p Edmond, Oklahoma 73013
+    - sa = @order.shipping_address
+    p = sa.full_name
+    p = sa.street
+    p = "#{sa.locality}, #{sa.region} #{sa.postal_code}"

data/config/locales/op_cart.en.yml

@@ -3,13 +3,13 @@ en:
     placeholders:
       order:
         email: "Email"
-        shipping_address:
-          full_name: "Full Name"
-          address: "Street Address"
-          zip_code: "Zip Code"
-          city: "City"
-          state: "State"
-        credit_cards:
-          number: "Card Number"
-          expiry: 'MM/YY'
-          cvc: 'CVC'
+      credit_card:
+        number: "Card Number"
+        expiry: 'MM/YY'
+        cvc: 'CVC'
+      shipping_address:
+        full_name: "Full Name"
+        street: "Street Address"
+        locality: "City"
+        region: "State"
+        postal_code: "Zip Code"

data/db/migrate/20140829200318_create_op_cart_orders.rb

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

data/db/migrate/20150125000000_create_op_cart_shipping_addresses.rb

@@ -0,0 +1,15 @@
+class CreateOpCartShippingAddresses < ActiveRecord::Migration
+  def change
+    create_table :op_cart_shipping_addresses do |t|
+      t.string :full_name,          null: false
+      t.string :street,             null: false
+      t.string :street_2
+      t.string :locality,           null: false
+      t.string :region,             null: false
+      t.string :postal_code,        null: false
+      t.references :user, index: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Eric Boehs
@@ -86,6 +86,7 @@ files:
 - app/models/op_cart/line_item.rb
 - app/models/op_cart/order.rb
 - app/models/op_cart/product.rb
+- app/models/op_cart/shipping_address.rb
 - app/views/op_cart/orders/new.html.slim
 - app/views/op_cart/orders/show.html.slim
 - config/initializers/stripe.rb
@@ -94,6 +95,7 @@ files:
 - db/migrate/20140829191646_create_op_cart_products.rb
 - db/migrate/20140829200318_create_op_cart_orders.rb
 - db/migrate/20140829201756_create_op_cart_line_items.rb
+- db/migrate/20150125000000_create_op_cart_shipping_addresses.rb
 - db/seeds.rb
 - lib/op_cart.rb
 - lib/op_cart/engine.rb