wordjelly-auth 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20bc9b5081d66477ee0989ac143f8a60f478ce80
-  data.tar.gz: 26ec2c00029ee39d59fdc93fc13e5282a254b27b
+  metadata.gz: 175b71c3a18b1cf69cde6e8c515ff85898bf853f
+  data.tar.gz: 02a26067e6f60b5111dc96fec8b1e11a8c3b7f10
 SHA512:
-  metadata.gz: 1a7120152153b13ef4f10b7b4db6fc518877aa21ab8614c2b70f578d59e2a90da204e822a6ceb73782fef3bd6c2d2752a3e3b9bfbc271504bdf4d8443f2c653f
-  data.tar.gz: adbc0907a82f757b9b4cc225ab4789a40a2f9090b37d49684c15ad37a03a067780758055d551b71e73600d578b3555a7f22bc9423e5e9c50ec653665006f2d0e
+  metadata.gz: e55de5b86cd70fcbe9829f572c356c4c9882b3aec5d7e541146b509bc588734cae0c08e7f360aecec60f2a2d8d9eb3f71c62deb1012ddbc86ef485efdccbbc8f
+  data.tar.gz: ce2da498b71b26c56365794980b3fa2441181873a1b4c8203d509261b3b92f4d199700c2b280ad81d7dc0bad27c42b04a28d4b2edfe6734a84041186ad6e5de7

data/app/assets/javascripts/auth/auth_dependencies.js

@@ -14,6 +14,21 @@ $(document).ready(function() {
 });
 ***/
 
+document.addEventListener("turbolinks:load", function() {
+  $('.modal').modal();
+  $('.tabs').tabs();
+  $('.sidenav').sidenav();
+  $('.collapsible').collapsible();
+  $('.parallax').parallax();
+  $('.datepicker').datepicker();
+  $('select').formSelect();
+});
+
+
+ $(document).ready(function(){
+    $('select').formSelect();
+  });
+
 $(document).ready(function(){
     $('.modal').modal();
 });
@@ -32,4 +47,8 @@ $(document).ready(function(){
 
 $(document).ready(function(){
     $('.parallax').parallax();
-  });
+});
+
+$(document).ready(function(){
+    $('.datepicker').datepicker();
+});

data/app/assets/stylesheets/auth/common-styles.scss

@@ -83,10 +83,25 @@
 	font-size:23px !important;
 }
 
+.fs-24{
+	font-size:24px !important;
+}
+
 .fs-25{
 	font-size:25px !important;
 }
 
+.fs-26{
+	font-size:26px !important;
+}
+
+.fs-27{
+	font-size:27px !important;
+}
+
+.fs-28{
+	font-size:28px !important;
+}
 
 .fs-30{
 	font-size:30px !important;

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

@@ -99,7 +99,7 @@ module Auth::Concerns::Shopping::CartControllerConcern
 
   ##override this def in your controller, and add attributes to transaction:[], each of the attributes in the transaction key will be cycled through, and if those fields exist on the cart_item, then they will be set.
   def permitted_params
-    params.permit({cart: [:discount_id,:name, :notes, {:add_cart_item_ids => []},{:remove_cart_item_ids => []}]},:id)
+    params.permit({cart: [:personality_id, :place_id, :discount_id,:name, :notes, {:add_cart_item_ids => []},{:remove_cart_item_ids => []}]},:id)
   end
 
-end
+end

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

@@ -7,6 +7,7 @@ module Auth::Concerns::Shopping::CartItemControllerConcern
     ## to be able to initialize a cart item from a product
     ## inside the create_multiple def.
     include Auth::Shopping::Products::ProductsHelper
+    include Auth::Shopping::CartItems::CartItemsHelper
 
   end
 
@@ -88,6 +89,29 @@ module Auth::Concerns::Shopping::CartItemControllerConcern
   ##
   ##
   ############################################################
+  ## need to add this to the route.
+  ## and need to provide a link to this, and that's the end of this part.
+  def create_package_items
+    cart_items = []
+    params[:product_ids].each do |product_id|
+      cart_item = Auth.configuration.cart_item_class.constantize.new(product_id: product_id)
+      cart_item.resource_id = lookup_resource.id.to_s
+      cart_item.resource_class = lookup_resource.class.name.to_s
+      cart_item.signed_in_resource = current_signed_in_resource
+      cart_item.save
+      cart_items << cart_item
+    end
+    respond_to do |format|
+      format.html do 
+        redirect_to cart_items_path
+      end
+      format.json do 
+        render :json => cart_items.to_json
+      end
+    end
+  end
+
+
   def create_multiple
     #puts "came to create multiple."
     #puts "params are:"

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

@@ -37,7 +37,7 @@ module Auth::Concerns::Shopping::DiscountControllerConcern
     respond_with @auth_shopping_discount
   end
 
-  ##only permits the quantity to be changed, transaction id is internally assigned and can never be changed by the external world.
+ 
   def update
 
     check_for_update(@auth_shopping_discount)
@@ -45,8 +45,8 @@ module Auth::Concerns::Shopping::DiscountControllerConcern
     @auth_shopping_discount.assign_attributes(@auth_shopping_discount_params)
     @auth_shopping_discount = add_owner_and_signed_in_resource(@auth_shopping_discount)  
 
-    
     @auth_shopping_discount.save
+
     respond_with @auth_shopping_discount
   end
 

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

@@ -16,6 +16,7 @@ module Auth::Concerns::Shopping::PaymentControllerConcern
 
   def show
     @auth_shopping_payment = add_signed_in_resource(@auth_shopping_payment)
+  
     @auth_shopping_payment.set_payment_receipt
     respond_with @auth_shopping_payment
   end
@@ -27,8 +28,10 @@ module Auth::Concerns::Shopping::PaymentControllerConcern
   end
 
   def new
+    puts "these are payment attributes"
+    puts @auth_shopping_payment.attributes.to_s
     @auth_shopping_payment = add_owner_and_signed_in_resource(@auth_shopping_payment)
-    ## so simply render the new action anyways.
+    @auth_shopping_payment.set_cart(@auth_shopping_payment.cart_id)
   end
 
   def edit
@@ -68,7 +71,7 @@ module Auth::Concerns::Shopping::PaymentControllerConcern
     #puts "these are the attributes assigned in the update action."
     #puts @auth_shopping_payment.attributes.to_s
     @auth_shopping_payment.payment_params = params
-    #puts "assigned params."
+   
     save_response = @auth_shopping_payment.save
     
     ## if save successfull then otherwise, respond_with edit.

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

@@ -0,0 +1,88 @@
+module Auth::Concerns::Shopping::PersonalityControllerConcern
+
+  extend ActiveSupport::Concern
+
+  included do
+    include Auth::Shopping::Personalities::PersonalitiesHelper
+  end
+
+  ##if an id is provided in the permitted params then tries to find that in the database, and makes a new cart item out of it.
+  #if no id is provided then creates a new personality from the permitted params, but excluding the id key.
+  #if a collection i.e plural resources is present in the permitted_params and its also there in our auth resources, then create a resource class and resource symbol out of it and assign resource as in the comments.
+  def initialize_vars
+    instantiate_shopping_classes
+
+    @auth_shopping_personality_params = permitted_params.fetch(:personality,{})
+    @auth_shopping_personality = params[:id] ? @auth_shopping_personality_class.find_self(params[:id],current_signed_in_resource) : @auth_shopping_personality_class.new(@auth_shopping_personality_params)
+    
+  end
+
+
+  ##expects the product id, resource_id is the logged in resource, and quantity 
+  def create
+    ##ensure that the cart item is new
+   
+    check_for_create(@auth_shopping_personality)
+    @auth_shopping_personality = add_owner_and_signed_in_resource(@auth_shopping_personality)
+     
+    @auth_shopping_personality.save
+
+    respond_with @auth_shopping_personality
+  end
+
+  ##only permits the quantity to be changed, transaction id is internally assigned and can never be changed by the external world.
+  def update
+    check_for_update(@auth_shopping_personality)
+    @auth_shopping_personality.assign_attributes(@auth_shopping_personality_params)
+    @auth_shopping_personality = add_owner_and_signed_in_resource(@auth_shopping_personality)  
+    @auth_shopping_personality.save
+    puts @auth_shopping_personality.errors.full_messages.to_s
+    respond_with @auth_shopping_personality
+  end
+
+  def show
+    not_found if @auth_shopping_personality.nil?
+    respond_with @auth_shopping_personality 
+  end
+
+  ##should show those cart items which do not have a parent_id.
+  ##since these are the pending cart items.
+  ##all remaining cart items have already been assigned to carts
+  def index
+    @auth_shopping_personalities = @auth_shopping_personality_class.find_personalities({:resource => lookup_resource}).page 1
+    respond_with @auth_shopping_personalities
+  end
+
+
+  ##can be removed.
+  ##responds with 204, and empty response body, if all is ok.
+  def destroy
+    not_found if @auth_shopping_personality.nil?
+    @auth_shopping_personality.destroy
+    respond_with @auth_shopping_personality
+  end
+
+  def search
+    args = {:query_string => params[:query_string]}
+    query_clause = Auth::Search::Main.es_six_finalize_search_query_clause(args)
+    @search_results = Auth.configuration.personality_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: []}
+      end
+      format.json do 
+        render json: @search_results.to_json
+      end
+    end
+  end
+
+
+  ## this permitted params is overridden in the dummy app, and as a result throws unpermitted parameters for the daughter app parameters, even though they are subsequently permitted, since super is called first.
+  def permitted_params
+
+    params.permit({personality: [:date_of_birth, :fullname, :sex]},:id, :query_string)
+    
+  end
+
+end

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

@@ -0,0 +1,96 @@
+module Auth::Concerns::Shopping::PlaceControllerConcern
+
+  extend ActiveSupport::Concern
+
+  included do
+      
+    ## to be able to initialize a cart item from a product
+    ## inside the create_multiple def.
+    include Auth::Shopping::Places::PlacesHelper
+
+  end
+
+  
+
+  ##if an id is provided in the permitted params then tries to find that in the database, and makes a new cart item out of it.
+  #if no id is provided then creates a new place from the permitted params, but excluding the id key.
+  #if a collection i.e plural resources is present in the permitted_params and its also there in our auth resources, then create a resource class and resource symbol out of it and assign resource as in the comments.
+  def initialize_vars
+    instantiate_shopping_classes
+
+  
+    @auth_shopping_place_params = permitted_params.fetch(:place,{})
+    @auth_shopping_place = params[:id] ? @auth_shopping_place_class.find_self(params[:id],current_signed_in_resource) : @auth_shopping_place_class.new(@auth_shopping_place_params)
+    
+  end
+
+
+  ##expects the product id, resource_id is the logged in resource, and quantity 
+  def create
+    ##ensure that the cart item is new
+   
+    check_for_create(@auth_shopping_place)
+    @auth_shopping_place = add_owner_and_signed_in_resource(@auth_shopping_place)
+     
+    @auth_shopping_place.save
+
+    respond_with @auth_shopping_place
+  end
+
+  ##only permits the quantity to be changed, transaction id is internally assigned and can never be changed by the external world.
+  def update
+    check_for_update(@auth_shopping_place)
+    @auth_shopping_place.assign_attributes(@auth_shopping_place_params)
+    @auth_shopping_place = add_owner_and_signed_in_resource(@auth_shopping_place)  
+    @auth_shopping_place.save
+    puts @auth_shopping_place.errors.full_messages.to_s
+    respond_with @auth_shopping_place
+  end
+
+  def show
+    not_found if @auth_shopping_place.nil?
+    respond_with @auth_shopping_place 
+  end
+
+  ##should show those cart items which do not have a parent_id.
+  ##since these are the pending cart items.
+  ##all remaining cart items have already been assigned to carts
+  def index
+    @auth_shopping_places = @auth_shopping_place_class.find_places({:resource => lookup_resource}).page 1
+    respond_with @auth_shopping_places
+  end
+
+
+  ##can be removed.
+  ##responds with 204, and empty response body, if all is ok.
+  def destroy
+    not_found if @auth_shopping_place.nil?
+    @auth_shopping_place.destroy
+    respond_with @auth_shopping_place
+  end
+
+  def search
+    args = {:query_string => params[:query_string]}
+    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: []}
+      end
+      format.json do 
+        render json: @search_results.to_json
+      end
+    end
+  end
+
+  ## this permitted params is overridden in the dummy app, and as a result throws unpermitted parameters for the daughter app parameters, even though they are subsequently permitted, since super is called first.
+  def permitted_params
+
+    params.permit({place: [:full_address, :unit_number, :building, :street, :pin_code, :city, :country_state, :country, :latitude, :longitude]},:id,:query_string)
+    
+
+  end
+
+end
+

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

@@ -15,16 +15,11 @@ module Auth::Concerns::Shopping::ProductControllerConcern
     puts "current signed in resource: #{current_signed_in_resource}"
     @auth_shopping_product = params[:id] ? @auth_shopping_product_class.find_self(params[:id],current_signed_in_resource) : @auth_shopping_product_class.new(@auth_shopping_product_params)
   end
-
   
 
   def create
     check_for_create(@auth_shopping_product)
     @auth_shopping_product = add_owner_and_signed_in_resource(@auth_shopping_product,{:owner_is_current_resource => true})
-    #puts "this is the auth shopping product"
-    #puts @auth_shopping_product.embedded_document
-    #puts @auth_shopping_product.embedded_document_path
-  	#@auth_shopping_product.send("#{@auth_shopping_product.embedded_document_path}=",@auth_shopping_product.embedded_document) if (@auth_shopping_product.embedded_document && @auth_shopping_product.embedded_document_path)
     @auth_shopping_product.save
     respond_with @auth_shopping_product
     
@@ -34,47 +29,63 @@ module Auth::Concerns::Shopping::ProductControllerConcern
     check_for_update(@auth_shopping_product)
     @auth_shopping_product = add_owner_and_signed_in_resource(@auth_shopping_product,{:owner_is_current_resource => true})
     @auth_shopping_product.assign_attributes(@auth_shopping_product_params)
-
-    ## assigns the embedded document to the provided path. 
-=begin
-    if @auth_shopping_product.embedded_document_path
-      curr_element = nil
-      total_els = @auth_shopping_product.embedded_document_path.split(".").size
-      @auth_shopping_product.embedded_document_path.split(".").each_with_index {|path,key|
-        if key == (total_els - 1)
-          if curr_element.nil?
-            @auth_shopping_product.send(path + "=",@auth_shopping_product.embedded_document)
-          else
-            curr_element.send(path + "=",@auth_shopping_product.embedded_document) if (path =~ /[a-z]+/)
-            curr_element.send(:[]=,path.to_i,@auth_shopping_product.embedded_document) if (path =~ /\d+/)
-          end
-        else  
-          if curr_element.nil?
-            curr_element = @auth_shopping_product.send(path)
-          else
-            curr_element = curr_element.send(path) if (path =~ /[a-z]+/)
-            curr_element = curr_element[path.to_i] if path=~/\d+/
-          end
-        end
-      }
-    end
-=end    
-    ## prune nil elements.
-    ## at all levels.
-
     @auth_shopping_product.save
     respond_with @auth_shopping_product
     
   end
 
+  ## index can accept product bundle as a parameter.
+  ## like only show the bundles.
+  ## if we want to show that then?
+  ## okay so let us add that bundle parameter.
   def index
     instantiate_shopping_classes
-    @auth_shopping_products = @auth_shopping_product_class.all
+    if params[:query_string]
+      if params[:autocomplete_bundle_name]
+        ## in this case, the autocomplete query has to be done.
+        args = {:query_string => params[:query_string]}
+        query = Auth::Search::Main.es_six_finalize_search_query_clause(args)
+        Auth.configuration.product_class.constantize.bundle_autocomplete_aggregation(query)
+        @auth_shopping_results = Auth.configuration.product_class.constantize.es.search(query,{:wrapper => :load}).results
+      end
+    elsif params[:group_by_bundles]
+      results = Auth.configuration.product_class.constantize.collection.aggregate([
+        {
+          "$match" => {
+            "bundle_name" => {
+              "$exists" => true
+            }
+          }
+        },
+        {
+          "$group" => {
+            "_id" => "$bundle_name",
+            "products" => {
+              "$push" => "$$ROOT"
+            }
+          }
+        }
+      ])
+      ## we need them keyed by the bundle name.
+      @products_grouped_by_bundle = {}
+      @auth_shopping_products = []
+      results.each do |result|
+        bundle_name = result["_id"]
+        products = result["products"].map{|c| c = Auth.configuration.product_class.constantize.new(c)}
+        @products_grouped_by_bundle[bundle_name] = products
+      end
+    else
+      @auth_shopping_products = @auth_shopping_product_class.all
+    end
+        
+    
+
   end
 
   def show
     instantiate_shopping_classes
     @auth_shopping_product = @auth_shopping_product_class.find(params[:id])
+    
     ## will render show.json.erb if its a json request.
   end
 
@@ -92,15 +103,15 @@ module Auth::Concerns::Shopping::ProductControllerConcern
 
   end
 
-  ## so now two additional keys get added
-  ## one -> embedded_document_path
-  ## two -> embedded_document.
-  def permitted_params
-    ## we just keep the embedded_document_path
-    ## i need to change the controllers back to product
-    ## and i need to 
-  	pr = params.permit({:product => [:name,:price]})
+  ## first create a new product with a bundle.
+  ## so let me modify that part first.
+  def permitted_params 
+  	pr = params.permit({:product => [:name,:price,:bundle_name]})
   end
 
+
+  
+
+
 end