comable_frontend 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2beaee12b666d7de3aeb8c5ba9c884b325fac9
-  data.tar.gz: b359b988a3320bf139e1cc3b9fea8925ffa733bf
+  metadata.gz: 32dbeca21c4c86948b916e807e6aaa2ed9bc0bcf
+  data.tar.gz: a54136ef96d2c802dbcd42b400877d1a1d93abea
 SHA512:
-  metadata.gz: 6ca78ddf6ef0ec1b15b64fba72eea53f2691a7ced2a389a54142c5c4708a53c59262161ce45f8020f593208220ec34f49129222b173671be9a81b04a7dfada30
-  data.tar.gz: f2f7f1a40860083fe4a0bdd0153458db2e0c38326af59076924189fb96a2c021b72e077ab46a65d96bf857142a4580c4385ab73be28ce0ae975d7a68746092b9
+  metadata.gz: 8c5bf6ff78e805fc86083aea2d7165d96ede22ef59bedd72f937a7c18bcd06a45f46970a866f9973eaf70088d21b3d3b3ac13bd8f6ca1bed19d551d18abe0515
+  data.tar.gz: 327fa0e0ae8e74745ecdceaaccd77fa998246c6f2389ec933bf7219303c0a7d53aba68f42fea3906d50ed21c4926c12ce7a1cc65e471bd7ab0e1029d10709015

data/app/controllers/comable/customers_controller.rb

@@ -1,8 +1,29 @@
 module Comable
   class CustomersController < Comable::ApplicationController
+    include Comable::PermittedAttributes
+
     before_filter :authenticate_customer!
 
     def show
     end
+
+    def addresses
+      return unless request.put?
+
+      current_customer.attributes = customer_params
+      if current_customer.save
+        flash.now[:notice] = 'Success'
+      else
+        flash.now[:alert] = 'Error'
+      end
+    end
+
+    def customer_params
+      params.require(:customer).permit(
+        :bill_address_id,
+        :ship_address_id,
+        addresses_attributes: permitted_address_attributes
+      )
+    end
   end
 end

data/app/controllers/comable/orders_controller.rb

@@ -2,24 +2,33 @@ 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
 
+    def new
+      redirect_to next_order_path unless agreement_required?
+    end
+
     def orderer
       case request.method_symbol
       when :post
-        redirect_to comable.delivery_order_path
+        redirect_to next_order_path if @order.save
       end
     end
 
     def delivery
       case request.method_symbol
       when :post
-        redirect_to next_order_path
+        redirect_to next_order_path if @order.save
       end
     end
 
@@ -40,8 +49,14 @@ 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
@@ -50,6 +65,19 @@ module Comable
         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
       return if current_customer.cart.any?
@@ -77,19 +105,16 @@ module Comable
 
     def order_params_for_orderer
       params.require(:order).permit(
-        :family_name,
-        :first_name,
-        :email
+        :family_name, # TODO: Remove
+        :first_name,  # TODO: Remove
+        :email,
+        bill_address_attributes: permitted_address_attributes
       )
     end
 
     def order_params_for_delivery
       params.require(:order).permit(
-        order_deliveries_attributes: [
-          :id,
-          :family_name,
-          :first_name
-        ]
+        ship_address_attributes: permitted_address_attributes
       )
     end
 

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

@@ -0,0 +1,15 @@
+module Comable
+  module PermittedAttributes
+    def permitted_address_attributes
+      [
+        :family_name,
+        :first_name,
+        :zip_code,
+        :state_name,
+        :city,
+        :detail,
+        :phone_number
+      ]
+    end
+  end
+end

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

@@ -19,6 +19,4 @@ ul.cart
           = submit_tag '変更'
 
 .order
-  - next_path = comable.delivery_order_path if current_customer.signed_in?
-  - next_path ||= comable.new_order_path
-  = link_to '注文', next_path
+  = link_to '注文', comable.new_order_path

data/app/views/comable/customers/_address.slim

@@ -0,0 +1,14 @@
+= render 'comable/shared/address', address: address
+
+.buttons
+  .use_bill_address
+    - if address != address.customer.bill_address
+      = form_for current_customer, as: :customer, url: comable.addresses_customer_url, method: :put do |f|
+        = f.hidden_field :bill_address_id, value: address.id
+        = f.submit 'use as billing address'
+
+  .use_ship_address
+    - if address != address.customer.ship_address
+      = form_for current_customer, as: :customer, url: comable.addresses_customer_url, method: :put do |f|
+        = f.hidden_field :ship_address_id, value: address.id
+        = f.submit 'use as shipping address'

data/app/views/comable/customers/addresses.slim

@@ -0,0 +1,52 @@
+.customer
+  .addresses
+    h1
+      | Addresses
+
+    - if current_customer.errors.any?
+      .errors
+        ul
+          - current_customer.errors.full_messages.each do |full_message|
+            li = full_message
+
+    - if current_customer.addresses.empty?
+      .not_found
+        p
+          | Not found.
+    - else
+      .bill_address
+        h2
+          | Bill address
+        - if current_customer.bill_address
+          = render 'address', address: current_customer.bill_address
+        - else
+          .not_found
+            p
+              | Not found.
+
+      .ship_address
+        h2
+          | Ship address
+        - if current_customer.ship_address
+          = render 'address', address: current_customer.ship_address
+        - else
+          .not_found
+            p
+              | Not found.
+
+      .other_addresses
+        h2
+          | Other addresses
+        ul
+          - current_customer.other_addresses.each do |address|
+            li
+              = render 'address', address: address
+
+  .new_address
+    h2
+      | New Address
+    = form_for current_customer, as: :customer, url: comable.addresses_customer_url, method: :put do |f|
+      = f.fields_for :addresses, current_customer.addresses.build do |ff|
+        = render 'comable/shared/address_form', address: ff
+      .submit
+        = f.submit

data/app/views/comable/orders/confirm.slim

@@ -1,37 +1,35 @@
 h1 注文情報確認
 
 .order
-  .orderer
-    h2 注文者
-    .family_name
-      = @order.family_name
-    .first_name
-      = @order.first_name
+  .bill_address
+    h2
+      | Billing address
+    = render 'comable/shared/address', address: @order.bill_address if @order.bill_address
 
-  .deliveries
-    - @order.order_deliveries.each.with_index(1) do |order_delivery, index|
-      h2 = "配送先[#{index}]"
-      .first_name
-        = order_delivery.family_name
-      .first_name
-        = order_delivery.first_name
-      .details
-        - order_delivery.order_details.each do |order_detail|
-          .name
-            = order_detail.product.name
-          .price
-            = order_detail.price
-          .quantity
-            = order_detail.quantity
+  .ship_address
+    h2
+      | Shipping address
+    = render 'comable/shared/address', address: @order.ship_address if @order.ship_address
+
+  .details
+    h2
+      | Order details
+    - @order.order_deliveries.first.order_details.each do |order_detail|
+      .name
+        = order_detail.stock.name
+      .price
+        = order_detail.price
+      .quantity
+        = order_detail.quantity
 
   .total
     h2 お会計
     .item_total_price
-      = @order.current_item_total_price
+      = number_to_currency @order.current_item_total_price
     .shipment_fee
-      = @order.current_shipment_fee
+      = number_to_currency @order.current_shipment_fee
     .total_price
-      = @order.current_total_price
+      = number_to_currency @order.current_total_price
 
   = form_for @order, as: :order, url: comable.order_path, method: :post do |f|
     = f.submit

data/app/views/comable/orders/delivery.slim

@@ -1,8 +1,39 @@
-h1 配送先情報入力
-
-.orderer
-  = form_for @order, as: :order, url: comable.delivery_order_path, method: :put do |f|
-    = f.fields_for :order_deliveries do |order_delivery|
-      = order_delivery.text_field :family_name, placeholder: '姓'
-      = order_delivery.text_field :first_name, placeholder: '名'
-    = f.submit
+.order
+  .ship_address
+    h1
+      | Shipping address
+
+    - if @order.ship_address
+      = render 'comable/shared/address', address: @order.ship_address
+      = link_to 'Next step', next_order_path
+
+      - if current_customer.other_addresses.any?
+        .other_addresses
+          h2
+            | Other addresses
+          ul
+            - current_customer.addresses.each do |address|
+              - next if @order.ship_address.same_as? address
+              li
+                = render 'comable/shared/address', address: address
+                = form_for @order, as: :order, url: comable.delivery_order_path, method: :put do |f|
+                  .hidden
+                    = f.fields_for :ship_address, address.clone do |ff|
+                      = render 'comable/shared/address_form', address: ff
+                  = f.submit 'Use this'
+
+    - else
+      / TODO: Standardize
+      - if @order.errors.any?
+        .error_messages
+          ul
+            - @order.errors.full_messages.each do |full_message|
+              li = full_message
+
+      .new
+        h2
+          | New shipping address
+        = form_for @order, as: :order, url: comable.delivery_order_path, method: :put do |f|
+          = f.fields_for :ship_address do |ff|
+            = render 'comable/shared/address_form', address: ff
+          = f.submit

data/app/views/comable/orders/new.slim

@@ -1,4 +1,4 @@
 h1 注文
 
 .order
-  = link_to '規約に同意して注文', comable.orderer_order_path
+  = link_to '規約に同意して注文', next_order_path

data/app/views/comable/orders/orderer.slim

@@ -1,8 +1,46 @@
-h1 注文者情報入力
-
-.orderer
-  = form_for @order, as: :order, url: comable.orderer_order_path, method: :put do |f|
-    = f.text_field :family_name, placeholder: '姓'
-    = f.text_field :first_name, placeholder: '名'
-    = f.email_field :email, placeholder: @order.class.human_attribute_name(:email)
-    = f.submit
+.order
+  .bill_address
+    h1
+      | Billing address
+
+    - if @order.bill_address
+      = render 'comable/shared/address', address: @order.bill_address
+      = link_to 'Next step', next_order_path
+
+      - if current_customer.other_addresses.any?
+        .other_addresses
+          h2
+            | Other addresses
+          ul
+            - current_customer.addresses.each do |address|
+              - next if @order.bill_address.same_as? address
+              li
+                = render 'comable/shared/address', address: address
+                = form_for @order, as: :order, url: comable.orderer_order_path, method: :put do |f|
+                  .hidden
+                    = f.fields_for :bill_address, address.clone do |ff|
+                      = render 'comable/shared/address_form', address: ff
+                  = f.submit 'Use this'
+
+    - else
+      / TODO: Standardize
+      - if @order.errors.any?
+        .error_messages
+          ul
+            - @order.errors.full_messages.each do |full_message|
+              li = full_message
+
+      .new
+        h2
+          | New billing address
+        = form_for @order, as: :order, url: comable.orderer_order_path, method: :put do |f|
+          = f.email_field :email, placeholder: @order.class.human_attribute_name(:email)
+          = f.fields_for :bill_address do |ff|
+            = render 'comable/shared/address_form', address: ff
+          = f.submit
+
+          / for old spec
+          / TODO: Remove
+          .hidden
+            = f.text_field :family_name, placeholder: '姓'
+            = f.text_field :first_name, placeholder: '名'

data/app/views/comable/shared/_address.slim

@@ -0,0 +1,20 @@
+dl
+  .name
+    dt = address.class.human_attribute_name(:family_name)
+    dd = address.family_name
+    dt = address.class.human_attribute_name(:first_name)
+    dd = address.first_name
+  .address
+    .state
+      dt = address.class.human_attribute_name(:state_name)
+      dd = address.state_name
+    .zip_code
+      dt = address.class.human_attribute_name(:zip_code)
+      dd = address.zip_code
+    .city
+      dt = address.class.human_attribute_name(:city)
+      dd = address.city
+  .other
+    .phone_number
+      dt = address.class.human_attribute_name(:phone_number)
+      dd = address.phone_number

data/app/views/comable/shared/_address_form.slim

@@ -0,0 +1,21 @@
+.name
+  = address.label :family_name
+  = address.text_field :family_name
+  = address.label :first_name
+  = address.text_field :first_name
+
+.address
+  .state
+    = address.label :state_name
+    = address.text_field :state_name
+  .zip_code
+    = address.label :zip_code
+    = address.text_field :zip_code, max_length: 8
+  .city
+    = address.label :city
+    = address.text_field :city
+
+.other
+  .phone_number
+    = address.label :phone_number
+    = address.text_field :phone_number, max_length: 18

data/app/views/layouts/comable/application.slim

@@ -13,6 +13,9 @@ html
     = javascript_include_tag "comable/application"
     = csrf_meta_tags
 
+    css:
+      .hidden { display: none; }
+
   body
     - flash.each do |name, msg|
       = content_tag(:div, msg, id: "flash_#{name}")

data/config/routes.rb

@@ -25,5 +25,10 @@ Comable::Core::Engine.routes.draw do
 
   devise_for :customer, path: :member, class_name: Comable::Customer.name, module: :devise
 
-  resource :customer, path: :member
+  resource :customer, path: :member do
+    member do
+      get :addresses
+      put :addresses
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-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.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -81,8 +81,11 @@ files:
 - app/controllers/comable/orders_controller.rb
 - app/controllers/comable/products_controller.rb
 - app/controllers/concerns/comable/payment_action.rb
+- app/controllers/concerns/comable/permitted_attributes.rb
 - app/controllers/concerns/comable/shipment_action.rb
 - app/views/comable/carts/show.slim
+- app/views/comable/customers/_address.slim
+- app/views/comable/customers/addresses.slim
 - app/views/comable/customers/show.slim
 - app/views/comable/orders/confirm.slim
 - app/views/comable/orders/create.slim
@@ -93,6 +96,8 @@ files:
 - app/views/comable/orders/shipment.slim
 - app/views/comable/products/index.slim
 - app/views/comable/products/show.slim
+- app/views/comable/shared/_address.slim
+- app/views/comable/shared/_address_form.slim
 - app/views/layouts/comable/application.slim
 - config/routes.rb
 - lib/comable/frontend/engine.rb