comable_frontend 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 818130115846669a1166faed5413d2ae2ed988e9
-  data.tar.gz: d024d10b74212e576fe0b68d3776e4875ea6a5e7
+  metadata.gz: 633b7c0815b6230271e217caa3fcb309699b8a5b
+  data.tar.gz: 93fbd100f5fb435a83bf00a0ee67faad1d46d202
 SHA512:
-  metadata.gz: 2fef8557e1d66e73985642526013ee0d7532f873c897b0b6f8e87cf993cbc2970746f46bea364c55e3172c4741dc1ff98453122a334ac26fd7d15bf71bd16e40
-  data.tar.gz: 24d80b8c5c0f182eaa586ceeadcdab503b3841b6b21a5f41e612dfdeb2603beccd5daa3bc246d1207eba241fc03102af5c280f71a156d17a01251734f0a9c92c
+  metadata.gz: 360d06fa73b0ddcc5d7598518c7edc3f27b77e01397f678e846071c8b5a7c2b8bd56cb99c37c30d8ce329c179642ccc0875bc8b907f9d0b9ad46c95a54e374c1
+  data.tar.gz: 336ad81da2599de8430ecdcb5e8bcadc9025fb86304d50b4bda80c743bc8e30a8dace03887ad366176adae8a653e3b8d629488812e80ae9f8aa845980b54410d

data/app/controllers/comable/carts_controller.rb

@@ -1,19 +1,17 @@
 module Comable
-  class CartsController < ApplicationController
+  class CartsController < Comable::ApplicationController
+    rescue_from Comable::NoStock, with: :no_stock
+
     def show
     end
 
     def add
-      product = Comable::Product.where(id: params[:product_id]).first
-      return redirect_by_product_not_found unless product
-
-      if product.sku?
-        stock = product.stocks.where(id: params[:stock_id]).first
-        return redirect_by_product_not_found unless stock
-      end
+      cart_item = Comable::Stock.where(id: params[:stock_id]).first
+      cart_item ||= Comable::Product.where(id: params[:product_id]).first
+      return redirect_by_product_not_found unless cart_item
+      return redirect_by_product_not_found if cart_item.is_a?(Comable::Product) && cart_item.sku?
 
-      # TODO: 在庫確認
-      current_customer.add_cart_item(stock || product, quantity: params[:quantity].to_i)
+      current_customer.add_cart_item(cart_item, cart_item_options)
 
       flash[:notice] = I18n.t('comable.carts.add_product')
       redirect_to cart_path
@@ -23,8 +21,7 @@ module Comable
       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)
+      current_customer.reset_cart_item(stock, cart_item_options)
 
       flash[:notice] = I18n.t('comable.carts.update')
       redirect_to cart_path
@@ -33,8 +30,19 @@ module Comable
     private
 
     def redirect_by_product_not_found
-      flash[:error] = I18n.t('comable.carts.product_not_found')
+      flash[:alert] = I18n.t('comable.errors.messages.products_not_found')
       redirect_to :back
     end
+
+    def no_stock
+      flash[:alert] = I18n.t('comable.errors.messages.products_soldout')
+      redirect_to cart_path
+    end
+
+    def cart_item_options
+      options = {}
+      options.update(quantity: params[:quantity].to_i) if params[:quantity]
+      options
+    end
   end
 end

data/app/controllers/comable/orders_controller.rb

@@ -1,5 +1,5 @@
 module Comable
-  class OrdersController < ApplicationController
+  class OrdersController < Comable::ApplicationController
     prepend Comable::ShipmentAction
     prepend Comable::PaymentAction
 

data/app/controllers/comable/products_controller.rb

@@ -1,5 +1,5 @@
 module Comable
-  class ProductsController < ApplicationController
+  class ProductsController < Comable::ApplicationController
     def index
       @products = Comable::Product.all
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comable_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement