From cc140aa7a25391f8416b5337695c95b1e7d5e147 Mon Sep 17 00:00:00 2001 From: iLGunners Date: Thu, 8 Nov 2018 19:56:41 +0600 Subject: [PATCH 01/26] _createServiceMembership now adds assignedEmploymentId --- meta/server-db-docs/service-membership.md | 1 + server/src/apis/add-sales.js | 2 +- server/src/collections/service-membership.js | 3 +++ server/test/test-sales-apis.js | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/server-db-docs/service-membership.md b/meta/server-db-docs/service-membership.md index 9d949baef..12f257e66 100644 --- a/meta/server-db-docs/service-membership.md +++ b/meta/server-db-docs/service-membership.md @@ -10,6 +10,7 @@ Joi.object().keys({ customerId: Joi.number().max(999999999999999).required(), salesId: Joi.number().max(999999999999999).required(), serviceId: Joi.number().max(999999999999999).required(), + assignedEmploymentId: Joi.number().max(999999999999999).allow(null).required(), expiringDatetimeStamp: Joi.number().max(999999999999999).required(), diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js index 18fd263f0..b4415bec3 100644 --- a/server/src/apis/add-sales.js +++ b/server/src/apis/add-sales.js @@ -167,7 +167,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin, Sal date.setMonth(date.getMonth() + serviceBlueprint.serviceDuration.months); date.setDate(date.getDate() + serviceBlueprint.serviceDuration.days); let expiringDatetimeStamp = date.getTime(); - let res = await this.database.serviceMembership.create({ createdByUserId, customerId, salesId, serviceId: service.id , expiringDatetimeStamp }); + let res = await this.database.serviceMembership.create({ createdByUserId, customerId, salesId, serviceId: service.id , assignedEmploymentId: serviceListObj.assignedEmploymentId, expiringDatetimeStamp }); } } diff --git a/server/src/collections/service-membership.js b/server/src/collections/service-membership.js index a73915b1a..46907fe78 100644 --- a/server/src/collections/service-membership.js +++ b/server/src/collections/service-membership.js @@ -15,6 +15,7 @@ exports.ServiceMembershipCollection = class extends Collection { customerId: Joi.number().max(999999999999999).required(), salesId: Joi.number().max(999999999999999).required(), serviceId: Joi.number().max(999999999999999).required(), + assignedEmploymentId: Joi.number().max(999999999999999).allow(null).required(), expiringDatetimeStamp: Joi.number().max(999999999999999).required(), @@ -55,6 +56,7 @@ exports.ServiceMembershipCollection = class extends Collection { customerId, salesId, serviceId, + assignedEmploymentId, expiringDatetimeStamp }) { return await this._insert({ @@ -65,6 +67,7 @@ exports.ServiceMembershipCollection = class extends Collection { customerId, salesId, serviceId, + assignedEmploymentId, expiringDatetimeStamp, diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js index d1539d518..c22128b77 100644 --- a/server/test/test-sales-apis.js +++ b/server/test/test-sales-apis.js @@ -115,7 +115,7 @@ let longstandingServiceBlueprintId = null; let longstandingService = null; let longstandingServiceSaleId = null; -describe('Sales', _ => { +describe.only('Sales', _ => { it('START', testDoneFn => { initializeServer(_ => { @@ -1578,6 +1578,7 @@ describe('Sales', _ => { } } }, (err, response, body) => { + console.log(body); expect(response.statusCode).to.equal(200); validateAddSalesApiSuccessResponse(body); longstandingServiceSaleId = body.salesId; From da3c2207abb8df6680aeef527653e834d44f1ed7 Mon Sep 17 00:00:00 2001 From: iLGunners Date: Thu, 8 Nov 2018 20:00:12 +0600 Subject: [PATCH 02/26] get service member list now returns assignedEmploymentId --- meta/api-docs/get-service-membership-list.md | 5 +++-- server/test/lib.js | 2 ++ server/test/test-sales-apis.js | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/api-docs/get-service-membership-list.md b/meta/api-docs/get-service-membership-list.md index 3fc4dcde6..bfee7e563 100644 --- a/meta/api-docs/get-service-membership-list.md +++ b/meta/api-docs/get-service-membership-list.md @@ -60,12 +60,13 @@ Possible Error Codes: phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(), }), + salesId: Joi.number().max(999999999999999).required(), + serviceId: Joi.number().max(999999999999999).required(), serviceBlueprintDetails: Joi.object().keys({ name: Joi.string().min(1).max(64).required(), }), - salesId: Joi.number().max(999999999999999).required(), - serviceId: Joi.number().max(999999999999999).required(), + assignedEmploymentId: Joi.number().max(999999999999999).allow(null).required(), expiringDatetimeStamp: Joi.number().max(999999999999999).required(), diff --git a/server/test/lib.js b/server/test/lib.js index 7e9dc0c94..e3cc1d7f3 100644 --- a/server/test/lib.js +++ b/server/test/lib.js @@ -1411,6 +1411,8 @@ exports.validateServiceMembershipSchemaWhenListObj = (doc) => { salesId: Joi.number().max(999999999999999).required(), serviceId: Joi.number().max(999999999999999).required(), + assignedEmploymentId: Joi.number().max(999999999999999).allow(null).required(), + expiringDatetimeStamp: Joi.number().max(999999999999999).required(), isDiscarded: Joi.boolean().required(), diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js index c22128b77..5fb0897e8 100644 --- a/server/test/test-sales-apis.js +++ b/server/test/test-sales-apis.js @@ -1578,7 +1578,6 @@ describe.only('Sales', _ => { } } }, (err, response, body) => { - console.log(body); expect(response.statusCode).to.equal(200); validateAddSalesApiSuccessResponse(body); longstandingServiceSaleId = body.salesId; From ad18e8d5d48336b409e7eef602dfa16379e4b624 Mon Sep 17 00:00:00 2001 From: iLGunners Date: Thu, 8 Nov 2018 20:24:16 +0600 Subject: [PATCH 03/26] work done --- client/src/lang-bn-bd.json | 3 ++- client/src/lang-en-us.json | 3 ++- client/src/page-manage-service-membership.html | 5 +++++ meta/api-docs/get-service-membership-list.md | 7 ++++++- server/src/apis/get-service-membership-list.js | 17 +++++++++++++++++ server/src/apis/get-user-display-information.js | 2 +- server/test/lib.js | 10 +++++++--- 7 files changed, 40 insertions(+), 7 deletions(-) diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json index 596228dac..e8875fbbb 100644 --- a/client/src/lang-bn-bd.json +++ b/client/src/lang-bn-bd.json @@ -815,7 +815,8 @@ "expiringDatetime": "মেয়াদ", "customer": "ক্রেতা", - "serviceBlueprint": "সেবার সদস্যপদ" + "serviceBlueprint": "সেবা", + "assignedEmployee": "দায়িত্বে" }, "serviceBlueprintSelector": { "serviceBlueprintNameOrPhoneInput": "নাম দিয়ে খুজুন", diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json index f68d224c4..a765a1369 100644 --- a/client/src/lang-en-us.json +++ b/client/src/lang-en-us.json @@ -814,7 +814,8 @@ "expiringDatetime": "Expiry", "customer": "Customer", - "serviceBlueprint": "Service blueprint" + "serviceBlueprint": "Service", + "assignedEmployee": "Assigned" }, "serviceBlueprintSelector": { "serviceBlueprintNameOrPhoneInput": "By name.", diff --git a/client/src/page-manage-service-membership.html b/client/src/page-manage-service-membership.html index d70dbe191..da99a4f41 100644 --- a/client/src/page-manage-service-membership.html +++ b/client/src/page-manage-service-membership.html @@ -180,6 +180,11 @@
[[verses.serviceMembership.serviceBlueprint]]: [[serviceMembership.serviceBlueprintDetails.name]]
+ +
[[verses.serviceMembership.expiringDatetime]]: [[$mkDate(serviceMembership.expiringDatetimeStamp, 'hh:mmtt dd-MMM-yyyy')]] diff --git a/meta/api-docs/get-service-membership-list.md b/meta/api-docs/get-service-membership-list.md index bfee7e563..7dc096bad 100644 --- a/meta/api-docs/get-service-membership-list.md +++ b/meta/api-docs/get-service-membership-list.md @@ -54,19 +54,24 @@ Possible Error Codes: lastModifiedDatetimeStamp: Joi.number().max(999999999999999).required(), createdByUserId: Joi.number().max(999999999999999).required(), + salesId: Joi.number().max(999999999999999).required(), + customerId: Joi.number().max(999999999999999).required(), customerDetails: Joi.object().keys({ fullName: Joi.string().min(1).max(64).required(), phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(), }), - salesId: Joi.number().max(999999999999999).required(), serviceId: Joi.number().max(999999999999999).required(), serviceBlueprintDetails: Joi.object().keys({ name: Joi.string().min(1).max(64).required(), }), assignedEmploymentId: Joi.number().max(999999999999999).allow(null).required(), + assignedEmployeeDetails: Joi.object().allow(null).required().keys({ + fullName: Joi.string().min(1).max(64).required(), + phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(), + }), expiringDatetimeStamp: Joi.number().max(999999999999999).required(), diff --git a/server/src/apis/get-service-membership-list.js b/server/src/apis/get-service-membership-list.js index e306fdb44..f913d554b 100644 --- a/server/src/apis/get-service-membership-list.js +++ b/server/src/apis/get-service-membership-list.js @@ -76,6 +76,22 @@ exports.GetServiceMembershipListApi = class extends Api { } } + async _combineAssignedEmployeeData({ serviceMembershipList }) { + for (let i = 0; i < serviceMembershipList.length; i++) { + if (serviceMembershipList[i].assignedEmploymentId) { + let employee = await this.database.employment.findById({ id: serviceMembershipList[i].assignedEmploymentId }); + throwOnFalsy(employee, "EMPLOYEE_INVALID", "Employee data unavailable / invalid."); + let user = await this.database.user.findById({ id: employee.userId }); + throwOnFalsy(user, "USER_INVALID", "User data unavailable / invalid."); + serviceMembershipList[i].assignedEmployeeDetails = { fullName: user.fullName, phone: user.phone }; + } else { + serviceMembershipList[i].assignedEmployeeDetails = null; + } + + console.log(serviceMembershipList[i].assignedEmployeeDetails); + } + } + async _findServiceMembershipList({ serviceBlueprintId, outletId, customerId, shouldFilterByServiceBlueprint, shouldFilterByOutlet, shouldFilterByCustomer, fromDate, toDate, organizationId }) { // console.log({ serviceBlueprintId, outletId, customerId, shouldFilterByServiceBlueprint, shouldFilterByOutlet, shouldFilterByCustomer, fromDate, toDate, organizationId }) @@ -242,6 +258,7 @@ exports.GetServiceMembershipListApi = class extends Api { let serviceMembershipList = await this._findServiceMembershipList({ serviceBlueprintId, outletId, customerId, shouldFilterByServiceBlueprint, shouldFilterByOutlet, shouldFilterByCustomer, fromDate, toDate, organizationId }); await this._combineCustomerData({ serviceMembershipList }); + await this._combineAssignedEmployeeData({ serviceMembershipList }); return { serviceMembershipList }; } diff --git a/server/src/apis/get-user-display-information.js b/server/src/apis/get-user-display-information.js index cc4c10ead..d5b538b5f 100644 --- a/server/src/apis/get-user-display-information.js +++ b/server/src/apis/get-user-display-information.js @@ -34,7 +34,7 @@ exports.GetUserDisplayInformationApi = class extends Api.mixin(UserMixin) { let employmentList = await this.database.employment.listEmploymentOfUserInOrganization({ userId, organizationId }); if (employmentList.length === 0) { - throw new CodedError("EMPLOYEE_INVALID", "The use is not employed by this organization"); + throw new CodedError("EMPLOYEE_INVALID", "The user is not employed by this organization"); } let employment = employmentList[0]; diff --git a/server/test/lib.js b/server/test/lib.js index e3cc1d7f3..625fbc098 100644 --- a/server/test/lib.js +++ b/server/test/lib.js @@ -1398,20 +1398,24 @@ exports.validateServiceMembershipSchemaWhenListObj = (doc) => { lastModifiedDatetimeStamp: Joi.number().max(999999999999999).required(), createdByUserId: Joi.number().max(999999999999999).required(), + salesId: Joi.number().max(999999999999999).required(), + customerId: Joi.number().max(999999999999999).required(), customerDetails: Joi.object().required().keys({ fullName: Joi.string().min(1).max(64).required(), phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(), }), + serviceId: Joi.number().max(999999999999999).required(), serviceBlueprintDetails: Joi.object().keys({ name: Joi.string().min(1).max(64).required(), }), - salesId: Joi.number().max(999999999999999).required(), - serviceId: Joi.number().max(999999999999999).required(), - assignedEmploymentId: Joi.number().max(999999999999999).allow(null).required(), + assignedEmployeeDetails: Joi.object().allow(null).required().keys({ + fullName: Joi.string().min(1).max(64).required(), + phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(), + }), expiringDatetimeStamp: Joi.number().max(999999999999999).required(), From 2489f221e4402f0a9b5b87f6669d2443fc855d77 Mon Sep 17 00:00:00 2001 From: iLGunners Date: Thu, 8 Nov 2018 20:28:44 +0600 Subject: [PATCH 04/26] cleanup --- client/src/page-pos.html | 8 ++++---- server/src/apis/get-service-membership-list.js | 2 -- server/test/test-sales-apis.js | 8 +++++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/page-pos.html b/client/src/page-pos.html index cd84917a6..1035973cb 100644 --- a/client/src/page-pos.html +++ b/client/src/page-pos.html @@ -204,14 +204,14 @@ - +
+
+ [[verses.inventory.addToInventoryHelp]] +
+ +
From cd447767823d8d7b7393fa15d6cdbc48b2f3b4cd Mon Sep 17 00:00:00 2001 From: iLGunners Date: Mon, 12 Nov 2018 19:14:56 +0600 Subject: [PATCH 07/26] tests passing --- server/src/apis/add-organization.js | 2 +- server/test/test-admin-apis.js | 6 +++--- server/test/test-dashboard-apis.js | 2 +- server/test/test-organization-apis.js | 4 ++-- server/test/test-warehouse-apis.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/src/apis/add-organization.js b/server/src/apis/add-organization.js index 21a6c5f4b..90ece2aa6 100644 --- a/server/src/apis/add-organization.js +++ b/server/src/apis/add-organization.js @@ -33,7 +33,7 @@ exports.AddOrganizationApi = class extends Api { } async _setTrialPackage({ organizationId }) { - const packageCode = "T01"; + const packageCode = "R-T01"; let aPackage = await this.database.fixture.findPackageByCode({ packageCode }); throwOnFalsy(aPackage, "DEV_ERROR", "package is missing"); let packageActivationId = await this.database.packageActivation.create({ packageCode, organizationId, createdByAdminName: "system", paymentReference: "SERVER_ADD_ORGANIZATION_API" }); diff --git a/server/test/test-admin-apis.js b/server/test/test-admin-apis.js index 4a49bedf8..f87656912 100644 --- a/server/test/test-admin-apis.js +++ b/server/test/test-admin-apis.js @@ -391,7 +391,7 @@ describe('Admin', _ => { json: { apiKey, organizationId: org1id, - packageCode: "SE03", + packageCode: "R-SE03", paymentReference: "joi test" } }, (err, response, body) => { @@ -427,7 +427,7 @@ describe('Admin', _ => { json: { apiKey, organizationId: invalidOrganizationId, - packageCode: "SE03", + packageCode: "R-SE03", paymentReference: "joi test" } }, (err, response, body) => { @@ -462,7 +462,7 @@ describe('Admin', _ => { json: { apiKey, organizationId: org1id, - packageCode: "SE12", + packageCode: "R-SE12", paymentReference: "joi test" } }, (err, response, body) => { diff --git a/server/test/test-dashboard-apis.js b/server/test/test-dashboard-apis.js index 90fa1335c..838a8530e 100644 --- a/server/test/test-dashboard-apis.js +++ b/server/test/test-dashboard-apis.js @@ -89,7 +89,7 @@ describe('Dashboard', _ => { json: { apiKey: adminApiKey, organizationId, - packageCode: "SE03", + packageCode: "R-SE03", paymentReference: "joi test" } }, (err, response, body) => { diff --git a/server/test/test-organization-apis.js b/server/test/test-organization-apis.js index 67da409ac..7add6805e 100644 --- a/server/test/test-organization-apis.js +++ b/server/test/test-organization-apis.js @@ -184,7 +184,7 @@ describe('Organization', _ => { json: { apiKey: adminApiKey, organizationId: org1id, - packageCode: "SE03", + packageCode: "R-SE03", paymentReference: "joi test" } }, (err, response, body) => { @@ -201,7 +201,7 @@ describe('Organization', _ => { json: { apiKey: adminApiKey, organizationId: org1id, - packageCode: "SE12", + packageCode: "R-SE12", paymentReference: "joi test" } }, (err, response, body) => { diff --git a/server/test/test-warehouse-apis.js b/server/test/test-warehouse-apis.js index 957e82384..fbcd51955 100644 --- a/server/test/test-warehouse-apis.js +++ b/server/test/test-warehouse-apis.js @@ -182,7 +182,7 @@ describe('Warehouse', _ => { json: { apiKey: adminApiKey, organizationId, - packageCode: "ME03", + packageCode: "R-ME03", paymentReference: "joi test" } }, (err, response, body) => { From 0b96c9de23ed5266346468168b5dc7e086a1209d Mon Sep 17 00:00:00 2001 From: iLGunners Date: Mon, 12 Nov 2018 19:30:57 +0600 Subject: [PATCH 08/26] PageVerify better --- client/src/lang-bn-bd.json | 5 +++-- client/src/lang-en-us.json | 5 +++-- client/src/page-verify.html | 13 +++++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json index 3ede8a0c6..acdba24c4 100644 --- a/client/src/lang-bn-bd.json +++ b/client/src/lang-bn-bd.json @@ -701,8 +701,9 @@ "phoneNowVerified": "আপনার ফোন যাচাই করা হয়েছে।", "phoneCouldNotBeVerified": "আপনার ফোন যাচাই করা যায়নি। নিশ্চিতকরণ যাচাই কোডটি সঠিক কিনা দেখুন।", "verifyPhoneNumberHeader": "ফোন নম্বর যাচাইকরণ", - "verificationTokenInput": "আপনার ফোনে পাঠানো যাচাইকরণ টোকেনটি লিখুন।", - "verificationTokenInputError": "আপনার ফোনে পাঠানো যাচাইকরণ টোকেনটি লিখুন।", + "verificationToken": "আপনার ফোনে পাঠানো যাচাইকরণ টোকেনটি লিখুন।", + "verificationTokenInput": "যাচাইকরণ টোকেনটি।", + "verificationTokenInputError": "সঠিক যাচাইকরণ টোকেনটি।", "resendSms": "এসএমএস আবার পাঠান", "verify": "যাচাই করুন", "dontHaveAccount": "অ্যাকাউন্ট নেই?" diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json index 1e9769abc..d27076900 100644 --- a/client/src/lang-en-us.json +++ b/client/src/lang-en-us.json @@ -700,8 +700,9 @@ "phoneNowVerified": "Your phone is now verified.", "phoneCouldNotBeVerified": "Your phone could not be verified. Make sure the verification code is correct.", "verifyPhoneNumberHeader": "VERIFY PHONE NUMBER", - "verificationTokenInput": "Enter the verification token we sent to your phone.", - "verificationTokenInputError": "Enter the verification token we sent to your phone.", + "verificationToken": "Enter the verification token we sent to your phone.", + "verificationTokenInput": "Verification token.", + "verificationTokenInputError": "Enter valid verification token.", "resendSms": "RESEND SMS", "verify": "Verify", "dontHaveAccount": "Don't have an account?" diff --git a/client/src/page-verify.html b/client/src/page-verify.html index 5887e5e4c..328db638a 100644 --- a/client/src/page-verify.html +++ b/client/src/page-verify.html @@ -31,18 +31,23 @@
+ -
- [[verses.verify.resendSms]] + +
+ [[verses.verify.resendSms]]
- [[verses.verify.verify]] + [[verses.verify.verify]]
+
[[verses.verify.dontHaveAccount]]
+
From e7d43d4262dc8b6ae0b0d4b4d00bcec5da8ffc68 Mon Sep 17 00:00:00 2001 From: iLGunners Date: Tue, 13 Nov 2018 16:07:55 +0600 Subject: [PATCH 09/26] Module Service done --- server/src/apis/add-service-blueprint.js | 3 +++ server/src/apis/edit-outlet-service.js | 3 +++ server/src/apis/edit-service-blueprint.js | 5 ++++- server/src/apis/get-active-service-list.js | 3 +++ server/src/apis/get-service-blueprint-list.js | 3 +++ .../modify-availability-of-service-list-in-outlet-list.js | 3 +++ 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/server/src/apis/add-service-blueprint.js b/server/src/apis/add-service-blueprint.js index 822d1f403..82f28f9d6 100644 --- a/server/src/apis/add-service-blueprint.js +++ b/server/src/apis/add-service-blueprint.js @@ -37,6 +37,9 @@ exports.AddServiceBlueprintApi = class extends Api.mixin(ServiceBlueprintMixin, organizationBy: "organizationId", privilegeList: [ "PRIV_MODIFY_ALL_SERVICE_BLUEPRINTS" + ], + moduleList: [ + "MOD_SERVICE", ] }]; } diff --git a/server/src/apis/edit-outlet-service.js b/server/src/apis/edit-outlet-service.js index 605d63b73..f519611f6 100644 --- a/server/src/apis/edit-outlet-service.js +++ b/server/src/apis/edit-outlet-service.js @@ -36,6 +36,9 @@ exports.EditOutletServiceApi = class extends Api.mixin(ServiceMixin) { ], privilegeList: [ "PRIV_MODIFY_ALL_SERVICE_BLUEPRINTS" + ], + moduleList: [ + "MOD_SERVICE", ] }]; } diff --git a/server/src/apis/edit-service-blueprint.js b/server/src/apis/edit-service-blueprint.js index 6d9b44b3d..b1e110352 100644 --- a/server/src/apis/edit-service-blueprint.js +++ b/server/src/apis/edit-service-blueprint.js @@ -39,7 +39,10 @@ exports.EditServiceBlueprintApi = class extends Api.mixin(ServiceBlueprintMixin) errorCode: "PRODUCT_BLUEPRINT_INVALID" }, privilegeList: [ - "PRIV_MODIFY_ALL_PRODUCT_BLUEPRINTS" + "PRIV_MODIFY_ALL_SERVICE_BLUEPRINTS" + ], + moduleList: [ + "MOD_SERVICE", ] }]; } diff --git a/server/src/apis/get-active-service-list.js b/server/src/apis/get-active-service-list.js index 50b0fbd98..18e614239 100644 --- a/server/src/apis/get-active-service-list.js +++ b/server/src/apis/get-active-service-list.js @@ -26,6 +26,9 @@ exports.GetActiveServiceListApi = class extends Api { }, privilegeList: [ "PRIV_VIEW_ALL_SERVICES" + ], + moduleList: [ + "MOD_SERVICE", ] }]; } diff --git a/server/src/apis/get-service-blueprint-list.js b/server/src/apis/get-service-blueprint-list.js index de657ee51..5879ae371 100644 --- a/server/src/apis/get-service-blueprint-list.js +++ b/server/src/apis/get-service-blueprint-list.js @@ -21,6 +21,9 @@ exports.GetServiceBlueprintListApi = class extends Api { organizationBy: "organizationId", privilegeList: [ "PRIV_VIEW_ALL_SERVICE_BLUEPRINTS" + ], + moduleList: [ + "MOD_SERVICE", ] }]; } diff --git a/server/src/apis/modify-availability-of-service-list-in-outlet-list.js b/server/src/apis/modify-availability-of-service-list-in-outlet-list.js index 4325aef4b..dd6f7bac0 100644 --- a/server/src/apis/modify-availability-of-service-list-in-outlet-list.js +++ b/server/src/apis/modify-availability-of-service-list-in-outlet-list.js @@ -38,6 +38,9 @@ exports.ModifyAvailabilityOfServiceListInOutletListApi = class extends Api.mixin organizationBy: "organizationId", privilegeList: [ "PRIV_MODIFY_ALL_SERVICES_AVAILABILITY_IN_ALL_OUTLETS" + ], + moduleList: [ + "MOD_SERVICE", ] }]; } From 60d02b4bf5af7bc8300a1de118739001253edd0f Mon Sep 17 00:00:00 2001 From: iLGunners Date: Tue, 13 Nov 2018 16:23:34 +0600 Subject: [PATCH 10/26] Module Product done --- server/src/apis/add-product-to-inventory.js | 3 +++ server/src/apis/add-sales-return.js | 3 +++ server/src/apis/bulk-import-product-blueprints.js | 3 +++ server/src/apis/delete-warehouse.js | 3 +++ server/src/apis/edit-inventory-product.js | 3 +++ server/src/apis/edit-product-blueprint.js | 3 +++ server/src/apis/get-aggregated-inventory-details.js | 3 +++ server/src/apis/get-inventory-list.js | 3 +++ server/src/apis/get-product-blueprint-list.js | 3 +++ server/src/apis/get-product.js | 3 +++ server/src/apis/report-inventory-details.js | 3 +++ server/src/apis/transfer-between-inventories.js | 7 ++++++- server/src/legacy-apis/add-warehouse.js | 3 +++ server/src/legacy-apis/delete-product-blueprint.js | 3 +++ server/src/legacy-apis/edit-warehouse.js | 3 +++ server/src/legacy-apis/get-sales-return-list.js | 3 +++ server/src/legacy-apis/get-sales-return.js | 3 +++ server/src/legacy-apis/get-warehouse-list.js | 3 +++ server/src/legacy-apis/get-warehouse.js | 3 +++ 19 files changed, 60 insertions(+), 1 deletion(-) diff --git a/server/src/apis/add-product-to-inventory.js b/server/src/apis/add-product-to-inventory.js index 515c6823f..0f24e719d 100644 --- a/server/src/apis/add-product-to-inventory.js +++ b/server/src/apis/add-product-to-inventory.js @@ -35,6 +35,9 @@ exports.AddProductToInventoryApi = class extends Api.mixin(ProductBlueprintMixin }, privilegeList: [ "PRIV_ADD_PRODUCTS_TO_ALL_INVENTORIES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js index a811dae09..149aa8063 100644 --- a/server/src/apis/add-sales-return.js +++ b/server/src/apis/add-sales-return.js @@ -48,6 +48,9 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi ], privilegeList: [ "PRIV_MODIFY_SALES_RETURN" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/bulk-import-product-blueprints.js b/server/src/apis/bulk-import-product-blueprints.js index ad22bd8e3..8d9877bc0 100644 --- a/server/src/apis/bulk-import-product-blueprints.js +++ b/server/src/apis/bulk-import-product-blueprints.js @@ -22,6 +22,9 @@ exports.BulkImportProductBlueprintsApi = class extends Api.mixin(ProductBlueprin organizationBy: "organizationId", privilegeList: [ "PRIV_MODIFY_ALL_PRODUCT_BLUEPRINTS" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/delete-warehouse.js b/server/src/apis/delete-warehouse.js index 859e2b883..310aec915 100644 --- a/server/src/apis/delete-warehouse.js +++ b/server/src/apis/delete-warehouse.js @@ -26,6 +26,9 @@ exports.DeleteWarehouseApi = class extends Api { }, privilegeList: [ "PRIV_MODIFY_ALL_WAREHOUSES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/edit-inventory-product.js b/server/src/apis/edit-inventory-product.js index 6ff68fa58..35bac568b 100644 --- a/server/src/apis/edit-inventory-product.js +++ b/server/src/apis/edit-inventory-product.js @@ -32,6 +32,9 @@ exports.EditInventoryProductApi = class extends Api.mixin(ProductMixin, Inventor }, privilegeList: [ "PRIV_MODIFY_ALL_PRODUCT_BLUEPRINTS" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/edit-product-blueprint.js b/server/src/apis/edit-product-blueprint.js index 164e7ae0a..2dd342ccd 100644 --- a/server/src/apis/edit-product-blueprint.js +++ b/server/src/apis/edit-product-blueprint.js @@ -41,6 +41,9 @@ exports.EditProductBlueprintApi = class extends Api.mixin(ProductBlueprintMixin) }, privilegeList: [ "PRIV_MODIFY_ALL_PRODUCT_BLUEPRINTS" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/get-aggregated-inventory-details.js b/server/src/apis/get-aggregated-inventory-details.js index fecf08ea6..b92c83a5d 100644 --- a/server/src/apis/get-aggregated-inventory-details.js +++ b/server/src/apis/get-aggregated-inventory-details.js @@ -30,6 +30,9 @@ exports.GetAggregatedInventoryDetailsApi = class extends Api.mixin(InventoryMixi }, privilegeList: [ "PRIV_VIEW_ALL_INVENTORIES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/get-inventory-list.js b/server/src/apis/get-inventory-list.js index 1df63ed0c..d32fc3e42 100644 --- a/server/src/apis/get-inventory-list.js +++ b/server/src/apis/get-inventory-list.js @@ -21,6 +21,9 @@ exports.GetInventoryListApi = class extends Api { organizationBy: "organizationId", privilegeList: [ "PRIV_VIEW_ALL_INVENTORIES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/get-product-blueprint-list.js b/server/src/apis/get-product-blueprint-list.js index b5b51a5b0..cd70d1de4 100644 --- a/server/src/apis/get-product-blueprint-list.js +++ b/server/src/apis/get-product-blueprint-list.js @@ -21,6 +21,9 @@ exports.GetProductBlueprintListApi = class extends Api { organizationBy: "organizationId", privilegeList: [ "PRIV_VIEW_ALL_PRODUCT_BLUEPRINTS" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/get-product.js b/server/src/apis/get-product.js index caf8a4646..6adb1828a 100644 --- a/server/src/apis/get-product.js +++ b/server/src/apis/get-product.js @@ -28,6 +28,9 @@ exports.GetProductApi = class extends Api.mixin(ProductMixin, InventoryMixin) { }, privilegeList: [ "PRIV_VIEW_ALL_INVENTORIES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/report-inventory-details.js b/server/src/apis/report-inventory-details.js index a5194b46a..4bd02c858 100644 --- a/server/src/apis/report-inventory-details.js +++ b/server/src/apis/report-inventory-details.js @@ -33,6 +33,9 @@ exports.ReportInventoryDetailsApi = class extends Api.mixin(InventoryMixin) { }, privilegeList: [ "PRIV_VIEW_ALL_INVENTORIES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/apis/transfer-between-inventories.js b/server/src/apis/transfer-between-inventories.js index d767f9adc..fb7cf6dcc 100644 --- a/server/src/apis/transfer-between-inventories.js +++ b/server/src/apis/transfer-between-inventories.js @@ -42,7 +42,12 @@ exports.TransferBetweenInventoriesApi = class extends Api { select: "organizationId", errorCode: "TO_INVENTORY_INVALID" }, - privilegeList: ["PRIV_TRANSFER_ALL_INVENTORIES"] + privilegeList: [ + "PRIV_TRANSFER_ALL_INVENTORIES" + ], + moduleList: [ + "MOD_PRODUCT", + ] } ]; } diff --git a/server/src/legacy-apis/add-warehouse.js b/server/src/legacy-apis/add-warehouse.js index 2ba33c55a..dd15ec912 100644 --- a/server/src/legacy-apis/add-warehouse.js +++ b/server/src/legacy-apis/add-warehouse.js @@ -26,6 +26,9 @@ exports.AddWarehouseApi = class extends inventoryCommonMixin(LegacyApi) { organizationBy: "organizationId", privilegeList: [ "PRIV_MODIFY_ALL_WAREHOUSES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/legacy-apis/delete-product-blueprint.js b/server/src/legacy-apis/delete-product-blueprint.js index f6662cffc..2db7926ab 100644 --- a/server/src/legacy-apis/delete-product-blueprint.js +++ b/server/src/legacy-apis/delete-product-blueprint.js @@ -28,6 +28,9 @@ exports.DeleteProductBlueprintApi = class extends collectionCommonMixin(LegacyAp }, privilegeList: [ "PRIV_MODIFY_ALL_PRODUCT_BLUEPRINTS" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/legacy-apis/edit-warehouse.js b/server/src/legacy-apis/edit-warehouse.js index 888173cfa..c90a6a1d1 100644 --- a/server/src/legacy-apis/edit-warehouse.js +++ b/server/src/legacy-apis/edit-warehouse.js @@ -31,6 +31,9 @@ exports.EditWarehouseApi = class extends collectionCommonMixin(LegacyApi) { }, privilegeList: [ "PRIV_MODIFY_ALL_WAREHOUSES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/legacy-apis/get-sales-return-list.js b/server/src/legacy-apis/get-sales-return-list.js index cf222c51c..cd346689b 100644 --- a/server/src/legacy-apis/get-sales-return-list.js +++ b/server/src/legacy-apis/get-sales-return-list.js @@ -34,6 +34,9 @@ exports.GetSalesReturnListApi = class extends outletCommonMixin(customerCommonMi organizationBy: "organizationId", privilegeList: [ "PRIV_VIEW_SALES_RETURN" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/legacy-apis/get-sales-return.js b/server/src/legacy-apis/get-sales-return.js index 0e9e33112..4d1a379ab 100644 --- a/server/src/legacy-apis/get-sales-return.js +++ b/server/src/legacy-apis/get-sales-return.js @@ -41,6 +41,9 @@ exports.GetSalesReturnApi = class extends collectionCommonMixin(LegacyApi) { ], privilegeList: [ "PRIV_VIEW_SALES_RETURN" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/legacy-apis/get-warehouse-list.js b/server/src/legacy-apis/get-warehouse-list.js index e2e525095..adb245250 100644 --- a/server/src/legacy-apis/get-warehouse-list.js +++ b/server/src/legacy-apis/get-warehouse-list.js @@ -22,6 +22,9 @@ exports.GetWarehouseListApi = class extends LegacyApi { organizationBy: "organizationId", privilegeList: [ "PRIV_VIEW_ALL_WAREHOUSES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } diff --git a/server/src/legacy-apis/get-warehouse.js b/server/src/legacy-apis/get-warehouse.js index 35d40b426..e4b867ba2 100644 --- a/server/src/legacy-apis/get-warehouse.js +++ b/server/src/legacy-apis/get-warehouse.js @@ -28,6 +28,9 @@ exports.GetWarehouseApi = class extends collectionCommonMixin(inventoryCommonMix }, privilegeList: [ "PRIV_VIEW_ALL_WAREHOUSES" + ], + moduleList: [ + "MOD_PRODUCT", ] }]; } From 225bfba0b5297b73963dc2795045c341a89941b4 Mon Sep 17 00:00:00 2001 From: Sayem Shafayet Date: Tue, 13 Nov 2018 22:46:21 +0600 Subject: [PATCH 11/26] Added Terms and Conditions --- client/src/lang-bn-bd.json | 6 ++ client/src/lang-en-us.json | 6 ++ client/src/page-register.html | 74 ++++++++++++----- client/src/page-toc.html | 146 ++++++++++++++++++++++++++++++++++ client/src/torque-app.html | 2 + 5 files changed, 214 insertions(+), 20 deletions(-) create mode 100644 client/src/page-toc.html diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json index acdba24c4..4c53cf003 100644 --- a/client/src/lang-bn-bd.json +++ b/client/src/lang-bn-bd.json @@ -108,6 +108,12 @@ "passwordInput": "আপনার সর্বনিম্ন ৮ অক্ষরের একটি পাসওয়ার্ড দিন", "passwordInputError": "সর্বনিম্ন ৮ অক্ষরের একটি পাসওয়ার্ড দিন", "alreadyHaveAccount": "আপনার কি ইতিমধ্যে একটি একাউন্ট আছে?", + "tocNotRead": "আপনি নিবন্ধন করার আগে আপনাকে অবশ্যই শর্তাবলী পড়তে হবে।", + "tocNotAgreed": "নিবন্ধন করার আগে আপনাকে অবশ্যই শর্তাবলীতে সম্মত হতে হবে।", + "tocLinkPart1": "আপনি নিবন্ধন করার আগে ", + "tocLinkPart2": " শর্তাবলী ", + "tocLinkPart3": " অনুগ্রহ করে পড়ুন।", + "tocCheckbox": "আমি উপরের শর্তাবলী পড়ে এবং বুঝে সম্মতি দিচ্ছি।", "nowAUserOfTorque": "আপনি এখন লিপির একটি ব্যবহারকারী। আপনি এখন লগ ইন করতে পারেন।" }, "sidebar": { diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json index d27076900..19089a36a 100644 --- a/client/src/lang-en-us.json +++ b/client/src/lang-en-us.json @@ -108,6 +108,12 @@ "passwordInput": "A minimum 8 digit password", "passwordInputError": "Enter a password at least 8 characters long.", "alreadyHaveAccount": "Already have an account?", + "tocNotRead": "You must read the Terms and Conditions before you proceed.", + "tocNotAgreed": "You must agree to the Terms and Conditions before you proceed.", + "tocLinkPart1": "Please read the ", + "tocLinkPart2": "The Terms and Conditions", + "tocLinkPart3": " before you register.", + "tocCheckbox": "I have read, understood and agree to the Terms and Conditions above.", "nowAUserOfTorque": "You are now a user of Torque. You now may log in." }, "sidebar": { diff --git a/client/src/page-register.html b/client/src/page-register.html index feede55cf..a270c3f22 100644 --- a/client/src/page-register.html +++ b/client/src/page-register.html @@ -20,7 +20,11 @@