Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bexley][WW] Populate direct debit fields to pass to Agile #5376

Merged
merged 1 commit into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions perllib/FixMyStreet/Cobrand/Bexley/Garden.pm
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
for ( @{ $self->garden_service_ids } ) {
if ( my $srv = $services->{$_} ) {
$srv->{customer_external_ref}
= $customer->{CustomerExternalReference};
$srv->{end_date} = $end_date;
return $srv;

Check warning on line 68 in perllib/FixMyStreet/Cobrand/Bexley/Garden.pm

View check run for this annotation

Codecov / codecov/patch

perllib/FixMyStreet/Cobrand/Bexley/Garden.pm#L66-L68

Added lines #L66 - L68 were not covered by tests
}
}

Expand Down Expand Up @@ -179,21 +179,37 @@
};

if ($customer->{error}) {
$c->stash->{error} = $customer->{error};
return 0;

Check warning on line 183 in perllib/FixMyStreet/Cobrand/Bexley/Garden.pm

View check run for this annotation

Codecov / codecov/patch

perllib/FixMyStreet/Cobrand/Bexley/Garden.pm#L182-L183

Added lines #L182 - L183 were not covered by tests
}

my $contract = $i->create_contract($customer->{Id}, $contract_data);

if ($contract->{error}) {
$c->stash->{error} = $contract->{error};
return 0;

Check warning on line 190 in perllib/FixMyStreet/Cobrand/Bexley/Garden.pm

View check run for this annotation

Codecov / codecov/patch

perllib/FixMyStreet/Cobrand/Bexley/Garden.pm#L189-L190

Added lines #L189 - L190 were not covered by tests
}

# Store the customer and contract IDs for future reference
$report->set_extra_metadata('direct_debit_customer_id', $customer->{Id});
$report->set_extra_metadata('direct_debit_contract_id', $contract->{Id});
$report->set_extra_metadata('direct_debit_reference', $contract->{DirectDebitRef});

# 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;
Expand Down
8 changes: 8 additions & 0 deletions t/app/controller/waste_bexley_garden.t
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,10 @@ FixMyStreet::override_config {
is $report->get_extra_metadata('direct_debit_customer_id'), 'CUSTOMER123', 'Correct customer ID';
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->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';
};

subtest 'Test direct debit submission flow existing customer' => sub {
Expand Down Expand Up @@ -633,6 +637,10 @@ FixMyStreet::override_config {
is $report->get_extra_metadata('direct_debit_customer_id'), 'CUSTOMER456', 'Correct customer ID';
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->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';
};

subtest 'cancel garden subscription' => sub {
Expand Down
Loading