Luis Ramos
0824f12472
Merge pull request #6472 from luisramos0/depen
...
Fix dependabot config
2020-12-08 20:02:26 +00:00
Luis Ramos
ab6f6c463a
Fix problem in dependabot config, yarn is not a valid package-ecosystem, we can try npm
2020-12-08 20:00:19 +00:00
Luis Ramos
e2181960bc
Merge pull request #6450 from openfoodfoundation/dependabot/bundler/knapsack-1.20.0
...
Bump knapsack from 1.19.0 to 1.20.0
2020-12-08 19:39:13 +00:00
Luis Ramos
e8ba16cb3e
Merge pull request #6457 from openfoodfoundation/dependabot/bundler/spring-2.0.2
...
Bump spring from 1.7.2 to 2.0.2
2020-12-08 19:38:55 +00:00
Luis Ramos
c233052ec6
Merge pull request #6438 from luisramos0/devise4
...
Upgrade to devise 4.7
2020-12-08 17:19:13 +00:00
Andy Brett
d55343da1a
only return gateway payment info if set on customer
2020-12-08 07:52:42 -08:00
Andy Brett
eddf8da107
update subscription spec with new method name
2020-12-08 07:52:42 -08:00
Andy Brett
3a8203094a
refactor to remove boolean flag param
2020-12-08 07:52:42 -08:00
Andy Brett
f1d439870e
use a named argument for offline param
2020-12-08 07:52:42 -08: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
bc3fd8c50c
remove unused method
2020-12-08 07:52:42 -08:00
Andy Brett
277d7f44b7
refactor api customers controller; resolve merge conflict
2020-12-08 07:52:42 -08:00
Andy Brett
a466886a32
fix rubocop warnings
2020-12-08 07:52:42 -08:00
Andy Brett
3d47ad7e33
add stubs for stripe requests
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
Andy Brett
13ab25ac45
separate method for charging offline
2020-12-08 07:52:41 -08:00
Andy Brett
cad8a018f9
put SetupIntent on the connected Stripe account
2020-12-08 07:52:41 -08:00
Andy Brett
215d1bbe20
create js setup intent when authing shop
2020-12-08 07:52:41 -08:00
Andy Brett
b517d2f0c7
guard against a stripe customer already being deleted
2020-12-08 07:52:41 -08:00
Andy Brett
cc00f24569
add spec for clearing authorizations to credit_card_controller_spec
2020-12-08 07:46:10 -08:00
Andy Brett
d0098e190f
close #4175
2020-12-08 07:46:10 -08:00
Andy Brett
1f8b4e05bb
allow charges in subscriptions spec
2020-12-08 07:46:10 -08:00
Andy Brett
f875e406a8
update karma specs for setting default card
2020-12-08 07:46:10 -08:00
Andy Brett
3b44c8e7e2
update UI after changing default card
2020-12-08 07:46:10 -08:00
Andy Brett
6fdcd6218d
add remove_shop_authorizations method to controller
2020-12-08 07:46:10 -08:00
Andy Brett
c60dcc75cd
confirm changes to default card
2020-12-08 07:46:10 -08:00
Andy Brett
4cdc1993b8
add more specific copy on cc authorization
2020-12-08 07:46:10 -08:00
Andy Brett
747345ece9
only show authorized shops if there is a default card
2020-12-08 07:46:10 -08:00
Matt-Yorkley
5b9db50250
Optimise Shipment#to_package
...
This is done in a later Spree commit to reduce the amount of processing done in larger orders.
See: ab01b1ec1e
2020-12-08 11:21:05 +00: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
Andy Brett
e866e983f6
add spec for partially refunded SCA orders
2020-12-07 14:51:47 -08:00
Transifex-Openfoodnetwork
33916cfff3
Updating translations for config/locales/nb.yml
2020-12-08 08:21:50 +11:00
Transifex-Openfoodnetwork
9333a6385e
Updating translations for config/locales/nb.yml
2020-12-08 08:00:43 +11:00
Transifex-Openfoodnetwork
c37bd8e911
Updating translations for config/locales/nb.yml
2020-12-08 07:40:37 +11:00
Andy Brett
96462325d2
fix #5829
2020-12-04 18:13:43 -08:00
dependabot-preview[bot]
567e489716
Bump spring from 1.7.2 to 2.0.2
...
Bumps [spring](https://github.com/rails/spring ) from 1.7.2 to 2.0.2.
- [Release notes](https://github.com/rails/spring/releases )
- [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/spring/compare/v1.7.2...v2.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-04 19:14:16 +00:00
Arun Kumar Mohan
868a19df6e
Fix tab toggle
2020-12-03 21:03:44 -05:00
Arun Kumar Mohan
81b03906f9
Remove /signup routes
2020-12-03 20:43:28 -05:00
Luis Ramos
acddb496b7
Remove spree_i18n dependency
2020-12-03 15:34:46 -08:00
dependabot-preview[bot]
d29773d297
[Security] Bump jquery-rails from 3.1.5 to 4.4.0
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 3.1.5 to 4.4.0. **This update includes a security fix.**
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v3.1.5...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-12-03 15:33:41 -08:00
Luis Ramos
0f27f57cbb
Use new Admin::ResourceController
2020-12-03 15:32:20 -08:00
Luis Ramos
1d327a61a6
Fix rubocop issue and adapt rubocop exceptions
2020-12-03 15:32:20 -08:00
Luis Ramos
0fb9f44dda
Make all controllers use new Admin::ResourceController
2020-12-03 15:32:20 -08:00
Luis Ramos
c63d99dd20
Remove Spree namespace from controller
2020-12-03 15:32:20 -08:00
Luis Ramos
99fd99cd33
Move spree admin resource controller to admin resource controller
2020-12-03 15:32:20 -08:00
