Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
ba0fdcd743
|
|
@ -572,11 +572,11 @@ export default {
|
|||
firstSaleZoomedImage: 'body > div > div > img',
|
||||
firstSaleQuantity: 'vn-ticket-sale [ng-model="sale.quantity"]',
|
||||
firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(6)',
|
||||
firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(8) > span',
|
||||
firstSalePrice: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(9) > span',
|
||||
firstSalePriceInput: '.vn-popover.shown input[ng-model="$ctrl.field"]',
|
||||
firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(9) > span',
|
||||
firstSaleDiscount: 'vn-ticket-sale vn-table vn-tr:nth-child(1) > vn-td:nth-child(10) > span',
|
||||
firstSaleDiscountInput: '.vn-popover.shown [ng-model="$ctrl.field"]',
|
||||
firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(10)',
|
||||
firstSaleImport: 'vn-ticket-sale:nth-child(1) vn-td:nth-child(11)',
|
||||
firstSaleReservedIcon: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td:nth-child(2) > vn-icon:nth-child(3)',
|
||||
firstSaleColour: 'vn-ticket-sale vn-tr:nth-child(1) vn-fetched-tags section',
|
||||
firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(1) vn-check[ng-model="sale.checked"]',
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import selectors from '../../helpers/selectors.js';
|
||||
import getBrowser from '../../helpers/puppeteer';
|
||||
// Tarea #2972
|
||||
xdescribe('Travel descriptor path', () => {
|
||||
|
||||
describe('Travel descriptor path', () => {
|
||||
let browser;
|
||||
let page;
|
||||
|
||||
|
|
@ -136,6 +136,7 @@ xdescribe('Travel descriptor path', () => {
|
|||
it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => {
|
||||
await page.waitToClick('vn-icon[icon="preview"]'); // summary icon
|
||||
await page.waitForState('travel.card.summary');
|
||||
await page.waitForTimeout(1000);
|
||||
await page.waitToClick(selectors.travelDescriptor.dotMenu);
|
||||
await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
|
||||
await page.waitToClick(selectors.travelDescriptor.acceptClonation);
|
||||
|
|
|
|||
|
|
@ -16,9 +16,6 @@
|
|||
"type": "number",
|
||||
"required": true
|
||||
},
|
||||
"amountUnpaid": {
|
||||
"type": "number"
|
||||
},
|
||||
"payed": {
|
||||
"type": "date",
|
||||
"required": true
|
||||
|
|
|
|||
|
|
@ -117,6 +117,9 @@
|
|||
"value10": {
|
||||
"type": "string"
|
||||
},
|
||||
"itemPackingTypeFk": {
|
||||
"type": "string"
|
||||
},
|
||||
"compression": {
|
||||
"type": "number"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ module.exports = Self => {
|
|||
http: {source: 'path'}
|
||||
}],
|
||||
returns: {
|
||||
type: ['Object'],
|
||||
type: ['object'],
|
||||
root: true
|
||||
},
|
||||
http: {
|
||||
|
|
@ -35,6 +35,7 @@ module.exports = Self => {
|
|||
fields: [
|
||||
'id',
|
||||
'name',
|
||||
'itemPackingTypeFk',
|
||||
'tag5',
|
||||
'value5',
|
||||
'tag6',
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
<vn-th shrink id="ticketId">Id</vn-th>
|
||||
<vn-th shrink>Quantity</vn-th>
|
||||
<vn-th>Item</vn-th>
|
||||
<vn-th>Packing type</vn-th>
|
||||
<vn-th number>Price</vn-th>
|
||||
<vn-th number>Disc</vn-th>
|
||||
<vn-th number>Amount</vn-th>
|
||||
|
|
@ -168,6 +169,9 @@
|
|||
</vn-textfield>
|
||||
</field>
|
||||
</vn-td-editable>
|
||||
<vn-td>
|
||||
{{::sale.item.itemPackingTypeFk == 'H' ? 'Horizontal' : (sale.item.itemPackingTypeFk == 'V' ? 'Vertical' : '-')}}
|
||||
</vn-td>
|
||||
<vn-td number>
|
||||
<span ng-class="{'link': $ctrl.isEditable}"
|
||||
translate-attr="{title: $ctrl.isEditable ? 'Edit price' : ''}"
|
||||
|
|
|
|||
|
|
@ -35,3 +35,4 @@ Address: Dirección
|
|||
Warehouse: Almacen
|
||||
Agency: Agencia
|
||||
Shipped: F. envio
|
||||
Packing type: Forma de encajado
|
||||
|
|
@ -30,6 +30,10 @@
|
|||
<td class="font gray uppercase">{{$t('date')}}</td>
|
||||
<th>{{ticket.shipped | date('%d-%m-%Y')}}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font gray uppercase">{{$t('packages')}}</td>
|
||||
<th>{{ticket.packages}}</th>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,3 +25,4 @@ vatType: VAT Type
|
|||
digitalSignature: Digital signature
|
||||
ticket: Delivery note {0}
|
||||
plantPassport: Plant passport
|
||||
packages: Packages
|
||||
|
|
@ -25,3 +25,4 @@ vatType: Tipo de IVA
|
|||
digitalSignature: Firma digital
|
||||
ticket: Albarán {0}
|
||||
plantPassport: Pasaporte fitosanitario
|
||||
packages: Bultos
|
||||
|
|
@ -25,3 +25,4 @@ vatType: Type de TVA
|
|||
digitalSignature: Signature numérique
|
||||
ticket: BL {0}
|
||||
plantPassport: Passeport phytosanitaire
|
||||
packages: Paquets
|
||||
|
|
@ -25,3 +25,4 @@ vatType: Tipo de IVA
|
|||
digitalSignature: Assinatura digital
|
||||
ticket: Nota de Entrega {0}
|
||||
plantPassport: Passaporte vegetal
|
||||
packages: Pacotes
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
SELECT
|
||||
t.id,
|
||||
t.shipped,
|
||||
c.code companyCode
|
||||
c.code companyCode,
|
||||
t.packages
|
||||
FROM ticket t
|
||||
JOIN company c ON c.id = t.companyFk
|
||||
WHERE t.id = ?
|
||||
Loading…
Reference in New Issue