caboose-cms 0.8.85 → 0.8.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c733a7f3995558a46f3453e11a29dd3f0c5a1d
-  data.tar.gz: 293ae7956fc12b5c071ec94650c59de6572ec6c8
+  metadata.gz: 0af06f8f26a6c537627299c1ccd323b5ca9033d3
+  data.tar.gz: 47d8742aac68010be20aa7b4f8d90a28b20a6601
 SHA512:
-  metadata.gz: 61ec5173bb6007cae13d6130e6ad0ee37d23a132693ba4df015fdf056b7478671811948a60f0eb5292aa33541f76f30b13c419df576695e15e456b3299e68dcb
-  data.tar.gz: 355fedb418323553d24700e953e018ac7c4b007410625747ebe9aac9a08635c4a7990a0a4aee0ef4141edb4999a70fc45423c48a233af94aecbec03c5e9397c2
+  metadata.gz: ebd290abf21ca8bbb0c02ebea94925725e9e4aad05659d667fd405cf177a58075f4dc6ca3224ee4c878f8038a7cde5ff9abd438d708563d8e075345cbcac1f8f
+  data.tar.gz: d1003bc8a568bbb802122cfe3eaeaadf6d481c19f19caf9527fe2633864d6e2e1121224e7ab95990df2ec6d84c501368d476c19f0bdca3b73a45a41e04314d51

data/app/assets/javascripts/caboose/model/index_table.js

@@ -1044,6 +1044,30 @@ IndexTable.prototype = {
         });
         td.append(select);
       }
+      //else if (f.type == 'checkbox_multiple')
+      //{
+      //  var options = false;
+      //  if (!f.options && f.options_url)
+      //  {
+      //    $.ajax({
+      //      url: f.options_url,
+      //      type: 'get',
+      //      success: function(resp) { f.options = resp; },
+      //      async: false
+      //    });
+      //  }
+      //  var div = $('<div/>');        
+      //  //if (f.empty_option_text)
+      //  //{
+      //  //  div.append($('<input/>').attr('type', 'checkbox').attr('id', f.name + '_empty').val(''))
+      //  //    .append($('<label/>').attr('for', f.name + '_empty').html(f.empty_option_text));
+      //  //}
+      //  $.each(f.options, function(j, option) {
+      //    div.append($('<input/>').attr('type', 'checkbox').attr('id', f.name + '_' + j).val(option.value).prop('checked', pp[f.name].indexOf(option.value) > -1))          
+      //      .append($('<label/>').attr('for', f.name + '_' + j).html(option.text));
+      //  });
+      //  td.append(div);
+      //}
       tr.append(td);
       tbody.append(tr);
     });    

data/app/controllers/caboose/application_controller.rb

@@ -83,6 +83,14 @@ module Caboose
         @invoice.landing_page_ref = params[:ref] || nil
         @invoice.payment_terms    = @site.store_config.default_payment_terms
         @invoice.save
+        
+        InvoiceLog.create(
+          :invoice_id     => @invoice.id,          
+          :user_id        => logged_in_user.id,
+          :date_logged    => DateTime.now.utc,
+          :invoice_action => InvoiceLog::ACTION_INVOICE_CREATED                
+        )
+        
         # Save the cart ID in the session
         session[:cart_id] = @invoice.id
       end                  

data/app/controllers/caboose/cart_controller.rb

@@ -42,29 +42,45 @@ module Caboose
       v = Variant.find(params[:variant_id])
       qty = params[:quantity] ? params[:quantity].to_i : 1
       
+      resp = StdClass.new
+            
       if @invoice.line_items.exists?(:variant_id => v.id)
         li = @invoice.line_items.find_by_variant_id(v.id)
         li.quantity += qty
         li.subtotal = li.unit_price * li.quantity
+        InvoiceLog.create(
+          :invoice_id     => @invoice.id,
+          :line_item_id   => li.id,
+          :user_id        => logged_in_user.id,
+          :date_logged    => DateTime.now.utc,
+          :invoice_action => InvoiceLog::ACTION_LINE_ITEM_UPDATED,
+          :field          => 'quantity',
+          :old_value      => li.quantity - qty,
+          :new_value      => li.quantity
+        )
       else
         unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)
-        li = LineItem.new(
+        li = LineItem.create(
           :invoice_id   => @invoice.id,
           :variant_id => v.id,
           :quantity   => qty,
           :unit_price => unit_price,
           :subtotal   => unit_price * qty,
           :status     => 'pending'
+        )        
+        InvoiceLog.create(
+          :invoice_id     => @invoice.id,
+          :line_item_id   => li.id,
+          :user_id        => logged_in_user.id,
+          :date_logged    => DateTime.now.utc,
+          :invoice_action => InvoiceLog::ACTION_LINE_ITEM_CREATED                                                                          
         )
       end
-
       GA.delay(:queue => 'caboose_store').event(@site.id, 'cart', 'add', "Product #{v.product.id}, Variant #{v.id}")
-
-      render :json => { 
-        :success => li.save, 
-        :errors => li.errors.full_messages,
-        :item_count => @invoice.item_count 
-      }      
+      
+      resp.success = true
+      resp.item_count = @invoice.item_count
+      render :json => resp
     end
     
     # @route PUT /cart/:line_item_id
@@ -73,7 +89,20 @@ module Caboose
       li = LineItem.find(params[:line_item_id])
 
       save = true    
+      fields_to_log = ['quantity', 'is_gift', 'include_gift_message', 'gift_message', 'gift_wrap', 'hide_prices']            
       params.each do |name,value|
+        if fields_to_log.include?(name)        
+          InvoiceLog.create(
+            :invoice_id     => @invoice.id,
+            :line_item_id   => li.id,
+            :user_id        => logged_in_user.id,
+            :date_logged    => DateTime.now.utc,
+            :invoice_action => InvoiceLog::ACTION_LINE_ITEM_UPDATED,
+            :field          => name,
+            :old_value      => li[name.to_sym],
+            :new_value      => value
+          )            
+        end
         case name
           when 'quantity'    then
             if value.to_i != li.quantity
@@ -92,6 +121,13 @@ module Caboose
             li.quantity = value.to_i
             if li.quantity == 0
               li.destroy
+              InvoiceLog.create(
+                :invoice_id     => @invoice.id,
+                :line_item_id   => li.id,
+                :user_id        => logged_in_user.id,
+                :date_logged    => DateTime.now.utc,
+                :invoice_action => InvoiceLog::ACTION_LINE_ITEM_DELETED                
+              )
             else            
               li.subtotal = li.unit_price * li.quantity
               li.save
@@ -112,7 +148,14 @@ module Caboose
     
     # @route DELETE /cart/:line_item_id
     def remove                  
-      li = LineItem.find(params[:line_item_id]).destroy      
+      li = LineItem.find(params[:line_item_id]).destroy
+      InvoiceLog.create(
+        :invoice_id     => @invoice.id,
+        :line_item_id   => params[:line_item_id],
+        :user_id        => logged_in_user.id,
+        :date_logged    => DateTime.now.utc,
+        :invoice_action => InvoiceLog::ACTION_LINE_ITEM_DELETED                
+      )
       op = li.invoice_package
       if op
         op.shipping_method_id = nil
@@ -140,7 +183,7 @@ module Caboose
       elsif gc.card_type == GiftCard::CARD_TYPE_AMOUNT && gc.balance <= 0       then resp.error = "That gift card has a zero balance." 
       elsif gc.min_invoice_total && @invoice.total < gc.min_invoice_total             then resp.error = "Your invoice must be at least $#{sprintf('%.2f',gc.min_invoice_total)} to use this gift card." 
       elsif Discount.where(:invoice_id => @invoice.id, :gift_card_id => gc.id).exists? then resp.error = "That gift card has already been applied to this invoice."
-      else
+      else            
         # Create the discount and recalculate the invoice
         d = Discount.create(:invoice_id => @invoice.id, :gift_card_id => gc.id, :amount => 0.0)
         d.calculate_amount                

data/app/controllers/caboose/invoice_packages_controller.rb

@@ -26,7 +26,15 @@ module Caboose
           :shipping_method_id  => params[:shipping_method_id],
           :status              => InvoicePackage::STATUS_PENDING          
         )        
-        op.save        
+        op.save
+        
+        InvoiceLog.create(
+          :invoice_id        => params[:invoice_id],
+          :invoice_packag_id => op.id,
+          :user_id           => logged_in_user.id,
+          :date_logged       => DateTime.now.utc,
+          :invoice_action    => InvoiceLog::ACTION_INVOICE_PACKAGE_CREATED                                                                            
+        )        
         resp.new_id = op.id
         resp.redirect = "/admin/invoices/#{params[:invoice_id]}/packages/#{op.id}"
         
@@ -42,8 +50,21 @@ module Caboose
       resp = Caboose::StdClass.new
       op = InvoicePackage.find(params[:id])    
       
-      save = true    
+      save = true
+      fields_to_log = ['invoice_id','shipping_method_id','shipping_package_id','status','tracking_number','total','package_method']
       params.each do |name,value|
+        if fields_to_log.include?(name)              
+          InvoiceLog.create(
+            :invoice_id         => params[:invoice_id],
+            :invoice_package_id => op.id,
+            :user_id            => logged_in_user.id,
+            :date_logged        => DateTime.now.utc,
+            :invoice_action     => InvoiceLog::ACTION_INVOICE_PACKAGE_UPDATED,
+            :field              => name,
+            :old_value          => op[name.to_sym],
+            :new_value          => value
+          )                      
+        end                
         case name
           when 'invoice_id'          then op.invoice_id              = value
           when 'shipping_method_id'  then op.shipping_method_id    = value
@@ -113,6 +134,13 @@ module Caboose
       op = InvoicePackage.find(params[:id])
       if op.line_items.nil? || op.line_items.count == 0
         op.destroy
+        InvoiceLog.create(
+          :invoice_id         => params[:invoice_id],
+          :invoice_package_id => params[:id],
+          :user_id            => logged_in_user.id,
+          :date_logged        => DateTime.now.utc,
+          :invoice_action     => InvoiceLog::ACTION_INVOICE_PACKAGE_DELETED                                                                            
+        )
         resp.redirect = "/admin/invoices/#{params[:invoice_id]}"
       else
         resp.error = "Only empty packages can be deleted."

data/app/controllers/caboose/invoices_controller.rb

@@ -17,7 +17,7 @@ module Caboose
       @pager = Caboose::PageBarGenerator.new(params, {
         'site_id'              => @site.id,
         'customer_id'          => params[:user_id] ? params[:user_id] : '', 
-        'status'               => Invoice::STATUS_PENDING,
+        'status'               => Invoice::STATUS_PENDING,      
         'shipping_method_code' => '',
         'id'                   => '',
         'invoice_number'       => '',
@@ -67,7 +67,13 @@ module Caboose
         :status => Invoice::STATUS_PENDING,                          
         :financial_status => Invoice::FINANCIAL_STATUS_PENDING,
         :invoice_number => @site.store_config.next_invoice_number
-      )    
+      )
+      InvoiceLog.create(
+        :invoice_id     => invoice.id,
+        :user_id        => logged_in_user.id,
+        :date_logged    => DateTime.now.utc,
+        :invoice_action => InvoiceLog::ACTION_INVOICE_CREATED                        
+      )      
       render :json => { :sucess => true, :redirect => "/admin/invoices/#{invoice.id}" }
     end
         
@@ -216,8 +222,20 @@ module Caboose
       resp = Caboose::StdClass.new({'attributes' => {}})
       invoice = Invoice.find(params[:id])    
             
-      save = true    
-      params.each do |name,value|        
+      save = true
+      fields_to_log = ['tax','handling','custom_discount','financial_status','customer_id','notes','customer_notes','payment_terms','date_due','status']            
+      params.each do |name,value|
+        if fields_to_log.include?(name)                                                  
+          InvoiceLog.create(
+            :invoice_id     => invoice.id,
+            :user_id        => logged_in_user.id,
+            :date_logged    => DateTime.now.utc,
+            :invoice_action => InvoiceLog::ACTION_INVOICE_UPDATED,
+            :field          => name,
+            :old_value      => invoice[name.to_sym],
+            :new_value      => value                                                                  
+          )
+        end
         case name
           when 'tax' 
             invoice.tax = value
@@ -229,9 +247,9 @@ module Caboose
             invoice.custom_discount = value
             invoice.discount = invoice.calculate_discount
             invoice.total = invoice.calculate_total
-          when 'status'
-            invoice.status = value
-            invoice.date_shipped = DateTime.now.utc if value == 'Shipped'
+          when 'status'            
+            invoice.status = value             
+            invoice.date_processed = DateTime.now.utc if value == Invoice::STATUS_PROCESSED
             
           when 'financial_status'    then invoice.financial_status = value
           when 'customer_id'         then invoice.customer_id      = value          
@@ -240,7 +258,7 @@ module Caboose
           when 'payment_terms'       then invoice.payment_terms    = value          
           when 'date_due'            then invoice.date_due         = value
                             
-        end
+        end                        
       end
 
       #invoice.calculate
@@ -254,7 +272,13 @@ module Caboose
     # @route DELETE /admin/invoices/:id
     def admin_delete
       return if !user_is_allowed('invoices', 'delete')
-      Invoice.find(params[:id]).destroy
+      Invoice.find(params[:id]).destroy      
+      InvoiceLog.create(
+        :invoice_id     => params[:id],
+        :user_id        => logged_in_user.id,
+        :date_logged    => DateTime.now.utc,
+        :invoice_action => InvoiceLog::ACTION_INVOICE_DELETED                                                                          
+      )      
       render :json => Caboose::StdClass.new({
         :redirect => '/admin/invoices'
       })
@@ -309,8 +333,7 @@ module Caboose
             Invoice::STATUS_CART, 
             Invoice::STATUS_PENDING, 
             Invoice::STATUS_READY_TO_SHIP, 
-            Invoice::STATUS_SHIPPED,
-            Invoice::STATUS_PAID, 
+            Invoice::STATUS_PROCESSED,             
             Invoice::STATUS_CANCELED
           ]
           options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}
@@ -346,16 +369,16 @@ module Caboose
       if Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted')                  
         d1 = Caboose::Setting.where(:name => 'google_feed_date_last_submitted').first.value      
         d1 = DateTime.parse(d1)
-      elsif Invoice.exists?("status = ? and date_authorized is not null", Invoice::STATUS_SHIPPED)
-        d1 = Invoice.where("status = ? and date_authorized is not null", Invoice::STATUS_SHIPPED).reorder("date_authorized DESC").limit(1).pluck('date_authorized')
+      elsif Invoice.exists?("status = ? and date_authorized is not null", Invoice::STATUS_PROCESSED)
+        d1 = Invoice.where("status = ? and date_authorized is not null", Invoice::STATUS_PROCESSED).reorder("date_authorized DESC").limit(1).pluck('date_authorized')
         d1 = DateTime.parse(d1)
       end
       
       # Google Feed Docs
       # https://support.google.com/trustedstoresmerchant/answer/3272612?hl=en&ref_topic=3272286?hl=en
       tsv = ["merchant invoice id\ttracking number\tcarrier code\tother carrier name\tship date"]            
-      if Invoice.exists?("status = ? and date_authorized > '#{d1.strftime("%F %T")}'", Invoice::STATUS_SHIPPED)
-        Invoice.where("status = ? and date_authorized > ?", Invoice::STATUS_SHIPPED, d1).reorder(:id).all.each do |invoice|
+      if Invoice.exists?("status = ? and date_authorized > '#{d1.strftime("%F %T")}'", Invoice::STATUS_PROCESSED)
+        Invoice.where("status = ? and date_authorized > ?", Invoice::STATUS_PROCESSED, d1).reorder(:id).all.each do |invoice|
           tracking_numbers = invoice.line_items.collect{ |li| li.tracking_number }.compact.uniq
           tn = tracking_numbers && tracking_numbers.count >= 1 ? tracking_numbers[0] : ""
           tsv << "#{invoice.id}\t#{tn}\tUPS\t\t#{invoice.date_shipped.strftime("%F")}"                              

data/app/controllers/caboose/line_items_controller.rb

@@ -21,15 +21,24 @@ module Caboose
       
       resp = StdClass.new
       v = Variant.find(params[:variant_id])
-      li = LineItem.new(
-        :invoice_id   => params[:invoice_id],
+      li = LineItem.create(
+        :invoice_id => params[:invoice_id],
         :variant_id => params[:variant_id],
         :quantity   => 1,
         :unit_price => v.price,
         :subtotal   => v.price,
-        :status     => 'pending'                
-      )         
-      resp.success = li.save
+        :status     => LineItem::STATUS_PENDING                
+      )
+      resp.success = true
+      resp.new_id = li.id
+            
+      InvoiceLog.create(
+        :invoice_id     => params[:invoice_id],
+        :line_item_id   => li.id,
+        :user_id        => logged_in_user.id,
+        :date_logged    => DateTime.now.utc,
+        :invoice_action => InvoiceLog::ACTION_LINE_ITEM_CREATED                                                                          
+      )      
       render :json => resp
     end
       
@@ -42,7 +51,20 @@ module Caboose
       
       save = true
       send_status_email = false
-      params.each do |name,value|        
+      fields_to_log = ['invoice_id','invoice_package_id','variant_id','parent_id','notes','custom1','custom2','custom3','unit_price','quantity','tracking_number','status']
+      params.each do |name,value|
+        if fields_to_log.include?(name)                
+          InvoiceLog.create(
+            :invoice_id     => params[:invoice_id],
+            :line_item_id   => li.id,
+            :user_id        => logged_in_user.id,
+            :date_logged    => DateTime.now.utc,
+            :invoice_action => InvoiceLog::ACTION_LINE_ITEM_UPDATED,
+            :field          => name,
+            :old_value      => li[name.to_sym],
+            :new_value      => value
+          )
+        end                
         case name
           when 'invoice_id'         then li.invoice_id          = value
           when 'invoice_package_id' then li.invoice_package_id  = value
@@ -53,15 +75,14 @@ module Caboose
           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}")
+          when 'unit_price'            
             li.unit_price = value
-            li.save
-            Caboose.log("li.unit_price = #{li.unit_price}")
+            li.save            
             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            
@@ -69,14 +90,6 @@ module Caboose
             li.invoice.subtotal = li.invoice.calculate_subtotal
             li.invoice.total = li.invoice.calculate_total
             
-            # 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
@@ -104,6 +117,14 @@ module Caboose
       invoice.total    = invoice.calculate_total
       invoice.save
       
+      InvoiceLog.create(
+        :invoice_id     => params[:invoice_id],
+        :line_item_id   => params[:id],
+        :user_id        => logged_in_user.id,
+        :date_logged    => DateTime.now.utc,
+        :invoice_action => InvoiceLog::ACTION_LINE_ITEM_DELETED                                                                          
+      )
+      
       render :json => Caboose::StdClass.new({
         :redirect => '/admin/invoices'
       })
@@ -118,15 +139,13 @@ module Caboose
     end
     
     # @route GET /admin/invoices/line-items/status-options
-    def admin_status_options
-      arr = ['pending', 'ready to ship', 'shipped', 'backinvoiceed', 'canceled']
-      options = []
-      arr.each do |status|
-        options << {
-          :value => status,
-          :text  => status
-        }
-      end
+    def admin_status_options      
+      options = [
+        { :value => LineItem::STATUS_PENDING       , :text => 'Pending'       },        
+        { :value => LineItem::STATUS_BACKORDERED   , :text => 'Backordered'   },
+        { :value => LineItem::STATUS_CANCELED      , :text => 'Canceled'      },
+        { :value => LineItem::STATUS_PROCESSED     , :text => 'Processed'     }
+      ]          
       render :json => options
     end
     

data/app/controllers/caboose/my_account_invoices_controller.rb

@@ -61,8 +61,7 @@ module Caboose
     end
 
     # @route POST /my-account/confirm
-    def confirm
-      Caboose::log(params)
+    def confirm      
       sc = @site.store_config
       @invoice = Invoice.find(params[:id])
 
@@ -111,7 +110,7 @@ module Caboose
           capture_resp = @invoice.capture_funds
           if capture_resp.success == true
             @invoice.take_gift_card_funds
-            @invoice.status = Caboose::Invoice::STATUS_PAID
+            @invoice.status = Caboose::Invoice::STATUS_PROCESSED
           end
         end
       end

data/app/models/caboose/invoice.rb

@@ -54,8 +54,7 @@ module Caboose
     STATUS_PENDING       = 'pending'    
     STATUS_CANCELED      = 'canceled'
     STATUS_READY_TO_SHIP = 'ready to ship'
-    STATUS_SHIPPED       = 'shipped'    
-    STATUS_PAID          = 'paid'
+    STATUS_PROCESSED     = 'processed'            
     STATUS_TESTING       = 'testing'
     
     # New
@@ -99,21 +98,7 @@ module Caboose
     scope :captured   , where('financial_status = ?', 'captured')
     scope :refunded   , where('financial_status = ?', 'refunded')
     scope :voided     , where('financial_status = ?', 'voided')        
-    
-    #
-    # Validations
-    #
-    
-    validates :status, :inclusion => {
-      :in      => ['cart', 'pending', 'canceled', 'ready to ship', 'shipped', 'paid', 'testing'],
-      :message => "%{value} is not a valid status. Must be either 'pending' or 'shipped'"
-    }
-    
-    validates :financial_status, :inclusion => {
-      :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'"
-    }
-    
+        
     after_initialize :check_nil_fields
     
     def check_nil_fields

data/app/models/caboose/invoice_log.rb

@@ -0,0 +1,30 @@
+module Caboose
+  class InvoiceLog < ActiveRecord::Base
+    self.table_name = 'store_invoice_logs'
+        
+    belongs_to :invoice  
+    belongs_to :user
+    attr_accessible :id   ,
+      :invoice_id         ,
+      :invoice_package_id ,
+      :line_item_id       ,      
+      :user_id            ,
+      :date_logged        ,
+      :invoice_action     ,
+      :field              ,
+      :old_value          ,
+      :new_value
+      
+    ACTION_INVOICE_CREATED         = 'invoice created'
+    ACTION_INVOICE_UPDATED         = 'invoice updated'
+    ACTION_INVOICE_DELETED         = 'invoice deleted'
+    ACTION_INVOICE_PACKAGE_CREATED = 'invoice package created'
+    ACTION_INVOICE_PACKAGE_UPDATED = 'invoice package updated'
+    ACTION_INVOICE_PACKAGE_DELETED = 'invoice package deleted'
+    ACTION_LINE_ITEM_CREATED       = 'line item created'
+    ACTION_LINE_ITEM_UPDATED       = 'line item updated'
+    ACTION_LINE_ITEM_DELETED       = 'line item deleted'
+
+  end
+end
+                                          

data/app/models/caboose/invoice_package.rb

@@ -15,8 +15,9 @@ module Caboose
       :total,
       :instore_pickup
       
-    STATUS_PENDING = 'Pending'
-    STATUS_SHIPPED = 'Shipped'
+    STATUS_PENDING       = 'Pending'
+    STATUS_READY_TO_SHIP = 'Ready to Ship'
+    STATUS_SHIPPED       = 'Shipped'
     
     after_initialize :check_nil_fields
     

data/app/models/caboose/line_item.rb

@@ -30,15 +30,17 @@ module Caboose
       :date_starts           ,
       :date_ends
     
-    STATUS_PENDING = 'pending'
-    STATUS_SHIPPED = 'shipped'
+    STATUS_PENDING       = 'pending'    
+    STATUS_BACKORDERED   = 'backordered'
+    STATUS_CANCELED      = 'canceled'
+    STATUS_PROCESSED     = 'processed'
 
     #
     # Scopes
     #    
-    scope :pending, where('status = ?', 'pending')
-    scope :fulfilled, where('status = ?', 'shipped')
-    scope :unfulfilled, where('status != ?', 'shipped')
+    scope :pending     , where('status = ?', 'pending')
+    scope :fulfilled   , where('status = ?', 'shipped')
+    scope :unfulfilled , where('status != ?', 'shipped')
     
     #validates :quantity, :numericality => { :greater_than_or_equal_to => 0 }    
     #validate :quantity_in_stock

data/app/models/caboose/schema.rb

@@ -408,6 +408,17 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :invoice_id            , :integer ],
         [ :discount_id           , :integer ]
       ],
+      Caboose::InvoiceLog => [
+        [ :invoice_id         , :integer  ],
+        [ :invoice_package_id , :integer  ],
+        [ :line_item_id       , :integer  ],
+        [ :user_id            , :integer  ],
+        [ :date_logged        , :datetime ],
+        [ :invoice_action     , :string   ],
+        [ :field              , :string   ],
+        [ :old_value          , :text     ],
+        [ :new_value          , :text     ]
+      ],
       Caboose::InvoicePackage => [
         [ :invoice_id           , :integer ],
         [ :instore_pickup       , :boolean  , { :default => false }],
@@ -444,6 +455,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :date_authorized       , :datetime ],
         [ :date_captured         , :datetime ],
         [ :date_shipped          , :datetime ],
+        [ :date_processed        , :datetime ],
         [ :date_due              , :date     ],
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
@@ -1162,5 +1174,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
       smtp.save
     end
     
+    # Change the invoice statuses
+    Caboose::Invoice.where("status = ? or status = ?", 'shipped', 'paid').all.each do |invoice|
+      invoice.status = 'processed'
+      invoice.save
+    end
+
   end
 end

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

@@ -2,6 +2,11 @@
 <% if @edituser %>
   <%= render :partial => 'caboose/users/admin_header' %>
 <% else %>
+  <div id='crumbtrail'>
+    <a href='/admin'>Admin</a> >
+    <a href='/admin/invoices'>Invoices</a> >
+    Invoice #<%= @invoice.id %>
+  </div>
   <h1>Edit Invoice #<%= @invoice.id %></h1>
 <% end %>
 

data/app/views/caboose/invoices/admin_index.html.erb

@@ -2,6 +2,10 @@
 <% if @edituser %>
   <%= render :partial => 'caboose/users/admin_header' %>
 <% else %>
+  <div id='crumbtrail'>
+    <a href='/admin'>Admin</a> >
+    Invoices
+  </div>
   <h1>Invoices</h1>
 <% end %>
 
@@ -33,7 +37,9 @@
   <% end %>
   <p><input type='text' name='total_gte' placeholder='Total Min' value="<%= @pager.params['total_gte'] %>" style='width: 100px;' /></p>
   <p><input type='text' name='total_lte' placeholder='Total Max' value="<%= @pager.params['total_lte'] %>" style='width: 100px;' /></p>
-  <p><select name='status'>
+  <p>
+    <!--
+    <select name='status'>
       <optgroup label='Status'>
         <option value=''>-- All statuses --</option>
         <% statuses = ['cart','pending','canceled','ready to ship','shipped','paid'] %>
@@ -41,7 +47,28 @@
           <option value='<%= status %>'<%= @pager.params['status'] == status ? " selected='true'" : '' %>><%= status.capitalize %></option>
         <% end %>
       </optgroup>
-    </select></p>  
+    </select>
+    -->    
+    <%
+    statuses = [
+      Caboose::Invoice::STATUS_CART          ,          
+      Caboose::Invoice::STATUS_PENDING       ,      
+      Caboose::Invoice::STATUS_READY_TO_SHIP ,
+      Caboose::Invoice::STATUS_PROCESSED     ,
+      Caboose::Invoice::STATUS_CANCELED
+    ]
+    all_checked = true
+    statuses.each do |status|
+      all_checked = false if !@pager.params['status'].include?(status)
+    end
+    Caboose.log(@pager.params['status'])
+    %>    
+    Status: 
+    <% statuses.each do |status| %>
+      <input type='checkbox' name='status[]' id='status_<%= status %>' value='<%= status %>' <% if @pager.params['status'].include?(status) %> checked='true'<% end %> />
+      <label for='status_<%= status %>'><%= status.capitalize %></label>
+    <% end %>                    
+  </p>  
   <p>
     <input type='submit' value='Search' />
     <input type='button' value='Clear' onclick="window.location='/admin<%= @edituser ? "/users/#{@edituser.id}" : '' %>/invoices';" />

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.85'
+  VERSION = '0.8.87'
 end

data/lib/tasks/caboose.rake

@@ -7,6 +7,10 @@ namespace :caboose do
     Caboose::Subscription.migrate_from_user_subscriptions
   end
   
+  task :create_subscription_invoices => :environment do
+    Caboose::Subscription.create_invoices
+  end
+  
   desc "Save sample asset"
   task :save_sample_asset => :environment do
     
@@ -151,7 +155,7 @@ namespace :caboose do
   
   desc "Calculate invoice profits"  
   task :calculate_invoice_profits => :environment do        
-    Caboose::Invoice.where("status = ? or status = ? or status = ?", Caboose::Invoice::STATUS_PENDING, Caboose::Invoice::STATUS_READY_TO_SHIP, Caboose::Invoice::STATUS_SHIPPED).reinvoice(:id).all.each do |invoice|
+    Caboose::Invoice.where("status = ? or status = ? or status = ?", Caboose::Invoice::STATUS_PENDING, Caboose::Invoice::STATUS_READY_TO_SHIP, Caboose::Invoice::STATUS_PROCESSED).reinvoice(:id).all.each do |invoice|
       invoice.update_column(:cost   , invoice.calculate_cost   )
       invoice.update_column(:profit , invoice.calculate_profit )
     end                    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.85
+  version: 0.8.87
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -881,6 +881,7 @@ files:
 - app/models/caboose/gift_card.rb
 - app/models/caboose/invoice.rb
 - app/models/caboose/invoice_discount.rb
+- app/models/caboose/invoice_log.rb
 - app/models/caboose/invoice_package.rb
 - app/models/caboose/invoice_package_calculator.rb
 - app/models/caboose/invoice_pdf.rb