Merge pull request 'fixes #5020 Borrado lógico en la tabla ItemPackingType' (!1257) from 5020-borradoLogico-IPT into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #1257
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Alexandre Riera 2023-01-18 08:15:08 +00:00
commit 52b12d52b1
7 changed files with 21 additions and 5 deletions

View File

@ -0,0 +1,3 @@
ALTER TABLE `vn`.`itemPackingType` ADD isActive BOOLEAN NOT NULL;
UPDATE `vn`.`itemPackingType` SET isActive = 0 WHERE code IN ('P', 'F');
UPDATE `vn`.`itemPackingType` SET isActive = 1 WHERE code IN ('V', 'H');

View File

@ -13,6 +13,9 @@
}, },
"description": { "description": {
"type": "string" "type": "string"
},
"isActive":{
"type": "boolean"
} }
}, },
"acls": [ "acls": [
@ -23,4 +26,4 @@
"permission": "ALLOW" "permission": "ALLOW"
} }
] ]
} }

View File

@ -25,7 +25,10 @@ class Controller extends SearchPanel {
getItemPackingTypes() { getItemPackingTypes() {
let itemPackingTypes = []; let itemPackingTypes = [];
this.$http.get('ItemPackingTypes').then(res => { const filter = {
where: {isActive: true}
};
this.$http.get('ItemPackingTypes', {filter}).then(res => {
for (let ipt of res.data) { for (let ipt of res.data) {
itemPackingTypes.push({ itemPackingTypes.push({
code: ipt.code, code: ipt.code,

View File

@ -39,6 +39,7 @@ export default class Controller extends Section {
field: 'ipt', field: 'ipt',
autocomplete: { autocomplete: {
url: 'ItemPackingTypes', url: 'ItemPackingTypes',
where: `{isActive: true}`,
showField: 'description', showField: 'description',
valueField: 'code' valueField: 'code'
} }
@ -47,6 +48,7 @@ export default class Controller extends Section {
field: 'futureIpt', field: 'futureIpt',
autocomplete: { autocomplete: {
url: 'ItemPackingTypes', url: 'ItemPackingTypes',
where: `{isActive: true}`,
showField: 'description', showField: 'description',
valueField: 'code' valueField: 'code'
} }

View File

@ -25,7 +25,10 @@ class Controller extends SearchPanel {
getItemPackingTypes() { getItemPackingTypes() {
let itemPackingTypes = []; let itemPackingTypes = [];
this.$http.get('ItemPackingTypes').then(res => { const filter = {
where: {isActive: true}
};
this.$http.get('ItemPackingTypes', {filter}).then(res => {
for (let ipt of res.data) { for (let ipt of res.data) {
itemPackingTypes.push({ itemPackingTypes.push({
description: this.$t(ipt.description), description: this.$t(ipt.description),

View File

@ -134,7 +134,7 @@
{{::ticket.shipped | date: 'dd/MM/yyyy HH:mm'}} {{::ticket.shipped | date: 'dd/MM/yyyy HH:mm'}}
</span> </span>
</td> </td>
<td>{{::ticket.ipt}}</td> <td>{{::ticket.ipt | dashIfEmpty}}</td>
<td> <td>
<span <span
class="chip {{$ctrl.stateColor(ticket.state)}}"> class="chip {{$ctrl.stateColor(ticket.state)}}">
@ -155,7 +155,7 @@
{{::ticket.futureShipped | date: 'dd/MM/yyyy HH:mm'}} {{::ticket.futureShipped | date: 'dd/MM/yyyy HH:mm'}}
</span> </span>
</td> </td>
<td>{{::ticket.futureIpt}}</td> <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
<td> <td>
<span <span
class="chip {{$ctrl.stateColor(ticket.futureState)}}"> class="chip {{$ctrl.stateColor(ticket.futureState)}}">

View File

@ -34,6 +34,7 @@ export default class Controller extends Section {
field: 'ipt', field: 'ipt',
autocomplete: { autocomplete: {
url: 'ItemPackingTypes', url: 'ItemPackingTypes',
where: `{isActive: true}`,
showField: 'description', showField: 'description',
valueField: 'code' valueField: 'code'
} }
@ -42,6 +43,7 @@ export default class Controller extends Section {
field: 'futureIpt', field: 'futureIpt',
autocomplete: { autocomplete: {
url: 'ItemPackingTypes', url: 'ItemPackingTypes',
where: `{isActive: true}`,
showField: 'description', showField: 'description',
valueField: 'code' valueField: 'code'
} }