subj_models 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e793645f8990aed3b68c7f6975dc240ac7f26a26
-  data.tar.gz: 13a3a0aeb8d2152232ab075b5c5b6413a23319b9
+  metadata.gz: 84241f6129048ebc4734a5b85a99d1ca8dbf02d0
+  data.tar.gz: f626cdcd3b1d2b5b06f617733b6c4ff97c884d5a
 SHA512:
-  metadata.gz: faf041f77a447d3024200925fdc8fa077fb4f56e3f1616ff50a800108fa0c14405b991f6eda8f794c85272b4767ad1ed4f6ce67e780dc224416d68354d410248
-  data.tar.gz: ec9d2f8a8a6b83e4b9e6035ccd2ce68a39bc830fd2db7dc8e210e3d614c88ce2c2a4ba47b518e7fb298d04b8bb7a01c2af859457960a1de68f6ffbe9195e399d
+  metadata.gz: 1e182bdd11fee25f45f63acb62500d154679df971a5de1d7da2ef6c317e21c09fb910a584babaaf6c434aef149b972830e39ee8c93ea9f7c25e46f72942b71e6
+  data.tar.gz: 6455c3d590b45ee561f73114569c59fd620b24491b2e2555ef76b8498c53dcb9d60a1fd40461df7898f15c73b0930a741a0ec6be25501f49ff3f0c3524e9b4c6

data/lib/subj_models/brand.rb

@@ -15,6 +15,7 @@ module SubjModels
         has_many :brand_lines, dependent: :destroy
         has_many :nomenclatures
         has_many :videos
+        has_and_belongs_to_many :users
 
         belongs_to :content_block1, class_name: "ContentBlock"
         belongs_to :content_block2, class_name: "ContentBlock"
@@ -25,6 +26,9 @@ module SubjModels
 
         validates :name, presence: true
 
+        scope :in_index_list, -> condition { where(show_on_index: condition) }
+        scope :in_recommended_list, -> condition { where(is_recommended: condition) }
+
         scope :category_id, -> (category_id) do
           return all if category_id.blank?
           joins(brand_lines: [{ nomenclatures: :category}]).where('categories.id' => category_id)

data/lib/subj_models/content_block.rb

@@ -17,7 +17,9 @@ module SubjModels
     end
 
     def to_s
-      id.to_s
+      brands = Brand.where('content_block1_id=? OR (content_block2_id=? OR content_block3_id=?)', id, id, id)
+
+      "#{title} - #{brands.any? ? 'С брендом' : 'Без бренда'}"
     end
 
   end

data/lib/subj_models/nomenclature.rb

@@ -22,7 +22,7 @@ module SubjModels
         has_many :nomenclature_files, dependent: :destroy
         has_many :events
         has_many :attribute_values, dependent: :destroy
-        has_many :nomenclature_prices
+        has_many :nomenclature_prices, dependent: :destroy
 
         belongs_to :analog_related_nomenclature, class_name: "Nomenclature"
         has_many :analogs, foreign_key: "analog_related_nomenclature_id", class_name: "Nomenclature"
@@ -38,6 +38,7 @@ module SubjModels
         scope :brand_line_ids, -> (brand_line_id) { where(brand_line_id: brand_line_id) }
         scope :with_action, -> { joins(:actions).distinct }
         scope :is_recommended, -> condition { where(is_recommended: condition) }
+        scope :in_index_list, -> condition { where(show_on_index: condition) }
         scope :is_stock, -> (condition) do
           nomenclature_prices_join.joins("LEFT OUTER JOIN qualities ON qualities.id = nomenclature_prices.quality_id").where("qualities.is_stock" => condition)
         end
@@ -124,7 +125,12 @@ module SubjModels
 
         scope :brand_ids, -> (brand) do
           return all unless brand.present?
-          joins(:brand_line).where(brand_lines: { brand_id: brand }) #TODO join brands in two ways
+          where(brand: brand)
+        end
+
+        scope :with_brand, -> (brand) do
+          return none unless brand.present?
+          where(brand: brand)
         end
 
         scope :brand_line_ids, -> (ids) do
@@ -143,7 +149,7 @@ module SubjModels
     end
 
     def to_s
-      id.to_s # TODO
+      name.to_s # TODO
     end
 
     def self.name_field_update(field)

data/lib/subj_models/services/types_support.rb

@@ -8,8 +8,9 @@ module SubjModels
       ADMIN = 1
       LEGAL_PERSON = 2
       NATURAL_PERSON = 3
+      DISTRIBUTOR = 4
 
-      USER_TYPES = { 'админ' => ADMIN, 'юридическое лицо' => LEGAL_PERSON, 'физическое лицо' => NATURAL_PERSON }
+      USER_TYPES = { 'админ' => ADMIN, 'юридическое лицо' => LEGAL_PERSON, 'физическое лицо' => NATURAL_PERSON, 'поставщик' => DISTRIBUTOR }
     end
 
     module EventTypes

data/lib/subj_models/user.rb

@@ -29,6 +29,7 @@ module SubjModels
         enum user_type: USER_TYPES
         enum card_receive_type: CARD_RECEIVE_TYPES
 
+
         has_many :orders
         has_many :user_specialization_approvals, dependent: :destroy
         has_many :user_cards, dependent: :destroy
@@ -36,6 +37,7 @@ module SubjModels
         has_many :user_delivery_addresses, dependent: :destroy
 
         has_and_belongs_to_many :user_specializations
+        has_and_belongs_to_many :brands
 
         belongs_to :document_file
         belongs_to :city
@@ -96,10 +98,6 @@ module SubjModels
       email
     end
 
-    def admin?
-      self.user_type == 'админ'
-    end
-
     def available_nomenclature_ids
       Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id).uniq.pluck(:id)
     end

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/subj_models/video.rb

@@ -21,7 +21,7 @@ module SubjModels
     end
 
     def to_s
-      id.to_s
+      "#{title1} #{title2}#{' - ПРОМО' if is_promo}"
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Move models from some project to gem.