raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,114 Commits 18 Branches 452 Tags
3ec58d879110866721d325cc628cbf50d3e8d328
Commit Graph

4262 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
filipefurtad0
d035d4bb87 Update all locales with the latest Transifex translations 2023-05-11 15:25:39 +01:00
Filipe
bf7a559a32 Merge pull request #10772 from Matt-Yorkley/view-caching 
Locale-aware Fragment Caching
 2023-05-10 11:18:08 +01:00
Matt-Yorkley
d90653c682 Merge pull request #10793 from jibees/fix-webpack-configuration-use-the-default-one 
Use the default webpack configuration for dev env
 2023-05-10 10:09:28 +01:00
Matt-Yorkley
4b707b9310 Extract locale file digest logic to a separate class and add tests 2023-05-08 14:09:00 +01:00
Matt-Yorkley
be48a6c295 Implement cache_with_locale helper for fragment caching with locales 2023-05-08 14:07:50 +01:00
Maikel
ad033e8d44 Merge pull request #10767 from Matt-Yorkley/remove-session-cookie-upgrader 
Remove SessionCookieUpgrader from middleware
 2023-05-08 12:50:42 +10:00
Jean-Baptiste Bellet
8a5608435c Update all locales with the latest Transifex translations 2023-05-03 17:30:48 +02:00
Konrad
b60a6fbd05 Merge pull request #10329 from thejwuscript/9861-improve-input-validation 
Improve input validation on new and edit Payment Method pages
 2023-05-03 16:11:21 +02:00
Jean-Baptiste Bellet
2d7356f2bb Use the default webpack configuration for dev env 
We used to override the output filename but this was a misunderstanding of an error (due to webpacke(r) incompatibles versions)

https://medium.com/@web_developer/hash-vs-chunkhash-vs-contenthash-e94d38a32208

https://github.com/webpack/webpack.js.org/issues/2096

Context: https://github.com/openfoodfoundation/openfoodnetwork/pull/10631#pullrequestreview-1410083331
 2023-05-03 10:10:17 +02:00
Maikel Linke
9f0a66659a Delete now unused SessionCookieUpgrader 2023-05-01 13:35:52 +10:00
Matt-Yorkley
8d9a8d8db5 Enable verbose query logs in development 
This is a new feature in Rails 7. Whenever a query is triggered it not only show you the query (as before), but also tells you (directly in the logs) exactly which line of code was responsible for triggering the query. It's unbelievably useful for debugging and performance work.
 2023-04-28 14:35:16 +01:00
Matt-Yorkley
84df1bfeab Remove SessionCookieUpgrader from middleware 
This was a transitional bit of code to allow us to rename our session cookies without killing active sessions and logging users out. It's done it's job, the transition is finished, and it isn't doing anything useful now. It can be removed from the middleware stack.
 2023-04-28 14:01:15 +01:00
Gaetan Craig-Riou
152af5e105 Merge pull request #10751 from mkllnk/mail-config 
Remove unused feature to intercept emails
 2023-04-28 16:28:41 +10:00
David Cook
918425fd93 Remove customised error message 
We're now handling these values on the frontend, so can keep this simple.

fixes up:
 Add numericality validation for *
 Add translation for Active Record error message
 2023-04-28 14:02:12 +10:00
David Cook
d2fbb0bde2 Update translations 
js: admin: orders: order_state: confirmation
 2023-04-27 14:49:28 +10:00
Jean-Baptiste Bellet
35778ecf1d If enterprise has a white_label_logo attached, then can edit its link 2023-04-26 11:04:47 +02:00
Maikel Linke
dae8703b02 Remove unused feature to intercept emails 
This option came from Spree and we never used it. The config input field
is disabled in the admin interface and I checked our managed databases.

I don't think that we will want this feature in the future either.
Staging sends unmodified emails which is more realistic and we haven't
had a use case to intercept those emails. There's still the BCC option
if we need additional access.
 2023-04-26 13:50:31 +10:00
Konrad
75b5d1fd6f Merge pull request #10712 from jibees/6133-backoffice-orders-endless-spinner-and-error-500-after-skipping-oc-selector 
Admin, create new order: distributor and order cycle are now mandatory on step 1 (aka the set_distribution step)
 2023-04-22 16:04:15 +02:00
Konrad
0c1606e50c Merge pull request #10728 from jibees/10718-missing-translation-confirmation-order-state 
Admin, `/orders`: adds translation for order in `confirmation` state
 2023-04-22 11:56:23 +02:00
Maikel Linke
4960402643 Update translations 2023-04-21 09:45:45 +10:00
Jean-Baptiste Bellet
6fdf9fa038 Add/Remove white label logo in enterprise preferences panel 2023-04-20 08:45:03 +02:00
Filipe
f206b7ed9e Merge pull request #10661 from mkllnk/report-download 
[Hidden] Provide download link for reports generated in the background
 2023-04-19 11:53:14 +01:00
Filipe
a409d3b97e Merge pull request #10201 from saunmanoj888/fix-invalid-image-upload 
Fix corrupt and invalid image upload issue
 2023-04-19 10:45:04 +01:00
Jean-Baptiste Bellet
a27b64a66b Add confirmation state translation 2023-04-19 11:32:51 +02:00
Jean-Baptiste Bellet
7e306693a8 Use Rails standard naming: same name for the route and the method 2023-04-19 10:15:35 +02:00
saunmanoj888
97f51d24b8 Validate image on creating product from products/new 2023-04-19 16:11:46 +10:00
saunmanoj888
c3d274c84f Fix corrupt and invalid image upload issue 2023-04-19 16:11:46 +10:00
Jean-Baptiste Bellet
61850f7e92 Remove duplicate line 
Probably due to a bad merge conflict resolution

Line is already on line `#25`
 2023-04-18 16:01:04 +02:00
Jean-Baptiste Bellet
6172d1f2e5 Extract method on_update that will be used elsewhere 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
73a81310f8 Create a new url /orders/ORDER_ID/distribution 
That handles the step when distributor and order_cycle must be selected
 2023-04-18 14:21:23 +02:00
David Cook
353acfd6ae Validate associated calculator with built in error handling 
Except that pesky generic message was appearing. I still don't know how to control that so just deleted it.
 2023-04-18 09:39:39 +10:00
David Cook
e43a018dc7 [wip] Copy each calculator error 
But we still have the duplicate problem.
Wait a minute, it copies them in the same format that I am copying them. So.. I don't need to copy them at all!

Now I see that we just needed the right format in the translation file.
 2023-04-18 09:39:39 +10:00
David Cook
f6fac018ea [wip] Use a custom message format for associated errors 
This is much simpler. Multiple messages get combined onto one line though, which is not perfect.

And.. it still seems to duplicate the errors. Weird, it's fine on my frontend though.
 2023-04-18 09:39:39 +10:00
James Wu
d40f3414ea fixup! Add translation for Active Record error message 2023-04-18 09:39:39 +10:00
James Wu
3dfaf882a3 Add translation for Active Record error message 2023-04-18 09:39:39 +10:00
Jean-Baptiste Bellet
6bf21d2abd SASS loader: Do not print warnings from dependencies 2023-04-14 11:09:39 +02:00
Maikel Linke
98e4f867b4 Provide download link for generated reports 2023-04-14 11:29:35 +10:00
David Cook
a6cd393c57 Update all locales with the latest Transifex translations 2023-04-13 16:45:38 +10: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
filipefurtad0
680b6a7122 Update all locales with the latest Transifex translations 2023-04-07 10:17:13 +01:00
Jean-Baptiste Bellet
bb502c2e65 Authorize localhost:3000 as trusted domain for images 2023-04-06 10:10:44 +02:00
Filipe
2f6b730ed4 Merge pull request #10614 from cillian/business-address-country-state-placeholders 
Add placeholders to business address country and state select fields
 2023-04-05 19:55:07 +01:00
Maikel Linke
020af0c0e4 Explain report timeout better to user 2023-04-05 09:59:02 +10:00
emiliecm
5abda22831 Fix bug #10596, missing translation for editing shipping category 2023-04-04 19:48:16 -04:00
Cillian O'Ruanaidh
89dac47aa6 Add placeholders to business address country and state select fields 2023-04-04 19:22:22 +01: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
Filipe
2051d811cf Merge pull request #10567 from jibees/10557-allow-hide-of-ofn-main-navigation 
White Label: Allow enterprise to hide ofn main navigation on `/shop`, `/cart`, `/checkout`, `/orders` pages
 2023-04-03 20:29:37 +01:00
Maikel Linke
a56081ad5b Update translations 2023-03-31 14:59:16 +11:00
Jean-Baptiste Bellet
c20ae0de1e Edit hide_ofn_navigation in 'white label' panel for an enterprise 2023-03-30 09:17:57 +11:00