comable_frontend 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3beb76091e8b030c33f3242ab1aaed6a0541757f
-  data.tar.gz: 18c8f8db4e34f646e429adfbbfdd806d2ce55c65
+  metadata.gz: 13ecbfa67267db1145552c73f094a493ab4c814c
+  data.tar.gz: 9b9caa79004f6b389defef7c8800747de04b3712
 SHA512:
-  metadata.gz: 7224bb70be00b7dd5cb36f42612f96b8ee39329c6152314e1be4cf61b85bd7878f9405b078d2d0d017f50132c0c52558b92f060b68b2856963185b0f50a6845c
-  data.tar.gz: 48ac9e707debee3b4aa4350bc88d8c60753091e4cf815bc9656565c3ce7dd9c35b1a0e5a51097707bc3bdf017502a415de7b875615ab3a84b70bc851de690b1d
+  metadata.gz: bf20628913312b17932660dfb42384a79ca54e3253437d91d73510e4eefa81ea0082269ba7bdb849833d8923de8d7e94d4a37e6872ba7b3c18ed2088185914ce
+  data.tar.gz: 194965bec47e14257334e9e7260760a1a83a928c898363c77809e38ab201beef0a3fe2d86a054a429fe17f6d3a13a783aef6929e597b7e314d861c6e29d3f990

data/app/controllers/comable/carts_controller.rb

@@ -4,7 +4,7 @@ module Comable
     before_filter :ensure_found_cart_item, only: [:add, :update]
 
     def add
-      if current_customer.add_cart_item(@cart_item, cart_item_options)
+      if current_comable_user.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')
@@ -13,7 +13,7 @@ module Comable
     end
 
     def update
-      if current_customer.reset_cart_item(@cart_item, cart_item_options)
+      if current_comable_user.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')
@@ -25,7 +25,7 @@ module Comable
       cart_item = find_cart_item
       return redirect_by_product_not_found unless cart_item
 
-      if current_customer.reset_cart_item(cart_item)
+      if current_comable_user.reset_cart_item(cart_item)
         redirect_to comable.cart_path, notice: Comable.t('carts.updated')
       else
         flash.now[:alert] = Comable.t('carts.invalid')

data/app/controllers/comable/orders_controller.rb

@@ -4,6 +4,7 @@ module Comable
     before_filter :load_order
     before_filter :ensure_cart_not_empty
     before_filter :ensure_saleable_stocks
+    before_filter :ensure_correct_flow, only: :create
 
     prepend Comable::SigninAction
     prepend Comable::ShipmentAction
@@ -27,13 +28,13 @@ module Comable
     end
 
     def create
-      if @order.state?(:confirm) && @order.next_state
-        flash.now[:notice] = Comable.t('orders.success')
-        send_order_complete_mail
-      else
-        flash[:alert] = Comable.t('orders.failure')
-        redirect_to next_order_path
-      end
+      @order.next_state!
+
+      flash.now[:notice] = Comable.t('orders.success')
+      send_order_complete_mail
+    rescue ActiveRecord::RecordInvalid
+      flash[:alert] = @order.errors.full_messages.join
+      redirect_to next_order_path
     end
 
     private
@@ -48,7 +49,7 @@ module Comable
     end
 
     def ensure_cart_not_empty
-      return if current_customer.cart.any?
+      return if current_comable_user.cart.any?
       flash[:alert] = Comable.t('carts.empty')
       redirect_to comable.cart_path
     end
@@ -59,6 +60,11 @@ module Comable
       redirect_to comable.cart_path
     end
 
+    def ensure_correct_flow
+      return if @order.state?(:confirm)
+      redirect_to next_order_path
+    end
+
     def load_order
       @order = current_order
       @order.attributes = order_params if order_params

data/app/controllers/comable/{customers_controller.rb → users_controller.rb}

@@ -1,16 +1,16 @@
 module Comable
-  class CustomersController < Comable::ApplicationController
+  class UsersController < Comable::ApplicationController
     include Comable::PermittedAttributes
 
-    before_filter :authenticate_customer!
+    before_filter :authenticate_user!
 
     def show
-      @orders = current_customer.orders.page(params[:page]).per(Comable::Config.orders_per_page)
+      @orders = current_comable_user.orders.page(params[:page]).per(Comable::Config.orders_per_page)
     end
 
     def update_addresses
-      current_customer.attributes = customer_params
-      if current_customer.save
+      current_comable_user.attributes = user_params
+      if current_comable_user.save
         flash.now[:notice] = Comable.t('successful')
       else
         flash.now[:alert] = Comable.t('failure')
@@ -18,8 +18,8 @@ module Comable
       render :addresses
     end
 
-    def customer_params
-      params.require(:customer).permit(
+    def user_params
+      params.require(:user).permit(
         :bill_address_id,
         :ship_address_id,
         addresses_attributes: permitted_address_attributes

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

@@ -10,7 +10,7 @@ module Comable
 
     def order_params_for_payment
       params.fetch(:order, {}).permit(
-        :payment_method_id
+        payment_attributes: [:payment_method_id]
       )
     end
   end

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

@@ -10,7 +10,7 @@ module Comable
 
     def order_params_for_shipment
       params.fetch(:order, {}).permit(
-        :shipment_method_id
+        shipment_attributes: [:shipment_method_id]
       )
     end
   end

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

@@ -29,11 +29,11 @@ module Comable
     end
 
     def resource
-      current_customer
+      current_comable_user
     end
 
     def resource_name
-      :customer
+      :user
     end
 
     def devise_mapping

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

@@ -3,13 +3,13 @@
     h1
       = Comable.t('shopping_cart')
 
-    - if current_customer.cart.errors.any?
+    - if current_comable_user.cart.errors.any?
       .errors
         ul
-          - current_customer.cart.errors.full_messages.each do |message|
+          - current_comable_user.cart.errors.full_messages.each do |message|
             li = message
 
-    - if current_customer.cart.empty?
+    - if current_comable_user.cart.empty?
       = Comable.t('carts.empty')
     - else
       table
@@ -23,7 +23,7 @@
             th
 
         tbody
-          - current_customer.cart.each do |cart_item|
+          - current_comable_user.cart.each do |cart_item|
             - stock = cart_item.stock
             - product = stock.product
             tr
@@ -46,7 +46,7 @@
               td
                 = link_to Comable.t('actions.destroy'), comable.cart_path(stock_id: stock.id), method: :delete
 
-  - if current_customer.cart.any?
+  - if current_comable_user.cart.any?
     section.order.col-sm-4
       table
         thead
@@ -59,9 +59,9 @@
             th.text-right
               = Comable.t('item_total_price')
             td
-              = number_to_currency current_customer.cart.price
+              = number_to_currency current_comable_user.cart.price
           tr.count
             th.text-right
               = Comable.t('item_total_quantity')
             td
-              = number_with_delimiter current_customer.cart.count
+              = number_with_delimiter current_comable_user.cart.count

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

@@ -16,42 +16,42 @@
           = @order.class.human_attribute_name(:ship_address)
         = render 'comable/shared/address', address: @order.ship_address
 
-      - if @order.payment_method
+      - if @order.payment
         .col-sm-4.comable-payment_method
           h2
             = @order.class.human_attribute_name(:payment_method)
-          = @order.payment_method.name
+          = @order.payment.name
 
-    - if @order.shipment_method
+    - if @order.shipment
       .row
-        .col-sm-12.comable-shipment_method
+        .col-sm-12.comable-shipment
           h2
             = @order.class.human_attribute_name(:shipment_method)
-          = @order.shipment_method.name
+          = @order.shipment.name
 
     .row
-      .col-sm-12.comable-order_details
+      .col-sm-12.comable-order_items
         table
           thead
             tr
               th
               th
-                = @order.order_details.human_attribute_name(:price)
+                = @order.order_items.human_attribute_name(:price)
               th
-                = @order.order_details.human_attribute_name(:quantity)
+                = @order.order_items.human_attribute_name(:quantity)
 
           tbody
-            - @order.order_details.each do |order_detail|
+            - @order.order_items.each do |order_item|
               tr
                 td
                   .name
-                    = order_detail.name_with_sku
+                    = order_item.name_with_sku
                   .caption
-                    = order_detail.product.caption
+                    = order_item.product.caption
                 td.price
-                  = number_to_currency order_detail.price
+                  = number_to_currency order_item.price
                 td.quantity
-                  = number_with_delimiter order_detail.quantity
+                  = number_with_delimiter order_item.quantity
 
   aside.col-sm-4
     table
@@ -66,6 +66,11 @@
             = @order.class.human_attribute_name(:item_total_price)
           td
             = number_to_currency @order.current_item_total_price
+        tr
+          th.text-right
+            = @order.class.human_attribute_name(:payment_fee)
+          td
+            = number_to_currency @order.current_payment_fee
         tr
           th.text-right
             = @order.class.human_attribute_name(:shipment_fee)

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

@@ -1,7 +1,7 @@
 #comable-order
-  .comable-complete
+  .comable-completed
     h1
-      = @order.class.human_state_name(:complete)
+      = @order.class.human_state_name(:completed)
 
     .comable-code
       = @order.code

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

@@ -15,12 +15,12 @@
             = render 'comable/shared/address_form', address: ff
           = f.submit Comable.t('next_step')
 
-      - if current_customer.other_addresses.any?
+      - if current_comable_user.other_addresses.any?
         .other_addresses.row
           h2
             = Comable.t('other_addresses')
           ul.list-unstyled
-            - current_customer.addresses.each do |address|
+            - current_comable_user.addresses.each do |address|
               - next if @order.ship_address.same_as? address
               li.col-sm-4
                 = render 'comable/shared/address', address: address

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

@@ -24,12 +24,12 @@
 
           = f.submit Comable.t('next_step')
 
-      - if current_customer.other_addresses.any?
+      - if current_comable_user.other_addresses.any?
         .other_addresses.row
           h2
             = Comable.t('other_addresses')
           ul.list-unstyled
-            - current_customer.addresses.each do |address|
+            - current_comable_user.addresses.each do |address|
               - next if @order.bill_address.same_as? address
               li.col-sm-4
                 = render 'comable/shared/address', address: address

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

@@ -1,13 +1,15 @@
 #comable-order
-  .comable-pyament
+  .comable-payment
     h1
       = @order.class.human_state_name(:payment)
 
     = form_for @order, as: :order, url: update_order_path, method: :put do |f|
-      ul
-        - Comable::PaymentMethod.all.each.with_index do |payment_method, index|
-          li
-            - checked_flag = @order.payment_method ? (@order.payment_method.id == payment_method.id) : index.zero?
-            = f.radio_button :payment_method_id, payment_method.id, checked: checked_flag
-            = f.label :payment_method_id, payment_method.name, value: payment_method.id
+      - payment = @order.payment || @order.build_payment
+      = f.fields_for :payment, payment do |ff|
+        ul
+          - Comable::PaymentMethod.all.each.with_index do |payment_method, index|
+            li
+              - checked_flag = payment.payment_method ? (payment.payment_method == payment_method) : index.zero?
+              = ff.radio_button :payment_method_id, payment_method.id, checked: checked_flag
+              = ff.label :payment_method_id, payment_method.name, value: payment_method.id
       = f.submit Comable.t('next_step')

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

@@ -4,10 +4,12 @@
       = @order.class.human_state_name(:shipment)
 
     = form_for @order, as: :order, url: update_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
+      - shipment = @order.shipment || @order.build_shipment
+      = f.fields_for :shipment, shipment do |ff|
+        ul
+          - Comable::ShipmentMethod.activated.each.with_index do |shipment_method, index|
+            li
+              - checked_flag = shipment.shipment_method ? (shipment.shipment_method == shipment_method) : index.zero?
+              = ff.radio_button :shipment_method_id, shipment_method.id, checked: checked_flag
+              = ff.label :shipment_method_id, shipment_method.name, value: shipment_method.id
       = f.submit Comable.t('next_step')

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

@@ -10,14 +10,14 @@ header
                 | descriptions
           ul.nav.navbar-nav.navbar-right
             li
-              = link_to Comable.t('my_account'), comable.customer_path
+              = link_to Comable.t('my_account'), comable.user_path
             li
-              - if current_customer.signed_in?
-                = link_to comable.destroy_customer_session_path, method: :delete do
+              - if current_comable_user.signed_in?
+                = link_to comable.destroy_user_session_path, method: :delete do
                   i.glyphicon.glyphicon-log-out>
                   = Comable.t('sign_out')
               - else
-                = link_to comable.new_customer_session_path do
+                = link_to comable.new_user_session_path do
                   i.glyphicon.glyphicon-log-in>
                   = Comable.t('sign_in')
     .container
@@ -51,10 +51,10 @@ header
               span
                 = Comable.t('cart')
               span<
-                | (#{current_customer.cart.size})
+                | (#{current_comable_user.cart.size})
               span.caret<
             ul.dropdown-menu.comable-mini-cart role="menu"
-              - current_customer.cart.take(5).each do |cart_item|
+              - current_comable_user.cart.take(5).each do |cart_item|
                 li
                   = link_to comable.product_path(cart_item.product) do
                     .comable-image

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

@@ -0,0 +1,2 @@
+- current_trackers.each do |tracker|
+  = liquidize tracker.code, tracker_id: tracker.tracker_id, order: @order || current_order

data/app/views/comable/{customers → users}/_address.slim

@@ -1,14 +1,14 @@
 = render 'comable/shared/address', address: address
 
 ul.buttons.list-inline
-  - if address != address.customer.bill_address
+  - if address != address.user.bill_address
     li.use_bill_address
-      = form_for current_customer, as: :customer, url: comable.addresses_customer_url, method: :put do |f|
+      = form_for current_comable_user, as: :user, url: comable.addresses_user_url, method: :put do |f|
         = f.hidden_field :bill_address_id, value: address.id
         = f.submit Comable.t('use_as_billing_address'), class: 'btn btn-default'
 
-  - if address != address.customer.ship_address
+  - if address != address.user.ship_address
     li.use_ship_address
-      = form_for current_customer, as: :customer, url: comable.addresses_customer_url, method: :put do |f|
+      = form_for current_comable_user, as: :user, url: comable.addresses_user_url, method: :put do |f|
         = f.hidden_field :ship_address_id, value: address.id
         = f.submit Comable.t('use_as_shipping_address'), class: 'btn btn-default'

data/app/views/comable/{customers → users}/addresses.slim

@@ -1,15 +1,15 @@
-.customer
+.user
   .addresses
     h1
       = Comable.t('address_book')
 
-    - if current_customer.errors.any?
+    - if current_comable_user.errors.any?
       .errors
         ul
-          - current_customer.errors.full_messages.each do |full_message|
+          - current_comable_user.errors.full_messages.each do |full_message|
             li = full_message
 
-    - if current_customer.addresses.empty?
+    - if current_comable_user.addresses.empty?
       .not_found
         p
           = Comable.t('not_found')
@@ -17,9 +17,9 @@
       .row
         .bill_address.col-sm-6
           h2
-            = current_customer.class.human_attribute_name(:bill_address)
-          - if current_customer.bill_address
-            = render 'address', address: current_customer.bill_address
+            = current_comable_user.class.human_attribute_name(:bill_address)
+          - if current_comable_user.bill_address
+            = render 'address', address: current_comable_user.bill_address
           - else
             .not_found
               p
@@ -27,9 +27,9 @@
 
         .ship_address.col-sm-6
           h2
-            = current_customer.class.human_attribute_name(:ship_address)
-          - if current_customer.ship_address
-            = render 'address', address: current_customer.ship_address
+            = current_comable_user.class.human_attribute_name(:ship_address)
+          - if current_comable_user.ship_address
+            = render 'address', address: current_comable_user.ship_address
           - else
             .not_found
               p
@@ -40,15 +40,15 @@
           h2
             = Comable.t('other_addresses')
           ul.list-unstyled
-            - current_customer.other_addresses.each do |address|
+            - current_comable_user.other_addresses.each do |address|
               li.col-sm-4
                 = render 'address', address: address
 
   .new_address
     h2
       = Comable.t('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|
+    = form_for current_comable_user, as: :user, url: comable.addresses_user_url, method: :put do |f|
+      = f.fields_for :addresses, current_comable_user.addresses.build do |ff|
         = render 'comable/shared/address_form', address: ff
       .submit
         = f.submit Comable.t('actions.create')

data/app/views/comable/{customers → users}/show.slim

@@ -1,16 +1,16 @@
-#comable-customer
+#comable-user
   h1
     = Comable.t('my_account')
 
   .comable-name
-    = current_customer.email
+    = current_comable_user.email
 
   .comable-member-menu
     ul
       li
-        = link_to Comable.t('change_email_or_password'), comable.edit_customer_path
+        = link_to Comable.t('change_email_or_password'), comable.edit_user_path
       li
-        = link_to Comable.t('edit_your_address_book'), comable.addresses_customer_path
+        = link_to Comable.t('edit_your_address_book'), comable.addresses_user_path
 
   .coamble-orders
     h2
@@ -37,23 +37,23 @@
               = order.bill_address.full_name
             td
               = order.code
-          - order.order_details.each do |order_detail|
+          - order.order_items.each do |order_item|
             tr
               td colspan="4"
                 .comable-detail
                   .row
                     .col-sm-2.comable-image
-                      = link_to comable.product_path(order_detail.product), class: 'thumbnail' do
-                        = image_tag order_detail.product.image_url, width: '100%'
+                      = link_to comable.product_path(order_item.product), class: 'thumbnail' do
+                        = image_tag order_item.product.image_url, width: '100%'
                     .col-sm-10
                       .comable-name
-                        = link_to order_detail.name_with_sku, comable.product_path(order_detail.product)
+                        = link_to order_item.name_with_sku, comable.product_path(order_item.product)
                       .comable-repeat
                         = form_tag comable.add_cart_path do
-                          - if order_detail.stock.stocked?
+                          - if order_item.stock.stocked?
                             .add_cart.form-inline.form-group
-                              = hidden_field_tag :stock_id, order_detail.stock_id
-                              = hidden_field_tag :quantity, order_detail.quantity
+                              = hidden_field_tag :stock_id, order_item.stock_id
+                              = hidden_field_tag :quantity, order_item.quantity
                               = submit_tag Comable.t('reorder'), class: 'btn btn-default'
 
     .text-center

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

@@ -25,6 +25,8 @@ html
 
   - mini_header_flag = controller_name == 'orders' || devise_controller?
   body class="#{'comable-checkout-layout' if mini_header_flag}"
+    = render 'comable/shared/tracker'
+
     - if mini_header_flag
       = render 'comable/shared/header_for_checkout'
     - else

data/config/routes.rb

@@ -20,9 +20,9 @@ Comable::Core::Engine.routes.draw do
     end
   end
 
-  devise_for :customer, path: :member, class_name: Comable::Customer.name, module: :devise
+  devise_for :user, path: :member, class_name: Comable::User.name, module: :devise
 
-  resource :customer, path: :member do
+  resource :user, path: :member do
     member do
       get :addresses
       put :addresses, action: :update_addresses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_frontend
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-15 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.3.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -211,16 +211,13 @@ files:
 - app/assets/stylesheets/comable/products.scss
 - app/controllers/comable/application_controller.rb
 - app/controllers/comable/carts_controller.rb
-- app/controllers/comable/customers_controller.rb
 - app/controllers/comable/orders_controller.rb
 - app/controllers/comable/products_controller.rb
+- app/controllers/comable/users_controller.rb
 - app/controllers/concerns/comable/payment_action.rb
 - app/controllers/concerns/comable/shipment_action.rb
 - app/controllers/concerns/comable/signin_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
 - app/views/comable/orders/delivery.slim
@@ -235,6 +232,10 @@ files:
 - app/views/comable/shared/_footer.slim
 - app/views/comable/shared/_header.slim
 - app/views/comable/shared/_header_for_checkout.slim
+- app/views/comable/shared/_tracker.slim
+- app/views/comable/users/_address.slim
+- app/views/comable/users/addresses.slim
+- app/views/comable/users/show.slim
 - app/views/kaminari/comable_frontend/_gap.html.slim
 - app/views/kaminari/comable_frontend/_next_page.html.slim
 - app/views/kaminari/comable_frontend/_page.html.slim