raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 18 Branches 453 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Perez
9bb49bb590 Ensure the query the class depends on is called 2021-01-20 18:23:22 +01:00
Pau Perez
db23428832 Test OutstandingBalance 
This duplicates the scenarios tested for CustomersWithBalance.
 2021-01-20 18:23:22 +01:00
Pau Perez
783863056d Extract query object out of UsersController 
It improves the overall readability of the code and as a result, things
became easier to manage already.
 2021-01-20 18:23:22 +01:00
Pau Perez
d18e79ab19 Move query object to app/queries/ and doc it 2021-01-20 18:23:22 +01:00
Pau Perez
e8ef4acb2b Hide new data fetching implementation under toggle 2021-01-20 18:23:22 +01:00
Pau Perez
37b7340eb1 Refactor specs to speed them up 
We don't care about the conversion from hash to JSON (that's an
ActiveModel::Serializer responsibility that is thoroughly tested) but
our logic so we can skip that step which only slows down tests.

It consistently reduced ~1.5s on my machine but it's still too slow to wait
~8.5s to get feedback from them.
 2021-01-20 18:23:22 +01:00
Pau Perez
a124f93b20 Remove old commented out code 2021-01-20 18:23:22 +01:00
Pau Perez
20abaaa950 Reuse outstanding balance statement across queries 
Instead of relying on Spree::Order#outstanding_balance we make us of the
result set `balance_value` computed column. So, we ask PostgreSQL to
compute it instead of Ruby and then serialize it from that computed
column. That's a bit faster to compute that way and let's reuse logic.

We hide this new implementation under this features' toggle so it's only
used when enabled. We want hit the old behaviour by default.
 2021-01-20 18:23:22 +01:00
Pau Perez
681a009eb6 Extract outstanding balance SQL CASE/WHEN 2021-01-20 18:23:22 +01:00
Pau Perez
caf1c9ecd9 Move data fetching from injection helper to action 
Data fetching is a controller action responsibility. We shouldn't couple
the controller with it too much but it should trigger it, not the
view-layer.
 2021-01-20 18:23:22 +01:00
Matt-Yorkley
e1c13bc194 Fix issue with orphaned adjustments in migration 2021-01-20 13:42:14 +00:00
Pau Perez
ba018df9c5 Pass request_queuing setting to Rack middleware 
It turns out that this setting belongs to the Rack middleware Datadog
comes with to track requests (See
e4c430a174/docs/GettingStarted.md (rack)).

The way to pass this option to it is through `configuration[:rack]`
where the `TraceMiddleware` will read it from. See
f57aefe60a/lib/ddtrace/contrib/rack/middlewares.rb (L215-L217)
and
f57aefe60a/lib/ddtrace/contrib/rack/middlewares.rb (L30-L43).
 2021-01-20 10:58:07 +01:00
Andy Brett
a53cc6bc92 Update all locales with the latest Transifex translations v3.5.3 2021-01-19 19:07:37 -08:00
Andy Brett
89ce850da6 Merge pull request #6703 from openfoodfoundation/fix-datadog-init 
Revert "Enable request queuing tracking in Datadog"
 2021-01-19 18:39:21 -08:00
Transifex-Openfoodnetwork
b9cf5b7a9b Updating translations for config/locales/de_DE.yml 2021-01-20 12:46:16 +11:00
Andy Brett
012289e95f Merge pull request #6687 from openfoodfoundation/dependabot/bundler/monetize-1.10.0 
Bump monetize from 1.9.4 to 1.10.0
 2021-01-19 17:23:33 -08:00
Matt-Yorkley
6a9505cf67 Ensure adjustments can access soft-deleted originators 
Note: originator is generally an EnterpriseFee or a TaxRate
 2021-01-19 16:46:14 +00:00
Matt-Yorkley
c4a8a38c8d Soft-delete enterprise fees 
These objects can hold critical information related to adjustments and tax categories. If they are hard-deleted we lose vital data that's needed by associated records.
 2021-01-19 16:46:14 +00:00
Matt-Yorkley
a184075c5c Fix performance issue in loading payment methods 
This was loading and initializing every payment method in the database, and every calculator for each of those payment methods.

🔥
 2021-01-19 15:33:44 +00:00
Pau Pérez Fabregat
b84fb5814e Merge pull request #6696 from Matt-Yorkley/migration-issues 
Update adjustment migration
 2021-01-19 16:02:04 +01: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
Matt-Yorkley
79b86f535d Move class definitions in adjustment migration 2021-01-19 13:33:37 +00:00
Luis Ramos
8007554176 Remove test_after_commit gem, it's baked into rails 5 now 2021-01-19 01:15:43 +00:00
Luis Ramos
fc40775ca8 Make paypal controller inherit from base controller and not from old store controller 2021-01-18 23:33:05 +00: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
Andy Brett
473ac820aa Merge pull request #6676 from openfoodfoundation/transifex 
Transifex
v3.5.2 		2021-01-18 13:34:44 -08:00
Pau Pérez Fabregat
c9d2149ef9 Merge pull request #6688 from coopdevs/remove-unneeded-deprecation-warning 
Remove old deprecation warning
 2021-01-18 21:06:56 +01:00
Pau Pérez Fabregat
cd7ba2c62b Merge pull request #6690 from coopdevs/update-static-files-config 
Update old setting to serve static assets
 2021-01-18 18:05:44 +01:00
dependabot[bot]
d1eea4654a Bump monetize from 1.9.4 to 1.10.0 
Bumps [monetize](https://github.com/RubyMoney/monetize) from 1.9.4 to 1.10.0.
- [Release notes](https://github.com/RubyMoney/monetize/releases)
- [Changelog](https://github.com/RubyMoney/monetize/blob/master/CHANGELOG.md)
- [Commits](https://github.com/RubyMoney/monetize/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-18 16:10:24 +00:00
Pau Perez
fd80d4a67f Remove old deprecation warning 
We're in Rails 4.2 so we can remove it. This gets rid of the following
message when running tests:

```
DEPRECATION WARNING: Suppressing Selenium deprecation warnings is not needed any more. (called from block in <top (required)> at /usr/src/app/spec/spec_helper.rb:214)
```
 2021-01-18 17:01:43 +01:00
Pau Perez
006abee23d Update old setting to serve static assets 
Fixes the following deprecation warning:

```
DEPRECATION WARNING: The configuration option `config.serve_static_assets` has been renamed to `config.serve_static_files` to clarify its role (it merely enables serving everything in the `public` folder and is unrelated to the asset pipeline). The `serve_
static_assets` alias will be removed in Rails 5.0. Please migrate your configuration files accordingly. (called from block in <top (required)> at /usr/src/app/config/environments/test.rb:13)
```
 2021-01-18 17:01:33 +01:00
Pau Pérez Fabregat
158aa78f89 Merge pull request #6692 from Matt-Yorkley/deliver-specs 
Update mail delivery mocks in subscription specs
 2021-01-18 16:41:02 +01:00
Matt-Yorkley
bc9020a555 Update mail delivery mocks in subscription specs 2021-01-18 12:27:07 +00:00
Andy Brett
1287cb1e56 Merge pull request #6686 from Matt-Yorkley/devise-spec-helper 
Update deprecated devise spec helper
 2021-01-17 19:57:49 -08:00
Luis Ramos
d8436c2dab Downgrade libv8 so that mini racer keeps working 2021-01-16 22:41:50 +00:00
Andy Brett
ca022e505a Merge pull request #6684 from Matt-Yorkley/subs-delivery 
Use deliver_now in Jobs
 2021-01-16 09:11:25 -08:00
Matt-Yorkley
a7ad62a735 Update deprecated devise spec helper 
Devise has been complaining about this for a while in the test suite:
```
[Devise] including `Devise::TestHelpers` is deprecated and will be removed from Devise.
For controller tests, please include `Devise::Test::ControllerHelpers` instead.
```
 2021-01-16 13:54:09 +00:00
Matt-Yorkley
ea9ebc8a33 Update Angular CSRF handling 2021-01-16 13:41:24 +00:00
Matt-Yorkley
b713219690 Use deliver_now in Jobs 2021-01-16 13:19:00 +00:00
Andy Brett
2c405a5705 Merge pull request #6672 from Matt-Yorkley/update-hooks 
Delete dead code #update_hooks
 2021-01-15 19:03:14 -08:00
Luis Ramos
7c9024101b Some css fixes to make it all work in rails 5 2021-01-15 23:26:37 +00:00
Luis Ramos
4060e7debf Replace usages of Spree::BaseController with ApplicationController 2021-01-15 21:59:16 +00:00
Luis Ramos
7a22367b4a Make controllers use ::Basecontroller instead of StoreController 2021-01-15 21:59:16 +00:00
Luis Ramos
23e6048bde Merge StoreController with BaseController 2021-01-15 21:59:16 +00:00
Luis Ramos
ff8a81cee7 Remove includes already present in parent ApplicationController 2021-01-15 21:59:16 +00:00
Luis Ramos
0eab1b2339 Merge Spree::BaseController with ApplicationController 2021-01-15 21:59:16 +00:00
Matt-Yorkley
c0c7c6ec78 Update checkout helper summing and add test coverage 2021-01-15 17:29:21 +00:00
Matt-Yorkley
5593da2928 Delete dead code #update_hooks 
These hooks allow Spree core to be modified by other gems and apps without changing Spree code. We don't use it. #YAGNI
 2021-01-15 16:49:45 +00:00
Andy Brett
f179214920 Merge pull request #6677 from Matt-Yorkley/remove-debugging 
Remove debugging code from spec
 2021-01-15 08:30:00 -08:00
Matt-Yorkley
1eb08ba31c Define basic models in migration 2021-01-15 16:17:18 +00:00