From 0b3a02a05df0077109dc35aede3749818035a100 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 22 Feb 2021 11:27:29 +0100 Subject: [PATCH 1/3] handle errors in PaymentScheduleItemWorker --- app/workers/payment_schedule_item_worker.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/workers/payment_schedule_item_worker.rb b/app/workers/payment_schedule_item_worker.rb index 3f27d0c53..56348aa6b 100644 --- a/app/workers/payment_schedule_item_worker.rb +++ b/app/workers/payment_schedule_item_worker.rb @@ -49,5 +49,7 @@ class PaymentScheduleItemWorker attached_object: psi psi.update_attributes(state: 'pending') end + rescue StandardError + psi.update_attributes(state: 'error') end end From 305e46201120c80853f3eeb5dcfbf21f88d5ddda Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 22 Feb 2021 11:28:52 +0100 Subject: [PATCH 2/3] on stripe subscription renew: cancel subscription after the last deadline --- app/services/stripe_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/stripe_service.rb b/app/services/stripe_service.rb index ad2a1cf3e..fdf10443d 100644 --- a/app/services/stripe_service.rb +++ b/app/services/stripe_service.rb @@ -33,7 +33,7 @@ class StripeService stp_subscription = Stripe::Subscription.create({ customer: payment_schedule.invoicing_profile.user.stp_customer_id, - cancel_at: subscription.expiration_date.to_i, + cancel_at: (payment_schedule.ordered_items.last.due_date + 3.day).to_i, add_invoice_items: items, coupon: payment_schedule.coupon&.code, items: [ From 56200188a6bebced047df7b71cbf528c62e45862 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 22 Feb 2021 12:00:04 +0100 Subject: [PATCH 3/3] fix mail sending in staging envs --- config/environments/staging.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 3ee7ffa7a..5741e847f 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -73,8 +73,8 @@ Rails.application.configure do # config.serve_static_assets = true config.action_mailer.default_url_options = { - host: ->(*) { Setting.get('base_url_host') }, - protocol: ->(*) { Setting.get('base_url_protocol') } + host: Rails.application.secrets.default_host, + protocol: Rails.application.secrets.default_protocol } # config.action_mailer.perform_deliveries = true # config.action_mailer.raise_delivery_errors = false