From 2bc206dee568690467de5ead75172b4e7eaf41a0 Mon Sep 17 00:00:00 2001 From: Moray Jones Date: Wed, 27 Sep 2023 15:59:45 +0100 Subject: [PATCH] [SLWP] Make confirmation pages more like others. Move from bespoke Peterborough design for Kingston and Sutton and any other cobrands to more consistent waste layout for confirmation. --- .../waste/bulky/booking_cancellation.html | 46 +++++++----- .../web/base/waste/bulky/confirmation.html | 71 +++++++++++-------- .../waste/bulky/booking_cancellation.html | 20 ++++++ .../waste/bulky/confirmation.html | 35 +++++++++ 4 files changed, 127 insertions(+), 45 deletions(-) create mode 100644 templates/web/peterborough/waste/bulky/booking_cancellation.html create mode 100644 templates/web/peterborough/waste/bulky/confirmation.html diff --git a/templates/web/base/waste/bulky/booking_cancellation.html b/templates/web/base/waste/bulky/booking_cancellation.html index 40ee3b93efe..783fb657859 100644 --- a/templates/web/base/waste/bulky/booking_cancellation.html +++ b/templates/web/base/waste/bulky/booking_cancellation.html @@ -1,20 +1,32 @@ [% PROCESS 'waste/header.html' %] -[% IF property %] - [% INCLUDE 'waste/_address_display.html' %] -[% END %] -
-
- -
-
- Important information -

Your booking has been cancelled

-
Booking reference number
-
[% cancelling_booking.id %]
- [% IF entitled_to_refund %] -

Your refund is on its way.

- [% END %] - Go back home -
+
+

+ Your booking has been cancelled +

+
+ [% IF entitled_to_refund %] +

Your refund is on its way.

+ [% END %] +

If you need to contact us about your application please use the application reference:  + [%~ IF cobrand.moniker == 'sutton' ~%] + LBS- + [%~ ELSIF cobrand.moniker == 'kingston' ~%] + RBK- + [%~ END ~%] + [%~ cancelling_booking.id %] +

+
+ +[% IF (c.cobrand.moniker == 'kingston' OR c.cobrand.moniker == 'sutton') %] + [% button_text = 'Return to property details' %] +[% ELSE %] + [% button_text = 'Show upcoming bin days' %] +[% END %] + +

+ [% button_text %] +

+ +[% INCLUDE footer.html %] diff --git a/templates/web/base/waste/bulky/confirmation.html b/templates/web/base/waste/bulky/confirmation.html index fe2fb88ffae..6891e96ca6a 100644 --- a/templates/web/base/waste/bulky/confirmation.html +++ b/templates/web/base/waste/bulky/confirmation.html @@ -1,35 +1,50 @@ +[% +IF report.category == 'Bulky collection'; + title = 'Bulky collection booking confirmed'; +ELSIF report.category == 'Small items collection'; + title = 'Small items collection booking confirmed'; +ELSE; + title = 'Enquiry has been submitted'; +END ~%] + [% PROCESS 'waste/header.html' %] -
-
- -
-
- Important information -

Collection booked

-
-
Booking reference number
-
[% report.id %]
-
Date of collection
-
-

[% cobrand.bulky_nice_collection_date(report) %]

- - Item collection starts from [% cobrand.bulky_nice_collection_time %]. - Please have your items ready and dismantled if required. - -
- [% IF reference %] -
Payment reference
-
[% reference %]
- [% END %] -
- [% message %] +
+

+ [% title %] +

+
+

Our contractor will collect the items you have requested on [% cobrand.bulky_nice_collection_date(report) %].

+

Item collection starts from [% cobrand.bulky_nice_collection_time %]. Please have your items ready and dismantled if required.

[% IF report.user.email AND report.get_extra_metadata('contributed_as') != 'anonymous_user' %] -

We have sent you an email confirming this booking.

-

Can’t find our email? Check your spam folder.

+

We have emailed confirmation of your booking to [% report.user.email %].

+ [% END %] +

If you need to contact us about your application please use the application reference:  + [%~ IF cobrand.moniker == 'sutton' ~%] + LBS- + [%~ ELSIF cobrand.moniker == 'kingston' ~%] + RBK- + [%~ END ~%] + [%~ report.id %] +

+ [% IF reference %] +

+ Card payment reference: [% reference %] +

[% END %] - Go back home -
+
+[% IF (c.cobrand.moniker == 'kingston' OR c.cobrand.moniker == 'sutton') %] + [% button_text = 'Return to property details' %] +[% ELSE %] + [% button_text = 'Show upcoming bin days' %] +[% END %] + +

+ [% # sometimes we have the property on the stash, sometimes it's just the report (e.g. token confirmation) + property_id = property.id OR report.get_extra_field_value('property_id') %] + [% button_text %] +

+ [% INCLUDE footer.html %] diff --git a/templates/web/peterborough/waste/bulky/booking_cancellation.html b/templates/web/peterborough/waste/bulky/booking_cancellation.html new file mode 100644 index 00000000000..40ee3b93efe --- /dev/null +++ b/templates/web/peterborough/waste/bulky/booking_cancellation.html @@ -0,0 +1,20 @@ +[% PROCESS 'waste/header.html' %] +[% IF property %] + [% INCLUDE 'waste/_address_display.html' %] +[% END %] + +
+
+ +
+
+ Important information +

Your booking has been cancelled

+
Booking reference number
+
[% cancelling_booking.id %]
+ [% IF entitled_to_refund %] +

Your refund is on its way.

+ [% END %] + Go back home +
+
diff --git a/templates/web/peterborough/waste/bulky/confirmation.html b/templates/web/peterborough/waste/bulky/confirmation.html new file mode 100644 index 00000000000..fe2fb88ffae --- /dev/null +++ b/templates/web/peterborough/waste/bulky/confirmation.html @@ -0,0 +1,35 @@ +[% PROCESS 'waste/header.html' %] + +
+
+ +
+
+ Important information +

Collection booked

+
+
Booking reference number
+
[% report.id %]
+
Date of collection
+
+

[% cobrand.bulky_nice_collection_date(report) %]

+ + Item collection starts from [% cobrand.bulky_nice_collection_time %]. + Please have your items ready and dismantled if required. + +
+ [% IF reference %] +
Payment reference
+
[% reference %]
+ [% END %] +
+ [% message %] + [% IF report.user.email AND report.get_extra_metadata('contributed_as') != 'anonymous_user' %] +

We have sent you an email confirming this booking.

+

Can’t find our email? Check your spam folder.

+ [% END %] + Go back home +
+
+ +[% INCLUDE footer.html %]