op_cart 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 141aa04382aba1feb816cd854b830ceab70fe33a
-  data.tar.gz: 7d44636bcb5cf528c512a0b1db8a3237c2ce0ffe
+  metadata.gz: 5eebd165fcfc2393d11a5bc38187675f501cb540
+  data.tar.gz: ae0ba7bc1ce2ee742a76b6c6fc4b7e4084262c8b
 SHA512:
-  metadata.gz: 806d6828dcd0254f33933bd73517a2d4de92332acbad5d914f796cfd623f7e5fbfd4291e89a76dcd79b1a18ae12d8f6176c4e16dd52ed34052789664b1121575
-  data.tar.gz: fa3e315d8b181bd9ed741737357e359b70fbcdd344791e72596d2834e2e92e6d0943c647f28e35822f141080d518a67ae35c039c524ef4f0194aff5ec328a3c0
+  metadata.gz: 8219b5278281607723727a06fd338a0d52c77e605ba6459cb3ba72d468eaf4ce2ef3521db6229f576cec3206246dea632a85819b3571d6125525dfa0ae25631a
+  data.tar.gz: 8e945ab2f42a3e2d5d363046aaea27d3ee79bd46fee4328a66138ec124963b7919c3da548541b6aa49c40db3f2fabf7b7120cbd67345631237dedaf4aeee873b

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

@@ -1,12 +1,12 @@
-OpCart =
+@OpCart =
   ready: ->
     if $('body').is '.op_cart-orders-new'
-      $number = $ '#order_credit_card_number'
-      $expiry = $ '#order_credit_card_expiry'
-      $cvc    = $ '#order_credit_card_cvc'
-      $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'
@@ -29,11 +29,13 @@ OpCart =
       $form = $(this)
       $form.find("button").prop "disabled", true
 
-      expiration = $("#order_credit_card_expiry").payment "cardExpiryVal"
+      Stripe.setPublishableKey $form.data("stripe-key")
+
+      expiration = $("#order_credit_cards_expiry").payment "cardExpiryVal"
 
       Stripe.card.createToken
-        number: $("#order_credit_card_number").val()
-        cvc: $("#order_credit_card_cvc").val()
+        number: $("#order_credit_cards_number").val()
+        cvc: $("#order_credit_cards_cvc").val()
         exp_month: expiration.month || 0
         exp_year: expiration.year || 0
       , OpCart.stripeResponseHandler
@@ -43,7 +45,6 @@ OpCart =
   stripeResponseHandler: (status, response) ->
     $form = $("#new_order")
 
-    debugger
     if response.error || !$form.get(0).checkValidity()
       if response.error
         errorMessage = response.error.message
@@ -52,10 +53,32 @@ OpCart =
       $form.find(".payment-errors").text errorMessage
       $form.find("button").prop "disabled", false
     else
-      $form.append $("<input type=\"hidden\" name=\"stripeToken\" />").val(response.id)
+      $('#order_card_token').val response.id
       $form.get(0).submit()
 
+  addItemToOrder: (productId, quantity) ->
+    currentQuantity = @lineItemQuantity productId
+    @lineItemQuantity productId, currentQuantity + 1
+    @updateDisplayedQuantity productId
+
+  removeItemFromOrder: (productId) ->
+    @lineItemQuantity productId, 0
+    @updateDisplayedQuantity productId
+
+  updateDisplayedQuantity: (productId) ->
+    $quantity = $ "#line_item_product_#{productId} .quantity .value"
+    $quantity.html @lineItemQuantity(productId)
+
+  lineItemQuantity: (productId, quantity) ->
+    $liQuantities = $ '#line_items_quantities'
+    liQuantities = JSON.parse $liQuantities.val() || "{}"
+
+    if quantity >= 0
+      liQuantities[productId] = quantity
+      $liQuantities.val JSON.stringify(liQuantities)
+    else
+      liQuantities[productId] || 0
 
 $ -> OpCart.ready()
-$(document).on 'page:load', -> OpCart.load()
+$(document).on 'page:load', OpCart.load
 

data/app/controllers/op_cart/orders_controller.rb

@@ -1,32 +1,50 @@
 module OpCart
   class OrdersController < ApplicationController
+    # before_action :authenticate_user!, only: [:show, :edit, :update, :destroy]
+    before_action :set_order, only: [:show, :edit, :update, :destroy]
+
     def new
-      @products = [Product.first] # Temp hack to display first product as order
+      @products = Product.all
       @order = Order.new
     end
 
     def create
-      product = Product.find params[:product_id]
+      @order = Order.new order_params
+      @order.status = :new
+      @order.user = current_user || User.first #TODO: Create a user from email
+      add_line_items
 
-      customer = Stripe::Customer.create(
-        card: params[:stripeToken],
-        email: params[:order][:email]
-      )
+      if @order.save
+        redirect_to @order, notice: 'Thank you for your purchase'
+      else
+        render :new
+      end
+    end
+
+    def show
+    end
 
-      # TODO Create Order w/ Line Items
-      # TODO Create shipping address
+    private
 
-      Stripe::Charge.create(
-        amount: product.price,
-        currency: "usd",
-        customer: customer.id
+    def set_order
+      # TODO prevent viewing of others' orders
+      # @order = current_user.orders.find params[:id]
+      @order = Order.find params[:id]
+    end
+
+    def order_params
+      params.require(:order).permit(:email, :card_token,
+        { shipping_address: [ :full_name, :address, :zip_code, :city, :state ] }
       )
+    end
 
-      redirect_to new_order_path, notice: 'Thank you for your purchase'
-    rescue Stripe::CardError => e
-      # The card has been declined or some other error has occurred
-      @error = e
-      render :new
+    def add_line_items
+      li_quantities_json = JSON.parse params[:line_items][:quantities]
+      li_quantities_json.each do |product_id, quantity|
+        @order.line_items <<
+          LineItem.new(sellable: Product.find(product_id), quantity: quantity)
+      end
     end
+
   end
 end

data/app/models/op_cart/line_item.rb

@@ -7,6 +7,22 @@ module OpCart
     validates :quantity, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
     validates :sellable_snapshot, presence: true
     validates :sellable, presence: true
-    validates :order, presence: true
+    # validates :order, presence: true
+
+    before_validation :set_unit_price
+    before_validation :snapshot_sellable
+
+    def total
+      (unit_price || sellable.price) * quantity
+    end
+
+    private
+    def set_unit_price
+      self.unit_price = sellable.price
+    end
+
+    def snapshot_sellable
+      self.sellable_snapshot = sellable.attributes
+    end
   end
 end

data/app/models/op_cart/order.rb

@@ -1,7 +1,10 @@
 module OpCart
   class Order < ActiveRecord::Base
+    has_many :line_items
     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:
@@ -9,12 +12,31 @@ module OpCart
     validates :status, presence: true
     validates :user, presence: true
 
+    before_validation :set_total
     before_save :charge_customer
 
     private
 
+    def set_total
+      self.total = line_items.reduce(0) { |total, line_item| total += line_item.total }
+    end
+
     def charge_customer
-      # TODO Create and charge customer
+      customer = Stripe::Customer.create(
+        card: card_token,
+        email: email
+      )
+
+      # TODO Create shipping address
+
+      Stripe::Charge.create(
+        amount: total,
+        currency: "usd",
+        customer: customer.id
+      )
+    rescue Stripe::CardError => e
+      # The card has been declined or some other error has occurred
+      self.errors.add e
     end
   end
 end

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

@@ -1,21 +1,30 @@
-script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.payment/1.0.2/jquery.payment.min.js" type="text/javascript"
-script src="https://js.stripe.com/v2/" type="text/javascript"
-
-javascript:
-  Stripe.setPublishableKey('#{Rails.configuration.stripe[:publishable_key]}')
-
-- if @products.any?
-  -# Hack to display products temporarily
+- if @products.present?
   .new_order
-    h2 Items in Order
+    h2 Purchasble Items
     ul style="list-style-type: none"
       - @products.each do |product|
         li
           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
+
+    h2 Items in Order
+    ul style="list-style-type: none"
+      - @products.each do |product|
+        li id="#{dom_id product, 'line_item'}"
+          p = product.name
+          p = number_to_currency product.price / 100
+          p.quantity
+            span.name Quantity: 
+            span.value 0
+          p
+            a onclick="OpCart.removeItemFromOrder(#{product.id})" style="cursor:pointer"
+              | Remove
 
-  = simple_form_for @order do |f|
+  = simple_form_for @order, data: { stripe_key: Rails.configuration.stripe[:publishable_key] } do |f|
     span.payment-errors
     p
       h2 Your Information
@@ -23,7 +32,7 @@ javascript:
 
     p
       h2 Shipping Address
-      = f.simple_fields_for :shipping_address do |sa|
+      = f.simple_fields_for :shipping_addresses 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' }
@@ -32,14 +41,15 @@ javascript:
 
     p
       h2 Card Details
-      = f.simple_fields_for :credit_card do |c|
+      = 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' }
 
-    = hidden_field_tag :product_id, @products.first.id
+    = f.input :card_token, as: :hidden
+    = hidden_field :line_items, :quantities, value: "{}"
 
     .form-actions
       = f.button :button, "Submit Payment"
 - else
-  p Add an item to your order.
+  p Add an item to your order to begin.

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

@@ -0,0 +1,22 @@
+.new_order
+  h2 Items in Order
+  ul
+    - @order.line_items.each do |line_item|
+      li id="#{dom_id line_item}"
+        p = line_item.sellable.name
+        p.quantity
+          = line_item.quantity
+          |  @ 
+          = number_to_currency line_item.unit_price / 100
+          |  = 
+          = number_to_currency line_item.total / 100
+    li
+      p Order Total: #{number_to_currency @order.total / 100}
+
+  p
+    h2 Your Information
+    = @order.email
+  p
+    h2 Shipping Address
+    p 123 N Todo Street
+    p Edmond, Oklahoma 73013

data/config/locales/op_cart.en.yml

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

data/db/migrate/20140829200318_create_op_cart_orders.rb

@@ -2,6 +2,7 @@ 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
       t.string :status,                null: false

data/db/seeds.rb

@@ -9,3 +9,15 @@ product1_attrs = {
 }
 
 product1 = OpCart::Product.where(sku: product1_attrs[:sku]).first_or_create product1_attrs
+
+product2_attrs = {
+             name: 'Device 9000',
+      description: 'The much improved Device 9000',
+              sku: 'A2000',
+            price: 25000,
+  allow_purchases: true,
+     charge_taxes: true,
+             user: User.first,
+}
+
+product2 = OpCart::Product.where(sku: product2_attrs[:sku]).first_or_create product2_attrs

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ files:
 - app/models/op_cart/order.rb
 - app/models/op_cart/product.rb
 - app/views/op_cart/orders/new.html.slim
+- app/views/op_cart/orders/show.html.slim
 - config/initializers/stripe.rb
 - config/locales/op_cart.en.yml
 - config/routes.rb