caboose-cms 0.5.87 → 0.5.88

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmY4OTYwYjU3MDliOGNlMDM0YjYzNGZlMWYxZTY3OGE5NzVlZjUxNQ==
+    MDg3NGE4N2VhNjdiN2NiMzc1MDNjZGNhMGRkZWY0MzAzM2ZlN2VmMA==
   data.tar.gz: !binary |-
-    YjcxYWUwNzk5YWFmYWYzNDA4OTU0M2NlMWExZDM4MjdjZWVmNTEwYw==
+    N2VmYzY3OTcwOTA0ZDk2YmI5ZGY2OTM2NDA1ZDMyYjBlM2QyNzAxMQ==
 SHA512:
   metadata.gz: !binary |-
-    NmQzYzM5ZThkZDdmYzNjNzcyODc3NGVlNGFkNjY4MWVmMzYyNzIzYzBhMTdh
-    ZTU0NzYzODQwODBiM2YzZDc2ODFjMDllYjBkNzZjYTZhMzQ2NThhM2RlMGNl
-    NjVjZTFjYzllYTdiODgxMGZmYzcxZjhlZGRjNDMxZDUyNzNkM2I=
+    ZWE5MTBjMzhiMDU2ODcxYTQ5NjcyNzAzZTc5YzAzYmVhNDQzNjYwNDIzOTlj
+    ZWViZWYxMmMzZmYxZmNmZGJhOWZmY2RhNzM5OGM4YWUwZDMwZDQyNmY3OTI3
+    NTBjNjc1NjBhM2NhYzIwODAxODhlOWQ5OThkZDU0M2ExZjliN2E=
   data.tar.gz: !binary |-
-    Y2ZhYmQ1YzY3YjdmZjdlN2EzOWY0NjU2MjhkNGJkYjI0ZmQxOTdlYTRiMTcx
-    ZWQ3YTQ3NzE0NjAwZjBhODc2N2JlZTMzNmNjZWE4NmU2NjVmZWU0ZWI0NzEy
-    MzBhMDNhYWI2ODEwYjk0NTAxZTkyMDNiMzY5NWQxNDRhZTBkZTA=
+    ZjE2MjQ4ODI1M2UxZGU0MDZiN2JjOTJiZGM4YTYyM2M0ODU4NDdhNWU2ZWI3
+    NWU0MDczZjhmOGU1NTgyZTNhOWU2MTcwZmJmYTUwZGQ5ZGMyZmYwMzE4ZWRm
+    OGU0NGEzYjZjZWQ2ODlkZGRhZDRiMGRlNWFhZTE0Y2NkNDQ4MTI=

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

@@ -643,6 +643,30 @@ OrderController.prototype = {
         if (resp.refresh) window.location.reload(true);
       }
     });
+  },
+  
+  capture_funds: function(confirm)
+  {
+    var that = this;    
+    if (!confirm)
+    {    
+      var p = $('<p/>').addClass('note confirm')
+        .append("Are you sure you want to charge " + that.order.total + " to the customer? ")
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.capture_funds(true); }))
+        .append(' ')
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+      $('#message').empty().append(p);
+      return;
+    }
+    $('#message').html("<p class='loading'>Capturing funds...</p>");
+    $.ajax({
+      url: '/admin/orders/' + order_id + '/capture',
+      success: function(resp) {
+        if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) $('#message').html("<p class='note success'>" + resp.success + "</p>");
+        if (resp.refresh) window.location.reload(true);
+      }
+    });
   }
                               
   //resend_confirmation: function(order_id)
@@ -657,30 +681,7 @@ OrderController.prototype = {
   //    }
   //  });
   //},
-  //
-  //capture_funds: function(order_id, confirm)
-  //{
-  //  total = $('#total').html();
-  //  if (!confirm)
-  //  {    
-  //    var p = $('<p/>').addClass('note confirm')
-  //      .append("Are you sure you want to charge " + total + " to the customer? ")
-  //      .append($('<input/>').attr('type','button').val('Yes').click(function() { capture_funds(order_id, true); }))
-  //      .append(' ')
-  //      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
-  //    modal.autosize(p);
-  //    return;
-  //  }
-  //  modal.autosize("<p class='loading'>Capturing funds...</p>");
-  //  $.ajax({
-  //    url: '/admin/orders/' + order_id + '/capture',
-  //    success: function(resp) {
-  //      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
-  //      if (resp.success) modal.autosize("<p class='note success'>" + resp.success + "</p>");
-  //      if (resp.refresh) window.location.reload(true);
-  //    }
-  //  });
-  //},    
+  //      
   //
   //refund_order: function(order_id, confirm)
   //{

data/app/controllers/caboose/checkout_controller.rb

@@ -83,7 +83,7 @@ module Caboose
             #: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",
-            :relay_url => sc.pp_relay_url,
+            :relay_url => "#{sc.pp_relay_domain}/checkout/authnet-relay",
             :transaction_type => 'AUTH_ONLY',                        
             :test => sc.pp_testing
           )

data/app/controllers/caboose/orders_controller.rb

@@ -54,30 +54,36 @@ module Caboose
       
       resp = Caboose::StdClass.new      
       order = Order.find(params[:id])
+      t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
       
       if order.financial_status == 'captured'
         resp.error = "This order has already been captured, you will need to refund instead"
+      elsif t.nil?
+        resp.error = "This order doesn't seem to be authorized."
       else
-        
-        t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true)
+                
         sc = @site.store_config
-        response = AuthorizeNet::SIM::Transaction.new(
-          sc.pp_username, 
-          sc.pp_password,                      
-          order.total,
-          :transaction_type => 'VOID',
-          :transaction_id => t.transaction_id
-        )                    
-        order.update_attributes(
-          :financial_status => 'voided',
-          :status => 'cancelled'
-        )
-        order.save
-          
-        # Add the variant quantities ordered back
-        #order.cancel
-          
-        resp.success = "Order voided successfully"                     
+        case sc.pp_name
+          when 'authorize.net'        
+                    
+            response = AuthorizeNet::SIM::Transaction.new(
+              sc.pp_username, 
+              sc.pp_password,                      
+              order.total,
+              :transaction_type => 'VOID',
+              :transaction_id => t.transaction_id
+            )                    
+            order.update_attributes(
+              :financial_status => 'voided',
+              :status => 'cancelled'
+            )
+            order.save          
+            # TODO: Add the variant quantities ordered back        
+            resp.success = "Order voided successfully"
+          when 'payscape'
+            # TODO: Implement payscape void order
+        end
+        
       end
     
       render :json => resp
@@ -240,24 +246,34 @@ module Caboose
     def capture_funds
       return if !user_is_allowed('orders', 'edit')
       
-      response = Caboose::StdClass.new({
-        'refresh' => nil,
-        'error'   => nil,
-        'success' => nil
-      })
-      
+      response = Caboose::StdClass.new
       order = Order.find(params[:id])
+      t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
       
       if order.financial_status == 'captured'
         resp.error = "Funds for this order have already been captured."    
       elsif order.total > order.auth_amount
         resp.error = "The order total exceeds the authorized amount."
+      elsif t.nil?
+        resp.error = "This order doesn't seem to be authorized."
       else
-        if PaymentProcessor.capture(order)
-          order.update_attribute(:financial_status, 'captured')
-          response.success = 'Captured funds successfully'
-        else
-          response.error = 'Error capturing funds'
+                        
+        sc = @site.store_config
+        case sc.pp_name
+          when 'authorize.net'
+            
+            response = AuthorizeNet::SIM::Transaction.new(
+              sc.pp_username, 
+              sc.pp_password,
+              order.total,
+              :transaction_type => 'CAPTURE_ONLY',
+              :transaction_id => t.transaction_id
+            )                
+            order.update_attribute(:financial_status, 'captured')
+            resp.success = 'Captured funds successfully'
+          when 'payscape'
+            # TODO: Implement capture funds for payscape
+
         end
           
         #if (order.discounts.any? && order.total < order.discounts.first.amount_current) || PaymentProcessor.capture(order)
@@ -273,6 +289,7 @@ module Caboose
         #else
         #  response.error = "Error capturing funds."
         #end
+        
       end
       
       render :json => response

data/app/controllers/caboose/store_controller.rb

@@ -27,7 +27,7 @@ module Caboose
           when 'pp_username'              then sc.pp_username             = value
           when 'pp_password'              then sc.pp_password             = value
           when 'pp_testing'               then sc.pp_testing              = value
-          when 'pp_relay_url'             then sc.pp_relay_url            = value
+          when 'pp_relay_domain'          then sc.pp_relay_domain         = value
           when 'ups_username'             then sc.ups_username            = value
           when 'ups_password'             then sc.ups_password            = value
           when 'ups_key'                  then sc.ups_key                 = value

data/app/models/caboose/schema.rb

@@ -58,7 +58,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       #Caboose::PageCache => [:block],
       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],
+      Caboose::StoreConfig => [:use_usps, :allowed_shipping_codes, :default_shipping_code, :pp_relay_url, :pp_response_url],
       Caboose::Variant => [:quantity],
       Caboose::Vendor => [:vendor, :vendor_id]
     }
@@ -557,9 +557,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :pp_name                 , :string  ],
         [ :pp_username             , :string  ],
         [ :pp_password             , :string  ],
-        [ :pp_testing              , :boolean , { :default => true }],
-        [ :pp_relay_url            , :string  ],        
-        [ :pp_response_url         , :string  ],
+        [ :pp_testing              , :boolean , { :default => true }],        
+        [ :pp_relay_domain         , :string  ],                
         [ :ups_username            , :string  ],
         [ :ups_password            , :string  ],
         [ :ups_key                 , :string  ],

data/app/views/caboose/checkout/payment.html.erb

@@ -8,7 +8,7 @@ store_config = @site.store_config
       <form id="payment" target="relay" action="https://secure.authorize.net/gateway/transact.dll" method="post">
         <%= sim_fields(@sim_transaction) %>
         <input type="hidden" id="x_invoice_num" name="x_invoice_num" value="<%= @order.id %>" />
-        <input type="hidden" id="x_description" name="x_after_relay" value="<%= raw store_config.pp_response_url      %>/<%= @order.id %>" />        
+        <input type="hidden" id="x_description" name="x_after_relay" value="<%= raw store_config.pp_relay_domain      %>/checkout/authnet-response/<%= @order.id %>" />        
         <input type="hidden" id="x_first_name"  name="x_first_name"  value="<%= raw @order.billing_address.first_name %>" />
         <input type="hidden" id="x_last_name"   name="x_last_name"   value="<%= raw @order.billing_address.last_name  %>" />       
         <input type="hidden" id="x_address"     name="x_address"     value="<%= raw @order.billing_address.address1   %>" />      

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

@@ -10,15 +10,15 @@
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/orders';" />
 <% if @order.financial_status == 'authorized' %>
-  <input type='button' value='Capture Funds' onclick="capture_funds(<%= @order.id %>);" />
-  <input type='button' value='Void' onclick="controller.void_order();" />
+  <input type='button' value='Capture Funds' onclick="controller.capture_funds();" />
+  <input type='button' value='Void'          onclick="controller.void_order();" />
 <% end %>
 <% if @order.financial_status == 'captured' %>
   <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
 <% end %>
 <input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
-<input type='button' value='Add Item' onclick="controller.add_variant();" />
-<input type='button' value='Print Order' onclick="controller.print_order(<%= @order.id %>);" />
+<input type='button' value='Add Item'            onclick="controller.add_variant();" />
+<input type='button' value='Print Order'         onclick="controller.print_order(<%= @order.id %>);" />
 
 <% str = Caboose.plugin_hook('admin_edit_order_buttons', "", @order) %>
 <% if str %><%= raw str %><% end %>

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

@@ -9,7 +9,7 @@ sc = @store_config
 <p><div id='storeconfig_<%= sc.id %>_pp_name'                 ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_pp_username'             ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_pp_password'             ></div></p>
-<p><div id='storeconfig_<%= sc.id %>_pp_relay_url'            ></div></p>
+<p><div id='storeconfig_<%= sc.id %>_pp_relay_domain'         ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_pp_testing'              ></div></p>
 
 <h2>Fulfillment Contacts</h2>
@@ -69,8 +69,8 @@ $(document).ready(function() {
       { name: 'pp_name'              , nice_name: 'Type'                 , type: 'select'   , value: <%= raw Caboose.json(sc.pp_name                ) %>, width: 400 , options_url: '/admin/store/payment-processor-options' },
       { name: 'pp_username'          , nice_name: 'Username'             , type: 'text'     , value: <%= raw Caboose.json(sc.pp_username            ) %>, width: 400 },
       { name: 'pp_password'          , nice_name: 'Password'             , type: 'text'     , value: <%= raw Caboose.json(sc.pp_password            ) %>, width: 400 },
-      { name: 'pp_testing'           , nice_name: 'Test Mode'            , type: 'checkbox' , value: <%= raw Caboose.json(sc.pp_testing ? 1 : 0     ) %>, width: 400 },
-      { name: 'pp_relay_url'         , nice_name: 'Relay URL'            , type: 'text'     , value: <%= raw Caboose.json(sc.pp_relay_url           ) %>, width: 400 },
+      { name: 'pp_relay_domain'      , nice_name: 'Relay Domain'         , type: 'text'     , value: <%= raw Caboose.json(sc.pp_relay_domain        ) %>, width: 400 },
+      { name: 'pp_testing'           , nice_name: 'Test Mode'            , type: 'checkbox' , value: <%= raw Caboose.json(sc.pp_testing ? 1 : 0     ) %>, width: 400 },      
       { name: 'fulfillment_email'    , nice_name: 'Fulfillment Email'    , type: 'text'     , value: <%= raw Caboose.json(sc.fulfillment_email      ) %>, width: 400 },
       { name: 'shipping_email'       , nice_name: 'Shipping Email'       , type: 'text'     , value: <%= raw Caboose.json(sc.shipping_email         ) %>, width: 400 },
       { name: 'handling_percentage'  , nice_name: 'Handling Percentage'  , type: 'text'     , value: <%= raw Caboose.json(sc.handling_percentage    ) %>, width: 400 },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.87'
+  VERSION = '0.5.88'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.87
+  version: 0.5.88
 platform: ruby
 authors:
 - William Barry
@@ -696,7 +696,6 @@ files:
 - app/views/caboose/categories/admin_edit.html.erb
 - app/views/caboose/categories/admin_index.html.erb
 - app/views/caboose/categories/admin_new.html.erb
-- app/views/caboose/checkout/#Untitled-1#
 - app/views/caboose/checkout/_address_form.html.erb
 - app/views/caboose/checkout/_billing_form.html.erb
 - app/views/caboose/checkout/_cart.html.erb

data/app/views/caboose/checkout/#Untitled-1#

@@ -1,3 +0,0 @@
-https://locker-room.biz/checkout/payment?show_relay=1
-https://locker-room.biz/checkout/authnet-relay
-https://lockerroom.caboosecms.com/checkout/authnet-relay