-
{{ 'FORM.LABELS.NAME' | translate }} ({{ 'FORM.LABELS.PROJECT' | translate }})
+
+ FORM.LABELS.NAME
+ (FORM.LABELS.PROJECT )
+
-
-
diff --git a/client/src/modules/templates/modals/project.modal.js b/client/src/modules/templates/modals/project.modal.js
index 546964c082..3edfabd3b3 100644
--- a/client/src/modules/templates/modals/project.modal.js
+++ b/client/src/modules/templates/modals/project.modal.js
@@ -1,22 +1,23 @@
angular.module('bhima.controllers')
-.controller('ProjectModalController', ProjectModalController);
+ .controller('ProjectModalController', ProjectModalController);
// dependencies injections
ProjectModalController.$inject = [
- '$uibModalInstance', 'ProjectService', 'NotifyService', 'data'
+ '$uibModalInstance', 'ProjectService', 'NotifyService', 'data',
];
function ProjectModalController(Instance, Projects, Notify, Data) {
- var vm = this;
+ const vm = this;
vm.project = {};
- vm.action = Data.action; // action must be 'create' or 'edit'
vm.enterprise = Data.enterprise; // the project enterprise
- vm.showLock = Data.action === 'edit' ? true : false;
+
+ vm.isCreateState = (Data.action === 'create');
+ vm.isEditState = (Data.action === 'edit');
// expose to the view
vm.submit = submit;
- vm.close = Instance.close;
+ vm.close = Instance.close;
/**
* @function submitProject
@@ -26,42 +27,38 @@ function ProjectModalController(Instance, Projects, Notify, Data) {
function submit(form) {
if (form.$invalid) {
Notify.danger('FORM.ERRORS.HAS_ERRORS');
- return;
+ return 0;
}
- var promise;
- var creation = !vm.showLock; //if show lock is false, creation true
- var project = angular.copy(vm.project);
+ const project = angular.copy(vm.project);
// set enterprise
project.enterprise_id = vm.enterprise.id;
// set locked boolean required
- project.locked = project.locked ? true : false;
+ project.locked = !!project.locked;
- promise = (creation) ?
+ const promise = (vm.isCreateState) ?
Projects.create(project) :
Projects.update(project.id, project);
return promise
- .then(function (response) {
- Instance.close(true);
- })
- .catch(Notify.handleError);
+ .then(() => {
+ Instance.close(true);
+ })
+ .catch(Notify.handleError);
}
- /** startup function */
+ /* startup function */
function startup() {
- if (Data.action === 'edit' && Data.identifier) {
+ if (vm.isEditState && Data.identifier) {
Projects.read(Data.identifier)
- .then(function (project) {
- vm.project = project;
- })
- .catch(Notify.handleError);
+ .then(project => {
+ vm.project = project;
+ })
+ .catch(Notify.handleError);
}
}
- // run
startup();
-
}
diff --git a/server/config/express.js b/server/config/express.js
index 6a70b0b183..99307b2859 100644
--- a/server/config/express.js
+++ b/server/config/express.js
@@ -27,7 +27,7 @@ const days = 1000 * 60 * 60 * 24;
const publicRoutes = [
'/auth/login',
'/languages',
- '/projects/',
+ '/projects',
'/auth/logout',
'/install',
'/currencies',
diff --git a/server/config/routes.js b/server/config/routes.js
index 578471cbaa..cf69e8bdf9 100644
--- a/server/config/routes.js
+++ b/server/config/routes.js
@@ -337,7 +337,7 @@ exports.configure = function configure(app) {
app.get('/payroll_config', payrollConfig.list);
app.get('/payroll_config/:id', payrollConfig.detail);
app.post('/payroll_config', payrollConfig.create);
- app.put('/payroll_config/:id', payrollConfig.update);
+ app.put('/payroll_config/:id', payrollConfig.update);
app.delete('/payroll_config/:id', payrollConfig.delete);
// reports API: Invoices (receipts)
@@ -624,7 +624,7 @@ exports.configure = function configure(app) {
app.post('/weekend_config', weekendConfig.create);
app.put('/weekend_config/:id', weekendConfig.update);
app.get('/weekend_config/:id/days', weekendConfig.listConfig);
- app.post('/weekend_config/:id/days', weekendConfig.createConfig);
+ app.post('/weekend_config/:id/days', weekendConfig.createConfig);
app.delete('/weekend_config/:id', weekendConfig.delete);
// creditor groups API
diff --git a/server/controllers/admin/enterprises.js b/server/controllers/admin/enterprises.js
index e94ec36fe4..6eff341964 100644
--- a/server/controllers/admin/enterprises.js
+++ b/server/controllers/admin/enterprises.js
@@ -4,7 +4,7 @@
* This controller is responsible for creating and updating Enterprises.
* Each enterprise must necessarily have a name, an abbreviation, a geographical
* location as well as a currency and it is not possible to remove an enterprise.
- * */
+ */
const db = require('../../lib/db');
const NotFound = require('../../lib/errors/NotFound');
@@ -17,15 +17,28 @@ exports.list = function list(req, res, next) {
let sql = 'SELECT id, name, abbr FROM enterprise';
if (req.query.detailed === '1') {
- sql =
- `SELECT id, name, abbr, email, po_box, phone,
- BUID(location_id) AS location_id, logo, currency_id,
- gain_account_id, loss_account_id
- FROM enterprise;`;
+ sql = `
+ SELECT id, name, abbr, email, po_box, phone,
+ BUID(location_id) AS location_id, logo, currency_id,
+ gain_account_id, loss_account_id, enable_price_lock
+ FROM enterprise LEFT JOIN enterprise_setting
+ ON enterprise.id = enterprise_setting.enterprise_id
+ ;`;
}
db.exec(sql)
- .then((rows) => {
+ .then(rows => {
+
+ // FIXME(@jniles) - this is kinda hacky. The idea is to keep settings
+ // separate in a JSON file. This will make more sense as we add enterprise
+ // options.
+ if (req.query.detailed === '1') {
+ rows.forEach(row => {
+ row.settings = { enable_price_lock : row.enable_price_lock };
+ delete row.enable_price_lock;
+ });
+ }
+
res.status(200).json(rows);
})
.catch(next)
@@ -36,7 +49,7 @@ exports.list = function list(req, res, next) {
// GET /enterprises/:id
exports.detail = function detail(req, res, next) {
lookupEnterprise(req.params.id)
- .then((enterprise) => {
+ .then(enterprise => {
res.status(200).json(enterprise);
})
.catch(next)
@@ -51,7 +64,21 @@ function lookupEnterprise(id) {
FROM enterprise WHERE id = ?;
`;
- return db.one(sql, [id], id, 'enterprise');
+ const settingsSQL = `
+ SELECT enable_price_lock FROM enterprise_setting WHERE enterprise_id = ?;
+ `;
+
+ let enterprise;
+
+ return db.one(sql, [id], id, 'enterprise')
+ .then(data => {
+ enterprise = data;
+ return db.exec(settingsSQL, id);
+ })
+ .then(settings => {
+ enterprise.settings = settings[0] || {};
+ return enterprise;
+ });
}
/**
@@ -94,7 +121,7 @@ exports.create = function create(req, res, next) {
const sql = 'INSERT INTO enterprise SET ?;';
db.exec(sql, [enterprise])
- .then((row) => {
+ .then(row => {
res.status(201).json({ id : row.insertId });
})
.catch(next)
@@ -105,16 +132,21 @@ exports.create = function create(req, res, next) {
exports.update = function update(req, res, next) {
const sql = 'UPDATE enterprise SET ? WHERE id = ?;';
const data = db.convert(req.body, ['location_id']);
- delete data.id;
- db.exec(sql, [data, req.params.id])
+ const { settings } = data;
+ delete data.settings;
+
+ data.id = req.params.id;
+
+ db.exec(sql, [data, data.id])
.then((row) => {
if (!row.affectedRows) {
throw new NotFound(`Could not find an enterprise with id ${req.params.id}`);
}
- return lookupEnterprise(req.params.id);
+ return db.exec('UPDATE enterprise_setting SET ? WHERE enterprise_id = ?', [settings, req.params.id]);
})
+ .then(() => lookupEnterprise(req.params.id))
.then((enterprise) => {
res.status(200).json(enterprise);
})
diff --git a/server/controllers/auth.js b/server/controllers/auth.js
index fb49a8d4c1..df56889465 100644
--- a/server/controllers/auth.js
+++ b/server/controllers/auth.js
@@ -9,12 +9,16 @@
* user's ability to selected routes.
*
* @requires lib/db
+ * @requires q
* @requires Topic
+ * @requires lodash
* @requires lib/errors/Unauthorized
* @requires lib/errors/Forbidden
* @requires lib/errors/InternalServerError
*/
+const _ = require('lodash');
+const q = require('q');
const db = require('../lib/db');
const Unauthorized = require('../lib/errors/Unauthorized');
const InternalServerError = require('../lib/errors/InternalServerError');
@@ -39,22 +43,19 @@ exports.reload = reload;
* the database all enterprise, project, and user data for easy access.
*/
function login(req, res, next) {
- const username = req.body.username;
- const password = req.body.password;
+ const { username, password } = req.body;
const projectId = req.body.project;
const param = {};
- const sql =
- `
- SELECT
- user.id, user.username, user.display_name, user.email, user.deactivated,
+ const sql = `
+ SELECT
+ user.id, user.username, user.display_name, user.email, user.deactivated,
project.enterprise_id , project.id AS project_id
- FROM user
- JOIN
- project_permission JOIN project ON user.id = project_permission.user_id
- AND project.id = project_permission.project_id
- WHERE
- user.username = ? AND user.password = PASSWORD(?)
+ FROM user
+ JOIN project_permission JOIN project ON user.id = project_permission.user_id
+ AND project.id = project_permission.project_id
+ WHERE
+ user.username = ? AND user.password = PASSWORD(?)
AND project_permission.project_id = ?;
`;
@@ -67,47 +68,37 @@ function login(req, res, next) {
JOIN user ON user.id = permission.user_id
WHERE user.username = ? AND user.password = PASSWORD(?)`;
+ q.all([
+ db.exec(sql, [username, password, projectId]),
+ db.exec(sqlUser, [username, password]),
+ db.exec(sqlPermission, [username, password]),
+ ])
+ .spread((connect, user, permission) => {
+ _.merge(param, { connect, user, permission });
- db.exec(sql, [username, password, projectId])
- .then((rows) => {
- param.connect = rows;
+ const hasAuthorization = param.connect.length > 0;
+ const isMissingPermissions = param.permission.length === 0;
+ const isUnrecognizedUser = param.user.length === 0;
- return db.exec(sqlUser, [username, password]);
- })
- .then((rows) => {
- param.user = rows;
- return db.exec(sqlPermission, [username, password]);
- })
- .then((rows) => {
- param.permission = rows;
- const connect = param.connect.length;
- const permission = param.permission.length;
- const user = param.user.length;
-
- if (connect === 1) {
+ if (hasAuthorization) {
if (Boolean(param.connect[0].deactivated)) {
throw new Unauthorized('The user is not activated, contact the administrator', 'FORM.ERRORS.LOCKED_USER');
}
- if (permission === 0) {
+ if (isMissingPermissions) {
throw new Unauthorized('No permissions in the database.', 'ERRORS.NO_PERMISSIONS');
}
- } else if (connect === 0) {
- if (user === 0) {
- throw new Unauthorized('Bad username and password combination.');
- } else {
- throw new Unauthorized('No permissions for that project.', 'ERRORS.NO_PROJECT');
- }
+ } else if (isUnrecognizedUser) {
+ throw new Unauthorized('Bad username and password combination.');
+ } else {
+ throw new Unauthorized('No permissions for that project.', 'ERRORS.NO_PROJECT');
}
return loadSessionInformation(param.connect[0]);
})
.then(session => {
// bind the session variables
- req.session.project = session.project;
- req.session.user = session.user;
- req.session.enterprise = session.enterprise;
- req.session.paths = session.paths;
+ _.merge(req.session, session);
// broadcast LOGIN event
Topic.publish(Topic.channels.APP, {
@@ -125,10 +116,10 @@ function login(req, res, next) {
}
/**
- * @method logout
- *
- * Destroys the server side session and sets the user as inactive.
- */
+ * @method logout
+ *
+ * Destroys the server side session and sets the user as inactive.
+ */
function logout(req, res, next) {
const sql = 'UPDATE user SET user.active = 0 WHERE user.id = ?;';
@@ -166,14 +157,14 @@ function logout(req, res, next) {
* @private
*/
function loadSessionInformation(user) {
- // this will be the new session
const session = {};
let sql = `
SELECT user.id, user.username, user.display_name, user.email, project.enterprise_id , project.id AS project_id
FROM user JOIN project_permission JOIN project ON
user.id = project_permission.user_id AND project.id = project_permission.project_id
- WHERE user.id = ? AND project.id = ?;`;
+ WHERE user.id = ? AND project.id = ?;
+ `;
return db.exec(sql, [user.id, user.project_id])
.then(rows => {
@@ -183,13 +174,14 @@ function loadSessionInformation(user) {
}
// we assume only one match for the user
- session.user = rows[0];
+ [session.user] = rows;
// next make sure this user has permissions
sql = `
SELECT IF(permission.user_id = ?, 1, 0) authorized, unit.path
FROM unit LEFT JOIN permission
- ON unit.id = permission.unit_id;`;
+ ON unit.id = permission.unit_id;
+ `;
return db.exec(sql, [session.user.id]);
})
@@ -232,7 +224,17 @@ function loadSessionInformation(user) {
throw new InternalServerError('There are no enterprises registered in the database!');
}
- session.enterprise = rows[0];
+ [session.enterprise] = rows;
+
+ sql = `
+ SELECT enable_price_lock FROM enterprise_setting
+ WHERE enterprise_id = ?;
+ `;
+
+ return db.exec(sql, [session.user.enterprise_id]);
+ })
+ .then(rows => {
+ [session.enterprise.settings] = rows;
sql = `
SELECT p.id, p.name, p.abbr, p.enterprise_id
@@ -246,7 +248,7 @@ function loadSessionInformation(user) {
throw new Unauthorized('No project matching the provided id.');
}
- session.project = rows[0];
+ [session.project] = rows;
return session;
});
@@ -257,7 +259,7 @@ function loadSessionInformation(user) {
* @method reload
*
* @description
- * Uses the same login code to re
+ * Uses the same login code to reload the permissions for the user.
*/
function reload(req, res, next) {
if (!(req.session && req.session.user)) {
@@ -269,10 +271,7 @@ function reload(req, res, next) {
loadSessionInformation(req.session.user)
.then(session => {
// bind the session variables
- req.session.project = session.project;
- req.session.user = session.user;
- req.session.enterprise = session.enterprise;
- req.session.paths = session.paths;
+ _.merge(req.session, session);
// broadcast LOGIN event
Topic.publish(Topic.channels.APP, {
diff --git a/server/models/bhima.sql b/server/models/bhima.sql
index 848590f345..6d64f99b83 100644
--- a/server/models/bhima.sql
+++ b/server/models/bhima.sql
@@ -82,7 +82,7 @@ INSERT INTO unit VALUES
(190, 'Payroll Rubric Configuration','TREE.PAYROLL_RUB_CONFIGURATION','',57,'/modules/payroll/rubric_configuration','/payroll/rubric_configuration'),
(191, 'Account Configuration','TREE.PAYROLL_ACCOUNT_CONFIGURATION','Account Configuration', 57,'/modules/payroll/account_configuration','/payroll/account_configuration'),
(192, 'Operating report', 'TREE.OPERATING_ACCOUNT', 'The Report of operating', 144, '/modules/reports/operating', '/reports/operating'),
- (193, 'Weekend Configuration','TREE.WEEKEND_CONFIGURATION','Weekend Configuration', 57,'/modules/payroll/weekend_configuration','/payroll/weekend_configuration'),
+ (193, 'Weekend Configuration','TREE.WEEKEND_CONFIGURATION','Weekend Configuration', 57,'/modules/payroll/weekend_configuration','/payroll/weekend_configuration'),
(194, 'Payroll Configuration','TREE.PAYROLL_CONFIGURATION','Payroll Configuration', 57,'/modules/payroll','/payroll');
diff --git a/server/models/schema.sql b/server/models/schema.sql
index 3c9220261a..0f228f58c4 100644
--- a/server/models/schema.sql
+++ b/server/models/schema.sql
@@ -609,6 +609,14 @@ CREATE TABLE `enterprise` (
FOREIGN KEY (`loss_account_id`) REFERENCES `account` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+DROP TABLE IF EXISTS `enterprise_setting`;
+CREATE TABLE `enterprise_setting` (
+ `enterprise_id` SMALLINT(5) UNSIGNED NOT NULL,
+ `enable_price_lock` TINYINT(1) NOT NULL DEFAULT 1,
+ PRIMARY KEY (`enterprise_id`),
+ FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
DROP TABLE IF EXISTS `entity_map`;
CREATE TABLE `entity_map` (
`uuid` BINARY(16) NOT NULL,
diff --git a/sh/build-database.sh b/sh/build-database.sh
index 0191d52f4e..03dd5ae952 100755
--- a/sh/build-database.sh
+++ b/sh/build-database.sh
@@ -20,7 +20,7 @@ mysql -u $DB_USER -p$DB_PASS -e "DROP DATABASE IF EXISTS $DB_NAME ;" &> /dev/nul
mysql -u $DB_USER -p$DB_PASS -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8 COLLATE utf8_unicode_ci;" &> /dev/null
echo "[build] database schema"
-mysql -u $DB_USER -p$DB_PASS $DB_NAME < server/models/schema.sql &> /dev/null
+mysql -u $DB_USER -p$DB_PASS $DB_NAME < server/models/schema.sql
echo "[build] triggers"
mysql -u $DB_USER -p$DB_PASS $DB_NAME < server/models/triggers.sql &> /dev/null
diff --git a/test/data.sql b/test/data.sql
index 8f1eb6ca82..f8cbfe9108 100644
--- a/test/data.sql
+++ b/test/data.sql
@@ -8,6 +8,9 @@ SET NAMES 'utf8';
INSERT INTO `enterprise` VALUES
(1, 'Test Enterprise', 'TE', '243 81 504 0540', 'enterprise@test.org', HUID('1f162a10-9f67-4788-9eff-c1fea42fcc9b'), NULL, 2, 103, NULL, NULL);
+INSERT INTO `enterprise_setting` (enterprise_id, enable_price_lock) VALUES
+ (1, 0);
+
-- Project
INSERT INTO `project` VALUES
(1, 'Test Project A', 'TPA', 1, 1, 0),
@@ -761,7 +764,7 @@ INSERT INTO `stock_movement` (`uuid`, `lot_uuid`, `document_uuid`, `depot_uuid`,
(HUID('e8502c3e-7483-11e7-a8de-507b9dd6de91'), HUID('064ab1d9-5246-4402-ae8a-958fcdb07b35'), HUID('0cc6c435-7484-11e7-a8de-507b9dd6de91'), HUID('f9caeb16-1684-43c5-a6c4-47dbac1df296'), HUID('d4bb1452-e4fa-4742-a281-814140246877'), 8, '2017-02-02', 75, 1.2000, 1, 1);
-- Rubric Payroll
-INSERT INTO `rubric_payroll` (`id`, `label`, `abbr`, `is_employee`, `is_percent`, `is_discount`, `is_tax`, `is_social_care`, `is_membership_fee`, `debtor_account_id`, `expense_account_id`, `is_ipr`, `value`) VALUES
+INSERT INTO `rubric_payroll` (`id`, `label`, `abbr`, `is_employee`, `is_percent`, `is_discount`, `is_tax`, `is_social_care`, `is_membership_fee`, `debtor_account_id`, `expense_account_id`, `is_ipr`, `value`) VALUES
(1, 'INSS Code part Patronale', 'INSS2', 0, 1, 1, 0, 0, 1, 300, 203, 0, 9),
(2, 'Impot Professionnel sur le Revenue', 'IPR', 1, 0, 1, 1, 0, 0, 300, 207, 1, NULL),
(3, 'Institut National de Pratique Professionel', 'INPP', 0, 1, 1, 1, 0, 0, 172, 206, 0, 0.2),
@@ -782,22 +785,22 @@ INSERT INTO `config_rubric_item` (`id`, `config_rubric_id`, `rubric_payroll_id`)
(6, 1, 4);
-- Configuration of weekend
-INSERT INTO `weekend_config` (`id`, `label`) VALUES
+INSERT INTO `weekend_config` (`id`, `label`) VALUES
(1, 'Configuration Semaine Anglaise'),
(2, 'Configuration Semaine Normale');
-- Days of weekend configuration
-INSERT INTO `config_week_days` (`id`, `indice`, `weekend_config_id`) VALUES
+INSERT INTO `config_week_days` (`id`, `indice`, `weekend_config_id`) VALUES
(1, 0, 1),
(2, 6, 1),
(3, 6, 2);
-- Tax IPR
-INSERT INTO `taxe_ipr` (`id`, `label`, `description`, `currency_id`) VALUES
+INSERT INTO `taxe_ipr` (`id`, `label`, `description`, `currency_id`) VALUES
(1, 'Bareme IPR 2013', 'Barème Impôt Professionnel sur les revenus', 1);
-- Tax IPR Configuration
-INSERT INTO `taxe_ipr_configuration` (`rate`, `tranche_annuelle_debut`, `tranche_annuelle_fin`, `tranche_mensuelle_debut`, `tranche_mensuelle_fin`, `ecart_annuel`, `ecart_mensuel`, `impot_annuel`, `impot_mensuel`, `cumul_annuel`, `cumul_mensuel`, `taxe_ipr_id`) VALUES
+INSERT INTO `taxe_ipr_configuration` (`rate`, `tranche_annuelle_debut`, `tranche_annuelle_fin`, `tranche_mensuelle_debut`, `tranche_mensuelle_fin`, `ecart_annuel`, `ecart_mensuel`, `impot_annuel`, `impot_mensuel`, `cumul_annuel`, `cumul_mensuel`, `taxe_ipr_id`) VALUES
(0, 0, 524160, 0, 43680, 524160, 43680, 0, 0, 0, 0, 1),
(15, 524160, 1428000, 43680, 119000, 903840, 75320, 135576, 11298, 135576, 11298, 1),
(20, 1428000, 2700000, 119000, 225000, 1272000, 106000, 254400, 21200, 0, 0, 1),
@@ -813,5 +816,5 @@ INSERT INTO `taxe_ipr_configuration` (`rate`, `tranche_annuelle_debut`, `tranche
INSERT INTO `config_accounting` (`label`, `account_id`) VALUES ('Configuration Compte Rémunération', 220);
-- Payroll Configuration Period
-INSERT INTO `payroll_configuration` (`id`, `label`, `dateFrom`, `dateTo`, `config_rubric_id`, `config_accounting_id`, `config_weekend_id`, `config_ipr_id`) VALUES
+INSERT INTO `payroll_configuration` (`id`, `label`, `dateFrom`, `dateTo`, `config_rubric_id`, `config_accounting_id`, `config_weekend_id`, `config_ipr_id`) VALUES
(1, 'Période de Paiement', '2018-02-01', '2018-02-28', 1, 1, 1, 1);
diff --git a/test/end-to-end/enterprises/enterprises.spec.js b/test/end-to-end/enterprises/enterprises.spec.js
index 89287ea6ac..39067aa39f 100644
--- a/test/end-to-end/enterprises/enterprises.spec.js
+++ b/test/end-to-end/enterprises/enterprises.spec.js
@@ -1,4 +1,3 @@
-/* global element, by */
const chai = require('chai');
const helpers = require('../shared/helpers');
@@ -128,7 +127,8 @@ describe('Enterprises', () => {
});
it('edit an existing project', () => {
- element(by.css(`[data-update="${abbr}"]`)).click();
+ const btn = $(`[data-project="${abbr}"]`);
+ btn.$('a[data-method="update"]').click();
FU.input('$ctrl.project.name', projectUpdate.name);
FU.input('$ctrl.project.abbr', projectUpdate.abbr);
@@ -139,7 +139,8 @@ describe('Enterprises', () => {
});
it('delete an existing project', () => {
- element(by.css(`[data-delete="${abbrUpdate}"]`)).click();
+ const btn = $(`[data-project="${abbr}"]`);
+ btn.$('a[data-method="delete"]').click();
FU.input('$ctrl.text', projectUpdate.name);
diff --git a/test/integration/enterprises.js b/test/integration/enterprises.js
index 69370b1346..70471e6739 100644
--- a/test/integration/enterprises.js
+++ b/test/integration/enterprises.js
@@ -1,4 +1,4 @@
-/* global expect, chai, agent */
+/* global expect, agent */
const helpers = require('./helpers');
@@ -6,9 +6,9 @@ const helpers = require('./helpers');
* The /enterprises API endpoint
* This test suite implements full CRUD on the /enterprises HTTP API endpoint.
*/
-describe('(/enterprises) Enterprises API', function () {
+describe('(/enterprises) Enterprises API', () => {
- var enterprise = {
+ const enterprise = {
name : 'enterprises',
abbr : 'T.E.S.T',
email : 'enterprises@test.org',
@@ -16,18 +16,19 @@ describe('(/enterprises) Enterprises API', function () {
phone : '2016',
location_id : '1f162a10-9f67-4788-9eff-c1fea42fcc9b',
logo : null,
- currency_id : 2
+ currency_id : 2,
};
- var updateEnterprise = {
+ const updateEnterprise = {
name : 'updateEnterprises',
abbr : 'upd',
phone : '00904940950932016',
location_id : '1f162a10-9f67-4788-9eff-c1fea42fcc9b',
- currency_id : 1
+ currency_id : 1,
+ settings : { enable_price_lock : 0 },
};
- var invalidEnterprise = {
+ const invalidEnterprise = {
name : null,
abbr : null,
email : 'enterprises@test.org',
@@ -35,45 +36,46 @@ describe('(/enterprises) Enterprises API', function () {
phone : '2016',
location_id : null,
logo : null,
- currency_id : null
+ currency_id : null,
};
/* the number of enterprises registered in the test db */
- var numEnterprises = 2;
+ const numEnterprises = 2;
/* response keys from a detailed query */
- var responseKeys = [
+ const responseKeys = [
'id', 'name', 'abbr', 'email', 'po_box', 'phone',
- 'location_id', 'logo', 'currency_id', 'gain_account_id', 'loss_account_id'
+ 'location_id', 'logo', 'currency_id', 'gain_account_id', 'loss_account_id',
+ 'settings',
];
- it('POST /enterprises will register a valid enterprises', function () {
+ it('POST /enterprises will register a valid enterprises', () => {
return agent.post('/enterprises')
- .send({ enterprise : enterprise })
- .then(function (res) {
+ .send({ enterprise })
+ .then(res => {
helpers.api.created(res);
enterprise.id = res.body.id;
- return agent.get('/enterprises/' + res.body.id);
+ return agent.get(`/enterprises/${res.body.id}`);
})
- .then(function (res) {
+ .then(res => {
expect(res).to.have.status(200);
})
.catch(helpers.handler);
});
- it('POST /enterprises will not register an incomplete enterprise', function () {
+ it('POST /enterprises will not register an incomplete enterprise', () => {
return agent.post('/enterprises')
.send({ enterprise : invalidEnterprise })
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 400);
})
.catch(helpers.handler);
});
- it('PUT /enterprises/:id should update an existing enterprises', function () {
- return agent.put('/enterprises/' + enterprise.id)
+ it('PUT /enterprises/:id should update an existing enterprises', () => {
+ return agent.put(`/enterprises/${enterprise.id}`)
.send(updateEnterprise)
- .then(function (res) {
+ .then(res => {
expect(res).to.have.status(200);
expect(res).to.be.json;
expect(res.body).to.have.all.keys(responseKeys);
@@ -81,35 +83,35 @@ describe('(/enterprises) Enterprises API', function () {
.catch(helpers.handler);
});
- it('GET /enterprises returns a list of enterprises', function () {
+ it('GET /enterprises returns a list of enterprises', () => {
return agent.get('/enterprises')
- .then(function (res) {
+ .then(res => {
helpers.api.listed(res, numEnterprises);
})
.catch(helpers.handler);
});
- it('GET /enterprises?detailed=1 returns a enterprises list with all keys', function () {
+ it('GET /enterprises?detailed=1 returns a enterprises list with all keys', () => {
return agent.get('/enterprises?detailed=1')
- .then(function (res) {
+ .then(res => {
helpers.api.listed(res, numEnterprises);
expect(res.body[0]).to.have.all.keys(responseKeys);
})
.catch(helpers.handler);
});
- it('GET /enterprises/:id returns a single enterprise', function () {
- return agent.get('/enterprises/' + enterprise.id)
- .then(function (res) {
+ it('GET /enterprises/:id returns a single enterprise', () => {
+ return agent.get(`/enterprises/${enterprise.id}`)
+ .then(res => {
expect(res).to.have.status(200);
expect(res).to.be.json;
})
.catch(helpers.handler);
});
- it('GET /enterprises/:id returns a 404 error for unknown enterprises', function () {
+ it('GET /enterprises/:id returns a 404 error for unknown enterprises', () => {
return agent.get('/enterprises/unknown')
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 404);
})
.catch(helpers.handler);
diff --git a/test/integration/login.js b/test/integration/login.js
index 2a5bccadd7..fd48fe1cef 100644
--- a/test/integration/login.js
+++ b/test/integration/login.js
@@ -1,9 +1,8 @@
-/* global expect, chai, agent, baseUrl */
+/* global expect, chai, */
const helpers = require('./helpers');
-describe('(/auth/login) The login API', function () {
- 'use strict';
+describe('(/auth/login) The login API', () => {
const port = process.env.PORT || 8080;
const url = `http://localhost:${port}`;
@@ -12,98 +11,98 @@ describe('(/auth/login) The login API', function () {
const validUser = {
username : 'superuser',
password : 'superuser',
- project: 1
+ project : 1,
};
const invalidUser = {
- username: 'unauthorized',
- password: 'unauthorized'
+ username : 'unauthorized',
+ password : 'unauthorized',
};
const deactivatedUser = {
username : 'admin',
password : '1',
- project : 1
- }
+ project : 1,
+ };
- it('rejects access to non-existant routes', function () {
+ it('rejects access to non-existant routes', () => {
return chai.request(url)
.get('/non-existant')
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 401);
expect(res.body.code).to.equal('ERRORS.UNAUTHORIZED');
})
.catch(helpers.handler);
});
- it('rejects access to non-public routes', function () {
+ it('rejects access to non-public routes', () => {
return chai.request(url)
.get('/journal')
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 401);
expect(res.body.code).to.equal('ERRORS.UNAUTHORIZED');
})
.catch(helpers.handler);
});
- it('allows access to public routes', function () {
+ it('allows access to public routes', () => {
return chai.request(url)
- .get('/projects/')
- .then(function (res) {
+ .get('/projects')
+ .then(res => {
expect(res).to.have.status(200);
})
.catch(helpers.handler);
});
- it('rejects an unrecognized user', function () {
+ it('rejects an unrecognized user', () => {
return chai.request(url)
.post('/auth/login')
.send(invalidUser)
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 401);
expect(res.body.code).to.equal('ERRORS.UNAUTHORIZED');
})
.catch(helpers.handler);
});
- it('rejects a deactivated user', function () {
+ it('rejects a deactivated user', () => {
return chai.request(url)
.post('/auth/login')
.send(deactivatedUser)
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 401);
expect(res.body.code).to.equal('FORM.ERRORS.LOCKED_USER');
})
.catch(helpers.handler);
});
- it('rejects a recognized user user without a project', function () {
+ it('rejects a recognized user user without a project', () => {
return chai.request(url)
.post('/auth/login')
.send({ username : validUser.username, password : validUser.password })
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 401);
expect(res.body.code).to.equal('ERRORS.NO_PROJECT');
})
.catch(helpers.handler);
});
- it('rejects a recognized user without a password', function () {
+ it('rejects a recognized user without a password', () => {
return chai.request(url)
.post('/auth/login')
.send({ username : validUser.username, project : validUser.project })
- .then(function (res) {
+ .then(res => {
helpers.api.errored(res, 401);
expect(res.body.code).to.equal('ERRORS.UNAUTHORIZED');
})
.catch(helpers.handler);
});
- it('sets a user\'s session properties', function () {
+ it('sets a user\'s session properties', () => {
return chai.request(url)
.post('/auth/login')
.send(validUser)
- .then(function (res) {
+ .then(res => {
expect(res).to.have.status(200);
expect(res.body).to.have.keys('enterprise', 'user', 'project', 'paths');
expect(res.body.user).to.contain.all.keys('id', 'enterprise_id', 'display_name', 'project_id', 'username', 'email');