caboose-cms 0.5.60 → 0.5.61

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmRiOTFhMTRiNDMzMjA1YjBkM2E1NGMyOWQ2ZjE2MTdmNzMzZGQyNg==
+    YmNhZDZiODIzMzY5MWNkM2EzN2EyY2E4NWIwOTYyOTE2ZjIxN2VmMA==
   data.tar.gz: !binary |-
-    ZDRlNWYwM2Y4NGU3NWJjOWQ1ZjNiODk0ZjhkMTFhMTQ3OTk2MzA1Mg==
+    OTZjOWM1NmY0MjFkYTBmOGQzMzY3MTE4NTBkZmFlOTM2MmJhMTI1MQ==
 SHA512:
   metadata.gz: !binary |-
-    NjYzZjZlZWE0YWFiNTU4NTI2YmMxYjVkY2NhOTA4ZTg3MWFiMzc0ODcxOWNj
-    MDgzZjU3NjAxZDBiNjZhZWEzYjQzZTczNmQ1MzQ3MjQ2OWRmZWRhNmU3NDJi
-    MmNlNTkzYWY5NjRjZjNmNzVmNWQ1ODVmYWI4MWQyNjY4MmVmNjI=
+    MTI2ZTliMWYzZDI5NjczZGE1NWQ2YjNmM2FmODZlZTc4OTk0MWQ0NGUxYWRi
+    ODFlNWY0MzIyMjc2YTg1NTJkYTJjYzUyYTY2Zjc4NmQ3MTFmNTkxMDU2YTQ2
+    YzEwZTMxMTY3YWNiZDE1NDNiNGYxY2E3MDJiZGNmYWZiYmEyY2M=
   data.tar.gz: !binary |-
-    ODRhMThlN2Y5ODM0YzQ1NDRiYmY2ZWM0NTNiODdlY2E3Mzk5NjYyNjQ1M2Fk
-    NzU3ZTAxYmU4MjVlNzI0YmUyNzMyNTNjZTVlYWRiYTkyNzcyYjZkNTBhOTUx
-    MTVkYmE2YzI3MWUyN2NjZmExOTE4ZTkzN2YzNTI1ZGRiNzFmY2Q=
+    Mjk1OWFlYzYzMjEyZDg1MTUwYWUxYjM1ZWM4ZjM1MTFmN2NlNTVhN2IyOWQ0
+    MThjM2NmOTc1NTZjYjc5M2E0YThhYWRlMTdhYTgzNWRjMGY3MzFjZWJlMzY0
+    MjA0NTVlZWNlOWM0ODQ4ZWQzY2Q5NDM3MjAzM2YzMzMwNjY2MzE=

data/app/assets/javascripts/caboose/authorize.net.js

@@ -0,0 +1,187 @@
+/* Usage:
+
+<script type="text/javascript" src="contentx/popup.js"></script>
+
+<script type="text/javascript">
+//<![CDATA[
+
+// Uncomment this line if eCheck is enabled. This does not affect functionality, only the initial sizing of the popup page for add payment.
+//AuthorizeNetPopup.options.eCheckEnabled = true;
+
+// Uncomment these lines to define a function that will be called when the popup is closed.
+// For example, you may want to refresh your page and/or call the GetCustomerProfile API method from your server.
+//AuthorizeNetPopup.options.onPopupClosed = function() {
+//	your code here.
+//};
+
+// Uncomment this line if you do not have absolutely positioned elements on your page that can obstruct the view of the popup.
+// This can speed up the processing of the page slightly.
+//AuthorizeNetPopup.options.skipZIndexCheck = true;
+
+// Uncomment this line to use test.authorize.net instead of secure.authorize.net.
+//AuthorizeNetPopup.options.useTestEnvironment = true;
+
+//]]>
+</script>
+
+*/
+
+(function () {
+	if (!window.AuthorizeNetPopup) window.AuthorizeNetPopup = {};
+	if (!AuthorizeNetPopup.options) AuthorizeNetPopup.options = {
+		onPopupClosed: null
+		,eCheckEnabled: false
+		,skipZIndexCheck: false
+		,useTestEnvironment: false
+	};
+	AuthorizeNetPopup.closePopup = function() {
+		document.getElementById("divAuthorizeNetPopupScreen").style.display = "none";
+		document.getElementById("divAuthorizeNetPopup").style.display = "none";
+		document.getElementById("iframeAuthorizeNet").src = "contentx/empty.html";
+		if (AuthorizeNetPopup.options.onPopupClosed) AuthorizeNetPopup.options.onPopupClosed();
+	};
+	AuthorizeNetPopup.openManagePopup = function() {
+		openSpecificPopup({action:"manage"});
+	};
+	AuthorizeNetPopup.openAddPaymentPopup = function() {
+		openSpecificPopup({action:"addPayment", paymentProfileId:"new"});
+	};
+	AuthorizeNetPopup.openEditPaymentPopup = function(paymentProfileId) {
+		openSpecificPopup({action:"editPayment", paymentProfileId:paymentProfileId});
+	};
+	AuthorizeNetPopup.openAddShippingPopup = function() {
+		openSpecificPopup({action:"addShipping", shippingAddressId:"new"});
+	};
+	AuthorizeNetPopup.openEditShippingPopup = function(shippingAddressId) {
+		openSpecificPopup({action:"editShipping", shippingAddressId:shippingAddressId});
+	};
+	AuthorizeNetPopup.onReceiveCommunication = function (querystr) {
+		var params = parseQueryString(querystr);
+		switch(params["action"]) {
+			case "successfulSave":
+				AuthorizeNetPopup.closePopup();
+				break;
+			case "cancel":
+				AuthorizeNetPopup.closePopup();
+				break;
+			case "resizeWindow":
+				var w = parseInt(params["width"]);
+				var h = parseInt(params["height"]);
+				var ifrm = document.getElementById("iframeAuthorizeNet");
+				ifrm.style.width = w.toString() + "px";
+				ifrm.style.height = h.toString() + "px";
+				centerPopup();
+				adjustPopupScreen();
+				break;
+		}
+	};
+	function openSpecificPopup(opt) {
+		var popup = document.getElementById("divAuthorizeNetPopup");
+		var popupScreen = document.getElementById("divAuthorizeNetPopupScreen");
+		var ifrm = document.getElementById("iframeAuthorizeNet");
+		var form = document.forms["formAuthorizeNetPopup"];
+
+		switch (opt.action) {
+			case "addPayment":
+				ifrm.style.width = "435px";
+				ifrm.style.height = AuthorizeNetPopup.options.eCheckEnabled ? "508px" : "479px";
+				break;
+			case "editPayment":
+				ifrm.style.width = "435px";
+				ifrm.style.height = "479px";
+				break;
+			case "addShipping":
+				ifrm.style.width = "385px";
+				ifrm.style.height = "359px";
+				break;
+			case "editShipping":
+				ifrm.style.width = "385px";
+				ifrm.style.height = "359px";
+				break;
+			case "manage":
+				ifrm.style.width = "442px";
+				ifrm.style.height = "578px";
+				break;
+		}
+
+		if (!AuthorizeNetPopup.options.skipZIndexCheck) {
+			var zIndexHightest = getHightestZIndex();
+			popup.style.zIndex = zIndexHightest + 2;
+			popupScreen.style.zIndex = zIndexHightest + 1;
+		}
+
+		if (AuthorizeNetPopup.options.useTestEnvironment) {
+			form.action = "https://test.authorize.net/profile/" + opt.action;
+		} else {
+			form.action = "https://secure.authorize.net/profile/" + opt.action;
+		}
+		if (form.elements["PaymentProfileId"]) form.elements["PaymentProfileId"].value = opt.paymentProfileId ? opt.paymentProfileId : "";
+		if (form.elements["ShippingAddressId"]) form.elements["ShippingAddressId"].value = opt.shippingAddressId ? opt.shippingAddressId : "";
+		form.submit();
+
+		popup.style.display = "";
+		popupScreen.style.display = "";
+		centerPopup();
+		adjustPopupScreen();
+	};
+	function centerPopup() {
+		var d = document.getElementById("divAuthorizeNetPopup");
+		d.style.left = "50%";
+		d.style.top = "50%";
+		var left = -Math.floor(d.clientWidth / 2);
+		var top = -Math.floor(d.clientHeight / 2);
+		d.style.marginLeft = left.toString() + "px";
+		d.style.marginTop = top.toString() + "px";
+		if (d.offsetLeft < 16) {
+			d.style.left = "16px";
+			d.style.marginLeft = "0px";
+		}
+		if (d.offsetTop < 16) {
+			d.style.top = "16px";
+			d.style.marginTop = "0px";
+		}
+	}
+	function adjustPopupScreen() { // IE6 fix
+		var popupScreen = document.getElementById("divAuthorizeNetPopupScreen");
+		if (popupScreen.currentStyle && popupScreen.currentStyle.position == "absolute") {
+			if (popupScreen.clientHeight < document.documentElement.scrollHeight) {
+				popupScreen.style.height = document.documentElement.scrollHeight.toString() + "px";
+			}
+			if (popupScreen.clientWidth < document.documentElement.scrollWidth) {
+				popupScreen.style.width = document.documentElement.scrollWidth.toString() + "px";
+			}
+		}
+	}
+	function getHightestZIndex() {
+		var max = 0;
+		var z = 0;
+		var a = document.getElementsByTagName('*');
+		for (var i = 0; i < a.length; i++) {
+			z = 0;
+			if (a[i].currentStyle) {
+				var style = a[i].currentStyle;
+				if (style.display != "none") {
+					z = parseFloat(style.zIndex);
+				}
+			} else if (window.getComputedStyle) {
+				var style = window.getComputedStyle(a[i], null);
+				if (style.getPropertyValue("display") != "none") {
+					z = parseFloat(style.getPropertyValue("z-index"));
+				}
+			}
+			if (!isNaN(z) && z > max) max = z;
+		}
+		return Math.ceil(max);
+	}
+	function parseQueryString(str) {
+		var vars = [];
+		var arr = str.split('&');
+		var pair;
+		for (var i = 0; i < arr.length; i++) {
+			pair = arr[i].split('=');
+			vars.push(pair[0]);
+			vars[pair[0]] = unescape(pair[1]);
+		}
+		return vars;
+	}
+} ());

data/app/assets/javascripts/caboose/cart.js

@@ -56,13 +56,18 @@ Caboose.Store.Modules.Cart = (function() {
   };
   
   self.render_item_count = function(item_count) {
-    var $link = $('#cart-link, .cart-link');
-    if (!$link.length) return false;
-    
-    function set_count(count) {
-      if      ($link.children('i') && count < 1) { $link.children('i').remove(); }
-      else if ($link.children('i').length)       { $link.children('i').empty().text(count); } 
-      else                                       { $link.append($('<i/>').text(count)); }
+    var $link = $('#cart-link, .cart-link');    
+    //if (!$link.length) return false;
+        
+    function set_count(count) {            
+      if ($('#cart_item_count').length > 0)
+        $('#cart_item_count').html(count);              
+      else if ($link.length > 0)
+      {
+        if ($link.children('i') && count < 1) { $link.children('i').remove(); }
+        else if ($link.children('i').length)  { $link.children('i').empty().text(count); } 
+        else                                  { $link.append($('<i/>').text(count)); }
+      }
     };
     
     if (item_count) {
@@ -94,7 +99,7 @@ Caboose.Store.Modules.Cart = (function() {
         type: $form.attr('method'),
         url: $form.attr('action'),
         data: $form.serialize(),
-        success: function(response) {
+        success: function(response) {          
           if (response.success) {
             self.render_item_count(response.item_count);
             if (self.$add_to_cart.length) self.$add_to_cart.trigger('added');

data/app/assets/javascripts/caboose/checkout_step4.js

@@ -7,13 +7,13 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
   
   self.initialize = function() {
     $('#checkout-confirm').hide();
-    //$('#relay').hide();
+    $('#relay').hide();
     self.bind_event_handlers();    
     self.expiration_change_handler();
   };
     
   self.bind_event_handlers = function() {
-    $('#checkout-payment form#payment select').change(self.expiration_change_handler);
+    $('#payment select').change(self.expiration_change_handler);
     $('#checkout-continue button').click(self.continue_handler);
     $('#checkout-confirm #edit_payment').click(self.edit_payment_handler);                
     
@@ -29,8 +29,7 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
     $('#expiration').val(month + year);
   };
   
-  self.continue_handler = function(event) {
-    alert('Testing');
+  self.continue_handler = function(event) {    
     if (!self.is_confirm)
     {
       var cc = $('#billing-cc-number').val();
@@ -40,9 +39,7 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
       {          
         $('#message').empty();
         $('#checkout-payment').hide();
-        $('#checkout-confirm').show();
-        $('#checkout_nav4 a').removeClass('current').addClass('done');
-        $('#checkout_nav5 a').removeClass('not_done').addClass('current');
+        $('#checkout-confirm').show();        
         $('#confirm_card_number').html("Card ending in " + cc.substr(-4));
         $('#checkout-continue button').html("Confirm order");
         self.is_confirm = true;
@@ -89,10 +86,11 @@ Caboose.Store.Modules.CheckoutStep4 = (function() {
 function relay_handler(resp)
 {
   console.log('RELAY');
+  console.log(resp);
   if (resp.success == true)
     window.location = '/checkout/thanks';
-  else if (resp.message)  
-    $('#message').html("<p class='note error'>" + resp.message + "</p>");
+  else if (resp.error)  
+    $('#message').html("<p class='note error'>" + resp.error + "</p>");
   else
     $('#message').html("<p class='note error'>There was an error processing your payment.</p>");
 }

data/app/controllers/caboose/#Untitled-1#

@@ -0,0 +1,7 @@
+Repconnex
+api_login_id: 3a79FjaHV
+api_transaction_key: 3K4v7n423KvA5R9P
+
+Locker Room
+47G9Y5vvQt
+4U6zLSj9u5V4Cq8B

data/app/controllers/caboose/application_controller.rb

@@ -55,10 +55,16 @@ module Caboose
     # Initialize the cart in the session
     def init_cart            
       # Check if the cart ID is defined and that it exists in the database
-      if !session[:cart_id] || !Caboose::Order.exists?(session[:cart_id])
+      create_new_order = false
+      if session[:cart_id]
+        @order = Caboose::Order.where(:id => session[:cart_id]).first
+        create_new_order = true if @order.nil? || @order.status != 'cart'                    
+      else                        
+        create_new_order = true                         
+      end
         
-        # Create an order to associate with the session
-        order = Caboose::Order.create(
+      if create_new_order # Create an order to associate with the session        
+        @order = Caboose::Order.create(
           :site_id          => @site.id,
           :status           => Caboose::Order::STATUS_CART,
           :financial_status => Caboose::Order::STATUS_PENDING,
@@ -67,13 +73,9 @@ module Caboose
           :landing_page     => request.fullpath,
           :landing_page_ref => params[:ref] || nil
         )
-
-        # Define the cart ID
-        session[:cart_id] = order.id
-      end
-      
-      # Log the order and set an instance variable up
-      @order = Caboose::Order.find(session[:cart_id])
+        # Save the cart ID in the session
+        session[:cart_id] = @order.id
+      end                  
     end
     
     # Parses any parameters in the URL and adds them to the params

data/app/controllers/caboose/cart_controller.rb

@@ -12,7 +12,7 @@ module Caboose
     
     # GET /cart/item-count
     def item_count
-      render :json => { :item_count => @order.line_items.count }
+      render :json => { :item_count => @order.item_count }
     end
     
     # POST /cart
@@ -30,11 +30,11 @@ module Caboose
           :quantity   => qty,
           :status     => 'pending'
         )
-      end            
+      end       
       render :json => { 
         :success => li.save, 
         :errors => li.errors.full_messages,
-        :item_count => @order.line_items.count 
+        :item_count => @order.item_count 
       }
     end
     

data/app/controllers/caboose/checkout_controller.rb

@@ -1,35 +1,10 @@
-#def calc_shipping_rates(order)
-#  weight = 0.0
-#  order.line_items.each do |li|
-#    w = li.variant.weight ? li.variant.weight : 0.0    
-#    weight = weight + (w * li.quantity)
-#  end
-#           
-#  shipping = 0.0
-#  shipping = 8.00  if weight >= 0.010  && weight <= 3.000      
-#  shipping = 10.00 if weight >= 3.001  && weight <= 6.000      
-#  shipping = 12.00 if weight >= 6.001  && weight <= 8.000      
-#  shipping = 15.00 if weight >= 8.001  && weight <= 12.000     
-#  shipping = order.total * 0.05 if weight > 12.000
-#             
-#  rates = [
-#    { :carrier => 'UPS'  , :service_code => 'GND'                  , :service_name => 'Ground'             , :total_price => shipping + (order.total > 49 ? 0.00 : 7.95) },           
-#    { :carrier => 'UPS'  , :service_code => '3DS'                  , :service_name => 'UPS 3 Day Air'      , :total_price => shipping + 12.95 },  
-#    { :carrier => 'UPS'  , :service_code => '2DA'                  , :service_name => 'UPS 2 Day Air'      , :total_price => shipping + 19.95 },  
-#    { :carrier => 'UPS'  , :service_code => '1DA'                  , :service_name => 'UPS Next Day Air'   , :total_price => shipping + 32.95 },
-#    { :carrier => 'USPS' , :service_code => 'Priority Mail 3-Day'  , :service_name => 'USPS Priority Mail' , :total_price => shipping + 12.95 },  
-#    { :carrier => 'USPS' , :service_code => 'Priority Mail 2-Day'  , :service_name => 'USPS Express Mail'  , :total_price => shipping + 24.95 }
-#  ]
-#      
-#  return [rates]
-#end
 
 module Caboose
   class CheckoutController < Caboose::ApplicationController
     
     helper :authorize_net
     before_filter :ensure_line_items, :only => [:step_one, :step_two]
-    protect_from_forgery :except => :relay
+    protect_from_forgery :except => :authnet_relay
     
     def ensure_line_items
       redirect_to '/checkout/empty' if @order.line_items.empty?
@@ -94,14 +69,20 @@ module Caboose
       store_config = @site.store_config
       case store_config.pp_name
         when 'authorize.net'
+          
+          sc = @site.store_config
           @sim_transaction = AuthorizeNet::SIM::Transaction.new(
-            store_config.pp_username,
-            store_config.pp_password,
-            @order.total,
-            :relay_url => "#{Caboose::store_url}/checkout/relay/#{@order.id}",
-            :transaction_type => 'AUTH_ONLY',
+            sc.pp_username, 
+            sc.pp_password, 
+            @order.total,            
+            #:relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay/#{@order.id}",
+            :relay_response => 'TRUE',
+            :relay_url => "#{request.protocol}#{request.host_with_port}/checkout/authnet-relay",
+            :transaction_type => 'AUTH_ONLY',            
             :test => true
           )
+          @request = request
+          
         when 'payscape'
           @form_url = Caboose::PaymentProcessor.form_url(@order)
       end
@@ -250,45 +231,54 @@ module Caboose
     #  end      
     #  render :layout => false
     #end
-    
-    # POST /checkout/relay/:order_id
-    def relay
-      ap '--HOOK RELAY'
-      @order = Caboose::Order.find(params[:order_id])
-      @success = Caboose::PaymentProcessor.authorize(@order, params)
-      @message = @success ? 'Payment processed successfully' : 'There was a problem processing your payment'
+        
+    # POST /checkout/authnet-relay
+    def authnet_relay
+      Caboose.log("Authorize.net relay, order #{params[:x_invoice_id]}")
       
-      #case Caboose::payment_processor
-      #  when 'authorize.net'
-      #    @success = params[:x_response_code] == '1'
-      #    @message = jarams[:x_response_reason_text]
-      #    @order.transaction_id = params[:x_trans_id] if params[:x_trans_id]
-      #  when 'payscape'
-      #    @success = Caboose::PaymentProcessor.authorize(@order, params)
-      #    @message = @success ? 'Payment processed successfully' : 'There was a problem processing your payment'
-      #    @order.transaction_id = params['transaction-id'] if params['transaction-id']
-      #end
+      order = Caboose::Order.find(params[:x_invoice_num])        
+      order.transaction_id = params[:x_trans_id] if params[:x_trans_id]        
+      success = params[:x_response_code] && params[:x_response_code] == '1' 
       
-      if @success
-        @order.financial_status = 'authorized'
-        @order.status = 'pending'
-        @order.date_authorized = DateTime.now
-        @order.auth_amount = @order.total
-        
-        # Clear cart
-        session[:cart_id] = nil
+      if success
+        order.financial_status = 'authorized'
+        order.status = 'pending'
+        order.date_authorized = DateTime.now
+        order.auth_amount = order.total
         
         # Send out emails        
-        OrdersMailer.customer_new_order(@order).deliver
-        OrdersMailer.fulfillment_new_order(@order).deliver        
+        OrdersMailer.customer_new_order(order).deliver
+        OrdersMailer.fulfillment_new_order(order).deliver        
         
         # Emit order event
-        Caboose.plugin_hook('order_authorized', @order)
+        Caboose.plugin_hook('order_authorized', order)
       else
-        @order.financial_status = 'unauthorized'
+        order.financial_status = 'unauthorized'
+        error = "There was a problem processing your payment."
+      end
+      
+      order.save
+      
+      @url = params[:x_after_relay]
+      @url << (success ? "?success=1" : "?error=#{error}")             
+                  
+      render :layout => false
+    end
+    
+    # GET  /checkout/authnet-response/:order_id
+    # POST /checkout/authnet-response/:order_id    
+    def authnet_response
+      Caboose.log("Authorize.net response, order #{params[:order_id]}")
+      
+      @resp = Caboose::StdClass.new
+      @resp.success = true if params[:success]
+      @resp.error = params[:error] if params[:error]
+      
+      if @resp.success        
+        session[:cart_id] = nil
+        init_cart
       end
       
-      @order.save
       render :layout => false
     end