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,862 Commits 19 Branches 453 Tags
fc6ed9ab4b2add4e254be18ecbc138da2846167d
Commit Graph

17557 Commits

Author SHA1 Message Date
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
Maikel
7bfe51d067 Merge pull request #13849 from rioug/10298-upgrade-to-shakapaker_v7 
Upgrade to shakapaker v7
 2026-01-26 11:14:31 +11:00
Rachel Arnould
2a7e8816c0 Merge pull request #13834 from mkllnk/pay-methods 
Simplify code listing available payment method types
 2026-01-23 22:52:29 +01:00
Gaetan Craig-Riou
988f903164 Update locale cache key to invalidate cache 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
a0c23825b8 Top level dir is not stripped anymore for static assets 2026-01-23 16:23:14 +01: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
315d52961a Add "v1" to locale cache key 
This is to invalidate existing locale cache key, so it will pick up
image path changes in cached fragment with locale
 2026-01-21 14:29:46 +11:00
David Cook
c0bcf177e7 Merge pull request #13861 from mkllnk/bump-ruby 
Bump Ruby from 3.3.10 to 3.4.8
 2026-01-20 16:34:31 +11:00
Maikel Linke
bac123f223 Remove unused switch to allow checkout on failures 
The inherited payment logic is complicated enough. Removing this dead
code makes it slightly simpler.
 2026-01-19 14:35:54 +11:00
Maikel Linke
fdc775ae6d Style arguments forwarding 2026-01-19 10:55:24 +11:00
David Cook
feed223ab4 Merge pull request #13528 from dacook/vine-expiry-message-13495 
[VINE] Show helpful message if voucher expired
 2026-01-19 09:20:18 +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
e8e48f7c64 use double quotes for the string value 2026-01-13 12:59:28 +05:00
David Cook
26702e6f0d Remove unused file 
Low-hanging fruit 🍇
 2026-01-13 14:59:26 +11:00
Gaetan Craig-Riou
a934b60f67 Make sure shipping modal gets closed 
Also check the modal is not showing instead of checking it's hidden
 2026-01-13 14:34:50 +11:00
Ahmed Ejaz
fd3c1c1343 Add "None" option to tags filter in product search 2026-01-13 02:13:51 +05:00
David Cook
368da19993 Display more specific invalid_voucher message to customer 
It was implemented with error code  409 in https://github.com/openfoodfoundation/vine/pull/112
 2026-01-12 17:14:57 +11:00
David Cook
419f4490d6 Recognise certain voucher errors 
I considered using the vine error message as the translation key (ie I18n.t(vine_voucher_validator_service.errors.#{message.parameterize.underscore}), but thought it might be more predictable to have keys explicitly defined and whitelisted like this.

These error message are still squashed by the controller, we'll deal with that next.
 2026-01-12 16:25:57 +11: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
Maikel Linke
f3c60148c1 Simplify filtering of Stripe 2026-01-09 16:54:25 +11:00
Maikel Linke
2e08c9c44e Simplify with defined order of payment methods 2026-01-09 16:54:21 +11:00
Maikel Linke
93f2af7e7d Lazy load payment method classes 
This avoids any class reloading issues in dev, simplifies most of the
code path and opens up for refactoring.

The only reason we still load the class is to call `clean_name` on it
for the translation key. We can probably do better.
 2026-01-09 16:54:02 +11:00
Maikel Linke
cb7a4b67ce Replace custom lookup with default Rails feature 
Rails renders an error when you try to supply an invalid value. Our code
is safe without an allow-list and the UX doesn't allow you to select an
invalid value.
 2026-01-09 16:53:06 +11:00
Maikel Linke
41a8d06326 Remove duplicate definition of payment providers 2026-01-09 15:16:36 +11:00
Maikel Linke
a957df1205 Use I18n API for readability 2026-01-09 15:16:36 +11:00
Maikel Linke
a1bdfa0a20 Move list of payment methods to where it is used 2026-01-09 15:16:36 +11:00
Maikel
a69528c432 Merge pull request #13803 from pacodelaluna/add-cloud-storage-configuration-for-s3-compatible-alternatives 
Add a new cloud storage configuration for s3-compatible alternatives
 2026-01-09 12:03:08 +11:00
Filipe
c73f28b434 Merge pull request #13815 from mkllnk/secrets 
Replace deprecated Rails secrets with credentials
 2026-01-08 18:46:33 +00:00
François Turbelin
cab4b2fb28 Add a new cloud storage configuration for s3-compatible alternatives 2026-01-08 13:08:09 +00:00
Filipe
80bd6defcb Merge pull request #13789 from prikeshsavla/13537-upgrade-active-storage-validations-gem 
Upgraded gem active_storage_validations to 3.0.2 and fixed any upgrade related issues
 2026-01-08 13:06:53 +00: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
Filipe
25063d2c4d Merge pull request #13649 from deivid-rodriguez/fix-removal-flash-message-translations 
Improve translations of some flash messages
 2026-01-07 16:33:34 +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
Gaetan Craig-Riou
bbbbe71bc4 Remove deprecated ~prefix 
https://github.com/webpack/sass-loader/blob/main/README.md#the-style-new-api-by-default-since-16-version-and-outputstyle-old-api-options-in-production-mode
 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
b3dc76b8cf Fix configuration and scss to get webpack to compile 
Move the Postcss config hack to postcss.config.js
 2026-01-06 14:31:32 +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
Maikel Linke
e91fab5702 Remove legacy config for secret key 2025-12-19 14:22:25 +11:00
Maikel Linke
e09853af0c Replace deprecated Rails secrets 
Use new credentials interface.
 2025-12-19 13:28:05 +11:00
Filipe
1b2a17d7e4 Merge pull request #13754 from deivid-rodriguez/no-changes-after-delete-customer 
Properly handle changes in `code` attribute when a customer is deleted
 2025-12-15 17:58:04 +00:00
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
Maikel Linke
0dabca583f Set stronger secret password for managers 
And avoid depending on Devise for this.
 2025-12-12 15:17:57 +11:00
Gaetan Craig-Riou
bcf4507795 Only show hub with inventory enabled 2025-12-12 13:04:44 +11: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
b302dcfbec Update existing enterprises 2025-12-10 16:24:54 +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