raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,831 Commits 21 Branches 450 Tags
d2fce053a79b46bec3e860abac9ddff05ab08f43
Commit Graph

732 Commits

Author SHA1 Message Date
Konrad
1b536d9265 Merge pull request #10601 from abdellani/fix-v1-customers-endpoint-should-only-return-managed-enterprise-customers 
fix: v1/customers endpoint should load customers of managed enterprises only
 2023-04-16 16:22:02 +02:00
Filipe
0971e8d9b5 Merge pull request #10644 from mkllnk/report-timeout-message 
[Hidden] Display a friendly message when a background report times out
 2023-04-11 19:40:42 +01:00
Mohamed ABDELLANI
03cb14c926 define manage_by scope on customer model 2023-04-11 12:18:15 +01:00
Maikel Linke
30184ac6aa Background reports time out earlier than nginx 
This allows us to display a friendly message before nginx displays its
default error.
 2023-04-11 16:44:13 +10:00
Filipe
2ff464321c Merge pull request #10619 from openfoodfoundation/dependabot/npm_and_yarn/stimulus_reflex-3.5.0-rc1 
Bump stimulus_reflex and cable_ready from 3.5.0-preX to 3.5.0-rc2
 2023-04-05 17:37:15 +01:00
Jean-Baptiste Bellet
6f8ab56d2e Replace deprecated call render operations: 
```
DEPRECATED: CableReady's `render operations:` call has been renamed to `render cable_ready:`. Please update your render call.
```
 2023-04-05 14:19:34 +10:00
David Cook
865d81d28f Apply suggestions from code review 2023-04-05 14:05:26 +10:00
Maikel Linke
00a3976905 Display a friendly message when a report times out 
Once we get a download link for a report, we can display this message
sooner. But for now we just use the existing request timeout.
 2023-04-04 11:08:20 +10:00
Neal Chambers
940f806e5f Fix Rubocop Layout/LineLength 2023-04-04 09:44:15 +09:00
Filipe
62cdda2ce2 Merge pull request #10523 from rioug/10431-voucher-minimum-backend 
Voucher bare minimum backoffice
 2023-03-29 20:21:57 +01:00
Gaetan Craig-Riou
4085aa22dc Add create voucher action and system test 2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
a4add889a8 Add form on the new voucher page 2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
f9f6793d10 Add template and basic controller for backoffice voucher pages 2023-03-28 13:39:29 +11:00
Maikel Linke
78fea7c7f2 Run background reports with Sidekiq, not fork 
Forking worked in theory but crashed the browser in system specs. It
also came with many other hurdles and isn't well known solution in the
Rails community. Sidekiq can give us better control over execution
limits as well.
 2023-03-27 13:27:49 +11:00
Jean-Baptiste Bellet
465a295dfa Delete manager invitation controller 2023-03-23 11:21:05 +01:00
Jean-Baptiste Bellet
9c84a6936a Create a concern for manager invitations 
Can be used elsewhere

Update manager_invitations.rb
 2023-03-23 11:21:05 +01:00
Maikel
512cb44df5 Merge pull request #10330 from mickenorlen/8909-add-balance-to-api-v1-customer-endpoint 
Add balance to api v1 customers endpoint
 2023-03-20 15:47:41 +11:00
Jean-Baptiste Bellet
131772f7b2 Variant can be "not available": next and don't update its estimate price 2023-03-03 15:07:10 +01:00
Jean-Baptiste Bellet
440e776e3a fee_calculator can be retrieved outside subscription_line_items iteration 2023-03-03 15:05:07 +01:00
Mikael Norlén
96c0057b03 Use Customers as argument for CustomersWithBalance 
Change argument for CustomersWithBalance from
enterprise_id to Customers collection.

We have the need to calculate balance for customers in general,
not just for customers in a given enterprise.
 2023-02-15 11:14:27 +01:00
Ana Nunes da Silva
3e03988d93 Remove receipt printing settings 2023-02-14 08:08:20 +00:00
Jean-Baptiste Bellet
9b2ed8846c load_enterprise_set_on_index is used only in one action 
so let's call it inside the action.
 2023-02-03 09:15:07 +01:00
Jean-Baptiste Bellet
e18454c55a Add pagination on enterprises page for super admin 
Enterprises are stored in `@enterprise_set` variables, and we iterate over to show the list of enterprises to super admin.

Previously, we used to use `Sets::EnterpriseSet.new(collection)` instead of creating set based on `@collection`: this leads to call the `collection` method twice, which was probably very time consuming. This commit fix also that.

+ use paginated enterprises loading on bulk update but without testing if the current user is an admin
 2023-02-03 09:15:07 +01:00
Maikel Linke
b19456535d Isolate report rendering in separate child process 
Sidekiq doesn't have any features to limit memory usage or execution
time. We need a separate process for this. Forking avoids the boot time
of a fresh process and copy-on-write ensures minimal memory overheads.
 2023-01-18 23:12:26 +00:00
Maikel Linke
a177f4c066 Add feature to render reports in the background 
This is supposed to lower the memory footprint of all Puma workers. The
reports code will occupy needed memory in one Sidekiq worker instead of
in several Puma processes.

The current code doesn't limit the execution time yet. We either need a
way to terminate the report rendering after a while or send an email
with a link to access a rendered report.
 2023-01-18 23:12:26 +00:00
Maikel Linke
19c4596b9e Untie report from request object 
We want simple report arguments to store it as background job.
 2023-01-18 23:12:26 +00:00
Maikel Linke
0c769706aa Split method for easier reading 2023-01-18 23:12:26 +00:00
Maikel Linke
65843fbd68 Render on-screen report as HTML in renderer 
So it can be treated like any other format.
 2023-01-18 23:12:26 +00:00
Maikel Linke
22a086ebc1 Remove report dependency on report controller 
The ReportsController was referencing the report and the report was
referencing the controller. It's unlikely that this circular dependency
created a memory leak but it's generally a bad design. And we need to
make the reporting independent of the controller to isolate it in a
background job.
 2023-01-05 15:06:41 +11:00
Rachel Arnould
fd95970774 Merge pull request #8996 from jibees/introduce-backoffice-ui-uplift 
Introduce backoffice UI uplift
 2022-12-14 14:20:43 +01:00
Filipe
996d3afe4f Merge pull request #9983 from cillian/remove-exchange-tags-n1-query 
Remove N+1 query loading tags for each order cycle exchange
 2022-12-07 17:38:41 +00:00
Jean-Baptiste Bellet
d7d29e3654 Create a new controller for new products page 
Controller is constrained by FeatureToggle

- new_products_page
 - and available on '/new_products'

Add simple view for new products page and a product

Add new products page as a new entry in the menu
 2022-12-07 15:08:52 +01:00
Mohamed ABDELLANI
e25f4b1daa integrate ReportRenderingOptions in the View/Controller 2022-11-25 09:10:53 +01:00
Cillian O'Ruanaidh
fbe6dcba7a Remove N+1 query loading tags for each order cycle exchange 2022-11-11 17:01:46 +00:00
Konrad
4a7ac45dba Merge pull request #9830 from jibees/9821-remove-report_inverse_columns_logic-feature-toggle 
Remove `report_inverse_columns_logic` feature toggle
 2022-10-25 00:23:31 +02:00
Konrad
84bf38ce4d Merge pull request #9791 from vsmay98/8250-fix-snail-for-all-enterprise-fee 
Fix snail issue for all enterprise fees
 2022-10-24 21:49:45 +02:00
Jean-Baptiste Bellet
e2441cdcf6 Use the report type or subtype as the title 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
edc667a336 By default, some columns are hidden. 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
02787e668f Remove report_inverse_columns_logic feature toggle 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-10-24 11:12:22 +02:00
Vishal Jain
755107ec9f Fix snail issue for all enterprise fees 2022-10-20 12:15:21 +05:30
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
Cillian O'Ruanaidh
855ec1a708 Add new 'Checkout options' step to the edit order cycle form so people can attach shipping methods 2022-09-30 13:13:39 +01:00
binarygit
8861b6d077 Replace permalinks angular ctrl with stimulus 2022-08-31 10:06:51 +05:45
binarygit
6b56a8df0a Display/hide side-menu items when values in primary details change 2022-08-10 15:11:53 +05:45
Jean-Baptiste Bellet
3a1fde40c5 Add a Spree config option: enterprise_number_required_on_invoices 2022-06-28 09:50:12 +02:00
Filipe
6b00319e4a Merge pull request #9191 from jibees/9186-inverse-hide-columns-UX-by-a-columns-to-show 
Admin, Reports: Inverting logic from "Columns to hide" to "Columns to show"
 2022-06-21 17:34:31 +01:00
Jean-Baptiste Bellet
16babf8250 Don't modify params object, but use an intermediate variable 
`@params_fields_to_show`
 2022-06-13 14:39:12 +02:00
Filipe
43888f7f3c Merge pull request #9126 from mkllnk/active-storage 
[Breaking] Replace Paperclip with Active Storage
 2022-06-07 11:14:39 +01:00
Filipe
b3d81154e6 Merge pull request #9174 from georgethoppil/nan-items-subscription 
Updating order cycle will ensure any $NaN subscription item prices to be recalculated
 2022-06-02 17:28:54 +01:00
Maikel Linke
727eef3c4f Replace Paperclippable ContentConfig 
The old Paperclip configuration was very clever and easy to use but it
was also a complicated implementation building on the complicated Spree
preference system.

I simplified this with Active Storage, storing simple references to blob
ids and default URLs as backup.
 2022-06-01 17:16:54 +10:00