comable_backend 0.3.4 → 0.4.0

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

@@ -1,6 +1,26 @@
 .comable-page
   .comable-page-heading
     ul.pull-right.list-inline
+      li
+      - if !@order.shipped?
+        = link_to comable.ship_admin_order_path(@order), class: 'btn btn-primary', method: :post, disabled: !@order.can_ship? do
+          i.fa.fa-truck>
+          = Comable.t('admin.ship')
+      - if @order.completed?
+        li
+          = link_to comable.cancel_admin_order_path(@order), class: 'btn btn-default', method: :post do
+            = @order.class.human_state_event_name(:cancel)
+      - if @order.canceled?
+        li
+          = button_to comable.resume_admin_order_path(@order), class: 'btn btn-default', method: :post do
+            = @order.class.human_state_event_name(:resume)
+
+    ul.pull-right.list-inline
+      li
+        = link_to comable.edit_admin_order_path(@order), class: 'btn btn-default' do
+          span.fa.fa-edit>
+          = Comable.t('admin.actions.edit')
+
       li.btn-group
         / TODO: Comment out after implemented.
         / = link_to Comable.t('admin.nav.orders.cart'), '#', class: 'btn btn-default'
@@ -16,131 +36,142 @@
           small< data-toggle="tooltip" data-placement="right" title="#{l @order.completed_at}"
             = time_ago_in_words @order.completed_at
 
-  .comable-page-body.row
-    section.col-sm-8
-      .panel.panel-default
-        table.table
-          thead
-            tr
-              th colspan="2"
-                = @order.order_details.klass.human_attribute_name(:product)
-              th
-                = @order.order_details.klass.human_attribute_name(:price)
-              th
-                = @order.order_details.klass.human_attribute_name(:quantity)
-              th
-                = @order.order_details.klass.human_attribute_name(:subtotal_price)
-          tbody
-            - @order.order_details.each do |order_detail|
+  .comable-page-body
+    - if @order.payment
+      = render 'payment_state', payment: @order.payment
+    - if @order.shipment
+      = render 'shipment_state', shipment: @order.shipment
+
+    section.row
+      .col-lg-8
+        .panel.panel-default
+          table.table
+            thead
+              tr
+                th colspan="2"
+                  = @order.order_items.klass.human_attribute_name(:product)
+                th
+                  = @order.order_items.klass.human_attribute_name(:price)
+                th
+                  = @order.order_items.klass.human_attribute_name(:quantity)
+                th
+                  = @order.order_items.klass.human_attribute_name(:subtotal_price)
+            tbody
+              - @order.order_items.each do |order_item|
+                tr
+                  td width="180"
+                    = image_tag order_item.image_url, width: '100%'
+                  td
+                    = order_item.name_with_sku
+                    .text-muted
+                      small = order_item.code
+                  td
+                    = number_to_currency order_item.price
+                  td
+                    = number_with_delimiter order_item.quantity
+                  td
+                    = number_to_currency order_item.subtotal_price
               tr
-                td width="180"
-                  = image_tag order_detail.image_url, width: '100%'
+                th.text-right colspan="4"
+                  = @order.class.human_attribute_name(:item_total_price)
                 td
-                  = order_detail.name_with_sku
-                  .text-muted
-                    small = order_detail.code
+                  = number_to_currency @order.item_total_price
+              tr
+                th.text-right colspan="4"
+                  = @order.class.human_attribute_name(:payment_fee)
                 td
-                  = number_to_currency order_detail.price
+                  = number_to_currency @order.payment_fee
+              tr
+                th.text-right colspan="4"
+                  = @order.class.human_attribute_name(:shipment_fee)
                 td
-                  = number_with_delimiter order_detail.quantity
+                  = number_to_currency @order.shipment_fee
+              tr
+                th.text-right colspan="4"
+                  = @order.class.human_attribute_name(:total_price)
                 td
-                  = number_to_currency order_detail.subtotal_price
-            tr
-              th.text-right colspan="4"
-                = @order.class.human_attribute_name(:item_total_price)
-              td
-                = number_to_currency @order.item_total_price
-            tr
-              th.text-right colspan="4"
-                = @order.class.human_attribute_name(:shipment_fee)
-              td
-                = number_to_currency @order.shipment_fee
-            tr
-              th.text-right colspan="4"
+                  = number_to_currency @order.total_price
+
+      nav.col-lg-4
+        .panel.panel-default.visible-lg-block
+          .panel-body
+            h3.text-center
+              small>
                 = @order.class.human_attribute_name(:total_price)
-              td
-                = number_to_currency @order.total_price
-
-    nav.col-sm-4
-      .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?
+              = 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-phone.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.bill_address.class.human_attribute_name(:phone_number)}"
+                i.fa.fa-map-marker.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:bill_address)}"
               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?
+                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-phone.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.ship_address.class.human_attribute_name(:phone_number)}"
+                i.fa.fa-user.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:user)}"
               dd
-                = @order.ship_address.phone_number
+                = link_to_if @order.user, @order.bill_address.full_name, [comable, :admin, @order.user]
 
-            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
+              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
 
-            - if @order.shipment_method
+        .panel.panel-default
+          .panel-heading
+            .panel-title
+              = Comable.t('admin.ship')
+          .panel-body
+            dl.dl-horizontal.comable-address-with-icon
               dt
-                i.fa.fa-truck.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:shipment_method)}"
+                i.fa.fa-map-marker.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:ship_address)}"
               dd
-                = @order.shipment_method.name
+                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
 
-            - 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)}"
+                i.fa.fa-user.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:user)}"
               dd
-                = @order.payment_method.name
+                = @order.bill_address.full_name
+
+              - if @order.shipment
+                dt
+                  i.fa.fa-truck.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:shipment_method)}"
+                dd
+                  = @order.shipment.name
+
+              - if @order.payment
+                dt
+                  i.fa.fa-money.fa-lg data-toggle="tooltip" data-placement="left" title="#{@order.class.human_attribute_name(:payment_method)}"
+                dd
+                  = @order.payment.name
 
-        .panel-footer
-          = render 'google_map', id: 'comable-google-map-for-ship-address', address: @order.ship_address
+          .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

@@ -5,11 +5,11 @@
     = f.submit
 
   fieldset
-    .col-sm-3
+    .col-md-3
       legend
         = Comable.t('admin.general')
 
-    .col-sm-9
+    .col-md-9
       .form-group
           = f.label :name
           = f.text_field :name
@@ -22,6 +22,10 @@
           .col-sm-6
             = f.select :payment_provider_kind, Comable::PaymentProvider::General.kind.map.with_index { |(_, value), index| [value, index] }
 
+      .form-group
+        = f.label :fee
+        = f.text_field :fee
+
       .form-group
         = f.label :enable_price
         .row

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

@@ -8,12 +8,12 @@
     = f.submit
 
   fieldset
-    .col-sm-3
+    .col-md-3
       legend
         = Comable.t('admin.general')
       .help-block
 
-    .col-sm-9
+    .col-md-9
       .form-group
         = f.label :code
         = f.text_field :code
@@ -60,7 +60,7 @@
   hr
 
   fieldset
-    .col-sm-3
+    .col-md-3
       legend
         = Comable.t('admin.stocks')
       .help-block
@@ -68,7 +68,7 @@
           = Comable.t('admin.link_to_add_new_stock')
           = link_to Comable.t('admin.actions.new'), comable.new_admin_product_stock_path(@product)
 
-    .col-sm-9
+    .col-md-9
       - if @product.stocks.any?
         table.table.table-striped
           thead
@@ -118,18 +118,18 @@
   hr
 
   fieldset
-    .col-sm-3
+    .col-md-3
       legend
         = Comable.t('admin.images')
       .help-block
 
-    .col-sm-9
+    .col-md-9
       - images = @product.images
       - main_image = images.first || @product.images.build
       - sub_images = images - [main_image]
 
       .row
-        .col-sm-6
+        .col-md-6
           = f.fields_for :images, main_image do |ff|
             label
               = Comable.t('admin.main_image')
@@ -143,11 +143,11 @@
                     span> = ff.check_box :_destroy
                     span> = Comable.t('admin.actions.destroy')
 
-        .col-sm-6
+        .col-md-6
           .row
             - sub_images.each.with_index(1) do |image, index|
               = f.fields_for :images, image do |ff|
                 = render 'comable/admin/shared/image_fields', ff: ff, index: index
 
-            .col-sm-6
+            .col-md-6
               = link_to_add_fields Comable.t('admin.add_sub_image'), f, :images

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

@@ -12,6 +12,22 @@
       li
         = link_to comable.root_path do
           = link_to Comable.t('admin.actions.new'), comable.new_admin_product_path, class: 'btn btn-default'
+      li.dropdown
+        = link_to '#', class: 'btn btn-default', 'data-toggle' => 'dropdown' do
+          = Comable.t('admin.more')
+          i.fa.fa-angle-down<
+        ul.dropdown-menu.dropdown-menu-right
+          li
+            = link_to Comable.t('admin.export_to_csv'), comable.export_admin_products_path(format: :csv, q: params[:q])
+          li
+            = link_to Comable.t('admin.export_to_excel'), comable.export_admin_products_path(format: :xlsx, q: params[:q])
+          li.divider
+          li
+            a.btn-file
+              span>
+                = Comable.t('admin.import')
+              = form_tag comable.import_admin_products_path, multipart: true do
+                = file_field_tag :file
 
     h1.page-header
       = Comable.t('admin.nav.product')

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

@@ -16,16 +16,16 @@ header.navbar.navbar-default.navbar-fixed-top
       li.dropdown.navbar-user
         a href="#" class="dropdown-toggle" data-toggle="dropdown"
           span.hidden-xs
-            = current_customer.email
+            = current_comable_user.email
           span.caret<
         ul.dropdown-menu.animated.fadeInLeft
           li.arrow
           li
-            = link_to comable.edit_admin_customer_path(current_customer) do
+            = link_to comable.edit_admin_user_path(current_comable_user) do
               span.fa.fa-edit>
               = Comable.t('admin.edit_profile')
           li.divider
           li
-            = link_to comable.destroy_customer_session_path, method: :delete do
+            = link_to comable.destroy_user_session_path, method: :delete do
               span.fa.fa-sign-in>
               = Comable.t('admin.sign_out')

data/app/views/comable/admin/shared/_sidebar.slim

@@ -35,10 +35,10 @@
               = Comable.t('admin.nav.static_page')
             li
               = Comable.t('admin.nav.static_content')
-      li class="#{'active' if controller_name == 'customers'}"
-        = link_to comable.admin_customers_path do
+      li class="#{'active' if controller_name == 'users'}"
+        = link_to comable.admin_users_path do
           i.fa.fa-user
-          = Comable.t('admin.nav.customer')
+          = Comable.t('admin.nav.user')
       li class="#{'active' if controller_name.in? %w( store shipment_methods payment_methods )}"
         = link_to '#' do
           i.fa.fa-cog
@@ -50,3 +50,5 @@
             = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
           li class="#{'active' if controller_name == 'payment_methods'}"
             = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path
+          li class="#{'active' if controller_name == 'trackers'}"
+            = link_to Comable.t('admin.nav.tracker'), comable.admin_trackers_path

data/app/views/comable/admin/shared/export.xlsx.axlsx

@@ -0,0 +1,17 @@
+wb = xlsx_package.workbook
+
+header_style = Comable::Config.export_xlsx_header_style
+header_style_handle = wb.styles.add_style(header_style) if header_style
+
+style = Comable::Config.export_xlsx_style
+style_handle = wb.styles.add_style(style) if style
+
+wb.add_worksheet(name: records.klass.model_name.human) do |sheet|
+  sheet.add_row records.klass.new.to_comma_headers
+  sheet.row_style 0, header_style_handle if header_style_handle
+
+  records.each do |record|
+    sheet.add_row record.to_comma
+  end
+  sheet.row_style (1..-1), style_handle if style_handle
+end