From b006da08e3dbea5ff10159886ef04c6de6f307e1 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 20 Nov 2018 16:33:09 +0100 Subject: [PATCH 01/13] #839 el autocomplete de ticket.weekly no se puede abrir --- client/ticket/src/weekly/index.html | 2 +- client/ticket/src/weekly/index.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/client/ticket/src/weekly/index.html b/client/ticket/src/weekly/index.html index f8431d622..8cfb97803 100644 --- a/client/ticket/src/weekly/index.html +++ b/client/ticket/src/weekly/index.html @@ -34,7 +34,7 @@ {{::weekly.ticket.client.name}} - + Date: Tue, 20 Nov 2018 16:33:43 +0100 Subject: [PATCH 02/13] added missing locale --- client/ticket/src/index/locale/es.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 client/ticket/src/index/locale/es.yml diff --git a/client/ticket/src/index/locale/es.yml b/client/ticket/src/index/locale/es.yml new file mode 100644 index 000000000..6eb23be33 --- /dev/null +++ b/client/ticket/src/index/locale/es.yml @@ -0,0 +1 @@ +Turns: Turnos \ No newline at end of file From 8119761792a8f914346d966732c241c27eb1e677 Mon Sep 17 00:00:00 2001 From: Gerard Date: Tue, 20 Nov 2018 16:36:37 +0100 Subject: [PATCH 03/13] =?UTF-8?q?#840=20dropdown=20no=20deberia=20de=20ten?= =?UTF-8?q?er=20timeout=20cuando=20data=20est=C3=A9=20definido?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/core/src/components/drop-down/drop-down.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/client/core/src/components/drop-down/drop-down.js b/client/core/src/components/drop-down/drop-down.js index 0e9b79584..5e797e560 100755 --- a/client/core/src/components/drop-down/drop-down.js +++ b/client/core/src/components/drop-down/drop-down.js @@ -26,7 +26,7 @@ export default class DropDown extends Component { this.showLoadMore = true; this.showFilter = true; - this.docKeyDownHandler = (e) => this.onDocKeyDown(e); + this.docKeyDownHandler = e => this.onDocKeyDown(e); } $postLink() { @@ -34,7 +34,7 @@ export default class DropDown extends Component { this.input = this.element.querySelector('.search input'); this.ul = this.element.querySelector('ul'); this.list = this.element.querySelector('.list'); - this.list.addEventListener('scroll', (e) => this.onScroll(e)); + this.list.addEventListener('scroll', e => this.onScroll(e)); } get shown() { @@ -66,10 +66,13 @@ export default class DropDown extends Component { if (this.model) { this.model.clear(); - this.searchTimeout = this.$timeout(() => { + if (!this.data) { + this.searchTimeout = this.$timeout(() => { + this.refreshModel(); + this.searchTimeout = null; + }, 350); + } else this.refreshModel(); - this.searchTimeout = null; - }, 350); } this.buildList(); From a856bc11bf99551ade9d463d25cae1a8a1db7e70 Mon Sep 17 00:00:00 2001 From: Joan Date: Wed, 21 Nov 2018 07:27:49 +0100 Subject: [PATCH 04/13] hide catalog model results --- client/order/src/catalog/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/order/src/catalog/index.html b/client/order/src/catalog/index.html index ec21fb2ea..0289178ff 100644 --- a/client/order/src/catalog/index.html +++ b/client/order/src/catalog/index.html @@ -11,7 +11,7 @@ - {{model.data.length || 0}} results + Date: Wed, 21 Nov 2018 08:47:31 +0100 Subject: [PATCH 05/13] updated fonts --- client/client/routes.json | 2 +- client/core/src/styles/fontello-codes.css | 10 ++++++---- client/core/src/styles/fontello.woff2 | Bin 13876 -> 16040 bytes 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/client/routes.json b/client/client/routes.json index c8dc88300..ca5f629e5 100644 --- a/client/client/routes.json +++ b/client/client/routes.json @@ -344,7 +344,7 @@ {"state": "client.card.creditInsurance.index", "icon": "icon-solunion"}, {"state": "client.card.contact", "icon": "contact_phone"}, {"state": "client.card.sample.index", "icon": "mail"}, - {"state": "client.card.webPayment", "icon": ""} + {"state": "client.card.webPayment", "icon": "icon-onlinepayment"} ] } ] diff --git a/client/core/src/styles/fontello-codes.css b/client/core/src/styles/fontello-codes.css index 901d8bcae..7d0f8ed0b 100644 --- a/client/core/src/styles/fontello-codes.css +++ b/client/core/src/styles/fontello-codes.css @@ -4,7 +4,7 @@ .icon-barcode:before { content: '\e802'; } /* '' */ .icon-bucket:before { content: '\e803'; } /* '' */ .icon-accessory:before { content: '\e804'; } /* '' */ -.icon-dfiscales:before { content: '\e805'; } /* '' */ +.icon-fiscal:before { content: '\e805'; } /* '' */ .icon-doc:before { content: '\e806'; } /* '' */ .icon-eye:before { content: '\e807'; } /* '' */ .icon-frozen:before { content: '\e808'; } /* '' */ @@ -12,16 +12,19 @@ .icon-grid:before { content: '\e80a'; } /* '' */ .icon-disabled:before { content: '\e80b'; } /* '' */ .icon-invoices:before { content: '\e80c'; } /* '' */ -.icon-frozen-1:before { content: '\e80d'; } /* '' */ -.icon-actions:before { content: '\e80e'; } /* '' */ +.icon-polizon:before { content: '\e80e'; } /* '' */ .icon-details:before { content: '\e80f'; } /* '' */ .icon-delivery:before { content: '\e810'; } /* '' */ .icon-solclaim:before { content: '\e811'; } /* '' */ .icon-noweb:before { content: '\e812'; } /* '' */ .icon-payment:before { content: '\e813'; } /* '' */ +.icon-supplier:before { content: '\e814'; } /* '' */ .icon-recovery:before { content: '\e815'; } /* '' */ .icon-risk:before { content: '\e816'; } /* '' */ +.icon-reserved:before { content: '\e817'; } /* '' */ +.icon-onlinepayment:before { content: '\e818'; } /* '' */ .icon-lines:before { content: '\e819'; } /* '' */ +.icon-actions:before { content: '\e81a'; } /* '' */ .icon-volum:before { content: '\e81b'; } /* '' */ .icon-components:before { content: '\e81c'; } /* '' */ .icon-clone:before { content: '\e81d'; } /* '' */ @@ -35,7 +38,6 @@ .icon-claims:before { content: '\e825'; } /* '' */ .icon-tags:before { content: '\e826'; } /* '' */ .icon-solunion:before { content: '\e827'; } /* '' */ -.icon-reserva:before { content: '\e828'; } /* '' */ .icon-entry:before { content: '\e829'; } /* '' */ .icon-traceability:before { content: '\e82a'; } /* '' */ .icon-transaction:before { content: '\e82b'; } /* '' */ diff --git a/client/core/src/styles/fontello.woff2 b/client/core/src/styles/fontello.woff2 index 412bb9121b1433e3019d98b1de9ead0976d99b24..d6e6cf5f722329415ea533d96ccf1f5f9e5ca82c 100644 GIT binary patch literal 16040 zcmV;ZK3BnaPew8T0RR9106wSy4*&oF0Cq3{06t3q0RR9100000000000000000000 z0000SR0dW6hy(~A36^jX2nvC{41uUu3t|8PHUcCAfj|Tx1%ylogKG?d1{;%VB}_N9 zopdLt4ST-I--C#1RW>5YB7H~p|DTf^V_=Vzb@xyTB6k=j=MajVJYBsn@pux##;kV) z-h$XN73+kH#fm4q9Tcg-O<4)Ow0Q<@lcYAYbnW*=y0b#v?g)*2lH@|s-|OB>uYjeBchgKjgA}3wuGqKdYqS44 zx4Yq@L&TgAvqqx^Rft{GxI|MiAriJH2{7=^+3fRbq!@_kEUjJHzW0BEf9F?t+j?b?pkYDz~KYX-|K35 zKQe6eTSR32OmcH2rqvlxE-iJ%&;$SSh5biedN7PBtMJsHuyrd>E-E`h2LL9q6}*(dg03_Hw2hM2@U zkx*g2cWTY-@~G_|NTb9KEW|Rk9C8XklC=aN{Yt+uwiUX@mMKs&2DvDB?;u>;F@|9w zTcbm5?Mj&NK}55bODMJ7|S zD_52b1_U%1kh=u-_6s1+klcF-i&7K}g!M;4L3TbE zm{p3Bvxh$spvy=CIB<;2K!0$@L&ydO_dT$C&0%fO4c8H4EkV-fmVW6fmVaofYyT6f!2dIfHs0Qfi{D-fVP6RfwqHofOdj*fp&xTfcAp+ zf%bzAfDVEVfsUlu=xD1rpOa&N1Crx_1CkSf1Co<~1CmpK1CrB#0aeGzHO!aYUjJ_~ z`(?y99(VU`#{r{%sGJxME1cO7!I=P|3Xt zsdNDaQ&w34!FC`wD^xz#pyf8B1PF9$IRB^Ou?lqN9q&#L`?h^Jj!HQeYsc*Blm^u` zQ$DGV!6X;o!KmiZiN`e-T+-3TNpg^RNahV8X3=Cj`VG+p)p-32gfSh^Qf6vbdDJef zR-)am)*c-aYZd%vMlPowmH{$a4uc9SNzFLc19XdYq)RWsrW(@2gMXrU<8l2>j2>|{ z(+5Fn88EuANxyBko*wzh50>;;d}>GM9ZhK)NO{9#Bve^1Svy^dR2#PLm?^TERJy2o zNIL-qYk5k!H1%%9Uj#}s*HR+ylIk3=Fo=DpV_}aK1W%Q08c*i6On{R%iNt0_s=ekZ zs4Ym@FD%<&&|#k5ktvWW1Aimy-`%1vdRR;x(!A%4?y1KvXDSlv_7qF&FhM$Ikbwor z#3E#239_*Qa?GV)PVo7#y$1*j7hQVWVOgJLW|2^OIgOHhUtP>z*QfjLxS z)o2w^$`Vw&Ji7`l^t{DyLFs&4pwcynFt;qL@ApT-cq!?gls=o6EQ$4S`y|Jq*T0k^X zv|c=2n~{6V_*4MO*d97v>pT?U$*u?EgS32gLH5e0_9s7@4>c8I^W;qBwuBS0#HS%$ z&+B9v;l6@N)Z%p*{X!@(ENaHHq7LpWm#Y4aAmE9_DBZBHgq&Tn%_4^FdN^EwB3|zK zZb}x0suyIaF)^wU5Hg>rzOIIcxu4J$LLVn(VXHPULx@l zH!E?^7AQrlhuqoJ4ck$a-aKVw<>#bHX2=!9Lh1H zduAU_SEL%<9{U<8jR+eJ~S6jkorap{xQKpYQC`i#f4seD^kP9m;je-I#!vV{~ zBxnUzSQ&*dva|zP!bHjSgHH4w~We05wo=JaPeEX{)KH# zNrR<8p#RT_arhab!2$jqW`D8u&-kYO13YmbfP&z_5Ev8!0wZpgR0L#Cv*4&hY9+`g zRnM9Z%1ZbOMI;IxDo?ogE_?ZHBi+x8i_7+z9ee$3Y^ExUw%)uVfj5j<57INGg1(yR zsy?bb%BR-jMD6Ne>gp@NrDiYKry5B~8ID*(7Q7 zkGeZ9DCAu@=B$Iqv8aTDry0GdfBxBp4#NGBf9Qx0W^Dc`ILEnDCdZOnX z=iXt5nG%z4)ce584>s6~z2Lu4J#qJhJ?xH`=UV>1oN|5rccSCxE2k^stA3j#^8rU! z&Jz<(Y4Just?~aIgR}5bbGg$ct*s5{dB)M+$`j%V7EYC5@rPwPdqyY&roOEXgDo4W zQ3W?X2J3r#1b{AMZ}&mV+YvdQ9VdFRc7wR9io5r=yzdU3of_L-RyJnL?54XvZ|Cma zBNK;=CIY5tL=a)Zs1b?~A{s-OI_Bj%%Rlv=+$cejNTIjqy(7fiN#8>D^nSJ`=0@b%DX&Rfyds}`{%FG^#oQCt5@b= z363iUHf~REZ13;62Z{y`O`bB2qxKx5GvRl&2a~W&p$Rj3t3@=vLn1qC5XNN{#|191 zvcbO_SEADXilNOXcSa-ePL5}P31gFl@j`)`O`yq*_Rr+oMS-^eXed6L7L{D)9-Jzv z)38zNUv8yjn#G5NfShUk7%>!;d~V;O1odlam_{LVjHS$cUK#a6^I!z@iE;{J1IdF^ znrS;1nh!Qj*cuQ@D3Jx@3)`67^MP8<$``10HuD0b796@mAm01;i> z;E!jDP#_g5D1H`vFgCYkUy74AdkS%F0KZZlS(@e{djTQN1wI!RluXg9!)1oU2h4wyOzf_FN zTpfD4zu1-SqNdnkRj0n3uAI&WG93=Ds>m)>PiSo)t764(`V7t$m+aPROs@qTlB7T_ zP&%2RoS0>^EP?n(wzwhznOFl zFZV6Yvl(`Xrehqta+yvAG_Vv(7=NY)`;_Nl&I!TUt!T$vG?EjvlY`xIPZbK4oD`RA>z==PZZ`&e4f)AcwI+ zWhujDWRwxtpi%fPAi}c5Ai~6+TkGZ@dQ`>rnfOQhi)-gPPv){=l((a>UW-)0htV9hTuoo|KePfy`1aENN|O0%SSP z!Udf2p~Vzfn@ymh86`nBOSxEn$Avs6mR9^Dv}Wh11&G+V6v%`%R?Q`rDDAA|UG{Vd z{0o3apFo{ocbm5Wm=Wm#QX-KUD*%+EDvVAXFhUfQs@pN61__a| z&wxq@$x<@lPA=k;Y*Cq(;aWWj9Hw(hPXVewD#KX@VlrUp1Wko$U=D@LrKQF^3R#SPgK`!*vCy(b>RINNaBD?@t6!Sj942lSa0TN9A3lLb-5QhO-F-KWqydP%n$w zs7y>a25hYX8KzN}60}Cs8afJHLy!Gb9?m8k9X~@6@APf8K>&y-1e4kR)kVD!(Xe`& zP@{zFu0aTX3@?=p&!nx`dXzu_Ag>_SnPP?tTu@3z*>|=jDvn(^suW<~E)dEP4c;F7 zg9e%ENz_@Mlk!xdVbfDzO$!eQ($M1uJRc)6J(OIp2D3VM4}zr|Gb*#$O)lP_Pl91p z*Vikp;(&iZ^m5F7cl^X;W$K<22soS(N&#I5yG=GFcH5OVc{-61-KRNMZa^q!opalj z4-_y-#$lbXCg%=gi&wNKZ=fVB7U@~jxYh4mE3SW{5|$ViXOZttBh5&R&Ipjw$Ole8;VPmhN`ua^m zmY|whnmQRZ5_Fm`R1iAFn6P7paCizA8;DQqd=TV7?&arVM$|1XcH(c9Az$czE4o;H zU4f{fpiFYEEA2d~MAaotF@*ecDLG*NbuMs4|7`XVh@we55x*A%CTcy2&ZyaVc2k#& zBf3|7PvUL5V&DQZuv%b1qk`YB)UdM2dy?O&p`)_!L!f!!F{ReRd619S5O5Eh zw@?}mjExK)c`!H>2h)643-r!?O5L2jSC9>TIB`&L<|Yq+LQLo>3bmLmQ+`d?=p!?w zGf}Um;Y+Ru>3Q#c#F_v<~enSH^i4m<{I6D>r+RRrph%p{Ad2r>q53TxSJM>YGIvH zbecRW_#7|LU7r2}BOGFkbG-cFR&e?_5q^I;G$D4oo9{M6%B)jM#pND94%Qp>NoEvw z|DGrK^obJ_U6Xrm@q>K%P~li4@nVBbs;};bC~<45c78Qls9uBi}f*_qMxbp|ff?PhThSder=;eyVJ5 zuZZ534DWWgX_jx)-D#w7@iJ@m^msM9yaqxTJr;ujeRb$vT7u5G|AlJ--lqB`5N)Kp zH(DXns~Bl|m>+Ja2^Ysl9ZoVjOM>e&05LIU?(=F$3LB9+XURbl9S;%{kH$Y#C?qmu zy5@tY6ssMa=w2BleU>$QPt#xnZ)f(lANg{NE5nA?sLw#}T{sXWFvHo0-13?A#80iO3eO9#b0zet9{@$XH{R5Ks$N5&Nw>j z9}xX!>nnEQ-A?PP+lQvkxwKNLmzbN1_O`RZEF}{ym9Fgmdtq=PB0W$N@=~jn_+%f} zG`iRRLQjk8+)hRRS)MU59_c!vXKbpcF2+*`D9IE`*MZ_^=cPC=b^#S&5r&T_p5D|W@Y?`>U;^R-s|LE50(rsH~6OPfkXi6zauN@KwL( z1Ery|-?le7j2wqEj9x}Bjm;1-L@e`yxjh7*PIzSX-bGYbgKh)!)j^HUrrb!J93!DJ zgEPm|N!g@lCp-><7VynsJGtWtIK4xTRFfk^va|8q?+&w6;MAzk21?<2q?9T{PZsYl zti(iN64z)6OSq7Dba3_(H`A(caIX^H7E>`t2;{R^=x}D{v6)@PYbSkW;5PzPI`t@N zgRL&I(_*FNBhSxdJ%rh+3Ejk1ac~tv-NAPN9s6q}cxbo?GF`F-)hRr)t^iT`uyj0P zMkGgw+O}zzYgb4qDR@oynjL>_KJ)+j`&H(eOdYpTzl=IHNM%q5r>IFEOOh^pT$Tfx z_w?W#9Kt>h7w5WVxvuQzn}tk7k;^*ocWTTFmgI$A`LyWMmDw@hDi&L7djh=(oy&cq z)94;+9;a*4pTtV)m;JYSi&`~3os%;?tx|8<{9lfG(Pp)pypli_i>W~XlCqWxxQv1F zlCd00@tB&k;Jm{@#wHy;<}v(|zB$veY4^JrqI{ z_O9>=KBuKBNzt~6*6}0{zkoDf|C9icC~>0YMqluwp*|#D~rz2C;%fzNmsKe=f8a z29P0W(t$uc3#0_;nY*F!psX%(v=^H}KYrk9xcYt7+;CX`MP_)_jt)SPTZ3$?!Qd+xchf4w>PJ zd(V1;TlH@_py44BhV+dsZXzBbHevt6H({`tCOis$TU)Fx8BmdN-=o+mC4h=1`c2}J z&f|vx9hp4bKLlRMfmPF7!VV8|?+36N#vM5W^>&mm5|O^W8_u)Mb-2?rIP&B^I3{5W zlamY2zyvVaxrlUR%g<3L8{7>tf|x)IsHY1Q(l|t&8uTBW@}C-{y8Y?WlXryMA>!U# zzF&mOzG7O`in;MgnI(Guw8JXBp)OP11Pk?G$V)67$lv!8})=4 z%zS_vrZX`B!-Et_&-~GgPd}9beSitMaDUvde!H-s!W`92m#CGd=Pjlvn<1iUL29^v} z+v)88|8?Sf2`d4AV1OTUF?+U4@lc{skgCoJ29Ll~A7vJRs8%)uS~UD}2(|)H;U~ zGOz<6IGWCA<8&QvP9ZhB+Sx(j0a*{24OcrNw!#RmWYl{{FRz>NNykJSyFmGk6|{6) zI^DLg_ut1Jsn%a)@u^h+05HHxL5@G;F5fEnG60bM&RwkXnXKbJjuc>7FWl!u&u6)F zh{fsw+jxWRVMJ3f60T8&fHeR{&S-*q`)t5T{6@O!iSoLB=>gb}?l2C(1?m5z^QJ@vWP!xViz{mUtgl1Bs0e({`G>}8#inm-q60``i3;U zb_j7MX~+-PO#Xy`CTsoPd7GvD7K{R;%AM27lcSYr)|j9OR&j>jN?I_LlS{PFqO{{b z_7=;zIB?I7_3L*mtpy<8*>sT~(=w>~zT%Jm!cl#1x|_k`mI{gN0H^!~|D34u5I!U>iqAlQj@QB1BE(rgu2C*lacS4$IGO3$){i z-noosx6N~+=ceE-DY%WHjfl2<8?Snn`vR?Fh>>lA1S~u-RD9nc((BvIC?q{pq1P{D z$?J7mY*}JLPH=3vv&uQIm=dwVP#+o`T5o8cyF9?3V9{veJA$=p8F?~PqY;`|%CRDS znZnzAD)Ak$q#O8M6V(-hM3sOmAtflJzU8Rb_xFJWT#`~>uUvcR#5H}xN-B4rq(0po zwZCiG{>U6r{YN5uDL0Y3tSfSVPK&Z!R$MGASGE8E2=CVl6Y@#Xt3Sd5p#YRByc%BB zJO6C!ND;Fj4R7idnJPR2j3N5fb+9wgb#Dp+#zRK@8X?L%;#w>K0Kd%)@-3%K$l~2V zm3K4qW5Qgb6e!=FMay3{bf%hX$RH1Va%-T@acsRl76JwO0OR7UPCsBn5{^s#!HaH6 z3x4w}p18>1Fu|KJ*vZQ46CCDKZEQZDaG%X58jS!n#$1b)yU2LjmQC6g8BgxANpWCo z;VE@{&04Q*N232fFifXZk;$uC7d$eF_N)I%ct9?S4?-o zy~o`&KEi;_lf~U|9+?oOmjq>H2UcbU24ofcWc>O%Sx|=MF=%~(J83ps7)Z(q)%3KI zuA+InalXMhW%7@AM=p#E>>mg?NmtpVk?GEwCBg4c+q;4QW_uf23fBVwPmFW`O^k&Q zc<}S?)X#8$%pcpe-@DcA0JY=To@nsJ0)VYP`vrI2bkh5zWfp2TdB!jULY2jUgSlk@ zAkL0vkJzyw8Ys)@-5Ep~cg3S_doY3nK;7?`L)b)}7U@PQt^d_X=YW2Jq}N6-2k$K6>T`E zEw^{O4;JoKqWt+3W=s7So(Aa9bNaJi5CF)=tZ;TPE|A&Y#tVc;+c~geqhncgz)I#Y z;e)+(?^d@x6h>Vb&Gbaq9rMJ~Vo!1y=2^(Jljo)A5SW;Qgn?~&W=Mc6m_)aI{<+aX@Q&|C)Q`z|oh}Xd*%1+Ppzwc-Q%^%^2Rx zlx5QsXdTmx(ZdJcoox&BNlx}HH2M0b%+-o%1HYR#g6|Bwl5d{}6+|Qwvq}F)c!_&! zi+VaQU+KDXc{J@U(|SBUy6yPaAWAYN={Tz@#05Uctx$K+!P{`*Sy5`Pm_Bn_N| zg2}dZ>|4TA^$p6-&TVw;7t9#5X;9rw)r`Vy7c?I0ZI&Syl!=oOfg=Z%9XGzgF z>u->?RKxTxKCYk8NCd;r730s{Xr?I8WNq7DJy3D4tAQHB+~P7I}kqm(Kr=VMX+D9 zkD%YU5*z|}!sG%BlWyF59N((T3AcZo4hw;oD~9VhzBYM?x5P_0d*q6Ngu}Kk9eyKF zFI@!x1eBA>$R8-%mk4)sy6(os*6r5IN~*nCVC*<&7o%-hV~Sg{gEudCJZWE6Kmw=! z_A8l&4+Oi++iy0yMhMg@L4>O@Ae)sTCe zWqZLLsNcTHjo0^K;u%JU5@VlOLq+_;{dV|`K;G7Pfo-Cq7eAJA*C2bmR@g*=v&1Mg zIXO>8@8jM|(8>9%gw5YlL*AJ}y)Z6DXz)5~5XO3X#tID=%sUf2Mn9_2!454Ll|v22 zACrVWYVyw8$;nK!tT(!Vzp+3zKz|ShqXIEm{y+?d^$lEYG~eyK3C_M7c(| zx`n%GekE>C>!FKDL7oxfPCv0o6C>~p3``f=+N_G<-&b-o{Ao0wRDL}BEoV&q$Xi;h z;(N#vdz9Who#*MoIGIc>%Qv3$;6}^5E1LIm2_=BV?N(ziGl+k(StoiJ=q$ueuYbb2 zAUQfO&QTG3c*@B7TEcRUgEzac)XQXa<=VAMRZ2=t&4dwucOGoPqD7*^Cvf@P0p3m= zy8k#}D0B{YeoT1J!|T*_aP?xrERAhZu$7^5)Lhu_Z%}+w7*OmxMkvmLt7?~0hI5sJ@VH+1AwbT<$GtiSjuU1?EDm@O9{&4* zJR?LlS8V;vmx`HvvvaCLGOBIzBtV({UzJ&jH8f{VurnZ;`1sf_q>oI_4;O?3#z-!lz2EQAW>JQvrZ5v3BY`r*Qzfb*LZBdx-jalX<$*-y zV3xUVy`(=HRg5X5ofsUyWr6rc5DvhlyBuolGuNvVh>3t{CjrWUQ2#{F$NO^h4si}f zKcZXnT>eH>n*E}Z4|`nVF^er}Ll+z;#F4d^M9A!sw^9vJ8xFWq!&1M`+eF1LH@%xV zb~!=Bhzy-7UAdT%b*l){3X6qZF`i$Ixo_mJ{38jg!&p3P!X(Mykmot|-IkGV)v@q> z!v|7p+xUut>ae*tY9Ak%W!cnrEnNOJFqN-K>?x8SaH~o?{c9svVcG9%`ntTf6?pYq z;l(pHM;;$>O7zZ(#hC>WyKl0j{4G{-j6f$)zp%9KYuK=~d_BV}RH>9!GY1?lLN>h!ZODTgBj-m*WL z#(aX=DUp&9VJs%v=h+$a{B*@`g>Gq)4$DZZTsZ-a12gLv!*+^P0^5645^6U)BANjg zHS2|Xn9}3Bc-xUnf`DBgj2(;AdsBglB{)TbBaA`E5X^ zk+X^0t>%NzhrpNZ?NJGs{2cnd5gkEK@KwiPGFY6HTn*-`vHX!9HU%jZD0$&TAM@FX ztrys|LLFizb(IgDrvX@tB)7ubJJ_%6)UogH?#XCu1E~1epW2M5%gOjU)BiIYC*0XbyHug z@S!rO{j(7;=QFfN83*;fm-$mc3|5x>Jv_{k8(y;KR_a%Aq+E936J}MCWqq?i%lrmjg?!^TKQxd@NKQ8WBK#kYR3L^JfBk?nm$AAIFmBZv_8Er|7$n3FK&yB&-b4 z9un6V$cHa>GUpFSoLd16VPYd>j(yS5zIdSLmok>MNo$|g@e&9+WnC)8hfBxk*&QNAACJ$8&ZU0R~3 zx|#r`kJ?@*G{G~bu_rMiM&8i2K=Tq;v~^`TpS(*G<@~!KPT9-^dZ?o0S_T=3a~cXf zSUnFS5Z7YFIYgXdPj$pG-mvdgi6dOi_`l_eOHThf({Jy)zPdQx7bT%Jt$A(Q(aBt< z2B&NwY|6r$7}2+W2cR_8vF@i?IWw505QBI{c4LEeY=b}=kZ=37WV=b;hOaX=ZDAop zbcp13m=HYx5v&1nP9UdOV-9;xfF;{HnTJye3Lgp-Hf4K~Xz}$sw=oPGrfO%*^d2?6 zQ$AIJMXlbJwy8PApkBQ*sLx7Fth?zca-bDBZ1NmTo%IyLDm^CRGt6|3m`+<93y~3U z*r(Ym+b?~CQGI1oZ-I)5+Juv`7>_xCC}ha%EL!KmyQ8n*4Dk4Hu_{+l$a0>m5%ZWw zTb|65Db#9eiNQPJ0)G6lx+;tRv-BqTp6-oT7`)-lKg?tjnBi>Q0qkC}IWgFsvB9<( zVWW=Kd@xKBziKc$TQU)OfXrx($nG(+JCTli^USl&5)7B)vL~W@-JOL>Vt7Jd73`b9 zPQ2@DWEN&QTM;zxRZFKF->K)nK>m5qY3|CFjx7+FeVrUv7bu8UZ9pH&fj!ERZPRz> z!Wdoc=VNs*LkzD_in?k7qmNQILrq~5T9ATtU}!sQ2OV_ZxUT6dxI#WS-zm*1ezT5*o z4EUpGRb#w>2eXF`E(9X&|Jt>6{o4M%HOrSR?P_nRFU`ZEk=wU*b`)84tI%HES_sIk zzEJZE)bdAl!rk4wpy0zsOCz70UrU)>liZNaOoa1VX~vxa6}R2- z$G}Q04Sd#qwPF{lZ+wIA8HMm$-^B|%wy#uE?Muk=fX^_{xo6`AtF zmL~+ycCSiGMtV^t1|VM40Cz;n)R(bB&YSBi_=ZCCp)d9L41f8{f86#uq5Z-mxi5wf zWQdsH$SjB69X7%5DRIfwiUKF2eb+X1CF_DI=VsQ0ThuCeem}{%0;Ox@@ZMq`OX8ln z8Hpy_#Ad6rgyH3smqVPHTr@++g}V#A;(fVab#P8GR+_MV5z0F!b4m|O_h}27F9AqY`&1J$x3d=-Nk^2&rL?c2WjDQCg<~58yW2UQ`bx&x~)V3MaT8>gN12X{oix1wo<|-Wp1%p>? zNOY9?Z5F_YRwD|GW1dh=IOTvq<{v7xtt!L~cp>?aCTPn!l{`UHPyHK=Db#3sgE5J; zQ^(fBkWaA@iduSuaS2sR{zoX=l!{NEL4w8tQVuR?Xe^LAxz6A`^07T9*s8O2nT@#N zx*?gkQ&0#o{%zKEFWumJ7mXWp!5OEc>ZjnF{J=dIoO9AqVH-Kk>7dm~tClMP7fcKh zQbAlHjhfv^4k~rAFj?qgpMhN%b-k^{&f+$*F+ zKaw8_L?XD6J9;GIyvRLzFmN7J%eTjli#Tn%d=uegpM2j9?&?!$K2zp>G0c|G)LGNl zL4C4A`MBoZvFnceAAqOh(hcF#bKIcmhW3u6a+LZiWs71caS--s$HGpZ4)z#5vMWE* z>L1I2`h#2V;*O1s^<$hA}u0IXIgM8t25wYVx=^LsmK)^hN?jM;|_wP{8Ff zhw*PgkI-K981_{J5l{hsdDWkTRzG|<>#Hw5`(#F8O!d8Y-gxbmmtJ^o+B1(l1+AWV z?2g-RnKJ2SB}diERIj+~KmR)JGaviNhd!|2ee2EN^RCC9P3Ng69(m}2`>wd`l8Y`l z@3bSdsHrZNH(YHa5*i%j zM8}|SGD23pB~8_oz)wHgh>4z}oOHDS`2&V}?vNwCGvU4fu`nf2Um@k3)-%CL&*hX) z`w9UkBgMAd-qcXn;?#OzBKC1}aNRva#*beSM2z)XyHrq8qK^bx*aZR`@jw6;06OHZ z)S6|N?2t_Gz=^E-?;bbDd&Txow1(SVzIyreiK7R$Mh8_5_YQjYl7?3(*-PZo=VO!K zdz9nz0k+#?+G+kEumgR^dsNTt*e&1LeL^8BYo*Y6*)~F_9DVP*fr!4m?(H73A&`(8 z+91*~7e9~&)}MJ0**1(6sraudY=PY!X#x1L&AWiW?h&2lRR8ZKblJMKZEf{+Gao;^ zd;RL=i|5nNp5D1N_5Z(rpFVZ+#PMTCj|}hKwsq~Ub-UWS#ZO&peQQ>xDJeL}&)3__ z!##Nw{ZU){0zC@=F{sB7W$CGzo>2q$=BwR#Xctjzf3m&>nC1FqWXdbzyTB9H{^cXJ zcNm#HK!7!;at!2}uUPBz_Cx!Bj!qf!v`aurlD7!&IY*HL-)mdBXBxtW)NyJ5G zEe3R!jhH{-$aZt=JY~bqVdQ?92^v3eXk;PX1Q!U*rl7^uL0W>SU1Uq}mtJn#q2jZB z=eIdFmnRCVaq!nj-O#4ET+VF6f1+`ho0Aqj)T*1Frkiv?JJeDocg?C9j*EG)D-OXR$qa?gDj|550^ zC~;HPIk0iCDbJLxT78*gbs^{8Wf0;|-hH=i?hd<)Y2#!QIW=*tN26;Alu@U$ZT8e| z7N!wVL#%yyZzUj8$OCGe3JdX&uWYK(l{{#F2zwl zJabQR)1j_?Ir!kj3V~KsAd0C3B%l#_AwQP!ES^UOQIj4c29CYpTsRYgJLiHsZFCS` zoZs)9t+QPYW%lUZt$MWFmghCbhSP+Pk9VWF-y{ydLx{Sn1^w^`;R9;AVPYHNWy6!- zAV-@L7u=>y;IP4wHzMK&u(0L)vL(&EtCsaI@9$`9UbpGUQXx49hYFNr0%q|ymtb@iXheR?jPJ(+X< zZV9*7=@ZrN8uQ$I8i!l=y;!ug(t?5>y5O5g`r;V8S5foX(__Kao?u3!gs2U3X6h z2l~H#VD`Jt`++b@m}LhibE&|@57R(|bs9kD2y~iGhpnz7EYfpT7)aY!lVEVL3y#R$ z=ULfb6sbNa5WoaIVx~1Bl?^0G#~Mwc1iJ}Fci!9*Vrw_SozMw(k+|f{-B!TxVt#gX zr19DGjAuOE+!6Iv=MS(_Ar>QIC6IiR&ns&*G`TjtJR@zh4%$-Mv)a==+=hW!SKr{l%!WGR zE3xa?w`bj1o&`C=xif}w29qDr zT-!;#nlx3N>Y$*d(hg`&(sj2;VmT|rNR?Ahqv@F#$b7V(hwHo>bTtHjL03(FU{*~Y zyln7vq$;<}Ue-9fU_q@HZc?4?fHbK8or_9o8BQdXGet_}+0`R0;k2^2J`K|d`1s6W z>$*5T+HJ>gwcp;#u+!M#G)Mm56x`9{iFjhE7xtx$NK8yC#PkrDu?Fxt2A>{Si!+;v zpr8IG2=O_h@GLoh=?JOQRe__AQYiR9ekuVZLIyq#5NP5K3SQ%L_i3b;7mtrbZ?ZBE zeQc%Z9d5?WjANF(cLG&aN_B7k$4TsaqsZqL5$kXKT;o|WVq1a7yIzYoxyD*6QjvC0 z5eo&No=-b&-8g+}$4P0leQR{n=&(i3uooEme4sRpYh6hA?KhCgt$O6`?gSBoA1;ih zy70Bf^DW5KJx`>e{4!(RCa!>#_Y6MRTUEtGPDAouPNZih-79W2D93lUZ;!`;_oKXQ z*UtF1R$I5YoK{P3j}XAWlj&^se?3Wfv>W0gyYHNzNEJn8r6r}0+6eZiSi~U82S7s@ zC1ujd;SZ}TNa8zmK?UthOnUmge-G}juP)4uyu5$!?k&5G6H4Mmt{+-&FM_L1Dn8t%s#|x$8cnz0@>H|gb292tC6W1K?suAk! zNim1OCuie=x!N#J47%ft-krF>;4dT&9F0rTO~e%p9>&$?{Q0UH<#B7yANBbKL8U&F znUYNHl}mXjN%j^tt~QI;V3XakEkRQ}9#G|_99v~u$|XUWd=w>qCd3@SD4!6wxXnkY zTR>QdO}`C7DrJh4pdW2mXEd)mFP+VbS-b8tFXYXWR~_}Mp}kc18pQ|ovu#(X%oaf= zh{gphi|9K6`zoY9-YQhQzOas;x3lWy9r2lO(n&~oJ*%GiENieAXzbQg;qobvtf)SA zP3VT{u$(Rg#c(!<%i{}(h9a>u)=cqz?euOcdSQ7IJO>h~xGRfF7+wDY4}ImJb?YLJ6UNgdcE?a8I- zNK7exQl)!eLya|=l6S*Ont47S-;@?SsWBn8F{YqT)l!JNw@IO}vFSvb+#$E(R`i(2 zVbMDiHC3u4lhU*Y;q0E~THJbSC6uP6i(? icYMP4fwFhaJHsYyTQ~W;T1MrGkFYq3rxzG(*SPxkMXVA4 literal 13876 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

DSh- zxAb@IO7e`TZwe`?13dPzKp6gs#%32|FeFh=LXL2d4XmL@g`8PT|M1>B@;rBs8p6m$ z7ffj6(ZiIRzVK&r|5~ndYQwr2Z?)`^*BE)(O9t+`<9W|`$|-|JXeCS;H)+5C7Ms>z zw!39=iX*vo%3C1a3TPVv+E2UA!_vK4O0+jaEV1&WV6!?RC=Ig!K@i$Uy2CgD;zllX zuw+sM&!sInz?^`WimODU_iV+gm6U}%DjBzJll-g36^`p~Z*=4Z;&oN*N1+Fz#7X3E zVB=t27E`u`=lPD+?WA+dgjp7d@LeqYcr)=dUBfg0~}pN(t|T zu9K*nYeQzbB~V`rFrzB~k`Bf$FT;!@Jj=5@#)yIAkcbVKRdYgc1I`sUU)OBl)Xc%Y zyXWpLW0fyUbD>9%d(|%d`)Jo~B!4Yf?u&uL_X48!t59#fL)@gM6DBqxUM4*G334lbhAYig+w7$R+n!GjTLpee1yWV$#;;FZ+&2Zk2|96;w520a~ENI*uOMTkX(m)SH$9 zrP;eLQ$n@>41>63b`HT*73GXxLX(~jdEA zmwA|x5|1b(sI)SKTm&#-cS$xY^4hVjd{@pT&%>)H;Bk*{OT=Sav)eh0Oz`d*Ahto? z>;{T>1rY{GfQsgmVq=r%YTD$qW)G08t`=b7U?YymJ>Xf{kMgK4=McaIL&QuAh%7Ns zKpp0pY9zTOFiyu4YlG!o2UbHnuorQav|9EwXiv>nGHLUwWfhJxHuMbc=i6jIFkn(1 zGCK$ZNeYb4LFV;wYt=uZMvhpFh?PKckmsUG9iu%yN}#7l{Vk}`?M1YkMi^DSBOEK%i8LpvR>7$&v(T9z(^E2rN8#i0y$0O zRio`4y3_u&$ip^jrNHZa>!LzzR?F2JwUq%I#8@A^t;6~GEmL%3mmW7lHcMHt+%-u)y41~ZPl`S%C0w+2m~nxk01@HWi2HDc?7$3!eS$yn^V zB9%!8m9fwewBYH9S1($c=iU^n<3|td%cO#&rOCo@_%941V|%+He5J@RnX93^JwB>7 zgKu}56zamuM`x{+sXGB_=o7~nMJE)H{2_x6cF--8$Z25j0wR4bM2q>g1U>fT_@P69 zcf64EPn|q;tf!+#szNB}^J;ds&K%KMc_-@l#`z?#vHRAVPR9u7{o)j`v3bO;mk0N& z7`gc+|8T_0q+yknSq)e|l+a+%p%CRBJW{tDI<%>tZ;UQgq9z&;ek)s1V{Q$wXylC^T6WKy zy~P`iv1D?VC_VDXBjV2ye~peFE%1%mPR9d#i@eF}<~{JO%nVFr)K{0+Qt!>-4sZeQHnNG$Y+)~V41#qFwN+Xv~kTkCZD zlN#4?ckhYX9Nu@zG*OSJt&eJH;SynO}xZ7!H?eB$h4%ktv_@c2*o+$X$6`fS`l2U`60ThJ|7I`;P_eUUJQbUy`(jqAUu@52p| z!R!xZrD@#!G>9MHD>TS8f#D$@HhsyzANm_!FAIx#?5n?%F;)AY@c(rIKl8~QHvs@A CORf_D From 4283012b2b9cda4ac1313e9f62e5ff5f567c391a Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 21 Nov 2018 08:58:34 +0100 Subject: [PATCH 06/13] #832 refactor ticket.request --- client/ticket/routes.json | 19 ++++- client/ticket/src/request/create/index.html | 34 ++++++++ client/ticket/src/request/create/index.js | 25 ++++++ .../ticket/src/request/create/locale/es.yml | 4 + client/ticket/src/request/create/style.scss | 7 ++ client/ticket/src/request/index.html | 69 ---------------- client/ticket/src/request/index.js | 29 ------- client/ticket/src/request/index/index.html | 78 +++++++++++++++++++ client/ticket/src/request/index/index.js | 47 +++++++++++ client/ticket/src/request/index/locale/es.yml | 6 ++ client/ticket/src/request/index/style.scss | 23 ++++++ client/ticket/src/request/locale/es.yml | 2 - client/ticket/src/ticket.js | 3 +- .../ticket-module/10_ticket_request.spec.js | 2 +- 14 files changed, 243 insertions(+), 105 deletions(-) create mode 100644 client/ticket/src/request/create/index.html create mode 100644 client/ticket/src/request/create/index.js create mode 100644 client/ticket/src/request/create/locale/es.yml create mode 100644 client/ticket/src/request/create/style.scss delete mode 100644 client/ticket/src/request/index.html delete mode 100644 client/ticket/src/request/index.js create mode 100644 client/ticket/src/request/index/index.html create mode 100644 client/ticket/src/request/index/index.js create mode 100644 client/ticket/src/request/index/locale/es.yml create mode 100644 client/ticket/src/request/index/style.scss delete mode 100644 client/ticket/src/request/locale/es.yml diff --git a/client/ticket/routes.json b/client/ticket/routes.json index 7eeab37e2..9c6701fbf 100644 --- a/client/ticket/routes.json +++ b/client/ticket/routes.json @@ -193,9 +193,22 @@ "description": "Weekly" }, { - "url" : "/request", + "url": "/request", "state": "ticket.card.request", - "component": "vn-ticket-request", + "abstract": true, + "component": "ui-view" + }, + { + "url" : "/index", + "state": "ticket.card.request.index", + "component": "vn-ticket-request-index", + "description": "Purchase request", + "acl": ["salesPerson"] + }, + { + "url" : "/create", + "state": "ticket.card.request.create", + "component": "vn-ticket-request-create", "description": "Purchase request", "acl": ["salesPerson"] } @@ -213,6 +226,6 @@ {"state": "ticket.card.saleTracking", "icon": "assignment"}, {"state": "ticket.card.picture", "icon": "image"}, {"state": "ticket.card.log", "icon": "history"}, - {"state": "ticket.card.request", "icon": "info"} + {"state": "ticket.card.request.index"} ] } \ No newline at end of file diff --git a/client/ticket/src/request/create/index.html b/client/ticket/src/request/create/index.html new file mode 100644 index 000000000..725b5f72a --- /dev/null +++ b/client/ticket/src/request/create/index.html @@ -0,0 +1,34 @@ + + + +

+
+ + New request + + + + {{firstName}} {{name}} + + + + + + + + + + + +
+
diff --git a/client/ticket/src/request/create/index.js b/client/ticket/src/request/create/index.js new file mode 100644 index 000000000..36b92021c --- /dev/null +++ b/client/ticket/src/request/create/index.js @@ -0,0 +1,25 @@ +import ngModule from '../../module'; +import './style.scss'; + +class Controller { + constructor($state, $scope) { + this.$ = $scope; + this.$state = $state; + this.ticketRequest = { + ticketFk: $state.params.id + }; + } + + onSubmit() { + this.$.watcher.submit().then( + json => this.$state.go('ticket.card.request.index', {id: json.data.id}) + ); + } +} + +Controller.$inject = ['$state', '$scope']; + +ngModule.component('vnTicketRequestCreate', { + template: require('./index.html'), + controller: Controller +}); diff --git a/client/ticket/src/request/create/locale/es.yml b/client/ticket/src/request/create/locale/es.yml new file mode 100644 index 000000000..ded6fc65b --- /dev/null +++ b/client/ticket/src/request/create/locale/es.yml @@ -0,0 +1,4 @@ +Purchase request: Petición de compra +Atender: Comprador +Remove request: Eliminar petición +New request: Crear petición \ No newline at end of file diff --git a/client/ticket/src/request/create/style.scss b/client/ticket/src/request/create/style.scss new file mode 100644 index 000000000..b47544b12 --- /dev/null +++ b/client/ticket/src/request/create/style.scss @@ -0,0 +1,7 @@ +vn-ticket-request { + vn-textfield { + margin: 0!important; + max-width: 100px; + } +} + diff --git a/client/ticket/src/request/index.html b/client/ticket/src/request/index.html deleted file mode 100644 index 536e99100..000000000 --- a/client/ticket/src/request/index.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - -
- - Purchase request - - - - - - - {{firstName}} {{name}} - - - - - - - - - - - - - - - - -
\ No newline at end of file diff --git a/client/ticket/src/request/index.js b/client/ticket/src/request/index.js deleted file mode 100644 index 84b1fe0ec..000000000 --- a/client/ticket/src/request/index.js +++ /dev/null @@ -1,29 +0,0 @@ -import ngModule from '../module'; - -class Controller { - constructor($stateParams, $scope) { - this.$stateParams = $stateParams; - this.$scope = $scope; - } - - add() { - this.$scope.model.insert({ - ticketFk: this.$stateParams.id - }); - } - - onSubmit() { - this.$scope.watcher.check(); - this.$scope.model.save().then(() => { - this.$scope.watcher.notifySaved(); - this.$scope.model.refresh(); - }); - } -} - -Controller.$inject = ['$stateParams', '$scope']; - -ngModule.component('vnTicketRequest', { - template: require('./index.html'), - controller: Controller -}); diff --git a/client/ticket/src/request/index/index.html b/client/ticket/src/request/index/index.html new file mode 100644 index 000000000..5b8663144 --- /dev/null +++ b/client/ticket/src/request/index/index.html @@ -0,0 +1,78 @@ + + + + +
+ + Purchase request + + + + + Id + Description + Created + Requester + Atender + Quantity + Price + Sale id + Ok + + + + + {{::request.id}} + {{::request.description}} + {{::request.created | dateTime: 'dd/MM/yyyy'}} + {{::request.requester.firstName}} {{::request.requester.name}} + {{::request.atender.firstName}} {{::request.atender.name}} + {{::request.quantity}} + {{::request.price}} + + + {{("000000"+request.saleFk).slice(-6)}} + + + + + + + + + + + + + + No results + + + + + + +
+ + + \ No newline at end of file diff --git a/client/ticket/src/request/index/index.js b/client/ticket/src/request/index/index.js new file mode 100644 index 000000000..6635dc7b7 --- /dev/null +++ b/client/ticket/src/request/index/index.js @@ -0,0 +1,47 @@ +import ngModule from '../../module'; +import './style.scss'; + +class Controller { + constructor($stateParams, $scope) { + this.$stateParams = $stateParams; + this.$scope = $scope; + this.filter = { + include: [ + {relation: 'atender', fields: ['firstName', 'name']}, + {relation: 'requester', fields: ['firstName', 'name']}, + {relation: 'sale'} + ] + }; + } + + removeLine(index) { + this.$scope.model.remove(index); + this.$scope.watcher.check(); + this.$scope.model.save().then(() => { + this.$scope.watcher.notifySaved(); + }); + } + // Item Descriptor + showDescriptor(event, sale) { + this.quicklinks = { + btnThree: { + icon: 'icon-transaction', + state: `item.card.diary({ + id: ${sale.itemFk}, + ticketFk: ${this.$stateParams.id} + })`, + tooltip: 'Item diary' + } + }; + this.$scope.descriptor.itemFk = sale.itemFk; + this.$scope.descriptor.parent = event.target; + this.$scope.descriptor.show(); + } +} + +Controller.$inject = ['$stateParams', '$scope']; + +ngModule.component('vnTicketRequestIndex', { + template: require('./index.html'), + controller: Controller +}); diff --git a/client/ticket/src/request/index/locale/es.yml b/client/ticket/src/request/index/locale/es.yml new file mode 100644 index 000000000..65442cde1 --- /dev/null +++ b/client/ticket/src/request/index/locale/es.yml @@ -0,0 +1,6 @@ +Purchase request: Petición de compra +Atender: Comprador +Remove request: Eliminar petición +New request: Crear petición +Sale id: Id linea +Requester: Solicitante \ No newline at end of file diff --git a/client/ticket/src/request/index/style.scss b/client/ticket/src/request/index/style.scss new file mode 100644 index 000000000..9e7f3812a --- /dev/null +++ b/client/ticket/src/request/index/style.scss @@ -0,0 +1,23 @@ +vn-ticket-request-index { + vn-textfield { + margin: 0!important; + max-width: 150px; + } + vn-autocomplete { + div.mdl-textfield { + padding: 0px !important; + } + label.mdl-textfield__label:after { + bottom: 0; + } + div.icons { + display: none !important; + } + vn-drop-down { + vn-textfield { + max-width: initial !important + } + } + } +} + diff --git a/client/ticket/src/request/locale/es.yml b/client/ticket/src/request/locale/es.yml deleted file mode 100644 index 5d27aae17..000000000 --- a/client/ticket/src/request/locale/es.yml +++ /dev/null @@ -1,2 +0,0 @@ -Purchase request: Petición de compra -Atender: Comprador \ No newline at end of file diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index 08a538fd2..8e81cc6f4 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -20,6 +20,7 @@ import './sale-checked'; import './component'; import './sale-tracking'; import './picture'; -import './request'; +import './request/index'; +import './request/create'; // import './log'; import './weekly'; diff --git a/e2e/paths/ticket-module/10_ticket_request.spec.js b/e2e/paths/ticket-module/10_ticket_request.spec.js index d945fce4b..e4a18ccd8 100644 --- a/e2e/paths/ticket-module/10_ticket_request.spec.js +++ b/e2e/paths/ticket-module/10_ticket_request.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/nightmare'; -describe('Ticket purchase request path', () => { +xdescribe('Ticket purchase request path', () => { const nightmare = createNightmare(); beforeAll(() => { From 27e13fdf3dbf09a79f7ac58e81feb3595ff47f97 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 21 Nov 2018 09:08:14 +0100 Subject: [PATCH 07/13] #832 missing where --- client/ticket/src/request/index/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ticket/src/request/index/index.html b/client/ticket/src/request/index/index.html index 5b8663144..a428398fd 100644 --- a/client/ticket/src/request/index/index.html +++ b/client/ticket/src/request/index/index.html @@ -3,6 +3,7 @@ url="/ticket/api/TicketRequests" fields="['id', 'description', 'created', 'requesterFk', 'atenderFk', 'quantity', 'price', 'saleFk', 'isOk']" order="created ASC" + link="{ticketFk: $ctrl.$stateParams.id}" filter="::$ctrl.filter" data="purchaseRequests"> From ead97cb14275ad2f0ba443ff087334d3ccba54ba Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 21 Nov 2018 09:13:40 +0100 Subject: [PATCH 08/13] #832 added missing watcher function --- client/ticket/src/request/index/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ticket/src/request/index/index.js b/client/ticket/src/request/index/index.js index 6635dc7b7..2cee00bc0 100644 --- a/client/ticket/src/request/index/index.js +++ b/client/ticket/src/request/index/index.js @@ -19,6 +19,7 @@ class Controller { this.$scope.watcher.check(); this.$scope.model.save().then(() => { this.$scope.watcher.notifySaved(); + this.$scope.watcher.updateOriginalData(); }); } // Item Descriptor From 3c0e0b3d49d825d6fc3d49b81c57d5b83fc9ee93 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 21 Nov 2018 09:16:09 +0100 Subject: [PATCH 09/13] added missing locale --- client/item/src/data/locale/es.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/item/src/data/locale/es.yml b/client/item/src/data/locale/es.yml index bf5d705f4..cfac5303e 100644 --- a/client/item/src/data/locale/es.yml +++ b/client/item/src/data/locale/es.yml @@ -2,4 +2,5 @@ Reference: Referencia Full name calculates based on tags 1-3. Is not recommended to change it manually: >- El nombre completo se calcula basado en los tags 1-3. - No se recomienda cambiarlo manualmente \ No newline at end of file + No se recomienda cambiarlo manualmente +Is active: Activo \ No newline at end of file From 3f98deff492098fe3620b789814c031b4d81fe41 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 21 Nov 2018 09:19:20 +0100 Subject: [PATCH 10/13] update ACL and structure db --- .../db/install/changes/1.2-CHECK/10-ACL.sql | 3 ++ .../changes/1.2-CHECK/15.last_buy_refresh.sql | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 services/db/install/changes/1.2-CHECK/15.last_buy_refresh.sql diff --git a/services/db/install/changes/1.2-CHECK/10-ACL.sql b/services/db/install/changes/1.2-CHECK/10-ACL.sql index e9e0adde6..6063d398e 100644 --- a/services/db/install/changes/1.2-CHECK/10-ACL.sql +++ b/services/db/install/changes/1.2-CHECK/10-ACL.sql @@ -3,3 +3,6 @@ INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission` INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (120, 'Travel', '*', 'WRITE', 'ALLOW', 'role', 'buyer'); INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (121, 'Item', 'regularize', '*', 'ALLOW', 'role', 'employee'); INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (122, 'TicketRequest', '*', '*', 'ALLOW', 'role', 'employee'); +INSERT INTO `salix`.`fieldAcl` (`model`, `property`, `actionType`, `role`) VALUES('TicketRequest', '*', '*', 'salesPerson'); +UPDATE `salix`.`ACL` SET model='TicketRequest', property='*', accessType='*', permission='ALLOW', principalType='ROLE', principalId='salesPerson' WHERE id=122; +INSERT INTO `salix`.`fieldAcl` (`model`, `property`, `actionType`,`role`) VALUES ('ClaimBeginning','*','*','salesAssistant'); \ No newline at end of file diff --git a/services/db/install/changes/1.2-CHECK/15.last_buy_refresh.sql b/services/db/install/changes/1.2-CHECK/15.last_buy_refresh.sql new file mode 100644 index 000000000..c2fe41d52 --- /dev/null +++ b/services/db/install/changes/1.2-CHECK/15.last_buy_refresh.sql @@ -0,0 +1,50 @@ +USE `cache`; +DROP procedure IF EXISTS `last_buy_refresh`; + +DELIMITER $$ +USE `cache`$$ +CREATE DEFINER=`root`@`%` PROCEDURE `last_buy_refresh`(vRefresh BOOL) +proc: BEGIN +/** + * Crea o actualiza la cache con la última compra y fecha de cada + * artículo hasta ayer. Para obtener la última compra hasta una fecha + * determinada utilizar el procedimiento vn2008.item_last_buy_(). + * + * @param vRefresh %TRUE para forzar el recálculo de la cache + **/ + DECLARE vCalc INT; + DECLARE started DATE; + DECLARE ended DATE; + DECLARE vLastRefresh DATE; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + CALL cache_calc_unlock (vCalc); + RESIGNAL; + END; + + CALL cache_calc_start (vCalc, vRefresh, 'last_buy', NULL); + + IF !vRefresh + THEN + LEAVE proc; + END IF; + + -- TODO: ¿Se puede usar la fecha del ultimo inventario? + SET started = vn2008.date_inv();-- TIMESTAMPADD(DAY, -90, CURDATE()); + SET ended = CURDATE(); -- TIMESTAMPADD(DAY, -1, CURDATE()); + + CALL vn.buyUltimateFromInterval(NULL, started, ended); + + DELETE FROM last_buy; + + INSERT INTO last_buy (item_id, warehouse_id, buy_id, landing) + SELECT itemFk, warehouseFk, buyFk, landed + FROM tmp.buyUltimateFromInterval; + + DROP TEMPORARY TABLE tmp.buyUltimateFromInterval; + CALL cache_calc_end (vCalc); +END$$ + +DELIMITER ; + From bad8e63f954a61022cf5c12845277c15b33ca69f Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 21 Nov 2018 09:59:47 +0100 Subject: [PATCH 11/13] changed icon reference --- client/ticket/src/sale/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html index 5d4ee9dd0..7862e7e3b 100644 --- a/client/ticket/src/sale/index.html +++ b/client/ticket/src/sale/index.html @@ -85,7 +85,7 @@ icon="warning" vn-tooltip="Visible: {{::sale.visible || 0}}
{{::$ctrl.$translate.instant('Available')}}: {{::sale.available || 0}}"> - + Date: Wed, 21 Nov 2018 10:09:36 +0100 Subject: [PATCH 12/13] #841 claim relation added --- client/ticket/src/summary/index.html | 8 ++++++++ services/loopback/common/methods/ticket/summary.js | 10 +++++----- services/loopback/common/models/sale.json | 5 +++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/client/ticket/src/summary/index.html b/client/ticket/src/summary/index.html index 15417223f..03a23b85f 100644 --- a/client/ticket/src/summary/index.html +++ b/client/ticket/src/summary/index.html @@ -67,6 +67,14 @@ + + + + { } }, { - relation: 'tracking', + relation: 'state', scope: { fields: ['stateFk'], include: { @@ -90,11 +90,11 @@ module.exports = Self => { ticketFk: ticketFk }, order: 'itemFk ASC', - include: [{ - relation: 'item', - }] + include: [ + {relation: 'item'}, + {relation: 'claimBeginning'} + ] }; - return await Sale.find(filter); } diff --git a/services/loopback/common/models/sale.json b/services/loopback/common/models/sale.json index 7dc61cc09..44b7c2b9c 100644 --- a/services/loopback/common/models/sale.json +++ b/services/loopback/common/models/sale.json @@ -57,6 +57,11 @@ "model": "SaleComponent", "foreignKey": "saleFk" }, + "claimBeginning": { + "type": "hasOne", + "model": "ClaimBeginning", + "foreignKey": "saleFk" + }, "saleTracking": { "type": "hasOne", "model": "SaleTracking", From cfae360c2835f002f371e330cbd7757ba6c64ef7 Mon Sep 17 00:00:00 2001 From: Gerard Date: Wed, 21 Nov 2018 10:09:50 +0100 Subject: [PATCH 13/13] log disabled --- client/ticket/routes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ticket/routes.json b/client/ticket/routes.json index 9c6701fbf..3e1c5641e 100644 --- a/client/ticket/routes.json +++ b/client/ticket/routes.json @@ -180,12 +180,12 @@ "ticket": "$ctrl.ticket" } }, - { +/* { "url" : "/log", "state": "ticket.card.log", "component": "vn-ticket-log", "description": "Log" - }, + }, */ { "url" : "/weekly", "state": "ticket.weekly",