op_cart 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555f3763a51291752b7b31d2cf101a3c722d8071
-  data.tar.gz: 6383d96c5fa6673fe1997725c6dade67789ba2d7
+  metadata.gz: eb4504eab944521ca26e80d782e55b6c943aa7c7
+  data.tar.gz: a6c332fdbd12c6d11d5e94ac470b55f1a8b36c43
 SHA512:
-  metadata.gz: 15d459050de75c8fb57f6882e936cf346d96890b4c683a94314715ae686627534c3a611d72b048e8b142953decabca8698cdc6d554baf449cd10a9b476ca26e7
-  data.tar.gz: bf59c9119eb7d3567d8be022ef33dcb357b80cdef60d6aa12bffc51aee14e48f57e852f6a554f84b7182133fbf2141c98b6e6a09b63339700e1ba73208dc0808
+  metadata.gz: e8f24610a0805d6de1a5238e848fc221e843313870c8cbfccaf4240d548cd8e3c0ddd1046823db46f2c1cfab86ffa0b74c3250a6802f32c879ab5e46ed6ec02f
+  data.tar.gz: 5ec244260b96dd7ed28c8dbcb15d1d2bf5bedc520cdf6053c48c96b57fd582c1620b810b723a6aef1bc93f1f2f99d6711bde30caf40a5e4ae0dc7eab4075166d

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

@@ -1,16 +1,13 @@
 @OpCart =
   ready: ->
-    if $('body').is '.op_cart-orders-new'
+    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'
-      $city   = $ '#order_shipping_addresses_city'
-      $state  = $ '#order_shipping_addresses_state'
-      $zip    = $ '#order_shipping_addresses_zip_code'
-
-      $number.payment 'formatCardNumber'
-      $expiry.payment 'formatCardExpiry'
-      $cvc.payment 'formatCardCVC'
 
       $zip.change ->
         if $zip.val().length == 5
@@ -20,6 +17,12 @@
           $city.prop "disabled", false
           $state.prop "disabled", false
 
+      if $('#card_details')
+        $number.payment 'formatCardNumber'
+        $expiry.payment 'formatCardExpiry'
+        $cvc.payment 'formatCardCVC'
+
+      @updateDisplayedQuantities()
       @stripeCreateToken()
 
   load: ->
@@ -50,11 +53,12 @@
       if response.error
         errorMessage = response.error.message
       else
-        errorMessage = 'Email or shipping information missing'
+        errorMessage = 'Email or shipping information missing' #TODO: what else is missing?
       $form.find(".payment-errors").text errorMessage
       $form.find("button").prop "disabled", false
     else
       $('#order_card_token').val response.id
+      $('#order_details').remove()
       $form.get(0).submit()
 
   addItemToOrder: (productId, quantity) ->
@@ -66,6 +70,9 @@
     @lineItemQuantity productId, 0
     @updateDisplayedQuantity productId
 
+  updateDisplayedQuantities: ->
+    $('li[data-product-id]').each -> OpCart.updateDisplayedQuantity $(@).data('product-id')
+
   updateDisplayedQuantity: (productId) ->
     $quantity = $ "#line_item_product_#{productId} .quantity .value"
     $quantity.html @lineItemQuantity(productId)
@@ -82,4 +89,3 @@
 
 $ -> OpCart.ready()
 $(document).on 'page:load', OpCart.load
-

data/app/controllers/op_cart/orders_controller.rb

@@ -9,9 +9,18 @@ module OpCart
     end
 
     def create
+      @products = Product.all
       @order = Order.new order_params
-      @order.status = :new
-      @order.user = current_user || User.first #TODO: Create a user from email
+      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
       add_line_items
 
       if @order.save
@@ -26,6 +35,11 @@ module OpCart
 
     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]
@@ -33,13 +47,17 @@ module OpCart
     end
 
     def order_params
-      params.require(:order).permit(:email, :card_token,
-        { shipping_address: [ :full_name, :address, :zip_code, :city, :state ] }
+      params.require(:order).permit(:email, :password, :card_token#,
+        # { shipping_address: [ :full_name, :address, :zip_code, :city, :state ] },
       )
     end
 
+    def line_items_params
+      params.require(:line_items).permit :quantities
+    end
+
     def add_line_items
-      li_quantities_json = JSON.parse params[:line_items][:quantities]
+      li_quantities_json = JSON.parse line_items_params[:quantities]
       li_quantities_json.each do |product_id, quantity|
         @order.line_items <<
           LineItem.new(sellable: Product.find(product_id), quantity: quantity)

data/app/models/op_cart/order.rb

@@ -1,18 +1,19 @@
 module OpCart
   class Order < ActiveRecord::Base
     has_many :line_items
+    has_one :shipping_address
     belongs_to :user
 
     accepts_nested_attributes_for :line_items
 
-    validates :email, presence: true, format: { with: /@/ }
     validates :total, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
     validates :tax_amount, numericality:
-      { only_integer: true, greater_than_or_equal_to: 0 } if :tax_amount?
+      { only_integer: true, greater_than_or_equal_to: 0 }, if: :tax_amount?
     validates :status, presence: true
     validates :user, presence: true
 
     before_validation :set_total
+    before_validation -> { self.status = :new }, unless: :status?
     before_save :charge_customer
 
     private
@@ -24,7 +25,7 @@ module OpCart
     def charge_customer
       customer = Stripe::Customer.create(
         card: card_token,
-        email: email
+        email: user.email
       )
 
       # TODO Create shipping address

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

@@ -3,13 +3,12 @@
     h2 Purchasble Items
     ul style="list-style-type: none"
       - @products.each do |product|
-        li
+        li id="#{dom_id product}" data-product-id=(product.id)
           p = product.name
           p = product.description
           p = number_to_currency product.price / 100
           p
-            a onclick="OpCart.addItemToOrder(#{product.id}, 1)" style="cursor:pointer"
-              | Add to Order
+            a href="#" onclick="OpCart.addItemToOrder(#{product.id}, 1); return false" Add to Order
 
     h2 Items in Order
     ul style="list-style-type: none"
@@ -21,33 +20,41 @@
             span.name Quantity: 
             span.value 0
           p
-            a onclick="OpCart.removeItemFromOrder(#{product.id})" style="cursor:pointer"
-              | Remove
+            a href="#" onclick="OpCart.removeItemFromOrder(#{product.id}); return false" Remove
 
   = simple_form_for @order, data: { stripe_key: Rails.configuration.stripe[:publishable_key] } do |f|
     span.payment-errors
     p
       h2 Your Information
-      = f.input :email, autofocus: true, input_html: { autocomplete: 'email' }
+      - if current_user.present?
+        strong Email: 
+        span = current_user.email
+      - else
+        = simple_fields_for :user do |fu|
+          = fu.input :email, autofocus: true, input_html: { autocomplete: 'email' }
+          = fu.input :password
 
     p
       h2 Shipping Address
-      = f.simple_fields_for :shipping_addresses do |sa|
+      = 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' }
 
-    p
+    p#card_details
       h2 Card Details
-      = 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' }
+      - 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' }
 
     = f.input :card_token, as: :hidden
-    = hidden_field :line_items, :quantities, value: "{}"
+    = 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

@@ -15,7 +15,7 @@
 
   p
     h2 Your Information
-    = @order.email
+    = @order.user.email
   p
     h2 Shipping Address
     p 123 N Todo Street

data/config/locales/op_cart.en.yml

@@ -3,7 +3,7 @@ en:
     placeholders:
       order:
         email: "Email"
-        shipping_addresses:
+        shipping_address:
           full_name: "Full Name"
           address: "Street Address"
           zip_code: "Zip Code"

data/db/migrate/20140829200318_create_op_cart_orders.rb

@@ -1,7 +1,6 @@
 class CreateOpCartOrders < ActiveRecord::Migration
   def change
     create_table :op_cart_orders do |t|
-      t.string :email,                 null: false
       t.string :card_token,            null: false
       t.integer :total,                null: false
       t.integer :tax_amount,        default: 0

data/lib/op_cart/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement