wordjelly-auth 1.2.6 → 1.2.8

data/app/models/auth/concerns/shopping/payment_concern.rb

@@ -255,7 +255,7 @@ module Auth::Concerns::Shopping::PaymentConcern
 	## called in show action of controller.
 	## return[Array]
 	def set_payment_receipt
-		puts "CAME TO SET PAYMENT RECEIPT ------------------------"
+		#puts "CAME TO SET PAYMENT RECEIPT ------------------------"
 		self.payment_receipt = {:current_payment => [], :cart => {}}
 		Auth.configuration.cart_item_class.constantize.where(:accepted_by_payment_id => self.id.to_s).each do |c_item|
 			puts "THIS ITEM IS C_ITEM: #{c_item.id.to_s}"
@@ -263,8 +263,8 @@ module Auth::Concerns::Shopping::PaymentConcern
 		end
 		set_cart(self.cart_id) if self.cart.nil?
 		self.payment_receipt[:cart] = self.cart.prepare_receipt
-		puts self.payment_receipt.to_s
-		puts "finished set payment receipt."
+		#puts self.payment_receipt.to_s
+		#puts "finished set payment receipt."
 	end
 
 	##res : 59a5405c421aa90f732c9059
@@ -601,8 +601,9 @@ module Auth::Concerns::Shopping::PaymentConcern
 	## validation
 	def payment_satisfies_minimum_payment_requirement
 		self.cart.prepare_cart
-		puts "the minimum payment amoutn is:"
-		puts self.cart.cart_minimum_payable_amount
+		#puts "the minimum payment amoutn is:"
+		#puts self.cart.cart_minimum_payable_amount
+		## what if self.cart.payment_stage.
 		return if (self.refund == true || self.discount)  
 		self.errors.add("amount","payment amount is not sufficient") if (self.cart.cart_minimum_payable_amount.nil? || (self.cart.cart_minimum_payable_amount > self.amount))
 	end
@@ -625,6 +626,19 @@ module Auth::Concerns::Shopping::PaymentConcern
 		super(options).merge({:payment_receipt => self.payment_receipt,:cash_change => self.cash_change})
 	end
 
+	def is_approved?
+		puts "the payment status is: #{self.payment_status}"
+		self.payment_status == 1
+	end
+
+	def is_pending?
+		self.payment_status.nil?
+	end
+
+	def is_disapproved?
+		self.payment_status == 0
+	end
+
 end
 
 

data/app/models/auth/concerns/shopping/personality_concern.rb

@@ -14,7 +14,7 @@ module Auth::Concerns::Shopping::PersonalityConcern
 			    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
 				    },
 			        mappings: {
-			          Auth::OmniAuth::Path.pathify(Auth.configuration.personality_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
+			          "document" => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
 			    }
 			}
 		}
@@ -30,7 +30,14 @@ module Auth::Concerns::Shopping::PersonalityConcern
 
 		field :sex, type: String
 
+		field :referred_by, type: String
 
+		field :referrer_contact_number, type: String
+
+		validates_presence_of :age
+		validates_presence_of :sex
+		validates_presence_of :fullname
+		validates_presence_of :date_of_birth
 		##################################################################
 		##
 		##
@@ -89,23 +96,71 @@ module Auth::Concerns::Shopping::PersonalityConcern
 		self.age = ((Time.now - birth_time)/1.year).to_i
 	end
 
-
-	######################################################################
+	#################################################################
 	##
 	##
 	## AUTOCOMPLETE METHODS.
 	##
 	##
-	######################################################################
+	#################################################################
+
+	def set_primary_link
+		self.primary_link = Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.personality_class),self.id.to_s)
+	end	
+
+	def set_secondary_links 
+		unless self.secondary_links["See All Carts"]
+			
+		end
+
+		unless self.secondary_links["See Latest Cart"]
+
+		end
+
+		unless self.secondary_links["See Pending Carts"]
+
+		end
+
+		unless self.secondary_links["Edit Information"]
+		
+		end
+	end
+
+	def set_autocomplete_tags
+		self.tags = []
+		self.tags << "Personality"
+	end
+
+	def set_autocomplete_description
+		
+	end
+
+
+	
+
+	################################################################
+	##
+	##
+	## CLASS METHODS.
+	##
+	##
+	################################################################
 
 	## @param[Hash] options : can contain a :resource key. which should be the resource(user) to which all the personalities belong.
 	module ClassMethods
 		def find_personalities(options)
 			conditions = {:resource_id => nil, :parent_id => nil}
 			conditions[:resource_id] = options[:resource].id.to_s if options[:resource]
-			puts "conditions are:"
-			puts conditions.to_s
 			Auth.configuration.personality_class.constantize.where(conditions)
 		end
 	end
+
+	#############################################################
+	##
+	##
+	## UTILITY METHODS.
+	##
+	##
+	#############################################################
+
 end

data/app/models/auth/concerns/shopping/place_concern.rb

@@ -7,6 +7,7 @@ module Auth::Concerns::Shopping::PlaceConcern
 
 	included do 
 
+=begin
 		INDEX_DEFINITION = {
 			index_options:  {
 			        settings:  {
@@ -88,8 +89,19 @@ module Auth::Concerns::Shopping::PlaceConcern
 			    }
 			}
 		}
+=end		
 		
-		
+		INDEX_DEFINITION = {
+			index_options:  {
+			        settings:  {
+			    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
+				    },
+			        mappings: {
+			          "document" => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
+			    }
+			}
+		}
+
 
 		field :nearest_address, type: String
 
@@ -121,6 +133,47 @@ module Auth::Concerns::Shopping::PlaceConcern
 		address
 	end
 
+
+	#################################################################
+	##
+	##
+	## AUTOCOMPLETE METHODS.
+	##
+	##
+	#################################################################
+
+	def set_primary_link
+		self.primary_link = Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.place_class),self.id.to_s)
+	end	
+
+	def set_secondary_links 
+		unless self.secondary_links["See All Carts"]
+			
+		end
+
+		unless self.secondary_links["See Latest Cart"]
+
+		end
+
+		unless self.secondary_links["See Pending Carts"]
+
+		end
+
+		unless self.secondary_links["Edit Information"]
+		
+		end
+	end
+
+	def set_autocomplete_tags
+		self.tags = []
+		self.tags << "Place"
+	end
+
+	def set_autocomplete_description
+		
+	end
+
+
 	module ClassMethods
 		def find_places(options)
 			conditions = {:resource_id => nil, :parent_id => nil}

data/app/models/auth/concerns/shopping/product_concern.rb

@@ -5,16 +5,24 @@ module Auth::Concerns::Shopping::ProductConcern
 	include Auth::Concerns::ChiefModelConcern
 	include Auth::Concerns::OwnerConcern
 	include Auth::Concerns::EsConcern
-	
+	include Mongoid::Autoinc	
+
+
+	## include the bar code concern if enable_bar_code_api is enabled.
+
+	if Auth.configuration.enable_barcode_api == true
+		include Auth::Concerns::Shopping::BarCodeConcern
+	end
 
 	included do 
 		
 		embeds_many :cycles, :class_name => "Auth::Work::Cycle", :as => :product_cycles
 
 		embeds_many :instructions, :class_name => "Auth::Work::Instruction", :as => :product_instructions
-					
-		INDEX_DEFINITION = 
+		
+		INDEX_DEFINITION ||= 
 		{
+			index_name: Auth.configuration.brand_name.downcase,
 			index_options:  
 				{
 				settings:  
@@ -23,7 +31,7 @@ module Auth::Concerns::Shopping::ProductConcern
 					},
 				mappings: 
 					{
-				        Auth::OmniAuth::Path.pathify(Auth.configuration.product_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS.deep_merge(
+				        "document" => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS.deep_merge(
 				        		{
 				        			properties: {
 				        				bundle_name: {
@@ -46,9 +54,7 @@ module Auth::Concerns::Shopping::ProductConcern
 		field :name, type: String
 		## a product can only belong to one bunch.
 		field :bunch, type: String
-		##PERMITTED
-		##the number of this product that are being added to the cart
-		##permitted
+	
 		field :quantity, type: Float, default: 1
 		## for WORKFLOW
 		#field :location_information, type: Hash, default: {}
@@ -73,13 +79,81 @@ module Auth::Concerns::Shopping::ProductConcern
 			self.public = "yes"
 		end
 
+		after_initialize do |document|
+
+			if ((document.new_record?) && (document.create_from_product_id))
+				
+				begin
+					create_from_product = Auth.configuration.product_class.constantize.find(self.create_from_product_id)
+					unless create_from_product.product_code.blank?
+						
+						document.attrs_to_copy_from_prod_to_prod.each do |attr|
+							document.send("#{attr}=",create_from_product.send("#{attr}"))
+						end
+					end
+				rescue Mongoid::Errors::DocumentNotFound => e
+					puts e.to_s
+				end
+			end
+		end
+
+		###########################################################
+		##
+		##
+		## THE WHOLE MATTER OF PRODUCT TYPE CODES.
+		##
+		##
+		###########################################################
+
+		## this is automatically assigned to whatever is the calculated hashid, only if it is not already set, so that is is done, in the write attribute hook.
+		field :product_code, type: String
+
+		field :auto_incrementing_number, type: Integer
+
+		increments :auto_incrementing_number
+
+		field :unique_hash_id, type: String
+
+		## first lets do the specs
+
+		attr_accessor :create_from_product_id
+		
+		############################################################
+
+	end
+
+	def write_attribute(field,value)
+		super(field,value)
+		if field.to_s == "auto_incrementing_number"
+			if self.auto_incrementing_number_changed?
+				unless self.unique_hash_id
+					hashids = Hashids.new(Auth.configuration.hashids_salt,0,Auth.configuration.hashids_alphabet)
+					self.unique_hash_id = hashids.encode(self.auto_incrementing_number)
+					## check if the option that create from product id is ticked, then assign that otherwise give it its own new product code
+					if self.create_from_product_id
+						
+					else
+						self.product_code = self.unique_hash_id if (self.product_code.blank?)
+					end
+				end
+			end
+		end
+	end
+
+
+	def attrs_to_copy_from_prod_to_prod
+		["product_code","name","description","price"]
 	end
 
 
+=begin
 	def as_indexed_json(options={})
+	 puts "super is:"
+	 puts super
 	 super.merge({bundle_name: bundle_name})
 	end 
-	
+=end	
+
 	## so we have completed the rolling n minutes.
 	def add_to_previous_rolling_n_minutes(minutes,origin_epoch,cycle_to_add)
 
@@ -145,5 +219,66 @@ module Auth::Concerns::Shopping::ProductConcern
 		end
 		minutes
 	end
+
+	## here need to add this action links to the products.
+	## it is basically a form to add a cart item
+	## that should be added hereitself.
+	## 
+	def set_secondary_links
+		## this can be done both as a user and as an admin.
+		## what if the admin assigns it for himself.
+		## these checks have to be established for everyone.
+		unless self.secondary_links["Order Now"]
+			self.secondary_links["Order Now"] = {
+				:partial => "auth/shopping/products/show/action_links.html.erb",
+				:instance_name_in_locals => "product", 
+				:other_locals => {}
+			}
+		end
+
+		unless self.secondary_links["Edit Product"]
+			self.secondary_links["Edit Product"] = {
+				:url => Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.edit_path(Auth.configuration.product_class),self.id.to_s)
+			}
+		end
+
+		unless self.secondary_links["See All Products"]
+			## for this the url is ===> index path.
+			self.secondary_links["See All Products"] = {
+				:url => Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.product_class),{})
+			}
+
+		end
+
+		unless self.secondary_links["See Related Products"]
+			self.secondary_links["See All Products"] = {
+				:url => Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.product_class),{})
+			}
+
+		end
+		
+		unless self.secondary_links["Add New Product"]
+			self.secondary_links["Add New Product"] = {
+				:partial => "auth/shopping/products/search_results/add_product.html.erb",
+				:instance_name_in_locals => "product", 
+				:other_locals => {}	
+			}
+		end
+
+	end
+
+	
+	def set_autocomplete_tags
+		self.tags = []
+		self.tags << "product"
+	end
+
+	def set_autocomplete_description
+		self.autocomplete_description = self.name + " - " + self.description
+	end
+
+	def set_primary_link
+		self.primary_link = Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.product_class),self.id.to_s)
+	end
 	
 end

data/app/models/auth/concerns/user_concern.rb

@@ -10,15 +10,18 @@ module Auth::Concerns::UserConcern
 	included do 
 
 		INDEX_DEFINITION = {
+				index_name: Auth.configuration.brand_name.downcase,
 				index_options:  {
 				        settings:  {
 				    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
 					    },
 				        mappings: {
-				          Auth::OmniAuth::Path.pathify(Auth.configuration.user_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
+				          "document" => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
 				    }
 				}
 			}
+		## so now first let me change the mapping name, and also shift the as_indexed_json def to the respective model everywhere
+
 
 		include GlobalID::Identification
 
@@ -41,6 +44,7 @@ module Auth::Concerns::UserConcern
 		before_save do |document|
 			## set the document resource id if its not already set.
 			document.resource_id = document.id.to_s unless document.resource_id
+			document.resource_class = document.class.name.to_s unless document.resource_class
 
 			##if the additional login param changes, for eg. during an update, then set the additional login param status to pending immediately before saving itself, so that it is transactional type of thing.
 			if document.additional_login_param_changed? && !document.additional_login_param.blank?
@@ -81,6 +85,8 @@ module Auth::Concerns::UserConcern
 		#######################################################
 
 		field :resource_id, type: String
+		field :resource_class, type: String
+
 
 		########################################################
 		# FIELDS FOR ALLOWING THE ADMIN TO CREATE USERS, AND ALSO REQUEST 
@@ -252,6 +258,7 @@ module Auth::Concerns::UserConcern
   			
   			## okay so this will be modified in the simple token authentication part.
   			attr_accessor :authentication_token
+  			attr_accessor :es
   			field :encrypted_authentication_token, type: String
 
   			field :authentication_token_expires_at, type: Integer
@@ -771,4 +778,79 @@ module Auth::Concerns::UserConcern
 		
 	end
 
+	################################################################
+	##
+	##
+	## OWNERSHIP.
+	##
+	##
+	################################################################
+	def is_owner?(object)
+		raise "object does not have a resource id field" unless ((object.respond_to? :resource_id) || (object.respond_to? :resource_class))
+		return true if ((object.resource_class == self.resource_class) && (object.resource_id == self.resource_id))
+		return false
+	end
+
+	################################################################
+	##
+	##
+	## AUTOCOMPLETE CONCERN PART.
+	##
+	##
+	################################################################
+
+
+    ## so the user's will have to give a unique id,
+    ## what if they want you to check that ?
+    def set_autocomplete_tags
+      if self.new_record?
+         self.tags << "user"
+         self.tags << self.name
+         self.tags << self.email
+         self.tags << self.additional_login_param
+      end
+    end
+
+    def set_primary_link
+      self.primary_link = Rails.application.routes.url_helpers.profile_path(:id => self.id.to_s, :resource => self.class.name.pluralize.downcase)
+    end
+
+    ## ill take it from here onwards.
+
+    ## now first we are going to test it with the ui.
+    ## and we are going to test it with one admin and one non admin account
+    ## before that, we are going to 
+    def set_secondary_links    		
+   	    unless self.secondary_links["Add New Account"]
+			self.secondary_links["Add New User"] = {
+				:partial => "auth/admin_create_users/search_results/add_new_user.html.erb",
+				:instance_name_in_locals => "user", 
+				:other_locals => {}
+			}
+		end
+		unless self.secondary_links["Manage This Account"]
+			self.secondary_links["Manage This User"] = {
+				:partial => "auth/admin_create_users/search_results/manage_user.html.erb",
+				:instance_name_in_locals => "user", 
+				:other_locals => {}
+			}
+		end
+		unless self.secondary_links["Set Unset Proxy"]
+			self.secondary_links["Set Unset Proxy"] = {
+				:partial => "auth/profiles/search_results/switch_to_user.html.erb",
+				:instance_name_in_locals => "user", 
+				:other_locals => {}
+			}
+		end
+		
+		## switch to the user, and see all associated people.
+
+		unless self.secondary_links["See All Associated People"]
+			self.secondary_links["See All Associated People"] = {
+				:url => Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.personality_class))
+			}
+		end
+
+    end
+
 end