Commit Graph

32369 Commits

Author SHA1 Message Date
drummer83
424666249e Reorganise en.yml after rebase 2024-09-21 13:20:37 +02:00
drummer83
966ddaae36 Improve greeting and intro styling to use less different font sizes and less bold formatting 2024-09-21 13:20:37 +02:00
drummer83
4fffe4b9c8 Improve producer mail
Adjust styling (added h4) to order summary table in order confirmation email etc.

Add 'Total:' to last row of table and make the last row bold.
2024-09-21 13:20:37 +02:00
drummer83
3b3968bdb1 Improve report mail
Slightly rephrase wording regarding download link and expiry.

Make text and link for download a callout (light blue box).
2024-09-21 13:20:37 +02:00
drummer83
184105ef71 Improve enterprise mails
Make messages with required user action callouts (light blue boxes), i.e. 'How to find the admin area' and 'Contact Enterprise XYZ if you don't know why you are invited to be a manager'.

Extend the 'How to find the admin area' text to small screens but recommend using large screens at the same time.
2024-09-21 13:20:37 +02:00
drummer83
2b1e8627a5 Improve subscription mails
All customer facing mails: Rephrase wording regarding contact email.

Order placement email: Replace 'Order confirmation' with 'Order summary' because the order is confirmed when the order cycle closes.

The rest are styling and wording improvements.
2024-09-21 13:20:37 +02:00
drummer83
f46e284ef0 Improve payment mails
Authorization required mail (to shop): Add order summary table to email.

Authorize payment email (to customer): Add order summary table to email.

The order summary tables require the checkout_helper in the payment_mailer.rb.

Add 'Order summary' string to shared strings, because this will be needed in the order placement mailer for subscriptions as well (instead of 'Order confirmation').

The rest are styling and wording improvements.
2024-09-21 13:20:37 +02:00
drummer83
4727e94eba Improve shipping mails
Replace simple table with proper order summary table. This requires the checkout_helper.

Add order number to email content
2024-09-21 13:20:37 +02:00
drummer83
bf7663b5ca Improve order mails
Move order summary table to a shared folder to use it in other mailers as well, e.g. shipment mailer.
Don't see reason to use fixed width of 25 % for price column in order summary table.
Introduce class 'subsection' to allow for easier styling of shipping/pick-up information and special customer instructions (notes during checkout).
Introduce class 'detail' to allow styling of the payments list in emails without affecting the payments list in invoices.
Display section 'Payment method description' only if there is a description available.

Order confirmation email for shop: Add customer info headline and rearrange customer info

Order cancellation email for shop: Add distributor to intro. Add order summary table (I think this can be useful in case of cancellations.)

Invoice email: Add order number to intro

Order cancellation email: Rephrase wording
2024-09-21 13:20:37 +02:00
drummer83
d5b0f1330a Improve user mails
Signup confirmation email: Remove text 'Use send feedback button' (because it doesn't exist)

Reset password instructions email: Use link label instead of raw link (more common these days) and remove corresponding text 'Copy & paste the link'
2024-09-21 13:20:37 +02:00
drummer83
b786d386f1 Simplify producer mailer
The method is used only once and therefore not required
2024-09-21 13:20:37 +02:00
drummer83
d91b48a01b Fix incorrect laguage of order confirmation email for shop
The mail was sent in the customer's language, but it should be sent in the shop owner's language
2024-09-21 13:20:37 +02:00
drummer83
581627cd3f Add translations to shipment mailer to send the mail in the customer's language 2024-09-21 13:20:37 +02:00
drummer83
e70142fb17 Add a 'reply to' email address where it makes sense and has been missing until now 2024-09-21 13:20:37 +02:00
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
678e556063 Fix some missing quotation marks in the email parts of the en.yml file to follow the conventions 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
Maikel Linke
f6e4b107b0 Update all locales with the latest Transifex translations v4.6.6 2024-09-20 09:46:02 +10: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
David Cook
f8bb33a9e8 Merge pull request #12869 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-8.0.10
Bump @hotwired/turbo from 8.0.6 to 8.0.10
2024-09-19 09:19:24 +10:00
dependabot[bot]
24a25d31a0 Bump @hotwired/turbo from 8.0.6 to 8.0.10
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 8.0.6 to 8.0.10.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/8.0.6...v8.0.10)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-18 09:50:44 +00:00
David Cook
4822a9ebcd Merge pull request #12868 from rioug/fix-buu-permission
[BUU] Add missing permission check on product actions
2024-09-18 17:25:24 +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
296997d558 Test to ensure report abilities 2024-09-17 13:23:14 +10: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
David Cook
1078e7cd36 Update specs
The key here is the enterprise_relationship. This is required for the supplier to have permission to see the orders.

Curiously, the unit test still passes. All will be revealed in the next commit..
2024-09-17 12:55:22 +10:00