[Bromley] [Waste] No refunds for unpaid bulky bookings.

mysociety · Nov 17, 2023 · 4aff6ed · 4aff6ed
1 parent b951a75
commit 4aff6ed
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -1031,8 +1031,14 @@ sub bulky_location_text_prompt {
 
 sub bulky_minimum_charge { $_[0]->wasteworks_config->{per_item_min_collection_price} }
 
+sub bulky_booking_paid {
+    my ($self, $collection) = @_;
+    return $collection->get_extra_metadata('payment_reference');
+}
+
 sub bulky_can_refund_collection {
     my ($self, $collection) = @_;
+    return 0 if !$self->bulky_booking_paid($collection);
     return 0 if !$self->within_bulky_cancel_window($collection);
     return $self->bulky_refund_amount($collection) > 0;
 }
@@ -1047,7 +1053,7 @@ sub bulky_send_cancellation_confirmation {
             ],
 
             wasteworks_id => $collection_report->id,
-            payment_reference => $collection_report->get_extra_metadata('payment_reference'),
+            paid => $self->bulky_booking_paid($collection_report),
             refund_amount => $self->bulky_refund_amount($collection_report),
             collection_date => $self->bulky_nice_collection_date($collection_report),
         },

diff --git a/t/app/controller/waste_bromley_bulky.t b/t/app/controller/waste_bromley_bulky.t
@@ -455,6 +455,39 @@ FixMyStreet::override_config {
 
             $mech->clear_emails_ok();
 
+            subtest 'No payment yet made' => sub {
+                $report->unset_extra_metadata('payment_reference');
+                $report->update;
+                $mech->get_ok('/waste/12345/bulky/cancel/' . $report->id);
+                $mech->content_lacks('If you cancel you will be refunded £30.00');
+                $mech->submit_form_ok( { with_fields => { confirm => 1 } } );
+                $mech->content_contains('Your booking has been cancelled');
+                $mech->content_lacks('If you need to contact us about your application please use the application reference');
+
+                my $report_id = $report->id;
+                my $email = $mech->get_email;
+                subtest 'Sends cancellation confirmation' => sub {
+                    is $email->header('Subject'),
+                        'Cancelled bulky goods collection ' . $report_id,
+                        'Correct subject';
+                    is $email->header('To'),
+                        '"Bob Marge"' . ' <' . $report->user->email . '>',
+                        'Correct recipient';
+                    my $text = $email->as_string;
+                    like $text, qr/Bulky goods collection slot ${report_id}/, "Correct ID";
+                    like $text, qr/scheduled for 01 July/, "Correct scheduled time";
+                    unlike $text, qr/=C2=A30.01 will be refunded/, "Correct refund amount";
+                };
+
+                # No refund email
+
+                $report->discard_changes;
+                $report->set_extra_metadata(payment_reference => 12345);
+                $report->state('confirmed');
+                $report->update;
+                $mech->clear_emails_ok;
+            };
+
             subtest 'Refund info' => sub {
                 $mech->get_ok('/waste/12345/bulky/cancel/' . $report->id);
                 $mech->content_contains('If you cancel you will be refunded £30.00');
@@ -494,7 +527,7 @@ FixMyStreet::override_config {
                     '"Bob Marge"' . ' <' . $report->user->email . '>',
                     'Correct recipient';
                 my $text = $email->as_string;
-                like $text, qr/Bulky goods collection ${report_id}/, "Correct ID";
+                like $text, qr/Bulky goods collection slot ${report_id}/, "Correct ID";
                 like $text, qr/scheduled for 01 July/, "Correct scheduled time";
                 like $text, qr/=C2=A30.01 will be refunded/, "Correct refund amount";
             };

diff --git a/templates/email/bromley/waste/bulky-confirm-cancellation.txt b/templates/email/bromley/waste/bulky-confirm-cancellation.txt
@@ -1,9 +1,9 @@
 [% USE pounds = format('%.2f'); ~%]
 Subject: Cancelled bulky goods collection [% wasteworks_id %]
 
-Bulky goods collection [% wasteworks_id %] scheduled for [%collection_date %] has been cancelled.
+Bulky goods collection slot [% wasteworks_id %] scheduled for [%collection_date %] has been cancelled.
 
-[% IF refund_amount > 0 && payment_reference %]
+[% IF refund_amount > 0 && paid %]
 £[% pounds(refund_amount / 100) %] will be refunded.
 [% END %]