Gaetan Craig-Riou
6ff4c2c3aa
Disable submitting form with enter key
...
We need to the enter key available to create new tags
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
d6ed536eb7
Add example of component stimulus controller naming convention
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
3585499fba
Move tag list input to a component
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
352203747a
Add tag styling
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
87a80d3efe
Add Tags collumn
...
Currently display the list of tags, no fancy UI.
Updating works
2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou
d3b653b257
Add "variant_tag" to variant
2025-04-22 13:41:01 +10: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
François Turbelin
98251b306e
Improve the no-white-spaces regexp for enterprises
2025-04-09 22:34:25 +02:00
Gaetan Craig-Riou
6d78ee8be4
Fix rubocop warning
2025-04-09 22:34:23 +02:00
Filipe
9f988f7a02
Merge pull request #13216 from drummer83/email_header
...
Email header: Improve logo, resizing and styles
2025-04-09 12:00:09 +01:00
Filipe
c17821687d
Merge pull request #13243 from cyrillefr/GoButtonResumeEnabledAfterFailedReport
...
Fixes button staying disabled after report fail
2025-04-09 10:19:06 +01:00
Filipe
c3cb51441f
Merge pull request #13192 from dacook/display-customer-contacts-in-reports-13129
...
[FF] Add option to display customer contact details to suppliers in reports
2025-04-08 20:34:44 +01:00
cyrillefr
5c3db6cab8
Removes unused action from filter in controller
2025-04-08 14:04:37 +02:00
cyrillefr
019c703b1c
Fix Rubocop InverseOf offense in Order
...
- also fix failing spec due to adding inverse
2025-04-03 12:39:06 +02:00
Konrad
d42d86b763
Reduce max-width of logo to reflect the proposed aspect ratio of 640px / 130px (= 247px / 50px)
2025-04-01 18:37:59 +02:00
Konrad
3b0b023624
Remove unused styles
...
Class "btn": not used in any of the emails and invoices
Class "column-wrap": not used in any of the emails and invoices
Class "collapse": margin and padding are set globally to zero already, padding is not used, but we need margin to overwrite it for h6
2025-04-01 18:36:25 +02:00
Konrad
db3a8a6b30
Header: Improve logo, resizing and styles
...
Use the site's main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)
The table's background color is defined in the parent table already
Limit the max width and max height of the logo and resize the logo accordingly instead of forcing it to squeeze into a fixed size
2025-04-01 18:11:13 +02:00
cyrillefr
f0a5c76b45
Fixes button staying disabled after report fail
...
- added a test
2025-04-01 17:25:53 +02:00
Gaetan Craig-Riou
1279ab21a6
Fix delete fee logic
...
A fee can be associated to both the incoming and outgoing exchange, the
previous logic did not account for that, resulting in the fee not being
correctly removed.
Now the delete logic also check for the metadata enterprise role to see
if any additional fee need to be removed.
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
223faa5569
Move #recreate_all_fees! spec to HandleFeesService
...
Spree::Order just delegate Orders::HandleFeesService so there is no
point testing fees in the order spec
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
b5bc6b84d7
Update Orders::HandleFeesService#recreate_all_fees!
...
We now update or create line item fees instead of deleting them and
recreating them. This is to cover the case when a product has been
removed from an Order Cycle but we want to keep the fee already applied
on existing order. This was an issue only if the existing order got
updated after the product was removed.
2025-04-01 13:46:34 +11:00
