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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2194_e2e_order_index_empty_filter
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-05-19 11:49:25 +02:00
parent 321aa827c2 5f8a2a24f5
commit 5e15321749
8 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/changes/10190-postRegulation/00-claimState.sql Normal file
View File

@ -0,0 +1,10 @@
ALTER TABLE `vn`.`claimState`
ADD COLUMN `priority` INT NOT NULL DEFAULT 1 AFTER `roleFk`;
UPDATE `vn`.`claimState` SET `priority` = '1' WHERE (`id` = '1');
UPDATE `vn`.`claimState` SET `priority` = '5' WHERE (`id` = '2');
UPDATE `vn`.`claimState` SET `priority` = '7' WHERE (`id` = '3');
UPDATE `vn`.`claimState` SET `priority` = '6' WHERE (`id` = '4');
UPDATE `vn`.`claimState` SET `priority` = '3' WHERE (`id` = '5');
UPDATE `vn`.`claimState` SET `priority` = '4' WHERE (`id` = '6');
UPDATE `vn`.`claimState` SET `priority` = '2' WHERE (`id` = '7');

15
db/dump/fixtures.sql
View File

@ -1473,14 +1473,15 @@ INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk
(4, 102, 2, CURDATE(), 18, 18, 567),
(5, 102, 3, CURDATE(), 19, 19, 567);
INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`)
INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`)
VALUES
( 1, 'pending', 'Pendiente', 1),
( 2, 'managed', 'Gestionado', 1),
( 3, 'resolved', 'Resuelto', 21),
( 4, 'canceled', 'Anulado', 1),
( 5, 'disputed', 'Cuestionado', 21),
( 6, 'mana', 'Mana', 1);
( 1, 'pending', 'Pendiente', 1, 1),
( 2, 'managed', 'Gestionado', 1, 5),
( 3, 'resolved', 'Resuelto', 21, 7),
( 4, 'canceled', 'Anulado', 1, 6),
( 5, 'disputed', 'Cuestionado', 21, 3),
( 6, 'mana', 'Mana', 1, 4),
( 7, 'inProgress', 'En Curso', 1, 2);
INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `observation`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created` )
VALUES

1
modules/claim/back/methods/claim/filter.js
View File

@ -114,7 +114,6 @@ module.exports = Self => {
LEFT JOIN claimState cs ON cs.id = cl.claimStateFk`
);
stmt.merge(conn.makeSuffix(filter));
let itemsIndex = stmts.push(stmt) - 1;

4
modules/claim/back/models/claim-state.json
View File

@ -19,6 +19,10 @@
"description": {
"type": "String",
"required": true
},
"priority": {
"type": "nomber",
"required": true
}
},
"relations": {

1
modules/claim/front/basic-data/index.html
View File

@ -40,6 +40,7 @@
show-field="description"
value-field="id"
label="Claim state"
order="priority ASC"
vn-focus>
</vn-autocomplete>
</vn-horizontal>

2
modules/claim/front/main/index.html
View File

@ -2,7 +2,7 @@
vn-id="model"
url="Claims/filter"
limit="20"
order="claimStateFk ASC, created DESC"
order="priority ASC, created DESC"
auto-load="true">
</vn-crud-model>
<vn-portal slot="topbar">

5
modules/client/front/descriptor/index.html
View File

@ -32,6 +32,11 @@
<vn-label-value label="Secured credit"
value="{{$ctrl.client.creditInsurance | currency: 'EUR': 2}}">
</vn-label-value>
<vn-label-value label="Risk"
value="{{$ctrl.client.debt | currency: 'EUR':2}}"
ng-class="{alert: $ctrl.client.debt > $ctrl.client.credit}"
info="Invoices minus payments plus orders not yet invoiced">
</vn-label-value>
<vn-label-value label="Sales person"
value="{{$ctrl.client.salesPerson.user.nickname}}">
</vn-label-value>

1
modules/client/front/descriptor/index.js
View File

@ -23,7 +23,6 @@ class Controller extends Component {
set client(value) {
this._client = value;
if (!value) return;
if (this.$params.sendSMS)