caboose-cms 0.5.67 → 0.5.68

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZhMTk0MmMzMWRkNTA1MjkzODk2Njc4OGRkODIwYTJlMDhmMTgwNQ==
+    MDdiMzBlZWU2NWJmMGY0NGE4YjA2MDE5NDQ0NWRjYWMxNTI1N2IxYQ==
   data.tar.gz: !binary |-
-    ODkzOTY4NTFkY2ZlMGM2OWZhYmI2ODE3ZGE3ZmQ4ZmRjNjU2MGY3Mw==
+    ZTU0N2YyMWZhYzY2ZmZmYzkxMjg2ODE1YjYwYTA4NWY3OThkOTM2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTIwNTFkM2QzMmI1NmIzM2M1NDdmZjI3MWVkYTEwY2NlYjE4NTA1NzJlZGY3
-    NmU2ZjUyM2ZkNzk3NzQ1YmFlZTc2NWQ3ODdkNjIzZjM1MjZmZWI3ZDMwMTc5
-    NzAxNWJlNmIzYzNmY2RmYzUyZTRkYmEyZDc2ZjU3YzIxMDNlMDc=
+    YWVlODIxMTE2ZTE2ZDFhYWJmZjRlYWM2MTIwZTA3MTI5ODhmNDg2YjU2OGJm
+    OWEyMzM0ZTUzYzdkYjk4MjZkMGQzZDc5NzkzNTU1OTkyNDY4YTNhZjcxMmI0
+    M2RlMDEzNzQxMjc4NTRiYWNiNGE3MzYxN2RhMTgyYjQ1ODRjNzQ=
   data.tar.gz: !binary |-
-    MzYwOWZkNmY4NDUwNDZmODJmMjNhMmNlZmFhN2RlODBmZjNjN2ZiNDZiOTMz
-    MTVmMGU1NDQyNDY0NjcwMzRlMmMyZTVlMmJmNGQ3ZjcwMDYzZTZhMDI0MGVi
-    ODYzNzI1YmFkYzVlM2EzMjdhMjgwYTRlMWJjMDhmYzEwMTY0YzM=
+    MTVlY2M1ZTAyMWMxMGI2NzU4YTY5OWU3ODIxZWE2MzYzYWVhN2FjZmNhMDkz
+    Yzg3ZTM2MWMzZjUwNTJlYmE0MzY0MTMxMmE3OGYyMGMyZGJlMjhjM2Y4M2E2
+    OTIxMTc3NmMyNGVhNjljMzRiNDJhNTBiOTkyOTc3MjQ1Y2U3MjY=

data/app/controllers/caboose/checkout_controller.rb

@@ -14,16 +14,6 @@ module Caboose
     def index
       redirect_to '/checkout/step-one'
     end
-    
-    # Test Email 
-    def test_email
-            
-      m = OrdersMailer.configure_for_site(@site.id).test_email
-      Caboose.log(m.delivery_method.settings)
-      m.deliver
-      
-      render :json => DateTime.now
-    end
             
     # GET /checkout/step-one
     def step_one
@@ -266,8 +256,8 @@ module Caboose
         order.status = 'pending'
         
         # Send out emails        
-        OrdersMailer.customer_new_order(order).deliver
-        OrdersMailer.fulfillment_new_order(order).deliver        
+        OrdersMailer.configure_for_site(@site.id).customer_new_order(order).deliver
+        OrdersMailer.configure_for_site(@site.id).fulfillment_new_order(order).deliver        
         
         # Emit order event
         Caboose.plugin_hook('order_authorized', order)

data/app/controllers/caboose/line_items_controller.rb

@@ -74,7 +74,7 @@ module Caboose
         end
       end
       if send_status_email       
-        OrdersMailer.customer_status_updated(li.order).deliver
+        OrdersMailer.configure_for_site(@site.id).customer_status_updated(li.order).deliver
       end    
       resp.success = save && li.save
       render :json => resp

data/app/controllers/caboose/login_controller.rb

@@ -84,7 +84,7 @@ module Caboose
 		  bob.password_reset_sent = DateTime.now
 		  bob.save
 		  
-		  LoginMailer.forgot_password_email(bob).deliver
+		  LoginMailer.configure_for_site(@site.id).forgot_password_email(bob).deliver
 		  		  
 		  resp.success = "We just sent you an email.  The reset link inside is good for 3 days."
 		  render :json => resp

data/app/controllers/caboose/order_packages_controller.rb

@@ -96,7 +96,7 @@ module Caboose
         end
       end
       if send_status_email       
-        OrdersMailer.customer_status_updated(li.order).deliver
+        OrdersMailer.configure_for_site(@site.id).customer_status_updated(li.order).deliver
       end
       resp.success = save && li.save
       render :json => resp

data/app/mailers/caboose/orders_mailer.rb

@@ -1,6 +1,6 @@
 module Caboose
   class OrdersMailer < ActionMailer::Base
-    default :from => 'lockerroombiz@gmail.com'
+    #default :from => 'lockerroombiz@gmail.com'
     
     #before_action :configure            
     #def configure(site_id)      
@@ -16,11 +16,7 @@ module Caboose
     #  }
     #  default_options[:from] = delivery_options[:user_name]
     #  delivery_method.settings.merge!(delivery_options)
-    #end
-    
-    def test_email            
-      mail(:to => 'william@nine.is', :subject => "Test #{DateTime.now.strftime('%H:%M:%S')}")
-    end
+    #end        
     
     # Sends a confirmation email to the customer about a new order 
     def customer_new_order(order)      

data/app/models/caboose/order.rb

@@ -134,7 +134,7 @@ module Caboose
     end
     
     def resend_confirmation
-      OrdersMailer.customer_new_order(self).deliver
+      OrdersMailer.configure_for_site(self.site_id).customer_new_order(self).deliver
     end
     
     def test?

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.67'
+  VERSION = '0.5.68'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.67
+  version: 0.5.68
 platform: ruby
 authors:
 - William Barry