c80_yax 0.1.0.1 → 0.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f41616e959e6eadcab3ecee39303ac308d57d3
-  data.tar.gz: f74adf0891bfeb16286ca6c356538fa5e3bc8698
+  metadata.gz: 74f206b661d9c2327e4e9f26b94b7d787593230a
+  data.tar.gz: 0b70a2734ea7e66e2ce0fcc72b52bbba1a1dffa7
 SHA512:
-  metadata.gz: ae1f05a7b8ebbc262fe8479f77d3b305bf5bc73d7c1721eb303ef04c25fb9a18a885942bc9c095886ec106ffcb6f8313e2874b64579bb16e9ec086eee4013de2
-  data.tar.gz: 0aeed6d233f00f6c422fde87ee219741e2feb0fdd1227ec44ea1e4976e44d04bb267b4a68c0dd0bb3f5e96207e5ae1505e66fe2dd31afe93bff0c01a6703004e
+  metadata.gz: 8106e294dc7c8a9175cde3c26cbe0fc79d0d0f7a4f95ee4f2141270df3b0a476e201b15f58582026b44aa27ef6f3f00923ef4cbc373fc25dddd90801b9a380aa
+  data.tar.gz: 7fa219ce73051ce3e0431feacbcffb0629d1cf9d45565d88deba6f75ebc88a280aa149b5699bfc41fe9d1dd3dfe33baf7c5c6c311c5a9635ee692675ac0d9a98

data/.ruby-gemset

@@ -0,0 +1 @@
+c80_yax

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.3

data/README.md

@@ -6,36 +6,73 @@ TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application's `Gemfile`:
 
 ```ruby
 gem 'c80_yax'
 ```
 
+Add dependencies to app's `Gemfile`:
+
+```ruby
+gem 'rails', '4.2.0'
+gem 'mysql2', '~> 0.3.18'
+
+gem 'execjs'
+gem 'therubyracer'
+
+gem 'activeadmin'
+gem 'devise'
+gem 'cancan' # or cancancan
+gem 'draper'
+gem 'pundit'
+
+gem 'font-awesome-rails'
+gem 'friendly_id'
+gem 'babosa'
+
+gem 'bootstrap-select-rails'
+gem 'c80_md'
+gem 'c80_yax'
+
+```
+
 And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Add to app's `active_admin.js.coffee`:
 
-    $ gem install c80_yax
-
-## Usage
+```coffee
+#= require bootstrap
+#= require bootstrap-select
+#= require c80_yax
+```
 
-TODO: Write usage instructions here
+Add to app's `active_admin.scss`:
 
-## Development
+```scss
+@import "font-awesome";
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "bootstrap-select";
+@import "mat_design";
+@import "c80_yax_backend";
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Add to app's `application_controller.rb`:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+helper C80Yax::Engine.helpers
+```
 
-## Contributing
+Add to app's `routes.rb`:
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/c80_yax. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+```ruby
+    mount C80Yax::Engine => '/'
+```
 
+## Usage
 
-## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 

data/app/admin/c80_yax/cats.rb

@@ -0,0 +1,47 @@
+# ПОДкатегории строительных материалов
+ActiveAdmin.register C80Yax::Cat, as: 'Cat' do
+
+  menu :label => proc{ I18n.t('c80_yax.active_admin.menu.cat')},
+       :parent => 'x_c80_yax',
+       :priority => 1
+
+  permit_params :title,
+                :slug,
+                :ord,
+                :strsubcat_ids => []
+
+  config.batch_actions = false
+  config.sort_order = 'id_asc'
+  before_filter :skip_sidebar!, :only => :index
+
+  index do
+    id_column
+    column :ord
+    column :title
+
+    column :strsubcats do |cat|
+      res = '-'
+      if cat.strsubcats.count > 0
+        res = ''
+        cat.strsubcats.map do |strsubcat|
+          res += "• #{strsubcat.title}<br>"
+        end
+      end
+      res.html_safe
+    end
+
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+
+    f.inputs 'Свойства категории' do
+      f.input :title
+      f.input :ord
+      f.input :strsubcats, :as => :check_boxes
+    end
+
+    f.actions
+  end
+
+end

data/app/admin/c80_yax/items.rb

@@ -1,9 +1,9 @@
 # категории строительных материалов
 ActiveAdmin.register C80Yax::Item, as: 'Item' do
 
-  menu :label => proc { I18n.t('c80_yax.active_admin.menu.item') },
+  menu :label => proc {I18n.t('c80_yax.active_admin.menu.item')},
        :parent => 'x_c80_yax',
-       :priority => 2
+       :priority => 3
 
 
   permit_params :title,
@@ -17,16 +17,16 @@ ActiveAdmin.register C80Yax::Item, as: 'Item' do
                 :is_available,
                 :strsubcat_id,
                 :iphotos_attributes => [:id, :image, :_destroy],
-                :item_props_attributes => [:value, :_destroy, :prop_name_id, :id]#,
-  # :vendor_ids => [],
+                :item_props_attributes => [:value, :_destroy, :prop_name_id, :id],
+                :vendor_ids => []
   # :gallery_ids => [],
   # :related_child_ids => []
 
   config.sort_order = 'id_asc'
 
-  # controller do
-  #   cache_sweeper :item_sweeper, :only => [:update,:create,:destroy]
-  # end
+  controller do
+    C80Yax::Item.add_observer(C80Yax::ItemObserver.instance)
+  end
 
   # action_item :dublcate_item, :only => :edit do
   #     link_to 'Клонировать', '', class:'dublicate_item'#, method: :post # эта ссылка обработается ajax-ом
@@ -35,43 +35,36 @@ ActiveAdmin.register C80Yax::Item, as: 'Item' do
   index do
     selectable_column
     id_column
-    
+
     column :iphotos do |item|
-      r = ''
-      if item.iphotos.count > 0
-        r = link_to image_tag(item.iphotos.first.image.thumb_md,
-                              style: 'width:150px'),
-                    item.iphotos.first.image.url,
-                    target: '_blank'
-        r = "#{r}<br>Всего фотографий: #{item.iphotos.count}".html_safe
-      end
-      r
+      item_photos_short(item)
     end
-    
+
     column :title
+    column :strsubcat
     column :is_hit
     column :is_sale
     column :is_main
     # column :is_ask_price
 
-    # column 'Бренд' do |itm|
-    #   str = '-'
-    #   if itm.vendors.count > 0
-    #     str = itm.vendors.first.title
-    #   end
-    #   str
-    # end
+    column :vendors do |itm|
+      print_vendor(itm)
+    end
 
     actions
   end
 
+  index as: :grid do |product|
+    product
+  end
+
   form(:html => {:multipart => true}) do |f|
 
     f.inputs 'Свойства' do
       f.input :title
       f.input :strsubcat,
               :as => :select,
-              :collection => C80Yax::Strsubcat.all.map { |s| [s.title, s.id] },
+              :collection => C80Yax::Strsubcat.all.map {|s| [s.title, s.id]},
               :input_html => {
                   :title => '',
                   :class => 'selectpicker',
@@ -95,13 +88,22 @@ ActiveAdmin.register C80Yax::Item, as: 'Item' do
       # https://github.com/justinfrench/formtastic
       f.has_many :iphotos, :allow_destroy => true do |iph|
         iph.input :image,
-                 :as => :file,
-                 :hint => image_tag(iph.object.image.thumb_md)
+                  :as => :file,
+                  :hint => image_tag(iph.object.image.thumb_md)
       end
 
       f.input :full_desc, :as => :ckeditor, :input_html => {:style => 'height:500px', rows: 20}
-      # f.input :vendors, :as => :select, :input_html => {:multiple => false}, :include_blank => true
-
+      f.input :vendors,
+              :as => :select,
+              :input_html => {
+                  :title => '',
+                  :class => 'selectpicker',
+                  :data => {
+                      :size => 10
+                  },
+                  :multiple => false
+              },
+              :include_blank => true
 
     end
 
@@ -125,4 +127,8 @@ ActiveAdmin.register C80Yax::Item, as: 'Item' do
     f.actions
   end
 
+  show do
+    render_show_item(item)
+  end
+
 end

data/app/admin/c80_yax/lib/custom_columns.rb

@@ -0,0 +1,37 @@
+module ActiveAdmin
+  module Views
+    class IndexAsTable < ActiveAdmin::Component
+      def editable_text_column resource, attr
+        val = resource.send(attr)
+        val = "&nbsp;" if val.blank?
+
+        slug = ''
+        begin
+          slug = resource.slug
+        rescue => e
+          slug = resource.id
+        end
+
+        html = %{
+                  <div  id='editable_text_column_#{resource.id}'
+                        class='editable_text_column'
+                        onclick='admin.editable_text_column_do(this)' >
+                        #{val}
+                   </div>
+
+                   <input
+
+                      data-path='#{resource.class.name.tableize}'
+                      data-attr='#{attr}'
+                      data-resource-id='#{resource.id}'
+                      data-resource-slug='#{slug}'
+                      class='editable_text_column admin-editable'
+                      id='editable_text_column_#{resource.id}'
+
+                      style='display:none;' />
+              }
+        html.html_safe
+      end
+    end
+  end
+end

data/app/admin/c80_yax/prop_names.rb

@@ -11,12 +11,16 @@ ActiveAdmin.register C80Yax::PropName, as: 'PropName' do
                 :is_normal_price,
                 :related_id
 
-  config.sort_order = 'title_asc'
+  config.sort_order = 'id_asc'
+  # config.clear_action_items!
+  config.batch_actions = false
 
-  filter :title
-  filter :strsubcats
-  filter :is_excluded_from_filtering
-  filter :is_normal_price
+  # filter :title
+  # filter :strsubcats
+  # filter :is_excluded_from_filtering
+  # filter :is_normal_price
+
+  before_filter :skip_sidebar!, :only => :index
 
   # controller do
   #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]
@@ -30,10 +34,10 @@ ActiveAdmin.register C80Yax::PropName, as: 'PropName' do
     column :uom
     column :is_excluded_from_filtering
     column :is_normal_price
-    column :related do |p|
-      if !p.related.blank?
-        r = C80Yax::PropName.find(p.related)
-        r.title
+    column :related do |pn|
+      if pn.related_id.present?
+        rpn = C80Yax::PropName.find(pn.related_id)
+        rpn.title
       end
     end
 

data/app/admin/c80_yax/strsubcats.rb

@@ -3,16 +3,18 @@ ActiveAdmin.register C80Yax::Strsubcat, as: 'Strsubcat' do
 
   menu :label => proc{ I18n.t('c80_yax.active_admin.menu.strsubcat')},
        :parent => 'x_c80_yax',
-       :priority => 1
+       :priority => 2
 
   permit_params :title,
                 :slug,
                 :ord,
                 :parent_id,
-                :prop_name_ids => []#,
-                # :main_props_attributes => [:id, :_destroy, :prop_name_ids => []],
-                # :common_props_attributes => [:id, :_destroy, :prop_name_ids => []],
-                # :price_props_attributes => [:id, :_destroy, :prop_name_ids => []]
+                :cat_ids => [],
+                :prop_name_ids => [],
+                :main_props_attributes => [:id, :_destroy, :prop_name_ids => []],
+                :common_props_attributes => [:id, :_destroy, :prop_name_ids => []],
+                :price_props_attributes => [:id, :_destroy, :prop_name_ids => []],
+                :prefix_props_attributes => [:id, :_destroy, :prop_name_ids => []]
 
   config.sort_order = 'id_asc'
 
@@ -35,37 +37,24 @@ ActiveAdmin.register C80Yax::Strsubcat, as: 'Strsubcat' do
   #            }
   #        }
 
-  # controller do
-  #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]
-  # end
+  controller do
+    C80Yax::Strsubcat.add_observer(C80Yax::StrsubcatObserver.instance)
+  end
 
   index do
     selectable_column
     id_column
-    column :ord do |str_sub_cat|
-      editable_text_column str_sub_cat, :ord
-    end
+    column :ord
     column :title
     # column :parent
 
-    column :prop_names do |strsubcat|
-      res = '-'
-      if strsubcat.prop_names.count > 0
-        res = ''
-        strsubcat.prop_names.map do |prop_name|
-          res += "• #{prop_name.title}<br>"
-        end
-      end
-      res.html_safe
+    column :cats do |str_sub_cat|
+      cat_admin_title(str_sub_cat)
     end
 
-    # column :strcats do |str_sub_cat|
-    #   str = '-'
-    #   if str_sub_cat.strcats.count > 0
-    #     str = str_sub_cat.strcats.first.title
-    #   end
-    #   str
-    # end
+    column :prop_names do |strsubcat|
+      all_props_list(strsubcat)
+    end
 
     actions
   end
@@ -75,9 +64,8 @@ ActiveAdmin.register C80Yax::Strsubcat, as: 'Strsubcat' do
     f.inputs 'Свойства подкатегории' do
       f.input :title
       f.input :ord
-      f.input :parent,
+      f.input :cats,
               :as => :select,
-              :collection => C80Yax::Strsubcat.where.not(id:f.object.id).map { |s| ["#{s.title}", s.id]},
               :input_html => {
                   :class => 'selectpicker',
                   :title => ' ',
@@ -88,41 +76,110 @@ ActiveAdmin.register C80Yax::Strsubcat, as: 'Strsubcat' do
                   :multiple => false
               },
               :include_blank => true
+
+      # f.input :parent,
+      #         :as => :select,
+      #         :collection => C80Yax::Strsubcat.where.not(id:f.object.id).map { |s| ["#{s.title}", s.id]},
+      #         :input_html => {
+      #             :class => 'selectpicker',
+      #             :title => ' ',
+      #             :data => {
+      #                 :size => '10',
+      #                 :width => '400px'
+      #             },
+      #             :multiple => false
+      #         },
+      #         :include_blank => true
+      #
+
     end
 
-    f.inputs 'Характеристики, которыми описываются товары из этой подкатегории', :class => 'collapsed' do
+    f.inputs I18n.t('c80_yax.active_admin.pages.strsubcat.label_all_props'), :class => 'collapsed' do
       f.input :prop_names, :as => :check_boxes
     end
 
-    # f.inputs "Характеристки, которые выводятся на странице просмотра товара справа от картинки (<a class='poiasn' href='#{image_url('samples/2015_11_22_item_main_props.jpg')}' target='_blank'>например</a>)", :class => 'collapsed-bug fieldset_main_props' do
-    #   f.has_many :main_props, allow_destroy: true do |main_prop|
-    #     main_prop.input :prop_names,
-    #                     :as => :select,
-    #                     :input_html => {:multiple => false},
-    #                     :collection => PropName.includes(:strsubcats).where(:strsubcats => {:id => f.object.id})
-    #
-    #   end
-    # end
-
-    # f.inputs "Ценовые характеристики, которые выводятся на странице просмотра товара под картинкой (<a class='poiasn' href='#{image_url('samples/2015_11_22_item_price_props.jpg')}' target='_blank'>пример 1</a>, <a class='poiasn' href='#{image_url('samples/2015_11_22_item_price_props_list.jpg')}' target='_blank'>пример 2</a>)".html_safe, :class => 'collapsed-bug fieldset_price_props' do
-    #   f.has_many :price_props, allow_destroy: true do |price_prop|
-    #     price_prop.input :prop_names,
-    #                     :as => :select,
-    #                     :input_html => {:multiple => false},
-    #                     :collection => PropName.includes(:strsubcats).where(:strsubcats => {:id => f.object.id}).where(:prop_names => {:is_normal_price => 1})
-    #   end
-    # end
-
-    # f.inputs "Характеристки, которые выводятся на странице просмотра товара в блоке 'дополнительные характеристики' (<a class='poiasn' href='#{image_url('samples/2015_11_22_item_common_props.jpg')}' target='_blank'>например</a>)", :class => 'collapsed-bug fieldset_common_props' do
-    #   f.has_many :common_props, allow_destroy: true do |common_prop|
-    #     common_prop.input :prop_names,
-    #                      :as => :select,
-    #                      :input_html => {:multiple => false},
-    #                      :collection => PropName.includes(:strsubcats).where(:strsubcats => {:id => f.object.id})
-    #   end
-    # end
+    f.inputs I18n.t('c80_yax.active_admin.pages.strsubcat.label_main_props',
+                    img: image_url('samples/2017_06_20_item_main_props.jpg')).html_safe,
+             :class => 'collapsed fieldset_main_props' do
+      f.has_many :main_props, allow_destroy: true do |main_prop|
+        main_prop.input :prop_names,
+                        :as => :select,
+                        :input_html => {
+                            :class => 'selectpicker',
+                            :title => ' ',
+                            :data => {
+                                :size => '10',
+                                :width => '400px'
+                            },
+                            :multiple => false
+                        },
+                        :collection => f.object.main_props_collection
+
+      end
+    end
+
+    f.inputs I18n.t('c80_yax.active_admin.pages.strsubcat.label_price_props',
+                    img: image_url('samples/2017_06_20_item_price_props.jpg')).html_safe,
+             :class => 'collapsed fieldset_price_props' do
+      f.has_many :price_props, allow_destroy: true do |price_prop|
+        price_prop.input :prop_names,
+                        :as => :select,
+                         :input_html => {
+                             :class => 'selectpicker',
+                             :title => ' ',
+                             :data => {
+                                 :size => '10',
+                                 :width => '400px'
+                             },
+                             :multiple => false
+                         },
+                        :collection => f.object.price_props_collection
+      end
+    end
+
+    f.inputs I18n.t('c80_yax.active_admin.pages.strsubcat.label_common_props',
+                    img: image_url('samples/2017_06_20_item_common_props.jpg')).html_safe,
+             :class => 'collapsed fieldset_common_props' do
+      f.has_many :common_props, allow_destroy: true do |common_prop|
+        common_prop.input :prop_names,
+                         :as => :select,
+                          :input_html => {
+                              :class => 'selectpicker',
+                              :title => ' ',
+                              :data => {
+                                  :size => '10',
+                                  :width => '400px'
+                              },
+                              :multiple => false
+                          },
+                         :collection => f.object.common_props_collection
+      end
+    end
+
+    f.inputs I18n.t('c80_yax.active_admin.pages.strsubcat.label_prefix_props',
+                    img: image_url('samples/2017-06-21_item_prefix_props.jpg')),
+             :class => 'collapsed fieldset_common_props' do
+      f.has_many :prefix_props, allow_destroy: true do |prefix_prop|
+        prefix_prop.input :prop_names,
+                          :as => :select,
+                          :input_html => {
+                              :class => 'selectpicker',
+                              :title => ' ',
+                              :data => {
+                                  :size => '10',
+                                  :width => '400px'
+                              },
+                              :multiple => false
+                          },
+                          :collection => f.object.prefix_props_collection
+      end
+    end
 
     f.actions
   end
 
+  show do
+    render 'view', { s: strsubcat }
+  end
+
 end

data/app/admin/c80_yax/vendors.rb

@@ -0,0 +1,39 @@
+ActiveAdmin.register C80Yax::Vendor, as: 'Vendor' do
+
+  menu :label => 'Производители',
+       :parent => 'x_c80_yax',
+       :priority => 0
+
+  permit_params :title,
+                :short,
+                :content,
+                :as_is
+
+  # controller do
+  #   cache_sweeper :vendor_sweeper, :only => [:update,:destroy]
+  # end
+
+  index do
+    selectable_column
+    # id_column
+
+    column :title
+    column :short
+
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+
+    f.inputs 'Свойства' do
+
+      f.input :title
+      f.input :as_is
+      f.input :short, :input_html => {:style => 'height:80px', :maxlength => 250}
+      f.input :content, :as => :ckeditor
+
+    end
+    f.actions
+  end
+
+end

data/app/assets/javascripts/backend/items.js

@@ -409,7 +409,7 @@ var fEdit = function () {
     fLoadingShow();
 };
 
-YOUR_APP.items = {
+C80_YAX.items = {
     edit: fEdit,
     "new": jsinit.go//,
     //create: jsinit.go

data/app/assets/javascripts/backend/strsubcats.js

@@ -0,0 +1,26 @@
+"use strict";
+
+// при клике по habtm кнопке "добавить",
+// на всякий случай,
+// инициализируем в появившемся на экране блоке
+// возможный bootstrap select picker
+var init_select_picker = function (){
+    $('.has_many_add').on('click', function (){
+        setTimeout(function() {
+            $('.selectpicker').selectpicker();
+        }, 40);
+    });
+};
+
+var f_edit = function (){
+    init_select_picker();
+};
+
+var f_new = function (){
+    init_select_picker();
+};
+
+C80_YAX.strsubcats = {
+    edit: f_edit,
+    "new": f_new
+};

data/app/assets/javascripts/c80_yax.js.coffee

@@ -1,6 +1,8 @@
 
+#= require lib_backend/init
 #= require lib_backend/collapsable-groups
 #= require lib_backend/jalert
+#= require lib_backend/loading
+#= require lib_backend/custom_columns
 
-# require ./backend/init # это должно быть включено в host app
 #= require_tree ./backend