From 3c6d27a2853bd3afe81302aed60314f103a55130 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Mon, 4 Mar 2019 12:04:23 +0100 Subject: [PATCH 1/9] order sales by concept #1166 --- .../changes/10-ticketGetVisibleAvailable.sql | 36 +++++++++++++++++++ e2e/paths/ticket-module/03_list_sale.spec.js | 8 ++--- front/core/components/td-editable/style.scss | 14 +++++++- .../methods/ticket/specs/getSales.spec.js | 5 ++- modules/ticket/back/methods/ticket/summary.js | 2 +- 5 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 db/install/changes/10-ticketGetVisibleAvailable.sql diff --git a/db/install/changes/10-ticketGetVisibleAvailable.sql b/db/install/changes/10-ticketGetVisibleAvailable.sql new file mode 100644 index 000000000..3d49d98d4 --- /dev/null +++ b/db/install/changes/10-ticketGetVisibleAvailable.sql @@ -0,0 +1,36 @@ +DROP PROCEDURE IF EXISTS vn.ticketGetVisibleAvailable; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticketGetVisibleAvailable`( + vTicket INT) +BEGIN + DECLARE vVisibleCalc INT; + DECLARE vAvailableCalc INT; + DECLARE vShipped DATE; + DECLARE vWarehouse TINYINT; + DECLARE vAlertLevel INT; + + SELECT t.warehouseFk, t.shipped, ts.alertLevel INTO vWarehouse, vShipped, vAlertLevel + FROM ticket t + LEFT JOIN ticketState ts ON ts.ticketFk = vTicket + WHERE t.id = vTicket; + + IF vAlertLevel IS NULL OR vAlertLevel = 0 THEN + IF vShipped >= CURDATE() THEN + CALL cache.available_refresh(vAvailableCalc, FALSE, vWarehouse, vShipped); + END IF; + IF vShipped = CURDATE() THEN + CALL cache.visible_refresh(vVisibleCalc, FALSE, vWarehouse); + END IF; + END IF; + + SELECT s.id, s.itemFk, s.quantity, s.concept, s.price, s.reserved, s.discount, v.visible, av.available, it.image + FROM sale s + LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCalc + LEFT JOIN cache.available av ON av.item_id = s.itemFk AND av.calc_id = vAvailableCalc + LEFT JOIN item it ON it.id = s.itemFk + WHERE s.ticketFk = vTicket + ORDER BY s.concept; +END$$ +DELIMITER ; diff --git a/e2e/paths/ticket-module/03_list_sale.spec.js b/e2e/paths/ticket-module/03_list_sale.spec.js index 2813bb988..54d63e26a 100644 --- a/e2e/paths/ticket-module/03_list_sale.spec.js +++ b/e2e/paths/ticket-module/03_list_sale.spec.js @@ -15,21 +15,21 @@ describe('Ticket List sale path', () => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleColour, 'innerText'); - expect(value).toContain('Red'); + expect(value).toContain('Yellow'); }); it('should confirm the first ticket sale contains the lenght', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleText, 'innerText'); - expect(value).toContain('3'); + expect(value).toContain('5'); }); it('should confirm the first ticket sale contains the price', async() => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText'); - expect(value).toContain('1.30'); + expect(value).toContain('2.30'); }); it('should confirm the first ticket sale contains the discount', async() => { @@ -43,7 +43,7 @@ describe('Ticket List sale path', () => { const value = await nightmare .waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText'); - expect(value).toContain('19.50'); + expect(value).toContain('23'); }); it('should navigate to the catalog by pressing the new item button', async() => { diff --git a/front/core/components/td-editable/style.scss b/front/core/components/td-editable/style.scss index 5fd042980..71162e906 100644 --- a/front/core/components/td-editable/style.scss +++ b/front/core/components/td-editable/style.scss @@ -1,11 +1,23 @@ @import "variables"; vn-td-editable { - cursor: pointer; + text { + cursor: pointer; + display: block + } + outline: none; position: relative; &:not([disabled="true"]) { cursor: initial; + + + text:hover::after { + font-family: 'salixfont'; + float: right; + content: '\e900'; + display: block + } } &.selected > .text { visibility: hidden; diff --git a/modules/ticket/back/methods/ticket/specs/getSales.spec.js b/modules/ticket/back/methods/ticket/specs/getSales.spec.js index da44716cf..a2ea4de3f 100644 --- a/modules/ticket/back/methods/ticket/specs/getSales.spec.js +++ b/modules/ticket/back/methods/ticket/specs/getSales.spec.js @@ -6,6 +6,9 @@ describe('ticket getSales()', () => { expect(sales.length).toEqual(4); expect(sales[0].tags).toBeDefined(); - expect(sales[1].claim).toBeDefined(); + expect(sales[1].tags).toBeDefined(); + expect(sales[2].tags).toBeDefined(); + expect(sales[3].tags).toBeDefined(); + expect(sales[2].claim).toBeDefined(); }); }); diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js index b47d325cd..2b1d8711c 100644 --- a/modules/ticket/back/methods/ticket/summary.js +++ b/modules/ticket/back/methods/ticket/summary.js @@ -113,7 +113,7 @@ module.exports = Self => { where: { ticketFk: ticketFk }, - order: 'itemFk ASC', + order: 'concept', include: [ {relation: 'item'}, {relation: 'claimBeginning'} From 9be6f1351a7af8e844503fa16ca253b4dab3b9a9 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Mar 2019 08:42:05 +0100 Subject: [PATCH 2/9] updated steps --- modules/agency/front/basic-data/index.html | 4 ++-- modules/agency/front/create/index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/agency/front/basic-data/index.html b/modules/agency/front/basic-data/index.html index 4d0a67bdf..28ec35377 100644 --- a/modules/agency/front/basic-data/index.html +++ b/modules/agency/front/basic-data/index.html @@ -51,14 +51,14 @@ label="Price" field="$ctrl.zone.price" min="0.00" - step="0.20" + step="0.10" display-controls="false"> diff --git a/modules/agency/front/create/index.html b/modules/agency/front/create/index.html index 0a8c08207..ac6b76efd 100644 --- a/modules/agency/front/create/index.html +++ b/modules/agency/front/create/index.html @@ -53,14 +53,14 @@ label="Price" field="$ctrl.zone.price" min="0.00" - step="0.20" + step="0.10" display-controls="false"> From 80ebf671e889b53d44f4e838efc0902a97f94b1c Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Mar 2019 10:45:07 +0100 Subject: [PATCH 3/9] fonts rollback to version 1.24 --- front/core/styles/salixfont.css | 430 +++++++++++++++---------------- front/core/styles/salixfont.eot | Bin 24264 -> 0 bytes front/core/styles/salixfont.svg | 160 ++++++------ front/core/styles/salixfont.ttf | Bin 24088 -> 23724 bytes front/core/styles/salixfont.woff | Bin 24164 -> 23800 bytes 5 files changed, 295 insertions(+), 295 deletions(-) delete mode 100644 front/core/styles/salixfont.eot diff --git a/front/core/styles/salixfont.css b/front/core/styles/salixfont.css index 67ff48cb5..8e9a02963 100644 --- a/front/core/styles/salixfont.css +++ b/front/core/styles/salixfont.css @@ -23,240 +23,240 @@ -moz-osx-font-smoothing: grayscale; } -.icon-tax:before { - content: "\e901"; -} -.icon-notes:before { - content: "\e902"; -} -.icon-lineas:before { - content: "\e903"; -} -.icon-languaje:before { - content: "\e904"; -} -.icon-greuge:before { - content: "\e905"; +.icon-pets:before { + content: "\e94e"; } .icon-100:before { - content: "\e906"; -} -.icon-History:before { - content: "\e907"; -} -.icon-Inactivo:before { - content: "\e908"; -} -.icon-person:before { - content: "\e909"; -} -.icon-actions:before { - content: "\e90a"; -} -.icon-addperson:before { - content: "\e90b"; -} -.icon-albaran:before { - content: "\e90c"; -} -.icon-apps:before { - content: "\e90d"; -} -.icon-artificial:before { - content: "\e90e"; -} -.icon-barcode:before { - content: "\e90f"; -} -.icon-basket:before { - content: "\e910"; -} -.icon-bin:before { - content: "\e911"; -} -.icon-botanical:before { - content: "\e912"; -} -.icon-claims:before { - content: "\e913"; -} -.icon-clone:before { - content: "\e914"; -} -.icon-columnadd:before { - content: "\e915"; -} -.icon-columndelete:before { - content: "\e916"; -} -.icon-complementos:before { - content: "\e917"; -} -.icon-components:before { - content: "\e918"; -} -.icon-confeccion:before { - content: "\e919"; -} -.icon-consignatarios:before { - content: "\e91a"; -} -.icon-control:before { - content: "\e91b"; -} -.icon-credit:before { - content: "\e91c"; -} -.icon-deleteline:before { - content: "\e91d"; -} -.icon-delivery:before { - content: "\e91e"; -} -.icon-details:before { - content: "\e900"; -} -.icon-dfiscales:before { - content: "\e91f"; -} -.icon-doc:before { - content: "\e920"; -} -.icon-entrada:before { - content: "\e921"; -} -.icon-eye:before { - content: "\e922"; -} -.icon-flor:before { - content: "\e923"; -} -.icon-frozen:before { - content: "\e924"; -} -.icon-grid:before { - content: "\e925"; -} -.icon-headercol:before { - content: "\e926"; -} -.icon-info:before { - content: "\e927"; -} -.icon-item:before { - content: "\e928"; -} -.icon-linesprepaired:before { - content: "\e929"; -} -.icon-logout:before { - content: "\e92a"; -} -.icon-mana:before { - content: "\e92b"; -} -.icon-mandatory:before { - content: "\e92c"; -} -.icon-newalbaran:before { - content: "\e92d"; -} -.icon-newinvoices:before { - content: "\e92e"; -} -.icon-niche:before { - content: "\e92f"; -} -.icon-no036:before { - content: "\e930"; -} -.icon-noweb:before { - content: "\e931"; -} -.icon-onlinepayment:before { - content: "\e932"; -} -.icon-package:before { - content: "\e933"; -} -.icon-payment:before { - content: "\e934"; -} -.icon-pets:before { - content: "\e935"; -} -.icon-photo:before { - content: "\e936"; -} -.icon-planta:before { - content: "\e937"; -} -.icon-recovery:before { - content: "\e938"; -} -.icon-regentry:before { - content: "\e939"; -} -.icon-reserva:before { - content: "\e93a"; -} -.icon-revision:before { - content: "\e93b"; -} -.icon-riesgo:before { - content: "\e93c"; -} -.icon-services:before { - content: "\e93d"; -} -.icon-settings:before { - content: "\e93e"; -} -.icon-sign:before { - content: "\e93f"; -} -.icon-sms:before { content: "\e940"; } -.icon-solclaim:before { - content: "\e941"; +.icon-accessory:before { + content: "\e90a"; } -.icon-solunion:before { - content: "\e942"; +.icon-actions:before { + content: "\e900"; } -.icon-splitline:before { - content: "\e943"; +.icon-addperson:before { + content: "\e901"; } -.icon-stowaway:before { - content: "\e944"; +.icon-albaran:before { + content: "\e902"; } -.icon-supplier:before { - content: "\e945"; -} -.icon-tags:before { - content: "\e946"; -} -.icon-ticket:before { - content: "\e947"; -} -.icon-traceability:before { +.icon-apps:before { content: "\e948"; } -.icon-transaction:before { +.icon-artificial:before { + content: "\e903"; +} +.icon-barcode:before { + content: "\e904"; +} +.icon-basket:before { + content: "\e942"; +} +.icon-bin:before { + content: "\e905"; +} +.icon-botanical:before { + content: "\e906"; +} +.icon-bucket:before { + content: "\e907"; +} +.icon-claims:before { + content: "\e908"; +} +.icon-clone:before { + content: "\e909"; +} +.icon-columnadd:before { + content: "\e944"; +} +.icon-columndelete:before { + content: "\e90f"; +} +.icon-components:before { + content: "\e90b"; +} +.icon-consignatarios:before { + content: "\e90d"; +} +.icon-control:before { + content: "\e93f"; +} +.icon-credit:before { + content: "\e90e"; +} +.icon-delivery:before { + content: "\e910"; +} +.icon-details:before { + content: "\e911"; +} +.icon-disabled:before { + content: "\e91b"; +} +.icon-doc:before { + content: "\e913"; +} +.icon-entry:before { + content: "\e914"; +} +.icon-exit:before { + content: "\e947"; +} +.icon-eye:before { + content: "\e915"; +} +.icon-fiscal:before { + content: "\e912"; +} +.icon-flower:before { + content: "\e916"; +} +.icon-frozen:before { + content: "\e917"; +} +.icon-greenery:before { + content: "\e93c"; +} +.icon-greuge:before { + content: "\e918"; +} +.icon-grid:before { + content: "\e919"; +} +.icon-handmade:before { + content: "\e90c"; +} +.icon-history:before { + content: "\e91a"; +} +.icon-info:before { content: "\e949"; } -.icon-unavailable:before { +.icon-invoices1:before { content: "\e94a"; } -.icon-verde:before { +.icon-invoices:before { + content: "\e91c"; +} +.icon-item:before { + content: "\e941"; +} +.icon-languaje:before { + content: "\e91d"; +} +.icon-linedelete:before { + content: "\e946"; +} +.icon-lines:before { + content: "\e91e"; +} +.icon-linesplit:before { + content: "\e945"; +} +.icon-linesprepaired:before { content: "\e94b"; } -.icon-volume:before { +.icon-logout:before { + content: "\e91f"; +} +.icon-mana:before { + content: "\e920"; +} +.icon-mandatory:before { + content: "\e921"; +} +.icon-niche:before { + content: "\e922"; +} +.icon-no036:before { + content: "\e923"; +} +.icon-notes:before { + content: "\e924"; +} +.icon-noweb:before { + content: "\e925"; +} +.icon-onlinepayment:before { + content: "\e926"; +} +.icon-package:before { + content: "\e927"; +} +.icon-payment:before { + content: "\e928"; +} +.icon-person:before { + content: "\e929"; +} +.icon-photo:before { + content: "\e92a"; +} +.icon-plant:before { + content: "\e92b"; +} +.icon-recovery:before { + content: "\e92d"; +} +.icon-regentry:before { + content: "\e92e"; +} +.icon-reserve:before { + content: "\e92f"; +} +.icon-revision:before { content: "\e94c"; } -.icon-web:before { +.icon-risk:before { + content: "\e930"; +} +.icon-services:before { content: "\e94d"; } +.icon-settings:before { + content: "\e931"; +} +.icon-sms:before { + content: "\e932"; +} +.icon-solclaim:before { + content: "\e933"; +} +.icon-solunion:before { + content: "\e934"; +} +.icon-splur:before { + content: "\e935"; +} +.icon-stowaway:before { + content: "\e92c"; +} +.icon-supplier:before { + content: "\e936"; +} +.icon-tags:before { + content: "\e937"; +} +.icon-tax:before { + content: "\e938"; +} +.icon-ticket:before { + content: "\e939"; +} +.icon-traceability:before { + content: "\e93a"; +} +.icon-transaction:before { + content: "\e93b"; +} +.icon-volume:before { + content: "\e93d"; +} +.icon-web:before { + content: "\e93e"; +} .icon-worker:before { - content: "\e94e"; + content: "\e943"; } \ No newline at end of file diff --git a/front/core/styles/salixfont.eot b/front/core/styles/salixfont.eot deleted file mode 100644 index d02e74ae49946c4f2ca7f092fdb97ebd37b890e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24264 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 a;rrV$jLst{HHDpi7#^$NFcQD^@Bar9k^2z< diff --git a/front/core/styles/salixfont.svg b/front/core/styles/salixfont.svg index 9c99d9457..d6654ec1e 100644 --- a/front/core/styles/salixfont.svg +++ b/front/core/styles/salixfont.svg @@ -3,87 +3,87 @@ Generated by IcoMoon - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/front/core/styles/salixfont.ttf b/front/core/styles/salixfont.ttf index 229075e3522ad98524ebf2577c77a4c97f7f37aa..7c0ac2492e9e53d1af4eb16ed47a939da5cb585b 100644 GIT binary patch delta 2197 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 diff --git a/front/core/styles/salixfont.woff b/front/core/styles/salixfont.woff index 97f55da68244ca8b245b380c62bd0c08596c05cd..2a9a880f52056e7351bcdcfa84e5312fba9b60ee 100644 GIT binary patch delta 2244 zcmaJ?eQZXNChAOF|N|P&PtLAS^KiCP(5hi;S1QaMs6>p8Xlko=QdwV1K;n1n z`e9nz=4f>4cUq$bAw92AGg~bj=0|+4Ep_Xhr{lO z`2%mP`w;6-dd}m{Ecz4Pj2Tp3ii0>DipJ8o39^f|M4^;$NPxN|kGB#79TLLu9d=a% zA;YU+73}8J7R(A>ciA`LJd90acG9bGpq}@7352oVdNYRkiD`c2jT@#SHw4mnBZg&+ z#T#+5B?Zf?&1*}t5xI%0!}>*efWt`tth|G;FN3>SwP#qrsx07g3qmUk6v0UlRH}Ct6vq{aT!5%aNtX@j2DH_5c}K~otDBL!Pp6y7j~jKrO8GOs}~>^PO2H4gcpEO zkCuXpWN~eaRFc2r-l3{}&b#X~nf2VA+E%iuc-R}Pa(jcpWAhY~`8heO*0joMIGd=A zMz{EUWx4+TT#4-45{uR)vSHOPe5)qaFVC?TWB!I>ds-;9+U(YJL(=C~tEwC&jg^%V zAZ=D4BbAknB_%Z#EwU%sfb@0zBxZl3E&AIrAJLzvhhw-zx9is$MlI~`mh<|5(m5_* zMRa9xbz_gBJeow$p>yb0=vDMO(wU`a>ogpxCVB+82dWIapz?|4CU_&8aVyrEQ^}U- z1}wv-z+H%Fav7GBF^v}^5{@Kgh*J~I8*!ppZAzq)n#%}5 zASe8=Wl`2-S1opF*rmF##+@$A@40c|>(j;41-#*O@$~{(DBRdHe*qgzajB?qe%xQs z7q|bCvKKioeuG`--eP0qJX;~N`u4}JQ2k&1%N%P8zQ;ZluItul9P2}+Z({u)**45R zbnjwUyL(x;l4Wnle$2-07uki#gx*>Q7p*CFPCwh$j`hOUF|13edt4YpD+URqH@SXL zmiZFdq5s44(KFYpA8OV+xP4>6;6e6-5EDNGx*gYU(OeBS!aX)pZXoQya4x z+^lKuXW6}#P1LlEbsmZfaJOlfm|6mT3Z$Q1+Z&ix0U2369P$6O5og4IGsdV9*`RqT z=x69Qrnty8axal6IYT{kj8BLO%Tt!ymIu~)o5QxtcE)zy_Gf$AQSUh6xa_!J(o^#6 zp;AZbd!?V0`JF!JnDbSa#Z~V*<=*Z7sWdFTBHi}hkv}MZzWgiyLH}Z)H!xdKUvar& zLD^SHtGMc(>Ni7=h3Zhta&z~M3$p3MBjz-m$ z`!-BlAz9^TtSDn*3i#(H=HcHxU}6FI0TbJx%g#Z^#?%VTI`FJv4wa&x zn3w?HVPXpSoPkvsz(Ws?nhpUR!zQ+&7IbTTWbE;&L-`XEXdI28G4wc^V*7?_8y~@= XL(texpovGg*v+A!`%(O7LsS0+MMTzC delta 2765 zcmZ`*eM}t36`$GJkGta*cG=rqIJkqm^?h+*xZC?6HrN;Yjue6o#Kr;qkwD6w33@NRp8RM zaJH-{y_?_6Z{B-5`)1yo+4<~O`27o5`DRyJ8^Q>F`-V};YFmM@@z*`dQ}t~#eZvU# z4S%%bx$R>kgTM#EV3D%m+GqdU7zjc3AoSN+;Ff4%Y~si?$Yv43offuWTgQRPhrn+4 zTVV5|1z|jNVPbIl5JG#v7S*oeF#heq!HE%&ordRLvXC$N*4sA@O->yF=d!h%6$4T&NOxk%q#k0mZ>w^oaqVpOr3M|VAyM@CJ@o93yiEH=JZKW7puk0l00zgQ$!z-tBhQ3yp*qwzs? zu-}*T$!VypKbgEHb?N$c;oZ8HmOAQMq?K$ej4B?F0ytWD8c&{C`HZqzAOrOqHq^J) zt>}@~)(CaEuGOPjhN@>p&*v}a^P|QC-Sg&UvXe4#=PTIsvH!y67273je6oF~@f+zu z^Q>bIH+P{oaR@&GOIM0LSn~%%vGgV!N(4jep~rHiSavBj*w1P)P4od*p?G0Y4mktH zkDOlRE)4d1+!D$z%O1vP#Kv3B7Ne9`j1V6-diVz881OTEjMkd`G4m3CKV=4lEHU=B z|IQef?lVqx^_d>mA~q+K1Z@mzuv2dku z%Bra=xN+r6{S0+(Wnc{%>@Hki1LV-HY^p*vkVy#pVG^7n^z1eN)DgzU^Y@)JKI;00 z`FYKcDPunwHYa+Tv3b@Hm1o_U&HQ`s`;;j+3{&RbSQBF=cRZBPWS!!9{U3DFO4 z=zg}Fu!Nqm+i7@W+nH?}4(lvOM1>D~A|Zj-1R)|2ma9?JIziGTw$#Cj9H9y4L?6vogohEMFzCc8<7McfjEYX%0Kr$Vg$u;o${|5SUmS(*@q{CVT(gO>j!VQig zCG1cSAq?Hi&^T|yqlDQ-7)-Kxjw2kyE+1R6zYvTb1Tmn#cigQj@u) z*0j37asc*~n&irGJO#%doOy8IC0lTk12Ly@YC4&Q^D(}1o)qScSv( z>SNI;RURGa$LSe&gEY{eVR<&w+t=FKmt|$i={~2QvwJ$~)`!CzL}8?T<63-)`a@GHKIAx_Bmy~x-Ek>>ly$UUrhbwfwGoQPzenJ zgx*$hg>FV{{ET@497WX+!`IXtyki{FbjW^p6(hmW&uD`&~2E6p;h2 z6<%}zKa8KmFH%F)9Q85jCMU@|bTj<~{WjxgtJzL2$Sv5swx8K)`+EC6hu`Vq^ZaY2 z6{TBB50-5&J686KvWr4o42omoE8+*`{_@w#3sSQy<@$l^g4`!RE&p4|R(LD6xWiTR zRZG>Eyia;Rt%(fRvbA|%weKhX1^1U45r4g6%0GmzijB4SWt`>xdSE8#T|nO_D?tDCl4M$JJ29HfcB$l)L{H~ dcO>!EDwKy)@gO?#)mo!_k4O1Gs$+Ym{|Bs4FyH_H From 7f10a509e04c37cbfcadc8b22b067298d1fea999 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Mar 2019 11:34:05 +0100 Subject: [PATCH 4/9] #1188 item.index filtering doesnt work for some params --- modules/item/back/methods/item/filter.js | 40 ++++++++++++++++-------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 6a8eac680..0abb3ceb6 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -23,6 +23,11 @@ module.exports = Self => { type: 'String', description: `If it's and integer searchs by id, otherwise it searchs by name`, http: {source: 'query'} + }, { + arg: 'id', + type: 'Integer', + description: 'Item id', + http: {source: 'query'} }, { arg: 'categoryFk', type: 'Integer', @@ -71,7 +76,7 @@ module.exports = Self => { case 'categoryFk': return {'ic.id': value}; case 'typeFk': - return {'t.id': value}; + return {'i.typeFk': value}; case 'isActive': return {'i.isActive': value}; } @@ -96,10 +101,10 @@ module.exports = Self => { ic.name AS category, i.density, tc.description AS taxClass, b.grouping, b.packing FROM item i - JOIN itemType t ON t.id = i.typeFk + LEFT JOIN itemType t ON t.id = i.typeFk LEFT JOIN itemCategory ic ON ic.id = t.categoryFk - JOIN worker w ON w.id = t.workerFk - JOIN account.user u ON u.id = w.userFk + LEFT JOIN worker w ON w.id = t.workerFk + LEFT JOIN account.user u ON u.id = w.userFk LEFT JOIN intrastat intr ON intr.id = i.intrastatFk LEFT JOIN producer pr ON pr.id = i.producerFk LEFT JOIN origin ori ON ori.id = i.originFk @@ -118,17 +123,26 @@ module.exports = Self => { if (ctx.args.tags) { let i = 1; - for (let tag of ctx.args.tags) { - if (tag.value == null) continue; - let tAlias = `it${i++}`; - stmt.merge({ - sql: `JOIN itemTag ${tAlias} ON ${tAlias}.itemFk = i.id - AND ${tAlias}.tagFk = ? - AND ${tAlias}.value = ?`, - params: [tag.tagFk, tag.value] - }); + for (const tag of ctx.args.tags) { + const tAlias = `it${i++}`; + + if (tag.tagFk) { + stmt.merge({ + sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id + AND ${tAlias}.tagFk = ? + AND ${tAlias}.value LIKE ?`, + params: [tag.tagFk, `%${tag.value}%`], + }); + } else { + stmt.merge({ + sql: `JOIN vn.itemTag ${tAlias} ON ${tAlias}.itemFk = i.id + AND ${tAlias}.value LIKE ?`, + params: [`%${tag.value}%`], + }); + } } } + stmt.merge(conn.makeSuffix(filter)); let itemsIndex = stmts.push(stmt) - 1; From 00f9754c1e085a69c6b5e309386ec28e7eb0a4b4 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Mar 2019 12:03:34 +0100 Subject: [PATCH 5/9] #1171 item.index mostrar campos medida y nicho --- modules/item/back/methods/item/filter.js | 5 +++-- modules/item/front/index/index.html | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 0abb3ceb6..0aa8808b1 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -99,7 +99,7 @@ module.exports = Self => { intr.description AS intrastat, i.stems, ori.code AS origin, t.name AS type, ic.name AS category, i.density, tc.description AS taxClass, - b.grouping, b.packing + b.grouping, b.packing, itn.code AS niche FROM item i LEFT JOIN itemType t ON t.id = i.typeFk LEFT JOIN itemCategory ic ON ic.id = t.categoryFk @@ -110,7 +110,8 @@ module.exports = Self => { LEFT JOIN origin ori ON ori.id = i.originFk LEFT JOIN taxClass tc ON tc.id = i.taxClassFk LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk - LEFT JOIN vn.buy b ON b.id = lb.buy_id` + LEFT JOIN vn.buy b ON b.id = lb.buy_id + LEFT JOIN itemPlacement itn ON itn.itemFk = i.id AND itn.warehouseFk = t.warehouseFk` ); if (ctx.args.hasVisible === true) { diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 5a2988537..6f748a752 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -26,6 +26,8 @@ Packing Description Stems + Size + Niche Type Category Intrastat @@ -65,6 +67,8 @@ {{::item.stems}} + {{::item.size}} + {{::item.niche}} {{::item.type}} {{::item.category}} {{::item.intrastat}} From 32893b49c1d07d6d350306b10139d5634b2f63b3 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Mar 2019 12:13:46 +0100 Subject: [PATCH 6/9] #1174 item.index buscador avanzado mostrar comprador --- modules/item/back/methods/item/filter.js | 7 +++++++ modules/item/front/index/index.html | 2 +- modules/item/front/search-panel/index.html | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 0aa8808b1..f92248037 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -48,6 +48,11 @@ module.exports = Self => { type: 'Boolean', description: 'Whether the the item is o not active', http: {source: 'query'} + }, { + arg: 'salesPersonFk', + type: 'Integer', + description: 'The buyer of the item', + http: {source: 'query'} } ], returns: { @@ -75,6 +80,8 @@ module.exports = Self => { return {'i.description': {like: `%${value}%`}}; case 'categoryFk': return {'ic.id': value}; + case 'salesPersonFk': + return {'t.workerFk': value}; case 'typeFk': return {'i.typeFk': value}; case 'isActive': diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 6f748a752..88f8fb5bc 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -32,7 +32,7 @@ Category Intrastat Origin - Sales person + Buyer Density Tax class Active diff --git a/modules/item/front/search-panel/index.html b/modules/item/front/search-panel/index.html index e3cb1f3d2..fca01dc2a 100644 --- a/modules/item/front/search-panel/index.html +++ b/modules/item/front/search-panel/index.html @@ -46,6 +46,17 @@ label="Description" model="filter.description"> + + Date: Tue, 5 Mar 2019 12:25:37 +0100 Subject: [PATCH 7/9] changed showfield of salesperson autocomplete --- modules/order/front/search-panel/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/order/front/search-panel/index.html b/modules/order/front/search-panel/index.html index 5f312992e..8f692a0fa 100644 --- a/modules/order/front/search-panel/index.html +++ b/modules/order/front/search-panel/index.html @@ -34,10 +34,10 @@ field="filter.workerFk" url="/client/api/Clients/activeWorkersWithRole" search-function="{firstName: $search}" + show-field="nickname" value-field="id" where="{role: 'employee'}" label="Sales person"> - {{firstName}} {{name}} From f5262954bcb7266735392fde25e57985b9bb71be Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 5 Mar 2019 14:08:00 +0100 Subject: [PATCH 8/9] bug with filter giving wrong dates fixed --- front/core/filters/dateTime.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/front/core/filters/dateTime.js b/front/core/filters/dateTime.js index de1506ead..fdda69870 100644 --- a/front/core/filters/dateTime.js +++ b/front/core/filters/dateTime.js @@ -9,9 +9,13 @@ dateTime.$inject = ['$filter']; export default function dateTime($filter) { return function(input, format) { - let value = new Date(input); - let offset = value.getTimezoneOffset() * 60000; - value.setTime(value.getTime() + offset); + let value; + if (input) { + value = new Date(input); + let offset = value.getTimezoneOffset() * 60000; + value.setTime(value.getTime() + offset); + } + return $filter('date')(value, format); }; } From d6683918bb8126887e29b5ae905966fb663fc03d Mon Sep 17 00:00:00 2001 From: Gerard Date: Mon, 4 Mar 2019 16:06:41 +0100 Subject: [PATCH 9/9] =?UTF-8?q?#1165=20A=C3=B1adir=20al=20buscador=20avanz?= =?UTF-8?q?ado=20de=20order=20la=20b=C3=BAsqueda=20por=20ticket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/order/back/methods/order/filter.js | 12 ++++++++++++ modules/order/front/search-panel/index.html | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index 00b4eec96..628b85343 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -35,6 +35,10 @@ module.exports = Self => { arg: 'clientFk', type: 'Integer', description: `The client id` + }, { + arg: 'ticketFk', + type: 'Integer', + description: `The ticket id` }, { arg: 'agencyModeFk', type: 'Integer', @@ -78,6 +82,8 @@ module.exports = Self => { return {'o.agency_id': value}; case 'sourceApp': return {'o.source_app': value}; + case 'ticketFk': + return {'ort.ticketFk': value}; case 'isConfirmed': return {'o.confirmed': value ? 1 : 0}; case 'id': @@ -118,6 +124,12 @@ module.exports = Self => { LEFT JOIN worker wk ON wk.id = c.salesPersonFk LEFT JOIN account.user u ON u.id = wk.userFk LEFT JOIN company co ON co.id = o.company_id`); + + if (ctx.args && ctx.args.ticketFk) { + stmt.merge({ + sql: `LEFT JOIN orderTicket ort ON ort.orderFk = o.id` + }); + } stmt.merge(conn.makeSuffix(filter)); stmts.push(stmt); diff --git a/modules/order/front/search-panel/index.html b/modules/order/front/search-panel/index.html index 8f692a0fa..0af885a53 100644 --- a/modules/order/front/search-panel/index.html +++ b/modules/order/front/search-panel/index.html @@ -50,6 +50,13 @@ model="filter.to"> + + + +