subj_models 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9612e3ebe8ad3f2f446ad3030bc0642a464e423c
-  data.tar.gz: 8b21fb022080a9ababfce82979f5da4290b710cf
+  metadata.gz: 13e68be2013b8160600f9f167582d78f66f6d180
+  data.tar.gz: a7aaa81aadc429f92e74d573e2c9a2168c2c6fce
 SHA512:
-  metadata.gz: b6374858290649e3eedb02500079768d1ecfe4967138f3c666ac054eb6642202b9ff16593a7ffc0a63be8b202549a80d45c45c48ed2453cea81060e42014b023
-  data.tar.gz: e4c0d9b9437c59364f084277c7679b5bb41e60e90f2674c0e8f3f5972dd201a27d8bfb3c90033ae7e9563dd6376a125bce260ada800e489d1a2c50db110a6001
+  metadata.gz: 222f53d56544d09ed813bb83dca645f62371d9f58de4461a05712c2ba0a2aeaf702cd7229ee83b4ef057328fc3d2ec7b2c0c386fed37a7705e11a0d0b0dd793e
+  data.tar.gz: cfe5aad30c72c587ffe116ad987cae2c49226c862e3f481d9c35f6340e6245d9c819731630957117d6e5d1685c86eb299ee874c196266c3ea4e501df6e4e277d

data/lib/subj_models/{action.rb → action_banner.rb}

@@ -2,7 +2,7 @@ require 'subj_models/concerns/comprising_external_id'
 
 module SubjModels
 
-  module ActionModule
+  module ActionBannerModule
 
     def self.included(including_class)
 
@@ -18,9 +18,9 @@ module SubjModels
 
         validates :nomenclatures, presence: true
         validates :name, presence: true
-        validates :discount_percent,
-          presence: true,
-          numericality: {only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
+        # validates :discount_percent,
+        #   presence: true,
+        #   numericality: {only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
 
         scope :to_show, -> condition { where(to_show: condition) }
 

data/lib/subj_models/brand.rb

@@ -18,7 +18,7 @@ module SubjModels
         has_many :events
 
         has_and_belongs_to_many :users
-        has_and_belongs_to_many :actions
+        has_and_belongs_to_many :action_banners
 
         belongs_to :content_block1, class_name: "ContentBlock"
         belongs_to :content_block2, class_name: "ContentBlock"

data/lib/subj_models/city.rb

@@ -10,7 +10,7 @@ module SubjModels
 
         include SubjModels::ComprisingExternalId
 
-        has_and_belongs_to_many :actions
+        has_and_belongs_to_many :action_banners
         has_many :offices
         has_many :users
 

data/lib/subj_models/nomenclature.rb

@@ -28,7 +28,7 @@ module SubjModels
         belongs_to :bought_together_related_nomenclature, class_name: "Nomenclature"
         has_many :bought_together, foreign_key: "bought_together_related_nomenclature_id", class_name: "Nomenclature"
 
-        has_and_belongs_to_many :actions
+        has_and_belongs_to_many :action_banners
         has_and_belongs_to_many :access_groups, through: :nomenclature_access_groups
         has_and_belongs_to_many :events
 
@@ -36,7 +36,7 @@ module SubjModels
 
         scope :with_category, -> { where.not(category_id: nil) }
         scope :brand_line_ids, -> (brand_line_id) { where(brand_line_id: brand_line_id) }
-        scope :with_action, -> { joins(:actions).distinct }
+        scope :with_action, -> { joins(:action_banners).distinct }
         scope :is_recommended, -> condition { where(is_recommended: condition) }
         scope :in_index_list, -> condition { where(show_on_index: condition) }
         scope :is_stock, -> (condition) do
@@ -58,7 +58,7 @@ module SubjModels
         end
 
         scope :only_promotional, -> do
-          joins(:actions).uniq
+          joins(:action_banners).uniq
         end
 
         scope :is_professional, -> (condition) {where(is_professional: condition) }

data/lib/subj_models/user.rb

@@ -63,7 +63,7 @@ module SubjModels
 
         scope :external_id, -> external_id do
           external_id ? where(external_id: external_id) : User.none
-        end 
+        end
 
         scope :internal_users, -> (condition) do
           joins(:user_card_delivery).where.not(user_card_deliveries: {id: nil} ).where(external_id: nil)

data/lib/subj_models/user_card_delivery.rb

@@ -1,4 +1,4 @@
-require 'subj_models/services/types_support'
+require 'subj_models/concerns/comprising_external_id'
 module SubjModels
 
   module UserCardDeliveryModule
@@ -7,10 +7,10 @@ module SubjModels
 
     def self.included(including_class)
 
-      including_class.class_eval do
 
+      including_class.class_eval do
 
-        # enum delivery_type: CARD_RECEIVE_TYPES
+        include SubjModels::ComprisingExternalId
 
         belongs_to :user
 

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/subj_models.rb

@@ -32,7 +32,7 @@ require 'subj_models/specialist_activity_document_type'
 require 'subj_models/nomenclature_attribute'
 require 'subj_models/category'
 require 'subj_models/nomenclature_review'
-require 'subj_models/action'
+require 'subj_models/action_banner'
 require 'subj_models/event_type'
 require 'subj_models/office_contact'
 require 'subj_models/order_delivery_courier'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ files:
 - bin/setup
 - lib/subj_models.rb
 - lib/subj_models/access_group.rb
-- lib/subj_models/action.rb
+- lib/subj_models/action_banner.rb
 - lib/subj_models/attribute_value.rb
 - lib/subj_models/brand.rb
 - lib/subj_models/brand_line.rb