raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,487 Commits 18 Branches 451 Tags
b24ca03e287c91b41bcdebe45eb836a0b4012a4e
Commit Graph

1557 Commits

Author SHA1 Message Date
David Cook
665273ce2f [wip] Attempt to update edited image in-place with Turbo Stream 
but it doesn't quite work.

Maybe we can force it with JS (https://www.writesoftwarewell.com/process-turbo-stream-javascript/)
 2024-05-23 11:55:29 +10:00
David Cook
536b5608ab Show edit form for new images 2024-05-22 17:08:58 +10:00
Mohamed ABDELLANI
7aad4ad652 Merge branch 'master' into prevent-generate-invoices-when-distributor-cannot-invoice 2024-04-22 10:55:39 +01:00
filipefurtad0
b1e10f3dd4 Replaces missing by existing key 
I'm not sure how to trigger this error, and triggering an update error message seems appropriate too - it's sort of an edge case, perhaps this is a valid approach
 2024-04-15 15:05:53 +01:00
Maikel
082b1f9411 Merge pull request #12300 from mkllnk/checkout-steps 
Remove unnecessary method checkout_steps
 2024-04-11 15:57:45 +10:00
cyrillefr
404fcf1f72 Fix FixRailsWhereEquals 
- fixes offenses caused by RuboCop::Cop::Rails::WhereEquals cop
 2024-04-09 10:44:02 +02:00
Maikel Linke
54738fc552 Remove unnecessary method checkout_steps 
It allowed introspection of a dynamic state machine. But the only two
usages of this method only referred to the first state which is always
the same. Our complicated checkout logic needs more clarity and
introducing some hardcoded state names here can only help.
 2024-03-21 13:43:54 +11:00
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +05:00
Feruz Oripov
1f299c84bc Merge branch 'master' into queries/naming 2024-03-02 16:32:50 +05:00
Mohamed ABDELLANI
ee1f60808e prevent generating invoices when order's distributor can't generate invoices 2024-02-29 18:56:52 +01:00
Gaetan Craig-Riou
48ba23af1c Notify BugSnag when something unexpected happens 2024-02-28 15:16:09 +11:00
Gaetan Craig-Riou
e5cd8e5216 Log error when something goes wrong 
Plus spec.
The old implementation would swallow the error, all we had was a flash
message feedback
 2024-02-28 15:13:40 +11:00
Feruz Oripov
ef17fd7d80 Cleanup 2024-02-26 23:41:48 +05:00
Feruz Oripov
f8c0edd68b Update CompleteOrdersWithBalanceQuery 2024-02-26 23:05:25 +05:00
Rachel Arnould
11bdba3c4e Merge pull request #12073 from rioug/12045-add-invisible-captcha 
Add invisible captcha to registration screen
 2024-02-05 10:44:41 +01:00
Gaetan Craig-Riou
d5499245d0 Merge pull request #11698 from openfoodfoundation/dependabot/bundler/redis-5.0.8 
chore(deps): bump redis from 4.8.1 to 5.0.8
 2024-01-29 10:55:58 +11:00
David Cook
4634917597 Treat image integrity error as an input error 
And thus give the user a useful message to try again.

Hmm, if this is a good idea, we should do it everywhere we upload an image. Can we build that in somehow, or at least make a shared helper that accepts a block and catches the error?

I replicated this in dev a couple of times, I think with a text file labelled as an image file. Unfortunately, I can no longer replicate in dev or with a spec.
 2024-01-25 14:14:58 +11:00
Maikel Linke
687176cf49 Remove trouble-some hiredis 
The hiredis client was praised as being faster parsing bulk responses
but it seems to have multiple issues now:

- The redis release 5.0 moved hiredis support to another gem.
- I tried the hiredis-client gem and it raised errors.
- There are claims of worse performance of hiredis [1].
- Maintenance responsiveness has been questioned [2].

Using the default redis driver seems to work fine though.

[1]: https://discuss.rubyonrails.org/t/hiredis-does-not-support-ssl-action-cable/75945
[2]: https://github.com/redis/hiredis/issues/655
 2024-01-25 13:28:44 +11:00
Gaetan Craig-Riou
d8876c40b8 Add invisible_captcha on the user registration page 
The default action when a user submit the form too quickly is to
redirect to :back with flash error message. As we are using CableReady
it's not working for us, so I render_alert_timestamp_error_message
to show the error message to the user.
 2024-01-23 16:30:12 +11:00
Gaetan Craig-Riou
96a010033d Fix admin view to use dfc_id 
This was missed in a previous refactor
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
652c7a563c Add dfc_name field on Spree::Taxons 
This will let us map OFN product taxons to DFC product types
 2024-01-22 10:02:10 +11:00
David Cook
6479990f6d Show image update form in modal 
It submits to the existing controller. I wanted to submit it with StimulusReflex, but it [doesn't support file uploads](https://docs.stimulusreflex.com/guide/working-with-forms.html#a-note-about-file-uploads). Perhaps we'll enhance this with javascript later.
 2024-01-16 13:44:28 +11:00
David Cook
91abb856a6 DRY 
Refactor to use the (previously unused) shared method.
 2024-01-16 12:53:07 +11:00
Gaetan Craig-Riou
aaa8f3f572 Per review, move logic to display ToS banner to a helper 
It easier to understand when we can see the logic to display the banner
in the view.
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
d0ba881aa2 Move acepting of ToS change to a reflex 
Spree::Admin::UserController is for super admin user only. Moving to a
reflex simplifies the code by getting rid of a new route and a new stimulus
controller
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
8371eada23 Don't show the banner if enterprises are not required to accepte ToS 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
5c9abfefee Per review, remove useless code pass 
It shouldn't be possible for the update to fail, as we are not sending
any parameter. Any other failure should be handled by rails already, ie
missing csrf token.
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
8e31e35d5d Add Tos banner on all admin pages 
Plus spec, this is tested on the dashboard page.
The banner will show if the user accepted_at is before the tos file
updated at time.
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
ee79fd88d2 Add /admin/users/:id/accept_terms_or_service end point 
Plus specs
 2023-12-22 13:20:14 +01:00
David Cook
0f3a952fd0 Add translation for product cloned message 
A validation error shouldn't happen. If it does, it's an exception, not an error.
 2023-12-06 15:13:20 +11:00
David Cook
32a4088386 Revert "#11067, remove messages to match with old UI UX" 
Now we support flash messages, we can show it!

This reverts commit d8904099dd.
 2023-12-06 10:12:18 +11:00
Mohamed ABDELLANI
a13e087541 use render edit instead of redirect_to 
with redirect_to, the validation errors will be lost at the rendering time.
 2023-11-28 13:45:17 +01:00
Rachel Arnould
1088b6b6dd Merge pull request #11785 from chahmedejaz/task/11067-admin_style_v3-product-clone 
Implement product clone
 2023-11-22 16:29:38 +01:00
Filipe
ebd1151054 Merge pull request #11730 from murjax/payment-save-flash-9048 
Fix Stripe payment flash rendering issue
 2023-11-17 11:51:42 +00:00
Ahmed Ejaz
29eadedc3a Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-17 03:45:54 +05:00
Filipe
ed8fd41bec Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop 
Fix Orders in confirmation state cannot be completed by hub or shop
 2023-11-16 19:50:14 +00:00
Ahmed Ejaz
0457755e27 Merge branch 'task/11067-admin_style_v3-product-clone' of https://github.com/chahmedejaz/openfoodnetwork into task/11067-admin_style_v3-product-clone 2023-11-11 15:54:58 +05:00
Ahmed Ejaz
d8904099dd #11067, remove messages to match with old UI UX 2023-11-11 15:47:59 +05:00
Ahmed Ejaz
2af678cb28 Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-08 18:41:31 +05:00
Ahmed Ejaz
851ce281ea #11067, implement product clone 2023-11-08 18:36:22 +05:00
Neal Chambers
0663f04535 Remove Simple References to Bogus Gateway 2023-11-07 11:19:26 +09:00
Ryan Murphy
7e5ad8c8a4 9048: Fix Stripe payment flash rendering issue 2023-11-01 07:33:06 -04:00
Maikel
6a236a8678 Revert "replace hiredis gem with hiredis-client" 2023-11-01 15:16:57 +11:00
cyrillefr
e1374d5837 Add Order completion after capturing event 
- A new processing method
- Payment means that link to it
- Altering methods that handle next status choice
 2023-10-29 21:58:03 +01:00
cyrillefr
cd6c3c45e6 Allow an order in confirmation state to transition to payment 2023-10-29 21:58:03 +01:00
Mohamed ABDELLANI
d6890e9828 check key class before call Rails.cache.delete 2023-10-26 10:27:00 +01:00
Mohamed ABDELLANI
f047deaf12 load the latest invoice when user tries to print an order 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
3f4eab2a0a update the invoice renderer to check if the feature is enable for individual user 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
614c8a5060 update order mailer to check if invoices feature is enabled for the current user 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
bd2a1b3e22 check if invoices feature is enabled for the current user before printing a single invoice 2023-10-08 21:47:17 +02:00