caboose-cms 0.5.86 → 0.5.87

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMyNzZjNzE0NGZkZDE3N2UzMDcyNTdkZjRkYmQzNzQwNWMzNWUxOA==
+    MmY4OTYwYjU3MDliOGNlMDM0YjYzNGZlMWYxZTY3OGE5NzVlZjUxNQ==
   data.tar.gz: !binary |-
-    MDk0NDljNWYzY2FmYTJlYmJhNDNjNTI1NzJlNDBlN2Q2MmVjYzNjNw==
+    YjcxYWUwNzk5YWFmYWYzNDA4OTU0M2NlMWExZDM4MjdjZWVmNTEwYw==
 SHA512:
   metadata.gz: !binary |-
-    ZjkzODMxMjk0ZjZiNmZmOTQ5ZWZlMzRkZWZmMTJiYjYyMDk0NWIxYmU4NWM0
-    OTBlZGY5ODhlMjk1ZmI0MzM0NzBlMjYwMTEyNTcyYTZlZjYwNzI1OGZlOWVj
-    OWQyZDZjMWUwNDM4YzE4ZDg5MjQ1NWJjYzJjZjEwNzdjZTljZGI=
+    NmQzYzM5ZThkZDdmYzNjNzcyODc3NGVlNGFkNjY4MWVmMzYyNzIzYzBhMTdh
+    ZTU0NzYzODQwODBiM2YzZDc2ODFjMDllYjBkNzZjYTZhMzQ2NThhM2RlMGNl
+    NjVjZTFjYzllYTdiODgxMGZmYzcxZjhlZGRjNDMxZDUyNzNkM2I=
   data.tar.gz: !binary |-
-    NzA5Yjk1MjUzNzRiMzQzNTE3OGEzMmU0ZWQxZGY2NDY4NjEwNDMwZTZmN2Q0
-    ODg4NjdhMjE4ODYxNjU0YmRhNDIzYmExZGVmYTVjZWUxZDJhNjk3NDdhMWVl
-    OGQ0YjZlMjk5YWY2ODFmZWM3N2JhNDZmODk4OGJiMDZhN2E1Yjc=
+    Y2ZhYmQ1YzY3YjdmZjdlN2EzOWY0NjU2MjhkNGJkYjI0ZmQxOTdlYTRiMTcx
+    ZWQ3YTQ3NzE0NjAwZjBhODc2N2JlZTMzNmNjZWE4NmU2NjVmZWU0ZWI0NzEy
+    MzBhMDNhYWI2ODEwYjk0NTAxZTkyMDNiMzY5NWQxNDRhZTBkZTA=

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

@@ -619,6 +619,30 @@ OrderController.prototype = {
         else that.refresh();        
       }
     });    
+  },
+  
+  void_order: function(confirm)
+  {
+    var that = this;
+    if (!confirm)
+    {    
+      var p = $('<p/>').addClass('note confirm')
+        .append("Are you sure you want to void this order? ")
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.void_order(true); }))
+        .append(' ')
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+      $('#message').empty().append(p);
+      return;
+    }
+    $('#message').html("<p class='loading'>Voiding...</p>");
+    $.ajax({
+      url: '/admin/orders/' + order_id + '/void',
+      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)
@@ -656,30 +680,7 @@ OrderController.prototype = {
   //      if (resp.refresh) window.location.reload(true);
   //    }
   //  });
-  //},
-  //
-  //void_order: function(order_id, confirm)
-  //{
-  //  if (!confirm)
-  //  {    
-  //    var p = $('<p/>').addClass('note confirm')
-  //      .append("Are you sure you want to void this order? ")
-  //      .append($('<input/>').attr('type','button').val('Yes').click(function() { void_order(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'>Voiding...</p>");
-  //  $.ajax({
-  //    url: '/admin/orders/' + order_id + '/void',
-  //    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/orders_controller.rb

@@ -52,33 +52,35 @@ module Caboose
     def admin_void
       return if !user_is_allowed('orders', 'edit')
       
-      response = Caboose::StdClass.new({
-        'refresh' => nil,
-        'error' => nil,
-        'success' => nil
-      })
-      
+      resp = Caboose::StdClass.new      
       order = Order.find(params[:id])
       
       if order.financial_status == 'captured'
-        response.error = "This order has already been captured, you will need to refund instead"
+        resp.error = "This order has already been captured, you will need to refund instead"
       else
-        if PaymentProcessor.void(order)
-          order.update_attributes(
-            :financial_status => 'voided',
-            :status => 'cancelled'
-          )
+        
+        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
+        # Add the variant quantities ordered back
+        #order.cancel
           
-          response.success = "Order voided successfully"
-        else
-          response.error = "Error voiding order."
-        end
+        resp.success = "Order voided successfully"                     
       end
     
-      render :json => response
+      render :json => resp
     end
   
     # GET /admin/orders/:id/refund

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

@@ -11,7 +11,7 @@
 <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="void_order(<%= @order.id %>);" />
+  <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 %>);" />

data/lib/caboose/version.rb

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

metadata

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