wordjelly-auth 1.2.6 → 1.2.8

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

@@ -3,27 +3,53 @@ module Auth::Concerns::Shopping::BarCodeConcern
 	extend ActiveSupport::Concern
 
 	included do 	
-		field :bar_code_tag, type: String
+		attr_accessor :bar_code_tag
 		attr_accessor :remove_bar_code
 
-		## do this before validation so that it provides a way to prevent the document from being saved, in case the bar code collection cannot be updated successfully.
+		after_find do |document| 
+			## look for a barcode
+			unless document.bar_code_tag
+				bar_codes = Auth::Shopping::BarCode.where(:assigned_to_object_id => document.id.to_s, :assigned_to_object_class => document.class.name)
+				if bar_codes.size == 1
+					document.bar_code_tag = bar_codes.first.bar_code_tag
+				end
+			end
+		end
+
 		before_validation do |document|
-			if document.bar_code_tag_changed? && document.bar_code_tag.nil?
-				
-				
-				
+=begin
+			## if the tag has changed, and if it was not nil
+			if document.bar_code_tag_changed? && !document.bar_code_tag_was.nil?
+				## it will relieve the original barcode from this object
+				## that barcode will now no longer be assigned to anything, 
+				## and this new barcode will be saved, as long as that clear operation was successfu
+				if Auth::Shopping::BarCode.clear_object(document.id.to_s) == false
+					document.errors.add(:bar_code_tag,"could not clear the barcode tag. Please try again later")
+				end
+			end
+=end
+			if document.remove_bar_code == "1"
+				if Auth::Shopping::BarCode.clear_object(document.id.to_s) == false
+					document.errors.add(:bar_code_tag,"could not clear the barcode tag. Please try again later")
+				end
 			end
 		end
 
 		## do this after_save, so that at the minimum this bar_code_tag cannot be used again in this collection.
+		## this has to be done before_save ?
+		## if we do it before_save ?
 		after_save do |document|
-			if document.bar_code_tag_changed? && document.bar_code_tag_was.nil?
+			
+			unless document.bar_code_tag.nil?
 				
+				if bar_code_object = Auth::Shopping::BarCode.upsert_and_assign_object(self)
 
+				else
+					document.errors.add(:bar_code_tag,"the bar code tag could not be persisted")
+				end
 
 			end
 		end
 	end
-end
 
-## how will all this finish.?
+end

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

@@ -9,6 +9,25 @@ module Auth::Concerns::Shopping::CartConcern
 	
 
 	included do 
+
+		###########################################################
+		##
+		##
+		## STATE MACHINE BEGINS.
+		##
+		##
+		##########################################################
+
+		field :payment_stage, type: String
+
+		##########################################################
+		##
+		##
+		## STATE MACHINE ENDS.
+		##
+		##
+		##########################################################
+
 		field :name, type: String
 		field :notes, type: String
 			
@@ -54,6 +73,8 @@ module Auth::Concerns::Shopping::CartConcern
 		## the discount object id, passed in so that it can be rendered in the show_cart action where we provide a link to create a payment.
 		field :discount_id, type: String
 
+		field :will_pay_at_step, type: String
+
 		attr_accessor :discount
 
 		attr_accessor :personality
@@ -81,7 +102,7 @@ module Auth::Concerns::Shopping::CartConcern
 			    		index: Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_SETTINGS
 				    },
 			        mappings: {
-			          Auth::OmniAuth::Path.pathify(Auth.configuration.cart_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
+			          "document" => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
 			    }
 			}
 		}
@@ -112,7 +133,7 @@ module Auth::Concerns::Shopping::CartConcern
 
 		set_personality
 
-		set_place
+		
 
 	end
 
@@ -318,9 +339,15 @@ module Auth::Concerns::Shopping::CartConcern
 
 		      ## and personality also has to be set here.
 		      resp = (add_or_remove == 1) ? cart_item.set_cart_and_resource(self) : cart_item.unset_cart
-		      	
-		      #puts "unset cart is:#{resp.to_s}"
 		      
+		      ## add these to the autocomplete tags
+		      if resp == true
+		      	if cart_item.parent_id
+		      		self.tags << cart_item.name unless self.tags.include? cart_item.name
+		      	else
+		      		self.tags.delete(cart_item.name)
+		      	end
+		      end
 		      
 		      resp
 	  	  rescue Mongoid::Errors::DocumentNotFound => error
@@ -348,23 +375,93 @@ module Auth::Concerns::Shopping::CartConcern
 	## the current implementation returns true if all items have been fully paid for.
 	def can_create_discount_coupons?
 		#return (self.cart_items.select{|c| c.accepted.nil? || c.accepted == false}.size == 0)
-		puts "CAME TO CAN CREATE DISCOUNT COUPONS."
+		#puts "CAME TO CAN CREATE DISCOUNT COUPONS."
 		prepare_cart
-
 		self.cart_pending_balance == 0		
 
 	end
 
 	def set_personality
-		return unless self.personality_id
-		puts "self personality id is: #{self.personality_id}"
+		#puts "personality id is : #{self.personality_id}"
+		return if self.personality_id.blank?
+		#puts "self personality id is: #{self.personality_id}"
 		self.personality = Auth.configuration.personality_class.constantize.find(self.personality_id)
+		#puts "self personality is: "
+		#puts self.personality.to_s
+		
 	end
 
 	def set_place
-		return unless self.place_id
-		puts "Self place id is: #{self.place_id}"
+		return if self.place_id.blank?
+		#puts "Self place id is: #{self.place_id}"
 		self.place = Auth.configuration.place_class.constantize.find(self.place_id)
 	end
 
+	##############################################################
+	##
+	##
+	## METHODS FOR AUTOCOMPLETE CONCERNS.
+	##
+	##
+	##############################################################
+	def set_primary_link
+		unless self.primary_link
+			self.primary_link = Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.cart_class),self.id.to_s)
+		end
+	end
+
+	def set_autocomplete_tags
+		self.tags = [] if self.personality_id_changed?
+		if self.new_record?
+			self.tags << "Cart"
+		end
+		if self.personality_id
+			personality = Auth.configuration.personality_class.constantize.find(self.personality_id)
+			personality.add_info(self.tags)
+		end
+	end
+
+	def set_autocomplete_description
+
+	end
+
+	def set_secondary_links
+
+	end
+
+
+	###############################################################
+	##
+	##
+	## STATE MACHINE BEGINS.
+	##
+	##
+	###############################################################
+	## @param[Object] cart_item : the cart_item that needs to be added to this cart
+	## @return[Boolean] true/false : depending on whether 
+	def can_accept_item?(cart_item)
+		return true
+	end
+
+	## @param[Object] cart_item : each cart item calls this method when : a) in cart_controller, after_create, b) in cart_controller after_update
+	## here it will check if the payment_stage has been satisfied or not, and then will decide to process the item further.
+	def can_process_item?(cart_item)
+		return true
+	end
+	
+	def process_items
+		self.cart_items.each do |item|
+			item.process if can_process_item?(item)
+		end
+	end
+	###############################################################
+	##
+	##
+	## STATE MACHINE ENDS.
+	##
+	##
+	###############################################################
+
+
+	
 end

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

@@ -7,21 +7,18 @@ module Auth::Concerns::Shopping::CartItemConcern
 	
 	include Auth::Concerns::Shopping::ProductConcern
 
-	
-
 	included do 
 
 		embeds_many :instructions, :class_name => "Auth::Work::Instruction", :as => :cart_item_instructions, :cascade_callbacks => true
 			
-
-
 		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.cart_item_class) => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
+			          "document" => Auth::Concerns::EsConcern::AUTOCOMPLETE_INDEX_MAPPINGS
 			    }
 			}
 		}
@@ -103,6 +100,9 @@ module Auth::Concerns::Shopping::CartItemConcern
 			end
 		end
 
+		## so when do we assign those?
+		## this is only possible if parent id on set on the cart_item
+		## then it should be set on the secondary links.
 
 		after_initialize do |document|
 			if document.new_record?
@@ -313,6 +313,10 @@ module Auth::Concerns::Shopping::CartItemConcern
 	def set_cart_and_resource(cart)
 		return true if self.parent_id
 		return false if (owner_matches(cart) == false)
+		unless cart.can_accept_item?(self)
+			self.errors.add(:parent_id, "the cart cannot accept this cart item, please add it to a new cart.")
+			return false
+		end
 		self.parent_id = cart.id.to_s
 		self.personality_id = cart.personality_id
 		self.place_id = cart.place_id
@@ -419,7 +423,7 @@ module Auth::Concerns::Shopping::CartItemConcern
 	end
 
 	def product_attributes_to_assign
-		["name","price","bundle_name","instructions","components"]
+		["name","price","bundle_name","product_code","instructions","components"]
 	end
 
 	## this is got by multiplying the price of the cart item by the minimum_acceptable at field.
@@ -428,9 +432,80 @@ module Auth::Concerns::Shopping::CartItemConcern
 	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
+			
+		unless self.secondary_links["Remove From Wish List"]
+			self.secondary_links["Remove From Wish List"] = {
+				:partial => "auth/shopping/cart_items/search_results/remove_item_from_wish_list.html.erb",
+				:instance_name_in_locals => "cart_item", 
+				:other_locals => {}
+			}
+		end
+
+		unless self.secondary_links["Check Status"]
+			if self.parent_id
+				self.secondary_links["Check Status"] = {
+					:url => Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.edit_path(Auth.configuration.cart_item_class),self.id.to_s)
+				}
+			end
+		end
+
+		unless self.secondary_links["Remove Item From Cart"]
+			self.secondary_links["Remove Item From Cart"] = {
+				:partial => "auth/shopping/cart_items/search_results/remove_item_from_cart.html.erb",
+				:instance_name_in_locals => "cart_item", 
+				:other_locals => {}
+			}
+		end
+		
+		## let me add for cart, personality and place as well.
+		unless self.secondary_links["See Other Items in Cart"]
+			if self.parent_id
+				self.secondary_links["See Other Items In Cart"] = {
+					:url => Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.cart_class),self.parent_id)
+				}
+			end
+		end
+
+	end
+
+	def set_autocomplete_tags
+		self.tags = []
+		self.tags << "item"
+		if self.personality_id
+			personality = Auth.configuration.personality_class.constantize.find(self.personality_id)
+			personality.add_info(self.tags)
+		end
+	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.cart_item_class),self.id.to_s)
+	end	
 
+	###############################################################
+	##
+	##
+	## STATE MACHINE
+	##
+	##
+	###############################################################
+	## called from cart_concern ,and there is indirectly called from the cart_controller after_update, and after_create
+	## so i have to give a way to call refresh on the cart
+	## so that this method is indirectly called.
+	## override it in the app to do custom logic with the item
+	def process
+
+	end
 =begin
 	## @param[String] req : the requirement from the definition. It consists of "*" wildcard, or a product id, or a definition address + product_id -> which is basically one of the output products of the definition. But here it will have the product id, not the self id.
 	## it has to be the product id.

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

@@ -44,7 +44,9 @@ module Auth::Concerns::Shopping::DiscountConcern
 		
 	include Auth::Concerns::ChiefModelConcern
 	include Auth::Concerns::OwnerConcern
-	
+	#include Auth::Concerns::EsConcern
+
+
 	included do 
 
 		####################################################
@@ -379,10 +381,39 @@ module Auth::Concerns::Shopping::DiscountConcern
 
 		end
 
+	end
+
+	#######################################################
+	##
+	##
+	## AUTOCOMPLETE METHODS.
+	##
+	##
+	#######################################################
+	def set_primary_link
+		unless self.primary_link
+			self.primary_link = Rails.application.routes.url_helpers.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.discount_class),self.id.to_s)
+		end
+	end
+
+	def set_autocomplete_tags
+		if self.new_record?
+			self.tags << "Discount"
+			self.tags << self.discount_amount if self.discount_amount
+			self.tags << self.discount_percentage if self.discount_percentage
+			## this needs more work.
+		end
+	end
+
+	def set_autocomplete_description
 
+	end
 
+	def set_secondary_links
+		
 	end
 
+
 	#######################################################
 	##
 	##

data/app/models/auth/concerns/shopping/lifecycle_of_state_concern.txt

@@ -0,0 +1,26 @@
+1. PROCESS_ITEM
+
+						cart controller
+							  |
+							  |
+							  |
+							  |
+						create / update
+							  |
+							  |
+							  |
+							  | 
+					calls cart#process_items(just before render)
+				calls cart#can_process_item?(item)
+					      if true then
+					   		  |
+					   		  |
+					   		  |
+					   		  |
+					calls cart_item#process
+
+
+======================================================================
+
+2. when cart-item is given a parent_id to be saved, in the method set_resource_and_parent id, just before calling save,
+called cart#can_accept_item, to check fi the cart is capable of accepting the item, saving goes forward only if this returns true.

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

@@ -174,8 +174,10 @@ module Auth::Concerns::Shopping::PayUMoneyConcern
 		## we should just set, gateway callback complete as true, and based on that never show the pay with payumoney link again in the show action.
 
 		## just looking to see if  
-		if (pr["mihpayid"] && pr["hash"] && (pr["txnid"] == self.id.to_s))
-			self.gateway_callback_called = true
+		if pr
+			if (pr["mihpayid"] && pr["hash"] && (pr["txnid"] == self.id.to_s))
+				self.gateway_callback_called = true
+			end
 		end
 	  	yield if block_given?
 	  	return true