caboose-cms 0.8.34 → 0.8.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b912cc8b30e8569dcb1f1d2e9b9282fbc8c4cb
-  data.tar.gz: 4c7b76303acd61dfa695d381ccac0330520ebe25
+  metadata.gz: e580ca759518da7762c5cc5160d5de30136cad5d
+  data.tar.gz: 11c47056fb135a003a5b437760dfe0e859565231
 SHA512:
-  metadata.gz: 5aa8fe51db11317e5a6570caba27576ee6855c633e0d9204c19dbbe885118edb2ba2342c4ef0df80fb0b640b180c6bf56b491987eed5423517ed7163a7703ca6
-  data.tar.gz: 020d7efb4def9817166f65d9cc15f5b13bd0d5fcaa12d9acb5818d388eb2230840080ba649cf907ef9f3ce7f1444502f6e905796c1f2ad189d5c03e3c828504e
+  metadata.gz: 1b159c76555d47fb10f9bd58b89c806a8095bbce445a8704e7ee46841c6b057ea2ef5a75f68a1cd165d87e112823a02fbb1375890b883fc047dd9c340cd18d3e
+  data.tar.gz: f79ba2f659c609466058f6f49a341bcc615b447fd59d8d3758639b9079916b596e987ee49c9dfac6f7f334a76525d518d2593abef2b316d4a860a24b9a0da823

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

@@ -79,7 +79,7 @@ InvoiceController.prototype = {
         update_url: '/admin/invoices/' + op.invoice_id + '/packages/' + op.id,
         authenticity_token: that.authenticity_token,
         attributes: [                      
-          { name: 'status'          , nice_name: 'Status'          , type: 'select' , value: op.status                                            , width: 300, fixed_placeholder: true , options_url: '/admin/invoices/line-items/status-options' },
+          { name: 'status'          , nice_name: 'Status'          , type: 'select' , value: op.status                                            , width: 300, fixed_placeholder: true , options_url: '/admin/invoices/line-items/status-options' },          
           { name: 'package_method'  , nice_name: 'Package/Method'  , type: 'select' , value: op.shipping_package_id + '_' + op.shipping_method_id , width: 300, fixed_placeholder: false, options_url: '/admin/shipping-packages/package-method-options' },
           { name: 'tracking_number' , nice_name: 'Tracking Number' , type: 'text'   , value: op.tracking_number                                   , width: 300, fixed_placeholder: true, align: 'right' },
           { name: 'total'           , nice_name: 'Shipping Total'  , type: 'text'   , value: curr(op.total)                                       , width: 300, fixed_placeholder: true, align: 'right' , after_update: function() { that.refresh_invoice(); }}
@@ -93,9 +93,10 @@ InvoiceController.prototype = {
         update_url: '/admin/invoices/' + li.invoice_id + '/line-items/' + li.id,
         authenticity_token: that.authenticity_token,
         attributes: [
-          { name: 'status'          , nice_name: 'Status'           , type: 'select'  , align: 'left' , value: li.status          , text: li.status, width: 150, fixed_placeholder: false, options_url: '/admin/invoices/line-items/status-options' },
-          { name: 'tracking_number' , nice_name: 'Tracking Number'  , type: 'text'    , align: 'left' , value: li.tracking_number , width: 200, fixed_placeholder: false },
-          { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: li.quantity        , width:  75, fixed_placeholder: false, after_update: function() { that.refresh_invoice(); } }
+          { name: 'status'          , nice_name: 'Status'           , type: 'select'  , align: 'left' , value: li.status           , text: li.status, width: 150, fixed_placeholder: false, options_url: '/admin/invoices/line-items/status-options' },
+          { name: 'tracking_number' , nice_name: 'Tracking Number'  , type: 'text'    , align: 'left' , value: li.tracking_number  , width: 200, fixed_placeholder: false },
+          { name: 'unit_price'      , nice_name: 'Unit Price'       , type: 'text'    , align: 'right', value: curr(li.unit_price) , width:  75, fixed_placeholder: false, after_update: function() { that.refresh_invoice(); } },
+          { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: li.quantity         , width:  75, fixed_placeholder: false, after_update: function() { that.refresh_invoice(); } }
         ]
       });
     });    
@@ -105,11 +106,12 @@ InvoiceController.prototype = {
       update_url: '/admin/invoices/' + that.invoice.id,
       authenticity_token: that.authenticity_token,
       attributes: [
-        { name: 'status'         , nice_name: 'Status'        , type: 'select', value: that.invoice.status                , width: 100, fixed_placeholder: false, options_url: '/admin/invoices/status-options' },
-        { name: 'payment_terms'  , nice_name: 'Terms'         , type: 'select', value: that.invoice.payment_terms         , width: 200, fixed_placeholder: true , options_url: '/admin/invoices/payment-terms-options' },
-        { name: 'tax'            , nice_name: 'Tax'           , type: 'text'  , value: curr(that.invoice.tax)             , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
-        { name: 'handling'       , nice_name: 'Handling'      , type: 'text'  , value: curr(that.invoice.handling)        , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
-        { name: 'custom_discount', nice_name: 'Discount'      , type: 'text'  , value: curr(that.invoice.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }}
+        { name: 'status'           , nice_name: 'Status'        , type: 'select', value: that.invoice.status                , width: 100, fixed_placeholder: false, options_url: '/admin/invoices/status-options' },
+        { name: 'financial_status' , nice_name: 'Status'        , type: 'select', value: that.invoice.financial_status      , width: 100, fixed_placeholder: true , width: 200, options_url: '/admin/invoices/financial-status-options' },
+        { name: 'payment_terms'    , nice_name: 'Terms'         , type: 'select', value: that.invoice.payment_terms         , width: 200, fixed_placeholder: true , width: 200, options_url: '/admin/invoices/payment-terms-options' },
+        { name: 'tax'              , nice_name: 'Tax'           , type: 'text'  , value: curr(that.invoice.tax)             , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
+        { name: 'handling'         , nice_name: 'Handling'      , type: 'text'  , value: curr(that.invoice.handling)        , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }},
+        { name: 'custom_discount'  , nice_name: 'Discount'      , type: 'text'  , value: curr(that.invoice.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_invoice(); }}
       ]
     });        
   },
@@ -227,7 +229,13 @@ InvoiceController.prototype = {
   {
     var that = this;
     window.open('/admin/invoices/' + that.invoice.id + '/print');
-  },  
+  },
+  
+  print_invoice: function()
+  {
+    var that = this;
+    window.open('/admin/invoices/' + that.invoice.id + '/print');
+  },
     
   line_items_for_invoice_package: function(invoice_package_id)
   {
@@ -267,7 +275,7 @@ InvoiceController.prototype = {
       .append($('<th/>').html('Shipping Address'))
       .append($('<th/>').html('Billing Address'))
       .append($('<th/>').html('Invoice Status'))
-      .append($('<th/>').html('Payment Status'))      
+      .append($('<th/>').html('Payment'))      
     );    
     table.append($('<tr/>')      
       .append($('<td/>').attr('valign', 'top')
@@ -285,6 +293,8 @@ InvoiceController.prototype = {
       .append($('<td/>').attr('valign', 'top').append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_status')))
       .append($('<td/>').attr('valign', 'top')
         .append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_payment_terms'))
+        .append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_payment_terms'))
+        .append($('<div/>').attr('id', 'invoice_' + that.invoice.id + '_financial_status'))
         .append($('<div/>').attr('id', 'transactions').attr('align', 'center').append(transactions))
       )      
     );
@@ -494,7 +504,8 @@ InvoiceController.prototype = {
             .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
           );
           tr.append($('<td/>').append($('<div/>').attr('id', 'lineitem_' + li.id + '_status')))      
-          tr.append($('<td/>').attr('align', 'right').html(curr(li.unit_price)));    
+          //tr.append($('<td/>').attr('align', 'right').html(curr(li.unit_price)));    
+          tr.append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_unit_price')));
           tr.append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity')));
           tr.append($('<td/>').attr('align', 'right').attr('id', 'li_' + li.id + '_subtotal').html(curr(li.subtotal)));        
           table.append(tr);
@@ -680,7 +691,8 @@ InvoiceController.prototype = {
         .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
       );            
       tr.append($('<td/>').append($('<div/>').attr('id', 'lineitem_' + li.id + '_status')))      
-      tr.append($('<td/>').attr('align', 'right').html(curr(li.unit_price)));    
+      //tr.append($('<td/>').attr('align', 'right').html(curr(li.unit_price)));    
+      tr.append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_unit_price')));
       tr.append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity')));
       tr.append($('<td/>').attr('align', 'right').attr('id', 'li_' + li.id + '_subtotal').html(curr(li.subtotal)));
       table.append(tr);
@@ -737,10 +749,11 @@ InvoiceController.prototype = {
     var p = $('<p/>');
     p.append($('<input/>').attr('type', 'button').val('< Back').click(function() { window.location = '/admin/invoices'; })).append(' ');
     if (that.invoice.total > 0 && that.invoice.financial_status == 'pending')    
-      p.append($('<input/>').attr('type', 'button').val('Send for Authorization').click(function() { that.send_for_authorization(); })).append(' ');        
-    //p.append($('<input/>').attr('type', 'button').val('Resend Confirmation' ).click(function() { that.resend_confirmation(); })).append(' ');
-    p.append($('<input/>').attr('type', 'button').val('Add Item'            ).click(function() { that.add_variant();         })).append(' ');
-    p.append($('<input/>').attr('type', 'button').val('Print Invoice'         ).click(function() { that.print_invoice();         })).append(' ');
+      p.append($('<input/>').attr('type', 'button').val('Send for Payment').click(function() { that.send_for_authorization(); })).append(' ');        
+    if (that.invoice.total > 0 && (that.invoice.financial_status == 'captured' || that.invoice.financial_status == 'paid by check' || that.invoice.financial_status == 'paid by other means'))    
+      p.append($('<input/>').attr('type', 'button').val('Send Receipt to Customer' ).click(function() { that.send_receipt();   })).append(' ');
+    p.append($('<input/>').attr('type', 'button').val('Add Item'                 ).click(function() { that.add_variant();     })).append(' ');
+    p.append($('<input/>').attr('type', 'button').val('Print Invoice'            ).click(function() { that.print_invoice();   })).append(' ');
     $('#controls').empty().append(p);
   },
 
@@ -842,8 +855,8 @@ InvoiceController.prototype = {
   {    
     var that = this;
     var div = $('<div/>')
-      .append($('<span/>').attr('id', 'financial_status').append(that.invoice.financial_status)).append(' ')
-      .append($('<a/>').attr('href', '#').html('refresh').click(function(e) { e.preventDefault(); that.refresh_transactions(); }))
+      //.append($('<span/>').attr('id', 'financial_status').append(that.invoice.financial_status)).append(' ')
+      .append($('<a/>').attr('href', '#').html('refresh transactions').click(function(e) { e.preventDefault(); that.refresh_transactions(); }))
       .append($('<div/>').attr('id', 'transactions_message'));
     if (that.invoice.invoice_transactions.length > 0)        
     {
@@ -1000,6 +1013,29 @@ InvoiceController.prototype = {
       }
     });
   },
+  
+  send_receipt: function(confirm)
+  {
+    var that = this;    
+    if (!confirm)
+    {    
+      var p = $('<p/>').addClass('note confirm')
+        .append("Are you sure you want to send a receipt to the customer? ")
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.send_receipt(true); }))
+        .append(' ')                
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+      $('#message').empty().append(p);
+      return;
+    }
+    $('#message').html("<p class='loading'>Sending receipt...</p>");
+    $.ajax({
+      url: '/admin/invoices/' + that.invoice.id + '/send-receipt',
+      success: function(resp) {
+        if (resp.error)   { that.flash_error(resp.error); }
+        if (resp.success) { that.refresh(function() { that.flash_success("A receipt email has been sent successfully to the customer."); }); }        
+      }
+    });
+  },
 
   calculate_tax: function()
   {

data/app/controllers/caboose/invoice_packages_controller.rb

@@ -67,44 +67,44 @@ module Caboose
       render :json => resp
     end
     
-    # @route PUT /admin/invoices/:invoice_id/line-items/:id
-    def admin_update_line_item
-      return if !user_is_allowed('invoices', 'edit')
-      
-      resp = Caboose::StdClass.new({'attributes' => {}})
-      li = LineItem.find(params[:id])    
-      
-      save = true
-      send_status_email = false    
-      params.each do |name,value|
-        case name
-          when 'quantity'
-            li.quantity = value
-            li.save
-                      	  
-            # Recalculate everything
-            r = ShippingCalculator.rate(li.invoice, li.invoice.shipping_method_code)
-            li.invoice.shipping = r['negotiated_rate'] / 100
-            li.invoice.handling = (r['negotiated_rate'] / 100) * 0.05
-            li.invoice.tax = TaxCalculator.tax(li.invoice)            
-            li.invoice.calculate_total
-            li.invoice.save
-            
-          when 'tracking_number'
-            li.tracking_number = value
-            send_status_email = true
-          when 'status'
-            li.status = value
-            resp.attributes['status'] = {'text' => value}
-            send_status_email = true
-        end
-      end
-      if send_status_email       
-        InvoicesMailer.configure_for_site(@site.id).customer_status_updated(li.invoice).deliver
-      end
-      resp.success = save && li.save
-      render :json => resp
-    end 
+    # @ route PUT /admin/invoices/:invoice_id/line-items/:id
+    #def admin_update_line_item
+    #  return if !user_is_allowed('invoices', 'edit')
+    #  
+    #  resp = Caboose::StdClass.new({'attributes' => {}})
+    #  li = LineItem.find(params[:id])    
+    #  
+    #  save = true
+    #  send_status_email = false    
+    #  params.each do |name,value|
+    #    case name
+    #      when 'quantity'
+    #        li.quantity = value
+    #        li.save
+    #                  	  
+    #        # Recalculate everything
+    #        r = ShippingCalculator.rate(li.invoice, li.invoice.shipping_method_code)
+    #        li.invoice.shipping = r['negotiated_rate'] / 100
+    #        li.invoice.handling = (r['negotiated_rate'] / 100) * 0.05
+    #        li.invoice.tax = TaxCalculator.tax(li.invoice)            
+    #        li.invoice.calculate_total
+    #        li.invoice.save
+    #        
+    #      when 'tracking_number'
+    #        li.tracking_number = value
+    #        send_status_email = true
+    #      when 'status'
+    #        li.status = value
+    #        resp.attributes['status'] = {'text' => value}
+    #        send_status_email = true
+    #    end
+    #  end
+    #  if send_status_email       
+    #    InvoicesMailer.configure_for_site(@site.id).customer_status_updated(li.invoice).deliver
+    #  end
+    #  resp.success = save && li.save
+    #  render :json => resp
+    #end 
     
     # @route DELETE /admin/invoices/:invoice_id/packages/:id
     def admin_delete

data/app/controllers/caboose/invoices_controller.rb

@@ -189,26 +189,27 @@ module Caboose
       
       resp = Caboose::StdClass.new({'attributes' => {}})
       invoice = Invoice.find(params[:id])    
-      
+            
       save = true    
-      params.each do |name,value|
+      params.each do |name,value|        
         case name
-          when 'tax'             then 
+          when 'tax' 
             invoice.tax = value
             invoice.total = invoice.calculate_total          
-          when 'handling'        then
+          when 'handling'
             invoice.handling = value
             invoice.total = invoice.calculate_total
-          when 'custom_discount' then 
+          when 'custom_discount' 
             invoice.custom_discount = value
             invoice.discount = invoice.calculate_discount
             invoice.total = invoice.calculate_total
-          when 'status'          then
+          when 'status'
             invoice.status = value
-            if value == 'Shipped'
-              invoice.date_shipped = DateTime.now.utc
-            end            
-          when 'customer_id'     then invoice.customer_id     = value            
+            invoice.date_shipped = DateTime.now.utc if value == 'Shipped'                          
+          when 'financial_status'            
+            invoice.financial_status = value
+          when 'customer_id'
+            invoice.customer_id = value            
         end
       end
 
@@ -216,7 +217,7 @@ module Caboose
       #invoice.calculate_total
       #resp.attributes['total'] = { 'value' => invoice.total }
       
-      resp.success = save && invoice.save
+      resp.success = save && invoice.save      
       render :json => resp
     end
     
@@ -237,6 +238,14 @@ module Caboose
       render :json => { :success => true }
     end
     
+    # @route GET /admin/invoices/:id/send-receipt
+    def admin_send_for_authorization
+      return if !user_is_allowed('invoices', 'edit')
+      invoice = Invoice.find(params[:id])
+      invoice.delay(:queue => 'caboose_store').send_receipt_email      
+      render :json => { :success => true }
+    end
+    
     # @route GET /admin/invoices/city-report
     def admin_city_report
       return if !user_is_allowed('invoices', 'view')
@@ -273,7 +282,18 @@ module Caboose
             Invoice::STATUS_SHIPPED, 
             Invoice::STATUS_CANCELED
           ]
-          options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}              
+          options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}
+        when 'financial-status'
+          statuses = [
+            Invoice::FINANCIAL_STATUS_PENDING             ,
+            Invoice::FINANCIAL_STATUS_AUTHORIZED          ,
+            Invoice::FINANCIAL_STATUS_CAPTURED            ,
+            Invoice::FINANCIAL_STATUS_REFUNDED            ,
+            Invoice::FINANCIAL_STATUS_VOIDED              ,
+            Invoice::FINANCIAL_STATUS_PAID_BY_CHECK       ,
+            Invoice::FINANCIAL_STATUS_PAID_BY_OTHER_MEANS                
+          ]
+          options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}
         when 'payment-terms'
           options = [
             { 'value' => Invoice::PAYMENT_TERMS_PIA   , 'text' => 'Pay In Advance' },

data/app/controllers/caboose/line_items_controller.rb

@@ -46,21 +46,26 @@ module Caboose
         case name
           when 'invoice_id'         then li.invoice_id          = value
           when 'invoice_package_id' then li.invoice_package_id  = value
-          when 'variant_id'       then li.variant_id        = value
-          when 'parent_id'        then li.parent_id         = value          
-          #when 'unit_price'       then li.unit_price        = value
-          #when 'subtotal'         then li.subtotal          = value
-          when 'notes'            then li.notes             = value
-          when 'custom1'          then li.custom1           = value
-          when 'custom2'          then li.custom2           = value
-          when 'custom3'          then li.custom3           = value
-          when 'quantity'
-            li.quantity = value
+          when 'variant_id'         then li.variant_id          = value
+          when 'parent_id'          then li.parent_id           = value                    
+          #when 'subtotal'          then li.subtotal            = value
+          when 'notes'              then li.notes               = value
+          when 'custom1'            then li.custom1             = value
+          when 'custom2'            then li.custom2             = value
+          when 'custom3'            then li.custom3             = value
+          when 'unit_price'
+            Caboose.log("li.unit_price = #{li.unit_price}")
+            li.unit_price = value
+            li.save
+            Caboose.log("li.unit_price = #{li.unit_price}")
             li.subtotal = li.unit_price * li.quantity
-            
             li.save
-            
-            
+            li.invoice.subtotal = li.invoice.calculate_subtotal
+            li.invoice.total = li.invoice.calculate_total
+          when 'quantity'
+            li.quantity = value
+            li.subtotal = li.unit_price * li.quantity            
+            li.save                        
             li.invoice.subtotal = li.invoice.calculate_subtotal
             li.invoice.total = li.invoice.calculate_total
             

data/app/controllers/caboose/users_controller.rb

@@ -269,19 +269,24 @@ module Caboose
       return if !user_is_allowed('users', 'sudo')
       user = User.find(params[:id])
                                   
-      # See if we're on the default domain               
-      d = Caboose::Domain.where(:domain => request.host_with_port).first      
-            
-      if d.primary == true
-        logout_user
-        login_user(user, false) # Login the new user      
-        redirect_to "/"
-      end
-               
-      # Set a random token for the user
-      user.token = (0...20).map { ('a'..'z').to_a[rand(26)] }.join
-      user.save
-      redirect_to "http://#{d.site.primary_domain.domain}/admin/users/#{params[:id]}/su/#{user.token}"                    
+      ## See if we're on the default domain               
+      #d = Caboose::Domain.where(:domain => request.host_with_port).first      
+      #      
+      #if d.primary == true
+      #  logout_user
+      #  login_user(user, false) # Login the new user      
+      #  redirect_to "/"
+      #end
+      #         
+      ## Set a random token for the user
+      #user.token = (0...20).map { ('a'..'z').to_a[rand(26)] }.join
+      #user.save
+      #      
+      #redirect_to "http://#{d.site.primary_domain.domain}/admin/users/#{params[:id]}/su/#{user.token}"
+                                          
+      logout_user
+      login_user(user, false) # Login the new user      
+      redirect_to "/"                           
     end
     
     # @route GET /admin/users/:id/su/:token

data/app/mailers/caboose/invoices_mailer.rb

@@ -47,7 +47,13 @@ module Caboose
     # Sends an email to the customer telling them they need to authorize payment on an invoice 
     def customer_payment_authorization(invoice)      
       @invoice = invoice
-      mail(:to => invoice.customer.email, :subject => "Order #{@invoice.invoice_number} ready for payment")
+      mail(:to => invoice.customer.email, :subject => "Invoice #{@invoice.invoice_number} ready for payment")
+    end
+    
+    # Sends an email to the customer telling them they need to authorize payment on an invoice 
+    def customer_receipt(invoice)      
+      @invoice = invoice
+      mail(:to => invoice.customer.email, :subject => "Invoice #{@invoice.invoice_number} receipt")
     end
   end
 end

data/app/models/caboose/invoice.rb

@@ -66,12 +66,14 @@ module Caboose
     #STATUS_CANCELED       = 'Canceled'
     #STATUS_WAIVED         = 'Waived'
              
-    FINANCIAL_STATUS_PENDING    = 'pending'
-    FINANCIAL_STATUS_AUTHORIZED = 'authorized'
-    FINANCIAL_STATUS_CAPTURED   = 'captured'
-    FINANCIAL_STATUS_REFUNDED   = 'refunded'
-    FINANCIAL_STATUS_VOIDED     = 'voided'
-    
+    FINANCIAL_STATUS_PENDING             = 'pending'
+    FINANCIAL_STATUS_AUTHORIZED          = 'authorized'
+    FINANCIAL_STATUS_CAPTURED            = 'captured'
+    FINANCIAL_STATUS_REFUNDED            = 'refunded'
+    FINANCIAL_STATUS_VOIDED              = 'voided'
+    FINANCIAL_STATUS_PAID_BY_CHECK       = 'paid by check'
+    FINANCIAL_STATUS_PAID_BY_OTHER_MEANS = 'paid by other means'
+        
     PAYMENT_TERMS_PIA   = 'pia'
     PAYMENT_TERMS_NET7  = 'net7'
     PAYMENT_TERMS_NET10 = 'net10'
@@ -104,7 +106,7 @@ module Caboose
     }
     
     validates :financial_status, :inclusion => {
-      :in      => ['pending', 'authorized', 'captured', 'refunded', 'voided'],
+      :in      => ['pending', 'authorized', 'captured', 'refunded', 'voided', 'paid by check', 'paid by other means'],
       :message => "%{value} is not a valid financial status. Must be 'authorized', 'captured', 'refunded' or 'voided'"
     }
     
@@ -489,6 +491,10 @@ module Caboose
       InvoicesMailer.configure_for_site(self.site_id).customer_payment_authorization(self).deliver
     end
     
+    def send_receipt_email
+      InvoicesMailer.configure_for_site(self.site_id).customer_receipt(self).deliver
+    end
+    
     def determine_statuses
       
       auth    = false
@@ -647,67 +653,69 @@ module Caboose
       case sc.pp_name          
         when StoreConfig::PAYMENT_PROCESSOR_STRIPE
           
-          Stripe.api_key = sc.stripe_secret_key.strip
-          charges = Stripe::Charge.list(:limit => 100, :customer => self.customer.stripe_customer_id)
-          
-          self.financial_status = Invoice::FINANCIAL_STATUS_PENDING                      
-          charges.each do |c|            
-            invoice_id = c.metadata && c.metadata['invoice_id'] ? c.metadata['invoice_id'].to_i : nil            
-            next if invoice_id.nil? || invoice_id != self.id
+          if sc.stripe_secret_key && sc.stripe_secret_key.strip.length > 0            
+            Stripe.api_key = sc.stripe_secret_key.strip
+            charges = Stripe::Charge.list(:limit => 100, :customer => self.customer.stripe_customer_id)
             
-            if c.refunded                               then self.financial_status = Invoice::FINANCIAL_STATUS_REFUNDED
-            elsif c.status == 'succeeded' && c.captured then self.financial_status = Invoice::FINANCIAL_STATUS_CAPTURED
-            elsif c.status == 'succeeded'               then self.financial_status = Invoice::FINANCIAL_STATUS_AUTHORIZED            
-            end                                    
-                        
-            auth_trans = InvoiceTransaction.create(
-              :invoice_id => self.id,
-              :transaction_id => c.id,
-              :transaction_type => c.captured ? InvoiceTransaction::TYPE_AUTHCAP : InvoiceTransaction::TYPE_AUTHORIZE,
-              :payment_processor => sc.pp_name,
-              :amount => c.amount / 100.0,
-              :amount_refunded => c.amount_refunded,
-              :date_processed => DateTime.strptime(c.created.to_s, '%s'),              
-              :success => c.status == 'succeeded',
-              :captured => c.captured,
-              :refunded => c.refunded              
-            )
-            if c.balance_transaction
-              bt = Stripe::BalanceTransaction.retrieve(c.balance_transaction)
-              capture_trans = InvoiceTransaction.create(
+            self.financial_status = Invoice::FINANCIAL_STATUS_PENDING                      
+            charges.each do |c|            
+              invoice_id = c.metadata && c.metadata['invoice_id'] ? c.metadata['invoice_id'].to_i : nil            
+              next if invoice_id.nil? || invoice_id != self.id
+              
+              if c.refunded                               then self.financial_status = Invoice::FINANCIAL_STATUS_REFUNDED
+              elsif c.status == 'succeeded' && c.captured then self.financial_status = Invoice::FINANCIAL_STATUS_CAPTURED
+              elsif c.status == 'succeeded'               then self.financial_status = Invoice::FINANCIAL_STATUS_AUTHORIZED            
+              end                                    
+                          
+              auth_trans = InvoiceTransaction.create(
                 :invoice_id => self.id,
-                :parent_id => auth_trans.id, 
-                :transaction_id => bt.id,
-                :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
+                :transaction_id => c.id,
+                :transaction_type => c.captured ? InvoiceTransaction::TYPE_AUTHCAP : InvoiceTransaction::TYPE_AUTHORIZE,
                 :payment_processor => sc.pp_name,
-                :amount => bt.amount / 100.0,                
-                :date_processed => DateTime.strptime(bt.created.to_s, '%s'),
-                :success => bt.status == 'succeeded' || bt.status == 'pending'
-              )                            
-            end
-            if c.refunds && c.refunds['total_count'] > 0
-              total = 0
-              c.refunds['data'].each do |r|
-                total = total + r.amount
-                InvoiceTransaction.create(
+                :amount => c.amount / 100.0,
+                :amount_refunded => c.amount_refunded,
+                :date_processed => DateTime.strptime(c.created.to_s, '%s'),              
+                :success => c.status == 'succeeded',
+                :captured => c.captured,
+                :refunded => c.refunded              
+              )
+              if c.balance_transaction
+                bt = Stripe::BalanceTransaction.retrieve(c.balance_transaction)
+                capture_trans = InvoiceTransaction.create(
                   :invoice_id => self.id,
-                  :parent_id => auth_trans.id,
-                  :transaction_id => r.id,
-                  :transaction_type => InvoiceTransaction::TYPE_REFUND,
+                  :parent_id => auth_trans.id, 
+                  :transaction_id => bt.id,
+                  :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
                   :payment_processor => sc.pp_name,
-                  :amount => r.amount / 100.0,                
-                  :date_processed => DateTime.strptime(r.created.to_s, '%s'),
-                  :success => r.status == 'succeeded' || r.status == 'pending'
-                )
+                  :amount => bt.amount / 100.0,                
+                  :date_processed => DateTime.strptime(bt.created.to_s, '%s'),
+                  :success => bt.status == 'succeeded' || bt.status == 'pending'
+                )                            
               end
-              total = total.to_f / 100
-              if total >= auth_trans.amount
-                auth_trans.refunded = true
-                auth_trans.save
+              if c.refunds && c.refunds['total_count'] > 0
+                total = 0
+                c.refunds['data'].each do |r|
+                  total = total + r.amount
+                  InvoiceTransaction.create(
+                    :invoice_id => self.id,
+                    :parent_id => auth_trans.id,
+                    :transaction_id => r.id,
+                    :transaction_type => InvoiceTransaction::TYPE_REFUND,
+                    :payment_processor => sc.pp_name,
+                    :amount => r.amount / 100.0,                
+                    :date_processed => DateTime.strptime(r.created.to_s, '%s'),
+                    :success => r.status == 'succeeded' || r.status == 'pending'
+                  )
+                end
+                total = total.to_f / 100
+                if total >= auth_trans.amount
+                  auth_trans.refunded = true
+                  auth_trans.save
+                end
               end
             end
+            self.save
           end
-          self.save
       end
     end
     

data/app/models/caboose/tax_calculator.rb

@@ -4,7 +4,7 @@ module Caboose
   class TaxCalculator
     
     def self.custom_tax(store_config, invoice)          
-      return eval(store_config.custom_tax_function)    
+      return store_config.custom_tax_function && store_config.custom_tax_function.strip.length > 0 ? eval(store_config.custom_tax_function) : 0.00    
     end
     
     def self.tax(invoice)

data/app/views/caboose/invoices_mailer/customer_receipt.html.erb

@@ -0,0 +1,75 @@
+<p><img src='<%= @invoice.site.logo.url(:thumb) %>' /></p>
+
+<h1>Receipt</h1>
+
+<p>
+  Invoice #<%= @invoice.id %><br />
+  Status: <% @invoice.status %><br />
+  Financial status: <% @invoice.financial_status %>
+</p>
+
+<table border='1' style='border-collapse: collapse;'>
+  <tr>    
+    <th>Line Item</th>
+    <th>Unit Price</th>
+    <th>Quantity</th>
+    <th>Subtotal</th>
+  </tr>
+  <% @invoice.line_items.each do |li| %>    
+    <% v = li.variant %>
+    <% p = v.product %>
+    <tr>            
+      <td>
+        <p><%= p.title %></td></p>
+        <% if li.is_gift %>
+          <p>This item is a gift.</p>
+          <ul>
+            <li><% if li.gift_wrap %>Gift wrap (<%= number_to_currency(p.gift_wrap_price) %>)<% else %>Do not gift wrap<% end %></li>
+            <li><% if li.include_gift_message %>Gift message: <%= li.gift_message %><% else %>No gift message<% end %></li>
+            <li><% if li.hide_prices %>Hide all prices<% else %>Show all prices<% end %></li>
+          </ul>
+        <% end %>
+      </td>
+      <td align='right'><%= number_to_currency(li.unit_price) %></td>
+      <td align='right'><%= li.quantity %></td>
+      <td align='right'><%= number_to_currency(li.subtotal) %></td>
+    </tr>  
+  <% end %>
+  <tr><td colspan="4" align='right'>Subtotal:               </td><td align='right'><%= number_to_currency(@invoice.subtotal) %></td></tr>
+  <tr><td colspan="4" align='right'>Tax:                    </td><td align='right'><%= number_to_currency(@invoice.tax)      %></td></tr>
+  <tr><td colspan="4" align='right'>Shipping and Handling:  </td><td align='right'><%= number_to_currency(@invoice.shipping + @invoice.handling) %></td></tr>
+  <% if @invoice.gift_wrap && @invoice.gift_wrap > 0 %>  
+    <tr><td colspan="4" align='right'>Gift wrap:            </td><td align='right'><%= number_to_currency(@invoice.gift_wrap) %></td></tr>
+  <% end %>
+  <% if @invoice.discounts %>
+    <% @invoice.discounts.each do |d| %>
+      <tr><td colspan="4" align='right'>"<%= d.gift_card.code %>" gift card: </td><td align='right'><%= number_to_currency(d.amount) %></td></tr>
+    <% end %>
+  <% end %>
+  <% if @invoice.custom_discount %>
+    <tr><td colspan="4" align='right'>Discount: </td><td align='right'><%= number_to_currency(@invoice.custom_discount) %></td></tr>
+  <% end %>      
+  <tr><td colspan="4" align='right'>Total:     </td><td align='right'><%= number_to_currency(@invoice.total) %></td></tr>
+</table>
+
+<% if @invoice.shipping_address %>
+  <% sa = @invoice.shipping_address %>
+  <h2>Shipping Address</h2>
+  <p>
+    <%= sa.first_name %> <%= sa.last_name %><br />
+    <%= sa.address1 %><br />
+    <% if sa.address2 && sa.address2.strip.length > 0 %><%= sa.address2 %><br /><% end %>
+    <%= sa.city %>, <%= sa.state %> <%= sa.zip %>
+  </p>
+<% end %>
+
+<% if @invoice.billing_address %>
+  <% ba = @invoice.billing_address %>
+  <h2>Billing Address</h2>
+  <p>
+    <%= ba.first_name %> <%= ba.last_name %><br />
+    <%= ba.address1 %><br />
+    <% if ba.address2 && ba.address2.strip.length > 0 %><%= ba.address2 %><br /><% end %>
+    <%= ba.city %>, <%= ba.state %> <%= ba.zip %>
+  </p>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.34'
+  VERSION = '0.8.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.34
+  version: 0.8.35
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1057,6 +1057,7 @@ files:
 - app/views/caboose/invoices/admin_summary_report.html.erb
 - app/views/caboose/invoices_mailer/customer_new_invoice.html.erb
 - app/views/caboose/invoices_mailer/customer_payment_authorization.html.erb
+- app/views/caboose/invoices_mailer/customer_receipt.html.erb
 - app/views/caboose/invoices_mailer/customer_status_updated.html.erb
 - app/views/caboose/invoices_mailer/fulfillment_new_invoice.html.erb
 - app/views/caboose/invoices_mailer/shipping_invoice_ready.html.erb