comable 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdfd44cf66aa3b1b326e80bef01bdde6f1c0447e
-  data.tar.gz: ef5123467b8427a8ca186b342ae58449fe0b62e0
+  metadata.gz: 56d44aba496e45370483a0b7a625fcf96f4dabf2
+  data.tar.gz: 03b299ed0c7bcfb019964d1da1758175951052d0
 SHA512:
-  metadata.gz: 91ecb5a8436788eab87d6443b4238cd5473ef327c1a77eb8bc40990b589f0c3c3ff4bca20b96a6895d092ffb6c9ebc2e60c45a3d7681a222e4ea99e0686282d2
-  data.tar.gz: 1b987222eab78a0c8f796b71fdc44cd6327b3fde26f7dec98e249e5162afa53b2e1f33e80a0c1bd6d561b24105d713bcdcea8dd2362b3d7e0e6323af377700c9
+  metadata.gz: d97538ce5e3a49d8c47b6f98da650be04606d4e51b535fc610ef9b9c334740bd17d9c6c66e4e2931c007851a27ce20eaa0b5bf2d0b718dd649e7bdfb6d326826
+  data.tar.gz: fd264578ddb1caffef0f74ece4c72d08cd73092250b833101f9708ab34687e489d487c8cf8e5757f0f91183d1316aef9cd9c4d2bd787e6b0a498ef1b0d69e74c

data/app/controllers/comable/carts_controller.rb

@@ -13,12 +13,23 @@ module Comable
       end
 
       # TODO: 在庫確認
-      current_customer.add_cart_item(stock || product)
+      current_customer.add_cart_item(stock || product, quantity: params[:quantity].to_i)
 
       flash[:notice] = I18n.t('comable.carts.add_product')
       redirect_to cart_path
     end
 
+    def update
+      stock = Comable::Stock.where(id: params[:stock_id]).first
+      return redirect_by_product_not_found unless stock
+
+      # TODO: 在庫確認
+      current_customer.reset_cart_item(stock, quantity: params[:quantity].to_i)
+
+      flash[:notice] = I18n.t('comable.carts.update')
+      redirect_to cart_path
+    end
+
     private
 
     def redirect_by_product_not_found

data/app/models/comable/cart_item.rb

@@ -1,7 +1,5 @@
 module Comable
   class CartItem < ActiveRecord::Base
-    utusemi!
-
     belongs_to :customer, class_name: Comable::Customer.name, foreign_key: Comable::Customer.table_name.singularize.foreign_key
     belongs_to :stock, class_name: Comable::Stock.name, foreign_key: Comable::Stock.table_name.singularize.foreign_key
 

data/app/models/comable/customer.rb

@@ -24,25 +24,21 @@ module Comable
       !logged_in?
     end
 
-    def add_cart_item(obj)
-      case obj
-      when Comable::Product
-        add_stock_to_cart(obj.stocks.first)
-      when Comable::Stock
-        add_stock_to_cart(obj)
-      when Array
-        obj.map { |item| add_cart_item(item) }
-      else
-        fail
+    def add_cart_item(obj, quantity: 1)
+      process_cart_item(obj) do |stock|
+        add_stock_to_cart(stock, quantity)
       end
     end
 
-    def remove_cart_item(obj)
-      case obj
-      when Comable::Stock
-        remove_stock_from_cart(obj)
-      else
-        fail
+    def remove_cart_item(obj, quantity: -1)
+      process_cart_item(obj) do |stock|
+        add_stock_to_cart(stock, quantity)
+      end
+    end
+
+    def reset_cart_item(obj, quantity: 0)
+      process_cart_item(obj) do |stock|
+        reset_stock_from_cart(stock, quantity)
       end
     end
 
@@ -83,26 +79,42 @@ module Comable
       @cookies.signed[:guest_token]
     end
 
-    def add_stock_to_cart(stock)
+    def process_cart_item(obj)
+      case obj
+      when Comable::Product
+        yield obj.stocks.first
+      when Comable::Stock
+        yield obj
+      when Array
+        obj.map { |item| yield item }
+      else
+        fail
+      end
+    end
+
+    def add_stock_to_cart(stock, quantity)
       fail I18n.t('comable.carts.product_not_stocked') if stock.soldout?
 
       cart_items = find_cart_items_by(stock)
       if cart_items.any?
         cart_item = cart_items.first
-        cart_item.increment!(:quantity)
+        cart_item.quantity += quantity
+        (cart_item.quantity > 0) ? cart_item.save : cart_item.destroy
       else
-        cart_item = cart_items.create
+        cart_item = cart_items.create(quantity: quantity)
         @cookies.permanent.signed[:guest_token] = cart_item.guest_token if not_logged_in?
       end
     end
 
-    def remove_stock_from_cart(stock)
-      cart_item = find_cart_items_by(stock).first
-      return false unless cart_item
-
-      if cart_item.quantity.pred.nonzero?
-        cart_item.decrement!(:quantity)
+    def reset_stock_from_cart(stock, quantity)
+      cart_items = find_cart_items_by(stock)
+      if quantity > 0
+        return add_stock_to_cart(stock, quantity) if cart_items.empty?
+        cart_item = cart_items.first
+        cart_item.quantity = quantity
+        cart_item.save
       else
+        return false if cart_items.empty?
         cart_item.destroy
       end
     end

data/app/views/comable/carts/show.slim

@@ -2,22 +2,26 @@ h1 カート
 
 ul.cart
   - current_customer.cart.each do |cart_item|
-    - stock = cart_item.stock
-    - product = stock.product
-    li.product
-      h2.name
-        - if stock.sku?
-          - sku_name = stock.sku_h_choice_name
-          - sku_name += '/' + stock.sku_v_choice_name if stock.sku_v_choice_name.present?
-          = link_to product.name + "(#{sku_name})", comable.product_path(product)
-        - else
-          = link_to product.name, comable.product_path(product)
-      .caption
-        = product.caption
-      .price
-        = number_to_currency product.price
-      .quantity
-        = number_with_delimiter cart_item.quantity
+    = form_tag comable.cart_path, method: :put do
+      - stock = cart_item.stock
+      - product = stock.product
+      li.product
+        h2.name
+          - if stock.sku?
+            - sku_name = stock.sku_h_choice_name
+            - sku_name += '/' + stock.sku_v_choice_name if stock.sku_v_choice_name.present?
+            = link_to product.name + "(#{sku_name})", comable.product_path(product)
+          - else
+            = link_to product.name, comable.product_path(product)
+        .caption
+          = product.caption
+        .price
+          = number_to_currency product.price
+        .quantity
+          - selected = cart_item.quantity
+          = select_tag :quantity, options_for_select(1.upto([10, selected].max).to_a, selected)
+          = hidden_field_tag :stock_id, stock.id
+          = submit_tag '変更'
 
 .order
   = link_to '注文', comable.new_order_path

data/app/views/comable/products/show.slim

@@ -14,6 +14,7 @@
   - if @product.unsold?
     .add_cart
         = hidden_field_tag :product_id, @product.id
+        = select_tag :quantity, options_for_select(1.upto(10).to_a)
         = submit_tag 'カートに入れる'
   - else
     .sold_out

data/config/locales/ja.yml

@@ -5,6 +5,7 @@ ja:
       product_not_found: 'ご指定の商品は見つかりませんでした'
       product_not_stocked: 'ご指定の商品は在庫がありません'
       empty: 'カートに商品が入っていません'
+      update: 'カートの内容が変更されました'
     orders:
       success: '注文が完了しました'
       failure: '注文に失敗しました。入力項目を見直してください。'

data/lib/comable/engine.rb

@@ -1,5 +1,4 @@
 require 'slim'
-require 'utusemi'
 
 module Comable
   class Engine < ::Rails::Engine

data/lib/comable/version.rb

@@ -1,3 +1,3 @@
 module Comable
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails