caboose-cms 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b21e4e3fe1e4fffbbf0e0c07e5a8f66014fba1
-  data.tar.gz: c8794f4febe45b56f519a93d8db75a75e34cb19e
+  metadata.gz: bd5c3299de4b2df226ab252fd6692f96f6d14e4a
+  data.tar.gz: 7d68c1f14df8d0eff130de8837687b4433c4b299
 SHA512:
-  metadata.gz: 4aee44531816be1b60eba614a3f76a7b212df96a4c6e9dec4aead01d9f6d22ae9ee373f34783041921bfe78d746cca320bdd5e8f8af48022c8004612cd69afa7
-  data.tar.gz: 41e9fe6899cf068580bfe5640133333300db0ea342d61cbc69e8cbf6289f85b48d88638d7256b52d7ccb0f8a9ac0e8dc593d6e093e02a36abf832fe2083ed024
+  metadata.gz: 290b12853521bb941918fb8ef86e72b09bb731d1a869929517b8433f0f5af53aaa31fecdb79c1fde9c490365c28a5883be5c386f81e9254a87f827f1e9500be2
+  data.tar.gz: 9786c74786a166a85aef663b970a8285afb9326ebfd61211919632161f531bca6006073fdfb7f9a3c09ff8c21eece139650e7de5747882a59eaa998541434cf9

data/app/models/caboose/invoice_pdf.rb

@@ -53,8 +53,6 @@ module Caboose
                       
       sc = self.invoice.site.store_config
       ot = self.invoice.invoice_transactions.where(:transaction_type => InvoiceTransaction::TYPE_AUTHORIZE, :success => true).first
-      
-      return unless ot
 
       case ot.payment_processor
         when StoreConfig::PAYMENT_PROCESSOR_AUTHNET
@@ -86,17 +84,6 @@ module Caboose
       invoice_info = "Invoice Number: #{invoice.invoice_number}\n"
       invoice_info << "Invoice Date: #{invoice.date_created.strftime('%d %b %Y %H:%M:%S %p')}\n"
       invoice_info << "Status: #{invoice.status.capitalize}\n"
-      
-      if invoice.status == Invoice::STATUS_PENDING
-        s  = self.invoice.site
-        sc = self.invoice.site.store_config
-        invoice_info << "\n"
-        invoice_info << "Please mail payments to:\n"
-        invoice_info << "#{s.description}\n"
-        invoice_info << "#{sc.origin_address1}\n"
-        invoice_info << "#{sc.origin_address2}\n"
-        invoice_info << "#{sc.origin_city}, " << "#{sc.origin_state} " << "#{sc.origin_zip}\n"
-      end
 
       tbl = []
       tbl << [
@@ -108,7 +95,6 @@ module Caboose
 
     
     def customer_info
-      return if self.invoice.status == Invoice::STATUS_PENDING
 
       c = invoice.customer
 
@@ -271,7 +257,6 @@ module Caboose
     end
 
     def payment_info
-      return if self.invoice.status == Invoice::STATUS_PENDING
 
       trans = invoice.invoice_transactions.where(:transaction_type => InvoiceTransaction::TYPE_AUTHORIZE, :success => true).first
       tbl = []

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.12'
+  VERSION = '0.9.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -839,7 +839,6 @@ files:
 - app/mailers/caboose/caboose_mailer.rb
 - app/mailers/caboose/invoices_mailer.rb
 - app/mailers/caboose/login_mailer.rb
-- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb

data/app/models/caboose/#Untitled-1#

@@ -1,12 +0,0 @@
-
-x = 0.0
-invoice.line_items.each do |li|
-  li.verify_unit_price  
-  x = x + (li.unit_price * li.quantity) if li.variant.taxable
-end
-
-return x * 0.09 if invoice.instore_pickup
-sa = invoice.shipping_address
-return 0.00 if sa.nil? || sa.city.nil? || sa.state.nil?       
-return 0.00 if sa.state.downcase != 'al'
-return (0.09 * x).round(2)