caboose-cms 0.5.170 → 0.5.171

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAwYTBkNTk5NjJjYzI1ZTM2ODFlYTk3YWE5NDBhMDRiNzEzMjg4ZQ==
+    NjA1Y2RjYjIzZmNkMGY3MGVhNmJlZTRmMTRhMzViYmUyOTBmNDAwYg==
   data.tar.gz: !binary |-
-    YTM3YTc5ZGQ4MDk2OTdhZGQ5YWFjYmMzZDFmMWZiY2RmNzA3MGUxOQ==
+    ZmE5NWM4MTU1NzZkMDU1MGNmMGE0OTEzYjUxYzczMzdlMWQ0MWExMQ==
 SHA512:
   metadata.gz: !binary |-
-    MWRlZTYxMjU2OTBmMjUwZDAwZDg2MjYyMDM1ZGY5ZjM4NDhlODEzZjY3MDlm
-    MDhiNGI0NjZkNzdhZDc0OGM3YzQ5ZjM0MTFhYTNhMTJmMjEwMzU2NmVkMzgw
-    NzlmMGM0Y2I4NzhhMWQ0ZTgzYzUzOWMzN2IwN2QxNzU1NTZiMWE=
+    ZDkxMTVkMDk4MzU0NDA1YjI1M2EyMTMxNDAyMTMwZDhmMGYzNzlmY2ZhMDIy
+    ZTBmZWU4ZmI5OWUzMDRmYjBhNjA0NmZjYjRjMzViYzdiZjM3ZWNkZjUyNmYy
+    Zjk4ZWExNTkzZWQwYmVjNWQ1NDZjMGYzMzc5NTc2YWQyMzNiYzE=
   data.tar.gz: !binary |-
-    NWM1YWY5NDVmZDc0ZjYzOTUwMDRmYmE0NmQ0Y2RlNWMyNzU1ZDVmYjg0NmM0
-    MTZiZmQ4OGY0ZWFlZDkxMDhmNjUyZDRjNjkwNjhhN2FmNjNiZGU1MDgyZjM5
-    MmU2N2MxYWJkZWY2NTcxMTE5YWE5MjAwMDg5NGU1NzY5Njc2NmY=
+    ZDE2MzlkN2Q0MzgwMmUyZDU2M2MzN2JlMmI1MDIwNWFmMWNmMjNmN2I3ZWI4
+    MjU4NmZiM2FiOTI2MzRjNGM1MTM4YTUwYWUxY2RlYjBiZDczOTg5N2U4YTJm
+    ZTllYzY5MTU5NzVjMTc4ZjZlYmI3OTU1YTBkMWY1NWU5NDZhY2U=

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

@@ -454,7 +454,7 @@ MyAccountOrderController.prototype = {
     if (resp.success == true)
     {
       $('#payment_form').empty();
-      $('#payment_message').empty().html("<p class='success'>Your payment has been processed successfully.</p>");
+      $('#payment_message').empty().html("<p class='note success'>Your payment has been processed successfully.</p>");
       setTimeout(function() { $('#payment_message').empty() }, 5000);
       that.refresh();
     }

data/app/controllers/caboose/orders_controller.rb

@@ -170,7 +170,12 @@ module Caboose
       })
     end
 
-    
+    # GET /admin/orders/:id/send-for-authorization
+    def admin_send_for_authorization
+      return if !user_is_allowed('orders', 'edit')              
+      OrdersMailer.configure_for_site(@site.id).delay.customer_payment_authorization(order)
+      render :json =>       
+    end
 
     # GET /admin/orders/status-options
     def admin_status_options

data/app/mailers/caboose/orders_mailer.rb

@@ -43,6 +43,12 @@ module Caboose
       @order = order
       mail(:to => order.customer.email, :subject => 'Order status update')
     end
+    
+    # Sends an email to the customer telling them they need to authorize payment on an order 
+    def customer_payment_authorization(order)      
+      @order = order
+      mail(:to => order.customer.email, :subject => "Order #{@order.order_number} ready for payment")
+    end
   end
 end
 

data/app/views/caboose/orders_mailer/customer_payment_authorization.html.erb

@@ -0,0 +1,5 @@
+<p><img src='<%= @order.site.logo.url(:thumb) %>' /></p>
+
+<h1>Order <%= @order.order_number %> is ready for payment!</h1>
+<p>Please <a href='http://<%= raw @order.site.primary_domain %>/my-account/orders/<%= @order.id %>'>review your order</a> and submit payment.</p>
+<p>Thank you!</p>

data/config/routes.rb

@@ -517,6 +517,7 @@ Caboose::Engine.routes.draw do
   get     "/admin/orders/status-options"              => "orders#admin_status_options"
   get     "/admin/orders/new"                         => "orders#admin_new"
   get     "/admin/orders/print-pending"               => "orders#admin_print_pending"
+  get     "/admin/orders/:id/send-for-authorization"  => "orders#admin_send_for_authorization"
   get     "/admin/orders/:id/capture"                 => "orders#capture_funds"  
   get     "/admin/orders/:id/json"                    => "orders#admin_json"
   get     "/admin/orders/:id/print"                   => "orders#admin_print"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.170'
+  VERSION = '0.5.171'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.170
+  version: 0.5.171
 platform: ruby
 authors:
 - William Barry
@@ -790,6 +790,7 @@ files:
 - app/views/caboose/orders/admin_new.html.erb
 - app/views/caboose/orders/admin_print.html.erb
 - app/views/caboose/orders_mailer/customer_new_order.html.erb
+- app/views/caboose/orders_mailer/customer_payment_authorization.html.erb
 - app/views/caboose/orders_mailer/customer_status_updated.html.erb
 - app/views/caboose/orders_mailer/fulfillment_new_order.html.erb
 - app/views/caboose/orders_mailer/shipping_order_ready.html.erb