diff --git a/perllib/FixMyStreet/Roles/Cobrand/Paye.pm b/perllib/FixMyStreet/Roles/Cobrand/Paye.pm index 24080f398b4..4ae58a9fda2 100644 --- a/perllib/FixMyStreet/Roles/Cobrand/Paye.pm +++ b/perllib/FixMyStreet/Roles/Cobrand/Paye.pm @@ -77,6 +77,10 @@ around waste_cc_get_redirect_url => sub { lineId => $self->waste_cc_payment_admin_fee_line_item_ref($p), }; } + my $email = $p->get_extra_metadata('contributed_as') + && ($p->get_extra_metadata('contributed_as') eq 'another_user' || $p->get_extra_metadata('contributed_as') eq 'anonymous_user') + ? '' + : $p->user->email; my %args = ( returnUrl => $c->uri_for_action('/waste/pay_complete', [ $p->id, $redirect_id ] ) . '', backUrl => $backUrl, @@ -84,7 +88,7 @@ around waste_cc_get_redirect_url => sub { request_id => $p->id, description => $p->title, name => $p->name, - email => $p->user->email, + email => $email, uprn => $p->uprn, address1 => shift @parts, address2 => shift @parts, diff --git a/t/app/controller/waste_bexley_bulky.t b/t/app/controller/waste_bexley_bulky.t index f5c9395b72f..6b40d84a86d 100644 --- a/t/app/controller/waste_bexley_bulky.t +++ b/t/app/controller/waste_bexley_bulky.t @@ -615,6 +615,7 @@ FixMyStreet::override_config { like $mech2->res->previous->header('Location'), qr/paye.example.org/; my ($token, $report, $report_id) = get_report_from_redirect($sent_params->{returnUrl}); + is $sent_params->{email}, $user->email, 'user email address used for paye'; is $sent_params->{items}[0]{reference}, 'bulky-customer-ref'; is $sent_params->{narrative}, "Bulky waste - $report_id"; is $call_params->{'temp:request'}{sale}{receiptDetails}{name}{surname}, 'Bob Marge'; diff --git a/t/app/controller/waste_bexley_garden.t b/t/app/controller/waste_bexley_garden.t index 2ce999fd68f..5b18139b2cb 100644 --- a/t/app/controller/waste_bexley_garden.t +++ b/t/app/controller/waste_bexley_garden.t @@ -3017,6 +3017,7 @@ FixMyStreet::override_config { my ($token, $report, $report_id) = get_report_from_redirect($sent_params->{returnUrl}); + is $sent_params->{email}, '', 'Blank email when staff make report'; is $sent_params->{narrative}, "Garden Waste Service Payment - Reference: " . $report_id . " Contract: 10001", 'Custom narrative was used for paye.net payment'; };