Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

amended upload to allow for validation changes

Browse source
This commit is contained in:
Finn 2018-03-13 12:55:13 +00:00
parent 29eaa291c5
commit 0cb3426825
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Pear/LocalLoop/Controller/Api/Transactions.pm
View file

@ -30,6 +30,10 @@ sub post_transaction_list_purchases {
}, },
); );
my $recurring_transactions = $c->schema->resultset('TransactionRecurring')->search({
buyer_id => $user->id,
});
# purchase_time needs timezone attached to it # purchase_time needs timezone attached to it
my @transaction_list = ( my @transaction_list = (
map {{ map {{
@ -39,9 +43,22 @@ sub post_transaction_list_purchases {
}} $transactions->all }} $transactions->all
); );
my @recurring_transaction_list = (
map {{
seller => $_->seller->name,
value => $_->value / 100000,
start_time => $c->format_iso_datetime($_->start_time),
last_updated => $c->format_iso_datetime($_->last_updated),
essential => $_->essential,
category => $_->category->category->name,
recurring_period => $_->recurring_period,
}} $recurring_transactions->all
);
return $c->render( json => { return $c->render( json => {
success => Mojo::JSON->true, success => Mojo::JSON->true,
transactions => \@transaction_list, transactions => \@transaction_list,
recurring_transactions => \@recurring_transaction_list,
page_no => $transactions->pager->total_entries, page_no => $transactions->pager->total_entries,
}); });
} }

6
lib/Pear/LocalLoop/Controller/Api/Upload.pm
View file

@ -147,7 +147,7 @@ sub post_upload {
# Unknown Organisation # Unknown Organisation
$validation->required('organisation_name'); $validation->required('organisation_name');
$validation->optional('street_name'); $validation->optional('street_name');
$validation->required('town'); $validation->optional('town');
$validation->optional('postcode')->postcode; $validation->optional('postcode')->postcode;
return $c->api_validation_error if $validation->has_error; return $c->api_validation_error if $validation->has_error;
@ -198,7 +198,7 @@ sub post_upload {
( defined $file ? ( proof_image => $file ) : () ), ( defined $file ? ( proof_image => $file ) : () ),
purchase_time => $c->format_db_datetime($purchase_time), purchase_time => $c->format_db_datetime($purchase_time),
essential => ( defined $essential ? $essential : 0 ), essential => ( defined $essential ? $essential : 0 ),
distance => $distance, distance => ( defined $category ? $category : undef ),
} }
); );
@ -227,7 +227,7 @@ sub post_upload {
value => $transaction_value * 100000, value => $transaction_value * 100000,
start_time => $c->format_db_datetime($purchase_time), start_time => $c->format_db_datetime($purchase_time),
essential => ( defined $essential ? $essential : 0 ), essential => ( defined $essential ? $essential : 0 ),
distance => $distance, distance => ( defined $category ? $category : undef ),
category_id => ( defined $category ? $category : undef ), category_id => ( defined $category ? $category : undef ),
recurring_period => $recurring_period, recurring_period => $recurring_period,
}); });