raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,799 Commits 18 Branches 451 Tags
ee2a6bf2e6025eaf2ca5b63dcafebacd52fdbdf4
Commit Graph

1100 Commits

Author SHA1 Message Date
Maikel
de938f6f10 Merge pull request #12949 from rioug/12859-use-VINE-voucher 
[City OFN Voucher] A shopper can use a VINE voucher
 2024-12-03 14:04:44 +11:00
Gaetan Craig-Riou
0569b30e0d Refactor Vine related services 
Move them under Vine module to keep the code nicely organised
 2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
9f3da1af4f Reddeem VINE voucher when firing "capture_and_complete_order"o 
'Spree::Payment#capture_and_complete!' will try to complete the order,
so we want to redeem any VINE voucher associated with the order first.
 2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
92c4cb9b7f Redeem VINE voucher when creating a new payment 
Creating a new payment will try to complete the order, so we want to
redeem any VINE voucher associated with the order first
 2024-11-28 13:35:01 +01:00
Maikel Linke
0d8df5d2a8 Replace Bugsnag calls with Alert.raise 2024-11-21 15:58:55 +11:00
Gaetan Craig-Riou
eb66244b74 Fix Bugsnag call to notify 
Make sure we add metadata as expected:
https://docs.bugsnag.com/platforms/ruby/rails/reporting-handled-errors/#add_metadata
 2024-11-06 14:01:48 +11:00
Gaetan Craig-Riou
b461d499ad Merge pull request #12914 from mkllnk/remove-stock-location-from-return-authorization 
Remove StockLocation from ReturnAuthorization
 2024-10-16 10:26:09 +11:00
Maikel Linke
a64aea4b9c Remove StockLocation from ReturnAuthorization 
We have only one default location and don't need it associated to
anything.
 2024-10-15 13:36:57 +11:00
Gaetan Craig-Riou
9db417319d Improve variant related validation when creating product 
I disabled Metrics/AbcSize for ensure_standard_variant as I don't think
that's hard to understand the code. And utimately it will be removed
once product actually becomes optional.
 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
4ad6971121 Fix Bulk product edit system spec after rebase 2024-10-14 15:01:18 +11:00
David Cook
917079931e Merge pull request #12778 from chahmedejaz/bugfix/12596-fix-annoying-oc-warning-display 
[BUU] Fix Messy flash notifications on new products page
 2024-08-16 10:29:43 +10:00
Ahmed Ejaz
46e54f48c9 12596: keep flash[:notice] check 2024-08-15 14:50:32 +05:00
Konrad
059dceb304 Merge pull request #12735 from chahmedejaz/bugfix/12698-fix-products-stateful-navigataion 
Fix 'Back to products list' stateful navigation
 2024-08-15 10:43:13 +02:00
Ahmed Ejaz
3474c60f4c 12596 - fix annoying oc warning display 
- such that it only displays once per user session
 2024-08-15 05:59:17 +05:00
wandji20
a85cfab506 Remove awesome nested set gem and dependencies [OFN-11636] 2024-08-12 18:47:16 +01:00
Ahmed Ejaz
c101c4e42f 12698 - fix 'go back to products' stateful navigation 2024-08-05 13:51:59 +05:00
David Cook
e62b640372 Poll to check when invoice file finished 
The BulkInvoiceJob already sends a notification via WebSockets once complete, but sometimes that fails. So this is added on top, just in case.
 2024-07-05 08:58:10 +10:00
Gaetan Craig-Riou
5884edaa1b Fix product import system spec 2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
ee88e2fdfa Fix product system spec 2024-07-03 11:11:03 +10:00
Gaetan Craig-Riou
9f612270c7 Fix bulk update product page old style 
and related product pages
 2024-07-03 11:05:01 +10:00
Gaetan Craig-Riou
25371ee9d0 Fix admin pages 
- move supplier to variant row on Bulk Edit product page
- add supplier dropdow on add/update variant page
 2024-07-03 10:17:49 +10:00
cyrillefr
e07cf6c628 Do not use rescue as control flow 2024-06-16 23:38:38 +02:00
cyrillefr
0470efa502 Requested changes: turbo_stream for success 
- must respond via turbo for create and update for success
- changed the spec accordingly
 2024-06-13 15:22:54 +02:00
cyrillefr
c5decfc58b Bugfix introduced by last commit 
- fixed bug created by last commit
- refactored to new method respond_with_error
- need for 2 cases in request spec: html & turbo
 2024-06-12 00:31:19 +02:00
cyrillefr
942990612b Requested changes 
- refined the code and applied it to create method too
- modified one request spec to work with turbo_stream
- added  2 examples in system specs
 2024-06-11 22:29:12 +02:00
cyrillefr
01612843b4 BUU Display error messages when file not valid 
- implements a turbo response in controller
- display error messages on modal -> able for user to re upload
- removes a pending in spec that now tests error message
 2024-06-10 14:32:08 +02:00
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
cyrillefr
404fcf1f72 Fix FixRailsWhereEquals 
- fixes offenses caused by RuboCop::Cop::Rails::WhereEquals cop
 2024-04-09 10:44:02 +02:00
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +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
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
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