Merge pull request #75 from Pear-Trading/master

Master merge for v0.9.6
This commit is contained in:
Tom Bloor 2017-11-22 11:38:34 +00:00 committed by GitHub
commit 1fc275022a
6 changed files with 8 additions and 5 deletions

View file

@ -2,6 +2,8 @@
# Next Release # Next Release
# v0.9.6
* **Admin Feature** Merged organisation lists into one list * **Admin Feature** Merged organisation lists into one list
* **Admin Feature** Paginated Organisation listings * **Admin Feature** Paginated Organisation listings
* **Admin Feature** Added flags to Organisations listings * **Admin Feature** Added flags to Organisations listings
@ -13,6 +15,7 @@
* **Admin Feature** Enabled merging of organisations to reduce duplicates * **Admin Feature** Enabled merging of organisations to reduce duplicates
* **Admin Feature** Added badges to user listing to show whether customer or organisation * **Admin Feature** Added badges to user listing to show whether customer or organisation
* **Admin Feature** Added pagination to user listings * **Admin Feature** Added pagination to user listings
* Improved logging for debugging issues with login
# v0.9.5 # v0.9.5

View file

@ -39,7 +39,7 @@ __PACKAGE__->add_columns(
size => 255, size => 255,
}, },
transaction_id => { transaction_id => {
data_type => 'varchar', data_type => 'integer',
is_foreign_key => 1, is_foreign_key => 1,
is_nullable => 1, is_nullable => 1,
}, },

View file

@ -206,7 +206,7 @@ CREATE TABLE "import_values" (
"purchase_date" timestamp NOT NULL, "purchase_date" timestamp NOT NULL,
"purchase_value" character varying(255) NOT NULL, "purchase_value" character varying(255) NOT NULL,
"org_name" character varying(255) NOT NULL, "org_name" character varying(255) NOT NULL,
"transaction_id" character varying, "transaction_id" integer,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );
CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id"); CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id");

View file

@ -206,7 +206,7 @@ CREATE TABLE "import_values" (
"purchase_date" timestamp NOT NULL, "purchase_date" timestamp NOT NULL,
"purchase_value" character varying(255) NOT NULL, "purchase_value" character varying(255) NOT NULL,
"org_name" character varying(255) NOT NULL, "org_name" character varying(255) NOT NULL,
"transaction_id" character varying, "transaction_id" integer,
"ignore_value" boolean DEFAULT false NOT NULL, "ignore_value" boolean DEFAULT false NOT NULL,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );

View file

@ -220,7 +220,7 @@ CREATE TABLE "import_values" (
"purchase_date" timestamp NOT NULL, "purchase_date" timestamp NOT NULL,
"purchase_value" character varying(255) NOT NULL, "purchase_value" character varying(255) NOT NULL,
"org_name" character varying(255) NOT NULL, "org_name" character varying(255) NOT NULL,
"transaction_id" character varying, "transaction_id" integer,
"ignore_value" boolean DEFAULT false NOT NULL, "ignore_value" boolean DEFAULT false NOT NULL,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );

View file

@ -18,7 +18,7 @@ CREATE TABLE "import_values" (
"purchase_date" timestamp NOT NULL, "purchase_date" timestamp NOT NULL,
"purchase_value" character varying(255) NOT NULL, "purchase_value" character varying(255) NOT NULL,
"org_name" character varying(255) NOT NULL, "org_name" character varying(255) NOT NULL,
"transaction_id" character varying, "transaction_id" integer,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );
CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id"); CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id");