raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,922 Commits 19 Branches 453 Tags
970f486ec0cdffef3eb1dfdd0fbc3f1384c1db0e
Commit Graph

6888 Commits

Author SHA1 Message Date
Sigmund Petersen
f8c88ea8c7 Merge pull request #13859 from rioug/10298-upgrade-to-shakapaker_v8 
Upgrade to shakapaker v8
 2026-02-04 12:51:42 +01:00
Maikel
813249bad7 Merge pull request #13897 from arunguleria/13893-products-table-layout-changes 
13893-hiding too many columns in Admin product list, the table layout breaks
 2026-02-04 12:42:17 +11:00
Maikel
79af9efd29 Merge pull request #13857 from rioug/10298-remove-rails-sass 
Remove rails-sass dependency
 2026-02-04 09:55:29 +11:00
Rachel Arnould
b731f9b9e4 Merge pull request #12997 from wandji20/wb-OFN-12794-user 
Remove Cable Ready responses from User related controllers
 2026-02-03 15:51:11 +01:00
Arun Guleria
36d617bceb 13893-hiding too many columns in Admin product list, the table layout breaks 2026-02-02 10:47:02 +05:30
Rachel Arnould
2a3b076170 Merge pull request #13826 from chahmedejaz/task/13744-add-none-option-in-tags-filter 
Allow to select "none" in variant tags dropdown
 2026-01-26 22:29:59 +01:00
Gaetan Craig-Riou
cc9cb966b5 Fix images/font path 
Now `additional_paths` are stripped like `source_path`
 2026-01-26 14:54:48 +11:00
Gaetan Craig-Riou
9a90e46b78 Move mail css back to be managed by wepack 
It wil allow us to remove dependency on `rails-sass`, and `sass` which
are not maintained anymore.
More or less revert this PR: https://github.com/openfoodfoundation/openfoodnetwork/pull/12743
 2026-01-26 14:50:31 +11:00
Gaetan Craig-Riou
a0c23825b8 Top level dir is not stripped anymore for static assets 2026-01-23 16:23:14 +01:00
David Cook
1e2b8bad3f Fix linter error 2026-01-22 12:32:12 +11:00
wandji20
f5823bd618 Refactor to render turbo responses inline 2026-01-22 12:06:56 +11:00
wandji20
d9453979b1 Small improvements 2026-01-22 12:06:56 +11:00
wandji20
2cde74b91a Handle user confirmation with turbo stream 2026-01-22 12:06:56 +11:00
wandji20
3fd007fa3d Handle user password with turbo stream 2026-01-22 12:06:56 +11:00
wandji20
e3431c7954 Handle user sessions with turbo stream 2026-01-22 12:06:56 +11:00
wandji20
9fa715c709 Handle user registration with turbo stream 2026-01-22 12:06:56 +11:00
Gaetan Craig-Riou
dd5db396b4 Merge pull request #13828 from rioug/10298-upgrade-to-shakapaker 
Upgrade to shakapaker
 2026-01-21 16:17:50 +11:00
Gaetan Craig-Riou
82f6484031 Add comment explaning why defer loading is disabled 2026-01-16 12:30:57 +11:00
Gaetan Craig-Riou
82f40d2e93 Merge pull request #13821 from piyyu/fix-import-multiple-products 
Fix “Import multiple products” button route on empty products page
 2026-01-16 09:55:33 +11:00
Ahmed Ejaz
fd3c1c1343 Add "None" option to tags filter in product search 2026-01-13 02:13:51 +05:00
Gaetan Craig-Riou
39245d55e2 Turn defer off when loading javascript script 
It seems that we have functionality that depends on the order the
scripts are executed. Using defer breaks that.
Using defer is better performance wise so we should try to address this
eventually, might need to wait till we get rid of angular.
 2026-01-12 15:56:03 +11:00
Filipe
bd367cb154 Merge pull request #13795 from prikeshsavla/13392-fix-producer-name-text-encoding 
Fix encoding issue using ng-bind-html
 2026-01-08 12:03:00 +00:00
Filipe
d0f48687e2 Merge pull request #13777 from rioug/13481-webhook-payment 
Payment status change webhook
 2026-01-08 11:26:41 +00:00
Gaetan Craig-Riou
3676acf244 Fix font link 2026-01-06 14:31:44 +11:00
Gaetan Craig-Riou
8ce14a55c8 Fix dependencies version, and update config 
Trying to stay as close as possible to the default config
 2026-01-06 14:31:43 +11:00
Ahmed Ejaz
b8de75b1ef Add "None" option to tags filter and update search functionality 
- Implemented apply_tags_filter method to handle "None" option in tag searches.
- Updated tags select field to include "None" option in the filters.
- Enhanced search_by_tag method in specs  to accept multiple tags and raise an error if none are provided.
- Added tests for searching by "None" tag and combinations with other tags.
 2026-01-06 02:39:56 +05:00
piyyu
ad4ce14486 Fix import multiple products button route 2025-12-26 00:11:09 +05:30
Filipe
ce46115139 Merge pull request #13648 from deivid-rodriguez/improve-enterprise-removal 
Improve enterprise removal
 2025-12-15 16:54:05 +00:00
Ahmed Ejaz
6b78f8b855 Merge pull request #13804 from rioug/13802-revert-enbling-variant-tag-no-inventory 
[Inventory] display inventory link for user who manage enterprises with inventory and enterprises without inventory
 2025-12-13 01:13:34 +05:00
Gaetan Craig-Riou
9967ba2d06 Allow managing inventory and variant tag at the same time 
For users with enterprise with inventory and enterpises with variant
tag, allow access to the inventory page and display variant tag only for
the enterprises its enabled for.
 2025-12-12 12:38:22 +11:00
Maikel Linke
1973e36634 Extract token and HTTP layer for re-use 
Calling a webhook as a platform and fetching enterprise data will have
the same auth.
 2025-12-10 16:24:53 +11:00
Gaetan Craig-Riou
23c57cb354 Add UI to manage payment staus webhook endpoint 2025-12-10 10:28:11 +11:00
Gaetan Craig-Riou
d6ef56af6e Fix existing code to support webhook_type 2025-12-10 10:28:11 +11:00
Prikesh Savla
c01cca33c7 Fix encoding issue for Producer name to allow special characters in the text using ng-bind-html 2025-12-09 11:43:12 +05:30
Filipe
20107986a6 Merge pull request #13725 from rioug/13642-disable-inventory-not-using 
[Variant Tags] Enable variant tag for enterprise with no inventory
 2025-12-08 20:38:14 +00:00
Maikel
1029b61bb0 Merge pull request #13742 from mkllnk/market-organic 
Add Market Organic as available platform
 2025-11-28 12:15:57 +11:00
David Rodríguez
6aa7ef3c21 Improve enterprise removal (success case) 
Make enterprise removal use turbo, which provides the following
benefits:

* More responsive removal since there's no full page reload.
* A success flash message (previously nothing was displayed).
* No double alert prompt.

It also goes in the direction of removing mrujs in favor of turbo.
 2025-11-27 19:09:35 +01:00
David Rodríguez
e32dcd53b5 Pass media attribute explicitly to stylesheet link tags 
So that we can enable Rails default behavior for potential future such link
tags without changing current behavior.
 2025-11-25 08:08:59 +01:00
Filipe
dddc945c42 Merge pull request #13679 from deivid-rodriguez/customer-edition 
Improve `/admin/customers` form handling
 2025-11-21 10:51:55 +00:00
Maikel Linke
134ea28249 Remove obsolete DPM option 2025-11-21 13:47:00 +11:00
Gaetan Craig-Riou
acfe180e1d Fix check inventory enabled 
Inventory cannot be enabled if variant tag is also enabled
Re generated the rubocop todo to account for Product::Importer, it has
too many line but it's temporary. Once the inventory is removed it won't
be an issue anymore
 2025-11-18 13:56:46 +11:00
Filipe
a1ee1eac4c Merge pull request #13680 from rioug/13674-enable-variant-tag-new-enterprise 
[Variant tags] Enable variant tag for enterprise created after 11th of August and super admins
 2025-11-17 23:05:11 +00:00
David Rodríguez
278a8b1ec2 Let save-bar properly track form state 
* Keep save bar visible as long as there's a customer form displayed.
* Only display "You have unsaved changes" when there's any difference
  from the original values. If form changes are reverted, hide that
  note.
* Similarly, only let the button be enabled if there are any actual
  changes to be saved.
 2025-11-13 08:37:51 +01:00
Gaetan Craig-Riou
e8b81c1ff6 Fix variant filtering 
We don't want to filter out variant missing producer, so that the user
can address the problem.
 2025-11-10 16:29:27 +11:00
Gaetan Craig-Riou
ab443fa50f Refactor the clone template to use local variable 
and add define locals on the template
 2025-11-10 16:29:27 +11:00
Gaetan Craig-Riou
25d55fec24 Filter out variant the user is not allowed to update 
With a product with mutiple variant, we can end in a scenario where a
user sees variant associated to producer it doesn't have permission for.
This prevents the user from updating any variant. This fix filter out
variant a user shoudn't be seeing
 2025-11-10 16:29:27 +11:00
Gaetan Craig-Riou
61f8b5c7f4 Add strict locals for some products V3 templates 
Rails now allows you to define which local a template is expecting:
https://edgeguides.rubyonrails.org/7_1_release_notes.html#allow-templates-to-set-strict-locals
 2025-11-10 16:29:27 +11:00
Gaetan Craig-Riou
0745028c06 Fix checking if variant tag is enabled 
variant_tag feature check should happen per enterprise basis, but we
still want super admin to so see variant tag. To do so we check if the
user is amdin or if any of the current user enterprise has variant tag
enable.
 2025-11-10 11:14:56 +11:00
Rachel Arnould
94bda6d0f8 Merge pull request #13592 from rioug/13266-tag-variant-tag-rule 
[Variant tags] Add tag rules for variant
 2025-11-07 14:14:50 +01:00
Gaetan Craig-Riou
c057bab493 Use route helpers for autocomplete url 
Co-authored-by: Maikel <maikel@email.org.au>
 2025-11-03 14:25:48 +11:00