Commit Graph

6582 Commits

Author SHA1 Message Date
drummer83
03ccd862d3 Re-arrange the email parts of the en.yml file to make the content structure follow the file structure and enable more lazy lookup throughout the files.
After re-arranging the locale file, the keys in the code needed to be adapted accordingly.
2024-09-21 13:20:37 +02:00
drummer83
57d2251886 Add forgotten text about setting a password after receiving the invitation email as an enterprise manager
The 'invite manager' functionality was introduced in #2189. I searched for a decision to not use the 'set a password' text, but couldn't find one. So I assume it was forgotten. In my opinion it actually makes sense to have this information added.
2024-09-21 13:20:37 +02:00
drummer83
a84a16dd69 Add signoff to all remaining emails which didn't have one yet
To do so the shipment mailer and payment mailers need to know the @order

Remove the 'callout' class from distributor signoff for uniformity and to keep the callout available for call to actions only

Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
64fed25d9d Create, re-arrange and use some shared translation keys
Shared keys are used for greetings, signoffs, order confirmation string (incl. order number), contact distributor note and order edit note

Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
fc8331e78b Add new partial to subscription_mailers and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
68ceee2651 Add new partial to report_mailer and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
e5c0efd9a4 Add new partial to producer_mailer and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
20ac1f20b2 Add new partial to payment_mailers and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
2283b63ed1 Add new partial to enterprise_mailers and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
ab05431343 Add new partial to order_mailers and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
ffa0f278ac Add new partial to shipment_mailer and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
09eef0487f Add new partial to test_mailer and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
df63cc08d8 Add new partial to user_mailers and re-organize used translation keys
Remaining translation keys for emails will be re-organized in a separate commit
2024-09-21 13:20:37 +02:00
drummer83
2baf6c18b2 Add new partial for greeting, intro text and logo (if present) to use in ALL emails
Adjust maximum size of logo and improve responsive behaviour on small screens (display logo centered and above text)
2024-09-21 13:20:37 +02:00
drummer83
30ed5af9f6 Quick beautification of test email 2024-09-21 13:20:37 +02:00
drummer83
4d998becca Delete text versions of emails
Reduces the effort to maintain emails.
2024-09-21 13:19:25 +02:00
drummer83
4ee7889cce Create styled email for reset password instructions 2024-09-21 12:46:29 +02:00
drummer83
ac7090817c Improve email footer of all emails
Use wrap style full width background like header

Move 'Powered by...' message to footer and rephrase to suit all recipients (not shoppers only)

Always show link to openfoodnetwork.org instead of email (if present) because email will be available via icon in the row below now

Add social media buttons of instance to email footer

Make footer text and icons dark gray (as instance name in email header)
2024-09-21 12:46:29 +02:00
drummer83
129ce66194 Header: Improve logo, resizing and styles
User the sites main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)

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

Update specs
2024-09-21 12:46:29 +02:00
Filipe
83ab9594f6 Merge pull request #12854 from chahmedejaz/task/11200-conditionally-hide-producer-column
[BUU2] Hide producer column when there's only one producer in the admin account
2024-09-19 15:42:15 -06:00
Gaetan Craig-Riou
3f6aaa74cc Remove duplicated styling for tabs
It uses the same styling as #admin now share via mixins
2024-09-13 14:14:30 +10:00
Gaetan Craig-Riou
67f037280a Add comment in shop view file
It wasn't possible to directly reuse the shopfront views because they
are still using angular.
2024-09-11 14:50:37 +10:00
Gaetan Craig-Riou
7e84d41e8c Simplify modal opening by just rendering the modal in turbo stream 2024-09-11 14:20:41 +10:00
Ahmed Ejaz
f8d3467d46 11200: add specs 2024-09-11 01:59:43 +05:00
Ahmed Ejaz
1580d539df 11200: coniditonally hide producer column 2024-09-11 00:56:52 +05:00
Gaetan Craig-Riou
379e5acfe5 Fix product preview modal opening
The previous solution failed to take into account that it would have been
trigger on any turbo steam rendering action, not just the product preview
one. Now the open event is dispatched when the product preview
controller is connected, which happens when the modal html is rendered.
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
5bf6bdf7f0 Fix some display issue with long description 2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
8de7c304fe Add AdminTooltipComponent
I left the stimulus controller separated as it is generic enough
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
b6695ba9a2 Add product preview on product edit page
Plus translation
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
e8de76dc46 Add style for Shop
As before, move imported css to partials to avoid duplication. And use
mixin and variable to handle tooltip styling
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
d56ab9257b Add tab switch and shop tab 2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
f24a4edc68 Add product detail to the modal 2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
27dd5def57 Open modal before rendering the received html
This way we don't see a blank modal waiting for the content to load
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
561f4648d2 Improve tooltip partial
Set up default value optiona locals variable
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
64d3091db9 Add product preview modal
Plus open modal when clicking on "preview" link.
It's using event to communicate between stimulus controller :
https://stimulus.hotwired.dev/reference/controllers#cross-controller-coordination-with-events
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
4756ab47c2 Wire preview link via turbo-stream 2024-09-10 13:29:39 +10:00
Ahmed Ejaz
983addff0d 12777: use unit_to_display method for variant unit
- This method prioritize display_as and after that considers options_text
2024-09-05 10:49:45 +02:00
Konrad
afc4c1e967 Merge pull request #12760 from wandji20/wb-OFN-12744
UX improvements for creation of new products [OFN-12744]
2024-08-29 17:22:36 +02:00
Konrad
ae993784d8 Merge pull request #12813 from chahmedejaz/task/12810-increase-price-column-width
[BUU] Fix the too Narrow Price field
2024-08-29 15:22:27 +02:00
Filipe
2817b8891e Merge pull request #12814 from dacook/buu/cell-padding
Increase column space in bulk products table
2024-08-28 21:30:03 -06:00
Konrad
0c2dcbc50d Merge pull request #12812 from chahmedejaz/bugfix/12809-irresponsive-products-column-widths
[BUU] Fix Table width not responsive to the amount of selected columns
2024-08-28 16:45:07 +02:00
David Cook
5324747f89 Reduce cell padding
This is closer to the original design:
* 6px between inputs
* 6px vertical padding on condensed rows
* 12px vertical padding on relaxed rows

Note that 'relaxed' rows are now smaller than the regular rows, which was not the original intention. But we haven't got spare time to do a broader review of table styles right now.
2024-08-26 16:53:19 +10:00
Ahmed Ejaz
d9c79ee49c 12810: increase price width
- make it to 10% which makes sure that any price value acceptable by the system is displayed fully
- Reduce On Hand to 8% to make up for some space for the above
2024-08-24 17:37:59 +05:00
Ahmed Ejaz
d1f9b0855d 12809: fix the class name for the producer column in product 2024-08-24 02:05:04 +05:00
wandji20
94b98867d8 Revert use of searchableDropdownComponent for product unit 2024-08-23 09:57:37 +01:00
wandji20
35ef1b9c7f Refactor new product dropdown to use SeachableDropdown component [OFN-12744] 2024-08-23 09:57:37 +01:00
wandji20
d61acd2cc1 Unify error messages and display on new product form [OFN-12744] 2024-08-23 09:57:37 +01:00
Maikel
e9c7e1778c Merge pull request #12782 from mkllnk/reports
Add fallback report loading in case websockets fail
2024-08-23 09:23:42 +10:00
wandji20
8f7505d53d Refactor oc datetime content partial and include warning modal in oc list [OFN-12775] 2024-08-22 22:17:12 +01:00
Filipe
ef9ca33913 Merge pull request #12772 from drummer83/E500_sub
Display admin order page instead of shopfront order page to avoid error 500
2024-08-22 13:26:20 -06:00