Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 466 dependabot/bundler/sidekiq unique jobs 7.1.33 #474

Merged
merged 23 commits into from
Feb 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b75751c
Merge branch 'dev' for release 6.3.4
nflorentin Nov 23, 2023
180410c
Merge branch 'dev' for release 6.3.5
gnepud Dec 4, 2023
cb36494
Merge branch 'dev' for release 6.3.6
nflorentin Dec 6, 2023
ebd2a54
Merge branch 'dev' for release 6.3.6
nflorentin Dec 6, 2023
d9e4568
(bug) unable to show wallet payment mean for invoice
gnepud Dec 11, 2023
11205bb
update Gemfile
gnepud Dec 11, 2023
c75fa4b
(quality) Cleanup unused feature
Dec 15, 2023
1331190
update changelog
gnepud Dec 15, 2023
5a88ff5
(feat) show invoice payment method in accounting line
gnepud Dec 21, 2023
04c5dc5
(bug) PayZen amount of subscription compute error for Coupon validity…
gnepud Dec 28, 2023
be034c1
(bug) unable to create Stripe coupon with duration = forever
gnepud Dec 28, 2023
dac874d
(i18n) updated translations
gnepud Dec 28, 2023
4fcdd51
update Changelog
gnepud Dec 28, 2023
32c5b01
Version 6.3.7
gnepud Dec 28, 2023
c2c71b2
Merge branch 'dev' for release 6.3.8
gnepud Dec 29, 2023
c770ab3
Merge branch 'dev' for release 6.3.9
gnepud Jan 8, 2024
9e5740b
Merge branch 'dev' for release 6.3.10
gnepud Jan 19, 2024
5da7f82
Merge branch 'dev' for release 6.3.11
gnepud Feb 2, 2024
f5d8278
Merge branch 'dev' for release 6.3.11
gnepud Feb 2, 2024
154aa97
Merge branch 'dev' for release 6.3.12
gnepud Feb 12, 2024
48604b3
Merge branch 'dev' for release 6.3.13
gnepud Feb 19, 2024
a523b56
Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)
dependabot[bot] Feb 23, 2024
cde1bcb
Revert "Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)"
gnepud Feb 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
(bug) unable to create Stripe coupon with duration = forever
gnepud committed Dec 28, 2023
commit be034c1c067946975f116e44074b7f81a697d658
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

- Fix a bug: unable to show wallet payment mean for invoice
- Fix a bug: PayZen amount of subscription compute error for Coupon validity per user = forever
- Fix a bug: unable to create Stripe coupon with duration = forever
- improvement: remove show_username_in_admin_list setting
- improvement: show invoice payment method in accounting line
- [TODO DEPLOY] `rails fablab:setup:build_accounting_lines`
2 changes: 1 addition & 1 deletion lib/stripe/service.rb
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ def create_coupon(coupon_id)
stp_coupon[:currency] = Setting.get('stripe_currency')
end

stp_coupon[:duration] = coupon.validity_per_user == 'always' ? 'forever' : 'once'
stp_coupon[:duration] = coupon.validity_per_user
stp_coupon[:redeem_by] = coupon.valid_until.to_i unless coupon.valid_until.nil?
stp_coupon[:max_redemptions] = coupon.max_usages unless coupon.max_usages.nil?

14 changes: 14 additions & 0 deletions lib/tasks/fablab/fix.rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true
require 'stripe/service'

# Correctives for bugs or upgrades migrations tasks
namespace :fablab do
@@ -348,5 +349,18 @@ namespace :fablab do
end
end
end

desc '[release 6.3.6] fix stripe coupon duration'
task stripe_coupon_duration: :environment do |_task, _args|
if Setting.get('payment_gateway') == 'stripe'
Coupon.where(validity_per_user: 'forever').each do |c|
cpn = Stripe::Coupon.retrieve(c.code, api_key: Setting.get('stripe_secret_key'))
cpn.delete
Stripe::Service.new.create_coupon(c.id)
rescue Stripe::InvalidRequestError => e
puts "Unable to create coupon #{c.code} on stripe: #{e}"
end
end
end
end
end
2 changes: 1 addition & 1 deletion test/fixtures/coupons.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ two:
valid_until: <%= 1.month.from_now.utc.strftime('%Y-%m-%d %H:%M:%S.%9N %Z') %>
max_usages: 10
active: true
validity_per_user: always
validity_per_user: forever

cash:
name: Cash Code
2 changes: 1 addition & 1 deletion test/models/coupon_test.rb
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ class CouponTest < ActiveSupport::TestCase
end

test 'two coupons cannot have the same code' do
c = Coupon.new({ name: 'Summer deals', code: 'SUNNYFABLAB', percent_off: 15, validity_per_user: 'always' })
c = Coupon.new({ name: 'Summer deals', code: 'SUNNYFABLAB', percent_off: 15, validity_per_user: 'forever' })
assert c.invalid?
end