wordjelly-auth 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 175b71c3a18b1cf69cde6e8c515ff85898bf853f
-  data.tar.gz: 02a26067e6f60b5111dc96fec8b1e11a8c3b7f10
+  metadata.gz: df0e9694a8b5ecf0415a1bd0987b1d064ac45421
+  data.tar.gz: 70c80d7e46de4f06d1f0220a81526f4b094fb20a
 SHA512:
-  metadata.gz: e55de5b86cd70fcbe9829f572c356c4c9882b3aec5d7e541146b509bc588734cae0c08e7f360aecec60f2a2d8d9eb3f71c62deb1012ddbc86ef485efdccbbc8f
-  data.tar.gz: ce2da498b71b26c56365794980b3fa2441181873a1b4c8203d509261b3b92f4d199700c2b280ad81d7dc0bad27c42b04a28d4b2edfe6734a84041186ad6e5de7
+  metadata.gz: 9ea1ac1f358a6e54a19f3f3aa74903a66e19d1c9fe9780e9bffb8ccfac5fe935f30c82cfee624ff7f95085de62137b18a1486b57b0befb7b1cf27cb5ee6a93af
+  data.tar.gz: f5d48381525347e16f82c3e9ae7689b04d4ed448aa371d9bb922d7f67758e9a4998f9f30c3e2b7493bb2d54cf7090a0311aabd0421b81ade6fd3b497f5fadb2d

data/app/controllers/auth/concerns/shopping/personality_controller_concern.rb

@@ -69,7 +69,7 @@ module Auth::Concerns::Shopping::PersonalityControllerConcern
     respond_to do |format|
       ## with js.
       format.js do 
-        render :partial => "search_result", locals: {search_results: @search_results, suggestions: []}
+        render :partial => "search", locals: {search_results: @search_results, suggestions: []}
       end
       format.json do 
         render json: @search_results.to_json

data/app/controllers/auth/concerns/shopping/place_controller_concern.rb

@@ -74,9 +74,8 @@ module Auth::Concerns::Shopping::PlaceControllerConcern
     query_clause = Auth::Search::Main.es_six_finalize_search_query_clause(args)
     @search_results = Auth.configuration.place_class.constantize.es.search(query_clause,{:wrapper => :load}).results
     respond_to do |format|
-      ## with js.
       format.js do 
-        render :partial => "search_result", locals: {search_results: @search_results, suggestions: []}
+        render :partial => "search", locals: {search_results: @search_results, suggestions: []}
       end
       format.json do 
         render json: @search_results.to_json

data/app/controllers/auth/concerns/work/communication_controller_concern.rb

@@ -2,29 +2,42 @@ module Auth::Concerns::Work::CommunicationControllerConcern
 
   	extend ActiveSupport::Concern
 
-  	## at this stage all we will have is instantiations .
-  	def get_parent_object(parent_object_class,parent_object_id)
-
-      parent_object = nil
-
-      begin
-        parent_object = parent_object_class.constantize.find(parent_object_id)
-        if params[:id]
-          @auth_work_communication = parent_object.communications.select{|c|
-                c.id.to_s == params[:id]
-          }
-          @auth_work_communication = @auth_work_communication.size > 0 ? @auth_work_communication[0] : Auth::Work::Communication.new(@auth_work_communication_params)
-        else
-
+    def set_instruction
+      if product_id = @auth_work_communication_params[:product_id]
+        if instruction_id = @auth_work_communication_params[:instruction_id]
+          if @auth_shopping_product = Auth.configuration.product_class.constantize.find(product_id)
+            @auth_work_instruction = nil
+            @instruction_index = 0
+            @auth_shopping_product.instructions.each do |inst|
+              if inst.id.to_s == instruction_id
+                @auth_work_instruction = inst
+                break
+              end
+              @instruction_index+=1
+            end
+          end
+        end
+      elsif cart_item_id = @auth_work_communication_params[:cart_item_id]
+        if instruction_id = @auth_work_communication_params[:instruction_id]
+          if @auth_shopping_cart_item = Auth.configuration.cart_item_class.constantize.find(cart_item_id)
+            @auth_work_instruction = nil
+            @instruction_index = 0
+            @auth_shopping_cart_item.instructions.each do |inst|
+              if inst.id.to_s == instruction_id
+                @auth_work_instruction = inst
+                break
+              end
+              @instruction_index+=1
+            end
+          end
         end
-      rescue Mongoid::Errors::DocumentNotFound
-        parent_object = parent_object_class.constantize.new
-        @auth_work_communication = Auth::Work::Communication.new(@auth_work_communication_params)
       end
+    end
+
+    def set_cycle
 
-      parent_object
+    end
 
-  	end
 
   	def initialize_vars
 
@@ -37,22 +50,51 @@ module Auth::Concerns::Work::CommunicationControllerConcern
       @auth_work_instruction = nil
 
       if @auth_work_communication_params[:cycle_id]
-          @auth_work_cycle = get_parent_object(@auth_work_cycle_class,@auth_work_communication_params[:cycle_id])
+          set_cycle
       elsif @auth_work_communication_params[:instruction_id]
-          @auth_work_instruction = get_parent_object(@auth_work_instruction_class,@auth_work_communication_params[:instruction_id])
+          set_instruction
       else
           not_found("please provide a cycle id or an instruction id")
       end      
 
+      not_found("instruction not found") unless @auth_work_instruction 
+
+      ## if the communication id is found, otherwise instantiate a new communication from the params.
+      if params[:id]
+        begin
+          @auth_work_communication = @auth_work_communication_class.find(params[:id])
+        rescue Mongoid::Errors::DocumentNotFound
+          @auth_work_communication = @auth_work_communication_class.new(@auth_work_communication_params)  
+        end
+      else
+        @auth_work_communication = @auth_work_communication_class.new(@auth_work_communication_params)
+      end
+
+
     end
 
     def create
-
+      if @auth_shopping_product
+        @auth_work_instruction.communications << @auth_work_communication
+        @auth_shopping_product.instructions[@instruction_index] = @auth_work_instruction
+        @auth_shopping_product.save
+      end
+      respond_to do |format|
+        format.html do 
+          render "show"
+        end
+        format.json do 
+          render :json => @auth_work_communication.to_json
+        end
+      end
     end
 
     def new
-      ## now new has to render this form.
-      ## and it has to determine the url and the 
+      
+    end
+
+    def edit
+
     end
 
     def index
@@ -60,7 +102,7 @@ module Auth::Concerns::Work::CommunicationControllerConcern
     end
 
     def update
-
+      ## now this still needs to be coded but will come to that later.
     end
 
     def show
@@ -72,7 +114,7 @@ module Auth::Concerns::Work::CommunicationControllerConcern
     end
 
 	  def permitted_params
-	  	pr = params.permit({:communication => [:send_email,:email_template_path,:method_to_determine_recipients,:repeat,:repeat_times,:method_to_determine_communication_timing,:enqueue_at_time]}, :id, :instruction_id,:cycle_id)
+	  	pr = params.permit({:communication => [:send_email,:email_template_path,:method_to_determine_recipients,:repeat,:repeat_times,:method_to_determine_communication_timing,:enqueue_at_time,:instruction_id,:cycle_id,:cart_item_id, :product_id, :name, :description]}, :id)
 	  end
 
 end

data/app/controllers/auth/concerns/work/instruction_controller_concern.rb

@@ -23,6 +23,9 @@ module Auth::Concerns::Work::InstructionControllerConcern
         else
           @auth_work_instruction = @auth_work_instruction_class.new(@auth_work_instruction_params)
         end
+      else
+
+        puts "product not found."
       end
     rescue Mongoid::Errors::DocumentNotFound
        @auth_shopping_product = @auth_shopping_product_class.new
@@ -50,7 +53,7 @@ module Auth::Concerns::Work::InstructionControllerConcern
           render json: @auth_work_instruction.to_json
         end
         format.html do 
-          render :partial => "show.html.erb", locals: {instruction: @auth_work_instruction, product: @auth_shopping_product}
+          render "show"
         end
     end
   end
@@ -89,7 +92,7 @@ module Auth::Concerns::Work::InstructionControllerConcern
   end
 
   def new
-    
+    puts "the product is: #{@auth_shopping_product.to_s}"
   end
 
   def edit

data/app/controllers/auth/work/communications_controller.rb

@@ -13,6 +13,4 @@ class Auth::Work::CommunicationsController < Auth::Work::WorkController
     before_filter :initialize_vars , TCONDITIONS
     before_filter :is_admin_user , :only => [:create,:update,:destroy,:edit]
     
-    
-
 end

data/app/jobs/communication_job.rb

@@ -0,0 +1,19 @@
+class CommunicationJob < ActiveJob::Base
+  queue_as :default
+  self.queue_adapter = :delayed_job
+
+  ##we currently log all exceptions to redis.
+  rescue_from(StandardError) do |exception|
+  	puts exception.message
+   	puts exception.backtrace.join("\n")
+  end
+ 
+  def perform(arguments)
+    if communication = Auth.configuration.communication_class.constantize.find_communication(arguments)
+      if time = communication.deliver_all
+        CommunicationJob.set(wait_until: time).perform_later(arguments)
+      end
+    end
+  end
+
+end

data/app/mailers/auth/send_mail.rb

@@ -4,12 +4,9 @@ class Auth::SendMail < ActionMailer::Base
 		@options = opts || {}
 		raise "no recipient address" unless @options[:to]
 		raise "no subject" unless @options[:to]
+		
 		mail(to: @options[:to], subject: @options[:subject]) do |format|
 			format.html { render @options[:template] || "send"  }
 		end	
 	end
-	## okay so for this, we will pass it to otp job only.
-	## with some arguments.
-	## why not use whatever emailer i was using before ?
-	## okay so the next step is to send this whole notification into a delayed job.
 end

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

@@ -12,6 +12,10 @@ module Auth::Concerns::Shopping::CartItemConcern
 
 	included do 
 
+		embeds_many :instructions, :class_name => "Auth::Work::Instruction", :as => :cart_item_instructions
+			
+
+
 		INDEX_DEFINITION = {
 			index_options:  {
 			        settings:  {
@@ -80,9 +84,7 @@ module Auth::Concerns::Shopping::CartItemConcern
 			    }
 			}
 		}
-		
-
-
+	
 
 		##PERMITTED
 		##the id of the product to which this cart item refers.
@@ -169,6 +171,25 @@ module Auth::Concerns::Shopping::CartItemConcern
 			document.public = "no"
 		end
 
+		## first of all how are the instructions copied over from the product to the cart item.
+		## that's it, now all the communication instructions are enqueued.
+		## next step, get a simple notification to be sent by email, and also by sms -> as soon as the time comes for it to be done.
+		after_save do |document|
+			puts "came to after_save document #{document.accepted_changed?}"
+			puts "is it true :#{document.accepted == true}"
+			if document.accepted_changed? && document.accepted == true
+				puts "accepted changed."
+				document.instructions.each do |instruction|
+					puts "doing instruction: #{instruction.id.to_s}"
+					instruction.communications.each do |communication|
+						## Test seperately?
+						## =>  fuck that.
+						puts "doing communication: #{communication.id.to_s}"
+						CommunicationJob.set(wait_until: communication.set_enqueue_at).perform_later({:cart_item_id => document.id.to_s, :instruction_id => instruction.id.to_s, :communication_id => communication.id.to_s})
+					end
+				end
+			end
+		end
 	end
 
 
@@ -190,7 +211,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-----------------------"
+		#puts "CALLED REFRESH accepted-----------------------"
 		if self.accepted_by_payment_id
 
 			begin
@@ -199,7 +220,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"
+					#puts "FOUND THE PAYMENT STATUS TO BE NIL or 0"
 					self.accepted = false
 				end
 			rescue Mongoid::Errors::DocumentNotFound
@@ -292,8 +313,8 @@ module Auth::Concerns::Shopping::CartItemConcern
 				}
 			)
 
-			puts "the doc after update is:"
-			puts doc_after_update.attributes.to_s
+			#puts "the doc after update is:"
+			#puts doc_after_update.attributes.to_s
 
 			return false unless doc_after_update
 			return false if doc_after_update.accepted != self.accepted
@@ -307,9 +328,9 @@ module Auth::Concerns::Shopping::CartItemConcern
 	## the #debit function returns the current cart credit.
 	## return true or false depending on whether , after debiting there is any credit left in the cart or not.
 	def cart_has_sufficient_credit_for_item?(cart)
-		puts "cart credit is: #{cart.cart_credit}"
+		#puts "cart credit is: #{cart.cart_credit}"
 		cart_has_credit = cart.debit((self.accept_order_at_percentage_of_price*self.price)) >= 0
-		puts "cart has credit is: #{cart_has_credit.to_s}"
+		#puts "cart has credit is: #{cart_has_credit.to_s}"
 		cart_has_credit
 	end
 
@@ -405,10 +426,11 @@ module Auth::Concerns::Shopping::CartItemConcern
 			if self.product_id
 	 			if product = Auth.configuration.product_class.constantize.find(product_id)
 	 				product_attributes_to_assign.each do |attr|
-	 					## only if the present attribute is nil, then we assign it from the product.
 	 					if self.respond_to? attr.to_sym
 		 					if self.send("#{attr}").nil?
 		 						self.send("#{attr}=",product.send("#{attr}"))
+		 					elsif (self.send("#{attr}").respond_to? :embedded_in) && (self.send("#{attr}").empty?)
+		 						self.send("#{attr}=",product.send("#{attr}"))
 		 					end
 	 					end
 	 				end
@@ -416,11 +438,11 @@ module Auth::Concerns::Shopping::CartItemConcern
 	 		end
 	 	rescue
 
-	 	end
+	 	end 
 	end
 
 	def product_attributes_to_assign
-		["name","price","bunch"]
+		["name","price","bundle_name","instructions"]
 	end
 
 	## this is got by multiplying the price of the cart item by the minimum_acceptable at field.

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

@@ -2,7 +2,8 @@ module Auth::Concerns::Shopping::PlaceConcern
 
 	extend ActiveSupport::Concern
 	include Auth::Concerns::OwnerConcern
-	
+	include Auth::Concerns::EsConcern	
+
 
 	included do 
 

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

@@ -10,10 +10,11 @@ module Auth::Concerns::Shopping::ProductConcern
 
 	included do 
 	
-		#embeds_many :specifications, :class_name => Auth.configuration.specification_class
+		
 
 		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_options:  {

data/app/models/auth/concerns/work/communication_fields_concern.rb

@@ -0,0 +1,82 @@
+## this should be added to any class that embeds communication.rb
+module Auth::Concerns::Work::CommunicationFieldsConcern
+
+	extend ActiveSupport::Concern
+	
+	included do 	
+				
+		####################################################################
+		##
+		##
+		## COMMON FIELDS
+		##
+		## defaults to the home page.
+		##
+		####################################################################
+		field :link, type: String, default: Auth.configuration.host_name
+
+		####################################################################
+		##
+		##
+		## EMAIL RELATED FIELDS.
+		##
+		##
+		####################################################################
+		field :email_subject, type: String, default: "Attention : #{Auth.configuration.brand_name}"
+		field :email_content, type: String, default: "Hi this email is from #{Auth.configuration.brand_name}"
+
+		####################################################################
+		##
+		## 
+		## SMS RELATED FIELDS.
+		##
+		##
+		####################################################################
+		field :sms_content, type: String, default: "Hi this message is from #{Auth.configuration.brand_name}"
+		
+		####################################################################
+		##
+		##
+		## MOBILE NOTIFICATIONS.
+		##
+		##
+		####################################################################
+		field :notification_badge, type: String, default: "default"
+		field :notification_content, type: String, default: "Hi this message is from #{Auth.configuration.brand_name}"
+
+		########################################################################
+		##
+		##
+		## It is expected that form fields will be added to the implementing object, for all the fields above. At the same time, the implementing object can override the methods below to provided customization for the fields. In the end, communication.rb, will call these methods on the parent object(eg instruction/cycle), and use the returned values, while sending the notifications.
+		## so for instructions what would you like to have ?
+		##
+		##
+		########################################################################
+		
+	end
+
+	def get_link(args={})
+		self.link
+	end
+
+	def get_email_subject(args={})
+		self.email_subject
+	end
+
+	def get_email_content(args={})
+		self.email_content
+	end
+
+	def get_sms_content(args={})
+		self.sms_content
+	end
+
+	def get_notification_badge(args={})
+		self.notification_badge
+	end
+
+	def get_notification_content(args={})
+		self.notification_content
+	end
+
+end