Skip to content

[Kingston] [Sutton] Staff user in CSV export. #5961

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.

Sign up for GitHub

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

Open
dracos wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Open

[Kingston] [Sutton] Staff user in CSV export. #5961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions perllib/FixMyStreet/Roles/Cobrand/KingstonSutton.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ sub dashboard_export_problems_add_columns {
uprn => 'UPRN',
user_email => 'User Email',
user_phone => 'User Phone',
staff_user => 'Staff User',
payment_method => 'Payment method',
payment_reference => 'Payment reference',
payment => 'Payment',
Expand All @@ -256,6 +257,8 @@ sub dashboard_export_problems_add_columns {
join => 'user',
});

my $user_lookup = $self->csv_staff_users;

$csv->csv_extra_data(sub {
my $report = shift;

Expand All @@ -265,6 +268,7 @@ sub dashboard_export_problems_add_columns {
} else {
my @fields = @{ $report->get_extra_fields() };
%fields = map { $_->{name} => $_->{value} } @fields;
$fields{contributed_by} = $report->get_extra_metadata('contributed_by');
}

my $detail = $csv->dbi ? $report->{detail} : $report->detail;
Expand All @@ -281,6 +285,7 @@ sub dashboard_export_problems_add_columns {
user_email => $report->user->email || '',
user_phone => $report->user->phone || '',
payment_reference => $report->get_extra_metadata('payment_reference') || '',
staff_user => $self->csv_staff_user_lookup($fields{contributed_by}, $user_lookup),
),
payment_method => $fields{payment_method} || '',
payment => $fields{payment},
Expand Down
2 changes: 2 additions & 0 deletions t/app/controller/waste_kingston.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,7 @@ FixMyStreet::override_config {
$mech->content_contains('a_user_2@example.net');
$mech->content_contains('unconfirmed');
$mech->content_contains('4000,,1500,1915,1,2'); # Fee/fee/fee/bin/current/sub
$mech->content_contains('a_user@example.net,,pkg-tappcontrollerwaste_kingstont-staff@example.org');
};

subtest 'check CSV pregeneration' => sub {
Expand All @@ -1252,6 +1253,7 @@ FixMyStreet::override_config {
$mech->content_contains('a_user_2@example.net');
$mech->content_contains('unconfirmed');
$mech->content_contains('4000,,1500,1915,1,2'); # Fee/fee/fee/bin/current/sub
$mech->content_contains('a_user@example.net,,pkg-tappcontrollerwaste_kingstont-staff@example.org');
};

subtest 'check new sub price changes at fixed time' => sub {
Expand Down
Loading