comable_frontend 0.2.3 → 0.3.0

data/app/controllers/comable/application_controller.rb

@@ -1,5 +1,7 @@
 module Comable
   class ApplicationController < ActionController::Base
     include Comable::ApplicationHelper
+
+    protect_from_forgery with: :exception
   end
 end

data/app/controllers/comable/carts_controller.rb

@@ -1,37 +1,52 @@
 module Comable
   class CartsController < Comable::ApplicationController
-    rescue_from Comable::NoStock, with: :no_stock
+    before_filter :set_cart_item, only: [:add, :update]
+    before_filter :ensure_found_cart_item, only: [:add, :update]
 
     def add
-      cart_item = find_cart_item
-      return redirect_by_product_not_found unless cart_item
-
-      current_customer.add_cart_item(cart_item, cart_item_options)
-
-      flash[:notice] = I18n.t('comable.carts.add_product')
-      redirect_to cart_path
+      if current_customer.add_cart_item(@cart_item, cart_item_options)
+        redirect_to comable.cart_path, notice: Comable.t('carts.added')
+      else
+        flash.now[:alert] = Comable.t('carts.invalid')
+        render :show
+      end
     end
 
     def update
+      if current_customer.reset_cart_item(@cart_item, cart_item_options)
+        redirect_to comable.cart_path, notice: Comable.t('carts.updated')
+      else
+        flash.now[:alert] = Comable.t('carts.invalid')
+        render :show
+      end
+    end
+
+    def destroy
       cart_item = find_cart_item
       return redirect_by_product_not_found unless cart_item
 
-      current_customer.reset_cart_item(cart_item, cart_item_options)
+      if current_customer.reset_cart_item(cart_item)
+        redirect_to comable.cart_path, notice: Comable.t('carts.updated')
+      else
+        flash.now[:alert] = Comable.t('carts.invalid')
+        render :show
+      end
+    end
 
-      flash[:notice] = I18n.t('comable.carts.update')
-      redirect_to cart_path
+    def checkout
+      current_order.next_state if current_order.state?(:cart)
+      redirect_to comable.next_order_path(state: :confirm)
     end
 
     private
 
-    def redirect_by_product_not_found
-      flash[:alert] = I18n.t('comable.errors.messages.products_not_found')
-      redirect_to :back
+    def set_cart_item
+      @cart_item = find_cart_item
     end
 
-    def no_stock
-      flash[:alert] = I18n.t('comable.errors.messages.products_soldout')
-      redirect_to cart_path
+    def ensure_found_cart_item
+      return if @cart_item
+      redirect_to :back, alert: Comable.t('errors.messages.products_not_found')
     end
 
     def find_cart_item

data/app/controllers/comable/customers_controller.rb

@@ -5,17 +5,17 @@ module Comable
     before_filter :authenticate_customer!
 
     def show
+      @orders = current_customer.orders.page(params[:page]).per(Comable::Config.orders_per_page)
     end
 
-    def addresses
-      return unless request.put?
-
+    def update_addresses
       current_customer.attributes = customer_params
       if current_customer.save
-        flash.now[:notice] = 'Success'
+        flash.now[:notice] = Comable.t('successful')
       else
-        flash.now[:alert] = 'Error'
+        flash.now[:alert] = Comable.t('failure')
       end
+      render :addresses
     end
 
     def customer_params

data/app/controllers/comable/orders_controller.rb

@@ -1,45 +1,38 @@
 module Comable
   class OrdersController < Comable::ApplicationController
-    prepend Comable::ShipmentAction
-    prepend Comable::PaymentAction
-    include Comable::PermittedAttributes
-
-    helper_method :next_order_path
-
     # TODO: Change the method name to load_order_with_params
     before_filter :load_order
-    before_filter :verify
-    # TODO: Remove
-    after_filter :save_order, except: :create
-
-    rescue_from Comable::InvalidOrder, with: :order_invalid
+    before_filter :ensure_cart_not_empty
+    before_filter :ensure_saleable_stocks
 
-    def new
-      redirect_to next_order_path unless agreement_required?
-    end
+    prepend Comable::SigninAction
+    prepend Comable::ShipmentAction
+    prepend Comable::PaymentAction
+    include Comable::PermittedAttributes
 
-    def orderer
-      case request.method_symbol
-      when :post
-        redirect_to next_order_path if @order.save
+    def edit
+      if @order.state?(params[:state]) || @order.stated?(params[:state])
+        render params[:state]
+      else
+        redirect_to next_order_path
       end
     end
 
-    def delivery
-      case request.method_symbol
-      when :post
-        redirect_to next_order_path if @order.save
+    def update
+      if @order.stated?(params[:state]) ? @order.save : @order.next_state
+        redirect_to next_order_path
+      else
+        render @order.state
       end
     end
 
     def create
-      order = current_customer.order
-      if order.complete?
-        flash[:notice] = I18n.t('comable.orders.success')
+      if @order.state?(:confirm) && @order.next_state
+        flash.now[:notice] = Comable.t('orders.success')
         send_order_complete_mail
       else
-        flash[:alert] = I18n.t('comable.orders.failure')
-        redirect_to comable.confirm_order_path
+        flash[:alert] = Comable.t('orders.failure')
+        redirect_to next_order_path
       end
     end
 
@@ -49,53 +42,27 @@ module Comable
       Comable::OrderMailer.complete(@order).deliver if current_store.email_activate?
     end
 
-    # TODO: Switch to state_machine
-    # rubocop:disable all
-    def next_order_path(target_action_name = nil)
-      case (target_action_name || action_name).to_sym
-      when :new
-        orderer_required? ? comable.orderer_order_path : next_order_path(:orderer)
-      when :orderer
-        delivery_required? ? comable.delivery_order_path : next_order_path(:delivery)
-      when :delivery
-        shipment_required? ? comable.shipment_order_path : next_order_path(:shipment)
-      when :shipment
-        payment_required? ? comable.payment_order_path : next_order_path(:payment)
-      else
-        comable.confirm_order_path
-      end
-    end
-    # rubocop:enable all
-
-    def agreement_required?
-      @order.customer.nil?
-    end
-
-    def orderer_required?
-      @order.bill_address.nil?
-    end
-
-    def delivery_required?
-      @order.ship_address.nil?
-    end
-
-    def verify
+    def ensure_cart_not_empty
       return if current_customer.cart.any?
-      flash[:alert] = I18n.t('comable.carts.empty')
+      flash[:alert] = Comable.t('carts.empty')
       redirect_to comable.cart_path
     end
 
-    def load_order
-      @order = current_customer.preorder(order_params || {})
+    def ensure_saleable_stocks
+      return if current_order.soldout_stocks.empty?
+      flash[:alert] = Comable.t('errors.messages.products_soldout')
+      redirect_to comable.cart_path
     end
 
-    def save_order
-      @order.save
+    def load_order
+      @order = current_order
+      @order.attributes = order_params if order_params
     end
 
     def order_params
       return unless params[:order]
-      case action_name.to_sym
+      return unless params[:state]
+      case params[:state].to_sym
       when :orderer
         order_params_for_orderer
       when :delivery
@@ -105,8 +72,6 @@ module Comable
 
     def order_params_for_orderer
       params.require(:order).permit(
-        :family_name, # TODO: Remove
-        :first_name,  # TODO: Remove
         :email,
         bill_address_attributes: permitted_address_attributes
       )
@@ -117,10 +82,5 @@ module Comable
         ship_address_attributes: permitted_address_attributes
       )
     end
-
-    def order_invalid
-      flash[:alert] = I18n.t('comable.orders.failure')
-      redirect_to comable.cart_path
-    end
   end
 end

data/app/controllers/comable/products_controller.rb

@@ -1,11 +1,25 @@
 module Comable
   class ProductsController < Comable::ApplicationController
+    before_filter :load_category_and_products, only: :index
+
     def index
-      @products = Comable::Product.all
+      @products = @products.page(params[:page]).per(Comable::Config.products_per_page)
     end
 
     def show
       @product = Comable::Product.find(params[:id])
     end
+
+    private
+
+    def load_category_and_products
+      @category = Comable::Category.where(id: params[:category_id]).first
+      if @category
+        subtree_of_category = Comable::Category.subtree_of(@category)
+        @products = Comable::Product.eager_load(:categories).merge(subtree_of_category)
+      else
+        @products = Comable::Product.search(params[:q])
+      end
+    end
   end
 end

data/app/controllers/concerns/comable/payment_action.rb

@@ -1,26 +1,16 @@
 module Comable
   module PaymentAction
-    def payment
-      case request.method_symbol
-      when :post
-        redirect_to next_order_path
-      end
-    end
-
     private
 
     # orderride OrdersController#order_params
     def order_params
-      (action_name.to_sym == :payment) ? order_params_for_payment : super
-    end
-
-    def payment_required?
-      Comable::Payment.exists?
+      return super unless params[:state] == 'payment'
+      order_params_for_payment
     end
 
     def order_params_for_payment
       params.fetch(:order, {}).permit(
-        :comable_payment_id
+        :payment_method_id
       )
     end
   end

data/app/controllers/concerns/comable/shipment_action.rb

@@ -1,21 +1,11 @@
 module Comable
   module ShipmentAction
-    def shipment
-      case request.method_symbol
-      when :post
-        redirect_to next_order_path
-      end
-    end
-
     private
 
     # orderride OrdersController#order_params
     def order_params
-      (action_name.to_sym == :shipment) ? order_params_for_shipment : super
-    end
-
-    def shipment_required?
-      Comable::ShipmentMethod.activated.exists?
+      return super unless params[:state] == 'shipment'
+      order_params_for_shipment
     end
 
     def order_params_for_shipment

data/app/controllers/concerns/comable/signin_action.rb

@@ -0,0 +1,55 @@
+module Comable
+  module SigninAction
+    class << self
+      def prepended(base)
+        base.instance_eval do
+          before_filter :ensure_signed_in_or_guest, except: [:signin, :guest]
+
+          helper_method :resource
+          helper_method :resource_name
+          helper_method :devise_mapping
+        end
+      end
+    end
+
+    def guest
+      if @order.state?(:cart) ? @order.next_state : @order.save
+        redirect_to next_order_path
+      else
+        render :signin
+      end
+    end
+
+    private
+
+    def ensure_signed_in_or_guest
+      return if @order.email
+      store_location
+      redirect_to comable.signin_order_path
+    end
+
+    def resource
+      current_customer
+    end
+
+    def resource_name
+      :customer
+    end
+
+    def devise_mapping
+      Devise.mappings[resource_name]
+    end
+
+    # orderride OrdersController#order_params
+    def order_params
+      return super unless action_name.in? %w( signin guest )
+      order_params_for_signin
+    end
+
+    def order_params_for_signin
+      params.fetch(:order, {}).permit(
+        :email
+      )
+    end
+  end
+end

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

@@ -1,22 +1,67 @@
-h1 カート
+#carts
+  section.cart.col-sm-8
+    h1
+      = Comable.t('shopping_cart')
 
-ul.cart
-  - current_customer.cart.each do |cart_item|
-    = form_tag comable.cart_path, method: :put do
-      - stock = cart_item.stock
-      - product = stock.product
-      li.product
-        h2.name
-          = link_to stock.name_with_sku, 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 '変更'
+    - if current_customer.cart.errors.any?
+      .errors
+        ul
+          - current_customer.cart.errors.full_messages.each do |message|
+            li = message
 
-.order
-  = link_to '注文', comable.new_order_path
+    - if current_customer.cart.empty?
+      = Comable.t('carts.empty')
+    - else
+      table
+        thead
+          tr
+            th
+            th
+              = Comable.t('price')
+            th
+              = Comable.t('quantity')
+            th
+
+        tbody
+          - current_customer.cart.each do |cart_item|
+            - stock = cart_item.stock
+            - product = stock.product
+            tr
+              td
+                .name
+                  = link_to stock.name_with_sku, comable.product_path(product)
+                .caption
+                  = product.caption
+                - if cart_item.soldout_stock?
+                  .error.soldout = Comable.t('carts.soldout')
+              td.price
+                = number_to_currency product.price
+              td.quantity
+                = form_tag comable.cart_path, method: :put do
+                  .form-inline.form-group
+                    - 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 Comable.t('actions.update'), class: 'btn-default'
+              td
+                = link_to Comable.t('actions.destroy'), comable.cart_path(stock_id: stock.id), method: :delete
+
+  - if current_customer.cart.any?
+    section.order.col-sm-4
+      table
+        thead
+          tr
+            th colspan="2"
+              = form_for current_order, as: :order, url: comable.checkout_cart_path, method: :put do |f|
+                = f.submit Comable.t('checkout'), class: 'btn btn-primary btn-lg btn-block'
+        tbody
+          tr.price
+            th.text-right
+              = Comable.t('item_total_price')
+            td
+              = number_to_currency current_customer.cart.price
+          tr.count
+            th.text-right
+              = Comable.t('item_total_quantity')
+            td
+              = number_with_delimiter current_customer.cart.count