wordjelly-auth 1.2.2 → 1.2.3

data/app/controllers/auth/concerns/token_concern.rb

@@ -112,9 +112,11 @@ module Auth::Concerns::TokenConcern
 
   
   def lookup_resource 
+    puts "came to lookup resource."
     ## if the current signed in resource si not an admin, just return it, because the concept of proxy arises only if the current_signed in resource is an admin.
+    puts "current signed in resource : #{current_signed_in_resource}"
     return current_signed_in_resource unless current_signed_in_resource.is_admin?
-    
+    puts "crossed resource."
     ## else.
     
     ## first check the session or the params for a proxy resource.

data/app/controllers/auth/search_controller.rb

@@ -27,18 +27,18 @@ class Auth::SearchController < ApplicationController
 	## @html => currently does not support html request.
 	def authenticated_user_search	
 		
+		
 		## m client will be available at this stage.
 		## the problem is that it is hard to pass it forward to the mongoid elasticsearch object.
 		## because while initializing the user it will have to first be set on the user.
 		## is there any other way to achieve this?
 		query = permitted_params[:query]
 		query[:resource_id] = lookup_resource.id.to_s if !current_signed_in_resource.is_admin?
+
 		
 		@search_results = Auth::Search::Main.search(query)
 		
-		puts "these are the search results."
-		puts @search_results.to_s
-
+	
 		#dummy_product = Auth.configuration.product_class.constantize.new
 		#dummy_product.name = "test product"
 		#dummy_product.price = 100.20

data/app/controllers/auth/shopping/personalities_controller.rb

@@ -0,0 +1,14 @@
+class Auth::Shopping::PersonalitiesController < Auth::Shopping::ShoppingController
+	include Auth::Concerns::Shopping::PersonalityControllerConcern
+
+	## only these actions need an authenticated user to be present for them to be executed.
+    CONDITIONS_FOR_TOKEN_AUTH = [:create,:update,:destroy,:edit,:new,:index,:show,:create_multiple]
+
+    TCONDITIONS = {:only => CONDITIONS_FOR_TOKEN_AUTH}
+    ##this ensures api access to this controller.
+    include Auth::Concerns::DeviseConcern
+    include Auth::Concerns::TokenConcern
+    before_filter :do_before_request , TCONDITIONS
+    before_filter :initialize_vars , TCONDITIONS
+
+end

data/app/controllers/auth/shopping/places_controller.rb

@@ -0,0 +1,11 @@
+class Auth::Shopping::PlacesController < Auth::Shopping::ShoppingController
+	include Auth::Concerns::Shopping::PlaceControllerConcern
+	## only these actions need an authenticated user to be present for them to be executed.
+    CONDITIONS_FOR_TOKEN_AUTH = [:create,:update,:destroy,:edit,:new,:index,:show,:create_multiple]
+    TCONDITIONS = {:only => CONDITIONS_FOR_TOKEN_AUTH}
+    ##this ensures api access to this controller.
+    include Auth::Concerns::DeviseConcern
+    include Auth::Concerns::TokenConcern
+    before_filter :do_before_request , TCONDITIONS
+    before_filter :initialize_vars , TCONDITIONS
+end

data/app/controllers/auth/shopping/shopping_controller.rb

@@ -12,6 +12,30 @@ class Auth::Shopping::ShoppingController < Auth::ApplicationController
 	    end
 	end
 
+	def instantiate_place_class
+		if @auth_shopping_place_class = Auth.configuration.place_class
+	      begin
+	        @auth_shopping_place_class = @auth_shopping_place_class.constantize
+	      rescue
+	        not_found("error instantiating class from place class")
+	      end
+	    else
+	      not_found("place class not specified in configuration")
+	    end
+	end
+
+	def instantiate_personality_class
+		if @auth_shopping_personality_class = Auth.configuration.personality_class
+	      begin
+	        @auth_shopping_personality_class = @auth_shopping_personality_class.constantize
+	      rescue
+	        not_found("error instantiating class from personality class")
+	      end
+	    else
+	      not_found("personality class not specified in configuration")
+	    end
+	end
+
 
     def instantiate_cart_class
 		if @auth_shopping_cart_class = Auth.configuration.cart_class
@@ -79,6 +103,8 @@ class Auth::Shopping::ShoppingController < Auth::ApplicationController
 		instantiate_cart_item_class
 		instantiate_product_class
 		instantiate_discount_class
+		instantiate_personality_class
+		instantiate_place_class
 	end
 
 

data/app/helpers/auth/shopping/payments/pay_u_money_helper.rb

@@ -31,7 +31,7 @@ module Auth::Shopping::Payments::PayUMoneyHelper
           result << hidden_field_tag(field == "hast" ? "hash" : field, value)
         end
 
-        result << '<input type=submit value=" Pay with PayU ">'
+        result << '<input type="image" src="/assets/payumoney.png" >'
         result << '</form>'
         result = result.join("\n")
         concat(result.respond_to?(:html_safe) ? result.html_safe : result)

data/app/helpers/auth/shopping/personalities/personalities_helper.rb

@@ -0,0 +1,26 @@
+module Auth::Shopping::Personalities::PersonalitiesHelper
+
+	## get /new
+	def new_personality_path
+      main_app.send(Auth::OmniAuth::Path.new_path(Auth.configuration.personality_class))
+    end
+
+    ## (PUT/PATCH/GET) - individual personality
+    def personality_path(personality)
+    	
+    	main_app.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.personality_class),personality)
+    end
+
+	
+	##/personalities (GET - all personalities /CREATE - individual personality) 
+	def personalities_path
+    	main_app.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.personality_class))
+    end
+
+    ##/shopping/personalities/:id/edit
+    def edit_personality_path(personality)
+    	main_app.send(Auth::OmniAuth::Path.edit_path(Auth.configuration.personality_class),personality)
+    end
+
+   
+end

data/app/helpers/auth/shopping/places/places_helper.rb

@@ -0,0 +1,26 @@
+module Auth::Shopping::Places::PlacesHelper
+
+	## get /new
+	def new_place_path
+      main_app.send(Auth::OmniAuth::Path.new_path(Auth.configuration.place_class))
+    end
+
+    ## (PUT/PATCH/GET) - individual place
+    def place_path(place)
+    	
+    	main_app.send(Auth::OmniAuth::Path.show_or_update_or_delete_path(Auth.configuration.place_class),place)
+    end
+
+	
+	##/places (GET - all places /CREATE - individual place) 
+	def places_path
+    	main_app.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.place_class))
+    end
+
+    ##/shopping/places/:id/edit
+    def edit_place_path(place)
+    	main_app.send(Auth::OmniAuth::Path.edit_path(Auth.configuration.place_class),place)
+    end
+
+   
+end

data/app/helpers/auth/shopping/products/products_helper.rb

@@ -40,8 +40,8 @@ module Auth::Shopping::Products::ProductsHelper
 
 	
 	##/products (GET - all products /CREATE - individual product) 
-	def products_path
-    	main_app.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.product_class))
+	def products_path(params={})
+    	main_app.send(Auth::OmniAuth::Path.create_or_index_path(Auth.configuration.product_class),params)
     end
 
     ##/shopping/products/:id/edit

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

@@ -47,10 +47,6 @@ module Auth::Concerns::ChiefModelConcern
 		##and add them to an images array. 
 		def load_images
 			self.images = Auth::Image.where(:parent_id => self.id.to_s) || []
-			self.images.each do |image|
-				puts image.attributes.to_s
-			end
-			
 		end
 
 

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

@@ -9,9 +9,11 @@ module Auth::Concerns::Shopping::CartConcern
 	included do 
 		field :name, type: String
 		field :notes, type: String
-		
-
-		
+			
+		## location of the user for this cart
+		field :place_id, type: String
+		## name, age, sex of the user for this cart.
+		field :personality_id, type: String		
 
 
 		## debit is calculated live, by first getting all the items already dispatched and their value, and then getting the total payments made and their value, so it infact becomes something at the validation level of the cart item.
@@ -52,6 +54,10 @@ module Auth::Concerns::Shopping::CartConcern
 
 		attr_accessor :discount
 
+		attr_accessor :personality
+
+		attr_accessor :place
+
 		before_destroy do |document|
 			document.prepare_cart
 			if document.cart_items.keep_if{|c| c.accepted == true}.size > 0
@@ -76,7 +82,7 @@ module Auth::Concerns::Shopping::CartConcern
 	## @param[Payment] : a payment object can be passed in.
 	## this is used in case there is a new payment which is calling prepare_cart. in that case the new payment has to be also added to the cart_payments. this is alwasy the case when a new payment is made with a status directly set as accepted, i.e for eg a cashier makes a payment on behalf of the customer.
 	def prepare_cart
-
+		
 		find_cart_items
 		
 		set_cart_price
@@ -91,12 +97,17 @@ module Auth::Concerns::Shopping::CartConcern
 
 		set_discount
 
+		set_personality
+
+		set_place
+
 	end
 
 	################ ATTR ACCESSOR SETTERS & GETTERS ##############
 
 	## set the cart items, [Array] of cart items.
 	def find_cart_items
+		puts "find cart items."
 		conditions = {:resource_id => get_resource.id.to_s, :parent_id => self.id.to_s}
 		self.cart_items = Auth.configuration.cart_item_class.constantize.where(conditions).order(:created_at => 'asc')
 		
@@ -109,6 +120,7 @@ module Auth::Concerns::Shopping::CartConcern
 
 	## => 
 	def set_cart_price
+		puts "set cart price"
 		self.cart_price = total_value_of_all_items_in_cart = get_cart_items.map{|c| c = c.price*c.quantity}.sum
 		self.cart_price
 	end
@@ -119,6 +131,7 @@ module Auth::Concerns::Shopping::CartConcern
 
 	
 	def set_cart_payments
+		puts "set cart payments."
 		self.cart_payments = []
 		payments_made_to_this_cart = Auth.configuration.payment_class.constantize.find_payments(get_resource,self)
 		
@@ -135,6 +148,7 @@ module Auth::Concerns::Shopping::CartConcern
 	end
 
 	def set_cart_paid_amount
+		puts "set cart paid amount"
 		total_paid = 0
 		payments = get_cart_payments
 		price = get_cart_price
@@ -249,6 +263,7 @@ module Auth::Concerns::Shopping::CartConcern
 	## then returns a hash with these two instead of the original values.
 	## @used_in : Shopping::PaymentConcern.set_receipt.
 	def prepare_receipt
+		puts "PREPARE RECEIPT-----------------------------------"
 		cart_item_ids = cart_items.map{|c| c = c.id.to_s}
 		cart_payment_ids = cart_payments.map{|c| c = c.id.to_s}
 		receipt = self.attributes.merge({:cart_items => cart_item_ids, :cart_payments => cart_payment_ids})
@@ -326,4 +341,16 @@ module Auth::Concerns::Shopping::CartConcern
 
 	end
 
+	def set_personality
+		return unless self.personality_id
+		puts "self personality id is: #{self.personality_id}"
+		self.personality = Auth.configuration.personality_class.constantize.find(self.personality_id)
+	end
+
+	def set_place
+		return unless self.place_id
+		puts "Self place id is: #{self.place_id}"
+		self.place = Auth.configuration.place_class.constantize.find(self.place_id)
+	end
+
 end

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

@@ -162,7 +162,6 @@ module Auth::Concerns::Shopping::CartItemConcern
 		end
 
 		
-
 		validate :user_cannot_change_anything_if_payment_accepted
 		validate :product_id_exists?
 
@@ -170,8 +169,6 @@ module Auth::Concerns::Shopping::CartItemConcern
 			document.public = "no"
 		end
 
-			
-
 	end
 
 
@@ -193,7 +190,7 @@ module Auth::Concerns::Shopping::CartItemConcern
 	### this is an internal method, cannot be set by admin or anyone, it is done after validation, since it is not necessary for someone to be admin, even the user can call refresh on the record to get the new state of the acceptence.
 	## just checks if the accepted by payment id exists, and if yes, then doesnt do anything, otherwise will update the cart item status as false.
 	def refresh_accepted
-		
+		puts "CALLED REFRESH accepted-----------------------"
 		if self.accepted_by_payment_id
 
 			begin
@@ -202,6 +199,7 @@ module Auth::Concerns::Shopping::CartItemConcern
 				## if the payment status is approved, then dont do anything to the cart item.(we don't retro check payment to cart item.)
 				## if the payment status is not approved, then make the cart item accepted as false.
 				if (payment.payment_status.nil? || payment.payment_status == 0)
+					puts "FOUND THE PAYMENT STATUS TO BE NIL or 0"
 					self.accepted = false
 				end
 			rescue Mongoid::Errors::DocumentNotFound
@@ -234,8 +232,7 @@ module Auth::Concerns::Shopping::CartItemConcern
 	## does not SAVE.
 	def set_accepted(payment,override)
 		
-		#puts "the existing self accepted is:"
-		#puts self.accepted.to_s
+		
 
 		if cart_has_sufficient_credit_for_item?(payment.cart) 
 			
@@ -371,7 +368,7 @@ module Auth::Concerns::Shopping::CartItemConcern
 
 			return if self.new_record?
 
-			puts "accepted changed? #{self.accepted_changed?.to_s}"
+			
 
 			return if self.accepted_changed? 
 

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

@@ -166,7 +166,6 @@ module Auth::Concerns::Shopping::DiscountConcern
 			document.add_verified_ids ||= []
 			document.add_declined_ids ||= []
 
-			
 
 			document.pending = document.pending - ([document.add_declined_ids + document.add_verified_ids].flatten)
 
@@ -189,10 +188,6 @@ module Auth::Concerns::Shopping::DiscountConcern
 	module ClassMethods
 
 		
-
-
-
-		
 		def find_discounts(options)
 			conditions = {:resource_id => nil}
 			conditions[:resource_id] = options[:resource].id.to_s if options[:resource]
@@ -200,8 +195,6 @@ module Auth::Concerns::Shopping::DiscountConcern
 		end
 
 
-		
-
 		## @called_from : payment_concern.rb
 		## @param[String] payment_id 
 		## @return[BSON::Document] the document after the update or nil, in case nothing was updated.

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

@@ -25,7 +25,6 @@ module Auth::Concerns::Shopping::PayUMoneyConcern
 		##remember to set the default_url_options in the dummy app routes file.
 		before_create do |document|
 			if document.is_gateway?
-				
 				document.surl = document.furl = Rails.application.routes.url_helpers.shopping_payment_url(document.id.to_s)
 				document.txnid = document.id.to_s
 				#document.txnid = "a#{Random.new.rand(1..50)}"
@@ -93,8 +92,9 @@ module Auth::Concerns::Shopping::PayUMoneyConcern
 														self.payment_status = 0 if transaction_details["status"].to_s.downcase =~/pending|failure/
 														if payment_status_changed?
 															## prevents recursive callbacks, after save.
+															## actually this may not be necessary here.
 															self.is_verify_payment = "false"
-															self.save
+															## so only if is_verify_payment is true,
 														else
 															self.errors.add(:payment_status,"transaction status was something other than failed|success|pending")
 														end

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

@@ -115,7 +115,7 @@ module Auth::Concerns::Shopping::PaymentConcern
 				
 
 		before_validation do |document|
-			puts "came to before validation."
+			
 			document.set_cart(document.cart_id)
 			
 			document.payment_callback(document.payment_type,document.payment_params)  
@@ -123,7 +123,10 @@ module Auth::Concerns::Shopping::PaymentConcern
 			## we can hook the refresh into this.
 			document.refresh_refund
 			
+			## here the call goes to save it inside
+			## that will again trigger.
 			document.verify_payment
+			
 		end
 
 		## because the validation will not allow the payment status to be changed in case this is not an admin user, and we need to allow the user to refresh the payment state, in case of refunds which need to set as failed because some later refund was accepted but in that callback the nil refund was for some reason not set as failed.
@@ -143,6 +146,7 @@ module Auth::Concerns::Shopping::PaymentConcern
 
 		## when a refund is accepted, any pening refund requests are considered to have failed, since this one has succeeded.
 		after_save do |document|
+			
 			if !document.skip_callback?("after_save")
 
 
@@ -170,10 +174,12 @@ module Auth::Concerns::Shopping::PaymentConcern
 					end
 
 					## set the payment receipt
+					
 					document.set_payment_receipt
 
 				end
 			end
+			
 		end
 
 
@@ -249,12 +255,16 @@ module Auth::Concerns::Shopping::PaymentConcern
 	## called in show action of controller.
 	## return[Array]
 	def 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}"
 			self.payment_receipt[:current_payment] <<  c_item
 		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."
 	end
 
 	##res : 59a5405c421aa90f732c9059
@@ -369,7 +379,12 @@ module Auth::Concerns::Shopping::PaymentConcern
 	end
 
 	def discount_callback(params,&block)
-		
+	
+		## so now what next ?
+		## what about refunds ?
+		## and what about discount coupons for companies ?
+		## can i handle that right now as well ?
+			
 		## the callback should fire on create/update, so new_record checking is not required.
 
 		## first check if the discount id exists -> get the discount object.
@@ -398,7 +413,7 @@ module Auth::Concerns::Shopping::PaymentConcern
 				self.amount = self.discount.discount_amount
 				
 			elsif self.discount.discount_percentage > 0
-				self.amount = self.cart.cart_pending_balance*self.discount.discount_percentage
+				self.amount = self.cart.cart_pending_balance*(self.discount.discount_percentage/100.0)
 			else
 				self.amount = 0
 			end
@@ -458,8 +473,9 @@ module Auth::Concerns::Shopping::PaymentConcern
 	def update_cart_items_accepted
 		
 		if payment_status_changed?
-
+			puts "payment status was changed---------------------"
 			if payment_status == 1
+				puts "PAYMENT STATUS IS 1"
 				self.cart.cart_credit+= self.amount
 			elsif payment_status == 0 && payment_status_was == 1
 				
@@ -469,8 +485,8 @@ module Auth::Concerns::Shopping::PaymentConcern
 			end
 
 		
-
 			cart_item_update_results = self.cart.get_cart_items.map{|cart_item| 
+				puts "CART ITEM OF THE CART IS FOUND"
 				cart_item.signed_in_resource = self.signed_in_resource
 				## first all the expected cart items should exist
 				## then they should all get saved
@@ -486,12 +502,13 @@ module Auth::Concerns::Shopping::PaymentConcern
 				cart_item.set_accepted(self,nil)
 			}.compact.uniq
 			self.errors.add(:cart,"cart item status could not be updated") if cart_item_update_results[0] == false
-		
+			puts "self errors are:"
+			puts self.errors.size
 		else
 			if (payment_status == 0 || payment_status == 1)
 				cart_item_update_results = self.cart.get_cart_items.map{|cart_item|
-					#puts "now mapping cart item"
-					#puts cart_item.id.to_s 
+					puts "VALIDATING IT WITH PAYMENT AT NULL."
+					puts cart_item.id.to_s 
 					cart_item.signed_in_resource = self.signed_in_resource
 					res = cart_item.set_accepted(self,nil)
 					res