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

Merge branch 'development' into TBSliver/Schema-Changes

Browse source
This commit is contained in:
Tom Bloor 2017-08-31 13:07:23 +01:00
commit bd8b1f91a4
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/Pear/LocalLoop/Controller/Admin/Organisations.pm
View file

@ -65,6 +65,7 @@ sub valid_read {
undef, {
page => $c->param('page') || 1,
rows => 10,
order_by => { -desc => 'submitted_at' },
},
);
$c->stash(

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

@ -93,7 +93,7 @@ sub post_upload {
my $validation = $c->validation;
# Test for file before loading the JSON in to the validator
$validation->required('file')->upload->filetype('image/jpeg');
$validation->optional('file')->upload->filetype('image/jpeg');
$validation->input( $c->stash->{api_json} );
@ -162,14 +162,14 @@ sub post_upload {
my $upload = $validation->param('file');
my $purchase_time = $c->parse_iso_datetime($validation->param('purchase_time') || '');
$purchase_time ||= DateTime->now();
my $file = $c->store_file_from_upload( $upload );
my $file = defined $upload ? $c->store_file_from_upload( $upload ) : undef;
my $new_transaction = $organisation->create_related(
'transactions',
{
buyer => $user,
value => $transaction_value,
proof_image => $file,
( defined $file ? ( proof_image => $file ) : ( proof_image => 'a' ) ),
purchase_time => $c->format_db_datetime($purchase_time),
}
);