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

Fix some annoyances with joins

Browse source
This commit is contained in:
Tom Bloor 2019-07-15 04:50:46 +01:00
parent ed2b6970f4
commit 43808f5510
No known key found for this signature in database
GPG key ID: 4657C7EBE42CC5CC
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Pear/LocalLoop/Controller/Api/External.pm
View file

@ -303,27 +303,27 @@ sub post_supplier_history {
order_by => { '-asc' => 'organisation.name' }, order_by => { '-asc' => 'organisation.name' },
} }
); );
my $quarter_year_rs = $c->schema->resultset('Transaction')->search( my $quarter_year_rs = $c->schema->resultset('Entity')->search(
{ {
'me.purchase_time' => { 'sales.purchase_time' => {
-between => [ -between => [
$dtf->format_datetime($third), $dtf->format_datetime($third),
$dtf->format_datetime($last), $dtf->format_datetime($last),
], ],
}, },
'me.buyer_id' => $user->entity->id, 'sales.buyer_id' => $user->entity->id,
}, },
{ {
join => { seller => 'organisation' }, join => [ 'sales', 'organisation' ],
columns => [ columns => [
{ {
id => 'me.seller_id', id => 'me.id',
name => 'organisation.name', name => 'organisation.name',
count => \"COUNT(*)", count => \"COUNT(*)",
total_spend => { sum => 'me.value' }, total_spend => { sum => 'sales.value' },
} }
], ],
group_by => 'me.seller_id', group_by => [ 'me.id', 'organisation.name' ],
order_by => { '-asc' => 'organisation.name' }, order_by => { '-asc' => 'organisation.name' },
} }
); );