comable_backend 0.3.4 → 0.4.0

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

@@ -12,7 +12,7 @@ html
   body id="#{"comable-#{controller_name.singularize}"}"
     = render 'comable/admin/shared/notifier'
 
-    - if current_customer.signed_in?
+    - if current_comable_user.signed_in?
       = render 'comable/admin/shared/header'
 
       #wrapper

data/config/routes.rb

@@ -6,17 +6,44 @@ Comable::Core::Engine.routes.draw do
 
     resources :products do
       resources :stocks
+
+      collection do
+        get :export
+        post :import
+      end
+    end
+
+    resources :stocks do
+      collection do
+        get :export
+        post :import
+      end
+    end
+
+    resources :orders do
+      collection do
+        get :export
+      end
+
+      member do
+        post :cancel
+        post :resume
+        post :cancel_payment
+        post :resume_payment
+        post :ship
+        post :cancel_shipment
+        post :resume_shipment
+      end
     end
-    resources :stocks
 
     resources :categories
-    resources :orders
-    resources :customers
+    resources :users
     resources :shipment_methods
     resources :payment_methods
+    resources :trackers
     resource :store, controller: :store, only: [:show, :edit, :update]
 
-    devise_for :customer, path: :user, class_name: Comable::Customer.name, module: :devise, controllers: {
+    devise_for :user, path: :user, class_name: Comable::User.name, module: :devise, controllers: {
       sessions: 'comable/admin/user_sessions'
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_backend
 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
@@ -294,6 +294,7 @@ files:
 - app/assets/stylesheets/comable/admin/_common.scss
 - app/assets/stylesheets/comable/admin/_dashboard.scss
 - app/assets/stylesheets/comable/admin/_errors.scss
+- app/assets/stylesheets/comable/admin/_flow.scss
 - app/assets/stylesheets/comable/admin/_mixins.scss
 - app/assets/stylesheets/comable/admin/_orders.scss
 - app/assets/stylesheets/comable/admin/_overrides.scss
@@ -306,7 +307,6 @@ files:
 - app/assets/stylesheets/comable/admin/overrides/tagit.scss
 - app/controllers/comable/admin/application_controller.rb
 - app/controllers/comable/admin/categories_controller.rb
-- app/controllers/comable/admin/customers_controller.rb
 - app/controllers/comable/admin/dashboard_controller.rb
 - app/controllers/comable/admin/orders_controller.rb
 - app/controllers/comable/admin/payment_methods_controller.rb
@@ -314,18 +314,21 @@ files:
 - app/controllers/comable/admin/shipment_methods_controller.rb
 - app/controllers/comable/admin/stocks_controller.rb
 - app/controllers/comable/admin/store_controller.rb
+- app/controllers/comable/admin/trackers_controller.rb
 - app/controllers/comable/admin/user_sessions_controller.rb
+- app/controllers/comable/admin/users_controller.rb
 - app/helpers/comable/admin/application_helper.rb
+- app/helpers/comable/admin/orders_helper.rb
 - app/helpers/comable/admin/products_helper.rb
 - app/helpers/comable/admin/shipment_methods_helper.rb
 - app/helpers/comable/admin/stores_helper.rb
 - app/views/comable/admin/categories/index.slim
-- app/views/comable/admin/customers/edit.slim
-- app/views/comable/admin/customers/index.slim
-- app/views/comable/admin/customers/show.slim
 - app/views/comable/admin/dashboard/_widget.slim
 - app/views/comable/admin/dashboard/show.slim
 - app/views/comable/admin/orders/_google_map.slim
+- app/views/comable/admin/orders/_payment_state.slim
+- app/views/comable/admin/orders/_shipment_state.slim
+- app/views/comable/admin/orders/edit.slim
 - app/views/comable/admin/orders/index.slim
 - app/views/comable/admin/orders/show.slim
 - app/views/comable/admin/payment_methods/_form.slim
@@ -346,6 +349,7 @@ files:
 - app/views/comable/admin/shared/_setup_search_form.slim
 - app/views/comable/admin/shared/_sidebar.slim
 - app/views/comable/admin/shared/_value_fields.slim
+- app/views/comable/admin/shared/export.xlsx.axlsx
 - app/views/comable/admin/shipment_methods/_form.slim
 - app/views/comable/admin/shipment_methods/edit.slim
 - app/views/comable/admin/shipment_methods/index.slim
@@ -356,7 +360,14 @@ files:
 - app/views/comable/admin/stocks/new.slim
 - app/views/comable/admin/store/_form.slim
 - app/views/comable/admin/store/edit.slim
+- app/views/comable/admin/trackers/_form.slim
+- app/views/comable/admin/trackers/edit.slim
+- app/views/comable/admin/trackers/index.slim
+- app/views/comable/admin/trackers/new.slim
 - app/views/comable/admin/user_sessions/new.slim
+- app/views/comable/admin/users/edit.slim
+- app/views/comable/admin/users/index.slim
+- app/views/comable/admin/users/show.slim
 - app/views/kaminari/comable_backend/_first_page.html.slim
 - app/views/kaminari/comable_backend/_gap.html.slim
 - app/views/kaminari/comable_backend/_last_page.html.slim

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

@@ -1,88 +0,0 @@
-.comable-page
-  .comable-page-heading
-    ul.pull-right.list-inline
-      li.btn-group
-        = link_to comable.edit_admin_customer_path(@customer), class: 'btn btn-default' do
-          span.fa.fa-edit>
-          = Comable.t('admin.actions.edit')
-        = link_to Comable.t('admin.nav.order'), comable.admin_orders_path(q: { customer_id_eq: @customer.id }), class: 'btn btn-default'
-      li
-        / TODO: Comment out after implemented.
-        / = link_to Comable.t('admin.nav.orders.cart'), '#', class: 'btn btn-default'
-
-    h1.page-header
-      ol.breadcrumb
-        li>
-          = link_to Comable.t('admin.nav.customer'), comable.admin_customers_path
-        li.active
-          = @customer.human_id
-          - if @customer.bill_full_name
-            small<
-              = Comable.t('honorific', name: @customer.bill_full_name)
-
-  .comable-page-body
-    section
-      dl.dl-horizontal
-        dt
-          = @customer.class.human_attribute_name(:role)
-        dd
-          = @customer.role.text
-        dt
-          = @customer.class.human_attribute_name(:email)
-        dd
-          = @customer.email
-        - if @customer.bill_address
-          dt
-            = @customer.class.human_attribute_name(:bill_address)
-          dd
-            ul.list-unstyled
-              li = @customer.bill_address.zip_code
-              li = @customer.bill_address.full_name
-              li = @customer.bill_address.state_name
-              li = @customer.bill_address.city
-              li = @customer.bill_address.detail
-              li = "#{@customer.bill_address.class.human_attribute_name(:phone_number)}: #{@customer.bill_address.phone_number}"
-
-    - if @customer.orders.any?
-      section
-        .panel.panel-default
-          .panel-heading
-            .panel-title
-              = Comable.t('admin.nav.customers.new_orders', count: 5)
-
-          table.table
-            thead
-              tr
-                th
-                  = @customer.orders.klass.human_attribute_name(:code)
-                th
-                  = @customer.orders.klass.human_attribute_name(:state)
-                th
-                  = @customer.orders.klass.human_attribute_name(:bill_full_name)
-                th
-                  = @customer.orders.klass.human_attribute_name(:order_details)
-                th
-                  = @customer.orders.klass.human_attribute_name(:total_price)
-                th
-                  = @customer.orders.klass.human_attribute_name(:completed_at)
-            tbody
-              - @customer.orders.limit(5).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
-
-          .panel-footer.text-right
-            = link_to Comable.t('admin.more'), comable.admin_orders_path(search_customer_id: @customer.id), class: 'btn btn-default'