comable_frontend 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10dec2ca9318ce2ef297d434cf57ac8ea50030d7
-  data.tar.gz: a8126652a4b4f513adb207a636e123ea7625abde
+  metadata.gz: 818130115846669a1166faed5413d2ae2ed988e9
+  data.tar.gz: d024d10b74212e576fe0b68d3776e4875ea6a5e7
 SHA512:
-  metadata.gz: 27c637c54425d5507b2af9594931de4aa6785eddc1f9a587d41f781e1b216d421c9dc30b752eb70b1ab9bd2a0947a4f5a10966751ae2df56abc5fc166e02f627
-  data.tar.gz: c97d2246135a7e13881928e8e29ff9ef572506c35c97dc278ca11c79509c79525ac5cce23cd8b0314afd71fad6cd148857b68c0dc0ec3a52eba339b74471c109
+  metadata.gz: 2fef8557e1d66e73985642526013ee0d7532f873c897b0b6f8e87cf993cbc2970746f46bea364c55e3172c4741dc1ff98453122a334ac26fd7d15bf71bd16e40
+  data.tar.gz: 24d80b8c5c0f182eaa586ceeadcdab503b3841b6b21a5f41e612dfdeb2603beccd5daa3bc246d1207eba241fc03102af5c280f71a156d17a01251734f0a9c92c

data/Rakefile

@@ -6,9 +6,6 @@ end
 
 require 'rdoc/task'
 
-$LOAD_PATH.unshift File.expand_path('..', __FILE__)
-require 'tasks/release'
-
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Comable'
@@ -16,11 +13,12 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-if ENV['COMABLE_NESTED']
-  task default: ['app:spec', 'rubocop']
-else
-  APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
-  load 'rails/tasks/engine.rake'
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+load 'rails/tasks/engine.rake'
+
+if File.exist?('comable.gemspec')
+  $LOAD_PATH.unshift File.expand_path('..', __FILE__)
+  require 'tasks/release'
 
   namespace :app do
     namespace :spec do
@@ -47,7 +45,7 @@ else
     namespace :migrate do
       task :all do
         FRAMEWORKS.each do |framework|
-          command = "cd #{framework} && test -d db && bundle exec rake db:migrate RAILS_ENV=#{Rails.env} COMABLE_NESTED=true"
+          command = "cd #{framework} && test -d db && bundle exec rake db:migrate RAILS_ENV=#{Rails.env}"
           puts command
           system command
         end
@@ -62,7 +60,7 @@ else
       namespace :reset do
         task :all do
           FRAMEWORKS.each do |framework|
-            command = "cd #{framework} && test -d db && bundle exec rake db:migrate:reset RAILS_ENV=#{Rails.env} COMABLE_NESTED=true"
+            command = "cd #{framework} && test -d db && bundle exec rake db:migrate:reset RAILS_ENV=#{Rails.env}"
             puts command
             system command
           end
@@ -74,6 +72,8 @@ else
   task default: ['app:spec:all', 'rubocop']
 end
 
+task default: ['app:spec', 'rubocop']
+
 Bundler::GemHelper.install_tasks
 
 # from https://github.com/rspec/rspec-rails/issues/936

data/app/controllers/comable/orders_controller.rb

@@ -1,5 +1,8 @@
 module Comable
   class OrdersController < ApplicationController
+    prepend Comable::ShipmentAction
+    prepend Comable::PaymentAction
+
     before_filter :load_order
     before_filter :verify
     before_filter :redirect_for_logged_in_customer, only: [:new, :orderer]
@@ -8,8 +11,6 @@ module Comable
     rescue_from ActiveRecord::RecordInvalid, with: :record_invalid
     rescue_from Comable::InvalidOrder, with: :order_invalid
 
-    include Decoratable
-
     def new
     end
 
@@ -23,14 +24,7 @@ module Comable
     def delivery
       case request.method_symbol
       when :post
-        redirect_to comable.payment_order_path
-      end
-    end
-
-    def payment
-      case request.method_symbol
-      when :post
-        redirect_to comable.confirm_order_path
+        redirect_to next_order_path
       end
     end
 
@@ -40,6 +34,7 @@ module Comable
     def create
       order = current_customer.order
       if order.complete?
+        Comable::OrderMailer.complete(order).deliver if current_store.email_activate?
         flash[:notice] = I18n.t('comable.orders.success')
       else
         flash[:alert] = I18n.t('comable.orders.failure')
@@ -49,6 +44,17 @@ module Comable
 
     private
 
+    def next_order_path(target_action_name = nil)
+      case (target_action_name || action_name).to_sym
+      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
+
     def verify
       return if current_customer.cart.any?
       flash[:alert] = I18n.t('comable.carts.empty')
@@ -70,15 +76,14 @@ module Comable
         order_params_for_orderer
       when :delivery
         order_params_for_delivery
-      when :payment
-        order_params_for_payment
       end
     end
 
     def order_params_for_orderer
       params.require(:order).permit(
         :family_name,
-        :first_name
+        :first_name,
+        :email
       )
     end
 
@@ -92,12 +97,6 @@ module Comable
       )
     end
 
-    def order_params_for_payment
-      params.require(:order).permit(
-        Comable::Payment.table_name.singularize.foreign_key.to_sym
-      )
-    end
-
     def redirect_for_logged_in_customer
       return redirect_to delivery_order_path if current_customer.logged_in?
     end

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

@@ -0,0 +1,27 @@
+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?
+    end
+
+    def order_params_for_payment
+      params.fetch(:order, {}).permit(
+        :comable_payment_id
+      )
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+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?
+    end
+
+    def order_params_for_shipment
+      params.fetch(:order, {}).permit(
+        :shipment_method_id
+      )
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ ul.cart
       - product = stock.product
       li.product
         h2.name
-          = link_to stock.name, comable.product_path(product)
+          = link_to stock.name_with_sku, comable.product_path(product)
         .caption
           = product.caption
         .price

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

@@ -2,12 +2,15 @@ h1 注文情報確認
 
 .order
   .orderer
+    h2 注文者
     .family_name
       = @order.family_name
     .first_name
       = @order.first_name
+
   .deliveries
-    - @order.order_deliveries.each do |order_delivery|
+    - @order.order_deliveries.each.with_index(1) do |order_delivery, index|
+      h2 = "配送先[#{index}]"
       .first_name
         = order_delivery.family_name
       .first_name
@@ -21,5 +24,14 @@ h1 注文情報確認
           .quantity
             = order_detail.quantity
 
+  .total
+    h2 お会計
+    .item_total_price
+      = @order.current_item_total_price
+    .shipment_fee
+      = @order.current_shipment_fee
+    .total_price
+      = @order.current_total_price
+
   = form_for @order, as: :order, url: comable.order_path, method: :post do |f|
     = f.submit

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

@@ -4,4 +4,5 @@ h1 注文者情報入力
   = 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

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

@@ -0,0 +1,11 @@
+h1 発送方法
+
+.order.shipment
+  = form_for @order, as: :order, url: comable.shipment_order_path, method: :put do |f|
+    ul
+      - Comable::ShipmentMethod.activated.each.with_index do |shipment_method, index|
+        li
+          - checked_flag = @order.shipment_method ? (@order.shipment_method.id == shipment_method.id) : index.zero?
+          = f.radio_button :shipment_method_id, shipment_method.id, checked: checked_flag
+          = f.label :shipment_method_id, shipment_method.name, value: shipment_method.id
+    = f.submit

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

@@ -1,7 +1,14 @@
 doctype html
 html
   head
-    title Comable
+    title = current_store.name
+
+    - if current_store.meta_keyword.present?
+      meta name="keywords" content="#{current_store.meta_keyword}"
+
+    - if current_store.meta_description.present?
+      meta name="description" content="#{current_store.meta_description}"
+
     = stylesheet_link_tag "comable/application", media: "all"
     = javascript_include_tag "comable/application"
     = csrf_meta_tags

data/config/routes.rb

@@ -15,6 +15,8 @@ Comable::Core::Engine.routes.draw do
       put :orderer
       get :delivery
       put :delivery
+      get :shipment
+      put :shipment
       get :payment
       put :payment
       get :confirm

data/lib/comable/frontend/engine.rb

@@ -13,6 +13,8 @@ module Comable
 
       # XXX: a code below to delegate comable:install:migrations to comable_core
       config.paths['db/migrate'] = []
+
+      config.autoload_paths << "#{config.root}/app/controllers/concerns" if Rails::VERSION::MAJOR == 3
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-28 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.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,8 @@ files:
 - app/controllers/comable/carts_controller.rb
 - app/controllers/comable/orders_controller.rb
 - app/controllers/comable/products_controller.rb
+- app/controllers/concerns/comable/payment_action.rb
+- app/controllers/concerns/comable/shipment_action.rb
 - app/views/comable/carts/show.slim
 - app/views/comable/orders/confirm.slim
 - app/views/comable/orders/create.slim
@@ -72,6 +74,7 @@ files:
 - app/views/comable/orders/new.slim
 - app/views/comable/orders/orderer.slim
 - app/views/comable/orders/payment.slim
+- app/views/comable/orders/shipment.slim
 - app/views/comable/products/index.slim
 - app/views/comable/products/show.slim
 - app/views/layouts/comable/application.slim