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

Added endpoints for organisation sector

Browse source
This commit is contained in:
Finn 2017-08-25 15:25:52 +01:00
parent 06e89c9199
commit ff263374ec
8 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ sub add_org_submit {
$validation->required('name');
$validation->optional('street_name');
$validation->required('town');
$validation->optional('sector');
$validation->optional('postcode')->postcode;
if ( $validation->has_error ) {
@ -43,6 +44,7 @@ sub add_org_submit {
name => $validation->param('name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'),
});
} finally {
@ -78,6 +80,7 @@ sub valid_edit {
$validation->required('name');
$validation->required('street_name');
$validation->required('town');
$validation->optional('sector');
$validation->required('postcode')->postcode;
if ( $validation->has_error ) {
@ -94,6 +97,7 @@ sub valid_edit {
name => $validation->param('name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'),
});
} );

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

@ -68,6 +68,7 @@ sub edit {
$validation->required('name');
$validation->required('street_name');
$validation->required('town');
$validation->optional('sector');
}
if ( $validation->has_error ) {
@ -107,6 +108,7 @@ sub edit {
name => $validation->param('name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'),
});
$user->update({

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

@ -75,6 +75,7 @@ sub post_register{
$validation->required('name');
$validation->required('street_name');
$validation->required('town');
$validation->required('sector');
}
return $c->api_validation_error if $validation->has_error;
@ -112,6 +113,7 @@ sub post_register{
name => $validation->param('name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'),
});
$c->schema->resultset('User')->create({

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

@ -128,6 +128,7 @@ sub post_account_update {
$validation->required('name');
$validation->required('street_name');
$validation->required('town');
$validation->required('sector');
}
return $c->api_validation_error if $validation->has_error;
@ -154,6 +155,7 @@ sub post_account_update {
name => $validation->param('name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'),
});
$user->update({

4
lib/Pear/LocalLoop/Schema/Result/Organisation.pm
View file

@ -34,6 +34,10 @@ __PACKAGE__->add_columns(
size => 16,
is_nullable => 1,
},
sector => {
data_type => "varchar",
size => 1,
is_nullable => 1,
);
__PACKAGE__->set_primary_key('id');

1
templates/admin/organisations/add_org.html.ep
View file

@ -21,6 +21,7 @@
<li class="list-group-item"><input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name"></li>
<li class="list-group-item"><input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name"></li>
<li class="list-group-item"><input id="town" type="text" class="form-control" placeholder="Town" name="town"></li>
<li class="list-group-item"><input id="sector" type="text" class="form-control" placeholder="Sector Area Code" name="sector"></li>
<li class="list-group-item"><input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode"></li>
<li class="list-group-item"><button class="btn btn-success" type="submit">Add Organisation</button></li>
</form>

1
templates/admin/organisations/valid_read.html.ep
View file

@ -20,6 +20,7 @@
<li class="list-group-item"><input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name" value="<%= $valid_org->name %>"></li>
<li class="list-group-item"><input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name" value="<%= $valid_org->street_name %>"></li>
<li class="list-group-item"><input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $valid_org->town %>"></li>
<li class="list-group-item"><input id="sector" type="text" class="form-control" placeholder="Sector Letter Code" name="sector" value="<%= $valid_org->sector %>"></li>
<li class="list-group-item"><input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode" value="<%= $valid_org->postcode %>"></li>
<li class="list-group-item"><button class="btn btn-success" type="submit">Edit Organisation</button></li>
</form>

4
templates/admin/users/read.html.ep
View file

@ -72,6 +72,10 @@
<label for="town">Town</label>
<input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $org_rs->town %>">
</div>
<div class="form-group">
<label for="town">Town</label>
<input id="town" type="sector" class="form-control" placeholder="Sector Area Code" name="sector" value="<%= $org_rs->sector %>">
</div>
% } else {
<h3 class="card-header">
User is not a customer or an organisation