Filipe
d20ed5c757
Merge pull request #13275 from slothmock/fix-#13264
...
Fix #13264 - missing 'ng-bind-html'
2025-04-29 18:45:15 +01:00
Filipe
69bb78e39c
Merge pull request #13213 from chahmedejaz/task/13128-add-order-number-to-notify-producer-email
...
Add order number to notify producer emails and make customer code available for everyone
2025-04-29 18:22:06 +01:00
Filipe
bf2277b6da
Merge pull request #13255 from piyush828-design/pagy_upgrade
...
Upgrade pagy version to latest
2025-04-29 16:12:58 +01:00
Ahmed Ejaz
6f9b5e2c54
fix specs
...
- add a new class .line-items in the orders-summary to better differentiate the line-items summary vs customer-details. This css class is not defined, just .customer-order for customer details. It's only used to make a differentiation in the specs
- use the updated `parsed_email` memoized helper method for mail body content
2025-04-28 15:11:54 +05:00
Ahmed Ejaz
d9c15cf414
update locale to use lazy loading
2025-04-28 15:11:54 +05:00
Ahmed Ejaz
57c30591bc
13128: add order number in OC report
...
- Make Customer Code independant of Customer Names setting
2025-04-28 15:11:52 +05:00
cyrillefr
2dce79a93d
Fixes Rubocop HeredocDelimiterNaming offense
2025-04-28 09:47:55 +02:00
piyush828-design
0bb6860343
Merge branch 'master' into pagy_upgrade
2025-04-28 11:23:44 +05:30
David Cook
e900c95213
Merge pull request #13276 from filipefurtad0/pagy_pagination_spec
...
Adds coverage to pagination (pagy bump)
2025-04-28 13:18:58 +10:00
piyush828-design
5e890bb361
Merge branch 'master' into pagy_upgrade
2025-04-24 17:46:39 +05:30
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
cyrillefr
7e8661b936
Rename a set method in Post checkout service
2025-04-24 09:29:40 +02:00
cyrillefr
7812d5f58a
Replace set_methods in order model
2025-04-24 09:29:40 +02:00
cyrillefr
9996fcb54d
Strips set prefix from method in ProducerMailer
2025-04-24 09:29:40 +02:00
piyush828-design
6f2f8e9542
fixed users page breaking
2025-04-24 12:49:47 +05:30
Filipe
40d4b0c811
Merge pull request #13269 from drummer83/remove_txt-mails
...
Remove text versions of emails
2025-04-23 22:44:39 +01:00
filipefurtad0
c8a91a9d44
Fixes deprecation on trailing hashes for sort_link
...
Running the spec was pointing to the following deprecation - Passing two trailing hashes to is deprecated, merge the trailing hashes into a single one. (called at /home/ffurtado/openfoodnetwork/app/views/spree/admin/users/index.html.haml:16)
2025-04-23 19:45:06 +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
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
e1c6709472
Merge pull request #13251 from cyrillefr/FixRailsLexicallyScopedActionFilterPartI
...
Adresses Rails/LexicallyScoped offenses
2025-04-22 11:26:11 +10: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
piyush828-design
3202d0ea81
fixed test failure
2025-04-16 18:24:32 +05:30
piyush828-design
da5cef26db
upgraded pagy to latest version
2025-04-16 17:46:31 +05:30
piyush828-design
e76b001348
Upgrade pagy version to latest
2025-04-16 17:46:31 +05:30
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
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
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
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
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
François Turbelin
9529acd477
Adjust the regexp
2025-04-09 23:23:37 +02:00
François Turbelin
243d81c786
Revert "Improve the no-white-spaces regexp for enterprises"
...
This reverts commit baf89053638628052752f345b357d630d7484046.
2025-04-09 23:20:51 +02:00
