caboose-cms 0.7.85 → 0.8.1

data/app/controllers/caboose/google_spreadsheets_controller.rb

@@ -3,7 +3,7 @@ require 'httparty'
 module Caboose
   class GoogleSpreadsheetsController < Caboose::ApplicationController
     
-    # GET /google-spreadsheets/:spreadsheet_id/csv
+    # @route GET /google-spreadsheets/:spreadsheet_id/csv
     def csv_data           
       spreadsheet_id = params[:spreadsheet_id]                                                                                                              
       #url = "https://docs.google.com/spreadsheets/d/#{spreadsheet_id}/export?format=csv&id=#{spreadsheet_id}&gid=0"

data/app/controllers/caboose/{order_packages_controller.rb → invoice_packages_controller.rb}

@@ -1,18 +1,18 @@
 module Caboose
-  class OrderPackagesController < Caboose::ApplicationController
+  class InvoicePackagesController < Caboose::ApplicationController
     
-    # GET /admin/orders/:order_id/packages/json
+    # @route GET /admin/invoices/:invoice_id/packages/json
     def admin_json      
-      return if !user_is_allowed('orders', 'view')
-      order = Order.find(params[:order_id])
-      render :json => order.order_packages.as_json(
+      return if !user_is_allowed('invoices', 'view')
+      invoice = Invoice.find(params[:invoice_id])
+      render :json => invoice.invoice_packages.as_json(
         :include => { :shipping_package => { :include => :shipping_methods} }
       )
     end     
 
-    # POST /admin/orders/:order_id/packages
+    # @route POST /admin/invoices/:invoice_id/packages
     def admin_add
-      return if !user_is_allowed('orders', 'add')
+      return if !user_is_allowed('invoices', 'add')
       
       resp = StdClass.new
                               
@@ -20,32 +20,32 @@ module Caboose
       elsif params[:shipping_method_id].strip.length   == 0 then resp.error = "Please select a shipping method."      
       else
 
-        op = OrderPackage.new(
-          :order_id            => params[:order_id],
+        op = InvoicePackage.new(
+          :invoice_id          => params[:invoice_id],
           :shipping_package_id => params[:shipping_package_id],
           :shipping_method_id  => params[:shipping_method_id],
-          :status              => OrderPackage::STATUS_PENDING          
+          :status              => InvoicePackage::STATUS_PENDING          
         )        
         op.save        
         resp.new_id = op.id
-        resp.redirect = "/admin/orders/#{params[:order_id]}/packages/#{op.id}"
+        resp.redirect = "/admin/invoices/#{params[:invoice_id]}/packages/#{op.id}"
         
       end
       
       render :json => resp
     end
     
-    # PUT /admin/orders/:order_id/packages/:id
+    # @route PUT /admin/invoices/:invoice_id/packages/:id
     def admin_update
-      return if !user_is_allowed('orders', 'edit')
+      return if !user_is_allowed('invoices', 'edit')
       
       resp = Caboose::StdClass.new
-      op = OrderPackage.find(params[:id])    
+      op = InvoicePackage.find(params[:id])    
       
       save = true    
       params.each do |name,value|
         case name
-          when 'order_id'            then op.order_id              = value
+          when 'invoice_id'          then op.invoice_id              = value
           when 'shipping_method_id'  then op.shipping_method_id    = value
           when 'shipping_package_id' then op.shipping_package_id   = value
           when 'status'              then op.status                = value
@@ -59,17 +59,17 @@ module Caboose
       end
       
       op.save
-      op.order.shipping = op.order.calculate_shipping
-      op.order.total = op.order.calculate_total
-      op.order.save
+      op.invoice.shipping = op.invoice.calculate_shipping
+      op.invoice.total = op.invoice.calculate_total
+      op.invoice.save
       
       resp.success = true
       render :json => resp
     end
     
-    # PUT /admin/orders/:order_id/line-items/:id
+    # @route PUT /admin/invoices/:invoice_id/line-items/:id
     def admin_update_line_item
-      return if !user_is_allowed('orders', 'edit')
+      return if !user_is_allowed('invoices', 'edit')
       
       resp = Caboose::StdClass.new({'attributes' => {}})
       li = LineItem.find(params[:id])    
@@ -83,12 +83,12 @@ module Caboose
             li.save
                       	  
             # Recalculate everything
-            r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
-            li.order.shipping = r['negotiated_rate'] / 100
-            li.order.handling = (r['negotiated_rate'] / 100) * 0.05
-            li.order.tax = TaxCalculator.tax(li.order)            
-            li.order.calculate_total
-            li.order.save
+            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
@@ -100,36 +100,36 @@ module Caboose
         end
       end
       if send_status_email       
-        OrdersMailer.configure_for_site(@site.id).customer_status_updated(li.order).deliver
+        InvoicesMailer.configure_for_site(@site.id).customer_status_updated(li.invoice).deliver
       end
       resp.success = save && li.save
       render :json => resp
     end 
     
-    # DELETE /admin/orders/:order_id/packages/:id
+    # @route DELETE /admin/invoices/:invoice_id/packages/:id
     def admin_delete
-      return if !user_is_allowed('orders', 'delete')
+      return if !user_is_allowed('invoices', 'delete')
       resp = StdClass.new
-      op = OrderPackage.find(params[:id])
+      op = InvoicePackage.find(params[:id])
       if op.line_items.nil? || op.line_items.count == 0
         op.destroy
-        resp.redirect = "/admin/orders/#{params[:order_id]}"
+        resp.redirect = "/admin/invoices/#{params[:invoice_id]}"
       else
         resp.error = "Only empty packages can be deleted."
       end
       render :json => resp
     end
     
-    # GET /admin/orders/:order_id/packages/:id/calculate-shipping
+    # @route GET /admin/invoices/:invoice_id/packages/:id/calculate-shipping
     def calculate_shipping
-      return if !user_is_allowed('orders', 'edit')
+      return if !user_is_allowed('invoices', 'edit')
 
-      op = OrderPackage.find(params[:id])
-      order = op.order
+      op = InvoicePackage.find(params[:id])
+      invoice = op.invoice
       
-      render :json => { :error => "Empty order" } and return if order.nil?
-      render :json => { :error => "No shippable items in order package" } and return if !order.has_shippable_items?
-      render :json => { :error => "Empty shipping address" } and return if order.shipping_address.nil?
+      render :json => { :error => "Empty invoice" } and return if invoice.nil?
+      render :json => { :error => "No shippable items in invoice package" } and return if !invoice.has_shippable_items?
+      render :json => { :error => "Empty shipping address" } and return if invoice.shipping_address.nil?
 
       rate = ShippingCalculator.calculate_rate(op)
       render :json => { :error => "No rate found for given shipping package and method" } and return if rate.nil?
@@ -137,26 +137,26 @@ module Caboose
       op.total = rate
       op.save
       
-      order.calculate_shipping
-      order.calculate_total
-      order.save
+      invoice.calculate_shipping
+      invoice.calculate_total
+      invoice.save
       
       render :json => { :error => "No rate found for shipping method" } and return if rate.nil?                   
       render :json => { :success => true, :rate => rate }            
     end
     
-    # GET /admin/orders/:order_id/packages/:id/shipping-rates
+    # @route GET /admin/invoices/:invoice_id/packages/:id/shipping-rates
     def shipping_rates
-      return if !user_is_allowed('orders', 'edit')
+      return if !user_is_allowed('invoices', 'edit')
 
-      op = OrderPackage.find(params[:id])
-      order = op.order
+      op = InvoicePackage.find(params[:id])
+      invoice = op.invoice
       
-      render :json => { :error => "Empty order" } and return if order.nil?
-      render :json => { :error => "No shippable items in order package" } and return if !order.has_shippable_items?
-      render :json => { :error => "Empty shipping address" } and return if order.shipping_address.nil?
+      render :json => { :error => "Empty invoice" } and return if invoice.nil?
+      render :json => { :error => "No shippable items in invoice package" } and return if !invoice.has_shippable_items?
+      render :json => { :error => "Empty shipping address" } and return if invoice.shipping_address.nil?
                                                         
-      rates = ShippingCalculator.order_package_rates(op)      
+      rates = ShippingCalculator.invoice_package_rates(op)      
       render :json => rates            
     end
             

data/app/controllers/caboose/{order_reports_controller.rb → invoice_reports_controller.rb}

@@ -1,21 +1,21 @@
 module Caboose
-  class OrdersController < Caboose::ApplicationController
+  class InvoicesController < Caboose::ApplicationController
      
-    # GET /admin/orders/summary-report
+    # GET /admin/invoices/summary-report
     def admin_summary_report
-      return if !user_is_allowed('orders', 'view')
+      return if !user_is_allowed('invoices', 'view')
       
       q = ["select 
           concat(date_part('year', date_authorized), '-', date_part('month', date_authorized), '-', date_part('day', date_authorized)),
           count(*), 
           sum(total)
-        from store_orders
+        from store_invoices
         where site_id = ?
         and (financial_status = ? or financial_status = ?)
         and date_authorized >= ?
         and date_authorized < ?
         group by concat(date_part('year', date_authorized), '-', date_part('month', date_authorized), '-', date_part('day', date_authorized))
-        order by concat(date_part('year', date_authorized), '-', date_part('month', date_authorized), '-', date_part('day', date_authorized))",
+        invoice by concat(date_part('year', date_authorized), '-', date_part('month', date_authorized), '-', date_part('day', date_authorized))",
         @site.id, 'authorized', 'captured', @d1, @d2]
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
       return rows.collect { |row|
@@ -34,30 +34,28 @@ module Caboose
       @pager = Caboose::PageBarGenerator.new(params, {
         'site_id'              => @site.id,
         'customer_id'          => '', 
-        'status'               => Order::STATUS_PENDING,
+        'status'               => Invoice::STATUS_PENDING,
         'shipping_method_code' => '',
         'id'                   => ''
       }, {
-        'model'          => 'Caboose::Order',
+        'model'          => 'Caboose::Invoice',
         'sort'           => 'id',
         'desc'           => 1,
-        'base_url'       => '/admin/orders',
+        'base_url'       => '/admin/invoices',
         'use_url_params' => false
       })
       
-      @orders    = @pager.items
+      @invoices  = @pager.items
       @customers = Caboose::User.reorder('last_name, first_name').all
       
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/orders/new
+    # GET /admin/invoices/new
     def admin_new
-      return if !user_is_allowed('orders', 'add')      
+      return if !user_is_allowed('invoices', 'add')      
       render :layout => 'caboose/admin'
     end
     
-    
-    
   end
 end

data/app/controllers/caboose/invoice_transactions_controller.rb

@@ -0,0 +1,35 @@
+module Caboose
+  class InvoiceTransactionsController < Caboose::ApplicationController
+    
+    # @route GET /admin/invoices/:invoice_id/transactions/:id/capture
+    def admin_capture
+      return if !user_is_allowed('invoices', 'edit')
+    
+      it = InvoiceTransaction.find(params[:id])
+      resp = it.capture 
+      
+      render :json => resp            
+    end
+        
+    # @route GET /admin/invoices/:invoice_id/transactions/:id/refund
+    def admin_refund
+      return if !user_is_allowed('invoices', 'edit')
+    
+      it = InvoiceTransaction.find(params[:id])
+      resp = it.refund 
+      
+      render :json => resp            
+    end
+    
+    # @route GET /admin/invoices/:invoice_id/transactions/:id/void
+    def admin_void
+      return if !user_is_allowed('invoices', 'edit')
+    
+      it = InvoiceTransaction.find(params[:id])
+      resp = it.void 
+      
+      render :json => resp            
+    end
+    
+  end
+end

data/app/controllers/caboose/invoices_controller.rb

@@ -0,0 +1,328 @@
+module Caboose
+  class InvoicesController < Caboose::ApplicationController
+    
+    # @route GET /admin/invoices/weird-test
+    def admin_weird_test
+      Caboose.log("Before the admin_weird_test")
+      x = Invoice.new
+      Caboose.log("After the admin_weird_test")
+      render :json => x      
+    end
+    
+    # @route GET /admin/invoices
+    def admin_index
+      return if !user_is_allowed('invoices', 'view')
+      
+      @pager = Caboose::PageBarGenerator.new(params, {
+        'site_id'              => @site.id,
+        'customer_id'          => '', 
+        'status'               => Invoice::STATUS_PENDING,
+        'shipping_method_code' => '',
+        'id'                   => '',
+        'invoice_number'       => ''
+      }, {
+        'model'          => 'Caboose::Invoice',
+        'sort'           => 'id',
+        'desc'           => 1,
+        'base_url'       => '/admin/invoices',
+        'use_url_params' => false,
+        'items_per_page' => 100
+      })
+      
+      @invoices  = @pager.items
+      @customers = Caboose::User.where(:site_id => @site.id).reorder('last_name, first_name').all
+      
+      render :layout => 'caboose/admin'
+    end
+    
+    # @route GET /admin/invoices/:id/refresh-transactions
+    def refresh_transactions      
+      return if !user_is_allowed('invoices', 'add')
+      
+      resp = Caboose::StdClass.new
+                  
+      invoice = Invoice.find(params[:id])
+      invoice.refresh_transactions            
+      resp.financial_status = invoice.financial_status
+      resp.invoice_transactions = invoice.invoice_transactions.reorder(:date_processed).all
+      
+      render :json => resp
+    end
+    
+    # @route GET /admin/invoices/new
+    def admin_new
+      return if !user_is_allowed('invoices', 'add')      
+      render :layout => 'caboose/admin'
+    end
+    
+    # @route POST /admin/invoices
+    def admin_add
+      return if !user_is_allowed('invoices', 'add')
+      invoice = Invoice.create(
+        :site_id => @site.id,
+        :status => Invoice::STATUS_PENDING,                          
+        :financial_status => Invoice::FINANCIAL_STATUS_PENDING,
+        :invoice_number => @site.store_config.next_invoice_number
+      )    
+      render :json => { :sucess => true, :redirect => "/admin/invoices/#{invoice.id}" }
+    end
+      
+    # @route_priority 50
+    # @route GET /admin/invoices/:id
+    def admin_edit
+      return if !user_is_allowed('invoices', 'edit')
+      @invoice = Invoice.where(:id => params[:id]).first
+
+      if params[:id].nil? || @invoice.nil?
+        render :file => 'caboose/invoices/admin_invalid_invoice', :layout => 'caboose/admin'
+        return
+      end            
+      render :layout => 'caboose/admin'
+    end
+    
+    # @route GET /admin/invoices/:id/calculate-tax
+    def admin_calculate_tax
+      return if !user_is_allowed('invoices', 'edit')
+      invoice = Invoice.find(params[:id])
+      invoice.tax = invoice.calculate_tax
+      invoice.total = invoice.calculate_total
+      invoice.save
+      render :json => { :success => true }      
+    end
+    
+    # @route GET /admin/invoices/:id/calculate-handling
+    def admin_calculate_handling
+      return if !user_is_allowed('invoices', 'edit')
+      invoice = Invoice.find(params[:id])
+      invoice.handling = invoice.calculate_handling
+      invoice.total = invoice.calculate_total
+      invoice.save
+      render :json => { :success => true }      
+    end
+
+    # @route GET /admin/invoices/:id/capture
+    def capture_funds
+      return if !user_is_allowed('invoices', 'edit')
+           
+      invoice = Invoice.find(params[:id])
+      resp = invoice.capture_funds   
+      
+      # Tell taxcloud the invoice was captured
+      #Caboose::TaxCalculator.captured(invoice)
+      
+      render :json => resp
+    end
+    
+    # @route GET /admin/invoices/:id/void
+    def admin_void
+      return if !user_is_allowed('invoices', 'edit')
+            
+      invoice = Invoice.find(params[:id])
+      resp = invoice.void
+    
+      render :json => resp
+    end
+  
+    # @route GET /admin/invoices/:id/refund
+    def admin_refund
+      return if !user_is_allowed('invoices', 'edit')
+    
+      invoice = Invoice.find(params[:id])
+      resp = invoice.refund 
+      
+      render :json => resp            
+    end
+    
+    # @route POST /admin/invoices/:id/resend-confirmation
+    def admin_resend_confirmation
+      if Invoice.find(params[:id]).resend_confirmation
+        render :json => { success: "Confirmation re-sent successfully." }
+      else
+        render :json => { error: "There was an error re-sending the email." }
+      end
+    end
+    
+    # @route GET /admin/invoices/:id/json
+    def admin_json
+      return if !user_is_allowed('invoices', 'edit')    
+      invoice = Invoice.find(params[:id])
+      if invoice.shipping_address_id.nil?
+        sa = Address.create
+        invoice.shipping_address_id = sa.id
+        invoice.save
+      end
+      render :json => invoice.as_json(:include => [        
+        { :line_items => { :include => { :variant => { :include => :product }}}},
+        { :invoice_packages => { :include => [:shipping_package, :shipping_method] }},
+        { :discounts => { :include => :gift_card }},
+        :customer,
+        :shipping_address,
+        :billing_address,
+        :invoice_transactions
+      ])
+    end
+  
+    # @route GET /admin/invoices/:id/print
+    def admin_print
+      return if !user_is_allowed('invoices', 'edit')           
+      
+      pdf = InvoicePdf.new
+      pdf.invoice = Invoice.find(params[:id])             
+      send_data pdf.to_pdf, :filename => "invoice_#{pdf.invoice.id}.pdf", :type => "application/pdf", :disposition => "inline"   
+    end
+    
+    # @route GET /admin/invoices/print-pending
+    def admin_print_pending
+      return if !user_is_allowed('invoices', 'edit')    
+      
+      pdf = PendingInvoicesPdf.new
+      if params[:print_card_details]
+        pdf.print_card_details = params[:print_card_details].to_i == 1
+      end
+      pdf.invoices = Invoice.where(:site_id => @site.id, :status => Invoice::STATUS_PENDING).all      
+      send_data pdf.to_pdf, :filename => "pending_invoices.pdf", :type => "application/pdf", :disposition => "inline"            
+    end
+      
+    # @route PUT /admin/invoices/:id
+    def admin_update
+      return if !user_is_allowed('invoices', 'edit')
+      
+      resp = Caboose::StdClass.new({'attributes' => {}})
+      invoice = Invoice.find(params[:id])    
+      
+      save = true    
+      params.each do |name,value|
+        case name
+          when 'tax'             then 
+            invoice.tax = value
+            invoice.total = invoice.calculate_total          
+          when 'handling'        then
+            invoice.handling = value
+            invoice.total = invoice.calculate_total
+          when 'custom_discount' then 
+            invoice.custom_discount = value
+            invoice.discount = invoice.calculate_discount
+            invoice.total = invoice.calculate_total
+          when 'status'          then
+            invoice.status = value
+            if value == 'Shipped'
+              invoice.date_shipped = DateTime.now.utc
+            end            
+          when 'customer_id'     then invoice.customer_id     = value            
+        end
+      end
+
+      #invoice.calculate
+      #invoice.calculate_total
+      #resp.attributes['total'] = { 'value' => invoice.total }
+      
+      resp.success = save && invoice.save
+      render :json => resp
+    end
+    
+    # @route DELETE /admin/invoices/:id
+    def admin_delete
+      return if !user_is_allowed('invoices', 'delete')
+      Invoice.find(params[:id]).destroy
+      render :json => Caboose::StdClass.new({
+        :redirect => '/admin/invoices'
+      })
+    end
+
+    # @route GET /admin/invoices/:id/send-for-authorization
+    def admin_send_for_authorization
+      return if !user_is_allowed('invoices', 'edit')
+      invoice = Invoice.find(params[:id])
+      invoice.delay.send_payment_authorization_email      
+      render :json => { :success => true }
+    end
+    
+    # @route GET /admin/invoices/city-report
+    def admin_city_report
+      return if !user_is_allowed('invoices', 'view')
+
+      @d1 = params[:d1] ? DateTime.strptime("#{params[:d1]} 00:00:00", '%Y-%m-%d %H:%M:%S') : DateTime.strptime(DateTime.now.strftime("%Y-%m-01 00:00:00"), '%Y-%m-%d %H:%M:%S')
+      @d2 = params[:d2] ? DateTime.strptime("#{params[:d2]} 00:00:00", '%Y-%m-%d %H:%M:%S') : @d1 + 1.month      
+      @rows = InvoiceReporter.city_report(@site.id, @d1, @d2)
+      
+      render :layout => 'caboose/admin'    
+    end
+    
+    # @route GET /admin/invoices/summary-report
+    def admin_summary_report
+      return if !user_is_allowed('invoices', 'view')
+
+      @d1 = params[:d1] ? DateTime.strptime("#{params[:d1]} 00:00:00", '%Y-%m-%d %H:%M:%S') : DateTime.strptime(DateTime.now.strftime("%Y-%m-01 00:00:00"), '%Y-%m-%d %H:%M:%S')
+      @d2 = params[:d2] ? DateTime.strptime("#{params[:d2]} 00:00:00", '%Y-%m-%d %H:%M:%S') : @d1 + 1.month      
+      @rows = InvoiceReporter.summary_report(@site.id, @d1, @d2)
+      
+      render :layout => 'caboose/admin'    
+    end
+
+    # @route GET /admin/invoices/:field-options    
+    def admin_options
+      return if !user_is_allowed('invoices', 'view')
+      
+      options = []
+      case params[:field]
+        when 'status'
+          statuses = [
+            Invoice::STATUS_CART, 
+            Invoice::STATUS_PENDING, 
+            Invoice::STATUS_READY_TO_SHIP, 
+            Invoice::STATUS_SHIPPED, 
+            Invoice::STATUS_CANCELED
+          ]
+          options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}              
+        when 'payment-terms'
+          options = [
+            { 'value' => Invoice::PAYMENT_TERMS_PIA   , 'text' => 'Pay In Advance' },
+            { 'value' => Invoice::PAYMENT_TERMS_NET7  , 'text' => 'Net 7'          },
+            { 'value' => Invoice::PAYMENT_TERMS_NET10 , 'text' => 'Net 10'         },
+            { 'value' => Invoice::PAYMENT_TERMS_NET30 , 'text' => 'Net 30'         },
+            { 'value' => Invoice::PAYMENT_TERMS_NET60 , 'text' => 'Net 60'         },
+            { 'value' => Invoice::PAYMENT_TERMS_NET90 , 'text' => 'Net 90'         },
+            { 'value' => Invoice::PAYMENT_TERMS_EOM   , 'text' => 'End of Month'   }            
+          ]
+      end          
+      render :json => options    
+    end
+    
+    # @route GET /admin/invoices/google-feed
+    def admin_google_feed
+      d2 = DateTime.now
+      d1 = DateTime.now
+      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')
+        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|
+          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")}"                              
+        end
+      end
+      
+      # Save when we made the last call
+      setting = if Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted')
+        Caboose::Setting.where(:name => 'google_feed_date_last_submitted').first
+      else
+        Caboose::Setting.new(:name => 'google_feed_date_last_submitted')
+      end
+      
+      setting.value = d2.strftime("%F %T")
+      setting.save            
+                   
+      # Print out the lines
+      render :text => tsv.join("\n")
+    end
+  end
+end