diff --git a/db/changes/10500-november/00-deletePickupContact.sql b/db/changes/10500-november/00-deletePickupContact.sql
new file mode 100644
index 000000000..6bfa662c5
--- /dev/null
+++ b/db/changes/10500-november/00-deletePickupContact.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`claimConfig` DROP COLUMN `pickupContact`;
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index a744b21c3..3f364bb42 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1778,10 +1778,10 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina
(1, 31, 4, 21, 2),
(2, 32, 3, 21, 3);
-INSERT INTO `vn`.`claimConfig`(`id`, `pickupContact`, `maxResponsibility`)
+INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`)
VALUES
- (1, 'Contact description', 50),
- (2, 'Contact description', 30);
+ (1, 50),
+ (2, 30);
INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`)
VALUES
@@ -1791,7 +1791,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
(1104, 2500, 150.00, 0.02, 0.10, 1.00);
INSERT INTO vn.claimRma (`id`, `code`, `created`, `workerFk`)
-VALUES
+ VALUES
(1, '02676A049183', DEFAULT, 1106),
(2, '02676A049183', DEFAULT, 1106),
(3, '02676A049183', DEFAULT, 1107),
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 1e151294f..f03441c0f 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -134,6 +134,7 @@
"Password does not meet requirements": "Password does not meet requirements",
"You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
"Not enough privileges to edit a client": "Not enough privileges to edit a client",
+ "Claim pickup order sent": "Claim pickup order sent [({{claimId}})]({{{claimUrl}}}) to client *{{clientName}}*",
"You don't have grant privilege": "You don't have grant privilege",
"You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user"
}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index a41315dd1..626e35b5b 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -236,6 +236,7 @@
"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+ "Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
"You don't have grant privilege": "No tienes privilegios para dar privilegios",
"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario"
}
diff --git a/modules/claim/back/methods/claim/claimPickupEmail.js b/modules/claim/back/methods/claim/claimPickupEmail.js
index 4d64cc66e..c688d6ded 100644
--- a/modules/claim/back/methods/claim/claimPickupEmail.js
+++ b/modules/claim/back/methods/claim/claimPickupEmail.js
@@ -9,7 +9,7 @@ module.exports = Self => {
arg: 'id',
type: 'number',
required: true,
- description: 'The client id',
+ description: 'The claim id',
http: {source: 'path'}
},
{
@@ -42,6 +42,11 @@ module.exports = Self => {
});
Self.claimPickupEmail = async ctx => {
+ const models = Self.app.models;
+ const userId = ctx.req.accessToken.userId;
+ const $t = ctx.req.__; // $translate
+ const origin = ctx.req.headers.origin;
+
const args = Object.assign({}, ctx.args);
const params = {
recipient: args.recipient,
@@ -52,6 +57,34 @@ module.exports = Self => {
for (const param in args)
params[param] = args[param];
+ const claim = await models.Claim.findById(args.id, {
+ fields: ['id', 'clientFk'],
+ include: {
+ relation: 'client',
+ scope: {
+ fields: ['name', 'salesPersonFk']
+ }
+ }
+ });
+
+ const message = $t('Claim pickup order sent', {
+ claimId: args.id,
+ clientName: claim.client().name,
+ claimUrl: `${origin}/#!/claim/${args.id}/summary`,
+ });
+
+ const salesPersonId = claim.client().salesPersonFk;
+ if (salesPersonId)
+ await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
+
+ await models.ClaimLog.create({
+ originFk: args.id,
+ userFk: userId,
+ action: 'insert',
+ description: 'Claim-pickup-order sent',
+ changedModel: 'Mail'
+ });
+
const email = new Email('claim-pickup-order', params);
return email.send();
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index 7a91e180a..16e134c60 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -19,7 +19,7 @@
readonly="true">
@@ -56,7 +56,7 @@
label="Pick up"
ng-model="$ctrl.claim.hasToPickUp"
vn-acl="claimManager"
- info="When checked will notify to the salesPerson">
+ title="{{'When checked will notify to the salesPerson' | translate}}">
diff --git a/modules/claim/front/basic-data/locale/es.yml b/modules/claim/front/basic-data/locale/es.yml
index c51afee3f..5250d266c 100644
--- a/modules/claim/front/basic-data/locale/es.yml
+++ b/modules/claim/front/basic-data/locale/es.yml
@@ -5,5 +5,5 @@ Responsability: Responsabilidad
Company: Empresa
Sales/Client: Comercial/Cliente
Pick up: Recoger
-When checked will notify a pickup to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial
-Packages received: Bultos recibidos
\ No newline at end of file
+When checked will notify to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial
+Packages received: Bultos recibidos
diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html
index 0c12aa2e6..6adbfd684 100644
--- a/modules/claim/front/summary/index.html
+++ b/modules/claim/front/summary/index.html
@@ -25,16 +25,23 @@
-
-
-
-
-
-
+