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

Merge pull request #87 from Pear-Trading/finn/applegacy

Browse source 
reverted fix and did different fix to order_by
This commit is contained in:
Finn 2017-12-18 15:50:17 +00:00 committed by GitHub
commit 6484ef277a
3 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Pear/LocalLoop/Controller/Admin/Reports.pm
View file

@ -18,10 +18,7 @@ sub transaction_data {
columns => [ columns => [
{ {
quantised => $quantised_column, quantised => $quantised_column,
count => $c->pg_or_sqlite( count => \"COUNT(*)",
'count',
"COUNT(*)",
),
sum_distance => $c->pg_or_sqlite( sum_distance => $c->pg_or_sqlite(
'SUM("me"."distance")', 'SUM("me"."distance")',
'SUM("me"."distance")', 'SUM("me"."distance")',

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

@ -86,10 +86,7 @@ sub post_customer {
columns => [ columns => [
{ {
quantised => 'quantised_weeks', quantised => 'quantised_weeks',
count => $c->pg_or_sqlite( count => \"COUNT(*)",
'count',
"COUNT(*)",
),
} }
], ],
group_by => 'quantised_weeks', group_by => 'quantised_weeks',
@ -106,13 +103,10 @@ sub post_customer {
join => { 'seller' => 'organisation' }, join => { 'seller' => 'organisation' },
columns => { columns => {
sector => "organisation.sector", sector => "organisation.sector",
count => $c->pg_or_sqlite( count => \"COUNT(*)",
'count',
"COUNT(*)",
),
}, },
group_by => "organisation.sector", group_by => "organisation.sector",
order_by => { '-desc' => "COUNT(*)" }, order_by => { '-desc' => $c->pg_or_sqlite('count',"COUNT(*)",)},
} }
); );

5
lib/Pear/LocalLoop/Controller/Api/V1/Customer/Graphs.pm
View file

@ -112,10 +112,7 @@ sub _purchases_avg_spend_duration {
columns => [ columns => [
{ {
quantised => 'quantised_days', quantised => 'quantised_days',
count => $c->pg_or_sqlite( count => \"COUNT(*)",
'count',
"COUNT(*)",
),
sum_value => $c->pg_or_sqlite( sum_value => $c->pg_or_sqlite(
'SUM("me"."value")', 'SUM("me"."value")',
'SUM("me"."value")', 'SUM("me"."value")',