caboose-cms 0.5.196 → 0.5.197

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjM1ZjMxZmM0YzU4MjdmNDIyY2RhZWZkNjgyODIyMjRkZGI3ZmExYw==
+    YmNlZjNhZGU4Y2JlNDJmODYwYjNiODhhYjY2ZGFlYjE3YjM5MjUyYw==
   data.tar.gz: !binary |-
-    MDA3YjM5NDk0Y2E2ODlhZDM0YjQyMzMwMmZlMDJlNDA0NzgzYWIxYQ==
+    MzAzOWQ1NjlmYTE2ODBhYjQ1NGIzNDNmZjBiN2NjZGFhMGJlYzQzOQ==
 SHA512:
   metadata.gz: !binary |-
-    OGEzN2I1Nzc0YWU4NWM4YWY0OTMwMTQ2NWZiMGY3ZDFkNmI4MWY5ZjdhYWNj
-    OWEzYThjMGM0OGZiYmE5MDEzOTAxMDg3N2QzYWI4Yjg3YjIxN2RkNTA5N2Yx
-    NGM0MmJkM2U4OTExN2QxM2M1YWJlNzMyN2EwMWQwNTU1NzkxMjY=
+    YzFkNmE2MmQ1NzlmMTBlYWMwNWI3ODNhNTg5YzFmOWE5OTlkODhkNWUxODk0
+    ZDIxNWE3MDdiN2VhMmJhNDU0MWM2ODA3NmUyMWIyYzJjMmFiNGY5YzMzZWE2
+    NmE5MGFhOTg4ZmQ0MDZlN2Y4YWJmMGQxMmNiNTRhMTMwNjVhYzY=
   data.tar.gz: !binary |-
-    NzE2Y2YyOWNiMTIwNDIzNmExNDhmMjNiNjE4NTBmOWJjZjFmZjU0NDcyMjlh
-    YTFkNDNjNmFhM2NlNjFkOWQ0MGNmZjZiM2YyNTYyODU1M2U0NTMyMmE4YjNi
-    MjM2MzFjNTg3MWE1MTc5ZTY2YWZhYWQ3ODNkYmQzNWNkY2JiYTg=
+    OWUxNzZmZDY2ZWY5NzA4ZWU1YTQ1NjQyNjEyNTUxMTIxMjg4NGVmMDRlNTA0
+    ZjI5ZmIwMDBhMTk0ZTYzOWVkMzJhZjdkZWIyNGQzN2JlZTM5MWUwNGJlYTY1
+    ZWE3YzI0NmFmOWZlMzg2MTY4OGRiYTkzYWVjZGVkODg2N2JmNGU=

data/app/controllers/caboose/retargeting_controller.rb

@@ -29,7 +29,7 @@ module Caboose
         case name          
           when 'conversion_id'      then rc.conversion_id      = value    
           when 'labels_function'    then rc.labels_function    = value
-          when 'fb_pixels_function' then rc.fb_pixels_function = value
+          when 'fb_pixel_id'        then rc.fb_pixel_id        = value
     	  end
     	end
     	

data/app/models/caboose/retargeting_config.rb

@@ -7,7 +7,7 @@ module Caboose
       :site_id,
       :conversion_id,      
       :labels_function,
-      :fb_pixels_function
+      :fb_pixel_id
     
     def labels(request, page)
       return [] if self.labels_function.nil? || self.labels_function.strip.length == 0      
@@ -16,15 +16,7 @@ module Caboose
       return [] if arr.nil?
       return [arr] if arr is_a? String
       return arr        
-    end
-    
-    def fb_pixels(request, page)
-      return [] if self.fb_pixels_function.nil? || self.fb_pixels_function.strip.length == 0
-      arr = eval(self.fb_pixels_function)
-      return [] if arr.nil?
-      return [arr] if arr.is_a?(String) || arr.is_a?(Integer)
-      return arr        
-    end
+    end        
     
   end  
 end

data/app/models/caboose/schema.rb

@@ -77,6 +77,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :decremented           
       ],        
       #Caboose::PageCache => [:block],
+      #Caboose::RetargetingConfig => [:fb_pixels_function],
       Caboose::ShippingPackage => [:price, :carrier, :service_code, :service_name, :shipping_method_id, :length, :width, :height],
       Caboose::Site => [:shipping_cost_function],
       Caboose::StoreConfig => [:use_usps, :allowed_shipping_codes, :default_shipping_code, :pp_relay_url, :pp_response_url],
@@ -506,7 +507,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :site_id               , :integer ],
         [ :conversion_id         , :string  ],                
         [ :labels_function       , :text    ],
-        [ :fb_pixels_function    , :text    ]
+        [ :fb_pixel_id           , :string  ]        
       ],
       Caboose::Review => [
         [ :product_id            , :integer   ],

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

@@ -19,8 +19,8 @@
     </noscript>
   <% end %>
   <%
-  # Facebook audiences  
-  %><% rc.fb_pixels(request, page).each do |pixel_id| %>  
+  # Facebook audiences
+  %><% if rc.fb_pixel_id && rc.fb_pixel_id.strip.length > 0 %>    
     <script>(function() {
       var _fbq = window._fbq || (window._fbq = []);
       if (!_fbq.loaded) {
@@ -31,11 +31,11 @@
         s.parentNode.insertBefore(fbds, s);
         _fbq.loaded = true;
       }
-      _fbq.push(['addPixelId', '<%= raw pixel_id %>']);
+      _fbq.push(['addPixelId', '<%= raw rc.fb_pixel_id %>']);
     })();
     window._fbq = window._fbq || [];
     window._fbq.push(['track', 'PixelInitialized', {}]);
     </script>
-    <noscript><img height="1" width="1" alt="" style="display:none" src="https://www.facebook.com/tr?id=<%= raw pixel_id %>&amp;ev=PixelInitialized" /></noscript>
+    <noscript><img height="1" width="1" alt="" style="display:none" src="https://www.facebook.com/tr?id=<%= raw rc.fb_pixel_id %>&amp;ev=PixelInitialized" /></noscript>
   <% end %>
 <% end %>

data/app/views/caboose/retargeting/admin_edit.html.erb

@@ -5,11 +5,9 @@ rc = s.retargeting_config
 <%= render :partial => 'caboose/sites/admin_header' %>
 
 <p><div id='site_<%= s.id %>_use_retargeting'   ></div></p>
-
-<h2>Google Audiences</h2>
+<p><div id='retargetingconfig_<%= rc.id %>_fb_pixel_id' ></div></p>
 <p><div id='retargetingconfig_<%= rc.id %>_conversion_id'   ></div></p>
-<h3>Conversion Labels</h3>
-<p><code>def conversion_labels_function(request, page) {</code></p>
+<p><code>def google_conversion_labels_function(request, page) {</code></p>
 <p><div id='retargetingconfig_<%= rc.id %>_labels_function' ></div></p>
 <p><code>
 &nbsp;&nbsp;# This function returns a conversion label string or an array of conversion label strings.<br />
@@ -19,18 +17,6 @@ rc = s.retargeting_config
 &nbsp;&nbsp;# return ["abc123", "xyz456"]<br />
 }</code></p>
 
-<h2>Facebook Pixel IDs</h2>
-<p><code>def facebook_pixel_ids(request, page) {</code></p>
-<p><div id='retargetingconfig_<%= rc.id %>_fb_pixels_function' ></div></p>
-<p><code>
-&nbsp;&nbsp;# This function returns a pixel ID string or an array of pixel ID strings.<br />
-&nbsp;&nbsp;# Example 1:<br />
-&nbsp;&nbsp;# return "abc123"<br />
-&nbsp;&nbsp;# Example 2: <br />
-&nbsp;&nbsp;# return ["abc123", "xyz456"]<br />
-&nbsp;&nbsp;# This function returns an array of conversion labels<br />
-}</code></p>
-
 <%= render :partial => 'caboose/sites/admin_footer' %>
 
 <% content_for :caboose_js do %>
@@ -52,9 +38,9 @@ $(document).ready(function() {
     update_url: "/admin/sites/<%= @site.id %>/retargeting",
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'conversion_id'      , nice_name: 'Conversion ID'               , type: 'text'     , value: <%= raw Caboose.json(rc.conversion_id      ) %>, width: 600 },
-      { name: 'labels_function'    , nice_name: 'Conversion Labels Function'  , type: 'textarea' , value: <%= raw Caboose.json(rc.labels_function    ) %>, width: 600, height: 75, fixed_placeholder: false },
-      { name: 'fb_pixels_function' , nice_name: 'Facebook Pixel IDs Function' , type: 'textarea' , value: <%= raw Caboose.json(rc.fb_pixels_function ) %>, width: 600, height: 75, fixed_placeholder: false }
+      { name: 'conversion_id'      , nice_name: 'Google Conversion ID'        , type: 'text'     , value: <%= raw Caboose.json(rc.conversion_id   ) %>, width: 600 },
+      { name: 'labels_function'    , nice_name: 'Conversion Labels Function'  , type: 'textarea' , value: <%= raw Caboose.json(rc.labels_function ) %>, width: 600, height: 75, fixed_placeholder: false },
+      { name: 'fb_pixel_id'        , nice_name: 'Facebook Pixel ID'           , type: 'text'     , value: <%= raw Caboose.json(rc.fb_pixel_id     ) %>, width: 600 }
     ]    
   });
 });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.196'
+  VERSION = '0.5.197'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.196
+  version: 0.5.197
 platform: ruby
 authors:
 - William Barry