Merge pull request 'fixes #4866 más detalle en faltas' (!1201) from 4866-detalle-faltas into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1201 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>
This commit is contained in:
commit
abf4c4e59b
|
|
@ -679,7 +679,10 @@ export default {
|
|||
moveToTicketButton: '.vn-popover.shown vn-icon[icon="arrow_forward_ios"]',
|
||||
moveToNewTicketButton: '.vn-popover.shown vn-button[label="New ticket"]',
|
||||
stateMenuButton: 'vn-ticket-sale vn-tool-bar > vn-button-menu[label="State"]',
|
||||
moreMenuState: 'body > div > div > div.content > div.filter.ng-scope > vn-textfield'
|
||||
moreMenuState: 'body > div > div > div.content > div.filter.ng-scope > vn-textfield',
|
||||
firstSaleHistoryButton: 'vn-ticket-sale vn-tr:nth-child(1) vn-icon-button[icon="history"]',
|
||||
firstSaleHistory: 'form vn-table div > vn-tbody > vn-tr',
|
||||
closeHistory: 'div.window vn-button[icon="clear"]'
|
||||
},
|
||||
ticketTracking: {
|
||||
createStateButton: 'vn-float-button'
|
||||
|
|
|
|||
|
|
@ -196,6 +196,15 @@ describe('Ticket Edit sale path', () => {
|
|||
expect(result).toContain('22.50');
|
||||
});
|
||||
|
||||
it('should check in the history that logs has been added', async() => {
|
||||
await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
|
||||
await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
|
||||
const result = await page.countElement(selectors.ticketSales.firstSaleHistory);
|
||||
|
||||
expect(result).toBeGreaterThan(0);
|
||||
await page.waitToClick(selectors.ticketSales.closeHistory);
|
||||
});
|
||||
|
||||
it('should recalculate price of sales', async() => {
|
||||
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
|
||||
await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
|
||||
|
|
|
|||
|
|
@ -19,4 +19,5 @@ import './user-popover';
|
|||
import './upload-photo';
|
||||
import './bank-entity';
|
||||
import './log';
|
||||
import './instance-log';
|
||||
import './sendSms';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
|
||||
<vn-dialog
|
||||
vn-id="instanceLog">
|
||||
<tpl-body>
|
||||
<vn-log
|
||||
url="{{$ctrl.url}}"
|
||||
origin-id="$ctrl.originId"
|
||||
changed-model="$ctrl.changedModel"
|
||||
changed-model-id="$ctrl.changedModelId">
|
||||
</vn-log>
|
||||
</tpl-body>
|
||||
</vn-dialog>
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
import ngModule from '../../module';
|
||||
import Section from '../section';
|
||||
import './style.scss';
|
||||
|
||||
export default class Controller extends Section {
|
||||
open() {
|
||||
this.$.instanceLog.show();
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.vnComponent('vnInstanceLog', {
|
||||
controller: Controller,
|
||||
template: require('./index.html'),
|
||||
bindings: {
|
||||
model: '<',
|
||||
originId: '<',
|
||||
changedModelId: '<',
|
||||
changedModel: '@',
|
||||
url: '@'
|
||||
}
|
||||
});
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
.vn-dialog {
|
||||
& > .window:not(:has(.empty-rows)) {
|
||||
width:60%;
|
||||
vn-log {
|
||||
vn-card {
|
||||
visibility: hidden;
|
||||
& > * {
|
||||
visibility: visible;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
ng-click="moreOptions.show($event)"
|
||||
ng-show="$ctrl.hasSelectedSales()">
|
||||
</vn-button>
|
||||
<vn-button
|
||||
<vn-button
|
||||
disabled="!$ctrl.hasSelectedSales() || !$ctrl.isEditable"
|
||||
ng-click="deleteLines.show()"
|
||||
vn-tooltip="Remove lines"
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
<vn-thead>
|
||||
<vn-tr>
|
||||
<vn-th shrink>
|
||||
<vn-multi-check model="model"
|
||||
<vn-multi-check model="model"
|
||||
on-change="$ctrl.resetChanges()">
|
||||
</vn-multi-check>
|
||||
</vn-th>
|
||||
|
|
@ -68,6 +68,7 @@
|
|||
<vn-th number>Disc</vn-th>
|
||||
<vn-th number>Amount</vn-th>
|
||||
<vn-th shrink>Packaging</vn-th>
|
||||
<vn-th shrink></vn-th>
|
||||
</vn-tr>
|
||||
</vn-thead>
|
||||
<vn-tbody>
|
||||
|
|
@ -84,13 +85,13 @@
|
|||
vn-tooltip="{{::$ctrl.$t('Claim')}}: {{::sale.claim.claimFk}}">
|
||||
</vn-icon>
|
||||
</a>
|
||||
<vn-icon
|
||||
ng-show="::(sale.visible < 0)"
|
||||
<vn-icon
|
||||
ng-show="::(sale.visible < 0)"
|
||||
color-main
|
||||
icon="warning"
|
||||
vn-tooltip="Visible: {{::sale.visible || 0}}">
|
||||
</vn-icon>
|
||||
<vn-icon ng-show="sale.reserved"
|
||||
<vn-icon ng-show="sale.reserved"
|
||||
icon="icon-reserve"
|
||||
translate-attr="{title: 'Reserved'}">
|
||||
</vn-icon>
|
||||
|
|
@ -108,21 +109,21 @@
|
|||
</vn-icon>
|
||||
</vn-td>
|
||||
<vn-td shrink>
|
||||
<img
|
||||
<img
|
||||
ng-src="{{$root.imagePath('catalog', '50x50', sale.itemFk)}}"
|
||||
zoom-image="{{$root.imagePath('catalog', '1600x900', sale.itemFk)}}"
|
||||
on-error-src/>
|
||||
</vn-td>
|
||||
<vn-td shrink>
|
||||
<vn-chip
|
||||
class="transparent"
|
||||
<vn-chip
|
||||
class="transparent"
|
||||
ng-class="{'alert': sale.visible < 0}">
|
||||
{{::sale.visible}}
|
||||
</vn-chip>
|
||||
</vn-td>
|
||||
<vn-td shrink>
|
||||
<vn-chip
|
||||
class="transparent"
|
||||
<vn-chip
|
||||
class="transparent"
|
||||
ng-class="{'alert': sale.available < 0}">
|
||||
{{::sale.available}}
|
||||
</vn-chip>
|
||||
|
|
@ -195,7 +196,7 @@
|
|||
translate-attr="{title: !$ctrl.isLocked ? 'Edit discount' : ''}"
|
||||
ng-click="$ctrl.showEditDiscountPopover($event, sale)"
|
||||
ng-if="sale.id">
|
||||
{{(sale.discount / 100) | percentage}}
|
||||
{{(sale.discount / 100) | percentage}}
|
||||
</span>
|
||||
</vn-td>
|
||||
<vn-td number>
|
||||
|
|
@ -204,6 +205,22 @@
|
|||
<vn-td shrink>
|
||||
{{::sale.item.itemPackingTypeFk | dashIfEmpty}}
|
||||
</vn-td>
|
||||
<vn-td shrink>
|
||||
<vn-icon-button
|
||||
vn-none
|
||||
vn-tooltip="History"
|
||||
icon="history"
|
||||
ng-click="log.open()">
|
||||
</vn-icon-button>
|
||||
<vn-instance-log
|
||||
vn-id="log"
|
||||
url="TicketLogs"
|
||||
origin-id="$ctrl.$params.id"
|
||||
changed-model="Sale"
|
||||
changed-model-id="sale.id">
|
||||
</vn-instance-log>
|
||||
</vn-td>
|
||||
|
||||
</vn-tr>
|
||||
</vn-tbody>
|
||||
</vn-table>
|
||||
|
|
@ -383,8 +400,8 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
class="clickable"
|
||||
<tr
|
||||
class="clickable"
|
||||
ng-repeat="ticket in $ctrl.transfer.lastActiveTickets track by ticket.id"
|
||||
ng-click="$ctrl.transferSales(ticket.id)">
|
||||
<td shrink>{{::ticket.id}}</td>
|
||||
|
|
@ -392,22 +409,22 @@
|
|||
<td shrink>{{::ticket.agencyName}}</td>
|
||||
<td expand>{{::ticket.address}}
|
||||
<span vn-tooltip="
|
||||
{{::ticket.nickname}}
|
||||
{{::ticket.name}}
|
||||
{{::ticket.street}}
|
||||
{{::ticket.postalCode}}
|
||||
{{::ticket.nickname}}
|
||||
{{::ticket.name}}
|
||||
{{::ticket.street}}
|
||||
{{::ticket.postalCode}}
|
||||
{{::ticket.city}}">
|
||||
{{::ticket.nickname}}
|
||||
{{::ticket.name}}
|
||||
{{::ticket.street}}
|
||||
{{::ticket.postalCode}}
|
||||
{{::ticket.nickname}}
|
||||
{{::ticket.name}}
|
||||
{{::ticket.street}}
|
||||
{{::ticket.postalCode}}
|
||||
{{::ticket.city}}
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td
|
||||
ng-if="!$ctrl.transfer.lastActiveTickets.length"
|
||||
ng-if="!$ctrl.transfer.lastActiveTickets.length"
|
||||
class="empty-rows"
|
||||
colspan="4"
|
||||
translate>
|
||||
|
|
@ -503,4 +520,4 @@
|
|||
vn-acl-action="remove">
|
||||
Refund
|
||||
</vn-item>
|
||||
</vn-menu>
|
||||
</vn-menu>
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ New ticket: Nuevo ticket
|
|||
Edit price: Editar precio
|
||||
You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
|
||||
This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
|
||||
You have to allow pop-ups in your web browser to use this functionality:
|
||||
You have to allow pop-ups in your web browser to use this functionality:
|
||||
Debes permitir los pop-pups en tu navegador para que esta herramienta funcione correctamente
|
||||
Disc: Dto
|
||||
Disc: Dto
|
||||
Available: Disponible
|
||||
What is the day of receipt of the ticket?: ¿Cual es el día de preparación del pedido?
|
||||
Add claim: Crear reclamación
|
||||
|
|
@ -39,3 +39,4 @@ Packaging: Encajado
|
|||
Refund: Abono
|
||||
Promotion mana: Maná promoción
|
||||
Claim mana: Maná reclamación
|
||||
History: Historial
|
||||
|
|
|
|||
Loading…
Reference in New Issue