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
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
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
piyush828-design
6f2f8e9542
fixed users page breaking
2025-04-24 12:49:47 +05:30
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
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
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
e76b001348
Upgrade pagy version to latest
2025-04-16 17:46:31 +05:30
Ahmed Ejaz
4e2198cd4f
hide shipping icons from suppliers
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
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
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
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
David Cook
4402854a2a
AddEnableProducersToEditOrdersToEnterprises
...
With system spec for setting the preference. The enterprise edit page seems under-tested..
2025-03-31 16:16:27 +11:00
David Cook
02db30202b
Use rails form helper methods
...
This helps ensure the labels are attached to the radio buttons, so you can click on the words to select the option.
2025-03-31 16:16:27 +11:00
Filipe
37ef5d5b02
Merge pull request #13214 from chahmedejaz/task/13179-expand-notes-edit-order
...
Fix expand notes field when editing order
2025-03-28 16:43:29 +00:00
Maikel Linke
c60718feea
List absent products in import preview
2025-03-27 13:36:48 +11:00
Maikel Linke
11be8360e3
Prettier and localised display of import stats
2025-03-27 13:36:47 +11:00
Maikel Linke
a6c08fe2ad
Reset stock for absent products in DFC catalog
2025-03-27 13:36:47 +11:00
Filipe
9fa42cae47
Merge pull request #13143 from mkllnk/admin-in-same-tab
...
Open admin dashboard in same tab by default
2025-03-25 17:10:51 +00:00
Ahmed Ejaz
806965b2cd
add textarea field plus the preformatted tag to display paragraph formatting in the notes
2025-03-24 00:43:07 +05:00
Maikel Linke
dc749092b4
Simplify authorisation required email
2025-03-20 09:58:46 +11:00
Ahmed Ejaz
86f5385aec
13179: fix notes field length issue
...
- notes field was a children of label element
- due to this its size was bound by the label element
- now this commit makes it a sibling, making it occupy the width of column width
2025-03-16 16:00:56 +05:00
David Cook
b5065de7d9
Update app/views/checkout/_tabs.html.haml
...
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com >
2025-03-12 10:01:45 +11:00
Maikel Linke
64a8b5845a
Add feature toggle open_in_same_tab for admin dashboard
...
This allows us to test what users actually want.
2025-03-11 16:38:51 +11:00
David Cook
55cbe51592
Prevent Turbo pre-fetch which changes cart state
2025-03-11 16:19:34 +11:00
Maikel Linke
caf40e7301
Open admin dashboard in same tab by default
2025-03-11 16:13:27 +11:00
Konrad
6d67a913d9
Merge pull request #13147 from dacook/cleanup
...
Speed up super admin dashboard
2025-03-04 18:09:20 +01:00
Konrad
fcc9e3dc8b
Merge pull request #13171 from cyrillefr/EnterpriseFeesPageTrueInsteadOfBlankOption
...
Remove true as select default first option
2025-03-04 18:07:24 +01:00
David Cook
9adf3a22af
Show only first 25 enterprises
...
I thought about reducing it further, but maybe people are used to having a large list. Let's see how this performs
2025-03-03 14:46:24 +01:00
David Cook
b9aada47e0
Remove superfluous %div from haml ID elements
...
Div is the default element in HAML, so we don't need to specify it.
2025-03-03 14:46:24 +01:00
David Cook
5a1190cdda
Remove superfluous %div from haml elements with class
...
Div is the default element in HAML, so we don't need to specify it. https://haml.info/docs/yardoc/file.REFERENCE.html#implicit-div-elements
2025-03-03 14:46:24 +01:00
Filipe
feccef0b36
Merge pull request #13157 from drummer83/email_styled_password
...
Create styled email for reset password instructions
2025-02-27 16:53:04 -06:00
Filipe
cf3213cf96
Merge pull request #13168 from dacook/dfc-product-import-select-all-12301
...
[DFC Orders] Select/deselect all on DFC Product Import
2025-02-27 16:43:37 -06:00
cyrillefr
96d6718e6d
Remove true as select default first option
2025-02-21 14:20:59 +01:00
Filipe
9baed8536c
Merge pull request #13121 from rioug/13054-out-of-stock-autoremove
...
Autoremove/update item from the cart if stock changed during checkout
2025-02-20 22:35:40 -06:00
