diff --git a/app/admin/orders.rb b/app/admin/orders.rb index e7abceb3..401e11a7 100644 --- a/app/admin/orders.rb +++ b/app/admin/orders.rb @@ -297,9 +297,11 @@ end member_action :send_order_email, :method => :put do + order = Order.find(params[:id]) resp = Job.submit("/orders/#{params[:id]}/email/send", nil) if resp.success? - redirect_to "/admin/orders/#{params[:id]}", :notice => "Email sent to customer." + order.complete_order(current_user) + redirect_to "/admin/orders/#{params[:id]}", :notice => "Email sent to customer and order marked as complete." else redirect_to "/admin/orders/#{params[:id]}", :alert => "Unable to send email: #{resp.message}" end diff --git a/config/environment.rb b/config/environment.rb index 83b2555a..9c1774b3 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -3,7 +3,7 @@ # VERSION INFO # -TRACKSYS_VERSION = '6.9.2' +TRACKSYS_VERSION = '6.9.3' # Setup logger for all jobs processors #