caboose-cms 0.8.62 → 0.8.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4106e491d93b523834ee2666e8b56318619b105
-  data.tar.gz: ed68ff328ca5bd231ebec43547d03135e17582ca
+  metadata.gz: 29bfd5e0f0743f4775004a3f59719900efc517f4
+  data.tar.gz: 459868d31674a46f4eff2f8bbf2f0ea962028789
 SHA512:
-  metadata.gz: 958a0609222e9d01efcdfb5c56de683cd193063df59d01cf3ce1e02df3f8efe74fcaf8d0d7d02525d87c10cdb59061653d1e106102f4bfa50b222bf1938e7601
-  data.tar.gz: 2529ba70074ed38ad461ab05ac478c0cdd4c1b95a74748a1cdf3ac3239df88f7accce80e6b5e402f5b12189ee5309384835102bc29c9b86799cf155857e3fb0a
+  metadata.gz: 9415b36ed339e43501767cbb4d991890eb1809ce1cf173d43d79e2d393d379c870191e1533cbf4eb6ea2b1e65902659c5959116bfcff80efc231c19892481a7d
+  data.tar.gz: 7306430f0dbcf7d6331d2ffa0c7b22669a3f6f62a726f71fc2fc8a3de6711e11db5d80851510ca0c83429ea620eccc507e4c676b9d4e33182400efc31212124a

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

@@ -717,7 +717,7 @@ InvoiceController.prototype = {
   summary_table: function(table)
   {    
     var that = this;
-    var requires_shipping = that.invoice_requires_shipping();
+    var requires_shipping = that.invoice_requires_shipping();        
     if (that.invoice.line_items.length > 0 || that.invoice.invoice_packages.length > 0)
     {
       table.append($('<tr/>').append($('<th/>').attr('colspan', requires_shipping ? '6' : '5').html('&nbsp;')));
@@ -938,11 +938,12 @@ InvoiceController.prototype = {
   capture_transaction: function(transaction_id, confirm)
   {
     var that = this;    
-    var t = that.transaction_with_id(transaction_id);          
+    var t = that.transaction_with_id(transaction_id);
+    var amount = that.invoice.total < t.amount ? that.invoice.total : t.amount;         
     if (!confirm)
     {    
       var p = $('<p/>').addClass('note confirm')
-        .append("Are you sure you want to charge $" + parseFloat(t.amount).toFixed(2) + " to the customer?<br />")
+        .append("Are you sure you want to charge $" + parseFloat(amount).toFixed(2) + " to the customer?<br />")
         .append($('<input/>').attr('type','button').val('Yes').click(function() { that.capture_transaction(transaction_id, true); }))
         .append(' ')
         .append($('<input/>').attr('type','button').val('No').click(function() { $('#transactions_message').empty(); }));
@@ -952,10 +953,12 @@ InvoiceController.prototype = {
     $('#transactions_message').html("<p class='loading'>Capturing funds...</p>");
     $.ajax({
       url: '/admin/invoices/' + that.invoice.id + '/transactions/' + transaction_id + '/capture',
+      type: 'get',
+      data: { amount: amount },
       success: function(resp) {
-        if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) { $('#message').empty(); that.refresh_transactions(); }
-        if (resp.refresh) { $('#message').empty(); that.refresh_transactions(); }
+        if (resp.error)     $('#transactions_message').html("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) { $('#transactions_message').empty(); that.refresh_transactions(); }
+        if (resp.refresh) { $('#transactions_message').empty(); that.refresh_transactions(); }
       }
     });
   },
@@ -1166,8 +1169,8 @@ InvoiceController.prototype = {
   {
     var that = this;
     var requires = false;
-    $.each(that.invoice.line_items, function(i, li) {
-      if (li.requires_shipping && !li.downloadable)
+    $.each(that.invoice.line_items, function(i, li) {      
+      if (li.variant.requires_shipping && !li.variant.downloadable)
         requires = true;              
     });
     return requires;

data/app/controllers/caboose/invoice_transactions_controller.rb

@@ -6,7 +6,7 @@ module Caboose
       return if !user_is_allowed('invoices', 'edit')
     
       it = InvoiceTransaction.find(params[:id])
-      resp = it.capture 
+      resp = params[:amount] ? it.capture(params[:amount]) : it.capture 
       
       render :json => resp            
     end

data/app/models/caboose/invoice_transaction.rb

@@ -48,12 +48,16 @@ module Caboose
     end
     
     # Capture funds from a previously authorized transaction
-    def capture
+    def capture(amount = nil)
       
       return { :error => "This invoice doesn't seem to be authorized." } if !self.success
       
       ct = InvoiceTransaction.where(:parent_id => self.id, :transaction_type => InvoiceTransaction::TYPE_CAPTURE, :success => true).first      
       return { :error => "Funds for this invoice have already been captured." } if ct
+      
+      # Make sure the amount given isn't greater than the invoice total      
+      return { :error => "Amount given to capture is greater than the current invoice total." } if amount && amount.to_f > self.invoice.total.to_f        
+      amount = self.invoice.total if amount.nil?      
             
       resp = Caboose::StdClass.new
       sc = self.invoice.site.store_config                
@@ -63,9 +67,10 @@ module Caboose
                                                                                     
           Stripe.api_key = sc.stripe_secret_key.strip
           bt = nil
-          begin
-            c = Stripe::Charge.retrieve(self.transaction_id)
-            c = c.capture
+          begin            
+            c = Stripe::Charge.retrieve(self.transaction_id)            
+            return { :error => "Amount given to capture is greater than the amount authorized." } if amount.to_f > (c.amount/100).to_f            
+            c = c.capture({ :amount => (amount*100).to_i })
             bt = Stripe::BalanceTransaction.retrieve(c.balance_transaction)
           rescue Exception => ex
             resp.error = "Error during capture process\n#{ex.message}"                

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.62'
+  VERSION = '0.8.63'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.62
+  version: 0.8.63
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg