comable_frontend 0.2.3 → 0.3.0

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

@@ -1,14 +1,14 @@
 = render 'comable/shared/address', address: address
 
-.buttons
-  .use_bill_address
-    - if address != address.customer.bill_address
+ul.buttons.list-inline
+  - if address != address.customer.bill_address
+    li.use_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'
+        = f.submit Comable.t('use_as_billing_address'), class: 'btn btn-default'
 
-  .use_ship_address
-    - if address != address.customer.ship_address
+  - if address != address.customer.ship_address
+    li.use_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'
+        = f.submit Comable.t('use_as_shipping_address'), class: 'btn btn-default'

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

@@ -1,7 +1,7 @@
 .customer
   .addresses
     h1
-      | Addresses
+      = Comable.t('address_book')
 
     - if current_customer.errors.any?
       .errors
@@ -12,41 +12,43 @@
     - if current_customer.addresses.empty?
       .not_found
         p
-          | Not found.
+          = Comable.t('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.
+      .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
+          - else
+            .not_found
+              p
+                = Comable.t('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.
+        .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
+          - else
+            .not_found
+              p
+                = Comable.t('not_found')
 
-      .other_addresses
-        h2
-          | Other addresses
-        ul
-          - current_customer.other_addresses.each do |address|
-            li
-              = render 'address', address: address
+      .row
+        .other_addresses
+          h2
+            = Comable.t('other_addresses')
+          ul.list-unstyled
+            - current_customer.other_addresses.each do |address|
+              li.col-sm-4
+                = render 'address', address: address
 
   .new_address
     h2
-      | New Address
+      = 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|
         = render 'comable/shared/address_form', address: ff
       .submit
-        = f.submit
+        = f.submit Comable.t('actions.create')

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

@@ -1,2 +1,60 @@
-.customer
-  .name = current_customer.email
+#comable-customer
+  h1
+    = Comable.t('my_account')
+
+  .comable-name
+    = current_customer.email
+
+  .comable-member-menu
+    ul
+      li
+        = link_to Comable.t('change_email_or_password'), comable.edit_customer_path
+      li
+        = link_to Comable.t('edit_your_address_book'), comable.addresses_customer_path
+
+  .coamble-orders
+    h2
+      = Comable.t('order_history')
+    - @orders.each do |order|
+      table
+        thead
+          tr
+            th
+              = order.class.human_attribute_name(:completed_at)
+            th
+              = order.class.human_attribute_name(:total_price)
+            th
+              = order.class.human_attribute_name(:bill_address)
+            th
+              = order.class.human_attribute_name(:code)
+        tbody
+          tr
+            td
+              = l order.completed_at.to_date, format: :long
+            td
+              = number_to_currency order.total_price
+            td
+              = order.bill_address.full_name
+            td
+              = order.code
+          - order.order_details.each do |order_detail|
+            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%'
+                    .col-sm-10
+                      .comable-name
+                        = link_to order_detail.name_with_sku, comable.product_path(order_detail.product)
+                      .comable-repeat
+                        = form_tag comable.add_cart_path do
+                          - if order_detail.stock.unsold?
+                            .add_cart.form-inline.form-group
+                              = hidden_field_tag :stock_id, order_detail.stock_id
+                              = hidden_field_tag :quantity, order_detail.quantity
+                              = submit_tag Comable.t('reorder'), class: 'btn btn-default'
+
+    .text-center
+      = paginate @orders, theme: :comable_frontend

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

@@ -1,35 +1,78 @@
-h1 注文情報確認
+#comable-order
+  h1
+    = @order.class.human_state_name(:confirm)
 
-.order
-  .bill_address
-    h2
-      | Billing address
-    = render 'comable/shared/address', address: @order.bill_address if @order.bill_address
+  section.col-sm-8
+    .row
+      .col-sm-4.comable-bill_address
+        h2
+          = @order.class.human_attribute_name(:bill_address)
+        .comable-email
+          = @order.email
+        = render 'comable/shared/address', address: @order.bill_address
 
-  .ship_address
-    h2
-      | Shipping address
-    = render 'comable/shared/address', address: @order.ship_address if @order.ship_address
+      .col-sm-4.comable-ship_address
+        h2
+          = @order.class.human_attribute_name(:ship_address)
+        = render 'comable/shared/address', address: @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
+      - if @order.payment_method
+        .col-sm-4.comable-payment_method
+          h2
+            = @order.class.human_attribute_name(:payment_method)
+          = @order.payment_method.name
 
-  .total
-    h2 お会計
-    .item_total_price
-      = number_to_currency @order.current_item_total_price
-    .shipment_fee
-      = number_to_currency @order.current_shipment_fee
-    .total_price
-      = number_to_currency @order.current_total_price
+    - if @order.shipment_method
+      .row
+        .col-sm-12.comable-shipment_method
+          h2
+            = @order.class.human_attribute_name(:shipment_method)
+          = @order.shipment_method.name
 
-  = form_for @order, as: :order, url: comable.order_path, method: :post do |f|
-    = f.submit
+    .row
+      .col-sm-12.comable-order_details
+        table
+          thead
+            tr
+              th
+              th
+                = @order.order_details.human_attribute_name(:price)
+              th
+                = @order.order_details.human_attribute_name(:quantity)
+
+          tbody
+            - @order.order_details.each do |order_detail|
+              tr
+                td
+                  .name
+                    = order_detail.name_with_sku
+                  .caption
+                    = order_detail.product.caption
+                td.price
+                  = number_to_currency order_detail.price
+                td.quantity
+                  = number_with_delimiter order_detail.quantity
+
+  aside.col-sm-4
+    table
+      thead
+        tr
+          th colspan="2"
+            = form_for @order, as: :order, url: comable.order_path, method: :post do |f|
+              = f.submit Comable.t('complete_order')
+      tbody
+        tr
+          th.text-right
+            = @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(:shipment_fee)
+          td
+            = number_to_currency @order.current_shipment_fee
+        tr
+          th.text-right
+            = @order.class.human_attribute_name(:total_price)
+          td
+            = number_to_currency @order.current_total_price

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

@@ -1,5 +1,7 @@
-h1 注文完了
+#comable-order
+  .comable-complete
+    h1
+      = @order.class.human_state_name(:complete)
 
-.order
-  .code
-    = @order.code
+    .comable-code
+      = @order.code

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

@@ -1,26 +1,34 @@
-.order
-  .ship_address
+#comable-order
+  .comable-ship_address
     h1
-      | Shipping address
+      = @order.class.human_state_name(:delivery)
 
-    - if @order.ship_address
+    - if @order.ship_address.try(:persisted?)
       = render 'comable/shared/address', address: @order.ship_address
-      = link_to 'Next step', next_order_path
+      = link_to Comable.t('next_step'), next_order_path
+
+      .edit.row
+        h2
+          = Comable.t('edit_shipping_address')
+        = form_for @order, as: :order, url: update_order_path, method: :put do |f|
+          = f.fields_for :ship_address do |ff|
+            = render 'comable/shared/address_form', address: ff
+          = f.submit Comable.t('next_step')
 
       - if current_customer.other_addresses.any?
-        .other_addresses
+        .other_addresses.row
           h2
-            | Other addresses
-          ul
+            = Comable.t('other_addresses')
+          ul.list-unstyled
             - current_customer.addresses.each do |address|
               - next if @order.ship_address.same_as? address
-              li
+              li.col-sm-4
                 = render 'comable/shared/address', address: address
-                = form_for @order, as: :order, url: comable.delivery_order_path, method: :put do |f|
+                = form_for @order, as: :order, url: update_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'
+                  = f.submit Comable.t('use_this_address'), class: 'btn btn-default'
 
     - else
       / TODO: Standardize
@@ -32,8 +40,9 @@
 
       .new
         h2
-          | New shipping address
-        = form_for @order, as: :order, url: comable.delivery_order_path, method: :put do |f|
+          = Comable.t('new_shipping_address')
+        - @order.ship_address ||= @order.build_ship_address
+        = form_for @order, as: :order, url: update_order_path, method: :put do |f|
           = f.fields_for :ship_address do |ff|
             = render 'comable/shared/address_form', address: ff
-          = f.submit
+          = f.submit Comable.t('next_step')

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

@@ -1,26 +1,43 @@
-.order
-  .bill_address
+#comable-order
+  .comable-bill_address
     h1
-      | Billing address
+      = @order.class.human_state_name(:orderer)
 
-    - if @order.bill_address
+    - if @order.bill_address.try(:persisted?)
+      .comable-email
+        = @order.email
       = render 'comable/shared/address', address: @order.bill_address
-      = link_to 'Next step', next_order_path
+      = link_to Comable.t('next_step'), next_order_path
+
+      .edit.row
+        h2
+          = Comable.t('edit_billing_address')
+        = form_for @order, as: :order, url: update_order_path, method: :put do |f|
+          .form-group
+            .col-sm-2.control-label
+              = f.label :email
+            .col-sm-10
+              = 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 Comable.t('next_step')
 
       - if current_customer.other_addresses.any?
-        .other_addresses
+        .other_addresses.row
           h2
-            | Other addresses
-          ul
+            = Comable.t('other_addresses')
+          ul.list-unstyled
             - current_customer.addresses.each do |address|
               - next if @order.bill_address.same_as? address
-              li
+              li.col-sm-4
                 = render 'comable/shared/address', address: address
-                = form_for @order, as: :order, url: comable.orderer_order_path, method: :put do |f|
+                = form_for @order, as: :order, url: update_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'
+                  = f.submit Comable.t('use_this_address'), class: 'btn btn-default'
 
     - else
       / TODO: Standardize
@@ -32,15 +49,16 @@
 
       .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)
+          = Comable.t('new_billing_address')
+        - @order.bill_address ||= @order.build_bill_address
+        = form_for @order, as: :order, url: update_order_path, method: :put do |f|
+          .form-group
+            .col-sm-2.control-label
+              = f.label :email
+            .col-sm-10
+              = 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: '名'
+          = f.submit Comable.t('next_step')

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

@@ -1,12 +1,13 @@
-h1 決済方法
+#comable-order
+  .comable-pyament
+    h1
+      = @order.class.human_state_name(:payment)
 
-.order.payment
-  = form_for @order, as: :order, url: comable.payment_order_path, method: :put do |f|
-    ul
-      - Comable::Payment.all.each.with_index do |payment, index|
-        li
-          - payment_foreign_key = Comable::Payment.table_name.singularize.foreign_key.to_sym
-          - checked_flag = @order.payment ? (@order.payment.id == payment.id) : index.zero?
-          = f.radio_button payment_foreign_key, payment.id, checked: checked_flag
-          = f.label payment_foreign_key, payment.name, value: payment.id
-    = f.submit
+    = 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
+      = f.submit Comable.t('next_step')