Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
commit
9e9807c4b5
16
CHANGELOG.md
16
CHANGELOG.md
|
|
@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [2310.01] - 2023-03-23
|
||||
|
||||
### Added
|
||||
-
|
||||
|
||||
### Changed
|
||||
-
|
||||
|
||||
### Fixed
|
||||
-
|
||||
|
||||
## [2308.01] - 2023-03-09
|
||||
|
||||
### Added
|
||||
|
|
@ -14,10 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
- (Trabajador -> PDA) Nueva sección
|
||||
|
||||
### Changed
|
||||
-
|
||||
|
||||
### Fixed
|
||||
-
|
||||
- (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono
|
||||
|
||||
## [2306.01] - 2023-02-23
|
||||
|
||||
|
|
|
|||
|
|
@ -2787,6 +2787,10 @@ INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
|
|||
VALUES
|
||||
(1, NULL, 1);
|
||||
|
||||
INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
|
||||
VALUES
|
||||
(1, 12);
|
||||
|
||||
INSERT INTO `vn`.`deviceProductionModels` (`code`)
|
||||
VALUES
|
||||
('BLACKVIEW'),
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ describe('ticket ticketCalculateClon()', () => {
|
|||
originalTicketId: 11
|
||||
};
|
||||
|
||||
stmt = new ParameterizedSQL('CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
|
||||
stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
|
||||
params.clientFk,
|
||||
params.shipped,
|
||||
params.warehouseFk,
|
||||
|
|
@ -31,7 +31,8 @@ describe('ticket ticketCalculateClon()', () => {
|
|||
params.agencyType,
|
||||
params.routeFk,
|
||||
params.landed,
|
||||
params.userId
|
||||
params.userId,
|
||||
true
|
||||
]);
|
||||
stmts.push(stmt);
|
||||
|
||||
|
|
@ -71,7 +72,7 @@ describe('ticket ticketCalculateClon()', () => {
|
|||
originalTicketId: 11
|
||||
};
|
||||
|
||||
stmt = new ParameterizedSQL('CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
|
||||
stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [
|
||||
params.clientFk,
|
||||
params.shipped,
|
||||
params.warehouseFk,
|
||||
|
|
@ -80,7 +81,8 @@ describe('ticket ticketCalculateClon()', () => {
|
|||
params.agencyType,
|
||||
params.routeFk,
|
||||
params.landed,
|
||||
params.userId
|
||||
params.userId,
|
||||
true
|
||||
]);
|
||||
stmts.push(stmt);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||
|
||||
describe('ticket ticketCreateWithUser()', () => {
|
||||
describe('ticket ticket_add()', () => {
|
||||
const today = Date.vnNew();
|
||||
it('should confirm the procedure creates the expected ticket', async() => {
|
||||
let stmts = [];
|
||||
|
|
@ -21,7 +21,7 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
userId: 18
|
||||
};
|
||||
|
||||
stmt = new ParameterizedSQL(`CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
|
||||
stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
|
||||
params.clientFk,
|
||||
params.shipped,
|
||||
params.warehouseFk,
|
||||
|
|
@ -30,7 +30,8 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
params.agencyModeFk,
|
||||
params.routeFk,
|
||||
params.landed,
|
||||
params.userId
|
||||
params.userId,
|
||||
true
|
||||
]);
|
||||
stmts.push(stmt);
|
||||
|
||||
|
|
@ -70,7 +71,7 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
userId: 18
|
||||
};
|
||||
|
||||
stmt = new ParameterizedSQL('CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)', [
|
||||
stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)', [
|
||||
params.clientFk,
|
||||
params.shipped,
|
||||
params.warehouseFk,
|
||||
|
|
@ -79,7 +80,8 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
params.agencyModeFk,
|
||||
params.routeFk,
|
||||
params.landed,
|
||||
params.userId
|
||||
params.userId,
|
||||
true
|
||||
]);
|
||||
stmts.push(stmt);
|
||||
|
||||
|
|
@ -120,7 +122,7 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
userId: 18
|
||||
};
|
||||
|
||||
stmt = new ParameterizedSQL(`CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
|
||||
stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
|
||||
params.clientFk,
|
||||
params.shipped,
|
||||
params.warehouseFk,
|
||||
|
|
@ -129,7 +131,8 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
params.agencyModeFk,
|
||||
params.routeFk,
|
||||
params.landed,
|
||||
params.userId
|
||||
params.userId,
|
||||
true
|
||||
]);
|
||||
|
||||
stmts.push(stmt);
|
||||
|
|
@ -172,7 +175,7 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
]);
|
||||
stmts.push(stmt);
|
||||
|
||||
stmt = new ParameterizedSQL(`CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
|
||||
stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [
|
||||
params.clientFk,
|
||||
params.shipped,
|
||||
params.warehouseFk,
|
||||
|
|
@ -181,7 +184,8 @@ describe('ticket ticketCreateWithUser()', () => {
|
|||
params.agencyModeFk,
|
||||
params.routeFk,
|
||||
params.landed,
|
||||
params.userId
|
||||
params.userId,
|
||||
true
|
||||
]);
|
||||
stmts.push(stmt);
|
||||
stmts.push(`select @newTicketId`);
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ export default {
|
|||
userConfigSecondAutocomplete: '#localBank',
|
||||
userConfigThirdAutocomplete: '#localCompany',
|
||||
acceptButton: '.vn-confirm.shown button[response=accept]',
|
||||
cancelButton: '.vn-confirm.shown input[response=cancel]',
|
||||
searchButton: 'vn-searchbar vn-icon[icon="search"]'
|
||||
},
|
||||
moduleIndex: {
|
||||
|
|
|
|||
|
|
@ -227,9 +227,21 @@ describe('Ticket Edit sale path', () => {
|
|||
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||
await page.waitToClick(selectors.ticketSales.moreMenuRefund);
|
||||
await page.waitForSnackbar();
|
||||
await page.waitForState('ticket.card.sale');
|
||||
});
|
||||
|
||||
it('should show error trying to delete a ticket with a refund', async() => {
|
||||
await page.accessToSearchResult('16');
|
||||
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
|
||||
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
|
||||
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||
const message = await page.waitForSnackbar();
|
||||
|
||||
expect(message.text).toContain('Tickets with associated refunds can\'t be deleted');
|
||||
await page.waitToClick(selectors.globalItems.cancelButton);
|
||||
});
|
||||
|
||||
it('should select the third sale and create a claim of it', async() => {
|
||||
await page.accessToSearchResult('16');
|
||||
await page.accessToSection('ticket.card.sale');
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@
|
|||
padding-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
& > .icons.pre {
|
||||
min-width: 22px
|
||||
}
|
||||
}
|
||||
&.readonly > .container > .icons.post {
|
||||
display: none;
|
||||
|
|
|
|||
|
|
@ -58,10 +58,33 @@ vn-chip {
|
|||
background-color: $color-font-bg-dark;
|
||||
color: $color-font-bg;
|
||||
}
|
||||
&.pink,
|
||||
&.pink.clickable:hover,
|
||||
&.pink.clickable:focus {
|
||||
background-color: $color-pink;
|
||||
}
|
||||
&.dark-notice,
|
||||
&.dark-notice.clickable:hover,
|
||||
&.dark-notice.clickable:focus {
|
||||
background-color: $color-notice;
|
||||
}
|
||||
&.yellow,
|
||||
&.yellow.clickable:hover,
|
||||
&.yellow.clickable:focus {
|
||||
background-color: $color-yellow;
|
||||
}
|
||||
&.none,
|
||||
&.none.clickable:hover,
|
||||
&.none.clickable:focus {
|
||||
background-color: $color-bg-panel;
|
||||
border-radius: 50%;
|
||||
border: 1px solid $color-font-link
|
||||
|
||||
}
|
||||
&.clickable {
|
||||
@extend %clickable;
|
||||
opacity: 0.8;
|
||||
|
||||
|
||||
&:hover,
|
||||
&:focus {
|
||||
opacity: 1;
|
||||
|
|
@ -118,4 +141,4 @@ vn-avatar {
|
|||
display: inline-block;
|
||||
min-width: 28px;
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<span class="required">*</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="icons pre">
|
||||
<div class="icons pre" ng-class="{'clearable': $ctrl.clearDisabled != true}">
|
||||
<vn-icon ng-show="::$ctrl.clearDisabled != true"
|
||||
icon="clear"
|
||||
translate-attr="{title: 'Clear'}"
|
||||
|
|
|
|||
|
|
@ -151,6 +151,9 @@
|
|||
display: none;
|
||||
}
|
||||
}
|
||||
& > .icons.pre.clearable {
|
||||
min-width: 22px
|
||||
}
|
||||
& > .underline {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
|
|
|
|||
|
|
@ -147,8 +147,8 @@
|
|||
"Receipt's bank was not found": "Receipt's bank was not found",
|
||||
"This receipt was not compensated": "This receipt was not compensated",
|
||||
"Client's email was not found": "Client's email was not found",
|
||||
"Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº {{id}}",
|
||||
"It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
|
||||
"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
|
||||
"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
|
||||
"Valid priorities: 1,2,3": "Valid priorities: 1,2,3"
|
||||
"It is not possible to modify cloned sales": "It is not possible to modify cloned sales"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -264,6 +264,8 @@
|
|||
"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
|
||||
"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
|
||||
"There is no assigned email for this client": "No hay correo asignado para este cliente",
|
||||
"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
|
||||
"You must indicate the reason": "You must indicate the reason"
|
||||
}
|
||||
"You must indicate the reason": "You must indicate the reason",
|
||||
"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
|
||||
"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº {{id}}",
|
||||
"Not exist this branch": "La rama no existe"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ module.exports = Self => {
|
|||
try {
|
||||
const invoiceOut = await Self.findById(id, null, myOptions);
|
||||
const hasInvoicing = await models.Account.hasRole(userId, 'invoicing', myOptions);
|
||||
|
||||
console.log(invoiceOut, !hasInvoicing);
|
||||
if (invoiceOut.hasPdf && !hasInvoicing)
|
||||
throw new UserError(`You don't have enough privileges`);
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ module.exports = Self => {
|
|||
ids = ids.split(',');
|
||||
|
||||
for (let id of ids) {
|
||||
console.log(zipConfig, totalSize, zipConfig ? zipConfig.maxSize : null);
|
||||
if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
|
||||
const invoiceOutPdf = await models.InvoiceOut.download(ctx, id, myOptions);
|
||||
const fileName = extractFileName(invoiceOutPdf[2]);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ describe('InvoiceOut createPdf()', () => {
|
|||
const ctx = {req: activeCtx};
|
||||
|
||||
it('should create a new PDF file and set true the hasPdf property', async() => {
|
||||
pending('https://redmine.verdnatura.es/issues/5035');
|
||||
const invoiceId = 1;
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@ describe('InvoiceOut downloadZip()', () => {
|
|||
});
|
||||
|
||||
it('should return an error if the size of the files is too large', async() => {
|
||||
pending('https://redmine.verdnatura.es/issues/5035');
|
||||
|
||||
const tx = await models.InvoiceOut.beginTransaction({});
|
||||
|
||||
let error;
|
||||
|
|
|
|||
|
|
@ -65,8 +65,9 @@ describe('InvoiceOut filter()', () => {
|
|||
await invoiceOut.updateAttribute('hasPdf', true, options);
|
||||
|
||||
const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options);
|
||||
console.log(result);
|
||||
|
||||
expect(result.length).toBeGreaterThanOrEqual(1);
|
||||
expect(result.length).toEqual(1);
|
||||
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ module.exports = Self => {
|
|||
const itemType = await models.ItemType.findById(params.typeFk, {fields: ['isLaid']}, myOptions);
|
||||
|
||||
params.isLaid = itemType.isLaid;
|
||||
params.isPhotoRequested = true;
|
||||
|
||||
const item = await models.Item.create(params, myOptions);
|
||||
|
||||
|
|
|
|||
|
|
@ -146,6 +146,12 @@
|
|||
},
|
||||
"isLaid": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"isPhotoRequested": {
|
||||
"type": "boolean",
|
||||
"mysql":{
|
||||
"columnName": "doPhoto"
|
||||
}
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
|
|
|
|||
|
|
@ -182,6 +182,12 @@
|
|||
ng-model="$ctrl.item.isFragile"
|
||||
info="Is shown at website, app that this item cannot travel (wreath, palms, ...)">
|
||||
</vn-check>
|
||||
<vn-check
|
||||
vn-one
|
||||
label="Do photo"
|
||||
ng-model="$ctrl.item.isPhotoRequested"
|
||||
info="This item does need a photo">
|
||||
</vn-check>
|
||||
</vn-horizontal>
|
||||
</vn-card>
|
||||
<vn-button-bar>
|
||||
|
|
|
|||
|
|
@ -11,4 +11,6 @@ Identifier: Identificador
|
|||
Fragile: Frágil
|
||||
Is shown at website, app that this item cannot travel (wreath, palms, ...): Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
|
||||
Multiplier: Multiplicador
|
||||
Generic: Genérico
|
||||
Generic: Genérico
|
||||
This item does need a photo: Este artículo necesita una foto
|
||||
Do photo: Hacer foto
|
||||
|
|
@ -91,6 +91,9 @@ class Controller extends Descriptor {
|
|||
|
||||
this.$.photo.setAttribute('src', newSrc);
|
||||
this.$.photo.setAttribute('zoom-image', newZoomSrc);
|
||||
|
||||
if (this.item.isPhotoRequested)
|
||||
this.$http.patch(`Items/${this.item.id}`, {isPhotoRequested: false});
|
||||
}
|
||||
|
||||
getWarehouseName(warehouseFk) {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ describe('vnItemDescriptor', () => {
|
|||
id: 1,
|
||||
itemType: {
|
||||
warehouseFk: 1
|
||||
}
|
||||
},
|
||||
isPhotoRequested: true
|
||||
};
|
||||
const stock = {
|
||||
visible: 1,
|
||||
|
|
@ -43,4 +44,16 @@ describe('vnItemDescriptor', () => {
|
|||
expect(controller.item).toEqual(item);
|
||||
});
|
||||
});
|
||||
|
||||
describe('onUploadResponse()', () => {
|
||||
it(`should change isPhotoRequested when a new photo is uploaded`, () => {
|
||||
controller.item = item;
|
||||
controller.$rootScope = {imagePath: () => {}};
|
||||
controller.$.photo = {setAttribute: () => {}};
|
||||
|
||||
$httpBackend.expectPATCH(`Items/${item.id}`).respond(200);
|
||||
controller.onUploadResponse();
|
||||
$httpBackend.flush();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@ class Controller extends Section {
|
|||
}
|
||||
|
||||
$onDestroy() {
|
||||
this.card.reload();
|
||||
if (this.$state.getCurrentPath()[2].state.name === 'item')
|
||||
this.card.reload();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,6 +75,15 @@
|
|||
{{$ctrl.summary.item.itemType.worker.user.name}}
|
||||
</span>
|
||||
</vn-label-value>
|
||||
<vn-horizontal>
|
||||
<vn-check
|
||||
label="Do photo"
|
||||
disabled="true"
|
||||
vn-one
|
||||
ng-model="$ctrl.item.isPhotoRequested"
|
||||
info="This item does need a photo">
|
||||
</vn-check>
|
||||
</vn-horizontal>
|
||||
</vn-one>
|
||||
<vn-one name="otherData">
|
||||
<h4 ng-show="$ctrl.isBuyer">
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@
|
|||
</vn-icon-button>
|
||||
</vn-td>
|
||||
</vn-tr>
|
||||
<vn-tr ng-repeat="waste in detail.lines" class="clickable vn-tr"
|
||||
<a ng-repeat="waste in detail.lines" class="clickable vn-tr"
|
||||
ui-sref="item.waste.detail({buyer: waste.buyer, family: waste.family})"
|
||||
ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}">
|
||||
ng-show="$ctrl.wasteConfig[detail.buyer].hidden">
|
||||
<vn-td></vn-td>
|
||||
<vn-td>{{::waste.family}}</vn-td>
|
||||
<vn-td number>{{::(waste.percentage / 100) | percentage: 2}}</vn-td>
|
||||
<vn-td number>{{::waste.dwindle | currency: 'EUR'}}</vn-td>
|
||||
<vn-td number>{{::waste.total | currency: 'EUR'}}</vn-td>
|
||||
<vn-td shrink></vn-td>
|
||||
</vn-tr>
|
||||
</a>
|
||||
</vn-tbody>
|
||||
</vn-table>
|
||||
</vn-card>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,16 @@ module.exports = Self => {
|
|||
verb: 'POST'
|
||||
}
|
||||
});
|
||||
Self.upload = async(ctx, options) => {
|
||||
Self.upload = async(
|
||||
ctx,
|
||||
appName,
|
||||
toVersion,
|
||||
branch,
|
||||
fromVersion,
|
||||
description,
|
||||
unlock,
|
||||
options
|
||||
) => {
|
||||
const models = Self.app.models;
|
||||
const myOptions = {};
|
||||
const $t = ctx.req.__; // $translate
|
||||
|
|
@ -55,12 +64,6 @@ module.exports = Self => {
|
|||
const AccessContainer = models.AccessContainer;
|
||||
const fileOptions = {};
|
||||
let tx;
|
||||
const appName = ctx.args.appName;
|
||||
const toVersion = ctx.args.toVersion;
|
||||
const branch = ctx.args.branch;
|
||||
const fromVersion = ctx.args.fromVersion;
|
||||
let description = ctx.args.description;
|
||||
const unlock = ctx.args.unlock;
|
||||
|
||||
if (typeof options == 'object')
|
||||
Object.assign(myOptions, options);
|
||||
|
|
@ -153,11 +156,14 @@ module.exports = Self => {
|
|||
formatDesc += `*${appName.toUpperCase()}* v.${toVersion} `;
|
||||
|
||||
const oldVersion = await models.MdbVersionTree.findOne({
|
||||
where: {version: fromVersion},
|
||||
where: {
|
||||
version: fromVersion,
|
||||
app: appName
|
||||
},
|
||||
fields: ['branchFk']
|
||||
}, myOptions);
|
||||
|
||||
if (branch == oldVersion.branchFk)
|
||||
if (!oldVersion || branch == oldVersion.branchFk)
|
||||
formatDesc += `[*${branch}*]: `;
|
||||
else
|
||||
formatDesc += `[*${oldVersion.branchFk}* » *${branch}*]: `;
|
||||
|
|
|
|||
|
|
@ -93,7 +93,14 @@
|
|||
<vn-tr ng-repeat="ticket in $ctrl.summary.tickets">
|
||||
<vn-td shrink>{{ticket.priority | dashIfEmpty}}</vn-td>
|
||||
<vn-td expand title="{{ticket.address.street}}">{{ticket.street}}</vn-td>
|
||||
<vn-td expand>{{ticket.city}}</vn-td>
|
||||
<vn-td
|
||||
expand
|
||||
ng-click="$ctrl.goToBuscaman(ticket)"
|
||||
class="link"
|
||||
vn-tooltip="Open buscaman"
|
||||
tooltip-position="up">
|
||||
{{::ticket.city}}
|
||||
</vn-td>
|
||||
<vn-td shrink>{{ticket.postalCode}}</vn-td>
|
||||
<vn-td>
|
||||
<span
|
||||
|
|
|
|||
|
|
@ -31,6 +31,21 @@ class Controller extends Summary {
|
|||
this.sumPackages();
|
||||
});
|
||||
}
|
||||
|
||||
goToBuscaman(ticket) {
|
||||
if (!this.route.vehicleFk)
|
||||
throw new UserError(`The route doesn't have a vehicle`);
|
||||
let query = `Routes/${this.route.vehicleFk}/getDeliveryPoint`;
|
||||
|
||||
this.$http.get(query).then(response => {
|
||||
if (!response.data)
|
||||
throw new UserError(`The route's vehicle doesn't have a delivery point`);
|
||||
|
||||
const address = response.data + '+to:' + ticket.postalCode + ' ' + ticket.city + ' ' + ticket.street;
|
||||
const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
|
||||
window.open(url + encodeURI(address), '_blank');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnRouteSummary', {
|
||||
|
|
|
|||
|
|
@ -37,5 +37,29 @@ describe('Route', () => {
|
|||
expect(controller.packagesTotal).toEqual(4);
|
||||
});
|
||||
});
|
||||
|
||||
describe('goToBuscaman()', () => {
|
||||
it('should open buscaman with the given arguments', () => {
|
||||
jest.spyOn(window, 'open').mockReturnThis();
|
||||
const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street';
|
||||
controller.route = {vehicleFk: 1};
|
||||
const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`;
|
||||
$httpBackend.when('GET', `Routes/1/summary`).respond();
|
||||
$httpBackend.expectGET(url).respond('46460 Av Espioca 100');
|
||||
|
||||
const ticket = {
|
||||
id: 1,
|
||||
checked: true,
|
||||
street: 'my street',
|
||||
postalCode: 'n19',
|
||||
city: 'London'
|
||||
};
|
||||
|
||||
controller.goToBuscaman(ticket);
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(window.open).toHaveBeenCalledWith(expectedUrl, '_blank');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -93,7 +93,14 @@
|
|||
</vn-input-number>
|
||||
</vn-td>
|
||||
<vn-td expand title="{{::ticket.street}}">{{::ticket.street}}</vn-td>
|
||||
<vn-td expand>{{::ticket.city}}</vn-td>
|
||||
<vn-td
|
||||
expand
|
||||
ng-click="$ctrl.goToBuscaman(ticket)"
|
||||
class="link"
|
||||
vn-tooltip="Open buscaman"
|
||||
tooltip-position="up">
|
||||
{{::ticket.city}}
|
||||
</vn-td>
|
||||
<vn-td shrink>{{::ticket.postalCode}}</vn-td>
|
||||
<vn-td expand>
|
||||
<span
|
||||
|
|
|
|||
|
|
@ -74,29 +74,24 @@ class Controller extends Section {
|
|||
return selectedItems;
|
||||
}
|
||||
|
||||
goToBuscaman() {
|
||||
goToBuscaman(ticket) {
|
||||
if (!this.route.vehicleFk)
|
||||
throw new UserError(`The route doesn't have a vehicle`);
|
||||
let query = `Routes/${this.route.vehicleFk}/getDeliveryPoint`;
|
||||
|
||||
this.$http.get(query).then(response => {
|
||||
if (!response.data)
|
||||
this.$http.get(`Routes/${this.route.vehicleFk}/getDeliveryPoint`).then(res => {
|
||||
if (!res.data)
|
||||
throw new UserError(`The route's vehicle doesn't have a delivery point`);
|
||||
|
||||
return response.data;
|
||||
}).then(address => {
|
||||
let addresses;
|
||||
if (address) addresses = address;
|
||||
let lines = this.getSelectedItems(this.tickets);
|
||||
|
||||
let url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
|
||||
let addresses = res.data;
|
||||
const lines = ticket ? [ticket] : this.getSelectedItems(this.tickets);
|
||||
lines.forEach((line, index) => {
|
||||
const previusLine = lines[index - 1] ? lines[index - 1].street : null;
|
||||
if (previusLine != line.street)
|
||||
const previousLine = lines[index - 1] ? lines[index - 1].street : null;
|
||||
if (previousLine != line.street)
|
||||
addresses = addresses + '+to:' + line.postalCode + ' ' + line.city + ' ' + line.street;
|
||||
});
|
||||
|
||||
window.open(url + addresses, '_blank');
|
||||
const url = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
|
||||
window.open(url + encodeURI(addresses), '_blank');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ describe('Route', () => {
|
|||
describe('goToBuscaman()', () => {
|
||||
it('should open buscaman with the given arguments', () => {
|
||||
jest.spyOn(window, 'open').mockReturnThis();
|
||||
const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460 Av Espioca 100+to:n19 London my street';
|
||||
const expectedUrl = 'http://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=46460%20Av%20Espioca%20100+to:n19%20London%20my%20street';
|
||||
controller.route = {vehicleFk: 1};
|
||||
const url = `Routes/${controller.route.vehicleFk}/getDeliveryPoint`;
|
||||
$httpBackend.expectGET(url).respond('46460 Av Espioca 100');
|
||||
|
|
|
|||
|
|
@ -68,8 +68,11 @@ module.exports = Self => {
|
|||
{
|
||||
arg: 'isVies',
|
||||
type: 'boolean'
|
||||
}
|
||||
],
|
||||
},
|
||||
{
|
||||
arg: 'isTrucker',
|
||||
type: 'boolean'
|
||||
}],
|
||||
returns: {
|
||||
arg: 'res',
|
||||
type: 'string',
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ module.exports = Self => {
|
|||
args.landed = landedResult && landedResult.landed;
|
||||
}
|
||||
|
||||
query = `CALL vn.ticketCreateWithUser(?, ?, ?, ?, ?, ?, ?, ?, ?, @result);
|
||||
query = `CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result);
|
||||
SELECT @result newTicketId;`;
|
||||
const result = await Self.rawSql(query, [
|
||||
args.clientId,
|
||||
|
|
@ -122,6 +122,7 @@ module.exports = Self => {
|
|||
args.agencyModeId || null,
|
||||
args.routeId || null,
|
||||
args.landed,
|
||||
true,
|
||||
myUserId
|
||||
], myOptions);
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,14 @@ module.exports = Self => {
|
|||
if (!isEditable)
|
||||
throw new UserError(`The sales of this ticket can't be modified`);
|
||||
|
||||
// Check if ticket has refunds
|
||||
const ticketRefunds = await models.TicketRefund.find({
|
||||
where: {originalTicketFk: id},
|
||||
fields: ['id']}
|
||||
, myOptions);
|
||||
if (ticketRefunds.length > 0)
|
||||
throw new UserError($t('Tickets with associated refunds', {id: ticketRefunds[0].id}));
|
||||
|
||||
// Check if has sales with shelving
|
||||
const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant', myOptions);
|
||||
const sales = await models.Sale.find({
|
||||
|
|
@ -134,12 +142,12 @@ module.exports = Self => {
|
|||
await models.TicketCollection.destroyById(ticketCollection.id, myOptions);
|
||||
|
||||
await Self.rawSql(`
|
||||
DELETE sc
|
||||
DELETE sc
|
||||
FROM vn.saleGroup sg
|
||||
JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
|
||||
JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
|
||||
JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
|
||||
JOIN vn.sale s ON s.id = sgd.saleFk
|
||||
JOIN vn.sale s ON s.id = sgd.saleFk
|
||||
WHERE s.ticketFk = ?;`, [ticket.id], myOptions);
|
||||
|
||||
if (tx) await tx.commit();
|
||||
|
|
|
|||
|
|
@ -101,4 +101,32 @@ describe('ticket setDeleted()', () => {
|
|||
throw e;
|
||||
}
|
||||
});
|
||||
|
||||
it('should show error trying to delete a ticket with a refund', async() => {
|
||||
const tx = await models.Ticket.beginTransaction({});
|
||||
let error;
|
||||
try {
|
||||
const options = {transaction: tx};
|
||||
|
||||
const ctx = {
|
||||
req: {
|
||||
accessToken: {userId: 9},
|
||||
headers: {origin: 'http://localhost:5000'},
|
||||
}
|
||||
};
|
||||
ctx.req.__ = value => {
|
||||
return value;
|
||||
};
|
||||
|
||||
const ticketId = 12;
|
||||
await models.Ticket.setDeleted(ctx, ticketId, options);
|
||||
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
await tx.rollback();
|
||||
error = e;
|
||||
}
|
||||
|
||||
expect(error.message).toContain('Tickets with associated refunds');
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -80,34 +80,6 @@ describe('sale transferSales()', () => {
|
|||
expect(error.message).toEqual(`Can't transfer claimed sales`);
|
||||
});
|
||||
|
||||
it('should be able to transfer claimed sales if the role is claimManager', async() => {
|
||||
const tx = await models.Ticket.beginTransaction({});
|
||||
|
||||
let error;
|
||||
try {
|
||||
const options = {transaction: tx};
|
||||
|
||||
const claimManagerId = 72;
|
||||
const myActiveCtx = {
|
||||
accessToken: {userId: claimManagerId},
|
||||
};
|
||||
const myCtx = {req: myActiveCtx};
|
||||
|
||||
const ticketId = 11;
|
||||
const receiverTicketId = null;
|
||||
const sales = await models.Ticket.getSales(ticketId, options);
|
||||
|
||||
await models.Ticket.transferSales(myCtx, ticketId, receiverTicketId, sales, options);
|
||||
|
||||
await tx.rollback();
|
||||
} catch (e) {
|
||||
await tx.rollback();
|
||||
error = e;
|
||||
}
|
||||
|
||||
expect(error).toBeUndefined();
|
||||
});
|
||||
|
||||
it('should transfer the sales from a ticket to a new one', async() => {
|
||||
const tx = await models.Ticket.beginTransaction({});
|
||||
|
||||
|
|
|
|||
|
|
@ -77,9 +77,8 @@ module.exports = Self => {
|
|||
|
||||
const saleIds = sales.map(sale => sale.id);
|
||||
|
||||
const isClaimManager = await models.Account.hasRole(userId, 'claimManager');
|
||||
const hasClaimedSales = await models.ClaimBeginning.findOne({where: {saleFk: {inq: saleIds}}});
|
||||
if (hasClaimedSales && !isClaimManager)
|
||||
if (hasClaimedSales)
|
||||
throw new UserError(`Can't transfer claimed sales`);
|
||||
|
||||
for (const sale of sales) {
|
||||
|
|
|
|||
|
|
@ -24,12 +24,44 @@
|
|||
<vn-tbody>
|
||||
<vn-tr ng-repeat="sale in $ctrl.sales">
|
||||
<vn-td center>
|
||||
<span class="chip {{$ctrl.chipHasSaleGroupDetail(sale.preparingList.hasSaleGroupDetail)}} vn-mx-xs chip2" vn-tooltip="has saleGroupDetail"></span>
|
||||
<span class="chip {{$ctrl.chipIsPreviousSelected(sale.preparingList.isPreviousSelected)}} vn-ml-xs" vn-tooltip="is previousSelected"></span>
|
||||
<span class="chip {{$ctrl.chipIsPrevious(sale.preparingList.isPrevious)}} vn-mr-xs" vn-tooltip="is previous"></span>
|
||||
<span class="chip {{$ctrl.chipIsPrepared(sale.preparingList.isPrepared)}} vn-mx-xs" vn-tooltip="is prepared"></span>
|
||||
<span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
|
||||
</vn-td>
|
||||
<vn-chip
|
||||
ng-class="::{
|
||||
'pink': sale.preparingList.hasSaleGroupDetail,
|
||||
'none': !sale.preparingList.hasSaleGroupDetail,
|
||||
}"
|
||||
class="circle"
|
||||
vn-tooltip="has saleGroupDetail"
|
||||
>
|
||||
</vn-chip>
|
||||
<vn-chip ng-class="::{
|
||||
'notice': sale.preparingList.isPreviousSelected,
|
||||
'none': !sale.preparingList.isPreviousSelected,
|
||||
}"
|
||||
class="circle"
|
||||
vn-tooltip="is previousSelected">
|
||||
</vn-chip>
|
||||
<vn-chip ng-class="::{
|
||||
'dark-notice': sale.preparingList.isPrevious,
|
||||
'none': !sale.preparingList.isPrevious,
|
||||
}"
|
||||
class="circle"
|
||||
vn-tooltip="is previous">
|
||||
</vn-chip>
|
||||
<vn-chip ng-class="::{
|
||||
'warning': sale.preparingList.isPrepared,
|
||||
'none': !sale.preparingList.isPrepared,
|
||||
}"
|
||||
class="circle"
|
||||
vn-tooltip="is prepared">
|
||||
</vn-chip>
|
||||
<vn-chip ng-class="::{
|
||||
'yellow': sale.preparingList.isControled,
|
||||
'none': !sale.preparingList.isControled,
|
||||
}"
|
||||
class="circle"
|
||||
vn-tooltip="is controled">
|
||||
</vn-chip>
|
||||
</vn-td>
|
||||
<vn-td number>
|
||||
<span
|
||||
ng-click="itemDescriptor.show($event, sale.item.id)"
|
||||
|
|
|
|||
|
|
@ -74,31 +74,6 @@ class Controller extends Section {
|
|||
this.$.itemDescriptor.show(event.target, sale.item.id);
|
||||
}
|
||||
|
||||
chipHasSaleGroupDetail(hasSaleGroupDetail) {
|
||||
if (hasSaleGroupDetail) return 'pink';
|
||||
else return 'message';
|
||||
}
|
||||
|
||||
chipIsPreviousSelected(isPreviousSelected) {
|
||||
if (isPreviousSelected) return 'notice';
|
||||
else return 'message';
|
||||
}
|
||||
|
||||
chipIsPrevious(isPrevious) {
|
||||
if (isPrevious) return 'dark-notice';
|
||||
else return 'message';
|
||||
}
|
||||
|
||||
chipIsPrepared(isPrepared) {
|
||||
if (isPrepared) return 'warning';
|
||||
else return 'message';
|
||||
}
|
||||
|
||||
chipIsControled(isControled) {
|
||||
if (isControled) return 'yellow';
|
||||
else return 'message';
|
||||
}
|
||||
|
||||
showSaleTracking(sale) {
|
||||
this.saleId = sale.id;
|
||||
this.$.saleTracking.show();
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
@import "variables";
|
||||
|
||||
.chip {
|
||||
.circle {
|
||||
display: inline-block;
|
||||
min-width: 15px;
|
||||
min-height: 25px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 50%;
|
||||
font-size: .9rem;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-back",
|
||||
"version": "23.08.01",
|
||||
"version": "23.10.01",
|
||||
"author": "Verdnatura Levante SL",
|
||||
"description": "Salix backend",
|
||||
"license": "GPL-3.0",
|
||||
|
|
|
|||
|
|
@ -66,8 +66,10 @@ module.exports = {
|
|||
else
|
||||
value = '---';
|
||||
|
||||
if (labelData.routeFk)
|
||||
value = `${value} [${labelData.routeFk.toString().substring(0, 3)}]`;
|
||||
if (labelData.routeFk) {
|
||||
let routeFk = labelData.routeFk.toString();
|
||||
value = `${value} [${routeFk.substring(routeFk.length - 3)}]`;
|
||||
}
|
||||
|
||||
return value;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
"height": "4.9cm",
|
||||
"margin": {
|
||||
"top": "0.3cm",
|
||||
"right": "0.6cm",
|
||||
"right": "0.3cm",
|
||||
"bottom": "0cm",
|
||||
"left": "0cm"
|
||||
"left": "0.2cm"
|
||||
},
|
||||
"printBackground": true
|
||||
}
|
||||
Loading…
Reference in New Issue