From 3aefea9f04f27694d749bff5fa91ce2cb27b1901 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 11 Feb 2020 12:38:48 +0000 Subject: [PATCH] Prepare SubsConfirmJob to receive a bit more payment logic --- app/jobs/subscription_confirm_job.rb | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/app/jobs/subscription_confirm_job.rb b/app/jobs/subscription_confirm_job.rb index 016f3bc21c..9db6cd6050 100644 --- a/app/jobs/subscription_confirm_job.rb +++ b/app/jobs/subscription_confirm_job.rb @@ -45,13 +45,24 @@ class SubscriptionConfirmJob def confirm_order!(order) record_order(order) - setup_payment!(order) if order.payment_required? - return send_failed_payment_email(order) if order.errors.present? + if process_payment!(order) + send_confirmation_email(order) + else + send_failed_payment_email(order) + end + end - order.process_payments! if order.payment_required? - return send_failed_payment_email(order) if order.errors.present? + def process_payment!(order) + return false if order.errors.present? + return true unless order.payment_required? - send_confirmation_email(order) + setup_payment!(order) + return false if order.errors.present? + + order.process_payments! + return false if order.errors.present? + + true end def setup_payment!(order)