Commit Graph

16610 Commits

Author SHA1 Message Date
drummer83
778b3c3f59 Unify and improve email subjects for all emails
Some subjects had a prefix (e.g. [Instance]), some subjects were misleading (e.g. failed payment email had 'Order Confirmation', some can be clearer by adding information like order number, distributor or coordinator
2024-09-21 13:20:37 +02:00
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
d8072aa207 White labelling ALL customer facing emails
White labelling added for Order: cancellation email, Order: invoice email, Shipment: shipped email, Subscriptions: authorize payment email, Subscriptions: placement email, Subscriptions: empty order email, Subscriptions: failed payment email

White labelling existed already for Order: confirmation email, Subscriptions: order confirmation email
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
a5d17b4da9 Merge pull request #12459 from mkllnk/description-html
Sanitise HTML in long description of enterprise
2024-09-19 16:12:45 -06: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
Filipe
562a24524b Merge pull request #12848 from rioug/12770-product-preview
Product preview
2024-09-19 15:20:18 -06:00
Filipe
2809194b42 Merge pull request #12847 from dacook/fix-bug-12835
Fix bug #12835 for producer reports
2024-09-19 14:31:04 -06:00
Maikel
7d3eff2abb Merge pull request #12845 from wandji20/wb-OFN-12281
Fix- chore(deps): bump debounced from 0.0.5 to 1.0.2
2024-09-19 11:22:30 +10:00
Gaetan Craig-Riou
68fa903d61 Add missing permission check on buu action
Plus request spec
2024-09-18 10:24:09 +10:00
wandji20
c2e0c94f2e Remove unused debounced plugin 2024-09-17 11:56:07 +01:00
David Cook
a9ad6a2851 Grant product managers ability to create reports
We missed this in c31416c, oops.
2024-09-17 13:08:49 +10:00
Gaetan Craig-Riou
40c4d38e45 Add permission check 2024-09-17 12:01:53 +10:00
Gaetan Craig-Riou
a25937321a Remove ability of any admin user to see all product
And fix related spec
2024-09-17 11:46:55 +10:00
wandji20
a8db288425 Improve debounced initialised events 2024-09-17 01:56:44 +01: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
Ahmed Ejaz
5be53a40a9 11200: rename products scope 2024-09-11 11:54:38 +05:00
Ahmed Ejaz
76fdf3725a 11200: add explanations 2024-09-11 11:41:01 +05: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
776b9fcdab Re enable images partial import 2024-09-11 14:24:24 +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
55733555bf Add style for Product details
Only import relevant css, which has been move to their own partial to
avoid duplication
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
f59ee96011 Copy foundation-sites css relevant to the modal
The frontend is based on fondation-sites to provide responsive design,
we can't just import in the backend. So opted for copying the part we
needed
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
2b74bbd45d Add styling for tabs 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