verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

WIP: #8116: Change isTaxDataChecked field #3478

Draft
jon wants to merge 1 commits from 8116-ChangeTaxDataCheckedField into dev
pull from: 8116-ChangeTaxDataCheckedField
merge into: verdnatura:dev
Conversation 0 Commits 1 Files Changed 6 +1502 -1502
6 changed files with 1502 additions and 1502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/dump/.dump/structure.sql
View File

@ -67013,7 +67013,7 @@ proc: BEGIN
IF(tp.isFreezed, ' CONGELADO',''), IF(tp.isFreezed, ' CONGELADO',''),
IF(tp.hasHighRisk, ' RIESGO',''), IF(tp.hasHighRisk, ' RIESGO',''),
IF(tp.hasTicketRequest, ' COD 100',''), IF(tp.hasTicketRequest, ' COD 100',''),
IF(tp.isTaxDataChecked, '',' FICHA INCOMPLETA'), IF(tp.isNotTaxDataChecked, '',' FICHA INCOMPLETA'),
IF(tp.hasComponentLack, ' COMPONENTES', ''), IF(tp.hasComponentLack, ' COMPONENTES', ''),
IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle, ' PEQUEÑO', '') IF(HOUR(util.VN_NOW()) < pb.HH AND tp.isTooLittle, ' PEQUEÑO', '')
) AS char(255))); ) AS char(255)));
@ -69804,7 +69804,7 @@ BEGIN
hasHighRisk TINYINT(1) DEFAULT 0, hasHighRisk TINYINT(1) DEFAULT 0,
hasTicketRequest INTEGER(1) DEFAULT 0, hasTicketRequest INTEGER(1) DEFAULT 0,
itemShortage VARCHAR(255), itemShortage VARCHAR(255),
isTaxDataChecked INTEGER(1) DEFAULT 1, isNotTaxDataChecked INTEGER(1) DEFAULT 1,
itemDelay VARCHAR(255), itemDelay VARCHAR(255),
itemLost VARCHAR(255), itemLost VARCHAR(255),
hasComponentLack INTEGER(1), hasComponentLack INTEGER(1),
@ -69821,7 +69821,7 @@ BEGIN
hasRisk, hasRisk,
hasHighRisk, hasHighRisk,
hasTicketRequest, hasTicketRequest,
isTaxDataChecked, isNotTaxDataChecked,
hasComponentLack, hasComponentLack,
isTooLittle) isTooLittle)
SELECT sgp.ticketFk, SELECT sgp.ticketFk,
@ -69831,7 +69831,7 @@ BEGIN
IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk, IF(FIND_IN_SET('hasRisk', t.problem), TRUE, FALSE) hasRisk,
IF(FIND_IN_SET('hasHighRisk', t.problem), TRUE, FALSE) hasHighRisk, IF(FIND_IN_SET('hasHighRisk', t.problem), TRUE, FALSE) hasHighRisk,
IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest, IF(FIND_IN_SET('hasTicketRequest', t.problem), TRUE, FALSE) hasTicketRequest,
IF(FIND_IN_SET('isTaxDataChecked', t.problem), FALSE, TRUE) isTaxDataChecked, IF(FIND_IN_SET('isTaxDataChecked', t.problem), FALSE, TRUE) isNotTaxDataChecked,
IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack, IF(FIND_IN_SET('hasComponentLack', s.problem), TRUE, FALSE) hasComponentLack,
IF(FIND_IN_SET('isTooLittle', t.problem) IF(FIND_IN_SET('isTooLittle', t.problem)
AND util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE, AND util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE,
@ -75053,7 +75053,7 @@ BEGIN
MAX(hasHighRisk) hasHighRisk, MAX(hasHighRisk) hasHighRisk,
MAX(hasTicketRequest) hasTicketRequest, MAX(hasTicketRequest) hasTicketRequest,
MAX(itemShortage) itemShortage, MAX(itemShortage) itemShortage,
MIN(isTaxDataChecked) isTaxDataChecked, MIN(isTaxDataChecked) isNotTaxDataChecked,
MAX(hasComponentLack) hasComponentLack, MAX(hasComponentLack) hasComponentLack,
MAX(isTooLittle) isTooLittle, MAX(isTooLittle) isTooLittle,
MAX(itemDelay) itemDelay, MAX(itemDelay) itemDelay,
@ -75069,7 +75069,7 @@ BEGIN
(isFreezed) + (isFreezed) +
(hasHighRisk) + (hasHighRisk) +
(hasTicketRequest) + (hasTicketRequest) +
(!isTaxDataChecked) + (!isNotTaxDataChecked) +
(hasComponentLack) + (hasComponentLack) +
(itemDelay IS NOT NULL) + (itemDelay IS NOT NULL) +
(isTooLittle) + (isTooLittle) +

2
db/routines/vn/procedures/productionControl.sql
View File

@ -72,7 +72,7 @@ proc: BEGIN
IF(tpr.isFreezed, ' CONGELADO',''), IF(tpr.isFreezed, ' CONGELADO',''),
IF(tpr.hasHighRisk, ' RIESGO',''), IF(tpr.hasHighRisk, ' RIESGO',''),
IF(tpr.hasTicketRequest, ' COD 100',''), IF(tpr.hasTicketRequest, ' COD 100',''),
IF(tpr.isTaxDataChecked, ' FICHA INCOMPLETA', ''), IF(tpr.isNotTaxDataChecked, ' FICHA INCOMPLETA', ''),
IF(tpr.hasComponentLack, ' COMPONENTES', ''), IF(tpr.hasComponentLack, ' COMPONENTES', ''),
IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour))) IF(HOUR(util.VN_NOW()) < IF(HOUR(t.shipped), HOUR(t.shipped), COALESCE(HOUR(zc.hour),HOUR(z.hour)))
AND tpr.isTooLittle, ' PEQUEÑO', '') AND tpr.isTooLittle, ' PEQUEÑO', '')

6
db/routines/vn/procedures/ticket_getProblems.sql
View File

@ -29,7 +29,7 @@ BEGIN
hasRisk BOOL DEFAULT FALSE, hasRisk BOOL DEFAULT FALSE,
hasHighRisk BOOL DEFAULT FALSE, hasHighRisk BOOL DEFAULT FALSE,
hasTicketRequest BOOL DEFAULT FALSE, hasTicketRequest BOOL DEFAULT FALSE,
isTaxDataChecked BOOL DEFAULT FALSE, isNotTaxDataChecked BOOL DEFAULT FALSE,
isTooLittle BOOL DEFAULT FALSE, isTooLittle BOOL DEFAULT FALSE,
isVip BOOL DEFAULT FALSE, isVip BOOL DEFAULT FALSE,
hasItemShortage BOOL DEFAULT FALSE, hasItemShortage BOOL DEFAULT FALSE,
@ -75,7 +75,7 @@ BEGIN
FIND_IN_SET('hasRisk', t.problem) > 0 hasRisk, FIND_IN_SET('hasRisk', t.problem) > 0 hasRisk,
FIND_IN_SET('hasHighRisk', t.problem) > 0 hasHighRisk, FIND_IN_SET('hasHighRisk', t.problem) > 0 hasHighRisk,
FIND_IN_SET('hasTicketRequest', t.problem) > 0 hasTicketRequest, FIND_IN_SET('hasTicketRequest', t.problem) > 0 hasTicketRequest,
FIND_IN_SET('isTaxDataChecked', t.problem) > 0 isTaxDataChecked, FIND_IN_SET('isTaxDataChecked', t.problem) > 0 isNotTaxDataChecked,
FIND_IN_SET('isTooLittle', t.problem) > 0 FIND_IN_SET('isTooLittle', t.problem) > 0
AND util.VN_NOW() < (util.VN_CURDATE() + AND util.VN_NOW() < (util.VN_CURDATE() +
INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL HOUR(zc.`hour`) HOUR) +
@ -101,7 +101,7 @@ BEGIN
UPDATE tmp.ticketProblems UPDATE tmp.ticketProblems
SET totalProblems = isFreezed + hasHighRisk + hasTicketRequest + SET totalProblems = isFreezed + hasHighRisk + hasTicketRequest +
isTaxDataChecked + hasComponentLack + hasItemDelay + isNotTaxDataChecked + hasComponentLack + hasItemDelay +
isTooLittle + hasItemLost + hasRounding + hasItemShortage + isVip; isTooLittle + hasItemLost + hasRounding + hasItemShortage + isVip;
DROP TEMPORARY TABLE tmp.sale; DROP TEMPORARY TABLE tmp.sale;

4
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -307,7 +307,7 @@ module.exports = Self => {
{'tp.hasRisk': true}, {'tp.hasRisk': true},
{'tp.hasTicketRequest': true}, {'tp.hasTicketRequest': true},
{'tp.hasComponentLack': true}, {'tp.hasComponentLack': true},
{'tp.isTaxDataChecked': true}, {'tp.isNotTaxDataChecked': true},
{'tp.hasItemShortage': true}, {'tp.hasItemShortage': true},
{'tp.isTooLittle': true} {'tp.isTooLittle': true}
]}; ]};
@ -317,7 +317,7 @@ module.exports = Self => {
{'tp.hasRisk': false}, {'tp.hasRisk': false},
{'tp.hasTicketRequest': false}, {'tp.hasTicketRequest': false},
{'tp.hasComponentLack': false}, {'tp.hasComponentLack': false},
{'tp.isTaxDataChecked': false}, {'tp.isNotTaxDataChecked': false},
{'tp.hasItemShortage': false}, {'tp.hasItemShortage': false},
{'tp.isTooLittle': false} {'tp.isTooLittle': false}
]}; ]};

2
modules/ticket/front/future/index.html
View File

@ -92,7 +92,7 @@
</td> </td>
<td class="icon-field"> <td class="icon-field">
<vn-icon <vn-icon
ng-show="::ticket.isTaxDataChecked !== 0" ng-show="::ticket.isNotTaxDataChecked !== 0"
translate-attr="{title: 'No verified data'}" translate-attr="{title: 'No verified data'}"
class="bright" class="bright"
icon="icon-no036"> icon="icon-no036">

2
modules/ticket/front/index/index.html
View File

@ -40,7 +40,7 @@
</vn-td> </vn-td>
<vn-td class="icon-field"> <vn-td class="icon-field">
<vn-icon <vn-icon
ng-show="::ticket.isTaxDataChecked !== 0" ng-show="::ticket.isNotTaxDataChecked !== 0"
translate-attr="{title: 'No verified data'}" translate-attr="{title: 'No verified data'}"
class="bright" class="bright"
icon="icon-no036"> icon="icon-no036">