Merge remote-tracking branch 'origin/bexley-ww-ggw-dd-fields' into co…

…mmercial-staging
mysociety · Feb 20, 2025 · 7e47c25 · 7e47c25
2 parents 08205ca + e44afa9
commit 7e47c25
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/perllib/FixMyStreet/Cobrand/Bexley/Garden.pm b/perllib/FixMyStreet/Cobrand/Bexley/Garden.pm
@@ -269,6 +269,22 @@ sub waste_setup_direct_debit {
     $report->set_extra_metadata('direct_debit_contract_id', $contract->{Id});
     $report->set_extra_metadata('direct_debit_reference', $contract->{DirectDebitRef});
     $report->confirm;
+
+    # To send to Agile
+    my $parser = DateTime::Format::Strptime->new( pattern => '%d/%m/%Y' );
+    my $start_date_str
+        = $parser->format_datetime( $c->stash->{payment_date} );
+    $report->update_extra_field(
+        {   name  => 'direct_debit_reference',
+            value => $contract->{DirectDebitRef},
+        }
+    );
+    $report->update_extra_field(
+        {   name  => 'direct_debit_start_date',
+            value => $start_date_str,
+        }
+    );
+
     $report->update;
 
     return 1;

diff --git a/t/app/controller/waste_bexley_garden.t b/t/app/controller/waste_bexley_garden.t
@@ -562,6 +562,11 @@ FixMyStreet::override_config {
         is $report->get_extra_metadata('direct_debit_reference'), 'APIRTM-DEFGHIJ1KL', 'Correct payer reference';
         is $report->state, 'confirmed', 'Report is confirmed';
 
+        is $report->get_extra_field_value('direct_debit_reference'),
+            'APIRTM-DEFGHIJ1KL', 'Reference set as extra field';
+        is $report->get_extra_field_value('direct_debit_start_date'),
+            '23/01/2023', 'Start date set as extra field';
+
         FixMyStreet::Script::Reports::send();
         my @emails = $mech->get_email;
         my $body = $mech->get_text_body_from_email($emails[1]);
@@ -572,7 +577,6 @@ FixMyStreet::override_config {
         like $body, qr/Bins to be delivered: 1/;
         like $body, qr/Total:.*?70/;
         $mech->clear_emails_ok;
-
     };
 
     subtest 'Test direct debit submission flow existing customer' => sub {
@@ -653,6 +657,10 @@ FixMyStreet::override_config {
         is $report->get_extra_metadata('direct_debit_contract_id'), 'CONTRACT123', 'Correct contract ID';
         is $report->get_extra_metadata('direct_debit_reference'), 'APIRTM-DEFGHIJ1KL', 'Correct payer reference';
         is $report->state, 'confirmed', 'Report is confirmed';
+        is $report->get_extra_field_value('direct_debit_reference'),
+            'APIRTM-DEFGHIJ1KL', 'Reference set as extra field';
+        is $report->get_extra_field_value('direct_debit_start_date'),
+            '23/01/2023', 'Start date set as extra field';
 
         FixMyStreet::Script::Reports::send();
         my @emails = $mech->get_email;