comable_backend 0.3.4 → 0.4.0

data/app/controllers/comable/admin/trackers_controller.rb

@@ -0,0 +1,58 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class TrackersController < Comable::Admin::ApplicationController
+      load_and_authorize_resource class: Comable::Tracker.name
+
+      def index
+        @trackers = @trackers.page(params[:page])
+      end
+
+      def show
+        render :edit
+      end
+
+      def new
+      end
+
+      def create
+        if @tracker.save
+          redirect_to comable.admin_tracker_path(@tracker), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :new
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        if @tracker.update_attributes(tracker_params)
+          redirect_to comable.admin_tracker_path(@tracker), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :edit
+        end
+      end
+
+      def destroy
+        @tracker.destroy
+        redirect_to comable.admin_trackers_path, notice: Comable.t('successful')
+      end
+
+      private
+
+      def tracker_params
+        params.require(:tracker).permit(
+          :activate_flag,
+          :name,
+          :tracker_id,
+          :code,
+          :place
+        )
+      end
+    end
+  end
+end

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

@@ -2,14 +2,14 @@ require_dependency 'comable/admin/application_controller'
 
 module Comable
   module Admin
-    class CustomersController < Comable::Admin::ApplicationController
+    class UsersController < Comable::Admin::ApplicationController
       include Comable::PermittedAttributes
 
-      load_and_authorize_resource class: Comable::Customer.name, except: :index
+      load_and_authorize_resource class: Comable::User.name, except: :index
 
       def index
-        @q = Comable::Customer.ransack(params[:q])
-        @customers = @q.result.page(params[:page]).accessible_by(current_ability)
+        @q = Comable::User.ransack(params[:q])
+        @users = @q.result.page(params[:page]).accessible_by(current_ability)
       end
 
       def show
@@ -19,8 +19,8 @@ module Comable
       end
 
       def update
-        if @customer.update_attributes(customer_params)
-          redirect_to comable.admin_customer_path(@customer), notice: Comable.t('successful')
+        if @user.update_attributes(user_params)
+          redirect_to comable.admin_user_path(@user), notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
           render :edit
@@ -29,8 +29,8 @@ module Comable
 
       private
 
-      def customer_params
-        params.require(:customer).permit(
+      def user_params
+        params.require(:user).permit(
           :email,
           :password,
           :role,

data/app/helpers/comable/admin/orders_helper.rb

@@ -0,0 +1,30 @@
+module Comable
+  module Admin
+    module OrdersHelper
+      def options_of_shipment_badge_for(shipment, state:)
+        human_name = shipment.class.state_machine.states[state].human_name
+        { class: shipment_badge_class_for(shipment, state: state), title: human_name, data: { toggle: 'tooltip', placement: 'top' } }
+      end
+
+      def shipment_badge_class_for(shipment, state:)
+        return badge_class_for_state(state) if shipment.state.to_sym == state.to_sym
+        can_cancel = shipment.resumed? && state.to_sym == :canceled
+        (!can_cancel && shipment.stated?(state)) ? 'comable-badge comable-badge-disable' : 'comable-badge comable-badge-default'
+      end
+
+      alias_method :options_of_payment_badge_for, :options_of_shipment_badge_for
+      alias_method :payment_badge_class_for, :shipment_badge_class_for
+
+      def badge_class_for_state(state)
+        case state.to_sym
+        when :pending, :ready
+          'comable-badge comable-badge-warning'
+        when :completed, :resumed
+          'comable-badge comable-badge-success'
+        when :canceled
+          'comable-badge comable-badge-danger'
+        end
+      end
+    end
+  end
+end

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

@@ -70,7 +70,7 @@ coffee:
 
   .comable-page-body
     fieldset
-      .col-sm-3
+      .col-md-3
         legend
           = Comable.t('admin.note')
         .help-block
@@ -83,7 +83,7 @@ coffee:
               = Comable.t('admin.link_to_add_new_node')
               = link_to Comable.t('admin.actions.new'), 'javascript:create_new_node()'
 
-      .col-sm-9
+      .col-md-9
         #comable-jstree
         = form_tag comable.admin_categories_path do
           .hidden

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

@@ -4,8 +4,8 @@
       = Comable.t('admin.nav.dashboard')
 
   .comable-page-body
-    section
-      .col-sm-4
+    section.row
+      .col-md-4
         - number = @this_week_orders.count
         = render 'widget',
           title: Comable.t('admin.new_orders'),
@@ -14,7 +14,7 @@
           color: 'green',
           fa: 'shopping-cart'
 
-      .col-sm-4
+      .col-md-4
         - number = @this_week_orders.sum(:total_price)
         = render 'widget',
           title: Comable.t('admin.sales'),
@@ -24,20 +24,19 @@
           fa: 'dollar'
 
     / TODO: Comment out after adding timestamp columns
-      .col-sm-4
-        - number = @this_week_customers.count
+      .col-md-4
+        - number = @this_week_users.count
         = render 'widget',
           title: Comable.t('admin.new_users'),
           number: number_with_delimiter(number),
-          progress: (number.to_f / @last_week_customers.count) * 100,
+          progress: (number.to_f / @last_week_users.count) * 100,
           color: 'black',
           fa: 'user'
 
     section
-      .col-sm-12
-        .panel.panel-default
-          .panel-body
-            #comable-morris.morris style="height: 300px;"
+      .panel.panel-default
+        .panel-body
+          #comable-morris.morris style="height: 300px;"
 
       javascript:
         morris_data = #{raw @this_month_orders.to_morris};

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

@@ -0,0 +1,40 @@
+section.row
+  .col-sm-2
+    .comable-flow-label
+      .comable-flow-label-container
+        label
+          | #{payment.order.class.human_attribute_name(:payment_state)}:
+        p
+          = payment.human_state_name
+
+  .col-sm-10
+    ul.comable-flow
+      li
+        = content_tag :div, options_of_payment_badge_for(payment, state: :pending) do
+          i.fa.fa-circle
+
+      li
+        = content_tag :div, options_of_payment_badge_for(payment, state: :ready) do
+          i.fa.fa-check-circle
+
+      li
+        = content_tag :div, options_of_payment_badge_for(payment, state: :completed) do
+          i.fa.fa-money
+
+      - if payment.state?(:resumed)
+        li
+          = content_tag :div, options_of_payment_badge_for(payment, state: :resumed) do
+            i.fa.fa-refresh
+
+      - if payment.state?(:completed) || payment.state?(:resumed)
+        li
+          = link_to comable.cancel_payment_admin_order_path(payment.order), options_of_payment_badge_for(payment, state: :canceled).merge(method: :post) do
+            i.fa.fa-close
+
+      - if payment.state?(:canceled)
+        li
+          = content_tag :div, options_of_payment_badge_for(payment, state: :canceled) do
+            i.fa.fa-close
+        li
+          = link_to comable.resume_payment_admin_order_path(payment.order), options_of_payment_badge_for(payment, state: :resumed).merge(method: :post) do
+            i.fa.fa-refresh

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

@@ -0,0 +1,44 @@
+section.row
+  .col-sm-2
+    .comable-flow-label
+      .comable-flow-label-container
+        label
+          | #{shipment.order.class.human_attribute_name(:shipment_state)}:
+        p
+          = shipment.human_state_name
+
+  .col-sm-10
+    ul.comable-flow
+      li
+        = content_tag :div, options_of_shipment_badge_for(shipment, state: :pending) do
+          i.fa.fa-circle
+
+      li
+        = content_tag :div, options_of_shipment_badge_for(shipment, state: :ready) do
+          i.fa.fa-check-circle
+
+      li
+        - if shipment.state?(:ready)
+          = link_to comable.ship_admin_order_path(shipment.order), options_of_shipment_badge_for(shipment, state: :completed).merge(method: :post, disabled: !@order.can_ship?) do
+            i.fa.fa-truck
+        - else
+          = content_tag :div, options_of_shipment_badge_for(shipment, state: :completed) do
+            i.fa.fa-truck
+
+      - if shipment.state?(:resumed)
+        li
+          = content_tag :div, options_of_shipment_badge_for(shipment, state: :resumed) do
+            i.fa.fa-refresh
+
+      - if shipment.state?(:completed) || shipment.state?(:resumed)
+        li
+          = link_to comable.cancel_shipment_admin_order_path(shipment.order), options_of_shipment_badge_for(shipment, state: :canceled).merge(method: :post) do
+            i.fa.fa-close
+
+      - if shipment.state?(:canceled)
+        li
+          = content_tag :div, options_of_shipment_badge_for(shipment, state: :canceled) do
+            i.fa.fa-close
+        li
+          = link_to comable.resume_shipment_admin_order_path(shipment.order), options_of_shipment_badge_for(shipment, state: :resumed).merge(method: :post) do
+            i.fa.fa-refresh

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

@@ -0,0 +1,112 @@
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
+
+      h1.page-header
+        ol.breadcrumb
+          li>
+            = link_to Comable.t('admin.nav.order'), comable.admin_orders_path
+          li>
+            = link_to @order.code, comable.admin_order_path(@order)
+          li.active
+            = Comable.t('admin.actions.edit')
+
+  .comable-page-body
+    section
+      = error_messages_for @order
+
+      = form_for @order, url: comable.admin_order_path(@order) do |f|
+        .hidden
+          = f.submit
+
+        fieldset
+          .col-md-3
+            legend
+              = Comable.t('admin.general')
+            .help-block
+
+          .col-md-9
+            .form-group
+              = f.label :email
+              = f.email_field :email
+
+        hr
+
+        - if f.object.bill_address
+          fieldset
+            .col-md-3
+              legend
+                = f.object.class.human_attribute_name(:bill_address)
+              .help-block
+
+            .col-md-9
+              = f.fields_for :bill_address do |ff|
+                .form-group
+                  = ff.label :full_name
+                  .row
+                    .col-sm-6
+                      = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name)
+                    .col-sm-6
+                      = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name)
+
+                .form-group
+                  = ff.label :zip_code
+                  = ff.text_field :zip_code, max_length: 8
+
+                .form-group
+                  = ff.label :state_name
+                  = ff.text_field :state_name
+
+                .form-group
+                  = ff.label :city
+                  = ff.text_field :city
+
+                .form-group
+                  = ff.label :detail
+                  = ff.text_field :detail
+
+                .form-group
+                  = ff.label :phone_number
+                  = ff.text_field :phone_number, max_length: 18
+
+        hr
+
+        - if f.object.ship_address
+          fieldset
+            .col-md-3
+              legend
+                = f.object.class.human_attribute_name(:ship_address)
+              .help-block
+
+            .col-md-9
+              = f.fields_for :ship_address do |ff|
+                .form-group
+                  = ff.label :full_name
+                  .row
+                    .col-sm-6
+                      = ff.text_field :family_name, placeholder: ff.object.class.human_attribute_name(:family_name)
+                    .col-sm-6
+                      = ff.text_field :first_name, placeholder: ff.object.class.human_attribute_name(:first_name)
+
+                .form-group
+                  = ff.label :zip_code
+                  = ff.text_field :zip_code, max_length: 8
+
+                .form-group
+                  = ff.label :state_name
+                  = ff.text_field :state_name
+
+                .form-group
+                  = ff.label :city
+                  = ff.text_field :city
+
+                .form-group
+                  = ff.label :detail
+                  = ff.text_field :detail
+
+                .form-group
+                  = ff.label :phone_number
+                  = ff.text_field :phone_number, max_length: 18

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

@@ -9,6 +9,15 @@
           = link_to_next_page @orders, '>', class: 'btn btn-default' do
             .btn.btn-default disabled="disabled"
               | >
+      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_orders_path(format: :csv, q: params[:q])
+          li
+            = link_to Comable.t('admin.export_to_excel'), comable.export_admin_orders_path(format: :xlsx, q: params[:q])
 
     h1.page-header
       = Comable.t('admin.nav.order')
@@ -32,8 +41,8 @@
           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
+          = f.label :user_id
+          = f.text_field :user_id_eq
 
         = render 'comable/admin/shared/advanced_search', f: f
 
@@ -46,12 +55,15 @@
             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(:payment_state)
+            th
+              = @orders.klass.human_attribute_name(:shipment_state)
             th
               = @orders.klass.human_attribute_name(:bill_full_name)
             th
-              = @orders.klass.human_attribute_name(:order_details)
+              = @orders.klass.human_attribute_name(:order_items)
             th
               = sort_link [:comable, @q], :total_price
             th
@@ -63,13 +75,17 @@
                   = link_to order.code, comable.admin_order_path(order)
                 td
                   = order.human_state_name
+                td
+                  = order.payment_human_state_name
+                td
+                  = order.shipment_human_state_name
                 td
                   = order.bill_full_name
                 td
                   ul.list-unstyled
-                    - order.order_details.each do |order_detail|
+                    - order.order_items.each do |order_item|
                       li
-                        | #{order_detail.name_with_sku} x #{order_detail.quantity}
+                        | #{order_item.name_with_sku} x #{order_item.quantity}
                 td
                   = number_to_currency order.total_price
                 td