verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' into 2906-deliveryNote_packages
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-06-18 08:27:46 +00:00
parent 325afe2245 fa9aea120c
commit e74f1f109e
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/helpers/selectors.js
View File

@ -572,11 +572,11 @@ export default {
firstSaleZoomedImage: 'body > div > div > img', firstSaleZoomedImage: 'body > div > div > img',
firstSaleQuantity: 'vn-ticket-sale [ng-model="sale.quantity"]', firstSaleQuantity: 'vn-ticket-sale [ng-model="sale.quantity"]',
firstSaleQuantityCell: 'vn-ticket-sale vn-tr:nth-child(1) > vn-td-editable:nth-child(6)', 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"]', 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"]', 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)', 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', 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"]', firstSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(1) vn-check[ng-model="sale.checked"]',

3
modules/item/back/models/item.json
View File

@ -117,6 +117,9 @@
"value10": { "value10": {
"type": "string" "type": "string"
}, },
"itemPackingTypeFk": {
"type": "string"
},
"compression": { "compression": {
"type": "number" "type": "number"
}, },

3
modules/ticket/back/methods/ticket/getSales.js
View File

@ -11,7 +11,7 @@ module.exports = Self => {
http: {source: 'path'} http: {source: 'path'}
}], }],
returns: { returns: {
type: ['Object'], type: ['object'],
root: true root: true
}, },
http: { http: {
@ -35,6 +35,7 @@ module.exports = Self => {
fields: [ fields: [
'id', 'id',
'name', 'name',
'itemPackingTypeFk',
'tag5', 'tag5',
'value5', 'value5',
'tag6', 'tag6',

4
modules/ticket/front/sale/index.html
View File

@ -63,6 +63,7 @@
<vn-th shrink id="ticketId">Id</vn-th> <vn-th shrink id="ticketId">Id</vn-th>
<vn-th shrink>Quantity</vn-th> <vn-th shrink>Quantity</vn-th>
<vn-th>Item</vn-th> <vn-th>Item</vn-th>
<vn-th>Packing type</vn-th>
<vn-th number>Price</vn-th> <vn-th number>Price</vn-th>
<vn-th number>Disc</vn-th> <vn-th number>Disc</vn-th>
<vn-th number>Amount</vn-th> <vn-th number>Amount</vn-th>
@ -168,6 +169,9 @@
</vn-textfield> </vn-textfield>
</field> </field>
</vn-td-editable> </vn-td-editable>
<vn-td>
{{::sale.item.itemPackingTypeFk == 'H' ? 'Horizontal' : (sale.item.itemPackingTypeFk == 'V' ? 'Vertical' : '-')}}
</vn-td>
<vn-td number> <vn-td number>
<span ng-class="{'link': $ctrl.isEditable}" <span ng-class="{'link': $ctrl.isEditable}"
translate-attr="{title: $ctrl.isEditable ? 'Edit price' : ''}" translate-attr="{title: $ctrl.isEditable ? 'Edit price' : ''}"

3
modules/ticket/front/sale/locale/es.yml
View File

@ -34,4 +34,5 @@ Recalculate price: Recalcular precio
Address: Dirección Address: Dirección
Warehouse: Almacen Warehouse: Almacen
Agency: Agencia Agency: Agencia
Shipped: F. envio Shipped: F. envio
Packing type: Forma de encajado