From a34c2ab18a9e27430c03fb1eb8e08c49591ee623 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 7 Feb 2018 20:04:12 +0100 Subject: [PATCH] send the billing code along with the query --- Yavsc.Abstract/Billing/BillingCodes.cs | 10 ++++++++++ Yavsc.Abstract/Billing/IBillable.cs | 1 + .../Identity}/ClientProviderInfo.cs | 4 +--- Yavsc.Abstract/Makefile | 2 +- .../Messaging/RdvQueryProviderInfo.cs | 4 ++-- Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg | Bin 0 -> 14330 bytes Yavsc/ApiControllers/BookQueryApiController.cs | 3 ++- .../ApiControllers/FrontOfficeApiController.cs | 2 +- Yavsc/Controllers/CommandController.cs | 7 ++++--- Yavsc/Helpers/EventHelpers.cs | 6 ++++-- Yavsc/Makefile | 7 ++++++- .../Models/Billing/NominativeServiceCommand.cs | 5 +++++ Yavsc/Services/MessageServices.cs | 6 ------ Yavsc/Startup/Startup.Workflow.cs | 7 ++++--- Yavsc/Views/Command/Create.cshtml | 2 ++ Yavsc/Views/FrontOffice/Profiles.cshtml | 1 + Yavsc/project.json | 5 ++--- Yavsc/project.lock.json | 2 +- 18 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 Yavsc.Abstract/Billing/BillingCodes.cs rename {Yavsc/Models/Messaging => Yavsc.Abstract/Identity}/ClientProviderInfo.cs (77%) rename {Yavsc/Models => Yavsc.Abstract}/Messaging/RdvQueryProviderInfo.cs (80%) create mode 100644 Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg diff --git a/Yavsc.Abstract/Billing/BillingCodes.cs b/Yavsc.Abstract/Billing/BillingCodes.cs new file mode 100644 index 00000000..9ede8cf6 --- /dev/null +++ b/Yavsc.Abstract/Billing/BillingCodes.cs @@ -0,0 +1,10 @@ +namespace Yavsc.Models.Billing +{ + public static class BillingCodes + { + public const string Rdv = "Rdv"; + public const string MBrush = "MBrush"; + + public const string Brush = "Brush"; + } +} \ No newline at end of file diff --git a/Yavsc.Abstract/Billing/IBillable.cs b/Yavsc.Abstract/Billing/IBillable.cs index 069d7a5d..6da26bb8 100644 --- a/Yavsc.Abstract/Billing/IBillable.cs +++ b/Yavsc.Abstract/Billing/IBillable.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; namespace Yavsc.Billing { public interface IBillable { + string BillingCode { get; set; } string GetDescription (); List GetBillItems(); long Id { get; set; } diff --git a/Yavsc/Models/Messaging/ClientProviderInfo.cs b/Yavsc.Abstract/Identity/ClientProviderInfo.cs similarity index 77% rename from Yavsc/Models/Messaging/ClientProviderInfo.cs rename to Yavsc.Abstract/Identity/ClientProviderInfo.cs index 19b206a6..0733b196 100644 --- a/Yavsc/Models/Messaging/ClientProviderInfo.cs +++ b/Yavsc.Abstract/Identity/ClientProviderInfo.cs @@ -2,15 +2,13 @@ using System.ComponentModel.DataAnnotations; namespace Yavsc.Models.Messaging { - using Models.Relationship; public class ClientProviderInfo { public string UserName { get; set; } public string Avatar { get; set; } - [Key] public string UserId { get; set; } public string EMail { get; set; } public string Phone { get; set; } - public Location BillingAddress { get; set; } + public ILocation BillingAddress { get; set; } } } diff --git a/Yavsc.Abstract/Makefile b/Yavsc.Abstract/Makefile index 72f14d69..fdb9bffb 100644 --- a/Yavsc.Abstract/Makefile +++ b/Yavsc.Abstract/Makefile @@ -1,5 +1,5 @@ CONFIG=Release -VERSION=1.0.5-rc5 +VERSION=1.0.5-rc6 PRJNAME=Yavsc.Abstract PKGFILENAME=$(PRJNAME).$(VERSION).nupkg DESTPATH=. diff --git a/Yavsc/Models/Messaging/RdvQueryProviderInfo.cs b/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs similarity index 80% rename from Yavsc/Models/Messaging/RdvQueryProviderInfo.cs rename to Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs index 123bbf13..3e25c991 100644 --- a/Yavsc/Models/Messaging/RdvQueryProviderInfo.cs +++ b/Yavsc.Abstract/Messaging/RdvQueryProviderInfo.cs @@ -3,12 +3,11 @@ using System; namespace Yavsc.Models { using Models.Messaging; - using Models.Relationship; public class RdvQueryProviderInfo { public ClientProviderInfo Client { get; set; } - public Location Location { get; set; } + public ILocation Location { get; set; } public long Id { get; set; } @@ -18,6 +17,7 @@ namespace Yavsc.Models public string Reason { get; set; } public string ActivityCode { get; set; } + public string BillingCode { get; set; } } } diff --git a/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg b/Yavsc.Abstract/Yavsc.Abstract.1.0.5-rc6.nupkg new file mode 100644 index 0000000000000000000000000000000000000000..6aef7a9a8e8bd0ea3bdf4132ea997e87c8a1005b GIT binary patch literal 14330 zcmc(`bx>Sg*6;$EOdpJPF=&WHd zCt*%bsJS)B9th=dbOJfREtZZDdms!hLaaEQfabP9D-b6S7Z-pNp5T9C(EWQ%8hHyb zI&}~i9gQXsVg-VU(Q)blU7_Y2Qf5#X1ZWQ9aBzV-fz07{4=2$7Begx)9O4Ldw1jb( zJKFy}E7-vbo|l`8lS_cp9_RqJ1VLeRG@SoyUhaR%`;VHTAc!m290cXG2f=_AKp2qI z+z|p|cY?sL69NOn4cr_~Pv*$o`}!T|60!~hPKu; z_*(KJJ$pt7U(f%wap~$K4&S(5w(hc`XKIuiWr-n2AR-O1ql6KOT{Y4z;2DT(o(x0o zuJe^h&$AK2)&@6^OdEOcHVImV)h!dhKUgl<3E&(@Qcd0WW@vgucz2LW_lrCOAfaqC z3dZ6W2J$hY6d4kGxp%A{n>GXqp34;oRjt+vDC|oH5TPV0HVJ?89iUIOT(7d=%gL6! zws)B(q8|%(Tk@WD@_#Lr=3a8?R&hyKj+JI1m;7x)(BpazD<&9@%fFW&wwtQ#xKRq<|-0{gA#kb z9?KHGp2DSu*yXl-ERRuj9vM&tM2@(RP1PyfHw-~qRR>mg{7p)SsyF?U%p}-#Uzn!P zen8Xfdl_5aCv4w@p^aK-$tAQ3=as2>Ffs6gT638@;}pj+2F|th-k2QZRVv0Zn{|zg zP!WY_Fw?VSn0IJV4k;0^iYg&&l@xO6YXMvh)$REVTZ$juF%T}p0~9MNcW+w5rwevk z35bnTOBXUUexv>Sa&D~qSoX2Q*U{$LGgtUv2R7q$a)iKuW_BQU2M~;ppMmF%8`wec z&*1d8GfT5Kj1s5w{CqXhbancKwWT3^Q=z!O-<>!hR+!Ks z>R@levmh8fc4fKs5V?8|6OMH}QsA>hn~5BPZRKcDMm{8GNNdQ;y9ekE9P~+##7A-H zS0278UCV_jn8(;K9w0uqF^YDa51H`I#*M*Vb)ee~>(1GwrcU?5w%X|!pKBkSm`TJh zr!zWzzmA?RDy^yH*M+l844HcQi-*{8n8|h9nSIUTrgQ|{P#UJJykuCPI$D1$AhNtQ z7ThG+ElY96bn;yFAJVOj6SPrW_axocJmL*Dxt8`|EQAU9=lqcL@qORE7eiB_l&3lc;c<=fZ%*@W85rjO1blHy#RQo<(Qv{(G1J!k8Xdx;F}%;C z-OIRlaCC=N(_Z7u`PI?i&>X+1{gzJWSR8X|Xwy~I(4+{m`mKS|tx*cAN)X}~jN0bY!U??sHo$j#G}5s5;SQ9cD$xkbC^^Le3! zp_$KQjquAev>#2#^esVVJT_kUz9HcqGjxoRx2!}-x=C4XR1 zRUhQAXau7CBnmb=&B4_;e7jU$!~kW)k(Xy~S*6p6JQzaZCng|7mdHrE_30Vx-00>f z=jEzATimaS*5|#Q>Ca%$P9#=LTyRR9NZ^1fls#)J7ymk1SB-d#>GZpRG(Hx(>jaI+ zIrz?^f%!(=afqsn!Vie`Xg@sbRLK?C_cDVopG&Y_BRo3=GwdzObX@W}b{K<_anfoK zV1R3TbF=CP7eK#f(fW12UYK*icLGJ{uwoKNmj2YR=Lu#3#YxsIj45IA31(l41?SX5 zqU%;?*&;ATJztn0R?Wm`+$Y70SQ1H$si#@KW;6&JDliMnPcnO5pdVITV3v}fWcfOU zO(wQD$$_OHHOx|x_6^egQMf|=Kv7kxmiE%@Wgx$m&){b;F_uu74-KPeTGy*!*882u zMfLhjqFhficY#FioX6FXU!Hp8za=_wS$or{NYxAncvvh9`xmyf&X}-etXjDI>x=x&=n+frEgskG$z~` zHi|Uv>HF3+9B>h!8|(m!T-^&;wM~~LCaK~QxKo@yuTvjvv@7Rp?w;8TSQKuu_L1Qt z8!g*C%C=^1@DJ*?2L3>F5T`hgGppGTvTk0|)W8p5%;PWm{-!Wd>J_rfo1(qQ=CDfc zn?{FfK7O*#J`ub+o^vQw;aC0Bkl?j?$6ho>d7Nf5!g-S+XC!e|r?WkfW9SxGv{61IfeibwLy{@?)FH*^m~O z=7#tdBQe~W5}9I*@+5r=MqQ8OkbIP-yzy#sQtbXaJ4NU$O4Tb>!x7N(3&s>z*Z$|O zfaThnOV!F6k@KdY5#YG0^FG>{2To>`l!;e>7%(?S%-HLD!Y{K#h++z4gd44=6-V_E zd{VJF&UnXTuqfDGv_mj5VcnFuV^x=CdF!#3A+T!E$VC~B?Qc;q{2PboVi)*=iVnby0{B$U{bTFA@dTI+EO^u>032J^2fj14Vnht0P zOIk`5hD>gF4x&PRE0Yev#TE~gJ873PR~&KzI+d2; zW@E2n1hgM>#FY-6*1429tjak2_+RFo#yMv+#$hWy$i%Zb5|6>+*b6y{#5LY4@6J9U zmkV?J)Ms(;xN=k3hKiEH(y@fT%_11HV&h{6iz%fLVz9oj)qZu99c{_b?Q2k`7gU)! zYYUKCq|0B@1gd^X6?3cxcelSUUV;HT!fadLhKDl})osa)x7^pr_$N z(O4IL>w1&Lbz1EH9R1CApJ#7HJShxp+J@G6m)wF@wTqTmy8$}ZH*bNM!~7x&Iz{OA zUyoVC1KZe-B$Z|ORLu7%fp6$D1Nc$SJx{qkWC zvA=`05$PAKOWf3_@2zX`d3K=q;Yo$2FDk!;cGoWgCk_`G2jmkQQ*WN(q>rt>?#6Sf zK*HOUiQG>)llYyAm>CFUQVupT>~5;VZ3&p#mvOd(D;ye48>pm7Iz#U z*$*!AOTSBwQlykQ{i^=7SK9vw#cE7`q)9>aLmPr(*vqy?@ct?bqw8|I=*9{xKw6nOi^N!o;gwW6RXMxY|x%4Yj$EH|gyw&{91QPJh&zfK(}# z6#NRe10aY&7O}1dfmS4!4}Aaw8#YK)2d6NdSG{EiOIYJ#;Lf|F#lyZY1H<$jfIjy* zW@w~3JbLL=ZpawNn<%;r+z3zENuY#u6D0M4Vu#{ppqYL#icMRM+PTV$^|KsS@lsb< zNVreo8HtvV8?)h7Wv5pk>-`+StM(Vk+~QH#B!*vPX~VmtqAyYd`p+ z8idBS>>0gU$1I{6lE0q=G(^`dO9s9vU5^g)O_T|ik=9Ia{~|6!3l@v4-3R<;oG$P> zu)CSvul&tr$!m9`7qNsjv7ENAm--?#=r$EpBa zblos&7rH21);ME7A4IrY$rKHku;ip01Ktke3MtyuGvPT`@#enUPBXvjvhM9ejd4xj zHJ5`fYV_&+-u-se(&uG#M04j`&&#^k(sMW2fdcpz`Y3dy$p3DSBGspq@w=I*->&D6 z37`Sy=}m*+18eI<-#o2-_E>XF{bUW5zSv>*94}6|=w;=gd0@C0V6W0^4p)dbh2DQ} z1c<^vU|n4E*=D|RvBIZ!&Rj=(wN(txhg&EuKHSN?eLi@Z17#St=eX}3^7**ktM1tSCAFWZgUdXpw?&dCw zmGP)4d&X45n-XW-RoiMk5cXsE9xxUZHtbD2v#SI!)ZFPv$^b0&oRud|CMw_Xc^@)d zjX7(J5V}l{SdyLgrC+5CxpSW62`JrcRnrT~wA)uV4AYr*@aP#`M?E;-r4RM%bRZN6 zaBi2~q4^O9Dc!V`n0#nDT~m%P6f~b#E*$K?aixvwwM?<&p$Z-28?gu``~03W9aMeF zUxol(SlaEypQHZuTU2{;w<xMJ>F?;SKu>kr(UDeU|){ z48ca!x3LmCN9MRDoxt6>k4O)ImP*D0vm=vfs;4hE(yFAYS8?aksz@1oL%_f}7yt6l z3_4NHRSQ$WWn;df4_!b`+Rvj)NAFy4iCbu#A}#>mD0GqP<$mnVFJo)rBL?!(9C6&a zEZOqOIVRgVOxe~((&6(Rq7NW`V-f0NY3Skg6A``K<*E;*O|4QE9Ay@NBa%*%FZkUo zQtO>{;#h&UjNuX1$|+AOd)EU+J-26s>$ft2=Ken8pVYZx0FfUiTV^Z4BVs;{EBNKu zUOD{1a|>2;geu6o)HK0jChL10)5*Dap&YKL_tRP`)MRuVH)J_erS>-lIG8lDReBqx z)=T^VuR>4#4YH{9w*D=*it}Ev1<&spwqjmeE*Wj-!V?}xo)aFUK%WpMhstjkh-KqI z1Fq&5srqi78>p%xj#srazy{i5##BnlW#w9Ez>VIMS_6#}uMxP~WPu&AWyr$qUCV>l zzH2OH#Et)|BTxJKz<$=yFJJ0H&LlhHyR+w>{T2c=jCaUBa~7ENyJ!yC#LDwjdYCsz zu|6L>8smK}s-sM48>ZjKp6jm5o~A?$+yOk-Ekqj{W`Y^Fn&3N~`}8bgnlj^kbI(@j z$(4JKh*-;>QHIg1rN7cP$?9>_`l^Kzto3n~&oxIVqiDxic+SE**sIthr$%J;-6f-N z%Z$&g8PAQ&PmR=}#f4SXH?aeRC$c@Eg0N`4E}+95BLBeF0*jv;=q2FG8 z$HaJIlMYRSme)OZbRR5>5LEOb;Md3V&=2u%O8TwnwI+E=diRS{4$hfAPR#J7;LXZK zZ3sHyC>JtWbKLBD{35{n9mC8e=|UHU^a+d_ohi&!k6!=$EA9$239%A}10e;TH@-W7 zg@HeuDIyHb4u1^TG@^a2eeTgon2p}1pnP2#*WTn{WOa}^_wl%1R=sZ|QkNC&NzZl8mm zu*@8W^?vXHDu2O=@Q<0^a&&H&g494k2=uFBN!>Rwwcq=6~UNF;TiThx67L&lAz3 zfM2v!eL6hu%DMD4@8@FCHY53d5DY)3H13{UM&Ztjzx4rmFSFQ|Tjj02V%9FVP?_so zIhV0|VVv|H!}rS*Z5PAxx39XcR~+Yio`#(};?lEyNt%`f-`coqjlF|GbXPUq$ghZV zj^<#tw}Jh0S9Q&*2p*^sd6*BGy!9n+?`=x;_3n*wU-)>>2{N~NX#}x;Cdo|n5@Y|V z&vERne^O^?W57|zp17Q$Nf9)V|A~n(Gd)w280l^0(tf8|3id}rL{>0DWrDtct~F_8 zjP^4oHIXyAp$_?rpEMmfOkc3u)$dS^(C-0#{_DB56=@vWGqeM9(G{U#(H+lA83^oh zP{R-hG>}!7MaDsY-I0e;kKT_`@luq=UH42`iqP~5rIC0`+5tBL)0oy>@~m&t% zqbVR2IrtxOxQ961ziu#gy{-DK3neor7E`QHD{R*B(es(=^z~n*>*O>*SZb)Ts`wB; zZ^{r+fJcTzEs-#6nt6{UrodaA_Jd|XPnXh4gD@Q_YCT{Db92aG^IE67M8~`imbEP$ zw-Uk+<#zp`vUtl_mgbNmmkP!^a^uN=fA~x}Un=EO>`z#lO)9R|cvfoV3vrbi=XP2$ zY7&f>b*MMbE`1YDFKSx5{1}`Jb+?xfKP1ksA>Y?V@t4mvJZmW-*_C^|jP&~Oq~3e6 z2{A%Sy!*JlaNSA|c`vp_PZ%M=zQQS__t>^gYB2Q6Y>(zlc}PS1H?z}Xyo3+-Xz zV4GQxiv3-?AJa7jn=h82)W!X+IK)0YPmA-GV$2*^I5v{^SfMQr`Y99DX&HDf5}+e% zft(Yufc}{EOK$_JZWFa#QQ~sYQGNEZQb(;pW1-mKBIFBT;cPHY;c-nkp~HAY*MzPZ z1i!x@$veqWT*UZY*0;``uT`SHINahE-YJlEI%DU5yQ?ct?L)IW~JgeUk3wTT$}(!Hf1TbB^1XY|*dV z=yjN$!&kEvW>AB)-V=F8tj2_US;p^2h}gGX5A3pA`H-s0Nm4YiD9?{|eFYYuVF!i1 z&EiGBqX#7JiptknJ?7tuBi_BH@N!xx^V+S)c2ixgR(S~19XXtS^ege;%kug7#%@1W z^;tEwb;y7k9uC-II&}u6x2SpNT?UG`!ToS3u z0&}}h5{c1gS1>?#Q^AbSMm&&bZ&cP~9qtvfL*KD44*tBJrc z#61Wtq~oF&5U}-e(sQsS135l?ekwPk+{Vn-2oV5CwxbK9P`Be=Fif6zka=TWFn(`n z`z{&SoVB%kn;z|zr4e$!6)o_#u!z`NjT(j#?;CUh;K!JH|1p3VRlb4k@aLGJfX&dR6D7#jF&&E zYkBIgS!BLFqCJ9}%C>07K$WRu$-t8jDpTq3A>ean$m)w*sy%{ZBr+H$EbL?p{#&O6 zER5VlQs>vZN-aVxu$B$gUW+wXQ%}QYKQyGA1Zw zSNz*rFm&sUvP;oz;t!}k8f(j5xYm;mYHw)YJYsC0W_^@emoW~qzUA6Z+&_%&z~S3N zW459(z9r(TK*YWyPva(dV4uwDcq=4Rfq;ESJIr#2JDEkDo0gOL4Ev4+E|N}WExcEm z!p)L$%u367LgCwE9%f0S@k72ng{vq0QQLwbVUGyblU~e)d&Iqt$`5!u1e8c*SFCXw zSGHMFr|?+o@K{!G5n(cGeOe^?3B`KybdQ?$iOPDz;*x4x0&b?a(YmUT41D~kPe=*B zN?aQ)LEnxEE3fN`qhSBDo`VL-jyp;|ge)oAYub)n3_j+v$3e#;MC{kve&2s;_@l;` zMExp8o6HJPAI?(P(FiN~a8~>JSraO{YAFWI0>UO(i*_58Mzs8OfG8PUr$7^h(mhkc zGr0A~55q(BWrntvWCr@jLM^RmRTMH>rS+sJKh*`PWZ<|aK5ZrnpLM%1;l+|5F{8+Yd z%C^<=zUCaQN5Zacrfuy0U9_Id*LAy{hHD>A<_X7^FbDN3=~e6XksYSpRMv`&Afsma z_Ds3$OwS=WFf}Dx+HRD4JwqOsQ!~u{mAclM}4;qRB6&A5NSR0#NP2MM^fWZJbFUCw__DPi(h$i(v zz6kYJJcJx5Z;Oa5FB4bfrLntU?OcRD7SwBn5Z3o;1cr{Q989=aRTobj=Zv&Nu)p>ftt!^y( zX=>Gn^tca}Kg-70RC=V*P%H0yN3U<>kx1(6NMm8ImI^!u z4AT7{tU(>^d+|M~!gV|Dye9FhlV~lcBq450McDnBq)NNQ{TkxR*KXBe&^jgn zQ}y%ks;T7C%6GPg^{<~hd|f3|*gdu&p0js~ShDk1q@`kwJyHIFHf9kFc1&<%(6cyh zHf$Bx{K&!>Z;hZRUc5!&7WdYk;tL2u2kkrJ(H(EHfcC|i( zo$uVju?lX;8Nlp?!(I*eOrfB$*6djUgTr5qWlJd)ICt~7zQ&g@5J6w9PR9Tt(;PNur_Fj z$D{WfPlNz#46oxg`>i)%i9aMSK2)kVjRhvkn{=$QoiH%d7O2~-@>wSIYuB2wasKD8 z42g=%W`Tr)<|BwPpCNAu0mJvyg!dYNJHqw+Rn1_)3cw&Mga__ zJkvr)eBm>z=;70CcV)A^9L({y`u;wEwZkHV=3nm9>23_BZK>HU$pb4Pt%M%&uKah= z{m*TA?-KXGeceZH9W{r=EXYuJJ>xAz7H+1MsFCFSBbi{)U(?or_Vd zIPM$HKCSS+DP~78Ck3o0aUWYd5C32*DCZ&lIMsRZVBz5t!==JhdOf=1yl}MI+g}K+8k1;q*uF)JZS|_Uw8z6n!Q#(FYDt?UeiQebE~wHK?P)< z<$3n_mGiX;(J@{QO15SWg*ko3J=#sA-PpRUEVqS@_s{lkjl3hGMZc=8<%vBdp&%JN z>jIs>5Fe8B^dwK+Eb;&7kQ5v6Fh+YfYuAE%IeO$YT9TSVxp|FM(JB^oJ7G6&dm`$> z-ShTE)Adb`j3B1X){sLmuxHV8@i|@p@x(TM8PNerpc*B2kB)s$tEG#7hP^E+{t|6e z^_XWuRx+gk%#`RNXG_|Eoeau3VO7>fF z=!@}XW5(bzlUqo#cV;r96=ZjRD0D(a#Tyd93^t{SpFIp5cwYfpX~XuVW;!VoRiBAE z9K9JX`1;K@^p2J){|aQUDBQ5x?#2IG*xE zGKxI!^2Aq2_%g1ZFJ|+2oF}L*`3BiciVZM6pS~D9`V%~mTJst56pDu@btDDD#j z^HGMz8P-;nD@lIL9ZB6BGYy04esSrx-eLis>k?Y^>Iz z=A72hqs~U}lNHxURMMv_bUkTm0b)zfPelx3()MO*!VU&Rs+I<5mmHCV9Fy8oSfZ7Y znK2s{Q*9{R_^u!BUrM0QSn2;}NfwRer6#i#+Wi7HOhY{jUfI4RN9GpoYv%!F85qf?uIT zJF>dM8gIjeKn{bUIhAOr?F+JY2c%us8@bQoTt{{4A`2rzp0qe}sdqHTIhK!Y;_I-S zshR8%nn*7p%3Hj_G4@R|aG5|IrQ4#cts3iYCrRYb0?z)`#)XHIwakOD8l~lod~H%r z9V36nlRBKtP4e%vL8D@F%Mpy%*`4{dDA)&yn`Bw#(_Nw%j=9IRNPTYVnC#N|;gcZ@ zwFC{|+{-<0eHB(~hVq=bMlBH+)9(2x&t*yCN!jL?JzRm7(`+fqP-~9#&!M77Gadk! zX)3;gn5U_htB1+7pWj*%B_3BU;U7xdytr?(ZUkNvVm!;yVoN|R84lMXarehSD;-`a z!syO_Z!*8H$jxDx*D5h6=>0bO!$cwkMK&vDIJg7Pnoko9*7JW)NcmVr_Eu|(*3^H< zyX&GAmx6G1`K3Grg%J6A4*e5GO1yduw5Gd}V5B0ZAYl>xl1==iz%8At`0h6s zz}kpDi00QD6!lT7xOZ_LR)-m%I7jy%FE*_d-nN@D`Cw%;TEEASyh+zqBPhwjz`8b$ zm?)Q9G!XZ;x;+z*J;v`t+UY^NO43owrjpph9A&i?bVCU$6UGQkuuzd{T;g)4qBGaz zv(pW=jJK9Y0pl-*J9AQk8XamTTF1moFMM2gey5e(Bx{Av9bua#4XCl8E|&a!_Dv6^ zqg%I~oYV#b|zm{9CO_Ew5Dn+-LrE9(iGf@xf##hmtRu`8ITtf@&w|e`# zoN5=B0t`bsbfhyZMXQSE7;M{R?q9_*M9i%D6Sz4|O}Lt$+tPxOfz`lDB0nd-2s|#) zBb@G(h^$Q<+2D#B6yO`R)_|i@kMuINDWc2fB>WqqBwPQXL#*F#ez=Dpl;>obU-wBR zEB{-3#~ALRddziNx#|2w!^G$JJMUK@A)DT=Re+`-I`bOnP7dQ>T!}n zud#HNQo`Xe@sNu#r9sF=*Tp6>1KKcKz98jeuryZbn(WQn;@)>=w!G$J6eBzq8w~#1 z*SN1O7XEhlp6r49-YCpA@&H>f<10)oq>G!iMy&A7@cmsChD<(_bh~C@kvc3=s8=R5 zqd%gzT4FApLaz8PZyW?7M`tOj%@jqx$TSq6bt z8cH~JMiG=EduP?l!qm#!Ytk)pC}BM6fr%zjVRF*ibDE6RuuN zDERKc%^B~x2kMXnwX!rN?p%Sh^&O8iqDnTttu(+CJmn4dQpCdesz6#BGvi5 zsCj#Qrm|u79OGMMO&PKy5(jrj%`WSs3FX4|-a38t+6U2r>nG2&vvspUfmbZE!{-fz zZ4I;*t9HJAL&z+3+BvqL*ECK9^?WnVIv6_YRuO#WBUV(u?niHf>z_tt8%NiF)T#OQ zWD$DY?X-3>p*%9iMmFMfsIEo!#qmy{Jr`oPP`gkcT(wkr3?K(BaMK)9bQkSi24B}m z`+n=PS)lW7bZ|KRP$)6(lln5lO@46P=M>QKKA)6hw%DpI4H@$Ff>-S;X{ONZt97<| zY2VZw<-0zQ8Hj?j{?CpU6a2eWx?`>7V$^H4cge=Z*;+3M-%cZmJ2)Mx%=1s@{^I-I z**WlONs!rE-fv>jf>fYTMQp_T<9_1#nweiAR(2oZMGIE*N!}8UEyeWH{v%uTtuA|q z;$)yx=*%kg=5*riS>6TH_$OZC`=>erdOu8c=yV51tvNdVtoxq(0qe^Xn#z|oh#$D;u{SkS=n71uwtar{-> zzZUeTK)A&L2DSu)Amaay1pMXwFIG`okcXQi!~!br@dwip<@~2CY6pbEl;QgU9>wB~ zhq#K%I}nWHEqp()(P;mjD&pbb=HcMt;9{eB>tY9Ufq=vuKrZm|?bvA4T;SJbt_bqb zbhHIIh&i~}*@3gOa&fD#vTI+$!6r)$_Gs8VleA;Z`dlvczMdwc`L|`Jcyv207ohCa? zc?^EqZgN!L%jS%iqa7#1%iwwH22yI8u9tJ2?A|89vs$PFB>a!Lt?)+$0{pS?-yt#h zrT@$EFUZ(GCjK`X>CY^9@8HKIeE9cW^>?W2KSTT{0rS`FzfPHO#OePZ9_Al4{wd=R zME9Q$)BmaQ7x({{N9#Z0|D%onx$pkO|63c``Ty5lsHTX5`o{?c{_28z(gXfT{|9F4 B)W!e+ literal 0 HcmV?d00001 diff --git a/Yavsc/ApiControllers/BookQueryApiController.cs b/Yavsc/ApiControllers/BookQueryApiController.cs index 18378a40..911ca49c 100644 --- a/Yavsc/ApiControllers/BookQueryApiController.cs +++ b/Yavsc/ApiControllers/BookQueryApiController.cs @@ -53,7 +53,8 @@ namespace Yavsc.Controllers Id = c.Id, Previsional = c.Previsional, Reason = c.Reason, - ActivityCode = c.ActivityCode + ActivityCode = c.ActivityCode, + BillingCode = c.BillingCode }). OrderBy(c=>c.Id). Take(25); diff --git a/Yavsc/ApiControllers/FrontOfficeApiController.cs b/Yavsc/ApiControllers/FrontOfficeApiController.cs index 94244ef1..3c70362f 100644 --- a/Yavsc/ApiControllers/FrontOfficeApiController.cs +++ b/Yavsc/ApiControllers/FrontOfficeApiController.cs @@ -15,7 +15,7 @@ namespace Yavsc.ApiControllers dbContext = context; } - [HttpGet,Route("Profiles/{actCode}")] + [HttpGet,Route("profiles/{actCode}")] IEnumerable Profiles (string actCode) { return dbContext.ListPerformers(actCode); diff --git a/Yavsc/Controllers/CommandController.cs b/Yavsc/Controllers/CommandController.cs index d8d20c7a..f807438e 100644 --- a/Yavsc/Controllers/CommandController.cs +++ b/Yavsc/Controllers/CommandController.cs @@ -91,7 +91,7 @@ namespace Yavsc.Controllers /// /// /// - public IActionResult Create(string id, string activityCode) + public IActionResult Create(string id, string activityCode, string billingCode) { if (string.IsNullOrWhiteSpace(id)) throw new InvalidOperationException( @@ -117,7 +117,8 @@ namespace Yavsc.Controllers PerformerId = pro.PerformerId, ClientId = userid, Client = user, - ActivityCode = activityCode + ActivityCode = activityCode, + BillingCode = billingCode }); } @@ -126,7 +127,7 @@ namespace Yavsc.Controllers [ValidateAntiForgeryToken] public async Task Create(RdvQuery command) { - + // TODO validate BillingCode value var uid = User.GetUserId(); var prid = command.PerformerId; if (string.IsNullOrWhiteSpace(uid) diff --git a/Yavsc/Helpers/EventHelpers.cs b/Yavsc/Helpers/EventHelpers.cs index ccc36795..07f091b5 100644 --- a/Yavsc/Helpers/EventHelpers.cs +++ b/Yavsc/Helpers/EventHelpers.cs @@ -24,7 +24,8 @@ namespace Yavsc.Helpers EventDate = query.EventDate, Location = query.Location, Id = query.Id, - ActivityCode = query.ActivityCode + ActivityCode = query.ActivityCode, + BillingCode = query.BillingCode }; return yaev; @@ -65,7 +66,8 @@ namespace Yavsc.Helpers Location = query.Location, Id = query.Id, Reason = "Commande groupée!", - ActivityCode = query.ActivityCode + ActivityCode = query.ActivityCode, + BillingCode = query.BillingCode }; return yaev; } diff --git a/Yavsc/Makefile b/Yavsc/Makefile index ff2151b0..459f1650 100644 --- a/Yavsc/Makefile +++ b/Yavsc/Makefile @@ -5,9 +5,14 @@ CONFIGURATION=Release ASPNET_LOG_LEVEL=info #warn HOSTING=localhost HOSTADMIN=root +FRMWRK=dnx451 +BINTARGET=Yavsc.dll +BINTARGETPATH=bin/$(CONFIGURATION)/$(FRMWRK)/$(BINTARGET) +all: $(BINTARGETPATH) -all: bin/$(CONFIGURATION) +$(BINTARGETPATH): + dnu build deploy: clean pushInPre pushInProd diff --git a/Yavsc/Models/Billing/NominativeServiceCommand.cs b/Yavsc/Models/Billing/NominativeServiceCommand.cs index 112f041e..6d772ea4 100644 --- a/Yavsc/Models/Billing/NominativeServiceCommand.cs +++ b/Yavsc/Models/Billing/NominativeServiceCommand.cs @@ -97,5 +97,10 @@ namespace Yavsc.Models.Billing [ForeignKey("PaymentId"), Display(Name = "Acquittement de la facture")] public virtual PayPalPayment Regularisation { get; set; } + [Required] + public string BillingCode + { + get; set; + } } } diff --git a/Yavsc/Services/MessageServices.cs b/Yavsc/Services/MessageServices.cs index 088a721e..7b68de2a 100755 --- a/Yavsc/Services/MessageServices.cs +++ b/Yavsc/Services/MessageServices.cs @@ -46,12 +46,6 @@ namespace Yavsc.Services throw new NotImplementedException("No GCM reg ids"); var msg = new MessageWithPayload() { - notification = new Notification() - { - title = ev.Topic+" "+ev.Sender, - body = ev.CreateBody(), - icon = "icon" - }, data = ev, registration_ids = regids.ToArray() }; diff --git a/Yavsc/Startup/Startup.Workflow.cs b/Yavsc/Startup/Startup.Workflow.cs index 68208498..351e7889 100644 --- a/Yavsc/Startup/Startup.Workflow.cs +++ b/Yavsc/Startup/Startup.Workflow.cs @@ -10,6 +10,7 @@ namespace Yavsc using Microsoft.Data.Entity; using Models; using Yavsc.Billing; + using Yavsc.Models.Billing; using Yavsc.Models.Haircut; using Yavsc.Models.Workflow; @@ -76,7 +77,7 @@ mais n'implemente pas l'interface IQueryable } } - RegisterBilling("Brush", new Func + RegisterBilling(BillingCodes.Brush, new Func ( ( db, id) => { var query = db.HairCutQueries.Include(q=>q.Prestation).Include(q=>q.Regularisation).Single(q=>q.Id == id) ; @@ -84,9 +85,9 @@ mais n'implemente pas l'interface IQueryable return query; })) ; - RegisterBilling("MBrush",new Func + RegisterBilling(BillingCodes.MBrush,new Func ( (db, id) => db.HairMultiCutQueries.Include(q=>q.Regularisation).Single(q=>q.Id == id))); - RegisterBilling("Rdv", new Func + RegisterBilling(BillingCodes.Rdv, new Func ( (db, id) => db.RdvQueries.Include(q=>q.Regularisation).Single(q=>q.Id == id))); } public static System.Reflection.Assembly OnYavscResourceResolve(object sender, ResolveEventArgs ev) diff --git a/Yavsc/Views/Command/Create.cshtml b/Yavsc/Views/Command/Create.cshtml index 5c29c08a..dd8c6e14 100644 --- a/Yavsc/Views/Command/Create.cshtml +++ b/Yavsc/Views/Command/Create.cshtml @@ -180,6 +180,7 @@ @Html.HiddenFor(model=>model.Location.Latitude) @Html.HiddenFor(model=>model.Location.Longitude) + @@ -195,6 +196,7 @@ @Html.HiddenFor(model=>model.ClientId) @Html.HiddenFor(model=>model.PerformerId) @Html.HiddenFor(model=>model.ActivityCode) + @Html.HiddenFor(model=>model.BillingCode) diff --git a/Yavsc/Views/FrontOffice/Profiles.cshtml b/Yavsc/Views/FrontOffice/Profiles.cshtml index 3f44dd10..59d48761 100644 --- a/Yavsc/Views/FrontOffice/Profiles.cshtml +++ b/Yavsc/Views/FrontOffice/Profiles.cshtml @@ -11,6 +11,7 @@ @Html.DisplayFor(m=>profile)
+
diff --git a/Yavsc/project.json b/Yavsc/project.json index 802b4cf6..79e2b3ae 100755 --- a/Yavsc/project.json +++ b/Yavsc/project.json @@ -113,8 +113,7 @@ "Microsoft.AspNet.OWin": "1.0.0-rc1-final", "System.Json": "4.0.20126.16343", "Yavsc.Abstract": { - "type": "build", - "version": "1.0.5" + "type": "build" }, "Extensions.AspNet.Authentication.Instagram": "1.0.0-t150809211713", "Microsoft.AspNet.Http.Extensions": "1.0.0-rc1-final", @@ -166,4 +165,4 @@ "postpublish": "echo after publish" }, "embed": "Views/**/*.cshtml" -} \ No newline at end of file +} diff --git a/Yavsc/project.lock.json b/Yavsc/project.lock.json index 4683fcff..f2c729c4 100644 --- a/Yavsc/project.lock.json +++ b/Yavsc/project.lock.json @@ -11437,7 +11437,7 @@ "Microsoft.AspNet.Mvc.Formatters.Json >= 6.0.0-rc1-final", "Microsoft.AspNet.OWin >= 1.0.0-rc1-final", "System.Json >= 4.0.20126.16343", - "Yavsc.Abstract >= 1.0.5", + "Yavsc.Abstract ", "Extensions.AspNet.Authentication.Instagram >= 1.0.0-t150809211713", "Microsoft.AspNet.Http.Extensions >= 1.0.0-rc1-final", "Microsoft.DiaSymReader.Native >= 1.5.0",