Jordan Mock
3bb14fbfdb
Merge branch 'master' into fix-#13264
2025-04-24 13:13:37 +01:00
Jordan 'sloth' Mock
b56411145c
Incorrect place for origianl fix. Thanks to Blane W for pointint out the correct line.
2025-04-24 13:05:40 +01:00
Maikel Linke
4756078ab9
Update all locales with the latest Transifex translations
2025-04-24 13:53:46 +10:00
Filipe
40d4b0c811
Merge pull request #13269 from drummer83/remove_txt-mails
...
Remove text versions of emails
2025-04-23 22:44:39 +01:00
Jordan Mock
c14c760033
Fix #13272 - missing 'ng-bind'
...
This PR fixes issue #13272 where supplier and product names containing HTML character entities (e.g. ã) were rendered as raw text on the /admin/inventory page.
For example, a supplier name intended to appear as:
Pãtes du Contentin
would incorrectly display as:
Pãtes du Contentin
Cause:
AngularJS’s {{ ... }} interpolation inserts raw strings into the DOM without decoding HTML entities.
2025-04-23 14:05:21 +01:00
Filipe
6a9493a581
Merge pull request #13256 from ashishp91/missing_translations_for_tax_category
...
Use translation for "none" in reports
2025-04-23 13:10:13 +01:00
Filipe
07842bf5eb
Merge pull request #13081 from pacodelaluna/do-not-allow-spaces-in-external-billing-id
...
Do not allow spaces in external billing
2025-04-23 12:20:02 +01:00
David Cook
280886241a
Merge pull request #13259 from piyush828-design/add_coverage_10597
...
Added tests for edit and delete
2025-04-23 13:05:13 +10:00
piyush828-design
8c564d344b
Merge branch 'master' into add_coverage_10597
2025-04-22 11:37:54 +05:30
piyush828-design
ed0b7f88a4
updated specs
2025-04-22 11:26:56 +05:30
David Cook
e1c6709472
Merge pull request #13251 from cyrillefr/FixRailsLexicallyScopedActionFilterPartI
...
Adresses Rails/LexicallyScoped offenses
2025-04-22 11:26:11 +10:00
Ahmed Ejaz
915dccc92d
Update all locales with the latest Transifex translations
2025-04-22 01:45:38 +05:00
Konrad
d97cb9ccb3
Update specs
2025-04-21 20:11:50 +02:00
Konrad
f63552ca38
Deletes remaining text versions of emails
...
This is in preparation for advancing the white labelling feature of emails and adding more specs in that regard
Related discussion on Slack: https://openfoodnetwork.slack.com/archives/C2GQ45KNU/p1722902361401869?thread_ts=1721485724.245519&cid=C2GQ45KNU
2025-04-21 20:11:50 +02:00
Filipe
d2fa2e612c
Merge pull request #13113 from chahmedejaz/task/13031-allow-producers-to-edit-orders
...
Allow producer to edit their products on hubs' orders
2025-04-21 11:28:36 +01:00
Ahmed Ejaz
7642c54667
remove the disabled button
2025-04-21 03:38:06 +05:00
Filipe
cb9db54cd3
Merge pull request #13240 from rioug/13100-do-not-remove-fee-product-removed-from-OC
...
[Enterprise Fees] Keep fees on product when a product is removed from the order cycle
2025-04-20 21:57:56 +01:00
Filipe
3236cbb0b8
Merge pull request #13191 from mkllnk/dfc-reset
...
Reset stock for absent products in DFC catalog
2025-04-20 21:34:49 +01:00
Ahmed Ejaz
3443c79169
Update all locales with the latest Transifex translations
2025-04-21 00:40:49 +05:00
François Turbelin
318bc1dae0
Add tests
2025-04-17 21:29:23 +02:00
piyush828-design
5849ae57de
Added tests for edit and delete
2025-04-16 12:11:52 +05:30
cyrillefr
a66a6197c7
Disable cop Rails LexicallyScopedActionFilter
2025-04-15 14:12:46 +02:00
David Cook
cf55a920da
Manually add variable for translation
...
Normally I'd avoid editing these files, but this results in translations appearing exactly as they did prior to the PR. Ideally I would notify translators to re-translate but I don't know that there's a good process for that. Hopefully this is fine and doesn't cause any conflicts...
2025-04-14 15:39:44 +10:00
Ahmed Ejaz
d12455ccbe
update schema
2025-04-13 21:45:04 +05:00
Ahmed Ejaz
87c957541d
refactor: fix rubocop lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
213209b460
hide customer info on bulk orders page
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
4e2198cd4f
hide shipping icons from suppliers
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
eee5d5c8ad
fix buggy spec:
...
- this before block was causing multiple nevigation to the index
- one from the spec itself, one from here.
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
293b30cfa6
simplify block
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
f2adcbf2b8
fix syntax error
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
acdffb0aa1
revert "remove subquery for optimization"
...
- we are using OR between two queries here: 53ec6621bc/app/services/search_orders.rb (L31-L32)
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
3474734418
implement spree_current_user let! so that user creation doesn't get captured in the scoper queries
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0500294480
rename is_producer to is_producer_only
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
a4f1f542be
rename distributor_allows_order_editing to filter_by_supplier
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
adbdc64c13
remove subquery for optimization
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
f132d99df4
remove ids usage
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
9867d0bc3a
fix flaky spec error:
...
Ferrum::BrowserError:
Argument should belong to the same JavaScript world as target object
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
ccfd0edbf1
fix lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bf6934db94
add specs
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
b803e18f42
fix lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
20146a8e11
update respective specs
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bc3917ebc1
incorporate show_customer_names_to_suppliers setting
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
4bc578f38f
restrict page sections from supplier
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
3e71f8293c
add bulk_management ability
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
d9308799b0
add ability search supplier products in orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
19c5fec9a9
add ability update supplier line_items in orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0a61910cf6
add ability to view supplier products containing orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
93fb3fd7d9
add enterprise producers_to_edit_orders setting
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
408ccc5c16
Update all locales with the latest Transifex translations
2025-04-12 23:33:20 +05:00
Ashish Gaur
2da170912f
Use translation for none in reports
2025-04-12 12:01:06 +05:30
