comable_backend 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e94beb188851f0e46828bfd1646cae7bb4e05f6
-  data.tar.gz: a2d0d7d82a72830d474ad05002d6b2a4ee534929
+  metadata.gz: e0d5ce48da7e6b0b8a887a746cad4a75e4c31916
+  data.tar.gz: b22f25a4c7cbcdb0182651740c1736fcbb8aae04
 SHA512:
-  metadata.gz: a5be16acf1bca4ee13335261547b9b6ca8c3272f1061b5014f8969d24979882bed37b5dfd2f63844a01c61839d172cae6c5fc261b45ea1b81857636270815fc6
-  data.tar.gz: 4c6436f0ff47e42d5eb9ae467aef140a7e88166f0777a2c43e379b772c60c902dc61e252fd88ee3a76afa5e30cc13fbb1ee62f3d75fc24836f05a4348cd680b5
+  metadata.gz: 3da03ea18f27b7badb7c125d694f2ee471573f8a527edcb799618b88e3339ea65ef540f143dfccb452acae19a13476317ca2c563bcc80416aac0db0be12676f8
+  data.tar.gz: 24b68b045eb0abcc5ce41fafccb7d7cdfbeea15a7b9031e9812762e4e3410fe98f5403fe93a793739293863578f707939453eb499ae576df2b03d3f120a92d64

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

@@ -93,3 +93,26 @@ $( ->
 
   $('[data-toggle="tooltip"]').tooltip()
 )
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
+class @Search
+  constructor: (@templates = {}) ->
+
+  remove_fields: (button) ->
+    $(button).closest('.fields').remove()
+
+  add_fields: (button, type, content) ->
+    new_id = new Date().getTime()
+    regexp = new RegExp('new_' + type, 'g')
+    $(button).before(content.replace(regexp, new_id))
+
+  nest_fields: (button, type) ->
+    new_id = new Date().getTime()
+    id_regexp = new RegExp('new_' + type, 'g')
+    template = @templates[type]
+    object_name = $(button).closest('.fields').attr('data-object-name')
+    sanitized_object_name = object_name.replace(/\]\[|[^-a-zA-Z0-9:.]/g, '_').replace(/_$/, '')
+    template = template.replace(/new_object_name\[/g, object_name + "[")
+    template = template.replace(/new_object_name_/, sanitized_object_name + '_')
+    $(button).before(template.replace(id_regexp, new_id))

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

@@ -262,3 +262,31 @@ footer {
     padding-top: 89px + 20px;
   }
 }
+
+
+#comable-advanced-search {
+  margin-top: 10px;
+
+  fieldset > fieldset {
+    margin-bottom: 10px;
+  }
+
+  button.comable-remove-button {
+    @include appearance(none);
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+    height: $input-height-base;
+    outline: none;
+  }
+
+  .comable-remove-button {
+    @include text-shadow(0 1px 0 #fff);
+    @include opacity(0.2);
+    font-size: 16px;
+    font-weight: bold;
+    line-height: 1;
+    color: #000;
+  }
+}

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

@@ -1,4 +1,3 @@
 @import 'comable/admin/overrides/bootstrap';
 @import 'comable/admin/overrides/jstree';
 @import 'comable/admin/overrides/tagit';
-@import 'comable/admin/overrides/pace';

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

@@ -39,6 +39,3 @@ $navbar-default-toggle-hover-bg: $navbar-default-link-hover-bg;
 
 // $panel-default-heading-bg: $comable-sidebar-bg;
 // $panel-default-border: $comable-sidebar-border;
-
-// pace
-$comable-pace: #fff;

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

@@ -7,8 +7,7 @@
 @import 'font-awesome';
 @import 'jquery-ui';
 @import 'morris';
-// TODO: https://github.com/yovu/pace-rails/issues/5
-// @import 'pace/pace-theme-minimal';
+@import 'pace/white/pace-theme-minimal';
 @import 'gritter';
 
 @import 'comable/admin/mixins';

data/app/assets/stylesheets/comable/admin/overrides/bootstrap.scss

@@ -81,3 +81,7 @@ legend {
 table > tbody > tr > td > ul {
   margin-bottom: 0;
 }
+
+.btn-link {
+  outline: none !important;
+}

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.includes(:stocks, :images).page(params[:page]).accessible_by(current_ability)
+        @products = @q.result(distinct: true).includes(:stocks, :images).page(params[:page]).accessible_by(current_ability)
       end
 
       def show

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

@@ -13,10 +13,41 @@ module Comable
       def link_to_add_fields(name, f, association, options = {})
         new_object = f.object.class.reflect_on_association(association).klass.new
         fields = f.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
-          render("#{association.to_s.singularize}_fields", ff: builder)
+          render("comable/admin/shared/#{association.to_s.singularize}_fields", ff: builder)
         end
         link_to(name, 'javascript:void(0)', options.merge(onclick: "add_fields(this, '#{association}', '#{escape_javascript(fields)}')"))
       end
+
+      def setup_search_form
+        render('comable/admin/shared/setup_search_form')
+      end
+
+      def button_to_remove_fields(name, options = {})
+        content_tag(:button, name, options.merge(class: "ransack remove_fields #{options[:class]}"))
+      end
+
+      def button_to_add_fields(name, f, type, options = {})
+        new_fields = build_fields(f, type)
+        content_tag(:button, name, options.merge(class: "ransack add_fields #{options[:class]}", 'data-field-type' => type, 'data-content' => "#{new_fields}"))
+      end
+
+      def build_fields(f, type)
+        new_object = f.object.send("build_#{type}")
+
+        f.send("#{type}_fields", new_object, child_index: "new_#{type}") do |builder|
+          render("comable/admin/shared/#{type}_fields", f: builder)
+        end
+      end
+
+      def enable_advanced_search?
+        grouping_params = params[:q][:g]
+        conditions_params = grouping_params.values.first[:c]
+        value_params = conditions_params.values.first[:v]
+
+        value_params.values.first[:value].present?
+      rescue NoMethodError
+        false
+      end
     end
   end
 end

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

@@ -13,8 +13,7 @@
     h1.page-header
       = Comable.t('admin.nav.customer')
       small<
-        = @customers.total_count
-        = Comable.t('admin.results')
+        | #{@customers.total_count} #{Comable.t('admin.results')}
 
   .comable-page-body
     .comable-search
@@ -25,12 +24,16 @@
               i.fa.fa-search
               span.caret<
             ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.advanced_search'), 'javascript:void(0)', 'data-toggle' => 'collapse', 'data-target' => '#comable-advanced-search'
               li
                 = link_to Comable.t('admin.clear_search_conditions'), comable.admin_customers_path
           = f.text_field :email_cont, class: 'form-control'
           span.input-group-btn
             = f.submit Comable.t('admin.search'), class: 'btn btn-default'
 
+        = render 'comable/admin/shared/advanced_search', f: f
+
     section
       - if @customers.empty?
         = Comable.t('admin.not_found')
@@ -62,8 +65,7 @@
                     span> = customer.bill_address.city
                     span> = customer.bill_address.detail
                 td
-                  = customer.orders.count
-                  = Comable.t('admin.times')
+                  | #{customer.orders.count} #{Comable.t('admin.times')}
 
         .text-center
           = paginate @customers, theme: :comable_backend

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

@@ -13,8 +13,7 @@
     h1.page-header
       = Comable.t('admin.nav.order')
       small<
-        = @orders.total_count
-        = Comable.t('admin.results')
+        | #{@orders.total_count} #{Comable.t('admin.results')}
 
   .comable-page-body
     .comable-search
@@ -25,6 +24,8 @@
               i.fa.fa-search
               span.caret<
             ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.advanced_search'), 'javascript:void(0)', 'data-toggle' => 'collapse', 'data-target' => '#comable-advanced-search'
               li
                 = link_to Comable.t('admin.clear_search_conditions'), comable.admin_orders_path
           = f.text_field :code_cont, class: 'form-control'
@@ -34,6 +35,8 @@
           = f.label :customer_id
           = f.text_field :customer_id_eq
 
+        = render 'comable/admin/shared/advanced_search', f: f
+
     section
       - if @orders.empty?
         = Comable.t('admin.not_found')

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

@@ -7,8 +7,7 @@
     h1.page-header
       = Comable.t('admin.nav.payment_method')
       small<
-        = @payment_methods.total_count
-        = Comable.t('admin.results')
+        | #{@payment_methods.total_count} #{Comable.t('admin.results')}
 
   .comable-page-body
     - if @payment_methods.empty?

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

@@ -147,7 +147,7 @@
           .row
             - sub_images.each.with_index(1) do |image, index|
               = f.fields_for :images, image do |ff|
-                = render 'image_fields', ff: ff, index: index
+                = render 'comable/admin/shared/image_fields', ff: ff, index: index
 
             .col-sm-6
               = link_to_add_fields Comable.t('admin.add_sub_image'), f, :images

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

@@ -16,8 +16,7 @@
     h1.page-header
       = Comable.t('admin.nav.product')
       small<
-        = @products.total_count
-        = Comable.t('admin.results')
+        | #{@products.total_count} #{Comable.t('admin.results')}
 
   .comable-page-body
     .comable-search
@@ -28,12 +27,16 @@
               i.fa.fa-search
               span.caret<
             ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.advanced_search'), 'javascript:void(0)', 'data-toggle' => 'collapse', 'data-target' => '#comable-advanced-search'
               li
                 = link_to Comable.t('admin.clear_search_conditions'), comable.admin_products_path
-          = f.text_field :code_or_name_cont, class: 'form-control'
+          = f.text_field :code_or_name_cont_any_splitted, class: 'form-control'
           span.input-group-btn
             = f.submit Comable.t('admin.search'), class: 'btn btn-default'
 
+        = render 'comable/admin/shared/advanced_search', f: f
+
     section
       - if @products.empty?
         = Comable.t('admin.not_found')
@@ -48,7 +51,7 @@
             th
               = sort_link [:comable, @q], :price
             th
-              = sort_link [:comable, @q], :stocks_quantity
+              = Comable.t('admin.stocks')
           tbody
             - @products.each do |product|
               - quantity = product.stocks.to_a.sum(&:quantity)
@@ -63,8 +66,14 @@
                 td
                   = number_to_currency product.price
                 td
-                  strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
-                    = number_with_delimiter product.stocks.to_a.sum(&:quantity)
+                  ul.list-unstyled
+                    - product.stocks.each do |stock|
+                      li
+                        strong class="#{(quantity <= 0) ? 'text-danger' : (quantity <= 10) ? 'text-warning' : 'text-success'}"
+                          = number_with_delimiter stock.quantity
+                        - if stock.sku?
+                          span<
+                            | (#{stock.sku_name})
 
         .text-center
           = paginate @products, theme: :comable_backend

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

@@ -0,0 +1,8 @@
+fieldset
+  .collapse#comable-advanced-search class="#{'in' if enable_advanced_search? }"
+    .well
+      = setup_search_form
+      = f.grouping_fields do |g|
+        = render 'comable/admin/shared/grouping_fields', f: g
+      - unless enable_advanced_search?
+        = build_fields f, :grouping

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

@@ -0,0 +1,15 @@
+= content_tag :fieldset, { class: 'fields condition', 'data-object-name' => f.object_name } do
+  .row
+    .col-sm-2
+      = f.attribute_fields do |a|
+        - klass = f.object.context.object
+        - options = {}
+        - options = klass.ransack_options[:attribute_select] if klass.respond_to? :ransack_options
+        = content_tag(:span, a.attribute_select(options), { class: 'fields', 'data-object-name' => a.object_name }, false)
+    .col-sm-2
+      = f.predicate_select only: %i(gteq lteq eq_any_splitted cont_any_splitted), compounds: false
+    .col-sm-7
+      = f.value_fields do |v|
+        = render 'comable/admin/shared/value_fields', f: v
+    .col-sm-1.text-center
+      = button_to_remove_fields Comable.t('admin.remove_search_condition'), class: 'comable-remove-button'

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

@@ -0,0 +1,8 @@
+= content_tag :fieldset, { class: 'fields', 'data-object-name' => f.object_name } do
+  = f.condition_fields do |c|
+    = render 'comable/admin/shared/condition_fields', f: c
+
+  - if f.object.conditions.empty?
+    = build_fields f, :condition
+
+  = button_to_add_fields Comable.t('admin.add_search_condition'), f, :condition, class: 'btn btn-link'

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

@@ -0,0 +1,14 @@
+coffee:
+  jQuery(document).ready(->
+    search = new Search()
+
+    $(document).on('click', '.ransack.add_fields', ->
+      search.add_fields(this, $(this).data('fieldType'), $(this).data('content'))
+      false
+    );
+
+    $(document).on('click', '.ransack.remove_fields', ->
+      search.remove_fields(this);
+      return false;
+    )
+  )

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

@@ -0,0 +1 @@
+= content_tag(:span, f.text_field(:value), { class: 'fields value', 'data-object-name' => f.object_name }, false)

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

@@ -7,8 +7,7 @@
     h1.page-header
       = Comable.t('admin.nav.shipment_method')
       small<
-        = @shipment_methods.total_count
-        = Comable.t('admin.results')
+        | #{@shipment_methods.total_count} #{Comable.t('admin.results')}
 
   .comable-page-body
     - if @shipment_methods.empty?

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

@@ -13,8 +13,7 @@
     h1.page-header
       = Comable.t('admin.nav.stock')
       small<
-        = @stocks.total_count
-        = Comable.t('admin.results')
+        | #{@stocks.total_count} #{Comable.t('admin.results')}
 
   .comable-page-body
     .comable-search
@@ -25,12 +24,16 @@
               i.fa.fa-search
               span.caret<
             ul.dropdown-menu role="menu"
+              li
+                = link_to Comable.t('admin.advanced_search'), 'javascript:void(0)', 'data-toggle' => 'collapse', 'data-target' => '#comable-advanced-search'
               li
                 = link_to Comable.t('admin.clear_search_conditions'), comable.admin_stocks_path
           = f.text_field :code_cont, class: 'form-control'
           span.input-group-btn
             = f.submit Comable.t('admin.search'), class: 'btn btn-default'
 
+        = render 'comable/admin/shared/advanced_search', f: f
+
     section
       - if @stocks.empty?
         = Comable.t('admin.not_found')

data/lib/comable/backend/engine.rb

@@ -30,6 +30,31 @@ module Comable
         g.test_framework :rspec, fixture: true
         g.fixture_replacement :factory_girl, dir: 'spec/factories'
       end
+
+      initializer 'comable.ransack.configure' do
+        Ransack.configure do |config|
+          config.add_predicate(
+            'eq_any_splitted',
+            arel_predicate: 'eq_any',
+            formatter: proc { |v| v.split(' ') },
+            validator: proc { |v| v.present? },
+            compounds: false,
+            type: :string
+          )
+
+          config.add_predicate(
+            'cont_any_splitted',
+            arel_predicate: 'matches_any',
+            formatter: proc { |v| v.split(' ').map { |s| "%#{s}%" } },
+            validator: proc { |v| v.present? },
+            compounds: false,
+            type: :string
+          )
+        end
+      end
+
+      # Add support Rails 4.1.x, 4.2.x for gritter
+      config.assets.precompile += %w( error.png gritter-close.png gritter.png ie-spacer.gif notice.png progress.gif success.png warning.png ) if Rails::VERSION::MAJOR == 4
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_backend
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-07 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.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -258,14 +258,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: gritter
   requirement: !ruby/object:Gem::Requirement
@@ -303,7 +303,6 @@ files:
 - app/assets/stylesheets/comable/admin/application.scss
 - app/assets/stylesheets/comable/admin/overrides/bootstrap.scss
 - app/assets/stylesheets/comable/admin/overrides/jstree.scss
-- app/assets/stylesheets/comable/admin/overrides/pace.scss
 - app/assets/stylesheets/comable/admin/overrides/tagit.scss
 - app/controllers/comable/admin/application_controller.rb
 - app/controllers/comable/admin/categories_controller.rb
@@ -334,14 +333,19 @@ 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/_image_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/_advanced_search.slim
+- app/views/comable/admin/shared/_condition_fields.slim
 - app/views/comable/admin/shared/_footer.slim
+- app/views/comable/admin/shared/_grouping_fields.slim
 - app/views/comable/admin/shared/_header.slim
+- app/views/comable/admin/shared/_image_fields.slim
 - app/views/comable/admin/shared/_notifier.slim
+- 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/shipment_methods/_form.slim
 - app/views/comable/admin/shipment_methods/edit.slim
 - app/views/comable/admin/shipment_methods/index.slim

data/app/assets/stylesheets/comable/admin/overrides/pace.scss

@@ -1,4 +0,0 @@
-.pace .pace-progress {
-  @include transition-property(none);
-  background-color: $comable-pace !important;
-}