From f225c071ac948df40a22cfedf1f804ce964012c7 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 5 Nov 2021 00:42:44 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20dialogue=20achat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/dialog-item-achat.js      |   4 ++--
 styles/img/ui/icon_echoppe.webp  | Bin 0 -> 5318 bytes
 templates/dialog-item-achat.html |  30 ++++++++++++++++++++----------
 3 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 styles/img/ui/icon_echoppe.webp

diff --git a/module/dialog-item-achat.js b/module/dialog-item-achat.js
index 0d9c9c90..b6b3f6ba 100644
--- a/module/dialog-item-achat.js
+++ b/module/dialog-item-achat.js
@@ -29,7 +29,7 @@ export class DialogItemAchat extends Dialog {
 
   constructor(html, vendeur, acheteur, venteData, chatMessageIdVente) {
     const isConsommable = venteData.item.type == 'nourritureboisson';
-    let options = { classes: ["dialogachat"], width: 400, height: isConsommable ? 450 : 300, 'z-index': 99999 };
+    let options = { classes: ["dialogachat"], width: 400, height: isConsommable ? 450 : 350, 'z-index': 99999 };
 
     const actionAchat = venteData.prixLot > 0 ? "Acheter" : "Prendre";
     const buttons = {};
@@ -39,7 +39,7 @@ export class DialogItemAchat extends Dialog {
     buttons[actionAchat] = { label: actionAchat, callback: it => { this.onAchat(); } };
     buttons["decliner"] = { label: "Décliner", callback: it => { } };
     let conf = {
-      title: actionAchat,
+      title: venteData.acheteur? venteData.acheteur.name + " - " + actionAchat : actionAchat,
       content: html,
       default: actionAchat,
       buttons: buttons
diff --git a/styles/img/ui/icon_echoppe.webp b/styles/img/ui/icon_echoppe.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e547bf14c456b8d464cd37016179663346ac42df
GIT binary patch
literal 5318
zcmV;%6glfsNk&G#6aWBMMM6+kP&gp66aWBFq5z!%D)|BR0Y1@au285dvoWPJsS;os
z31@Ej7MTCI|NY%sSl(TKs4wY7I4^F9W!5dME8~WL$#>oK&;6Ttk2@ag$F2|Y+KHaS
zcvIFSERSeAQTnn#%gy*n{*J*3=s)-Yr&YHGN@i2J^(LQGj|Zlux`c?p@z%>&GZYia
zYI0~FR*pz?!job>B9n@(wFHw<Yem3vo(x<lSQ|+`#_*6xoRFFS5of^Ye$_8lBx*_b
zELE6JEcpSfL!p%<rKUX(+Or7GO*iY)ViHduv0(3YPqD_OsfgLUE)fx?b1_@<i5G7H
zHNv+ymba*Nu|{j{4R%Ym3uTvRLRSg+q)ExA>az?g-mdA2kT!&$_s4`m6S^k$jDLl<
z+_IYB;#A<}tOST0mg)orYk=heP!{sp59Zq2z-SRQzNZ)(t-zeB#)U;0>w_64R<v37
zsW(uijwa|q$DqdhvUQAfowzPiw-7ICHRzFW)NBz7fVW5g*&sSQ28MwVU9A`$(m}J&
z?niI;hd~@okVD*#tS5e<Ygjy}pgj}-6@XwuMwn^`4<1?NLiV7rYG}@~be6zCE;6fj
ztw{39GD8_!E&ulsJ6QNcHK(kOZGfkiLTk^?>_?<haaFdUoM^1{NUrB$?3hzO{05An
zNc&YkK49nw1CfCw$Y@3o2~c@XGRT+uDTwPS4Z+u<VRgC?I)x=wTOeyeTF-;a)TCfv
zvYNIn1jl{l6Msea=U^FV%U@!21Hgk}V!DYwx~H~vNulluA!lW4xA>%PMOVOS{|t9`
zc2^hhisGzG1)?ag{7tZgmOjmKxG%I#is27xzlr20h@TfM!)_*ImvUPu8H|+`ODv3c
z@hCwRg1m&(9$39Z=<w{@*TI%!;K=<${)F0b>9qs-V|#h|a(aRPg%%<b-*{Z)A^-cc
z&BTtwiOOSb)NinmW=A8%lneZIP~DVMdxwmgWai3)-LC@01o`ERY!`3^X#-#K;r<VW
zjiR#4wTuo|k(GH?r7O_gC&o>qoDfwsed|Lt)PSm)KjqGsFdtQ4Sg@VXdMl!T)fJME
zYGnfo&4O*Z(R5iHFloiMU@#b=_;~Wf7+{uc-BBdLN%4=r$Arc(^4-RTZIA}TZnJ8p
z^;i3|8JP#cPi3nQX8@P-G(ey2=%29dKaWvASE--GBx$l>*;BEp_V%~Wc>t4>YCWM~
z&o;9{GVG@@XWd|p)jXeWX~k0tXdg_kQy~fD^5jn-PD>u5wLD3u@S9iP2lfXoS}B0k
z<ha$Ss9wL@83n2#cB3S3a4M_);#^NapxGRL$D;@QWVt|S9%Flz=nWQ2%x}=vkm0`F
zLy^lm*Afd?&FZi6I;2<GE~?2ZG7t8>dx-$--FBB8t7}tUeG)zxTUh-Ru<yg_RRjf|
z<!X{CelM=3-Tai`A0$W*kuHPr@SD(79+)j7ilkfv?3hP8+)BP_$)9?sN8)o=Q|mLE
zUeMS32_H#Ox!4YEKMjQsP<Id@2$n_)yJc)Ge#o;EN{wXo`?>#^3CXafHJ|{lm^ZbV
zO&37W{#FMS%*m}4PO*tXUuyK`d0TaQv9Mu+jwfc>0Wj(e=mXw?W!#CaqH!`TrGO;k
z^G3cuZzen774BSAf}%s&4??acooR$W>b4cAz!R|m`kX0$YQc}RFW4qbK8^8tfBSlD
z58zkkl&IoOzyDl+|Myqu)q4MO#r{$r1^^wlC6849>;M4%#vng&*Bqjh?<`{;6b#$3
z2RnHD)vW`{_ddVQfKYr)NLUqAF^^IYCqIS88vrBxEYSLaSx{hreoBSxB$xwt4IoUg
z8~_ftW)2fugFQ2`<U%ogZ;|827d_HEvcJSX=o((v#^M0Yu9O)p0$`;?V%7sSOrY^Y
z9nz?|>b6*COQax_ZLik}w+pdD11}sUtex=`Ij_n+r<jO6FU(e8^$EXGyhyPD7`{5u
zBql9EMN9u96A6;-jnf09U#B3JrUj7O)&N1kPAwDI+<@3djm*}_%>*x7ER0h%)sIL<
zE`7j*zrQR6;M>Z`+VLTaB?11NW}HInKtc{;Aun1qv;C|V?eg6Nk-=UH+!^V36@BRX
z7#~{0aWP-w=kY!Z=H4eXeDNl`%CV)^3dmXfKNyf)eOj83Cal591mV3!OA>jFy=F`5
zV#EZV=5=4#$Jl^#15%;@kU2qEdMgCxZbAy{bAYv5bW&_5m2aH=*J-~+L<mlC%CQB<
znBD;g5D`_)U!^>IS(u|?pnQSTji@)3KY%)Rb)(b`q@LnsPW;+`>xL^1HT;bGzU>(B
z*6m3dnWT7LN{wZ!j_jzeI&#gFJ7WSE*X|3IiB_93hCswP08>6^X`mjLCO@t#6JX-y
z4h720TeK^$-8D7Tz&NX@?pK!KX`sxVLlNet9KC1wjIWxq=%wqI@0Xj_zIkCVnzy8!
zQGjshdp#-{ax#t6lV4cHvfTf3wI)zWZNN~y5mO?a5<PebW7DWs<6dG0iVLGj2o@2i
z^NmAH-8dE~9_iKr5&Sf|Lp_cpm|bCYxh!gAMnEz8`f6iFvPlE(=x&xDd8Ig6FmX{t
z3D<TY<ZqHa<zg{PinE5?FeKF1M>)Nf5AgW?*#I)mKuiD%V4firsk5MnQx#nHuk_a+
zH+@c<FdXYhm-7i|SSvo<FF=G{Lrh#SQke?$B4Kybbgi1IgO`VCs-z<awRgOnOTFa%
z@3#ocYu=u;CrDGq$XA&d1DtF=W7B6&z-$JsG>LjnGnmVRyd%Fg+v4nNAILh*xsOeQ
zXJ4mEG{`m1L&+UWs8a4a>xRLLb_!DgD0EYWA8)RPe~&4aUl14y-Z39W)dYENT(U1*
z`@P#{8o9-`pm2Uw4l7uQ?H|ii#Ye#R^-^5bpVc`ZL>B>M5OH3X;g%DrudN^ksUMk)
z^B<h!*u{;XHtBL%qTebijcOe>Q`E|*2u`RBMdV<L3UGNgTf8s=;w^aJx@_MhY086=
zsdrMpM=&yOjjAlHdwXfKGSu+p67lmv58IE6hL{+f5ViI_mWYx!j4kc!shrrb@(rIz
zDL{+n5mYH~6w+pLFW09HZEe(~72+pSh&y3u_iA6j)*ygFAR-fFdQt!EvUEkr&RpZR
zqc{L9^Xj<ZnJtKH7+p_={{Oda{G{MR(lz`G$(?)YGXV2*_1QX{O68U=>E`8Yt1$({
zAZlh+_uyHIBK8U8ZKJ_k$%>om<pK44rJO8R7bFiTZCVCSxW)cAgte$;7a$LSdlePY
z-b!?rdNr^#4}t$epxj2o2MM!%gGSyP@ilUxLd(vL)dE)LJ_H;}xZXwW!39;0JhlG+
zcJ-?x8Nm2&_&|Q*pQ&T!!V*<htH3+3U~rXz8Q3i5e*(V^j}KUS8HxGzvlH;Wt-jqT
z=(VPs0xH7GRM+<0Gl1O;T(8sJbIjSbmay{)M1c<$i6vtsu1`>`+!^9bz|C6(^ejpF
zIKv&`W}p?(#agypn`P5`lofB?1|!{&7o72VDPhD=(1Cqx4+?lK%d(6Jvn-`3FF0(X
zn3Dt+;4}$SpxP7Z;9XhRAW5SlQSV_WuPQ1ZgaALRlg%SFl20226lzoZvkdx}WgV0}
zkg+M%t^e6)5CvcUX^s?5Y^tMmhrL+2{$eihf7d2dDWdEo%5*?3%!N~T+FPXJKSuZ2
z0P%=jfCl>N(jq?<G(FF!DTQ%#8g=P9O7-;E_N0mc0ycn>1eEgtpkYqRw?=2&HtxQS
z(YmLNpImO_4m?1$qB_*+R1po%tdsF-f2Jr*EHTksbXP2308Ap2s{%{1o4FX~xLT_U
zuSRnoqi~P^G`=6un5Cqy(@F71dXPY_&wSHSQ8SVQWgH6+F5KjA#MdprpX!kC0rd?U
z8m9qlU}#FbVUQrZZbA#c9l0*U;RbdLA449G=gg1JTXSAnVzLG90RK97sl;xPxxMKF
z{m!6llW}OHovwTdi3v6o>WP_}DY<8VC_r{u$JCe9#|qqrt=^{FNvALhC=(dMNuBNr
zJtRJR$D-Ix7`OqCb@y%f=FtU~BU4y~Rd~@7nYJQ9_F4&~P*S%JFgI3Bj)Xg6(=5<$
zj_>Iy1Ff2A)YRch?r~LQ*Z=Vbcc@ahbT}w|#zYvK?7tJx_ymzHUJ8Bqa5ZAU$vkLf
z%FLVSNre3*hH*FXc-P|f&u6bdctFV?A-rHJ4mo3%y&Va1>zBf$@eU1wG!*thO|Vq1
zCuqVCx2=T9v8WnkgQY^(53EEg)~x#s7f0H7nxG&5EVBidLP(xF#>><F1D^f4sEq<)
z{*|0T5Hmg`UQ2^>lskYBJ{C=jsm%>?odOslJL#}-OSmw<+?D!)vk5NTl?6{Gny@y8
zEo85#%ke$&vg`dy6tT7lGk&jt`8XoG%A=)2^*{ad;nC`tb=@&}XYe(-bB*UTF8+rT
zgO?}AYn@x~$9YOX!$%5nHl=%FFd{dM{Kut-31VZCffV<mW2p5_N-N>dRdw`8S_?4_
z#b(s=D*9UCP6uI>$3n|`=`{Nu{Oh|5S!ZSSfZ}b>8(8K{AJX-;C<+S>WY6Hk<!JH_
zjgn<|wQkza_ve|V0;<uj!G80Q{3n5(*Oajp$GuPP*Z4koyio|_9tRzN!NrlVIPWK&
zY;`M1tNpgu9xsR!VyC0QaJ|(Gkt9|uWCG~=f`|C$KY%tYMOJ#5hm8iJ(Ens{ZIDo7
zMU7D7xu4ONff!iYjk!*VOAP>Pf|}<2_O1UMGPNYr-_bJ3VCOAzL%}8}k`tPoXT|Ap
zc=u`92ds8&QH=aa*R`xCYlT@Bs#QA5?J4W+M&9C0;NPwJPs>t{x9=CFBt|M=zbJh)
z2@>ZLQ~?;G3+GP{Yt=HCM_nN6<+UdF+Kd1JxXJGq(i{S)@RF3~fPC^<+@976+{m~c
zQ+tC8wlbhhusF_K>uI((6I=39+?X`eDn#@W|7QeMxv|8^(*|#XgCM?l<YLG)B5fuW
z$ZEqL;(<h5K>|duBy-cy@_SW_{`I7HtA*uY3CcX6qlgyOsY8LL*~+E3!E`z55yQnR
zUm-OUUEI_RAVMkTiU0{E?924pAWoSk0C*jCYwTWa8s-9ANFY(qPlcJB0BF|EibE{6
zCuk$|IB9j|BXE7l_3$8HKoUj@Ir0!dVAjUSE=y>V7@Oa!OPRb&NPETh4j3k?{s|a~
ziX(_Ve&e$1eI8r4x|^iWAvrEE1ZQ|rF=WfP^3=2r0qEj`kocy(JXhox6Yug`6!qnj
zv2tTNrhBQYECD{z`bo@9Dk_I?ew_eR9&z?{)=IWIXrts$7`sQj^GCh5B9TmD*h)$3
z7GN&n#p>D+0lli$7(d1McYLDr0kn*wV=zV8`G+#Op=yb8+uv;_t^A4Z&9JLN#L(oe
z;;>Epuf{!bW(hD=X=(K8`%NyW^fr+V(S>w|Wi8-sSCC8(I?xyxn=$hPUNDm*1=S(}
z$u<~cuaj2$3s6HRX`$Cl-iU@BFKWfKkN({=9}CFA!0kbONnn%gG8|Y-W;=cNV@8y*
z@fF_nYknm#<mah6;V_K9VLRi@1MZyOdqx)QHnX1m$gGT%{?<YOV*R%4;tfjUI~7O6
z(9|ywIMic^*)07v!<r)O-AOJz(=<N5NaYQ*0%HK`mupgOo_aR0oMI){euNwb$u^*n
zRKnQQa(g9Y?)oEW!jb@LZ|4*z;+I$rc-3GZn|oy#JNH%J>BlFuV`$D=O$j8qo-QpC
z#{Lz+_Vs$}j`LbEbhMY^ICW&a;G}gC!j|To6UcpaVAz+0wzvKwrre!;mC(7Lu+$mh
zS2AKaHFYX`!$c>ID?QGDTufL19bDgKG+%(LOU-hXIFNffhyr%vkDMj_bR2Zq#gf(=
zad5X!XlLVyfCqdvp)|aRc-p6@ZU!fvjLNlP$+Z=3A77E}d0U=G|4hAjnA;7UtL5Xr
z384w)_@<b@?9bwW#U8iv=7m0rO8hvLz_lLNjJ!+K6C#9Aw)MLC2R7*S6^QFg+nueZ
zv^Bf_Jl=9DdnQ$vE$o&9Z)mYoKUAV$tu%!K4~9LeDVKBqYyVL|ifj%q0#w9K(bZv<
zwMl}|2Rft-?g1l&YuCwjOWR$9wemZ}+vEwnl}O%Dv?PU~&K9o|10#JKpWV%XWEqBK
zm!O`jc$1rPf-Y>VIdXr|$iRiYiX$bO`)fYLiUNzU%ugf<fk;(mEy~chx^N}bMNiG@
zl~Y#mJJagv)*To}?IuMG+g<m@Uz#w#2QLUrixIP>^CJoA*gj&u+PP5>+-B<)oxDky
z5qlzSsIKeddM<t+QhL;0^~Eity>tTrqL?J|w!MW|n3QBI1kkl8)tH`)J2x{?RnkEb
zWo{--8I$UM^SXiM=|+FEA@{L4a==0F|2JR{3_*SC*IoL-5&xiRMvBEFL%)Up9NXW9
zT1fYJOdv9ZsgX(vEieE8mp^sX0(~SBXXpT1-u$h11X7q-XTy!)y7vs2Rs!27cAbt~
zSAD+V$JwG}IdZ-Dcih~ZR#~2L%|&)=<m7-MR}Ioe_XNus->7)vfm8qrKZ*_<d9(3`
z9JH0otTQ&cD%$6?b&qp}(SNilAt?c*R-Gv^sgdaQY)xMJg9DEQ#(6x@*9KU=fDvw)
z0RE-kc&1zBRTLvJli)-@KqB!J!j;3*45)1qd%`q{CRVYH+p6ZG@z(cjjDat3QjQ}u
znXz5LGm+$by&q4W*=`s`a@kZa&W_)COn}xstQ-jtgTX*2X=cxlFp~7Y3Lzuc^={33
zP_?60^b!u~j%B~aFN3oJioEFewTOMX0zJcO;M3sEqcH#;(41hYL@K=fmpcDZXS9(H
z0SeT{lkVdgy0sYf$*-p8c1@}DT66F(G}vbqQTy9jT^Pk9SHlZkK&p-kAt7CwSj*P}
zR1dh7(V+M(i{a-ifoAifRTgqDc;c(z(C&8z@+lh9<Sef#E~Y=Wh^n|MK&Pe8X4i3f
YAY$U$2NH!W?zK1`Jtg@vS@uSd0MErZRsaA1

literal 0
HcmV?d00001

diff --git a/templates/dialog-item-achat.html b/templates/dialog-item-achat.html
index b6c6b9e3..b182a975 100644
--- a/templates/dialog-item-achat.html
+++ b/templates/dialog-item-achat.html
@@ -1,14 +1,24 @@
 <form class="rdddialog">
   <div>
-    {{#if vendeur}}
-    <img class="chat-icon" src="{{vendeur.img}}" title="{{vendeur.name}}" alt="{{vendeur.name}}" />
-    {{/if}}
-    <img class="chat-icon" src="{{item.img}}" title="{{item.name}}" alt="{{item.name}}" />
-    {{!--
-    {{#if acheteur}}
-    <img class="chat-icon" src="{{acheteur.img}}" title="{{acheteur.name}}" alt="{{acheteur.name}}" />
-    {{/if}}
-    --}}
+    <div class="flexrow flex-center">
+      <div>
+        {{#if vendeur}}
+        <img class="chat-icon" src="{{vendeur.img}}" title="{{vendeur.name}}" alt="{{vendeur.name}}" />
+        {{else}}
+        <img class="chat-icon" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon_echoppe.webp" title="Un commerçant" alt="Vendeur MJ" />
+        {{/if}}
+      </div>
+      <div><i class="fas fa-sign-out-alt"></i></div>
+      <div><img class="chat-icon" src="{{item.img}}" title="{{item.name}}" alt="{{item.name}}" /></div>
+      <div><i class="fas fa-sign-in-alt"></i></div>
+      <div>
+        {{#if acheteur}}
+        <img class="chat-icon" src="{{acheteur.img}}" title="{{acheteur.name}}" alt="{{acheteur.name}}" />
+        {{else}}
+        <img class="chat-icon" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon_echoppe.webp" title="Un acheteur" alt="Acheteur MJ" />
+        {{/if}}
+      </div>
+    </div>
     <h4>
       {{#if isVente}}Acheter{{else}}Prendre{{/if}}
       {{#if vendeur}}à {{vendeur.name}}{{/if}}:
@@ -83,4 +93,4 @@
   </div>
   {{/if}}
   </div>
-</form>
\ No newline at end of file
+</form>