[Waste] [Bromley] Don't cancel bookings without payment if staff crea…

…ted.
mysociety · Nov 9, 2023 · 971875d · 971875d
1 parent 4209729
commit 971875d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -1225,6 +1225,7 @@ sub cancel_bulky_collections_without_payment {
             created  => { '<'  => $cutoff_date },
             external_id => { '!=', undef },
             state => [ FixMyStreet::DB::Result::Problem->open_states ],
+            -not => { extra => { '@>' => '{"contributed_as":"another_user"}' } },
             -or => [
                 extra => undef,
                 -not => { extra => { '\?' => 'payment_reference' } }

diff --git a/t/app/controller/waste_bromley_bulky.t b/t/app/controller/waste_bromley_bulky.t
@@ -589,9 +589,18 @@ FixMyStreet::override_config {
         is $p->state, "confirmed";
         is $p->comments->count, 0;
 
-        # No payment - cancelled.
+        # No payment but made by staff - not cancelled.
+        $p->set_extra_metadata( contributed_as => 'another_user' );
         $p->unset_extra_metadata('payment_reference');
         $p->update;
+        $cobrand->cancel_bulky_collections_without_payment({ commit => 1 });
+        $p->discard_changes;
+        is $p->state, "confirmed";
+        is $p->comments->count, 0;
+
+        # No payment non-staff - cancelled.
+        $p->unset_extra_metadata('contributed_as');
+        $p->update;
         $cobrand->cancel_bulky_collections_without_payment({ commit => 1});
         $p->discard_changes;
         is $p->state, "closed";