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

Added fairly trading org field and change org transactions to show

Browse source 
purchases not sales
This commit is contained in:
Tom Bloor 2018-01-02 19:57:12 +00:00
parent d4ff855251
commit 8be16867bb
No known key found for this signature in database
GPG key ID: 4657C7EBE42CC5CC
4 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ sub add_org_submit {
$validation->optional('postcode')->postcode;
$validation->optional('pending');
$validation->optional('is_local');
$validation->optional('is_fair');
if ( $validation->has_error ) {
$c->flash( error => 'The validation has failed' );
@ -60,6 +61,7 @@ sub add_org_submit {
submitted_by_id => $c->current_user->id,
pending => defined $validation->param('pending') ? 0 : 1,
is_local => $validation->param('is_local'),
is_fair => $validation->param('is_fair'),
},
type => 'organisation',
});
@ -78,7 +80,7 @@ sub add_org_submit {
sub valid_read {
my $c = shift;
my $valid_org = $c->schema->resultset('Organisation')->find( $c->param('id') );
my $transactions = $valid_org->entity->sales->search(
my $transactions = $valid_org->entity->purchases->search(
undef, {
page => $c->param('page') || 1,
rows => 10,
@ -109,6 +111,7 @@ sub valid_edit {
$validation->required('postcode')->postcode;
$validation->optional('pending');
$validation->optional('is_local');
$validation->optional('is_fair');
$validation->optional('is_lis');
$validation->optional('is_esta');
@ -129,6 +132,7 @@ sub valid_edit {
postcode => $validation->param('postcode'),
pending => defined $validation->param('pending') ? 0 : 1,
is_local => $validation->param('is_local'),
is_fair => $validation->param('is_fair'),
});
$valid_org->entity->update_or_create_related( 'associations', {
lis => $validation->param('is_lis'),