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

Merge branch 'master' into development

Browse source
This commit is contained in:
Finn 2018-01-18 14:26:18 +00:00
commit 41928e1ff6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Pear/LocalLoop/Controller/Admin/Categories.pm
View file

@ -19,7 +19,7 @@ sub create {
my $c = shift; my $c = shift;
my $validation = $c->validation; my $validation = $c->validation;
$validation->required('category', 'trim')->like(qr/^[\w]*$/)->not_in_resultset('name', $c->result_set); $validation->required('category', 'trim')->not_in_resultset('name', $c->result_set);
my $category_name = $validation->param('category'); my $category_name = $validation->param('category');

2
lib/Pear/LocalLoop/Controller/Api/Stats.pm
View file

@ -93,7 +93,7 @@ sub post_customer {
my @all_weeks = $week_transaction_rs->all; my @all_weeks = $week_transaction_rs->all;
my $first = $all_weeks[0]->get_column('count') || 0; my $first = $all_weeks[0]->get_column('count') || 0;
my $second = $all_weeks[1]->get_column('count') || 0; my $second = defined $all_weeks[1] ? $all_weeks[1]->get_column('count') || 0 : 0;
my $max = max( map { $_->get_column('count') } @all_weeks ); my $max = max( map { $_->get_column('count') } @all_weeks );
my $sum = sum( map { $_->get_column('count') } @all_weeks ); my $sum = sum( map { $_->get_column('count') } @all_weeks );
my $count = $week_transaction_rs->count; my $count = $week_transaction_rs->count;