[Waste] Option to confirm bulky before payment.

This can be used in situations where the backend lets you then confirm that payment has been successful.
mysociety · Sep 22, 2023 · 2e49d60 · 2e49d60
1 parent b4653cb
commit 2e49d60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/perllib/FixMyStreet/App/Controller/Waste.pm b/perllib/FixMyStreet/App/Controller/Waste.pm
@@ -266,8 +266,10 @@ sub confirm_subscription : Private {
 
     $c->stash->{property_id} = $p->get_extra_field_value('property_id');
 
+    my $already_confirmed;
     if ($p->category eq 'Bulky collection') {
         $c->stash->{template} = 'waste/bulky/confirmation.html';
+        $already_confirmed = $c->cobrand->bulky_send_before_payment;
     } else {
         $c->stash->{template} = 'waste/garden/subscribe_confirm.html';
     }
@@ -277,7 +279,7 @@ sub confirm_subscription : Private {
     # rather than the default 'done' form one
     $c->stash->{override_template} = $c->stash->{template};
 
-    return unless $p->state eq 'unconfirmed';
+    return unless $p->state eq 'unconfirmed' || $already_confirmed;
 
     $p->update_extra_field( {
             name => 'LastPayMethod',

diff --git a/perllib/FixMyStreet/App/Controller/Waste/Bulky.pm b/perllib/FixMyStreet/App/Controller/Waste/Bulky.pm
@@ -222,7 +222,8 @@ sub process_bulky_data : Private {
             amend_extra_data($c, $c->stash->{report}, $data);
             $c->stash->{report}->update;
         } else {
-            $c->forward('/waste/add_report', [ $data, 1 ]) or return;
+            my $no_confirm = !$c->cobrand->bulky_send_before_payment;
+            $c->forward('/waste/add_report', [ $data, $no_confirm ]) or return;
         }
         if ( FixMyStreet->staging_flag('skip_waste_payment') ) {
             $c->stash->{message} = 'Payment skipped on staging';

diff --git a/perllib/FixMyStreet/Roles/CobrandBulkyWaste.pm b/perllib/FixMyStreet/Roles/CobrandBulkyWaste.pm
@@ -475,4 +475,6 @@ sub _bulky_send_reminder_email {
     }
 }
 
+sub bulky_send_before_payment { 0 }
+
 1;
-Original file line number
+Diff line change
@@ Expand Up / @@ -475,4 +475,6 @@ sub _bulky_send_reminder_email { @@
         }
     }
+    sub bulky_send_before_payment { 0 }
 ;