Pau Pérez Fabregat
7e255442a5
Merge pull request #7262 from openfoodfoundation/transifex
...
Transifex
2021-03-30 19:52:45 +02:00
Andy Brett
02009ed48b
Merge pull request #7270 from openfoodfoundation/dependabot/bundler/ddtrace-0.47.0
...
Bump ddtrace from 0.46.0 to 0.47.0
2021-03-30 10:51:22 -07:00
Matt-Yorkley
3f14694b2b
Merge pull request #6960 from andrewpbrett/namespace-api
...
Namespace existing API endpoints to api/v0/*
2021-03-30 19:45:27 +02:00
Pau Pérez Fabregat
d34dd30e51
Merge pull request #7268 from openfoodfoundation/dependabot/bundler/simplecov-0.21.2
...
Bump simplecov from 0.18.5 to 0.21.2
2021-03-30 19:17:16 +02:00
Andy Brett
0954a13f55
Merge pull request #7273 from openfoodfoundation/dependabot/bundler/angular_rails_csrf-4.5.0
...
Bump angular_rails_csrf from 4.2.0 to 4.5.0
2021-03-30 10:01:04 -07:00
Andy Brett
38cba66207
Merge pull request #7272 from openfoodfoundation/dependabot/bundler/activemerchant-1.119.0
...
Bump activemerchant from 1.107.4 to 1.119.0
2021-03-30 09:59:41 -07:00
dependabot[bot]
0d935725e2
Bump angular_rails_csrf from 4.2.0 to 4.5.0
...
Bumps [angular_rails_csrf](https://github.com/jsanders/angular_rails_csrf ) from 4.2.0 to 4.5.0.
- [Release notes](https://github.com/jsanders/angular_rails_csrf/releases )
- [Changelog](https://github.com/jsanders/angular_rails_csrf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jsanders/angular_rails_csrf/compare/4.2.0...v4.5.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 16:43:35 +00:00
Andy Brett
b799a1777f
Merge pull request #7271 from openfoodfoundation/dependabot/bundler/acts_as_list-1.0.3
...
Bump acts_as_list from 0.9.19 to 1.0.3
2021-03-30 09:42:42 -07:00
Andy Brett
3fb2e503f5
Merge pull request #7275 from openfoodfoundation/dependabot/bundler/factory_bot_rails-6.1.0
...
Bump factory_bot_rails from 5.2.0 to 6.1.0
2021-03-30 09:39:37 -07:00
Matt-Yorkley
cd6ef9e274
Merge pull request #7269 from openfoodfoundation/dependabot/bundler/bugsnag-6.20.0
...
Bump bugsnag from 6.19.0 to 6.20.0
2021-03-30 18:13:02 +02:00
dependabot[bot]
ce83be4eac
Bump factory_bot_rails from 5.2.0 to 6.1.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.2.0 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.2.0...v6.1.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 16:04:36 +00:00
Andy Brett
aac4a17c1f
Merge pull request #7274 from openfoodfoundation/dependabot/bundler/test-prof-1.0.2
...
Bump test-prof from 0.11.3 to 1.0.2
2021-03-30 09:01:24 -07:00
dependabot[bot]
0eaa4aeb62
Bump activemerchant from 1.107.4 to 1.119.0
...
Bumps [activemerchant](https://github.com/activemerchant/active_merchant ) from 1.107.4 to 1.119.0.
- [Release notes](https://github.com/activemerchant/active_merchant/releases )
- [Changelog](https://github.com/activemerchant/active_merchant/blob/master/CHANGELOG )
- [Commits](https://github.com/activemerchant/active_merchant/compare/v1.107.4...v1.119.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 16:00:49 +00:00
Andy Brett
880075729d
Merge pull request #7267 from openfoodfoundation/dependabot/bundler/capybara-3.35.3
...
Bump capybara from 3.32.2 to 3.35.3
2021-03-30 08:59:37 -07:00
Andy Brett
dee2004305
Merge pull request #7276 from openfoodfoundation/dependabot/bundler/ffaker-2.18.0
...
Bump ffaker from 2.16.0 to 2.18.0
2021-03-30 08:58:12 -07:00
Andy Brett
57035ae0cc
Merge pull request #7277 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.2
...
Bump karma from 6.3.1 to 6.3.2
2021-03-30 08:57:35 -07:00
Matt-Yorkley
b6b367c378
Add return adjustments test in checkout helper
2021-03-30 16:41:23 +01:00
Matt-Yorkley
d447864b7e
Update test description
2021-03-30 16:39:40 +01:00
Matt-Yorkley
08491d9ad4
Use an instance double in #compute_amount test
2021-03-30 16:39:40 +01:00
Matt-Yorkley
7882c427f7
Simplify creation of negative amounts
2021-03-30 16:39:40 +01:00
Matt-Yorkley
dbe227bd41
Use #change in adjustment spec with changing value
2021-03-30 16:39:40 +01:00
Matt-Yorkley
e71f47a2e3
Use underscore in unused arguments
2021-03-30 16:39:40 +01:00
Matt-Yorkley
4b4f29641e
Add test for ReturnAuthorization#compute_amount override
2021-03-30 16:39:40 +01:00
Matt-Yorkley
fcb8145a6c
Bring in changes to Adjustment#update! and CalculatedAdjustments#update_adjustment
2021-03-30 16:39:40 +01:00
Matt-Yorkley
c480d43bda
Override #compute_amount in ReturnAuthorization
...
In some cases adjustments are updated (recalculated) via their originator. In the case of return adjustments, there's no calculation (and no calculator).
2021-03-30 16:39:40 +01:00
Matt-Yorkley
4c5ecbc2d4
Migrate return adjustments source to originator
2021-03-30 16:39:40 +01:00
Matt-Yorkley
3c1883dac2
Remove use of :source polymorphic association for return adjustments
2021-03-30 16:39:40 +01:00
Matt-Yorkley
8db598bff7
Simplify return adjustment creation
2021-03-30 16:39:40 +01:00
Andy Brett
a67038720c
Merge pull request #7255 from mkllnk/fail-on-translations
...
Raise errors in specs with missing translations
2021-03-30 08:37:15 -07:00
Matt-Yorkley
74ba6e35be
Merge pull request #7283 from Matt-Yorkley/unit-price-nils
...
Defend against nils in variant serializer
2021-03-30 17:00:26 +02:00
Transifex-Openfoodnetwork
42efb6f762
Updating translations for config/locales/fr_CA.yml
2021-03-31 01:10:30 +11:00
Pau Pérez Fabregat
7d5726b6c7
Merge pull request #7150 from coopdevs/use-order-balance-object
...
Feature-toggle all remaining parts of the app where the order balance is shown
2021-03-30 15:58:12 +02:00
Matt-Yorkley
741dee29c3
Defend against nils in variant serializer
...
If unit_price.denominator ever returns nil, the serializer won't explode now.
2021-03-30 14:45:33 +01:00
Transifex-Openfoodnetwork
a41852ee7a
Updating translations for config/locales/en_CA.yml
2021-03-31 00:41:40 +11:00
Guido Oliveira
877d76cf19
fix display scrollbar only if needed
2021-03-30 10:05:04 -03:00
Matt-Yorkley
153ec268b7
Remove RackRequestBlocker
2021-03-30 13:24:44 +01:00
Matt-Yorkley
92eaf5fbaa
Remove atomic gem
...
Bundler says this when installing gems:
```
Post-install message from atomic:
This gem has been deprecated and merged into Concurrent Ruby (http://concurrent-ruby.com ).
```
We already have concurrent-ruby 👍
2021-03-30 12:29:48 +01:00
Maikel Linke
0980b81742
Raise errors in specs with missing translations
...
The previous mechanism didn't seem to work and newer Rails versions have
an easier config for this now.
Also fixing all i18n errors which were now failing specs.
2021-03-30 17:08:17 +11:00
dependabot[bot]
30df1cc55d
Bump karma from 6.3.1 to 6.3.2
...
Bumps [karma](https://github.com/karma-runner/karma ) from 6.3.1 to 6.3.2.
- [Release notes](https://github.com/karma-runner/karma/releases )
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md )
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.1...v6.3.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:55:35 +00:00
Andy Brett
61a39311b4
improve specs
2021-03-29 22:51:40 -07:00
dependabot[bot]
c05a9cfb40
Bump ffaker from 2.16.0 to 2.18.0
...
Bumps [ffaker](https://github.com/ffaker/ffaker ) from 2.16.0 to 2.18.0.
- [Release notes](https://github.com/ffaker/ffaker/releases )
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md )
- [Commits](https://github.com/ffaker/ffaker/compare/v2.16.0...v2.18.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:35:24 +00:00
dependabot[bot]
adff08038a
Bump test-prof from 0.11.3 to 1.0.2
...
Bumps [test-prof](https://github.com/test-prof/test-prof ) from 0.11.3 to 1.0.2.
- [Release notes](https://github.com/test-prof/test-prof/releases )
- [Changelog](https://github.com/test-prof/test-prof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/test-prof/test-prof/compare/v0.11.3...v1.0.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:33:19 +00:00
dependabot[bot]
e8bc1f5aca
Bump acts_as_list from 0.9.19 to 1.0.3
...
Bumps [acts_as_list](https://github.com/brendon/acts_as_list ) from 0.9.19 to 1.0.3.
- [Release notes](https://github.com/brendon/acts_as_list/releases )
- [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md )
- [Commits](https://github.com/brendon/acts_as_list/compare/v0.9.19...v1.0.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:24:11 +00:00
dependabot[bot]
ab3b36ac0b
Bump ddtrace from 0.46.0 to 0.47.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.46.0 to 0.47.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.46.0...v0.47.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:23:19 +00:00
dependabot[bot]
1a25fb78df
Bump bugsnag from 6.19.0 to 6.20.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.19.0 to 6.20.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.19.0...v6.20.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:21:06 +00:00
dependabot[bot]
e7e337f0aa
Bump simplecov from 0.18.5 to 0.21.2
...
Bumps [simplecov](https://github.com/simplecov-ruby/simplecov ) from 0.18.5 to 0.21.2.
- [Release notes](https://github.com/simplecov-ruby/simplecov/releases )
- [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md )
- [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.18.5...v0.21.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:19:27 +00:00
dependabot[bot]
65f9454760
Bump capybara from 3.32.2 to 3.35.3
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.2 to 3.35.3.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.32.2...3.35.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-30 05:18:12 +00:00
Andy Brett
8867f1ef7a
refactor responsibilities and order of operations
2021-03-29 15:37:30 -07:00
Andy Brett
3664b86e03
ignore long module in rubocop
2021-03-29 14:53:13 -07:00
Andy Brett
d0d3b73257
add specs
2021-03-29 14:53:13 -07:00