comable_backend 0.3.2 → 0.3.3

data/app/views/comable/admin/orders/index.slim

@@ -1,79 +1,76 @@
-#comable-order
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        .btn-group role="group"
+          = link_to_previous_page @orders, '<', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | <
+          = link_to_next_page @orders, '>', class: 'btn btn-default' do
+            .btn.btn-default disabled="disabled"
+              | >
+
+    h1.page-header
       = Comable.t('admin.nav.order')
+      small<
+        = @orders.total_count
+        = Comable.t('admin.results')
 
-  h1.page-header
-    = Comable.t('admin.nav.order')
-    small<
-      = @orders.total_count
-      = Comable.t('admin.results')
+  .comable-page-body
+    .comable-search
+      = search_form_for @q, url: comable.admin_orders_path do |f|
+        .input-group
+          span.input-group-btn
+            button.btn.btn-default.dropdown-toggle type="button" data-toggle="dropdown"
+              i.fa.fa-search
+              span.caret<
+            ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.clear_search_conditions'), comable.admin_orders_path
+          = f.text_field :code_cont, class: 'form-control'
+          span.input-group-btn
+            = f.submit Comable.t('admin.search'), class: 'btn btn-default'
+        .hidden
+          = f.label :customer_id
+          = f.text_field :customer_id_eq
 
-  .row
-    section.col-sm-8
+    section
       - if @orders.empty?
         = Comable.t('admin.not_found')
       - else
-        .panel.panel-inverse
-          .panel-heading
-            .panel-title
-              = Comable.t('admin.index')
-          table.table.table-striped
-            thead
-              th
-                = sort_link [:comable, @q], :code
-              th
-                / TODO: Change to shipment_state and payment_state
-                = sort_link [:comable, @q], :state
-              th
-                = @orders.klass.human_attribute_name(:bill_full_name)
-              th
-                = @orders.klass.human_attribute_name(:order_details)
-              th
-                = sort_link [:comable, @q], :total_price
-              th
-                = sort_link [:comable, @q], :completed_at
-            tbody
-              - @orders.each do |order|
-                tr
-                  td
-                    = link_to order.code, comable.admin_order_path(order)
-                  td
-                    = order.human_state_name
-                  td
-                    = order.bill_full_name
-                  td
-                    ul.list-unstyled
-                      - order.order_details.each do |order_detail|
-                        li
-                          | #{order_detail.name_with_sku} x #{order_detail.quantity}
-                  td
-                    = number_to_currency order.total_price
-                  td
-                    = l order.completed_at
+        table.table.table-striped
+          thead
+            th
+              = sort_link [:comable, @q], :code
+            th
+              / TODO: Change to shipment_state and payment_state
+              = sort_link [:comable, @q], :state
+            th
+              = @orders.klass.human_attribute_name(:bill_full_name)
+            th
+              = @orders.klass.human_attribute_name(:order_details)
+            th
+              = sort_link [:comable, @q], :total_price
+            th
+              = sort_link [:comable, @q], :completed_at
+          tbody
+            - @orders.each do |order|
+              tr
+                td
+                  = link_to order.code, comable.admin_order_path(order)
+                td
+                  = order.human_state_name
+                td
+                  = order.bill_full_name
+                td
+                  ul.list-unstyled
+                    - order.order_details.each do |order_detail|
+                      li
+                        | #{order_detail.name_with_sku} x #{order_detail.quantity}
+                td
+                  = number_to_currency order.total_price
+                td
+                  = l order.completed_at
 
         .text-center
           = paginate @orders, theme: :comable_backend
-
-    nav.col-sm-4
-      #comable-affix
-        .panel
-          .panel-body
-            = search_form_for @q, url: comable.admin_orders_path do |f|
-              .form-horizontal
-                .form-group
-                  .col-sm-3.control-label
-                    = f.label :code
-                  .col-sm-9
-                    = f.text_field :code_cont
-
-                .form-group
-                  .col-sm-3.control-label
-                    = f.label :customer_id
-                  .col-sm-9
-                    = f.text_field :customer_id_eq
-
-                .text-right
-                  = f.submit Comable.t('admin.search'), class: 'btn btn-default'

data/app/views/comable/admin/orders/show.slim

@@ -1,57 +1,24 @@
-#comable-order
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.order'), comable.admin_orders_path
-    li.active
-      = @order.code
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li.btn-group
+        / TODO: Comment out after implemented.
+        / = link_to Comable.t('admin.nav.orders.cart'), '#', class: 'btn btn-default'
+        / = link_to Comable.t('admin.nav.orders.shipment'), '#', class: 'btn btn-default'
+        / = link_to Comable.t('admin.nav.orders.payment'), '#', class: 'btn btn-default'
 
-  h1.page-header
-    = @order.code
-    small<
-      = Comable.t('honorific', name: @order.bill_full_name)
+    h1.page-header
+      ol.breadcrumb
+        li>
+          = link_to Comable.t('admin.nav.order'), comable.admin_orders_path
+        li.active
+          = @order.code
+          small< data-toggle="tooltip" data-placement="right" title="#{l @order.completed_at}"
+            = time_ago_in_words @order.completed_at
 
-  .row
+  .comable-page-body.row
     section.col-sm-8
-      .panel.panel-inverse
-        .panel-heading
-          .panel-title
-            = Comable.t('admin.nav.orders.detail')
-        .panel-body
-          dl.dl-horizontal
-            dt
-              = @order.class.human_attribute_name(:code)
-            dd
-              = @order.code
-            dt
-              = @order.class.human_attribute_name(:completed_at)
-            dd
-              = l @order.completed_at
-            dt
-              = @order.class.human_attribute_name(:bill_address)
-            dd
-              ul.list-unstyled
-                li = @order.bill_address.zip_code
-                li = @order.bill_address.full_name
-                li = @order.bill_address.state_name
-                li = @order.bill_address.city
-                li = @order.bill_address.detail
-                li = "#{@order.bill_address.class.human_attribute_name(:phone_number)}: #{@order.bill_address.phone_number}"
-            dt
-              = @order.class.human_attribute_name(:email)
-            dd
-              = @order.email
-            dt
-              = @order.class.human_attribute_name(:shipment_method)
-            dd
-              = @order.shipment_method.name
-            dt
-              = @order.class.human_attribute_name(:payment_method)
-            dd
-              = @order.payment_method.name
-
-      .panel.panel-inverse
+      .panel.panel-default
         table.table
           thead
             tr
@@ -95,22 +62,85 @@
                 = number_to_currency @order.total_price
 
     nav.col-sm-4
-      #comable-affix data-spy="affix"
-        .panel
-          .panel-body
-            h3.text-center
-              small>
-                = @order.class.human_attribute_name(:total_price)
-              = number_to_currency @order.total_price
+      .panel.panel-default
+        .panel-body
+          h3.text-center
+            small>
+              = @order.class.human_attribute_name(:total_price)
+            = number_to_currency @order.total_price
+
+      .panel.panel-default
+        .panel-heading
+          .panel-title
+            = Comable.t('admin.bill')
+        .panel-body
+          .pull-right
+            .comable-avatar
+              = gravatar_tag @order.email, class: 'thumbnail'
+
+          dl.dl-horizontal.comable-address-with-icon
+            dt
+              i.fa.fa-map-marker.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:bill_address)}"
+            dd
+              ul.list-unstyled
+                li = @order.bill_address.zip_code
+                li = @order.bill_address.state_name
+                li = @order.bill_address.city
+                li = @order.bill_address.detail
+
+            - if @order.bill_address.phone_number.present?
+              dt
+                i.fa.fa-phone.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.bill_address.class.human_attribute_name(:phone_number)}"
+              dd
+                = @order.bill_address.phone_number
+
+            dt
+              i.fa.fa-user.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:customer)}"
+            dd
+              = link_to_if @order.customer, @order.bill_address.full_name, [comable, :admin, @order.customer]
+
+            dt
+              i.fa.fa-envelope.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:email)}"
+            dd
+              = mail_to @order.email
+
+      .panel.panel-default
+        .panel-heading
+          .panel-title
+            = Comable.t('admin.ship')
+        .panel-body
+          dl.dl-horizontal.comable-address-with-icon
+            dt
+              i.fa.fa-map-marker.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:ship_address)}"
+            dd
+              ul.list-unstyled
+                li = @order.ship_address.zip_code
+                li = @order.ship_address.state_name
+                li = @order.ship_address.city
+                li = @order.ship_address.detail
+
+            - if @order.ship_address.phone_number.present?
+              dt
+                i.fa.fa-phone.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.ship_address.class.human_attribute_name(:phone_number)}"
+              dd
+                = @order.ship_address.phone_number
+
+            dt
+              i.fa.fa-user.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:customer)}"
+            dd
+              = @order.bill_address.full_name
+
+            - if @order.shipment_method
+              dt
+                i.fa.fa-truck.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:shipment_method)}"
+              dd
+                = @order.shipment_method.name
 
-        .panel
-          .list-group
-            - if @order.customer
-              = link_to Comable.t('admin.nav.orders.customer'), comable.admin_customer_path(@order.customer), class: 'list-group-item'
-            - else
-              = link_to Comable.t('admin.nav.orders.customer'), '#', class: 'list-group-item disabled'
+            - if @order.payment_method
+              dt
+                i.fa.fa-money.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:payment_method)}"
+              dd
+                = @order.payment_method.name
 
-            / TODO: Comment out after implemented.
-            / = link_to Comable.t('admin.nav.orders.cart'), '#', class: 'list-group-item'
-            / = link_to Comable.t('admin.nav.orders.shipment'), '#', class: 'list-group-item'
-            / = link_to Comable.t('admin.nav.orders.payment'), '#', class: 'list-group-item'
+        .panel-footer
+          = render 'google_map', id: 'comable-google-map-for-ship-address', address: @order.ship_address

data/app/views/comable/admin/payment_methods/_form.slim

@@ -1,46 +1,31 @@
-= form_for [comable, :admin, @payment_method] do |f|
-  / TODO: Standardize
-  - if @payment_method.errors.any?
-    #error_explanation
-      h2
-        = pluralize(@payment_method.errors.count, 'error')
-        | prohibited this payment_method from being saved:
-
-      ul
-        - @payment_method.errors.full_messages.each do |message|
-          li = message
+= error_messages_for @payment_method
 
-  .panel.panel-inverse
-    .panel-heading
-      .panel-title
-        = Comable.t('admin.nav.payment_methods.edit')
+= form_for [comable, :admin, @payment_method] do |f|
+  .hidden
+    = f.submit
 
-    .panel-body
-      .form-horizontal
-        fieldset
-          .form-group
-            .col-sm-3.control-label
-              = f.label :name
-            .col-sm-6
-              = f.text_field :name
+  fieldset
+    .col-sm-3
+      legend
+        = Comable.t('admin.general')
 
-          .form-group
-            .col-sm-3.control-label
-              = f.label :payment_provider
-            .col-sm-3
-              = f.select :payment_provider_type, Comable::PaymentProvider.all.map { |provider_class| [provider_class.display_name, provider_class.name] }
-            .col-sm-3
-              = f.select :payment_provider_kind, Comable::PaymentProvider::General.kind.map.with_index { |(_, value), index| [value, index] }
+    .col-sm-9
+      .form-group
+          = f.label :name
+          = f.text_field :name
 
-          .form-group
-            .col-sm-3.control-label
-              = f.label :enable_price
-            .col-sm-3
-              = f.text_field :enable_price_from
-            .col-sm-3
-              = f.text_field :enable_price_to
+      .form-group
+        = f.label :payment_provider
+        .row
+          .col-sm-6
+            = f.select :payment_provider_type, Comable::PaymentProvider.all.map { |provider_class| [provider_class.display_name, provider_class.name] }
+          .col-sm-6
+            = f.select :payment_provider_kind, Comable::PaymentProvider::General.kind.map.with_index { |(_, value), index| [value, index] }
 
-    .panel-footer
-      = link_to Comable.t('admin.actions.cancel'), comable.admin_payment_methods_path, class: 'btn btn-default'
-      .pull-right
-        = f.submit
+      .form-group
+        = f.label :enable_price
+        .row
+          .col-sm-6
+            = f.text_field :enable_price_from
+          .col-sm-6
+            = f.text_field :enable_price_to

data/app/views/comable/admin/payment_methods/edit.slim

@@ -1,28 +1,27 @@
-#comable-payment-method
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path
-    li.active
-      = @payment_method.name
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
 
-  h1.page-header
-    = @payment_method.name
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path
+          li.active
+            = @payment_method.name
 
-  .row
-    section.col-sm-8
-      = render 'form'
-      hr
-      .panel.panel-danger
-        .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger" aria-expanded="false" aria-controls="comable-danger"
-          strong
-            span.fa.fa-angle-down>
-            = Comable.t('admin.actions.destroy')
-        #comable-danger.collapse
-          .panel-body
-            p
-              = Comable.t('admin.confirmation_to_remove_product')
-            = link_to Comable.t('admin.actions.destroy'), comable.admin_payment_method_path(@payment_method), method: :delete, class: 'btn btn-danger'
-
-    nav.col-sm-4
+  .comable-page-body
+    = render 'form'
+    hr
+    .panel.panel-danger
+      .panel-heading type="button" data-toggle="collapse" data-target="#comable-danger"
+        strong
+          span.fa.fa-angle-down>
+          = Comable.t('admin.actions.destroy')
+      #comable-danger.collapse
+        .panel-body
+          p
+            = Comable.t('admin.confirmation_to_remove_product')
+          = link_to Comable.t('admin.actions.destroy'), comable.admin_payment_method_path(@payment_method), method: :delete, class: 'btn btn-danger'

data/app/views/comable/admin/payment_methods/index.slim

@@ -1,53 +1,41 @@
-#comable-payment-method
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
-      = Comable.t('admin.nav.payment_method')
-
-  h1.page-header
-    = Comable.t('admin.nav.payment_method')
-    small<
-      = @payment_methods.total_count
-      = Comable.t('admin.results')
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_payment_method_path, class: 'btn btn-default'
 
-  .row
-    section.col-sm-8
-      - if @payment_methods.empty?
-        = Comable.t('admin.not_found')
-      - else
-        .panel.panel-inverse
-          .panel-heading
-            .panel-title
-              = Comable.t('admin.index')
-          table.table.table-striped
-            thead
-              th
-                = @payment_methods.klass.human_attribute_name(:name)
-              th
-                = @payment_methods.klass.human_attribute_name(:payment_provider)
-              th
-                = @payment_methods.klass.human_attribute_name(:enable_price)
-            tbody
-              - @payment_methods.each do |payment_method|
-                tr
-                  td
-                    = link_to payment_method.name, comable.admin_payment_method_path(payment_method)
-                    /- unless payment_method.activate_flag
-                    /  span.fa.fa-eye-slash.text-muted<
-                  td
-                    = payment_method.payment_provider.display_name
-                  td
-                    - if payment_method.enable_price_from || payment_method.enable_price_to
-                      span = number_to_currency payment_method.enable_price_from
-                      span>< ~
-                      span = number_to_currency payment_method.enable_price_to
+    h1.page-header
+      = Comable.t('admin.nav.payment_method')
+      small<
+        = @payment_methods.total_count
+        = Comable.t('admin.results')
 
-        .text-center
-          = paginate @payment_methods, theme: :comable_backend
+  .comable-page-body
+    - if @payment_methods.empty?
+      = Comable.t('admin.not_found')
+    - else
+      table.table.table-striped
+        thead
+          th
+            = @payment_methods.klass.human_attribute_name(:name)
+          th
+            = @payment_methods.klass.human_attribute_name(:payment_provider)
+          th
+            = @payment_methods.klass.human_attribute_name(:enable_price)
+        tbody
+          - @payment_methods.each do |payment_method|
+            tr
+              td
+                = link_to payment_method.name, comable.admin_payment_method_path(payment_method)
+                /- unless payment_method.activate_flag
+                /  span.fa.fa-eye-slash.text-muted<
+              td
+                = payment_method.payment_provider.display_name
+              td
+                - if payment_method.enable_price_from || payment_method.enable_price_to
+                  span = number_to_currency payment_method.enable_price_from
+                  span>< ~
+                  span = number_to_currency payment_method.enable_price_to
 
-    nav.col-sm-4
-      #comable-affix
-        .panel
-          .list-group
-            = link_to Comable.t('admin.actions.new'), comable.new_admin_payment_method_path, class: 'list-group-item'
+      .text-center
+        = paginate @payment_methods, theme: :comable_backend

data/app/views/comable/admin/payment_methods/new.slim

@@ -1,17 +1,16 @@
-#comable-payment-method
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li
-      = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path
-    li.active
-      = Comable.t('admin.actions.new')
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
 
-  h1.page-header
-    = Comable.t('admin.actions.new')
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path
+          li.active
+            = Comable.t('admin.actions.new')
 
-  .row
-    section.col-sm-8
-      = render 'form'
-
-    nav.col-sm-4
+  .comable-page-body
+    = render 'form'