caboose-cms 0.6.20 → 0.6.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E4ZjUxYTEyYzFjN2Q1ZTBlNmQ2Y2MwOGMyZjMyNmI4NDlkMjk4OQ==
+    YzdkNGFjZTA5YTcyYTEyZTAxNzhjNTk5OGZlNDNlMDFiMGFkODFjYQ==
   data.tar.gz: !binary |-
-    YmU0N2FkNDZiMjYyNjIxYjIyY2UxNjVmY2QzZTliOWZjYTAxMGQ0ZQ==
+    OWQwZWYxYjQ0MDI5ZjEyY2EzZTRhNTNjOWI0OWYyNTkwYWFmMmU3Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZjJmOGZjNzRkNzI2MmFhYjcyM2VlZGU4OTc4YWE0M2U3NjhjMmM5ZTVlMDg4
-    YzYyZTQxZGYxY2JiYmM0MjQyNmRkYThhOTcxMDFlNWFiYTllZjRmMTJhMTZh
-    YWNiOWVjZjFiMGZhZGE0MmI0ZTVlNWE3YzU2ZmQ4ZjQ3MDUzNTY=
+    NDk3N2FkNWI5ZGEyYjM0ZDI1ZDczOWYzZWMzNDQyOTcyM2FiMTVlOGZmZmE4
+    MGQxMmI1ZDliOTE3NzM2YmY4OGIxYjJhYWZmMmZkMDVhZWQ5OGZiMTA5ZmYz
+    YzgwNGJjZjliOWEzMmUxNWVjOWJhOTVlZDVkNDEzNTY5ZjlmZmY=
   data.tar.gz: !binary |-
-    M2NjZjBmZDdiOTU2MDE4M2M0NjYxOWY2YmMwMWMzY2ExNTIzOTRlYzVlMDE4
-    MzRhMWRjN2FiZTVjNDQzY2Y2NTIxOGJmMTk5MmE1YjExM2Y2YWVmMjlkZjhj
-    YTEyOTExOTY5ZTE3YzAwZTdjMzBhZTk3ZWQzZjhhZDZkNzM3ZjU=
+    OGY2MjcxZDk1YjJjNDcyMWQzYzMzMzZiMzEzNjM3MDZkMzRkYWJkNjBhNzBj
+    ODQwMjNmMzZiY2Y2NTY2MTJkOTlkYzhhNzJhMjQ1ZTg2NTY2Yzk1MDI0YTUw
+    MGNlMTlkMTMyMzY0MDU1MjdhZGU2MWNiMzUxNTc4ZGQ3ODczNjA=

data/app/controllers/caboose/checkout_controller.rb

@@ -57,7 +57,7 @@ module Caboose
       #Caboose.log(@rates.inspect)
       @logged_in_user = logged_in_user
 
-      add_ga_event('checkout', 'shipping')      
+      add_ga_event('Ecommerce', 'Checkout', 'Shipping')            
     end
     
     # Step 4 - Gift cards
@@ -66,8 +66,8 @@ module Caboose
       redirect_to '/checkout'           and return if !logged_in?
       redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
       redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
-      @logged_in_user = logged_in_user
-      add_ga_event('checkout', 'gift-cards')
+      @logged_in_user = logged_in_user      
+      add_ga_event('Ecommerce', 'Checkout', 'Gift Cards')
     end
     
     # Step 5 - Payment
@@ -109,8 +109,8 @@ module Caboose
         when 'payscape'
           @form_url = Caboose::PaymentProcessor.form_url(@order)
       end
-      @logged_in_user = logged_in_user
-      add_ga_event('checkout', 'payment')
+      @logged_in_user = logged_in_user      
+      add_ga_event('Ecommerce', 'Checkout', 'Payment Form')
     end
         
     # GET /checkout/confirm
@@ -128,8 +128,8 @@ module Caboose
           return
         end
       end
-      @logged_in_user = logged_in_user
-      add_ga_event('checkout', 'confirm_without_payment')
+      @logged_in_user = logged_in_user      
+      add_ga_event('Ecommerce', 'Checkout', 'Confirm Without Payment')
     end
     
     # POST /checkout/confirm
@@ -175,8 +175,8 @@ module Caboose
       @logged_in_user = logged_in_user
       
       # Find the last order for the user
-      @last_order = Order.where(:customer_id => @logged_in_user.id).order("id desc").limit(1).first
-      add_ga_event('checkout', 'thanks')
+      @last_order = Order.where(:customer_id => @logged_in_user.id).order("id desc").limit(1).first            
+      add_ga_event('Ecommerce', 'Checkout', 'Payment', (@last_order.total*100).to_i)
     end
     
     #===========================================================================

data/app/controllers/caboose/products_controller.rb

@@ -27,7 +27,7 @@ module Caboose
             @sale_categories[cat] = [] if @sale_categories[cat].nil?
             @sale_categories[cat] << p
           end
-          add_ga_event('products', 'view', 'Sales')
+          add_ga_event('Products', 'View', 'Sales')
           render 'caboose/products/sales' and return
           
         elsif params[:id].to_i > 0 && Product.exists?(params[:id])
@@ -39,7 +39,7 @@ module Caboose
           @reviews        = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
           @logged_in_user = logged_in_user
           
-          add_ga_event('products', 'view', "Product #{@product.id}")
+          add_ga_event('Products', 'View', "Product #{@product.id}")
           render 'caboose/products/details' and return
         end
       end
@@ -119,7 +119,7 @@ module Caboose
       @category = if @filter['category_id'] then Category.find(@filter['category_id'].to_i) else nil end
       
       @pager.set_item_count
-      add_ga_event('products', 'view', "Category #{cat.id}")      
+      add_ga_event('Products', 'View', "Category #{cat.id}")      
     end
     
     def show      

data/app/views/caboose/blocks/_ga_events.html.erb

@@ -1,16 +0,0 @@
-<% if ga_events && ga_events.count > 0 %>
-<script type='text/javascript'>
-<% ga_events.each do |arr| %>
-  <%
-  cat    = arr[0] ? arr[0] : nil 
-  action = arr[1] ? arr[1] : nil 
-  label  = arr[2] ? arr[2] : nil 
-  value  = arr[3] ? arr[3] : nil
-  arr2 = [cat, action]
-  arr2 << (label ? label : '') if label || (label.nil? && value)    
-  arr2 << value if value          
-  %>
-  ga('send', 'event', <% arr2.each do |x| %>, <%= raw Caboose.json(x) %><% end %>);
-<% end %>
-</script>
-<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.20'
+  VERSION = '0.6.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg