From 61d615a814c28e58543d26a07a342868a1342654 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer <reinhold@kainhofer.com> Date: Thu, 14 Feb 2013 16:18:36 +0100 Subject: [PATCH] Version 2.0: Add AND operator to the list of parsed operators --- ...mshipment_rules_shipping_advanced_v2.0.zip | Bin 17832 -> 17875 bytes .../plg_vmshipment_rules_shipping_v2.0.zip | Bin 14616 -> 14620 bytes rules_shipping_advanced.php | 8 ++++---- rules_shipping_base.php | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/releases/plg_vmshipment_rules_shipping_advanced_v2.0.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.0.zip index 41e4dc7729a16aa1bd6dfb4e9526f4d93c36923a..31772ab87f29c38d539237ebb4a6a3f04b7a1207 100644 GIT binary patch delta 5338 zcmZ3{&3L(+Q6j*bnMH(wfq{eJV~wBFy_`2M=khZ!FlkL@)R(I-$S4R6;bdS|`z{j* z!lf1542&!<m>C$r#MY?V;M*r8|4Y|*9eteCDJAnlb*|M6ZPk4;<p~l#MSD3ddpBI$ z)}^zv>fplCebx2nH}Ag0CH?N%vsp76w)}qc`QNTbFK!>rxtPIHBy`M3!0-0H2W zX5JR{)M^T_dYfH8^J%8Vxs9*;j~ku7_3pOY;@!J%3+zrZ;TA8Je4ZpIdf7lsc+RX- z5zFeX2xbbN%z1zAe1Xa3hDdjphkHd<&Jmk9zsq&f(>fKSnRYD>deai^gdeBu>v$q= zw}s=err4&KhTfz(;w#T|eDeJ8;COOE+>gwAf{Jq$m{`_X3KZMV_pJZJalB$;yqLwT zR!^NL&GMoVen|;RDfRUeG~aJI*CeK|^XKDU`>BtTXFO}&!@wJNuFHCJ@lm1lr1evB z=Q|!d`N)uW`R158)BMk^)aHwq{o@*Q+F+h)phDf3mx)TjD?Hc#{d;fCTW7`|?IyoR zK3$RX^sDZ^E82Ny{;{KVll*qO)T>RJyvI7$<@e?qxz6v0`R{%Ye=e&L-1T|$<%0z# zH`HG<1*^7k7#n&rPE?&-^KyAn{GBr!(o77#%O5>cKjD#|*B(_z3r^3|uCqkz&P1IM zX51@e`!O#2*Qy=N>mS8@ye(MAlYjDo!xQUrR!e`5OCK$?m?A7aIr&$x8S%;|a9*hQ zR!f?><onDEPV9?1HvZLKVzP=QVC5ukxfwbKs-}s&+#z&%!Py&L$_!<H6XcE^SvX%k zbNU>;&XcY$FIFe?o?W={-OHy}&tFe}zkk1C?xyZ=v%bl5{!U}zOL^BWD6AlLD??Oi zll1JX`ky2><P@=q>TY1}+&jhPu(Y}>k7<*aq(HsZop*9a-R+zBmRg+t^V=t@{hgWA zLl=wNk58O8@~>;0Aer<#vCcFo?{-=2$NR^^wEoAotSqV9VYTz;z26lNW9Qaa)SJn4 z)_&}(dvHW4c#B6_*Pr#$hWd+M9^dK7c3tHAJ&(_?{xU0FeaWfLarwr4@8h5MSzF6j z%-j7xZ_E8>E%gs26>TrMx=st~lej6VxVUA?62`rU)qSrRi*4If;r@=b*6&ivIVsmo zoy_*UTbQgj%<oWDD5$gfoP1=fy!|ud1$W$H*2oIfP4Tj?5Mj0HH2kH;Zy0&7N>FX? zy^|V|N|wGSejm5vQG00rA$!}zrdrR^)Jc=$izM0gnJ3TlJUO{uNiH}~Sk6X0EHc=_ zdQt0>ulkm5n{pCsh5T-+M4y;{;OgtE3$7>LH`}()Y@1l-B=2>ss#6U`CY|QyoX*#w zEaUfcMp=~2^MB&5+EY*5H#FI&qwDFeWobS?bj!(q>VhI%-mM){Ve*lRje<<S<b|9+ zG_c$A{<St@XVs4Mlw7{C-ZksK3Jc$SvB-I6`~{bDtYo_2H`OFlG^cRs!}xnjOE<jl zn0t-cS^MXg)630N9E>vS#cEmim#+!)o9wX3<jIBJJaNkli;pn3ZB}_Vak;?mu(esL zQ`Bo8E(l6{82iPe&g<OMu2%~bE-Q*?3QcgI_}^lA>WLi=8yM!hcxTV&a44<cc_P(H z{X?XlZcM&wjLXDRD^43s?hW!ZjZ0j$<nW2e5<f1650|gh9}#<WcayomzEFe2n5LSl zuaU|H+5tN9b!<7>mMT#f;(J#e{{3r)8>jzF?UKCx_w6M2Wp~e&bv&~{;ha=c^Q3jW zFES>T=2g7RU987>o9~{*gB2m2M^)6G)@OR0vD>M&_Q%WE4ynm@cGvq;!pv^Sh^hT~ z8+*x0X0D3iwRhZ0qd6}8S*q#sKjP2V&~~1ScS6_af4KD~>U{mGd7N*~zxryL`!@9a zmeM70`xmZVT(`N#Zrio~wO{{j{92PTk2Cmw)2(gu`ulQM%$05Z@qr<lDNXe3C(-<8 ztqw<@)^ELVpym0eT`T9$oOR3cfq7KHl_rIN>GR_`vohy<&e7fUqAKXqp$AL<{QRRh z^^8tdWs&~l5B8TfFS?f*s^7))==*MivlAK~@T}xlDlmA}`H=5`+zE|2?Ncs4s5&e6 zROwCSimkO5-&y%SzkTm*Zt>Tb)1Rf6Z{N8q_w%7#Y3=Q~I`wzA-Oc;G*3M0%kdMd5 zcFKQ)auXwuz>il2t2Z3I`t`wH^IcZ<yFcFJJ$GJj&*jOhXY*fgp1Rd=&lfiFaC7^~ zZ&WzAw0{{popD<6toPTCo=X=ev%Gk|C#cHu;|!fGDSL0{Tvz<OzN{?ljmql9|5nxS zv3fS&{rKu!n=j$+tN*>KD6Rkf{OY||W#w06|7MoHUXyqC>RWw1gD+E_IM}am>X_;J zcf!94wK+k$FS4SoZWn(`R8?Gd+}PW5=4wTgOa3t&Mu&EM4L#u@nsv)f(<CLgbaO+? zi*l`>D^2djEDP2;yNByY+q$MU=TG%zMj;nE(i$urCMjNJ=ZwnJe0Hh7wDIQa`p(Im zr`TsLy<~8Q>AvTsh@CR*vhRKy8}8Y&vGL*yG0W}lOM-0!UMQz<y?CU!@J)Zkq#T(Y z&Vo-%UvJ4^@G{srL3_*VZ$XbHZ>>2Ur5pd{_mo>+zXeof+^b4Wc-K0t3tQG^Fhe^` z`}TuHn<n3KGY$N)?O^|Hy}1jHWt<NGkzJQi|0K9CX~B2iH*B6$56-K&-0flZz@W_h zso&h|l3t}T9H)JD9xT4<Z87=Cm0j}5J!X#{<mdC<l`D;QQq|?|?ou{UyRz-*saY~# zr?57zUX}L5|CXviK}ewMv1GegxrTkaw0HDRPR%K`*-)Y8*mpnXDD!jal=KtpCV6&D z`^J4XZ(n^@PKV^K&IO^*e`UQWb9s0F^Bl*;i?0R+PFbYnJteg@x`R1<&e06pzZ{-1 zCw?l`FWHz_b6#jg`P;qA3{BnnV|g0u7W~{eNseD9MZb%8o{6;tmte$)tWzEPP8_c6 ze5U^(A*sZ5>)Vu#500r^Y~g)iE~=37a%Sp1rx`JdPqciE>iN9{L^c{c+BmD-e_e%f zXW!;vO*XGhA1~Tlv~DqV+ic0bxjjr>vOVj=dAaB1o-WS~We;uD`tet)xjbRRi8L`+ zBWdG|2XWFr=Y8_@iu~|!t8xC1GZtQ()YG$GRes)m<?wV}oA)<YC~$msdYDo)zf6GL zF0<$%TWs_BB@QY(+3wfJ#}+Q)o3OX^BhO=3#`?&HSiSY7)4ocqxjXr5prJ#BXx_Q^ z-ah*lM7Q!iajfXz*z6{GXxi;(C5+9XJv)E(`AYS~u73P5$HDfEXx6@0Q&;?Y?UpY7 z@Q6<0KmOy-l2$2CyWrJxYKb(v>Ne8}SB%+h*34+;UB#AlA<*Oee)*68OzZ2MrMR?& zr#9u6B}x4(PP_4Fsmy2ZGLNkdVb04Jt<+QfGRM9(|M--?nx2^#KTn_7cESDvo8+6B z^H!O!5U-liI>9q|;swEyq%FQHm(=W3+$dSQGHKlk6TPWc%dH%i_I;kR_1&w&iBgYs zuS)fZ2^mVi?X8`A`XyJph^$}ou6~7U^(kK0!!jfvmFZ1e;<1C-#&y{Qr<pzJDPcTI z>z{ns*%G8<xm`MYZRqab+@)166Qs7;{WITR`mOx#v+Wf*rH9SBHawK=uko6e8_{i3 z{yyTXiMr}xjR#TzXIq}Ns-KzFwyno#MVwS_hWVPK5$E$%OmCj$t>fMAR4HWtO5&VG z7jyj%uAdEWpV*zB?RsqWt)DZ}SRW^D(fz&To1n>MyH}Ub@2j#~Hve{3YyGD~8>1ei zXRUbo{i*5SC7rXxR_<QbK6mc6SNmRlXRI~+c(H57+*7)5WOF0sx=Z@o7XCe8G5f;X zPpi*M?O19wb(-6Px57+aRs}a#if`Qe+3B}?I$!K%mZV4Z=T%N<zn-$}_mxlfyQL&V zzixWtwtZU&|5?x5ikoDevP(aQWxq5r<+`GzUAca7;>kFNCsHo?*92KTZ<?!h?{k~2 zV-lp%+4plDlVP~=uSv-VYqe|xW_$gamitQ0l5zcoyO||l_l1^T6<t>}_m5<$sb5R* z?w@aL=DwfMGF|gnLvDTXhxYddchz1duQ#7+X*ILs5W|GN-Q_xu>%})s5Vv^kzx4BA z-nNHv`q2xPpHcVw{rKpM-<wx=AN+7^_rC%=iOO*G>x&!93(chF^4`CEJ0T;T>q}+s z%w?XpuKDhNx9a12zIi3*C;eBs$}X7pf9In+8~Ey%iuj5zG}&|GTIe?y;k0`G%~`L4 z;&rbq(z<(oTJF_c8@1MebL)<+`kHs}!M1dhl<CWTBim2STmQ@Gqx5g1z;k|&wa#8; z^6Z!SDzfoa_p5*BpT8Eg&fIxbQM>xV1kTR7;N}nfYg6WWPkAoC|B~b9-jDyp`X{D# zbQrlw9rJ!UYrb^%*K1p@NS97n_G!_ck9X_kp8m6}o#C@!(p#--GagOOP%vis!~3Ss zXGOK%vy|%KH#46&TnsPvux6WiW7fOLN1rQi^XdKNf2=+?{{dsxUHLlm<!dS?tD718 z$*xRG7T9~~^?6nQ?iasIkLAB<s<qW$Yx<=3(pfXLsI^HKcGpNX{@JRhxv1gT8Kd7b z^{z~)YpG{n>A#_1nQHT8Q|{36Y6ZprvlnNzTKVRcZML^7EIRb1ZMylrmp`9oe0aC? zPNeZiZnl3>-vV~;PV$(4{M33OlPDYWP>Y9lU#^(!%?+;gSBuyh|F6_x`M=N!`6?@% zA2qJDTP-{@E5_U)O~YJf?fFM+o6O3~uLOucyXq6_yxXk0K3rMx?7b(;e;R4#+hqMV zF+3%5_iT*v0{hqvjK`{$TuEMH`!p(`QCsGNfaCfH{FiRCWV*=3#K*^#F9^@D<OyI* z`t>KRV9!0194BY36KgcL$tA|<da1=ZUz=^jbV?xdlfmI*1*iP|=T4V+Wp?V{hWvLd zr|)gZVp-|A#4O<7H?#VHsN4mbi>6<Fdg_+#q2iO7$#2&yE>Yp>@vzshzm<7qxut|# zt@oPLo=-`e!oKwJ`CjBMdG}Y@_~3)bCx5n2p518vtFof_lmE68r)@))_5_Kmb>=5# zoID(H_vNgR`(Au+g<@YP`O4<2vP&oSSmo>8kNx&ac-23@EMI@g`h=;kbegla-dVX$ zYN3g`<0OR+4exmkl1Z=PCDKbYn>KQ|TRB<PS=lbR{9*;)L&qDF=kkfyvqwc$eEgmN z{H1yH+D++p3*~ICSKW-ycqx6w>ds{SWj+T**O~T(D9@ZHGjm?vFO~h56ssDhncZu> z?eRsBHSV>+K0Eo!RAZyMTjG1t>Z7<7rQ-Rvi2R@a;HSZ#!it}lFZ{mxq0;K(suMqN z1#JI){@BUv?X%Xsj@^EacX_A?$F9ru>(;GX!#yc0u-2Kuby?ij*<0_;5eeI-+;H^H zz4zOHzy0+1)aL7YD|Z%on#XUyBGZ)Tw(794{pIkU%1t-ApEUPu`~TtF@-4SH)sBC6 zzPEGd9xM48nK}D!u$aEu6P)HGuzG*CPuCqkH=FXQMVhOx{C{-upKznsTveY`h0Uq| z4xDo~oqFV3`LkP3wf~>w{4W?PZX13x=Gnh3AMFvn{GBy^P6mryD(6WvFzBT+Fo-kA zOupbK#mULQy!V?-;NEYWxdr}-*DvptV5`^Lue8>sx>b8cjZVzctUGE;__VIQI~}H# zAiIjCWRZ`Q(BJo)Wz{#nzx3KH_mT=rxnfz|xynB(exDTf?YzC>@wbLuU(Dw7Zb}TF zA+qjDUC11j1l5+iOP5{tJ^R9_-u$<L)V$vG<v%~X`TOQ<g2}v?XZsZR4oyB)Hm%gO z{?CbtnhYm@8oUXb#`+^S`^mE}??iraR(ZYbWteuE$#+A)d$47f(jE()>&qRoKh~{C zFXk6(aAth(qiR}uhR3W)#cAu-_p`F*UR`Ye{N1YF>oS(sA2)V9D2utdg@3y2T!Fjy zqHi0^`rZ}$H>-Eo!RJ3-NpE;-pXFcwHooEBQH|yGlf88RpWSu&?1^yUY1(`*KRo-f zRXvn7;fieY;r$#vsRoy(>-^_rYUMWF)4pVp_q+Io-Dgw&zVk9vjQN!$T6M`iv+6;> zxAvdH3;yPJ7&KoLGVuB&|6{HA`5McP*t|bR`{QkN1Qhb)d|p3zu%I>LenWd(_sK}t zgcSxg_S>VLeXYORF@=riMcU;KpVjZp1DL)$Eax^YNIv#;>6r^hb<9MbOFvximMS%O zO4a?ZIgZAvby`p7asAc#VD9etuh3u)&#|2k7!Gp^GMF_f?bhjK->4(CXws+IMr%a& zy<lA|^zh}U+5IPt*(|J=@|u<(y(m_p{!ICl<@d(0BsRHMOEaCz>aYJi&S)|>cJZ9@ zz=gKkm}&wTH~nyX<in%w_EEvBbc)EW$63iIWfyq+@0r!@%^Y*SB`rXDqvVcBsS$-v z^%qmt-#(tEo2j6kWj6KR!JjMj*o9Uog#GY2^Le^gYvRU@SB@$Rg_eYg9K3deSIe=d z)Utg_L0(J5Y)1{zS^h4mYxU~q2+WPpJdi4&6VCp_?|jF1o~=`+rUZF=dQLmqvMEb3 zAz;()#xU2CE2~StZ0*xowRpd)`<C0k(t`K1UOZN(thOtE)v4@~MNV_G7VcefA#Ur1 z#E=&oqB6|2wnXceh>GsIrQ)*xPs$l@Hl2vqU&S^mJW%{lvv0v}`I|3on?5H^pILvY zTRE@d_pkqKzgef~Op@C#c|BfYK8Mx9>n}~6vQOzfh<f?`cTQ8#iwoN&#C$B>GSVk) z5!5;QLyArN>793-Cqwd=7t}<oKXE}bspaslgzHaM{nguYV9L{9eKEr2VGF1Ebji$_ z@WZU)MB}`kTN7ShGTZwujLF<`SM<{tQ|2?TG_$Chy2P)aRceuL#a`jnT%n8{uP#}7 zS9@ps?h&<*_<5<z_gR3^T$fo4e;?e4oOS#6)2?kSvG?EpVcEP*dloxWaMR=<<1kiV z2HC(<o7Wnz28%>lM?pn)T2E!=LmTdkaWr94`#$--qpUn;5h1|<0*nj{3|ksMO+M!+ z&$Rd3<oAx&EDyCA7$#4!mYn=nn|pGQlLL#0K3G6vvb;X)<jqbFjJlJ*I2kGiH~Bej zIwyUxpPhkWi4+5aJp;0lg~kk%v#o6>FED0hV`X6WWssfx!BGa}i#5(NjFpp5I(x$e oCmXxSF+Q0b<PyoKGkJ|m1mo1ntgdlPERK^?U2WNN9YO8{04}^FC;$Ke delta 5334 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 Xj9HTnT;rH-I!vD6YRl&22=WC0{vZ}I diff --git a/releases/plg_vmshipment_rules_shipping_v2.0.zip b/releases/plg_vmshipment_rules_shipping_v2.0.zip index 83ec336faa2c9b2e7db00a3b9698b3e5f975ca93..7fbc943505fb1599946e4525b4d3ebc9d25f92fb 100644 GIT binary patch delta 1099 zcmbPHG^c38T4vszHGWP8i(D$_Ni#6$P2R<<%(nNNOyJ&cn;$d(6R%(1E5TN;w_j<k zOLeREiW;4mrCE2>mhfp^dv`iaD?xS@OUWW1DWSjbH_NJTe1GY+S?(njmU6|ixO0_% zRQx_E?Av*J#p7=cyS|vs=iQVTK0{>PmAa5QDhaABcb6`^?0fcwQN8(Z1F3nv>C1n9 zc=Pwo*#wh$G0*lX@Ew|bs%%=RY5kuQ6Ezu5{xo<KG>!E~ZuXOBU*3uQ;;iy|*~>8P zGL!Fye)nL@E~PydI@gywWPhw%kzUL%*5J(e-bdB6^bC(#lZw;Ut?y@L&AqzV{`tFA zz1L+dtv_z;cu*E|a|{1;*|`FD??vA>mi4_W_HS12u7l5iyprDV);`O>{%w52y`vh- z>nD5Z{y)3x^4SyN!qc?*UVeD?W2<^7Yr+-T=EM6rdQuH8P1pI)$<)eix~F}~BJX$c z3%k#z{C($Ts2KArNwn&cduG*xfN$+Tg%|wI?=Wb-C}iOEN&d%L@$)s79kF?TjP}Rd z=m;p}$N9W|@L)k}#{Gu&w(gUWt_dp)YV5a1J^NaJwPOk!&x^Fn9X_kyn+Gs`cUaDC zT9AC~>(Vn9j_R0+JePjB-Yr#X?v$$gUvnIdRqM2#&g1&4^TFKR@n50A9G+u4A21x| z6l5@KQrfN4%f3-ZYSE-mvyIk>?0dnwSm@!)PqX_^8nangFXc5YKYCHDLj9TYDa-GT zVM%Oqua;&ym(^eYd7RN?ZtUVY<$()rw=vZOFmC$c_Q;1v+wG%*SLqayTaUAnPs%Rv z_TMwB+nYJ&d`nt@^hU`YlTsrJo$4>9tiOFcO*d0PJIie9y@Nkj>ah#0Pzd|sbLR7O zuhztk8?PKy778s16FGS82CtT5PpM`5l!CmLh}n)BqO<&6QrGI$&k>j#p?M%xKqs92 zhu`^*?>t+lOic;$_Vk=~v}IG4VnV>C-Hl<cC0ACLe%acmvug2vSNAQqf29TQXT5l= zPFZbN{;E^iC5xQqW-Z*i;zHck3yC2wHbiBZYi)_vEfE#nbxXx%|DTjI-fTJ%ufK|I zRCu8Hp=RHL-SRhI+BSVonm)7sQnzwm#qVGL*?zN5(U~N-U-Ejq#C#5`h1Xx2I%S{I zdl2>V`|q5lpcfamONjYcx@DwK+9IfP^oJCi_R~A>I!}h=FE6NxSbySzW>U-HT?yBp ztop0B<-nAuzxrZ?%fl8<^XZbAGvS9>#fipwJ+~&jykxfbT^N(O<*w+bFQ&|AUTJ1g zHFb$!KdaOt-HN@!tGPlMIbL0|^se^K_T3|DAMx{2m+!Lxqq#1#82&!E5jpGj@26ec zSYq$L{ll`kPkyT?THX#YHDm$h?a4i6(vugM$}vuwyx%mAanocuvv9_(lgrHfnSZJ= zOcvBPnf%AhmHCGrh;2K$(cFPCYVslTNXA8zWh^2XxhI!e#4%P)zG7j=_Sl4hfq?-4 Dr+E+D delta 1108 zcmbPJG^1$4T4vssY(J+1)8jm5Ni#6WPu|6>%ocG&CNSd0=Euzc#Os&#Dsa^M)g682 zP<+v)Q+}~H$JeNqD=gW+mi9X4YB8D~jaZTJuR1*~y*&M$+4OB&0tEJ2m#4+&J)4<c z{_UINp5pC+$KNuRo{#>MJHdDNp(O=Nzb$^G!YHlyW?in;-EETbPu{1=A3MDH^vz5= zn`--NV~Kb_y`p$Q^@pCR+NXEbOVuq&=W-}A<Y}Lh%2*dIwex3XIoD$r<)vTT7*1z4 z>fJcKc;%Nx9Qu5xzveF3T48r(^G<edhwuZ&!JfX%+|9iTodLCPcdxsZ@b$(1;_|b{ zlKbY&{So8BVZAQzR{QBjzm7clwQpPdmgRBRpG~{_ptR<z?2T{oTbJ+urtgq%a<2ZR z_tItc>33hIJz33pT2%h!hi5;ws)w>BTw!j07teCcNaCgQwErxPhZ?2qoPw?{{jmPR zQL#;h<x6J>=+$oIvVFNY{Z`?MABX>NUifG3GUH$d=Z8su*!R6YYAnx}G+lcCnfK!S z+$<+%i(j^}u*gulrCu;`$DBE#ENxuxe($_#vc7)3n~mpzh2`bF8e4wVF`ItiDA{#^ z>A7*9PHLl`*v6F>_c`lLv@XBcV)835g?rY^hs%RruDo!bss1wer~c-LDFrjR`3&X= zFeWH#Y&t#3z9aSGgsD^BPf1+*!OgwLt7ZA=d^`2?5)a-?F}rd{bg%9QKOOfe#qWgI z9^tXM;(fX8QGMQre&!6T-ENlhi=66nn1494YCN*;G&anUc-s78<>Dn5<gZJ4zhj84 zdUUNvkEg&^c$Z`Ck-P_9(-Mzr{&k(aH&1r<)+LQ=G79Qei5_OYbVh1kXV$+U(+BL* zt0QfcjE}x>(ah$(wm|4e#Pn_l&FOAFTUlFz7XEZGx%TRi<b}@qsZ0uN2aAdu9(?K9 zaX!F1(o=2glqo5ZJ{qgVm`<s*OIL)rxG#=!kAHn)k=3v05|{S1`DVS*0>0lS&v>zK z<tqJ`F0EEqovH&D?#)_wc*TXptrz@4GL}cZ(9$Z|>e*5E^XByFJm>ab<JL)HJ&=6w zXN_aKZPAqKmW-o@n|#gtR@Of(eEnbgoOr^<6GeaCMb|skX#Hr8n{j=@8p~Y=(wE-P zU&HB@=x{$tZo^qmN9)ohbK`S;RwR}M`8}IA!}jZ|*7vPng?MVsdJ1j`l*~%ne7{U= z#m1Nm6T2Ur)4C$%Ik7}o=ziM-iwm3mXDi3vT4#Re(*0#8%2q4Q=E_mHddOgsnZ=7u z2duZSu7AC8S%7fEM7`LOEyp)qI}-b`b*lf$8!3FMmpzwqUf}<A?$Vum`r%vHU;JA4 zPdLDvnPu`kQ;E&%<Y$Va<?j$vLl#i}o;<-!dh!xeIp#ijhRN&YWhOr~bzokn#4!21 zlIUbhGY7_vldH`98NW_GWme7fMQ`$HGt<d6=AMjUlaHB4GR~W<U=hK{KDp8&j<Ia= O4GTNA`z8zw3=9Cr2@pO2 diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php index 92b92bc..70210c3 100644 --- a/rules_shipping_advanced.php +++ b/rules_shipping_advanced.php @@ -71,8 +71,8 @@ class ShippingRule_Advanced extends ShippingRule { "+" => 50, "-" => 50, "<" => 40, "<=" => 40, ">" => 40, ">=" => 40, "=>" => 40, "=<" => 40, "==" => 40, "!=" => 40, "<>" => 40, - "&" => 21, - " OR " => 20, + "&&" => 21, " AND " => 21, "AND" => 21, + " OR " => 20, "OR" => 20, "=" => 10, "(" => 0, ")" =>0 ); @@ -86,7 +86,7 @@ class ShippingRule_Advanced extends ShippingRule { $str_re = '/("(?:\\"|[^"])*"|\'(?:\\\'|[^\'])*\')/'; $strings = preg_split($str_re, $expression, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); // Then split all other parts of the expression at the operators - $op_re = ':\s*( OR |<=|=>|>=|=>|<>|!=|==|<|=|>|\+|-|\*|/|%|\(|\)|\^)\s*:'; + $op_re = ':\s*( OR |&&| AND |<=|=>|>=|=>|<>|!=|==|<|=|>|\+|-|\*|/|%|\(|\)|\^)\s*:'; $atoms = array(); foreach ($strings as $s) { if (preg_match($str_re, $s)) { @@ -155,7 +155,7 @@ class ShippingRule_Advanced extends ShippingRule { $atoms = $this->tokenize_expression ($rulepart); // Any of these indicate a comparison and thus a condition: - $comparison_ops = array('<', '<=', '=<', '<>', '!=', '==', '>', '>=', '=>'); + $comparison_ops = array('<', '<=', '=<', '<>', '!=', '==', '>', '>=', '=>', ' OR ', 'OR', 'AND', ' AND ', '&&'); $is_comparison = false; $is_assignment = false; diff --git a/rules_shipping_base.php b/rules_shipping_base.php index c42290d..ca96df5 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -633,6 +633,7 @@ class ShippingRule { switch ($op) { case 'OR': case ' OR ': foreach ($args as $a) { $res = ($res || $a); }; break; + case '&&': case 'AND': case ' AND ': $res = true; foreach ($args as $a) { $res = ($res && $a); }; break; case 'in': $needle = array_shift($args); $res = in_array($needle, $args); break; -- GitLab