raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-15 04:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,842 Commits 16 Branches 457 Tags
52a36f33bc28684eebcbed76277884939631a653
Commit Graph

30842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
837e581c29 Reload order after cancelling it in tests that check shipment states 2023-06-14 10:19:30 +01:00
Matt-Yorkley
06c9697d0d Don't try to cancel shipments that might already be cancelled 2023-06-14 10:19:30 +01:00
Matt-Yorkley
c5dfecbb69 Reapply taxes at model level if order address changes 
This should be done at the model level
 2023-06-14 10:19:30 +01:00
Matt-Yorkley
a0f23fc510 Extract before_payment_state? method 2023-06-14 10:19:30 +01:00
Matt-Yorkley
13a22c56f4 Move taxing of admin adjustments out of customer details controller 2023-06-14 10:19:30 +01:00
Matt-Yorkley
65b6a75c9b Reorder callback definitions 2023-06-14 10:19:30 +01:00
Matt-Yorkley
a0d0f8fd2f Tidy up checkout tax spec 2023-06-14 10:19:30 +01:00
Maikel Linke
c2605b2606 Display loading spinner before quick reports 
We had a race condition that could first display the report and then
replace it again with the "loading" spinner. That doesn't seem to happen
now that we changed the order of cable events.
 2023-06-14 15:40:52 +10:00
Maikel Linke
91d0dabc1d Require associations on DistributorShippingMethod 2023-06-14 15:09:12 +10:00
Maikel Linke
bd11475fe1 Require associations on DistributorPaymentMethod 2023-06-14 15:08:22 +10:00
Maikel Linke
ed231ec512 Update belongs_to default in Customer model 2023-06-14 15:08:05 +10:00
Maikel Linke
fc00a48d67 Require associations of CoordinatorFee 2023-06-14 15:08:05 +10:00
Maikel Linke
c02c90317f Require user of column preference record 
It doesn't make sense to have a preference without a user. And it was
already enforced in the database.
 2023-06-14 15:07:43 +10:00
Maikel Linke
2d4cfd7548 Validate and enforce AdjustmentMetadata associations 2023-06-14 15:07:43 +10:00
Maikel Linke
d88781a083 Start to adopt new default to require belongs_to 
Newer version of Rails have this option as default. We can slowly
transition to opt in gradually, model by model. Once all models are
covered, we can change the default and remove the setting from the
models again.

The style violation was added to the todo file because it's temporary.

We have 60 models using `belongs_to`. And changing them all at once
breaks some specs. So let's do it gradually.
 2023-06-14 15:06:59 +10:00
Maikel
989a88e252 Merge pull request #10848 from mkllnk/totals-report 
Fix error on summarising total_units in Order Cycle Supplier Totals report
 2023-06-14 13:59:48 +10:00
Matt-Yorkley
074eb4b592 Move tax charge logic out of checkout controller and update payment transition 2023-06-13 17:53:46 +01:00
Matt-Yorkley
bf912ae4d3 Remove angular loading element in darkwarm layout 2023-06-13 17:35:13 +01:00
Filipe
9c42781ff1 Merge pull request #10913 from abdellani/remove-split-checkout-toggle-and-legacy-checkout 
Remove split checkout toggle and legacy checkout
 2023-06-13 17:00:07 +01:00
Matt-Yorkley
73b2d37224 Don't try to load orders if the number of line_items with the current filters applied is zero 
This ends up sending a request to the orders endpoint with no filters and no search params, which then tries to load every order in the entire database if the user is superadmin, which blows up.
 2023-06-13 15:47:19 +01:00
Mohamed ABDELLANI
2654d3b866 update the rubocop_todo list 2023-06-13 14:58:16 +01:00
Matt-Yorkley
5fa81d1333 Fix invalid test setup in old tax tests 2023-06-13 14:58:16 +01:00
Matt-Yorkley
4e7fab6914 Delete dead code Checkout#find_transition 
This method is only called from tests and nowhere else in the codebase. We may as well remove it.
 2023-06-13 14:58:16 +01:00
Matt-Yorkley
8d633234f4 Set voucher specs to pending temporarily 2023-06-13 14:58:16 +01:00
Matt-Yorkley
d5a625bdeb Fix Paypal spec 2023-06-13 14:58:16 +01:00
Matt-Yorkley
0e289a23c1 Set some legacy checkout specs that we might want to rewrite later to pending 2023-06-13 14:58:16 +01:00
Matt-Yorkley
5487aa19fc Fix missing checkout_state_path 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
345f540723 fix spec/models/spree/tax_rate_spec.rb 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
78617905c6 remove spec/requests/checkout/concurrency_spec.rb 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
56204b2315 fix ./spec/routing/stripe_spec.rb 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
905187f3ce fix ./spec/services/order_tax_adjustments_fetcher_spec.rb:100 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
7e84579aa3 spec/system/consumer/shopping/checkout_stripe_spec 
these tests are using the legacy checkout
 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
bd0e7cdfc8 remove legacy checkout tests 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
907c65d98c run create_tax_charge! after transition to payment state 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
c2aaf88e98 remove checkout controller 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
fc0cca2210 remove legacy checkout view 2023-06-13 14:58:16 +01:00
jibees
c379dcacc5 Merge pull request #10993 from openfoodfoundation/dependabot/bundler/jwt-2.7.1 
chore(deps): bump jwt from 2.7.0 to 2.7.1
 2023-06-13 15:05:30 +02:00
jibees
64e6d639c1 Merge pull request #10995 from openfoodfoundation/dependabot/bundler/rubocop-1.52.1 
chore(deps-dev): bump rubocop from 1.52.0 to 1.52.1
 2023-06-13 15:03:45 +02:00
jibees
374904f473 Merge pull request #10996 from openfoodfoundation/dependabot/bundler/test-unit-3.6.0 
chore(deps): bump test-unit from 3.5.9 to 3.6.0
 2023-06-13 15:03:03 +02:00
jibees
fb7ae9fd58 Merge pull request #10991 from openfoodfoundation/dependabot/bundler/view_component-3.2.0 
chore(deps): bump view_component from 3.1.0 to 3.2.0
 2023-06-13 15:02:26 +02:00
dependabot[bot]
19bd05ce5a chore(deps): bump test-unit from 3.5.9 to 3.6.0 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.5.9 to 3.6.0.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.5.9...3.6.0)

---
updated-dependencies:
- dependency-name: test-unit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-13 10:11:47 +00:00
dependabot[bot]
f9abec4346 chore(deps-dev): bump rubocop from 1.52.0 to 1.52.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.52.0 to 1.52.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.52.0...v1.52.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-13 10:10:38 +00:00
dependabot[bot]
3e7ad17f69 chore(deps): bump jwt from 2.7.0 to 2.7.1 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.7.0...v2.7.1)

---
updated-dependencies:
- dependency-name: jwt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-13 10:08:44 +00:00
dependabot[bot]
b813879330 chore(deps): bump active_storage_validations from 1.0.3 to 1.0.4 
Bumps [active_storage_validations](https://github.com/igorkasyanchuk/active_storage_validations) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/igorkasyanchuk/active_storage_validations/releases)
- [Changelog](https://github.com/igorkasyanchuk/active_storage_validations/blob/master/CHANGES.md)
- [Commits](https://github.com/igorkasyanchuk/active_storage_validations/compare/1.0.3...1.0.4)

---
updated-dependencies:
- dependency-name: active_storage_validations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-13 10:02:26 +00:00
Filipe
12bb8db7b3 Merge pull request #10933 from Matt-Yorkley/fix-payment-intents 
Fix ProcessPaymentIntent service
 2023-06-13 11:00:27 +01:00
dependabot[bot]
c3846ad269 chore(deps): bump view_component from 3.1.0 to 3.2.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-13 09:58:11 +00:00
Matt-Yorkley
93c3241bb5 Add more test coverage in stripe controller spec 2023-06-13 10:14:09 +01:00
Matt-Yorkley
abd55b2104 Move order to completed whether it's current state is payment or confirmation 2023-06-13 10:14:09 +01:00
Matt-Yorkley
47df9493ae Fix ProcessPaymentIntent service 2023-06-13 10:14:09 +01:00
Gaetan Craig-Riou
694e46d1fb Fix Bundler/OrderedGems 2023-06-13 15:35:40 +10:00