Merge pull request #94 from Pear-Trading/Release-v0.10.2

Release v0.10.2

.travis.yml

@@ -1,13 +1,18 @@
 sudo: false
 
 language: perl
+
+#addons:
+#  postgresql: "9.6"
+
 perl:
   - "5.20"
 env:
   - HARNESS_PERL_SWITCHES="-MDevel::Cover"
 install:
-  - cpanm --quiet --notest --installdeps .
+  - cpanm --quiet --notest --installdeps . #--with-feature=postgres .
   - cpanm Devel::Cover
 script:
   - prove -lr
+    #- PEAR_TEST_PG=1 prove -lr
   - cover

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 # Next Release
 
+# v0.10.2
+
+* Added fairly traded column for organisations
+* **Admin Fix** Fix issue with setting location on Admin side
+
 # v0.10.1
 
 * Added API for customer graphs

lib/Pear/LocalLoop/Controller/Admin/Organisations.pm

@@ -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' );
@@ -49,6 +50,11 @@ sub add_org_submit {
 
   my $organisation;
 
+  my $location = $c->get_location_from_postcode(
+    $validation->param('postcode'),
+    'organisation',
+  );
+
   try {
     my $entity = $c->schema->resultset('Entity')->create({
       organisation => {
@@ -57,9 +63,11 @@ sub add_org_submit {
         town         => $validation->param('town'),
         sector       => $validation->param('sector'),
         postcode     => $validation->param('postcode'),
+        ( defined $location ? ( %$location ) : ( latitude => undef, longitude => undef ) ),
         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 +86,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 +117,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');
 
@@ -119,6 +128,11 @@ sub valid_edit {
 
   my $valid_org = $c->schema->resultset('Organisation')->find( $c->param('id') );
 
+  my $location = $c->get_location_from_postcode(
+    $validation->param('postcode'),
+    'organisation',
+  );
+
   try {
     $c->schema->storage->txn_do( sub {
       $valid_org->update({
@@ -127,8 +141,10 @@ sub valid_edit {
         town        => $validation->param('town'),
         sector      => $validation->param('sector'),
         postcode    => $validation->param('postcode'),
+        ( defined $location ? ( %$location ) : ( latitude => undef, longitude => undef ) ),
         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'),

lib/Pear/LocalLoop/Schema.pm

@@ -6,7 +6,7 @@ use warnings;
 
 use base 'DBIx::Class::Schema';
 
-our $VERSION = 18;
+our $VERSION = 19;
 
 __PACKAGE__->load_namespaces;
 

lib/Pear/LocalLoop/Schema/Result/Organisation.pm

@@ -59,6 +59,11 @@ __PACKAGE__->add_columns(
     default => undef,
     is_nullable => 1,
   },
+  is_fair => {
+    data_type => 'boolean',
+    default => undef,
+    is_nullable => 1,
+  },
   submitted_by_id => {
     data_type => 'integer',
     is_nullable => 1,

share/ddl/PostgreSQL/deploy/19/001-auto-__VERSION.sql

@@ -0,0 +1,18 @@
+-- 
+-- Created by SQL::Translator::Producer::PostgreSQL
+-- Created on Tue Jan  2 19:51:55 2018
+-- 
+;
+--
+-- Table: dbix_class_deploymenthandler_versions
+--
+CREATE TABLE "dbix_class_deploymenthandler_versions" (
+  "id" serial NOT NULL,
+  "version" character varying(50) NOT NULL,
+  "ddl" text,
+  "upgrade_sql" text,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "dbix_class_deploymenthandler_versions_version" UNIQUE ("version")
+);
+
+;

share/ddl/PostgreSQL/deploy/19/001-auto.sql

@@ -0,0 +1,330 @@
+-- 
+-- Created by SQL::Translator::Producer::PostgreSQL
+-- Created on Tue Jan  2 19:51:55 2018
+-- 
+;
+--
+-- Table: account_tokens
+--
+CREATE TABLE "account_tokens" (
+  "id" serial NOT NULL,
+  "name" text NOT NULL,
+  "used" integer DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "account_tokens_name" UNIQUE ("name")
+);
+
+;
+--
+-- Table: entities
+--
+CREATE TABLE "entities" (
+  "id" serial NOT NULL,
+  "type" character varying(255) NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+;
+--
+-- Table: gb_postcodes
+--
+CREATE TABLE "gb_postcodes" (
+  "outcode" character(4) NOT NULL,
+  "incode" character(3) DEFAULT '' NOT NULL,
+  "latitude" numeric(7,5),
+  "longitude" numeric(7,5),
+  PRIMARY KEY ("outcode", "incode")
+);
+
+;
+--
+-- Table: import_sets
+--
+CREATE TABLE "import_sets" (
+  "id" serial NOT NULL,
+  "date" timestamp NOT NULL,
+  PRIMARY KEY ("id")
+);
+
+;
+--
+-- Table: leaderboards
+--
+CREATE TABLE "leaderboards" (
+  "id" serial NOT NULL,
+  "name" character varying(255) NOT NULL,
+  "type" character varying(255) NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "leaderboards_type" UNIQUE ("type")
+);
+
+;
+--
+-- Table: customers
+--
+CREATE TABLE "customers" (
+  "id" serial NOT NULL,
+  "entity_id" integer NOT NULL,
+  "display_name" character varying(255) NOT NULL,
+  "full_name" character varying(255) NOT NULL,
+  "year_of_birth" integer NOT NULL,
+  "postcode" character varying(16) NOT NULL,
+  "latitude" numeric(5,2),
+  "longitude" numeric(5,2),
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "customers_idx_entity_id" on "customers" ("entity_id");
+
+;
+--
+-- Table: entity_association
+--
+CREATE TABLE "entity_association" (
+  "id" serial NOT NULL,
+  "entity_id" integer NOT NULL,
+  "lis" boolean,
+  "esta" boolean,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "entity_association_idx_entity_id" on "entity_association" ("entity_id");
+
+;
+--
+-- Table: leaderboard_sets
+--
+CREATE TABLE "leaderboard_sets" (
+  "id" serial NOT NULL,
+  "leaderboard_id" integer NOT NULL,
+  "date" timestamp NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "leaderboard_sets_idx_leaderboard_id" on "leaderboard_sets" ("leaderboard_id");
+
+;
+--
+-- Table: organisations
+--
+CREATE TABLE "organisations" (
+  "id" serial NOT NULL,
+  "entity_id" integer NOT NULL,
+  "name" character varying(255) NOT NULL,
+  "street_name" text,
+  "town" character varying(255) NOT NULL,
+  "postcode" character varying(16),
+  "country" character varying(255),
+  "sector" character varying(1),
+  "pending" boolean DEFAULT false NOT NULL,
+  "is_local" boolean,
+  "is_fair" boolean,
+  "submitted_by_id" integer,
+  "latitude" numeric(8,5),
+  "longitude" numeric(8,5),
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "organisations_idx_entity_id" on "organisations" ("entity_id");
+
+;
+--
+-- Table: transactions
+--
+CREATE TABLE "transactions" (
+  "id" serial NOT NULL,
+  "buyer_id" integer NOT NULL,
+  "seller_id" integer NOT NULL,
+  "value" numeric(100,0) NOT NULL,
+  "proof_image" text,
+  "submitted_at" timestamp NOT NULL,
+  "purchase_time" timestamp NOT NULL,
+  "distance" numeric(15),
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "transactions_idx_buyer_id" on "transactions" ("buyer_id");
+CREATE INDEX "transactions_idx_seller_id" on "transactions" ("seller_id");
+
+;
+--
+-- Table: users
+--
+CREATE TABLE "users" (
+  "id" serial NOT NULL,
+  "entity_id" integer NOT NULL,
+  "email" text NOT NULL,
+  "join_date" timestamp NOT NULL,
+  "password" character varying(100) NOT NULL,
+  "is_admin" boolean DEFAULT false NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "users_email" UNIQUE ("email")
+);
+CREATE INDEX "users_idx_entity_id" on "users" ("entity_id");
+
+;
+--
+-- Table: feedback
+--
+CREATE TABLE "feedback" (
+  "id" serial NOT NULL,
+  "user_id" integer NOT NULL,
+  "submitted_at" timestamp NOT NULL,
+  "feedbacktext" text NOT NULL,
+  "app_name" character varying(255) NOT NULL,
+  "package_name" character varying(255) NOT NULL,
+  "version_code" character varying(255) NOT NULL,
+  "version_number" character varying(255) NOT NULL,
+  "actioned" boolean DEFAULT false NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "feedback_idx_user_id" on "feedback" ("user_id");
+
+;
+--
+-- Table: import_lookups
+--
+CREATE TABLE "import_lookups" (
+  "id" serial NOT NULL,
+  "set_id" integer NOT NULL,
+  "name" character varying(255) NOT NULL,
+  "entity_id" integer NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "import_lookups_idx_entity_id" on "import_lookups" ("entity_id");
+CREATE INDEX "import_lookups_idx_set_id" on "import_lookups" ("set_id");
+
+;
+--
+-- Table: organisation_payroll
+--
+CREATE TABLE "organisation_payroll" (
+  "id" serial NOT NULL,
+  "org_id" integer NOT NULL,
+  "submitted_at" timestamp NOT NULL,
+  "entry_period" timestamp NOT NULL,
+  "employee_amount" integer NOT NULL,
+  "local_employee_amount" integer NOT NULL,
+  "gross_payroll" numeric(100,0) NOT NULL,
+  "payroll_income_tax" numeric(100,0) NOT NULL,
+  "payroll_employee_ni" numeric(100,0) NOT NULL,
+  "payroll_employer_ni" numeric(100,0) NOT NULL,
+  "payroll_total_pension" numeric(100,0) NOT NULL,
+  "payroll_other_benefit" numeric(100,0) NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "organisation_payroll_idx_org_id" on "organisation_payroll" ("org_id");
+
+;
+--
+-- Table: session_tokens
+--
+CREATE TABLE "session_tokens" (
+  "id" serial NOT NULL,
+  "token" character varying(255) NOT NULL,
+  "user_id" integer NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "session_tokens_token" UNIQUE ("token")
+);
+CREATE INDEX "session_tokens_idx_user_id" on "session_tokens" ("user_id");
+
+;
+--
+-- Table: import_values
+--
+CREATE TABLE "import_values" (
+  "id" serial NOT NULL,
+  "set_id" integer NOT NULL,
+  "user_name" character varying(255) NOT NULL,
+  "purchase_date" timestamp NOT NULL,
+  "purchase_value" character varying(255) NOT NULL,
+  "org_name" character varying(255) NOT NULL,
+  "transaction_id" integer,
+  "ignore_value" boolean DEFAULT false NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id");
+CREATE INDEX "import_values_idx_transaction_id" on "import_values" ("transaction_id");
+
+;
+--
+-- Table: leaderboard_values
+--
+CREATE TABLE "leaderboard_values" (
+  "id" serial NOT NULL,
+  "entity_id" integer NOT NULL,
+  "set_id" integer NOT NULL,
+  "position" integer NOT NULL,
+  "value" numeric(100,0) NOT NULL,
+  "trend" integer DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "leaderboard_values_entity_id_set_id" UNIQUE ("entity_id", "set_id")
+);
+CREATE INDEX "leaderboard_values_idx_entity_id" on "leaderboard_values" ("entity_id");
+CREATE INDEX "leaderboard_values_idx_set_id" on "leaderboard_values" ("set_id");
+
+;
+--
+-- Foreign Key Definitions
+--
+
+;
+ALTER TABLE "customers" ADD CONSTRAINT "customers_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
+
+;
+ALTER TABLE "entity_association" ADD CONSTRAINT "entity_association_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
+
+;
+ALTER TABLE "leaderboard_sets" ADD CONSTRAINT "leaderboard_sets_fk_leaderboard_id" FOREIGN KEY ("leaderboard_id")
+  REFERENCES "leaderboards" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "organisations" ADD CONSTRAINT "organisations_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
+
+;
+ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
+  REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_seller_id" FOREIGN KEY ("seller_id")
+  REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "users" ADD CONSTRAINT "users_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
+
+;
+ALTER TABLE "feedback" ADD CONSTRAINT "feedback_fk_user_id" FOREIGN KEY ("user_id")
+  REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "import_lookups" ADD CONSTRAINT "import_lookups_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION DEFERRABLE;
+
+;
+ALTER TABLE "import_lookups" ADD CONSTRAINT "import_lookups_fk_set_id" FOREIGN KEY ("set_id")
+  REFERENCES "import_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "organisation_payroll" ADD CONSTRAINT "organisation_payroll_fk_org_id" FOREIGN KEY ("org_id")
+  REFERENCES "organisations" ("id") DEFERRABLE;
+
+;
+ALTER TABLE "session_tokens" ADD CONSTRAINT "session_tokens_fk_user_id" FOREIGN KEY ("user_id")
+  REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "import_values" ADD CONSTRAINT "import_values_fk_set_id" FOREIGN KEY ("set_id")
+  REFERENCES "import_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "import_values" ADD CONSTRAINT "import_values_fk_transaction_id" FOREIGN KEY ("transaction_id")
+  REFERENCES "transactions" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION DEFERRABLE;
+
+;
+ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;
+ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_set_id" FOREIGN KEY ("set_id")
+  REFERENCES "leaderboard_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+;

share/ddl/PostgreSQL/upgrade/18-19/001-auto.sql

@@ -0,0 +1,12 @@
+-- Convert schema 'share\ddl\_source\deploy\18\001-auto.yml' to 'share\ddl\_source\deploy\19\001-auto.yml':;
+
+;
+BEGIN;
+
+;
+ALTER TABLE organisations ADD COLUMN is_fair boolean;
+
+;
+
+COMMIT;
+

share/ddl/SQLite/deploy/18/001-auto.sql

@@ -95,7 +95,7 @@ CREATE TABLE organisations (
   postcode varchar(16),
   country varchar(255),
   sector varchar(1),
-  pending boolean NOT NULL DEFAULT false,
+  pending boolean NOT NULL DEFAULT 0,
   is_local boolean,
   submitted_by_id integer,
   latitude decimal(8,5),
@@ -129,7 +129,7 @@ CREATE TABLE users (
   email text NOT NULL,
   join_date datetime NOT NULL,
   password varchar(100) NOT NULL,
-  is_admin boolean NOT NULL DEFAULT false,
+  is_admin boolean NOT NULL DEFAULT 0,
   FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
 );
 CREATE INDEX users_idx_entity_id ON users (entity_id);
@@ -146,7 +146,7 @@ CREATE TABLE feedback (
   package_name varchar(255) NOT NULL,
   version_code varchar(255) NOT NULL,
   version_number varchar(255) NOT NULL,
-  actioned boolean NOT NULL DEFAULT false,
+  actioned boolean NOT NULL DEFAULT 0,
   FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 CREATE INDEX feedback_idx_user_id ON feedback (user_id);
@@ -204,7 +204,7 @@ CREATE TABLE import_values (
   purchase_value varchar(255) NOT NULL,
   org_name varchar(255) NOT NULL,
   transaction_id integer,
-  ignore_value boolean NOT NULL DEFAULT false,
+  ignore_value boolean NOT NULL DEFAULT 0,
   FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
   FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE NO ACTION ON UPDATE NO ACTION
 );

share/ddl/SQLite/deploy/19/001-auto-__VERSION.sql

@@ -0,0 +1,18 @@
+-- 
+-- Created by SQL::Translator::Producer::SQLite
+-- Created on Tue Jan  2 19:51:55 2018
+-- 
+
+;
+BEGIN TRANSACTION;
+--
+-- Table: dbix_class_deploymenthandler_versions
+--
+CREATE TABLE dbix_class_deploymenthandler_versions (
+  id INTEGER PRIMARY KEY NOT NULL,
+  version varchar(50) NOT NULL,
+  ddl text,
+  upgrade_sql text
+);
+CREATE UNIQUE INDEX dbix_class_deploymenthandler_versions_version ON dbix_class_deploymenthandler_versions (version);
+COMMIT;

share/ddl/SQLite/deploy/19/001-auto.sql

@@ -0,0 +1,230 @@
+-- 
+-- Created by SQL::Translator::Producer::SQLite
+-- Created on Tue Jan  2 19:51:55 2018
+-- 
+
+;
+BEGIN TRANSACTION;
+--
+-- Table: account_tokens
+--
+CREATE TABLE account_tokens (
+  id INTEGER PRIMARY KEY NOT NULL,
+  name text NOT NULL,
+  used integer NOT NULL DEFAULT 0
+);
+CREATE UNIQUE INDEX account_tokens_name ON account_tokens (name);
+--
+-- Table: entities
+--
+CREATE TABLE entities (
+  id INTEGER PRIMARY KEY NOT NULL,
+  type varchar(255) NOT NULL
+);
+--
+-- Table: gb_postcodes
+--
+CREATE TABLE gb_postcodes (
+  outcode char(4) NOT NULL,
+  incode char(3) NOT NULL DEFAULT '',
+  latitude decimal(7,5),
+  longitude decimal(7,5),
+  PRIMARY KEY (outcode, incode)
+);
+--
+-- Table: import_sets
+--
+CREATE TABLE import_sets (
+  id INTEGER PRIMARY KEY NOT NULL,
+  date datetime NOT NULL
+);
+--
+-- Table: leaderboards
+--
+CREATE TABLE leaderboards (
+  id INTEGER PRIMARY KEY NOT NULL,
+  name varchar(255) NOT NULL,
+  type varchar(255) NOT NULL
+);
+CREATE UNIQUE INDEX leaderboards_type ON leaderboards (type);
+--
+-- Table: customers
+--
+CREATE TABLE customers (
+  id INTEGER PRIMARY KEY NOT NULL,
+  entity_id integer NOT NULL,
+  display_name varchar(255) NOT NULL,
+  full_name varchar(255) NOT NULL,
+  year_of_birth integer NOT NULL,
+  postcode varchar(16) NOT NULL,
+  latitude decimal(5,2),
+  longitude decimal(5,2),
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
+);
+CREATE INDEX customers_idx_entity_id ON customers (entity_id);
+--
+-- Table: entity_association
+--
+CREATE TABLE entity_association (
+  id INTEGER PRIMARY KEY NOT NULL,
+  entity_id integer NOT NULL,
+  lis boolean,
+  esta boolean,
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
+);
+CREATE INDEX entity_association_idx_entity_id ON entity_association (entity_id);
+--
+-- Table: leaderboard_sets
+--
+CREATE TABLE leaderboard_sets (
+  id INTEGER PRIMARY KEY NOT NULL,
+  leaderboard_id integer NOT NULL,
+  date datetime NOT NULL,
+  FOREIGN KEY (leaderboard_id) REFERENCES leaderboards(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX leaderboard_sets_idx_leaderboard_id ON leaderboard_sets (leaderboard_id);
+--
+-- Table: organisations
+--
+CREATE TABLE organisations (
+  id INTEGER PRIMARY KEY NOT NULL,
+  entity_id integer NOT NULL,
+  name varchar(255) NOT NULL,
+  street_name text,
+  town varchar(255) NOT NULL,
+  postcode varchar(16),
+  country varchar(255),
+  sector varchar(1),
+  pending boolean NOT NULL DEFAULT 0,
+  is_local boolean,
+  is_fair boolean,
+  submitted_by_id integer,
+  latitude decimal(8,5),
+  longitude decimal(8,5),
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
+);
+CREATE INDEX organisations_idx_entity_id ON organisations (entity_id);
+--
+-- Table: transactions
+--
+CREATE TABLE transactions (
+  id INTEGER PRIMARY KEY NOT NULL,
+  buyer_id integer NOT NULL,
+  seller_id integer NOT NULL,
+  value numeric(100,0) NOT NULL,
+  proof_image text,
+  submitted_at datetime NOT NULL,
+  purchase_time datetime NOT NULL,
+  distance numeric(15),
+  FOREIGN KEY (buyer_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  FOREIGN KEY (seller_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX transactions_idx_buyer_id ON transactions (buyer_id);
+CREATE INDEX transactions_idx_seller_id ON transactions (seller_id);
+--
+-- Table: users
+--
+CREATE TABLE users (
+  id INTEGER PRIMARY KEY NOT NULL,
+  entity_id integer NOT NULL,
+  email text NOT NULL,
+  join_date datetime NOT NULL,
+  password varchar(100) NOT NULL,
+  is_admin boolean NOT NULL DEFAULT 0,
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
+);
+CREATE INDEX users_idx_entity_id ON users (entity_id);
+CREATE UNIQUE INDEX users_email ON users (email);
+--
+-- Table: feedback
+--
+CREATE TABLE feedback (
+  id INTEGER PRIMARY KEY NOT NULL,
+  user_id integer NOT NULL,
+  submitted_at datetime NOT NULL,
+  feedbacktext text NOT NULL,
+  app_name varchar(255) NOT NULL,
+  package_name varchar(255) NOT NULL,
+  version_code varchar(255) NOT NULL,
+  version_number varchar(255) NOT NULL,
+  actioned boolean NOT NULL DEFAULT 0,
+  FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX feedback_idx_user_id ON feedback (user_id);
+--
+-- Table: import_lookups
+--
+CREATE TABLE import_lookups (
+  id INTEGER PRIMARY KEY NOT NULL,
+  set_id integer NOT NULL,
+  name varchar(255) NOT NULL,
+  entity_id integer NOT NULL,
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX import_lookups_idx_entity_id ON import_lookups (entity_id);
+CREATE INDEX import_lookups_idx_set_id ON import_lookups (set_id);
+--
+-- Table: organisation_payroll
+--
+CREATE TABLE organisation_payroll (
+  id INTEGER PRIMARY KEY NOT NULL,
+  org_id integer NOT NULL,
+  submitted_at datetime NOT NULL,
+  entry_period datetime NOT NULL,
+  employee_amount integer NOT NULL,
+  local_employee_amount integer NOT NULL,
+  gross_payroll numeric(100,0) NOT NULL,
+  payroll_income_tax numeric(100,0) NOT NULL,
+  payroll_employee_ni numeric(100,0) NOT NULL,
+  payroll_employer_ni numeric(100,0) NOT NULL,
+  payroll_total_pension numeric(100,0) NOT NULL,
+  payroll_other_benefit numeric(100,0) NOT NULL,
+  FOREIGN KEY (org_id) REFERENCES organisations(id)
+);
+CREATE INDEX organisation_payroll_idx_org_id ON organisation_payroll (org_id);
+--
+-- Table: session_tokens
+--
+CREATE TABLE session_tokens (
+  id INTEGER PRIMARY KEY NOT NULL,
+  token varchar(255) NOT NULL,
+  user_id integer NOT NULL,
+  FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX session_tokens_idx_user_id ON session_tokens (user_id);
+CREATE UNIQUE INDEX session_tokens_token ON session_tokens (token);
+--
+-- Table: import_values
+--
+CREATE TABLE import_values (
+  id INTEGER PRIMARY KEY NOT NULL,
+  set_id integer NOT NULL,
+  user_name varchar(255) NOT NULL,
+  purchase_date datetime NOT NULL,
+  purchase_value varchar(255) NOT NULL,
+  org_name varchar(255) NOT NULL,
+  transaction_id integer,
+  ignore_value boolean NOT NULL DEFAULT 0,
+  FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX import_values_idx_set_id ON import_values (set_id);
+CREATE INDEX import_values_idx_transaction_id ON import_values (transaction_id);
+--
+-- Table: leaderboard_values
+--
+CREATE TABLE leaderboard_values (
+  id INTEGER PRIMARY KEY NOT NULL,
+  entity_id integer NOT NULL,
+  set_id integer NOT NULL,
+  position integer NOT NULL,
+  value numeric(100,0) NOT NULL,
+  trend integer NOT NULL DEFAULT 0,
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+  FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+CREATE INDEX leaderboard_values_idx_entity_id ON leaderboard_values (entity_id);
+CREATE INDEX leaderboard_values_idx_set_id ON leaderboard_values (set_id);
+CREATE UNIQUE INDEX leaderboard_values_entity_id_set_id ON leaderboard_values (entity_id, set_id);
+COMMIT;

share/ddl/SQLite/upgrade/18-19/001-auto.sql

@@ -0,0 +1,12 @@
+-- Convert schema 'share\ddl\_source\deploy\18\001-auto.yml' to 'share\ddl\_source\deploy\19\001-auto.yml':;
+
+;
+BEGIN;
+
+;
+ALTER TABLE organisations ADD COLUMN is_fair boolean;
+
+;
+
+COMMIT;
+

share/ddl/_source/deploy/19/001-auto-__VERSION.yml

@@ -0,0 +1,91 @@
+---
+schema:
+  procedures: {}
+  tables:
+    dbix_class_deploymenthandler_versions:
+      constraints:
+        - deferrable: 1
+          expression: ''
+          fields:
+            - id
+          match_type: ''
+          name: ''
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields: []
+          reference_table: ''
+          type: PRIMARY KEY
+        - deferrable: 1
+          expression: ''
+          fields:
+            - version
+          match_type: ''
+          name: dbix_class_deploymenthandler_versions_version
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields: []
+          reference_table: ''
+          type: UNIQUE
+      fields:
+        ddl:
+          data_type: text
+          default_value: ~
+          is_nullable: 1
+          is_primary_key: 0
+          is_unique: 0
+          name: ddl
+          order: 3
+          size:
+            - 0
+        id:
+          data_type: int
+          default_value: ~
+          is_auto_increment: 1
+          is_nullable: 0
+          is_primary_key: 1
+          is_unique: 0
+          name: id
+          order: 1
+          size:
+            - 0
+        upgrade_sql:
+          data_type: text
+          default_value: ~
+          is_nullable: 1
+          is_primary_key: 0
+          is_unique: 0
+          name: upgrade_sql
+          order: 4
+          size:
+            - 0
+        version:
+          data_type: varchar
+          default_value: ~
+          is_nullable: 0
+          is_primary_key: 0
+          is_unique: 1
+          name: version
+          order: 2
+          size:
+            - 50
+      indices: []
+      name: dbix_class_deploymenthandler_versions
+      options: []
+      order: 1
+  triggers: {}
+  views: {}
+translator:
+  add_drop_table: 0
+  filename: ~
+  no_comments: 0
+  parser_args:
+    sources:
+      - __VERSION
+  parser_type: SQL::Translator::Parser::DBIx::Class
+  producer_args: {}
+  producer_type: SQL::Translator::Producer::YAML
+  show_warnings: 0
+  trace: 0
+  version: 0.11021

t/api/stats.t

@@ -55,6 +55,7 @@ $t->post_ok('/api/stats/customer' => json => {
     sum => 118,
     count => 7,
     })
+  ->or($framework->dump_error)
   ->json_is('/sectors', {
     sectors => ['A'],
     purchases => [118],

templates/admin/organisations/add_org.html.ep

@@ -55,6 +55,24 @@
           <input id="pending" type="checkbox" name="pending" value="0">
         </div>
       </div>
+      <div class="form-group row">
+        <label for="local" class="col-md-4 col-form-label">Is Local</label>
+        <div class="col-md-8">
+          <select id="local" class="form-control" name="is_local">
+            <option value="0"<%= !$valid_org->is_local ? '' : ' selected' %>>Non Local</option>
+            <option value="1"<%= $valid_org->is_local ? ' selected' : '' %>>Local</option>
+          </select>
+        </div>
+      </div>
+      <div class="form-group row">
+        <label for="local" class="col-md-4 col-form-label">Is Fairly Traded</label>
+        <div class="col-md-8">
+          <select id="local" class="form-control" name="is_fair">
+            <option value="0"<%= !$valid_org->is_fair ? '' : ' selected' %>>Non Fairly Traded</option>
+            <option value="1"<%= $valid_org->is_fair ? ' selected' : '' %>>Fairly Traded</option>
+          </select>
+        </div>
+      </div>
       <div class="form-group row">
         <div class="ml-auto col-sm-10">
           <button class="btn btn-success" type="submit">Save Changes To Organisation</button>

templates/admin/organisations/list.html.ep

@@ -38,6 +38,13 @@
             % } else {
             <span class="badge badge-secondary">Non Local Org</span>
             % }
+            % if ( !defined $org_result->is_fair ) {
+            <span class="badge badge-danger">Fair Trading Status Not Set</span>
+            % } elsif ( $org_result->is_fair ) {
+            <span class="badge badge-success">Fairly Trading Org</span>
+            % } else {
+            <span class="badge badge-secondary">Non Fairly Trading Org</span>
+            % }
           </div>
         </a>
         % }

templates/admin/organisations/valid_read.html.ep

@@ -126,6 +126,15 @@ function initMap() {
               </select>
             </div>
           </div>
+          <div class="form-group row">
+            <label for="local" class="col-md-4 col-form-label">Is Fairly Traded</label>
+            <div class="col-md-8">
+              <select id="local" class="form-control" name="is_fair">
+                <option value="0"<%= !$valid_org->is_fair ? '' : ' selected' %>>Non Fairly Traded</option>
+                <option value="1"<%= $valid_org->is_fair ? ' selected' : '' %>>Fairly Traded</option>
+              </select>
+            </div>
+          </div>
           <div class="form-group row">
             <div class="ml-auto col-md-8">
               <button class="btn btn-success btn-block" type="submit">Save Changes To Organisation</button>