raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,785 Commits 21 Branches 450 Tags
dbef7b60a683fa857032459b3a033eb704ebbab2
Commit Graph

1403 Commits

Author SHA1 Message Date
Andy Brett
84689c43be Merge pull request #6534 from andrewpbrett/sca-emails 
Send email when SCA authorization is required for admin payment
 2021-01-21 13:53:35 -08:00
Andy Brett
0e7f4b2f14 Merge pull request #6537 from mkllnk/simplify-mail-config 
Simplify mail config
 2021-01-21 10:59:43 -08:00
Andy Brett
ab5ffead1d require that the redirect url be to stripe.com and over https 2021-01-21 09:18:29 -08:00
Pau Pérez Fabregat
8b01c9c8ba Merge pull request #6279 from luisramos0/base_controller 
Merge Spree::BaseController with ApplicationController and merge StoreController with ::BaseController
 2021-01-19 15:52:47 +01:00
Maikel
334e270a11 Merge pull request #6552 from Matt-Yorkley/adjustments-order-association 
[Adjustments] Associate all adjustments with an order
 2021-01-19 08:43:13 +11:00
Luis Ramos
4060e7debf Replace usages of Spree::BaseController with ApplicationController 2021-01-15 21:59:16 +00:00
Pau Pérez Fabregat
929ae82e00 Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal 
Bye Bye Spree Paypal
 2021-01-14 18:16:44 +01:00
Maikel Linke
c922a8fd4c Fix: Remove unused conditional 
I forgot to remove this unused conditional in a previous commit. Spree
defaulted to overriding the email config and we never changed that.
 2021-01-14 12:05:42 +11:00
Maikel Linke
be229c9002 Simplify email config by removing unused option 
Spree used to give you more options to configure ActionMailer but our
setup is much simpler. We can remove unused code.

The removed option was never used by OFN and defaulted to true. We don't
need a database migration because the value isn't set in the database.
 2021-01-14 12:05:41 +11:00
Matt-Yorkley
ca4de40fa2 Associate all adjustments with an order 
This change is introduced in the adjustments updates from Spree 2.2 and used heavily in new scopes and methods (not included here).
 2021-01-11 17:35:35 +00:00
Pau Perez
33c72ecab0 Defend from nil BETA_TESTERS var 2021-01-11 15:55:34 +01:00
Pau Perez
398467e7ed Hide new balance impl. under feature toggle 
This makes it possible to deploy it without releasing it to users since
the toggle is not enabled for anyone.

It aims to make the balance calculation consistent across pages.
 2021-01-11 15:50:19 +01:00
Matt-Yorkley
2e5810d64d Fix more Rubocop offences 2021-01-09 13:26:30 +00:00
Matt-Yorkley
83f58368c7 Fix class-loading issue in test suite 
Fixes:

```
Failure/Error: include Spree::Core::ControllerHelpers::Auth

NameError:
  uninitialized constant Spree::Core::ControllerHelpers::Auth
# ./lib/spree/api/controller_setup.rb:19:in `block in included'
# ./lib/spree/api/controller_setup.rb:5:in `class_eval'
# ./lib/spree/api/controller_setup.rb:5:in `included'
# ./app/controllers/api/base_controller.rb:9:in `include'
# ./app/controllers/api/base_controller.rb:9:in `<class:BaseController>'
# ./app/controllers/api/base_controller.rb:6:in `<module:Api>'
# ./app/controllers/api/base_controller.rb:5:in `<top (required)>'
# ./app/controllers/api/products_controller.rb:5:in `<module:Api>'
# ./app/controllers/api/products_controller.rb:4:in `<top (required)>'
# ./spec/controllers/api/products_controller_spec.rb:6:in `<top (required)>'
```
 2021-01-09 13:26:30 +00:00
Andy Brett
3877721209 Merge pull request #6631 from Matt-Yorkley/actionmailer-deliver 
[Deprecation] Replace ActionMailer#deliver with ActionMailer#deliver_now
 2021-01-08 17:42:31 -08:00
Matt-Yorkley
a9706fa5f1 Update syntax in rake task 2021-01-08 23:18:55 +00:00
Matt-Yorkley
cc88611b15 Update Spree::Money to use Monetize#parse instead of Money#parse 
This method was removed from the money gem without replacement. It's now provided by the monetize gem.
 2021-01-06 19:20:19 +00:00
Matt-Yorkley
45e4d86631 Merge money_decorator.rb with money.rb 
The #rounded method was left out, as it appears to be dead code.
 2021-01-06 19:17:00 +00:00
Andy Brett
3d8c7cc9f0 Merge pull request #6522 from arku/feat/stripe-credit-card-removal 
Extract Stripe credit card deletion logic to a service object
 2021-01-02 14:56:00 -08:00
Andy Brett
b4e47217ef Merge pull request #6523 from arku/fix/credit-card-clone-destroyer 
Handle nil stripe customer in credit card clone removal logic
 2020-12-21 14:27:16 -08:00
Andy Brett
ebe71429db Merge pull request #6541 from mkllnk/fix-subscription-script 
Fix typo in subs test script
 2020-12-17 17:10:05 -08:00
Andy Brett
2d636c8272 Merge pull request #6546 from andrewpbrett/sca-backend 
Fix #6543
 2020-12-17 14:00:36 -08:00
Andy Brett
13d6d2c978 separate conditionals 🤦 2020-12-17 13:23:14 -08:00
Maikel Linke
f0db7a22cc Fix typo in subs test script 2020-12-17 16:08:59 +11:00
Pau Pérez Fabregat
f26507b897 Merge pull request #6454 from arku/fix/signup-route 
Remove /signup routes
 2020-12-14 16:38:23 +01:00
Pau Pérez Fabregat
d4fc3f2118 Merge pull request #6516 from coopdevs/per-user-feature-toggles 
Refactor FeatureToggle to toggle depending on user
 2020-12-14 16:03:05 +01:00
Arun Kumar Mohan
020df3619f Add tests for Stripe::CreditCardRemover 2020-12-12 21:39:21 -05:00
Arun Kumar Mohan
f02f2c540c Handle nil stripe customer in credit card clone removal logic 2020-12-12 21:31:06 -05:00
Andy Brett
a745fceb53 Merge pull request #6469 from andrewpbrett/sca-backend 
Allow SCA cards to be setup and charged offline for subscriptions
 2020-12-11 14:23:12 -08:00
Pau Perez
182f0f66b6 Refactor FeatureToggle to toggle depending on user 
This enables showing features to individual users only, which enables us
to deploy features that are not yet released to gather feedback from
product and testing, while no users have access to it.
 2020-12-11 09:13:07 +01:00
Andy Brett
655512adab add missing require statements 2020-12-10 12:17:42 -08:00
Andy Brett
f50577b489 refactor cloner to use ivars 2020-12-10 11:42:28 -08:00
Andy Brett
a1f6fe5522 remove unused method now that we use autopaging 2020-12-10 11:22:14 -08:00
Andy Brett
8c747e4812 refactor destroy_clones to separate class 2020-12-10 11:22:02 -08:00
Andy Brett
4c25edd91c refactor find_cloned_card to separate class 2020-12-10 11:04:27 -08:00
Andy Brett
13b95f41bb use built-in auto_paging_each with stripe 2020-12-10 08:19:41 -08:00
Maikel
33d220e777 Merge pull request #6291 from luisramos0/subs_tasks 
Add tasks to help manually test subscriptions
 2020-12-10 12:55:59 +11:00
Andy Brett
103366ea97 add request limits to credit card cloner 2020-12-08 07:52:42 -08:00
Andy Brett
9c544ef2f4 remove cloned cards after removing the platform card 2020-12-08 07:52:42 -08:00
Andy Brett
a466886a32 fix rubocop warnings 2020-12-08 07:52:42 -08:00
Andy Brett
fea7576ac1 update CreditCardCloner to find existing clone 2020-12-08 07:52:42 -08:00
Maikel Linke
84730577da Fail with better message when giving wrong OC id 
The script was failing with:

  NoMethodError: undefined method `update!' for nil:NilClass

Now it's failing with:

  ActiveRecord::RecordNotFound: Couldn't find OrderCycle with id=1
 2020-12-08 11:48:34 +11:00
Maikel Linke
906dbffb29 Fail loudly when task doesn't work 2020-12-08 11:43:21 +11:00
Maikel Linke
aa8df639c4 Style to avoid indent changes with context changes 
When the indent of arguments is aligned with the method brackets, it
needs to be changed when the method changes. Putting all arguments on
their own line makes diffs of method changes or argument changes
clearer. See the next commit.
 2020-12-08 11:38:50 +11:00
Maikel Linke
70d1888cc2 Ease reading of times 2020-12-08 11:36:15 +11:00
Maikel Linke
feb0ad452d Safeguard production env from test script 2020-12-08 11:33:37 +11:00
Arun Kumar Mohan
81b03906f9 Remove /signup routes 2020-12-03 20:43:28 -05:00
Luis Ramos
bfd4adbcee Adapt code to work with frozen strings 2020-12-03 06:38:24 -08:00
Luis Ramos
611de912a8 Switch frozen_string_literal to false so that price code keeps working 2020-12-03 06:38:24 -08:00
Matt-Yorkley
b04a76e8bf Update payments_report totals 2020-11-27 14:00:29 +00:00