Merge branch 'test' into 6434-improve-signInLog
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
81b3b22e55
|
@ -148,11 +148,100 @@ export default class Controller extends Section {
|
|||
const params = {tickets: ticketsToMove};
|
||||
return this.$http.post('Tickets/merge', params)
|
||||
.then(() => {
|
||||
this.$.model.refresh();
|
||||
this.vnApp.showSuccess(this.$t('Success'));
|
||||
this.refresh();
|
||||
if (ticketsToMove.length)
|
||||
this.vnApp.showSuccess(this.$t('Success', {tickets: ticketsToMove.length}));
|
||||
});
|
||||
}
|
||||
|
||||
async getLanded(params) {
|
||||
const query = `Agencies/getLanded`;
|
||||
return this.$http.get(query, {params}).then(res => {
|
||||
if (res.data)
|
||||
return res.data;
|
||||
|
||||
return this.vnApp.showError(
|
||||
this.$t(`No delivery zone available for this landing date`)
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
async splitTickets() {
|
||||
this.progress = [];
|
||||
this.splitErrors = [];
|
||||
this.$.splitTickets.hide();
|
||||
this.$.splitProgress.enable = true;
|
||||
this.$.splitProgress.cancel = false;
|
||||
this.$.splitProgress.show();
|
||||
|
||||
for (const ticket of this.checked) {
|
||||
if (this.$.splitProgress.cancel) break;
|
||||
try {
|
||||
const {query, params} = await this.requestComponentUpdate(ticket, true);
|
||||
this.$http.post(query, params)
|
||||
.catch(e => {
|
||||
this.splitErrors.push({id: ticket.futureId, reason: e.message});
|
||||
})
|
||||
.finally(() => this.progressAdd(ticket.futureId));
|
||||
} catch (e) {
|
||||
this.splitErrors.push({id: ticket.futureId, reason: e.message});
|
||||
this.progressAdd(ticket.futureId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
progressAdd(ticketId) {
|
||||
this.progress.push(ticketId);
|
||||
if (this.progress.length == this.checked.length) {
|
||||
this.$.splitProgress.enable = false;
|
||||
this.refresh();
|
||||
if ((this.progress.length - this.splitErrors.length) > 0) {
|
||||
this.vnApp.showSuccess(this.$t('Success', {
|
||||
tickets: this.progress.length - this.splitErrors.length
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async requestComponentUpdate(ticket, isWithoutNegatives) {
|
||||
const query = `tickets/${ticket.futureId}/componentUpdate`;
|
||||
if (!ticket.landed) {
|
||||
const newLanded = await this.getLanded({
|
||||
shipped: this.$.model.userParams.dateToAdvance,
|
||||
addressFk: ticket.futureAddressFk,
|
||||
agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
|
||||
warehouseFk: ticket.futureWarehouseFk
|
||||
});
|
||||
if (!newLanded)
|
||||
throw new Error(this.$t(`No delivery zone available for this landing date`));
|
||||
|
||||
ticket.landed = newLanded.landed;
|
||||
ticket.zoneFk = newLanded.zoneFk;
|
||||
}
|
||||
const params = {
|
||||
clientFk: ticket.futureClientFk,
|
||||
nickname: ticket.nickname,
|
||||
agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
|
||||
addressFk: ticket.futureAddressFk,
|
||||
zoneFk: ticket.zoneFk ?? ticket.futureZoneFk,
|
||||
warehouseFk: ticket.futureWarehouseFk,
|
||||
companyFk: ticket.futureCompanyFk,
|
||||
shipped: this.$.model.userParams.dateToAdvance,
|
||||
landed: ticket.landed,
|
||||
isDeleted: false,
|
||||
isWithoutNegatives,
|
||||
newTicket: ticket.id ?? undefined,
|
||||
keepPrice: true
|
||||
};
|
||||
|
||||
return {query, params};
|
||||
}
|
||||
|
||||
refresh() {
|
||||
this.$.model.refresh();
|
||||
this.$checkAll = null;
|
||||
}
|
||||
|
||||
exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
case 'id':
|
||||
|
|
Loading…
Reference in New Issue