New price
-{{($ctrl.saleClaimed.quantity * $ctrl.saleClaimed.sale.price) - - (($ctrl.newDiscount * ($ctrl.saleClaimed.quantity * $ctrl.saleClaimed.sale.price))/100) - | currency: 'EUR':2}} -
-New price
+{{($ctrl.saleClaimed.quantity * $ctrl.saleClaimed.sale.price) - + (($ctrl.newDiscount * ($ctrl.saleClaimed.quantity * $ctrl.saleClaimed.sale.price))/100) + | currency: 'EUR':2}} +
\ No newline at end of file
diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml
index 6c33a779fe..27a9eb9a98 100644
--- a/modules/claim/front/locale/es.yml
+++ b/modules/claim/front/locale/es.yml
@@ -3,6 +3,7 @@ Add sale: Añadir linea
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Client Id: Id cliente
Claimed ticket: Ticket reclamado
+Delete claim: Eliminar reclamación
Observation: Observación
Responsible: Responsable
Remove sale: Borrar linea
@@ -11,4 +12,5 @@ Created: Creado
Send Pickup order: Enviar orden de recogida
Show Pickup order: Ver orden de recogida
Search claim by id or client name: Buscar reclamaciones por identificador o nombre de cliente
+Claim deleted!: Reclamación eliminada!
diff --git a/modules/client/back/methods/address/createDefaultAddress.js b/modules/client/back/methods/address/createDefaultAddress.js
index 46691717cb..c757f9f858 100644
--- a/modules/client/back/methods/address/createDefaultAddress.js
+++ b/modules/client/back/methods/address/createDefaultAddress.js
@@ -19,23 +19,25 @@ module.exports = function(Self) {
Self.createDefaultAddress = async data => {
const Address = Self.app.models.Address;
const Client = Self.app.models.Client;
- const transaction = await Address.beginTransaction({});
+ const tx = await Address.beginTransaction({});
try {
+ let options = {transaction: tx};
+
let address = data.address;
- let newAddress = await Address.create(address, {transaction});
- let client = await Client.findById(address.clientFk, {transaction});
+ let newAddress = await Address.create(address, options);
+ let client = await Client.findById(address.clientFk, options);
if (data.isDefaultAddress) {
await client.updateAttributes({
defaultAddressFk: newAddress.id
- }, {transaction});
+ }, options);
}
- await transaction.commit();
+ await tx.commit();
return newAddress;
} catch (e) {
- await transaction.rollback();
+ await tx.rollback();
throw e;
}
};
diff --git a/modules/client/back/methods/client/confirmTransaction.js b/modules/client/back/methods/client/confirmTransaction.js
index 30a09c5a19..467a8627ba 100644
--- a/modules/client/back/methods/client/confirmTransaction.js
+++ b/modules/client/back/methods/client/confirmTransaction.js
@@ -19,15 +19,17 @@ module.exports = Self => {
});
Self.confirmTransaction = async(ctx, id) => {
- let transaction = await Self.beginTransaction({});
let userId = ctx.req.accessToken.userId;
+ let tx = await Self.beginTransaction({});
try {
- let oldTpvTransaction = await Self.app.models.TpvTransaction.findById(id, {options: transaction});
+ let options = {transaction: tx};
- let confirm = await Self.rawSql('CALL hedera.tpvTransactionConfirmById(?)', [id], {options: transaction});
+ let oldTpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options);
- let tpvTransaction = await Self.app.models.TpvTransaction.findById(id, {options: transaction});
+ let confirm = await Self.rawSql('CALL hedera.tpvTransaction_confirmById(?)', [id], options);
+
+ let tpvTransaction = await Self.app.models.TpvTransaction.findById(id, null, options);
let oldInstance = {status: oldTpvTransaction.status};
let newInstance = {status: tpvTransaction.status};
@@ -42,12 +44,12 @@ module.exports = Self => {
newInstance: newInstance
};
- await Self.app.models.ClientLog.create(logRecord, {options: transaction});
+ await Self.app.models.ClientLog.create(logRecord, options);
- await transaction.commit();
+ await tx.commit();
return confirm;
} catch (e) {
- await transaction.rollback();
+ await tx.rollback();
throw e;
}
};
diff --git a/modules/client/back/methods/client/createWithUser.js b/modules/client/back/methods/client/createWithUser.js
index de18d4f4db..36ab284431 100644
--- a/modules/client/back/methods/client/createWithUser.js
+++ b/modules/client/back/methods/client/createWithUser.js
@@ -25,10 +25,12 @@ module.exports = function(Self) {
};
const Account = Self.app.models.Account;
const Address = Self.app.models.Address;
- const transaction = await Account.beginTransaction({});
+ const tx = await Account.beginTransaction({});
try {
- let account = await Account.create(user, {transaction});
+ let options = {transaction: tx};
+
+ let account = await Account.create(user, options);
let client = await Self.create({
id: account.id,
name: data.name,
@@ -42,7 +44,7 @@ module.exports = function(Self) {
provinceFk: data.provinceFk,
countryFk: data.countryFk,
isEqualizated: data.isEqualizated
- }, {transaction});
+ }, options);
let address = await Address.create({
@@ -54,16 +56,16 @@ module.exports = function(Self) {
provinceFk: client.provinceFk,
isEqualizated: client.isEqualizated,
isActive: true
- }, {transaction});
+ }, options);
await client.updateAttributes({
defaultAddressFk: address.id
- }, {transaction});
+ }, options);
- await transaction.commit();
+ await tx.commit();
return client;
} catch (e) {
- await transaction.rollback();
+ await tx.rollback();
throw e;
}
};
diff --git a/modules/client/back/methods/client/specs/confirmTransaction.spec.js b/modules/client/back/methods/client/specs/confirmTransaction.spec.js
index 3b54102316..5fe638001b 100644
--- a/modules/client/back/methods/client/specs/confirmTransaction.spec.js
+++ b/modules/client/back/methods/client/specs/confirmTransaction.spec.js
@@ -5,7 +5,7 @@ describe('Client confirmTransaction', () => {
afterAll(async done => {
await app.models.Client.rawSql(`
- CALL hedera.tpvTransactionUndo(?)`, [transactionId]);
+ CALL hedera.tpvTransaction_undo(?)`, [transactionId]);
done();
});
diff --git a/modules/client/back/methods/client/uploadFile.js b/modules/client/back/methods/client/uploadFile.js
index 7187d684f2..6b7a494590 100644
--- a/modules/client/back/methods/client/uploadFile.js
+++ b/modules/client/back/methods/client/uploadFile.js
@@ -50,11 +50,12 @@ module.exports = Self => {
Self.uploadFile = async(ctx, id) => {
const models = Self.app.models;
- const transaction = await Self.beginTransaction({});
- const options = {transaction};
const promises = [];
+ const tx = await Self.beginTransaction({});
try {
+ const options = {transaction: tx};
+
const uploadedFiles = await models.Dms.uploadFile(ctx, options);
uploadedFiles.forEach(dms => {
const newClientDms = models.ClientDms.create({
@@ -66,11 +67,11 @@ module.exports = Self => {
});
const resolvedPromises = await Promise.all(promises);
- await transaction.commit();
+ await tx.commit();
return resolvedPromises;
} catch (err) {
- await transaction.rollback();
+ await tx.rollback();
throw err;
}
};
diff --git a/modules/client/back/methods/credit-classification/createWithInsurance.js b/modules/client/back/methods/credit-classification/createWithInsurance.js
index 66e11d2711..368e9a41a1 100644
--- a/modules/client/back/methods/credit-classification/createWithInsurance.js
+++ b/modules/client/back/methods/credit-classification/createWithInsurance.js
@@ -23,11 +23,13 @@ module.exports = Self => {
});
Self.createWithInsurance = async(data, ctx) => {
- let transaction = await Self.beginTransaction({});
+ let tx = await Self.beginTransaction({});
try {
+ let options = {transaction: tx};
+
let classificationSchema = {client: data.clientFk, started: data.started};
- let newClassification = await Self.create(classificationSchema, {transaction});
+ let newClassification = await Self.create(classificationSchema, options);
let CreditInsurance = Self.app.models.CreditInsurance;
let insuranceSchema = {
creditClassification: newClassification.id,
@@ -35,13 +37,13 @@ module.exports = Self => {
grade: data.grade
};
- let newCreditInsurance = await CreditInsurance.create(insuranceSchema, {transaction});
- await transaction.commit();
+ let newCreditInsurance = await CreditInsurance.create(insuranceSchema, options);
+ await tx.commit();
await CreditInsurance.messageSend(newCreditInsurance, ctx.req.accessToken);
return newClassification;
} catch (e) {
- transaction.rollback();
+ await tx.rollback();
throw e;
}
};
diff --git a/modules/client/front/address/create/index.html b/modules/client/front/address/create/index.html
index 344d56be75..58c5cf817f 100644
--- a/modules/client/front/address/create/index.html
+++ b/modules/client/front/address/create/index.html
@@ -6,6 +6,14 @@
save="post"
form="form">
+