verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge pull request 'salesPersonUser replaces salesPerson relation' (#378) from 2396-client_model_replace_relation_salesPerson into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #378
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-09-16 08:36:26 +00:00
parent 826b4a6f4b 5b69ce983c
commit c980155e6f
30 changed files with 103 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/claim/back/methods/claim/getSummary.js
View File

@ -51,15 +51,9 @@ module.exports = Self => {
scope: {
fields: ['salesPersonFk', 'name'],
include: {
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['nickname']
}
}
fields: ['id', 'name']
}
}
}

7
modules/claim/back/methods/claim/regularizeClaim.js
View File

@ -45,7 +45,7 @@ module.exports = Self => {
if (addressId)
address = await models.Address.findById(addressId, null, options);
const salesPerson = sale.ticket().client().salesPerson();
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
const nickname = address && address.nickname || destination.description;
const origin = ctx.req.headers.origin;
@ -113,7 +113,10 @@ module.exports = Self => {
relation: 'client',
scope: {
include: {
relation: 'salesPerson'
relation: 'salesPersonUser',
scope: {
fields: ['id', 'name']
}
}
}
}

2
modules/claim/front/summary/index.html
View File

@ -16,7 +16,7 @@
</vn-label-value>
<vn-label-value
label="Salesperson"
value="{{$ctrl.summary.claim.client.salesPerson.user.nickname}}">
value="{{$ctrl.summary.claim.client.salesPersonUser.name}}">
</vn-label-value>
<vn-label-value
label="Attended by"

1
modules/client/back/methods/client/createWithUser.js
View File

@ -46,7 +46,6 @@ module.exports = function(Self) {
isEqualizated: data.isEqualizated
}, options);
let address = await Address.create({
clientFk: client.id,
nickname: client.name,

11
modules/client/back/methods/client/getCard.js
View File

@ -25,17 +25,6 @@ module.exports = function(Self) {
},
include: [
{
relation: 'salesPerson',
scope: {
fields: ['userFk', 'firstName'],
include: {
relation: 'user',
scope: {
fields: ['name', 'nickname']
}
}
}
}, {
relation: 'contactChannel',
scope: {
fields: ['id', 'name']

22
modules/client/back/methods/client/getTransactions.js
View File

@ -25,17 +25,17 @@ module.exports = Self => {
let conn = Self.dataSource.connector;
let stmt = new ParameterizedSQL(`
SELECT
t.id,
t.clientFk,
t.created,
t.amount / 100 amount,
t.receiptFk IS NOT NULL AS isConfirmed,
tt.message responseMessage,
te.message errorMessage
FROM hedera.tpvTransaction t
JOIN hedera.tpvMerchant m ON m.id = t.merchantFk
LEFT JOIN hedera.tpvResponse tt ON tt.id = t.response
LEFT JOIN hedera.tpvError te ON te.code = errorCode`);
t.id,
t.clientFk,
t.created,
t.amount / 100 amount,
t.receiptFk IS NOT NULL AS isConfirmed,
tt.message responseMessage,
te.message errorMessage
FROM hedera.tpvTransaction t
JOIN hedera.tpvMerchant m ON m.id = t.merchantFk
LEFT JOIN hedera.tpvResponse tt ON tt.id = t.response
LEFT JOIN hedera.tpvError te ON te.code = errorCode`);
stmt.merge(conn.makeSuffix(filter, 't'));

4
modules/client/back/methods/client/hasCustomerRole.js
View File

@ -30,8 +30,8 @@ module.exports = Self => {
});
Self.hasCustomerRole = (id, context, callback) => {
let query =
`SELECT COUNT(*) > 0 isCustomer
let query = `
SELECT COUNT(*) > 0 isCustomer
FROM salix.Account A
JOIN salix.Role r ON r.id = A.roleFK
WHERE r.name = 'customer'

10
modules/client/back/methods/client/isValidClient.js
View File

@ -30,12 +30,12 @@ module.exports = Self => {
});
Self.isValidClient = async id => {
let query =
`SELECT r.name
let query = `
SELECT r.name
FROM salix.Account a
JOIN vn.client c ON a.id = c.id
JOIN salix.RoleMapping rm ON rm.principalId = a.id
JOIN salix.Role r ON r.id = rm.roleId
JOIN vn.client c ON a.id = c.id
JOIN salix.RoleMapping rm ON rm.principalId = a.id
JOIN salix.Role r ON r.id = rm.roleId
WHERE a.id = ? AND c.isActive AND c.isTaxDataChecked`;
let roleNames = await Self.rawSql(query, [id]);

10
modules/client/back/methods/client/summary.js
View File

@ -42,15 +42,9 @@ module.exports = Self => {
}
},
{
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['name']
}
}
fields: ['id', 'name']
}
},
{

1
modules/client/back/methods/credit-classification/createWithInsurance.js
View File

@ -25,7 +25,6 @@ module.exports = Self => {
Self.createWithInsurance = async(data, ctx) => {
const tx = await Self.beginTransaction({});
const models = Self.app.models;
const $t = ctx.req.__; // $translate
try {
let options = {transaction: tx};

2
modules/client/back/models/client.js
View File

@ -105,7 +105,7 @@ module.exports = Self => {
});
function hasSalesMan(err) {
if (this.payMethod && !this.salesPerson)
if (this.payMethod && !this.salesPersonUser)
err();
}

5
modules/client/back/models/client.json
View File

@ -131,11 +131,6 @@
"model": "PayMethod",
"foreignKey": "payMethodFk"
},
"salesPerson": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "salesPersonFk"
},
"salesPersonUser": {
"type": "belongsTo",
"model": "Account",

2
modules/client/back/models/credit-insurance.js
View File

@ -51,7 +51,7 @@ module.exports = function(Self) {
const data = ctx.instance;
const insurance = await Self.findById(data.id, null, options);
const client = insurance.classification().customer();
const salesPerson = client.salesPerson();
const salesPerson = client.salesPersonUser();
if (!salesPerson) return;

10
modules/client/back/models/credit-insurance.json
View File

@ -43,15 +43,9 @@
"scope": {
"fields": ["name", "salesPersonFk"],
"include": {
"relation": "salesPerson",
"relation": "salesPersonUser",
"scope": {
"fields": "userFk",
"include": {
"relation": "user",
"scope": {
"fields": ["name"]
}
}
"fields": ["id", "name"]
}
}
}

2
modules/client/front/descriptor/index.html
View File

@ -39,7 +39,7 @@
<span
ng-click="workerDescriptor.show($event, $ctrl.client.salesPersonFk)"
class="link">
{{$ctrl.client.salesPerson.user.name}}
{{$ctrl.client.salesPersonUser.name}}
</span>
</vn-label-value>
</div>

4
modules/client/front/summary/index.html
View File

@ -1,5 +1,5 @@
<vn-card class="summary">
<h5>{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPerson.user.nickname}}</h5>
<h5>{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPersonUser.name}}</h5>
<vn-horizontal>
<vn-one>
<h4 translate>Basic data</h4>
@ -25,7 +25,7 @@
<span
ng-click="workerDescriptor.show($event, $ctrl.summary.salesPersonFk)"
class="link">
{{$ctrl.summary.salesPerson.user.name}}
{{$ctrl.summary.salesPersonUser.name}}
</span>
</vn-label-value>
<vn-label-value label="Channel"

49
modules/order/back/methods/order/catalogFilter.js
View File

@ -91,30 +91,31 @@ module.exports = Self => {
]
));
stmt = new ParameterizedSQL(`SELECT
i.id,
i.name,
i.subName,
i.image,
i.tag5,
i.value5,
i.tag6,
i.value6,
i.tag7,
i.value7,
i.tag8,
i.value8,
tci.price,
tci.available,
w.lastName AS lastName,
w.firstName,
tci.priceKg,
ink.hex
FROM tmp.ticketCalculateItem tci
JOIN vn.item i ON i.id = tci.itemFk
JOIN vn.itemType it ON it.id = i.typeFk
JOIN vn.ink ON ink.id = i.inkFk
JOIN vn.worker w on w.id = it.workerFk`);
stmt = new ParameterizedSQL(`
SELECT
i.id,
i.name,
i.subName,
i.image,
i.tag5,
i.value5,
i.tag6,
i.value6,
i.tag7,
i.value7,
i.tag8,
i.value8,
tci.price,
tci.available,
w.lastName AS lastName,
w.firstName,
tci.priceKg,
ink.hex
FROM tmp.ticketCalculateItem tci
JOIN vn.item i ON i.id = tci.itemFk
JOIN vn.itemType it ON it.id = i.typeFk
JOIN vn.ink ON ink.id = i.inkFk
JOIN vn.worker w on w.id = it.workerFk`);
// Apply order by tag
if (orderBy.isTag) {

20
modules/order/back/methods/order/getItemTypeAvailable.js
View File

@ -38,16 +38,16 @@ module.exports = Self => {
order.agencyModeFk
]);
stmts.push(stmt);
stmt = new ParameterizedSQL(`SELECT it.id, it.name, ic.name categoryName
FROM tmp.availableCalc ac
JOIN cache.available a ON a.calc_id = ac.calcFk
JOIN item i ON i.id = a.item_id
JOIN itemType it ON it.id = i.typeFk
JOIN itemCategory ic ON ic.id = it.categoryFk
WHERE it.categoryFk = ?
GROUP BY it.id`, [
itemCategoryId
]);
stmt = new ParameterizedSQL(`
SELECT it.id, it.name, ic.name categoryName
FROM tmp.availableCalc ac
JOIN cache.available a ON a.calc_id = ac.calcFk
JOIN item i ON i.id = a.item_id
JOIN itemType it ON it.id = i.typeFk
JOIN itemCategory ic ON ic.id = it.categoryFk
WHERE it.categoryFk = ?
GROUP BY it.id`, [itemCategoryId]
);
let categoriesIndex = stmts.push(stmt) - 1;
let sql = ParameterizedSQL.join(stmts, ';');

1
modules/order/back/methods/order/getTaxes.js
View File

@ -28,7 +28,6 @@ module.exports = Self => {
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.order');
stmt = new ParameterizedSQL(`
CREATE TEMPORARY TABLE tmp.order
(INDEX (orderFk))

9
modules/order/back/methods/order/summary.js
View File

@ -31,14 +31,17 @@ module.exports = Self => {
async function getOrderData(Self, orderId) {
let filter = {
include: [
{relation: 'agencyMode', scope: {fields: ['name']}},
{
relation: 'agencyMode', scope: {fields: ['name']}},
{
relation: 'client',
scope: {
fields: ['salesPersonFk', 'name'],
include: {
relation: 'salesPerson',
fields: ['firstName', 'name']
relation: 'salesPersonUser',
scope: {
fields: ['id', 'name']
}
}
}
},

10
modules/order/front/card/index.js
View File

@ -31,15 +31,9 @@ class Controller extends ModuleCard {
'isTaxDataChecked'
],
include: {
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['name']
}
}
fields: ['id', 'name']
}
}
}

2
modules/order/front/descriptor/index.html
View File

@ -19,7 +19,7 @@
<span
ng-click="workerDescriptor.show($event, $ctrl.order.client.salesPersonFk)"
class="link">
{{$ctrl.order.client.salesPerson.user.name}}
{{$ctrl.order.client.salesPersonUser.name}}
</span>
</vn-label-value>
<vn-label-value

7
modules/ticket/back/methods/ticket/deleteStowaway.js
View File

@ -31,7 +31,10 @@ module.exports = Self => {
relation: 'client',
scope: {
include: {
relation: 'salesPerson'
relation: 'salesPersonUser',
scope: {
fields: ['id', 'name']
}
}
}
}]
@ -69,7 +72,7 @@ module.exports = Self => {
await ticketTracking.destroy();
const salesPerson = ticket.client().salesPerson();
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
const origin = ctx.req.headers.origin;
const message = $t('This ticket is not an stowaway anymore', {

12
modules/ticket/back/methods/ticket/filter.js
View File

@ -260,12 +260,12 @@ module.exports = Self => {
stmt = new ParameterizedSQL(`
SELECT
f.*,
tt.total,
tp.*
FROM tmp.filter f
LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticketTotal tt ON tt.ticketFk = f.id`);
f.*,
tt.total,
tp.*
FROM tmp.filter f
LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = f.id
LEFT JOIN tmp.ticketTotal tt ON tt.ticketFk = f.id`);
if (args.problems != undefined && (!args.from && !args.to))
throw new UserError('Choose a date range or days forward');

14
modules/ticket/back/methods/ticket/setDeleted.js
View File

@ -89,12 +89,9 @@ module.exports = Self => {
scope: {
fields: ['id', 'salesPersonFk'],
include: {
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['id', 'userFk'],
include: {
relation: 'user'
}
fields: ['id', 'name']
}
}
}
@ -121,15 +118,14 @@ module.exports = Self => {
}
// Send notification to salesPerson
const salesPerson = ticket.client().salesPerson();
if (salesPerson) {
const salesPersonUser = salesPerson.user().name;
const salesPersonUser = ticket.client().salesPersonUser();
if (salesPersonUser) {
const origin = ctx.req.headers.origin;
const message = $t(`Has deleted the ticket id`, {
id: id,
url: `${origin}/#!/ticket/${id}/summary`
});
await models.Chat.send(ctx, `@${salesPersonUser}`, message);
await models.Chat.send(ctx, `@${salesPersonUser.name}`, message);
}
return ticket.updateAttribute('isDeleted', true);

10
modules/ticket/back/methods/ticket/summary.js
View File

@ -57,15 +57,9 @@ module.exports = Self => {
scope: {
fields: ['salesPersonFk', 'name', 'phone', 'mobile'],
include: {
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['name']
}
}
fields: ['id', 'name']
}
}
}

10
modules/ticket/front/card/index.js
View File

@ -38,15 +38,9 @@ class Controller extends ModuleCard {
'mobile'
],
include: {
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['name']
}
}
fields: ['id', 'name']
}
},
},

2
modules/ticket/front/descriptor/index.html
View File

@ -94,7 +94,7 @@
<span
ng-click="workerDescriptor.show($event, $ctrl.ticket.client.salesPersonFk)"
class="link">
{{$ctrl.ticket.client.salesPerson.user.name}}
{{$ctrl.ticket.client.salesPersonUser.name}}
</span>
</vn-label-value>
<vn-label-value

10
modules/ticket/front/descriptor/index.js
View File

@ -204,15 +204,9 @@ class Controller extends Descriptor {
'isTaxDataChecked'
],
include: {
relation: 'salesPerson',
relation: 'salesPersonUser',
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['name']
}
}
fields: ['id', 'name']
}
}
}

2
modules/ticket/front/summary/index.html
View File

@ -22,7 +22,7 @@
<span
ng-click="workerDescriptor.show($event, $ctrl.summary.client.salesPersonFk)"
class="link">
{{$ctrl.summary.client.salesPerson.user.name}}
{{$ctrl.summary.client.salesPersonUser.name}}
</span>
</vn-label-value>
<vn-label-value label="Agency"