raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,988 Commits 17 Branches 453 Tags
6262dc3a2e7dbbe09bebc2b0b64d2ff0ffb6bbc8
Commit Graph

505 Commits

Author SHA1 Message Date
GeorgeThoppil
898c470c00 Change enterprise visibility scope 2022-04-21 20:27:28 -04:00
Matt-Yorkley
eef59bbaae Improve permissions query building 
For larger queries and especially where filtering and paginating, these simpler product queries are way more efficient. It cuts out some very large subqueries with large lists of product ids.
 2022-04-05 22:28:09 +01:00
Filipe
20c0195584 Merge pull request #8017 from cillian/hide-variants-with-no-stock 
When creating backoffice orders hide variants with no stock by default
 2021-12-23 21:34:06 +00:00
Cillian O'Ruanaidh
9bc7922734 Only left join variant overrides belonging to the distributor when searching for in stock variants. 
Before the :scope_to_distributor call was filtering out variants from other distributors anyway via the :exchange_variants table but it is clearer if we filter by distributor on the :variant_overrides left join too.
 2021-12-17 15:25:55 +00:00
Jean-Baptiste Bellet
cad8d8316d Improve variant order when searching 2021-12-07 11:37:39 +01:00
Jean-Baptiste Bellet
1b6cfb60a1 Searching variants should order results by variants display name 2021-12-07 11:18:20 +01:00
Jean-Baptiste Bellet
12f7935a26 Add needed Helper to handle create 2021-12-07 11:18:20 +01:00
Matt-Yorkley
817f0942dd Pull in reports POC work replacing Packing reports 2021-11-04 14:55:23 +00:00
Matt-Yorkley
cf5d964133 Update usages of old preference getters and setters 2021-11-04 11:48:30 +00:00
Cillian O'Ruanaidh
2462d71ab5 When creating backoffice orders hide variants with no stock by default 
But let people include out of stock variants by checking a checkbox if they want.

Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.

Co-authored-by: Maikel Linke <maikel@email.org.au>
 2021-10-08 13:13:32 +01:00
Nihal
43e6d1b933 Show order total in Delivery/Payment Method reports instead of first payment 2021-09-10 13:08:00 +05:30
Pau Pérez Fabregat
aa9a85159e Merge pull request #7806 from mkllnk/feature-toggles 
Remove custom feature toggles
 2021-06-18 12:23:21 +02:00
Maikel Linke
a8eecf963d Remove unused custom FeatureToggle implementation 
Flipper is now our only source of truth regarding feature toggles.
 2021-06-18 10:46:51 +10:00
Maikel Linke
bba85e5e79 Remove feature toggling via ENV vars 
We don't use ENV vars for feature toggles any more. Flipper is much
easier to manage.
 2021-06-18 10:46:51 +10:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Matt-Yorkley
3f9a3b41da Refactor and improve EnterpriseFeeApplicator spec 2021-06-06 20:17:03 +01:00
Matt-Yorkley
30e2be13f0 Update spec/lib/open_food_network/i18n_config_spec.rb 2021-06-01 18:50:04 +01:00
Luis Ramos
dc1cdf4254 Add required DB cleaner setup code 2021-06-01 18:50:04 +01:00
Pau Perez
5bca7d1f8f Remove the old balance's code branch 
This keeps the `OrderBalance` abstraction but removes the old code now
that the feature is enabled for all users in all instances and there are
no bugs reported. It's become dead code.
 2021-04-19 11:52:41 +02:00
Maikel
0c182c4606 Merge pull request #7259 from jibees/7193-implements-feature-toggle-with-flipper 
Implements feature toggle with flipper
 2021-04-15 11:33:12 +10:00
Matt-Yorkley
b6038c01a3 Remove references to Adjustment source 2021-04-14 12:01:21 +01:00
Maikel Linke
8a062b05eb Clarify test users in feature toggle spec 2021-04-12 18:26:18 +02:00
Maikel Linke
7a0912d5a4 Use Flipper within the OFN FeatureToggle interface 
This ensures that we keep the same interface as before and can migrate
to Flipper in a backwards-compatible way.
 2021-04-12 18:26:18 +02:00
Maikel Linke
b045a59685 Consider feature toggles without user as well 
This is running the same feature toggle logic when a user is given or no
user is given. This allows features to define what to do with guests.
 2021-04-12 18:26:18 +02:00
Matt-Yorkley
a768cb2510 Set adjustment "target" (adjustable) to be the line item when adding enterprise fees on line items 2021-03-18 13:18:20 +00:00
Pau Pérez Fabregat
51f63060a4 Merge pull request #6879 from coopdevs/customer-balance-bulk-coop-report 
Customer balance bulk coop report
 2021-03-17 12:08:44 +01:00
Matt-Yorkley
ac37db7e00 Update test setup in OrderCycleManagement report 2021-03-11 12:23:00 +00:00
Matt-Yorkley
55db911334 Update sales tax report 2021-03-04 14:27:02 +00:00
Matt-Yorkley
c093701adf Improve UserBalanceCalculator spec test setup 
Previously we were creating order objects that were not actually complete, and manually setting the `completed_at` field. This meant the order objects being tested were not actually in the correct state, ie: pre-checkout orders that had not been processed properly.
 2021-03-04 14:27:02 +00:00
Pau Perez
2ead2ad417 Replace private stub with fake collaborator object 2021-03-03 18:19:26 +01:00
Pau Perez
b7335e12e9 Add first basic unit test to Reports::LineItems 
This is quite hard and tedious due to its tight coupling with
Permissions::Order but sets the path to adding more of these and
eventually refactoring this class in the future.
 2021-03-03 18:19:26 +01:00
Matt-Yorkley
0e3429dc35 Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor 
Enterprise fees refactor
 2021-02-22 17:59:18 +01:00
Pau Pérez Fabregat
8068c6015f Merge pull request #6836 from coopdevs/customer-balance-reports 
Customer balance reports
 2021-02-17 17:34:37 +01:00
Pau Perez
36ce39a217 Sort OC report orders by completed_at 
This is then consistent with the ordering we use to list orders in
/admin, which is more useful. As a result, the test is also more robust.
 2021-02-16 13:25:21 +01:00
Pau Perez
cbfea1ba97 Hide new report's balance under toggle 2021-02-08 19:43:45 +01:00
Pau Perez
e4319b06e6 Take into account other finalized order states 
This makes it consistent with other places where we show order balances.
Here though, we purposefully skip canceled ones.
 2021-02-08 19:34:42 +01:00
Pau Perez
a66d1b7299 Compute order balance chaining with query object 2021-02-08 19:34:42 +01:00
Pau Perez
106dcbae01 Add test coverage to the two distinct output rows 2021-02-08 19:34:42 +01:00
Pau Perez
412bb24e42 Ensure report rows are always in the same order 
I saw the row were returned not respecting any ordering when refreshing
the page locally. It made it hard to debug whether or not the customer
balance was right.

It's less than ideal to use `allow_any_instance_of` but with this legacy
and very coupled code, it's the best we can do.
 2021-02-08 19:34:42 +01:00
Pau Perez
d6350c3d0b Remove deprecated Feature class implementation 
This became dead code now.
 2021-02-04 10:20:54 +01:00
Pau Perez
14cee0e45d Add new Feature class to toggle based on a closure 
This enables toggling features as best fits us in each case. With this
new approach we can then toggle :customer_balance to an entire instance,
which is what we want in France.
 2021-02-04 10:20:54 +01:00
Matt-Yorkley
e7866db7b1 Improve efficiency in applying enterprise fees in Order#update_distribution_charge! 2021-01-29 18:32:26 +00: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
Luis Ramos
5b00868c6f Allow mutable strings in some specs 2020-12-03 06:38:24 -08:00
Luis Ramos
2b8f0abe49 Try some mass auto-correct adding frozen-string-literal to all specs 2020-12-03 06:38:24 -08:00
Pau Pérez Fabregat
4911bb6613 Merge pull request #6274 from luisramos0/rubocop 
Use rubocop auto correct to fix a number of issues
 2020-11-02 22:13:36 +01:00
Luis Ramos
403384dbb1 Fix rubocop isssues, trailing whitespaces and empty lines 2020-10-30 16:50:37 +00:00
Luis Ramos
4845cde20f Fix rubocop issue Layout/HashAlignment 2020-10-30 16:50:37 +00:00
Luis Ramos
7e606471e4 Make tag_rulee_applicator and available_payment_methods_filter handle case where a relation is given instead of an array 2020-10-30 10:10:54 +00:00