comable-backend 0.7.0.beta1 → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e413e5bc839c0924bfa5d8ffe4b07e996edc6b
-  data.tar.gz: c9e611eeff9a149567730af68720b2b8a36ab43a
+  metadata.gz: a9a4aab8272e2f6d7559b2b904eff5dae392ac9b
+  data.tar.gz: 6a467557d5063f57772c037adddabc6099bfce7a
 SHA512:
-  metadata.gz: 0c7bcfbceaba2d2806a1b42ee422d443908e8a613e6705c9259b30063b48f2548f8eb1f961e06e6ca70a36c9dd59eab2668e30eceb26d0bcbdfd97b82eb26337
-  data.tar.gz: 514dd41231eb28738854f4fcb721fe651e46071025b787b4e4ca72807ac6a6324c737adb9679a0eb676cae36ac2df3d3ea191a25d8373d20d13598f9d947eac8
+  metadata.gz: 74082e26be423fa71b1d3196d9daf07251b106665314a77bde732c3a77812bb63a27853149375dd8ee14f763e620107788328e657de86291782a5223603a9c61
+  data.tar.gz: cfa9c867269a22cb149cea5f1a5e69f67dd73fe40dc9b7e69985a0972bd5718a21ad8d17858a4e7a24dde9483096aa27e146ae4cd0e3faf6ef422c478db08cac

data/Rakefile

@@ -4,6 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+require 'rspec/core/rake_task'
 require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
@@ -69,9 +70,9 @@ if File.exist?('comable.gemspec')
     end
   end
 
-  task default: ['app:spec:all', 'rubocop', 'brakeman:all']
+  task default: ['app:spec:all', 'jasmine', 'rubocop', 'brakeman:all']
 else
-  task default: ['app:spec', 'rubocop', 'brakeman']
+  task default: ['app:spec', 'jasmine', 'rubocop', 'brakeman']
 end
 
 Bundler::GemHelper.install_tasks
@@ -79,6 +80,10 @@ Bundler::GemHelper.install_tasks
 # from https://github.com/rspec/rspec-rails/issues/936
 task 'test:prepare'
 
+task :jasmine do
+  sh 'bundle exec rake app:spec:javascript RAILS_ENV=test'
+end
+
 task :rubocop do
   sh 'rubocop'
 end

data/app/assets/javascripts/comable/admin/application.coffee

@@ -12,8 +12,10 @@
 #= require ace/ace
 #= require ace/worker-html
 #= require ace/mode-liquid
+#= require ace/theme-monokai
 #= require moment
 #= require bootstrap-datetimepicker
+#= require select2
 #= require comable/admin/dispatcher
 #= require_tree .
 #= require_self
@@ -46,6 +48,22 @@ add_beforeunload_event = ->
   $form.submit(remove_beforeunload_function)
   $(document).on('page:change', remove_beforeunload_function)
 
+# Based on http://gistflow.com/posts/428-autocomplete-with-rails-and-select2
+initialize_select2 = ->
+  $('.select2').each( ->
+    $select = $(this)
+    options = { theme: 'bootstrap' }
+    if $select.hasClass('ajax')
+      options.ajax = {
+        url: $select.data('source')
+        dataType: 'json'
+        cache: true
+        data: (params) -> { q: { name_cont: params.term }, page: params.page }
+        processResults: (data, page) -> { results: data }
+      }
+    $select.select2(options)
+  )
+
 window.add_fields = (_this, association, content) ->
   new_id = new Date().getTime()
   regexp = new RegExp('new_' + association, 'g')
@@ -57,6 +75,11 @@ window.add_fields = (_this, association, content) ->
 
 $(document).ready(->
   add_beforeunload_event()
+  initialize_select2()
+
+  $(document).on('click', '.add_fields', ->
+    initialize_select2()
+  )
 
   $('.btn-file :file').change(->
     $(this).closest('form').submit()

data/app/assets/javascripts/comable/admin/dispatcher.coffee

@@ -22,6 +22,9 @@ class Dispatcher
       when 'products:new', 'products:show', 'products:edit', 'products:update', 'products:create'
         new Product
         new Variant
+        new Stock
+      when 'variants:show', 'variants:edit', 'variants:update'
+        new Stock
       when 'navigations:new', 'navigations:show', 'navigations:edit', 'navigations:update', 'navigations:create'
         new Navigation
       when 'themes:tree'

data/app/assets/javascripts/comable/admin/products.coffee

@@ -25,9 +25,13 @@ class @Product
     @radio_published = $('#product_published_at_published')
     @radio_unpublished = $('#product_published_at_unpublished')
     @published_at = $('#product_published_at')
+    @property = $('#product_property')
+    @properties = $('#properties')
+    @add_property = $('.add_property')
 
     @initialize_visibility()
     @add_event_to_set_visibility()
+    @add_event_to_property()
 
   # 公開/非公開の制御
   initialize_visibility: ->
@@ -54,3 +58,29 @@ class @Product
     @published_at.blur( =>
       @radio_unpublished.click() unless @published_at.val()
     )
+
+  add_event_to_property: ->
+    @properties.on('change', 'input', @reset_property)
+    @properties.on('click', '.remove_property', @remove_property)
+    @properties.on('click', '.remove_property', @reset_property)
+    @add_property.click(@adding_property_field)
+
+  reset_property: =>
+    property_attrbutes = $('.property').map( (_index, property) ->
+      property_key = $(property).find('.property_key').val()
+      property_value = $(property).find('.property_value').val()
+      return unless property_key && property_value
+      {
+        'property_key': property_key,
+        'property_value': property_value
+      }
+    )
+    @property.val(JSON.stringify(property_attrbutes.get()))
+
+  remove_property: ->
+    $(this).closest('tr').remove()
+
+  adding_property_field: ->
+    field_tags = $(this).data('fields')
+    $field = $(field_tags)
+    $('#properties').append($field) # タグを追加

data/app/assets/javascripts/comable/admin/stocks.coffee

@@ -0,0 +1,10 @@
+class @Stock
+  constructor: ->
+    @register_click_event_to_remove_comable_stock_button()
+
+  register_click_event_to_remove_comable_stock_button: ->
+    $(document).on('click', '.js-remove-comable-stock', ->
+      $stock = $(this).closest('.comable-stock')
+      $stock.addClass('hidden')
+      $stock.find('input[data-name="destroy"]').val(true)
+    )

data/app/assets/stylesheets/comable/admin/_products.scss

@@ -15,4 +15,11 @@
       vertical-align: middle;
     }
   }
+
+  tr.property td:first-child {
+    border-right: 1px solid #ddd;
+  }
+  tr.property:last-child {
+    border-bottom: 1px solid #ddd;
+  }
 }

data/app/assets/stylesheets/comable/admin/application.scss

@@ -12,6 +12,8 @@
 @import 'gritter';
 @import 'awesome_admin_layout';
 @import 'bootstrap-datetimepicker';
+@import 'select2';
+@import 'select2-bootstrap';
 
 @import 'comable/admin/mixins';
 @import 'comable/admin/overrides';

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

@@ -7,7 +7,7 @@ module Comable
 
       def index
         @q = Comable::Navigation.ransack(params[:q])
-        @navigations = @q.result.accessible_by(current_ability)
+        @navigations = @q.result.accessible_by(current_ability).by_newest
       end
 
       def show
@@ -46,21 +46,12 @@ module Comable
       end
 
       def search_linkable_ids
-        @linkable_id_options = linkable_id_options
+        @linkable_id_options = Comable::NavigationItem.linkable_id_options(params[:linkable_type])
         render layout: false
       end
 
       private
 
-      def linkable_type
-        return if params[:linkable_type].blank?
-        params[:linkable_type] if Comable.const_defined?(params[:linkable_type].demodulize)
-      end
-
-      def linkable_id_options
-        linkable_type ? linkable_type.constantize.linkable_id_options : [[]]
-      end
-
       def navigation_params
         params.require(:navigation).permit(
           :name,

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

@@ -59,17 +59,21 @@ module Comable
       end
 
       def ship
-        @order.shipment.ship!
+        if params[:shipment_id]
+          find_shipment.ship!
+        else
+          @order.ship!
+        end
         redirect_to :back, notice: Comable.t('successful')
       end
 
       def cancel_shipment
-        @order.shipment.cancel!
+        find_shipment.cancel!
         redirect_to :back, notice: Comable.t('successful')
       end
 
       def resume_shipment
-        @order.shipment.resume!
+        find_shipment.resume!
         redirect_to :back, notice: Comable.t('successful')
       end
 
@@ -90,6 +94,10 @@ module Comable
       def redirect_to_back_with_alert(exception)
         redirect_to :back, alert: exception.message
       end
+
+      def find_shipment
+        @order.shipments.find(params[:shipment_id])
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Comable
 
       def index
         @q = Comable::Page.ransack(params[:q])
-        @pages = @q.result.accessible_by(current_ability)
+        @pages = @q.result.accessible_by(current_ability).by_newest
       end
 
       def show

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

@@ -6,7 +6,7 @@ module Comable
       load_and_authorize_resource class: Comable::PaymentMethod.name
 
       def index
-        @payment_methods = @payment_methods.page(params[:page])
+        @payment_methods = @payment_methods.page(params[:page]).by_newest
       end
 
       def show

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

@@ -7,7 +7,7 @@ module Comable
 
       def index
         @q = Comable::Product.ransack(params[:q])
-        @products = @q.result(distinct: true).includes(:images, variants: [:option_values, :stock]).page(params[:page]).accessible_by(current_ability)
+        @products = @q.result(distinct: true).includes(:images, variants: [:option_values, :stocks]).page(params[:page]).accessible_by(current_ability).by_newest
       end
 
       def show
@@ -73,10 +73,11 @@ module Comable
         params.require(:product).permit(
           :name,
           :caption,
+          :property,
           :published_at,
           category_path_names: [],
           images_attributes: [:id, :file, :_destroy],
-          variants_attributes: [:id, :price, :sku, :options, :quantity, :_destroy],
+          variants_attributes: [:id, :price, :sku, :options, :_destroy, stocks_attributes: [:id, :quantity, :stock_location_id, :_destroy]],
           option_types_attributes: [:id, :name, { values: [] }]
         )
       end

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

@@ -6,7 +6,7 @@ module Comable
       load_and_authorize_resource class: Comable::ShipmentMethod.name
 
       def index
-        @shipment_methods = @shipment_methods.page(params[:page])
+        @shipment_methods = @shipment_methods.page(params[:page]).by_newest
       end
 
       def show

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

@@ -0,0 +1,76 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class StockLocationsController < Comable::Admin::ApplicationController
+      include Comable::PermittedAttributes
+
+      load_and_authorize_resource class: Comable::StockLocation.name, except: :index
+
+      before_filter :build_address, only: [:show, :new, :edit]
+
+      def index
+        @q = Comable::StockLocation.ransack(params[:q])
+        @stock_locations = @q.result.page(params[:page]).accessible_by(current_ability)
+
+        respond_to do |format|
+          format.html
+          format.json { render json: @stock_locations }
+        end
+      end
+
+      def show
+        render :edit
+      end
+
+      def new
+        @stock_location.build_address unless @stock_location.address
+      end
+
+      def create
+        if @stock_location.save
+          redirect_to comable.admin_stock_location_path(@stock_location), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :new
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        if @stock_location.update_attributes(stock_location_params)
+          redirect_to comable.admin_stock_location_path(@stock_location), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :edit
+        end
+      end
+
+      def destroy
+        @stock_location.destroy
+        redirect_to comable.admin_stock_locations_path, notice: Comable.t('successful')
+      end
+
+      private
+
+      def stock_location_params
+        params.require(:stock_location).permit(
+          :name,
+          :active,
+          :default,
+          address_attributes: permitted_address_attributes
+        ).tap do |params|
+          next unless params[:address_attributes]
+          next if params[:address_attributes].values.any?(&:present?)
+          params.delete(:address_attributes)
+        end
+      end
+
+      def build_address
+        @stock_location.build_address unless @stock_location.address
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Comable
 
       def index
         @q = @stocks.ransack(params[:q])
-        @stocks = @q.result.includes(variant: [:product, :option_values]).page(params[:page]).accessible_by(current_ability)
+        @stocks = @q.result.includes(variant: [:product, :option_values]).page(params[:page]).accessible_by(current_ability).by_newest
       end
 
       def show
@@ -76,7 +76,8 @@ module Comable
           :code,
           :quantity,
           :sku_h_choice_name,
-          :sku_v_choice_name
+          :sku_v_choice_name,
+          :stock_location_id
         )
       end
     end

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

@@ -6,6 +6,7 @@ module Comable
       load_and_authorize_resource class: Comable::Theme.name, find_by: :name
 
       def index
+        @themes = @themes.by_newest
       end
 
       def show

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

@@ -6,7 +6,7 @@ module Comable
       load_and_authorize_resource class: Comable::Tracker.name
 
       def index
-        @trackers = @trackers.page(params[:page])
+        @trackers = @trackers.page(params[:page]).by_newest
       end
 
       def show

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

@@ -9,7 +9,7 @@ module Comable
 
       def index
         @q = Comable::User.ransack(params[:q])
-        @users = @q.result.page(params[:page]).accessible_by(current_ability)
+        @users = @q.result.page(params[:page]).accessible_by(current_ability).by_newest
       end
 
       def show

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

@@ -8,7 +8,7 @@ module Comable
 
       def index
         @q = @variants.ransack(params[:q])
-        @variants = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability)
+        @variants = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability).by_newest
       end
 
       def show
@@ -41,7 +41,7 @@ module Comable
 
       def destroy
         @variant.destroy
-        redirect_to comable.admin_product_variants_path(@product), notice: Comable.t('successful')
+        redirect_to comable.admin_product_path(@product), notice: Comable.t('successful')
       end
 
       private
@@ -50,7 +50,7 @@ module Comable
         params.require(:variant).permit(
           :price,
           :sku,
-          stock_attributes: [:quantity],
+          stocks_attributes: [:id, :quantity, :stock_location_id, :_destroy],
           option_values_attributes: [:id, :name]
         )
       end

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

@@ -31,7 +31,7 @@ module Comable
           new_object = f.object.send("build_#{type}")
           f.send("#{type}_fields", new_object, child_index: "new_#{type}", &render_block)
         else
-          new_object = f.object.send(type).build
+          new_object = Comable.const_get(type.to_s.classify).new
           f.send('fields_for', type, new_object, child_index: "new_#{type}", &render_block)
         end
       end
@@ -46,10 +46,6 @@ module Comable
         false
       end
 
-      def page_name
-        [controller_name, action_name].join(':')
-      end
-
       private
 
       def singular?(string)

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

@@ -5,10 +5,6 @@ module Comable
         Comable::NavigationItem.linkable_params_lists.map { |attr| attr.slice(:name, :type).values }
       end
 
-      def linkable_id_options(navigation_item)
-        navigation_item.linkable_class.try(:linkable_id_options) || [[]]
-      end
-
       # アイテム追加ボタン設置
       def add_fields_button_tag(name, f, association)
         new_object = f.object.send(association).klass.new

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

@@ -1,6 +1,11 @@
 module Comable
   module Admin
     module ProductsHelper
+      # プロパティ追加ボタン設置
+      def add_property_button_tag(name)
+        fields = render 'comable/admin/products/property_fields', property_key: nil, property_value: nil
+        button_tag(name, type: :button, class: 'add_property btn btn-default pull-right', data: { fields: fields.delete("\n") })
+      end
     end
   end
 end

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

@@ -20,7 +20,7 @@ module Comable
       private
 
       def views_dir
-        spec = Gem::Specification.find_by_name('comable-frontend')
+        spec = Gem::Specification.find_by_path('comable/frontend')
         fail 'Please install "comable-frontend" gem!' unless spec
         "#{spec.gem_dir}/app/views"
       end

data/app/navigations/comable/admin/application.rb

@@ -54,6 +54,10 @@ AwesomeAdminLayout.define(only: Comable::Admin::ApplicationController) do |contr
       link comable.admin_stocks_path
     end
 
+    item Comable.t('admin.nav.stock_location') do
+      link comable.admin_stock_locations_path
+    end
+
     item Comable.t('admin.nav.category') do
       link comable.admin_categories_path
     end

data/app/views/comable/admin/navigations/_navigation_item_fields.slim

@@ -1,5 +1,4 @@
-- linkable_class = f.object.linkable_class
-- link_selectable = linkable_class.try(:linkable_exists?)
+- link_selectable = f.object.linkable_exists?
 
 fieldset.navigation-item class="#{'hidden' if f.object._destroy}"
   .row
@@ -16,7 +15,7 @@ fieldset.navigation-item class="#{'hidden' if f.object._destroy}"
       = f.text_field :url
 
     .col-sm-3.linkable_id class="#{'hidden' unless link_selectable}"
-      = f.select :linkable_id, linkable_id_options(f.object)
+      = f.select :linkable_id, f.object.linkable_id_options
 
     .col-sm-3
       = f.hidden_field :_destroy, class: :destroy

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

@@ -19,7 +19,7 @@ section.row
 
       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
+          = link_to comable.ship_admin_order_path(shipment.order, shipment_id: shipment.id), options_of_shipment_badge_for(shipment, state: :completed).merge(method: :post, disabled: !shipment.can_ship?) do
             i.fa.fa-truck
         - else
           = content_tag :div, options_of_shipment_badge_for(shipment, state: :completed) do
@@ -32,7 +32,7 @@ section.row
 
       - 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
+          = link_to comable.cancel_shipment_admin_order_path(shipment.order, shipment_id: shipment.id), options_of_shipment_badge_for(shipment, state: :canceled).merge(method: :post) do
             i.fa.fa-close
 
       - if shipment.state?(:canceled)
@@ -40,5 +40,5 @@ section.row
           = 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
+          = link_to comable.resume_shipment_admin_order_path(shipment.order, shipment_id: shipment.id), options_of_shipment_badge_for(shipment, state: :resumed).merge(method: :post) do
             i.fa.fa-refresh

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

@@ -141,7 +141,7 @@
                         p
                           = ff.text_field :name, placeholder: ff.object.class.human_attribute_name(:name), data: { name: 'name' }
                         p.text-muted
-                          = ff.text_field :code, placeholder: ff.object.class.human_attribute_name(:code), data: { name: 'code' }
+                          = ff.text_field :sku, placeholder: ff.object.class.human_attribute_name(:sku), data: { name: 'sku' }
                       td
                         = ff.text_field :price, placeholder: ff.object.class.human_attribute_name(:price), data: { name: 'price' }
                       td

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

@@ -39,8 +39,8 @@
   .comable-page-body
     - if @order.payment
       = render 'payment_state', payment: @order.payment
-    - if @order.shipment
-      = render 'shipment_state', shipment: @order.shipment
+    - @order.shipments.each do |shipment|
+      = render 'shipment_state', shipment: shipment
 
     section.row
       .col-lg-8

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

@@ -103,8 +103,9 @@
               th
                 = @product.variants.human_attribute_name(:quantity)
             tbody
-              = f.fields_for :variants do |ff|
-                = render 'comable/admin/shared/variants_fields', f: ff
+              - if @product.persisted?
+                = f.fields_for :variants do |ff|
+                  = render 'comable/admin/shared/variants_fields', f: ff
           = link_to_add_fields nil, f, :variants, class: 'hidden js-add-variant'
 
         - if @product.persisted?
@@ -142,6 +143,22 @@
 
     hr
 
+  fieldset
+    .col-md-3
+      legend
+        = Comable.t('admin.nav.products.property')
+      .help-block
+
+    .col-md-9
+      .form-group
+        table.table#properties
+          - @product.properties.each do |property|
+            = render 'comable/admin/products/property_fields', property_key: property['property_key'], property_value: property['property_value']
+        = f.hidden_field :property
+        = add_property_button_tag Comable.t('admin.nav.products.add_property')
+
+  hr
+
   fieldset
     .col-md-3
       legend

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

@@ -0,0 +1,8 @@
+tr.property
+  td
+    = text_field_tag nil, property_key, id: nil, class: :property_key
+  td
+    = text_field_tag nil, property_value, id: nil, class: :property_value
+  td
+    button.btn.btn-default.pull-right.remove_property type="button"
+      = Comable.t('actions.destroy')

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

@@ -0,0 +1,27 @@
+.form-group
+  = f.label :full_name
+  .row
+    .col-sm-6
+      = f.text_field :family_name, placeholder: f.object.class.human_attribute_name(:family_name)
+    .col-sm-6
+      = f.text_field :first_name, placeholder: f.object.class.human_attribute_name(:first_name)
+
+.form-group
+  = f.label :zip_code
+  = f.text_field :zip_code, max_length: 8
+
+.form-group
+  = f.label :state_name
+  = f.text_field :state_name
+
+.form-group
+  = f.label :city
+  = f.text_field :city
+
+.form-group
+  = f.label :detail
+  = f.text_field :detail
+
+.form-group
+  = f.label :phone_number
+  = f.text_field :phone_number, max_length: 18

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

@@ -0,0 +1,15 @@
+.row.comable-stock
+  = f.hidden_field :_destroy, data: { name: 'destroy' }
+
+  .col-md-6
+    .form-group
+      = f.label :quantity
+      = f.text_field :quantity
+
+  .col-md-6
+    .form-group
+      = f.label :stock_location_id
+      = f.collection_select :stock_location_id, [f.object.try(:stock_location)].compact, :id, :name, {}, class: 'select2 ajax', data: { source: comable.admin_stock_locations_path }
+
+      .help-block.text-right
+        = link_to Comable.t('admin.actions.destroy'), 'javascript: void(0)', class: 'js-remove-comable-stock'

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

@@ -20,7 +20,6 @@ fieldset
       = f.label :sku
       = f.text_field :sku
 
-    = f.fields_for :stock, f.object.stock || f.object.build_stock do |ff|
-      .form-group
-        = ff.label :quantity
-        = ff.text_field :quantity
+    = f.fields_for :stocks do |ff|
+      = render 'comable/admin/shared/stocks_fields', f: ff
+    = link_to_add_fields Comable.t('admin.add_stocks'), f, :stocks

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

@@ -0,0 +1,37 @@
+= error_messages_for @stock_location
+
+= form_for [comable, :admin, @stock_location] do |f|
+  .hidden
+    = f.submit
+
+  fieldset
+    .col-md-3
+      legend
+        = Comable.t('admin.general')
+
+    .col-md-9
+      .form-group
+        = f.label :name
+        = f.text_field :name
+
+      .form-group
+        .checkbox
+          = f.label :active do
+            = f.check_box :active
+            = f.object.class.human_attribute_name(:active)
+
+      .form-group
+        .checkbox
+          = f.label :default do
+            = f.check_box :default
+            = f.object.class.human_attribute_name(:default)
+
+  fieldset
+    .col-md-3
+      legend
+        = f.object.class.human_attribute_name(:address)
+      .help-block
+
+    .col-md-9
+      = f.fields_for :address do |ff|
+        = render 'comable/admin/shared/address_form', f: ff

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

@@ -0,0 +1,27 @@
+.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.stock_location'), comable.admin_stock_locations_path
+          li.active
+            = @stock_location.name
+
+  .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_stock_location_path(@stock_location), method: :delete, class: 'btn btn-danger'

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

@@ -0,0 +1,28 @@
+.comable-page
+  .comable-page-heading
+    ul.pull-right.list-inline
+      li
+        = link_to Comable.t('admin.actions.new'), comable.new_admin_stock_location_path, class: 'btn btn-default'
+
+    h1.page-header
+      = Comable.t('admin.nav.stock_location')
+      small<
+        | #{@stock_locations.size} #{Comable.t('admin.results')}
+
+  .comable-page-body
+    - if @stock_locations.empty?
+      = Comable.t('admin.not_found')
+    - else
+      table.table.table-striped
+        thead
+          th
+            = @stock_locations.klass.human_attribute_name(:name)
+        tbody
+          - @stock_locations.each do |stock_location|
+            tr
+              td
+                = link_to stock_location.name, comable.admin_stock_location_path(stock_location)
+                - unless stock_location.active
+                  span.fa.fa-eye-slash.text-muted<
+                - if stock_location.default
+                  span.fa.fa-check.text-primary<

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

@@ -0,0 +1,16 @@
+.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.stock_location'), comable.admin_stock_locations_path
+          li.active
+            = Comable.t('admin.actions.new')
+
+  .comable-page-body
+    = render 'form'

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

@@ -14,21 +14,13 @@
       .help-block
 
     .col-md-9
-      .form-group
-        = f.label :code
-        = f.text_field :code
-
       .form-group
         = f.label :quantity
         = f.text_field :quantity
 
-      - if @stock.sku?
-        - if @stock.sku_h?
-          .form-group
-            = f.label :sku_h_choice_name, @stock.sku_h_item_name
-            = f.text_field :sku_h_choice_name
+      .form-group
+        = f.label :stock_location_id
+        = f.collection_select :stock_location_id, [@stock.stock_location].compact, :id, :name, {}, class: 'select2 ajax', data: { source: comable.admin_stock_locations_path }
 
-        - if @stock.sku_v?
-          .form-group
-            = f.label :sku_v_choice_name, @stock.sku_v_item_name
-            = f.text_field :sku_v_choice_name
+      .help-block.text-right
+        = link_to Comable.t('admin.remove'), 'javascript: void(0)', class: 'remove-fields'

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

@@ -66,16 +66,13 @@
             - @stocks.each do |stock|
               tr
                 td
+                  p
+                    = link_to stock.variant.product.name, comable.admin_product_variant_path(stock.variant.product, stock.variant)
                   - if stock.variant.options.any?
-                    p
-                      = link_to stock.variant.product.name, comable.admin_product_variant_path(stock.variant.product, stock.variant)
                     p
                       - stock.variant.options.each do |option|
                         span.comable-variant-name
                           = option.value
-                  - else
-                    p
-                      = link_to stock.variant.product.name, comable.admin_product_path(stock.variant.product)
                 td
                   = stock.variant.sku
                 td

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

@@ -50,30 +50,4 @@
 
             .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
+                = render 'comable/admin/shared/address_form', f: ff

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

@@ -28,4 +28,4 @@
         .panel-body
           p
             = Comable.t('admin.confirmation_to_remove_product')
-          = link_to Comable.t('admin.actions.destroy'), comable.admin_product_path(@product), method: :delete, class: 'btn btn-danger'
+          = link_to Comable.t('admin.actions.destroy'), comable.admin_product_variant_path(@product, @variant), method: :delete, class: 'btn btn-danger'

data/config/routes.rb

@@ -39,6 +39,7 @@ Comable::Core::Engine.routes.draw do
     end
 
     resources :categories
+    resources :stock_locations
     resources :pages
 
     resources :navigations do

data/lib/comable/backend/engine.rb

@@ -21,8 +21,9 @@ require 'jquery-turbolinks'
 require 'awesome_admin_layout'
 require 'ace-rails-ap'
 
-require 'bootstrap3-datetimepicker-rails'
 require 'momentjs-rails'
+require 'bootstrap3-datetimepicker-rails'
+require 'select2-rails'
 
 module Comable
   module Backend

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable-backend
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta1
+  version: 0.7.0.beta2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-31 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.7.0.beta1
+        version: 0.7.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0.beta1
+        version: 0.7.0.beta2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -460,6 +460,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.14
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Provide backend functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -478,6 +492,7 @@ files:
 - app/assets/javascripts/comable/admin/pages.coffee
 - app/assets/javascripts/comable/admin/products.coffee
 - app/assets/javascripts/comable/admin/search.coffee
+- app/assets/javascripts/comable/admin/stocks.coffee
 - app/assets/javascripts/comable/admin/themes.coffee
 - app/assets/javascripts/comable/admin/variants.coffee
 - app/assets/stylesheets/comable/admin/_common.scss
@@ -508,6 +523,7 @@ files:
 - app/controllers/comable/admin/payment_methods_controller.rb
 - app/controllers/comable/admin/products_controller.rb
 - app/controllers/comable/admin/shipment_methods_controller.rb
+- app/controllers/comable/admin/stock_locations_controller.rb
 - app/controllers/comable/admin/stocks_controller.rb
 - app/controllers/comable/admin/store_controller.rb
 - app/controllers/comable/admin/themes_controller.rb
@@ -548,9 +564,11 @@ files:
 - app/views/comable/admin/payment_methods/index.slim
 - app/views/comable/admin/payment_methods/new.slim
 - app/views/comable/admin/products/_form.slim
+- app/views/comable/admin/products/_property_fields.slim
 - app/views/comable/admin/products/edit.slim
 - app/views/comable/admin/products/index.slim
 - app/views/comable/admin/products/new.slim
+- app/views/comable/admin/shared/_address_form.slim
 - app/views/comable/admin/shared/_advanced_search.slim
 - app/views/comable/admin/shared/_condition_fields.slim
 - app/views/comable/admin/shared/_footer.slim
@@ -559,6 +577,7 @@ files:
 - app/views/comable/admin/shared/_notifier.slim
 - app/views/comable/admin/shared/_option_type_fields.slim
 - app/views/comable/admin/shared/_option_types_fields.slim
+- app/views/comable/admin/shared/_stocks_fields.slim
 - app/views/comable/admin/shared/_value_fields.slim
 - app/views/comable/admin/shared/_variant_form.slim
 - app/views/comable/admin/shared/_variants_fields.slim
@@ -567,6 +586,10 @@ files:
 - app/views/comable/admin/shipment_methods/edit.slim
 - app/views/comable/admin/shipment_methods/index.slim
 - app/views/comable/admin/shipment_methods/new.slim
+- app/views/comable/admin/stock_locations/_form.slim
+- app/views/comable/admin/stock_locations/edit.slim
+- app/views/comable/admin/stock_locations/index.slim
+- app/views/comable/admin/stock_locations/new.slim
 - app/views/comable/admin/stocks/_form.slim
 - app/views/comable/admin/stocks/edit.slim
 - app/views/comable/admin/stocks/index.slim
@@ -623,7 +646,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provide backend functions for Comable.