From fad8a2539c35d3ab38088da8a5a81a526a59ddc4 Mon Sep 17 00:00:00 2001
From: Ivan Chaplygin <chaplygin@retailcrm.ru>
Date: Fri, 17 May 2024 14:23:40 +0300
Subject: [PATCH] ref #72069 Changing the coupon output Edit text translations
 Creating separate methods with checks Fix check corporate person

---
 resources/pot/retailcrm-es_ES.pot             |   4 ++--
 resources/pot/retailcrm-ru_RU.pot             |   4 ++--
 src/include/class-wc-retailcrm-loyalty.php    |  18 ++++--------------
 src/include/class-wc-retailcrm-orders.php     |   6 ++++--
 src/include/functions.php                     |  10 ++++++++++
 .../class-wc-retailcrm-loyalty-validator.php  |   2 +-
 src/languages/retailcrm-es_ES.l10n.php        |   2 +-
 src/languages/retailcrm-es_ES.mo              | Bin 18277 -> 18284 bytes
 src/languages/retailcrm-ru_RU.l10n.php        |   2 +-
 src/languages/retailcrm-ru_RU.mo              | Bin 22511 -> 22526 bytes
 tests/datasets/data-loyalty-retailcrm.php     |   8 ++++----
 11 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot
index 2dc4ce0..356d5f0 100644
--- a/resources/pot/retailcrm-es_ES.pot
+++ b/resources/pot/retailcrm-es_ES.pot
@@ -586,5 +586,5 @@ msgstr "Es posible debitar"
 msgid "bonuses"
 msgstr "bonos"
 
-msgid "Your coupon:"
-msgstr "Tu cupón:"
+msgid "Use coupon:"
+msgstr "Utiliza el cupón:"
diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot
index 40d8bd7..193c76e 100644
--- a/resources/pot/retailcrm-ru_RU.pot
+++ b/resources/pot/retailcrm-ru_RU.pot
@@ -595,5 +595,5 @@ msgstr "Возможно списать"
 msgid "bonuses"
 msgstr "бонусов"
 
-msgid "Your coupon:"
-msgstr "Ваш купон:"
+msgid "Use coupon:"
+msgstr "Используйте купон:"
diff --git a/src/include/class-wc-retailcrm-loyalty.php b/src/include/class-wc-retailcrm-loyalty.php
index b3dfce5..92aeda4 100644
--- a/src/include/class-wc-retailcrm-loyalty.php
+++ b/src/include/class-wc-retailcrm-loyalty.php
@@ -37,7 +37,7 @@ if (!class_exists('WC_Retailcrm_Loyalty')) :
             $this->loyaltyForm = new WC_Retailcrm_Loyalty_Form();
             $this->validator = new WC_Retailcrm_Loyalty_Validator(
                 $this->apiClient,
-                    $this->settings['corporate_enabled'] ?? WC_Retailcrm_Base::NO
+                isCorporateUserActivate($this->settings)
             );
         }
 
@@ -272,9 +272,8 @@ if (!class_exists('WC_Retailcrm_Loyalty')) :
                 return $resultString;
             }
 
-            $resultString .= '<div style="background: #05ff13;">' . __('It is possible to write off', 'retailcrm') . ' ' . $lpDiscountSum . ' ' . __('bonuses', 'retailcrm') . '</div>';
-
-            return $resultString . '<div style="background: #05ff13;">' . __('Your coupon:', 'retailcrm') . ' ' . $coupon->get_code() . '</div>';
+            $resultString .= ' <div style="text-align: left; line-height: 2"><b>' . __('It is possible to write off', 'retailcrm') . ' ' . $lpDiscountSum . ' ' . __('bonuses', 'retailcrm') . '</b></div>';
+            return $resultString. '<div style="text-align: left;"><b>' . __('Use coupon:', 'retailcrm') . ' <u><i>' . $coupon->get_code() . '</i></u></i></b></div>';
         }
 
         public function clearLoyaltyCoupon()
@@ -349,16 +348,7 @@ if (!class_exists('WC_Retailcrm_Loyalty')) :
 
         public function isValidOrder($wcUser, $wcOrder)
         {
-            return !(!$wcUser
-                || (
-                    isset($this->settings['corporate_enabled'])
-                    && $this->settings['corporate_enabled'] === WC_Retailcrm_Base::YES
-                    && (
-                        !empty($wcUser->get_billing_company())
-                        || !empty($wcOrder->get_billing_company())
-                    )
-                ))
-            ;
+            return !(!$wcUser || (isCorporateUserActivate($this->settings) && isCorporateOrder($wcUser, $wcOrder)));
         }
 
         public function applyLoyaltyDiscount($wcOrder, $discountLp, $createdOrder)
diff --git a/src/include/class-wc-retailcrm-orders.php b/src/include/class-wc-retailcrm-orders.php
index d1b6ea7..6bfe6ec 100644
--- a/src/include/class-wc-retailcrm-orders.php
+++ b/src/include/class-wc-retailcrm-orders.php
@@ -100,8 +100,10 @@ if (!class_exists('WC_Retailcrm_Orders')) :
                     $discountLp = $this->loyalty->deleteLoyaltyCouponInOrder($wcOrder);
                     $wcUser = $wcOrder->get_user();
 
-                    if (!$this->loyalty->isValidOrder($wcUser, $wcOrder) && $discountLp > 0) {
-                        writeBaseLogs('The user does not meet the requirements for working with the loyalty program. Order Id: ' . $orderId);
+                    if (!$this->loyalty->isValidOrder($wcUser, $wcOrder)) {
+                        if ($discountLp > 0) {
+                            writeBaseLogs('The user does not meet the requirements for working with the loyalty program. Order Id: ' . $orderId);
+                        }
 
                         $discountLp = 0;
                     } else {
diff --git a/src/include/functions.php b/src/include/functions.php
index 87f1fa8..b1afd25 100644
--- a/src/include/functions.php
+++ b/src/include/functions.php
@@ -207,3 +207,13 @@ function isLoyaltyActivate($settings)
 {
     return isset($settings['loyalty']) && $settings['loyalty'] === WC_Retailcrm_Base::YES;
 }
+
+function isCorporateUserActivate($settings)
+{
+    return isset($settings['corporate_enabled']) && $settings['corporate_enabled'] === WC_Retailcrm_Base::YES;
+}
+
+function isCorporateOrder($wcUser, $wcOrder)
+{
+    return !empty($wcUser->get_billing_company()) || !empty($wcOrder->get_billing_company());
+}
diff --git a/src/include/validators/loyalty-validator/class-wc-retailcrm-loyalty-validator.php b/src/include/validators/loyalty-validator/class-wc-retailcrm-loyalty-validator.php
index 17a8731..2e08d09 100644
--- a/src/include/validators/loyalty-validator/class-wc-retailcrm-loyalty-validator.php
+++ b/src/include/validators/loyalty-validator/class-wc-retailcrm-loyalty-validator.php
@@ -59,7 +59,7 @@ if (!class_exists('WC_Retailcrm_Loyalty_Validator')) :
 
             $customer = new WC_Customer($userId);
 
-            if ($this->isActiveCorp === WC_Retailcrm_Base::YES && !empty($customer->get_billing_company())) {
+            if ($this->isActiveCorp && !empty($customer->get_billing_company())) {
                 throw new ValidatorException($this->isCorporateUser, 400);
             }
 
diff --git a/src/languages/retailcrm-es_ES.l10n.php b/src/languages/retailcrm-es_ES.l10n.php
index ad61403..7a6b3e6 100644
--- a/src/languages/retailcrm-es_ES.l10n.php
+++ b/src/languages/retailcrm-es_ES.l10n.php
@@ -246,7 +246,7 @@ return [
         "This user is a corporate person" => "Este usuario es una persona jurídica",
         "It is possible to write off" => "Es posible debitar",
         "bonuses" => "bonificaciones",
-        "Your coupon:" => "Tu cupón:",
+        "Use coupon:" => "Utiliza el cupón:",
     ],
     "language" => "es",
     "x-generator" => "GlotPress/2.4.0-alpha",
diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo
index 3da7bc5c9abe5b7abc6dfa39098e3517beb72e6e..43567c3b681012b3e10728bf0f292248c0508df0 100644
GIT binary patch
delta 1925
zcmXZce`r;87{~GF-2J+_yL;P@yY0H)>YP(^)pDkrTkhIcQY|;PbQE;EEYPi{qNGCI
z3ZWJ>Hm{I>XurcXo72u8hC(u;e+&yTvoK4dsAyvd20;+LKb|ufujl#RbI*C6=lebP
zw^3(y)H(G?Rw~!b+*-48Jda`g5zFu|T!lGH&5E%JllUlZ#?u(Zj5@Qk7(?CfTMXe1
z%)>c<{a?%>&sk;`!N@X8Sr$PR3wK~G7GMLe#C8ngFzP}3Pz8>nzIO~W@dK>E3EbnD
zT|gDww%jYE5APyRq6!*E-RGU<DX)@~EEKWuIqF82u@wKt1sGmI_ZUNc{<!aMY$rdA
z>g=lT&$xvAchn?8bfb=ASb_DZ=XItCo*{S=)!}*6=&xWl-b790A3x8fjl0PUunOa-
z>yoIBcAz@nk0m(fuTP-ve+JdSMb!6G^8`VH2pi3ITPfa&t*An}P@N27A&#L6`q0nM
z`1w~@&-zcO?*|*aEsS9wc?WL7W7va#AeW}Bg?4taFo^fyb=1fsBpUfb?842cir+(a
z#b&S@XHgxs-OItm1h(NcZozqM!HtdH7QBKX@^K9Fe0!UqgM}&7h;CsXF1XJdX(?)?
zbr{1|?8dFA0#D$p_zS9lfz@8YF6s<ra8U%ykzw0Pq<QPdIM25?2-e`&n2*^cgjS08
zV;8F9*YPoQu>b>nsDh%n7#mPq(1W~b_9CjGkFXQZp{~zZYeubBfvG}*ZUWAiJ&Rj0
zjXKS<Sc$iAAr`LlZoCSc$@{P$4`DIRq4qwL5A`}nky@<^WB3HBkzLq|N1K`dQv}!i
zg|%#yZm<vanvCE89!C|Lx8Cds)}T)PS=7X4Pz7H`U3bl2pGQr~;b|(U2urXME3v7S
z`R5Y!vY@vhft)AXfkk)}EAX`MH>eTM`FRN^?J)UjT#6TPBi_VC*z|z6z72IqUq*&x
z?_)1sPZ2yw(73^?d_U?nd=p<o7azjrc5nS42FNE-hja?d@f`A7W8b6Rp3J!S3mL&0
z@+dCCHK+#qQIkp?B;Z`w5!9$I;bQz1%P>egdcYE77i<IShA&|P-^Csb(1i|LAAW~J
zs4a@~YK3tVYKyj^3QS;@j?WN*4$p4P#u48!R6%c{4(B9li>_iF-atJt*y(LmC2Efw
zkslUYpN@rA<WCVj$G>)6f5+3kp+V<VdL~rjOuIjXrXA<w^hmhb`7HfqxS?jkyXy97
zJwQCk|G2+)n{+hN=$uGD9C;z{6MuaRo^&rp{)`5zlf!#=4nM!n{j|0?;9jZwuPlGh
d_Mz<u64e7k)ycg(zi|2NQvB(F+tN|*{13X=<*NVy

delta 1922
zcmXZce@s<%7{~GF5LZ#|FZprtf*@c5UNtZc3{cREV$Dhcf8lfswElpCEY{?Y?qYL|
z+9<rX)gM~REJ*|A<quYF6|Jq!elRl^o6}lz(=8cu)7EOM_os8%*z0+|_uO-y=lOom
z{bR_vIpmCQ_a&B?S!%gi5T~&KZ{S1tH%2g4X4Z+Da3`L@T>KM1!$7&2AHT&+{MpNY
z!vOiLxBd^#C(o!b3t_mz66PZ)W?=!AVHQ^5DvV<W_M#qm6jkV(sPCP^bo>xYa0Fj+
z%r2n{Z;ZKx?ZMULhfoC_N8RWBSi-GjjD;K)zChjR3NFU`xDZ1t&8jgU_4!WE7jZNB
z+o;Zd@%$AZB)^54On`3GaXuDe4E4Ni34#uS1E>zaL~X%UoQHQ&6Zy-_{j^a<o{dYf
z33c5eR7YK?&igSBhrRU?)cq$>4g7%meqxRwgCNX?v)vZOFgBnH*@5b$8?$j3RnQqP
zpY-zYa0Tl(P~Trr>26^@?j~=>$MF=l;%(&8gl(Xm7g*@VHFzC0@-T@;UVu+w3##G|
zkX^AUY{5IIjv5~}djdPK0mrco=dd2PtaZ0w0R800G05}nJ%X()jG{(#4+EIF&K+qK
zHPQ-<Vgt6|K2(9{aR7fu74Xa>Zow0%GnCFnAuL3OZL5*yZ9m3&zP&+EgFoUToKHe%
zQCyEZP#q8AlQ@A{_y8ZOpa?F*D%2LVA#a+!f@<g^Y{rYI>(d`KqgE@zL^eSy0q4t}
z#l3g}b(-&B5#Gam%&B#6T#0q$d$1jo7{OW8-uw7auX6;c)rv8Sdr^%X!Hsybj`<%T
zxaKX?vQfIhQPgYlIv&Qes6vAq%-+FL)T#d*HL)pF!B<e%UGvuGP?JjIX(}ie^KdB^
zVa-P7pGmNr1-%6w$a%6Z%)ygbh!;GkQ6rx9^2MCA6XexchL^Aj?_w#|G`j2Us6+ZH
zG9){VyYPB~U<<*zO>X7=sMl}^U&9I9hV}f)X#E(b;W^YH9mOSh5&5mL8Pwb3i@U#&
zVJsn!U@5LgHLxEwsl+h?&V{{;%kVN5;C<AMvuKCuTP5m7-S{*PVJps|4p|djT*Y=&
z0c&`rv_<t8#5ih;T2P<2qff`@Fo6zF7tX^0&q37Qy@fiQr%_upjpaClda%>%ZdD#?
zk5?f-ELNS2`d2PGPxKuB+V%hclDqs}&RFs*f1Wd%n(>c0&e`N(u+AAzeiN)L`PjQk
zr?sE|5&nn0H8GjY4Xt%PNj?^OIdINfZ^KVh--mAJrlyu>rTO>u^c^Yg?CI<6dA>IF
cQ~AFIshjbGX$#x>iaYyyzfQ5Zd27u152m!|Z2$lO

diff --git a/src/languages/retailcrm-ru_RU.l10n.php b/src/languages/retailcrm-ru_RU.l10n.php
index 9312170..514c7e5 100644
--- a/src/languages/retailcrm-ru_RU.l10n.php
+++ b/src/languages/retailcrm-ru_RU.l10n.php
@@ -245,7 +245,7 @@ return [
         "This user is a corporate person" => "Этот пользователь является корпоративным лицом",
         "It is possible to write off" => "Возможно списать",
         "bonuses" => "бонусов",
-        "Your coupon:" => "Ваш купон:",
+        "Use coupon:" => "Используйте купон:",
     ],
     "language" => "ru",
     "x-generator" => "GlotPress/2.4.0-alpha",
diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo
index 059386dbfffc5e4960bfef46bb57ee6a876817de..acd4ebf3f2a5c736dbb6e56f49e33059308c5c47 100644
GIT binary patch
delta 1960
zcmX}sdu&rx9KiA41t$aAZVbE5!O{X@D|_LDiH?UG6URf44Jpc077;<GY-B@uUj_uU
zV?HPZ&}d><GC*Y5%c6sfg+G9VgxLNwz+lEBf(syVk*F~ezduf6b9+DMoO^rj@BDt}
z_FlX7pxrw5W|BQrL>6R=jKn4A!3{V9o3RkvFdchvDc;3OtjrPd;sHE?ov8CQ21Q)B
z8Qs`|I{pO?!Zu97_Mq63M5CL5!FUGK@JGzY>zIrw<IICHPy;MP{oPc21j}(0&csGb
z<Q>eQ-<xX!`3qm7pOj|;Sd6-$H}Y(eR2pj;&<VoGZ{-MT26__X{WypIV?<SjHCT!c
zPQX7<GZQQ@^X*LdB^EJ$6o=ted>s3cwTa6nzX2M>*nlA%gXfV$e&eJ8W{npajfLpJ
zO02*doQ4N+2;M>#EBzS2tS3w+r=g#IE$RZB@maJxXiTMXA9dmhgj<5sF%>tW2J|s%
zKvC38T|=E{;FD%W1*i|Gzy-J*19%dr;}r~}pLEsYVcf#=C4HhuH3R$cE4+{8xVzW{
za0xl2kJEeTe@cW{r3G~br*I=aKwbHUNg{RFhOeUUX_5D_5p@sT#!M`IhHE@us%dCV
z8c=K8f?0SO+0gPQ`p{2Wv}TjA5^GR16U80agZhBiCyU%b2S3EUQ$*HafHdoT`%&jV
zjSG3c^wOA##T4>o+=Q>-Mbs1*u}r;Qjau_o<d8d@8Zp1rr2cEv2b@Mtc^?vk<d+#&
zpq8!`-@>zKvk|3$yWhrY)D@jUO>rM;tuo8aYqTBn=tod9(T%z%enk!3_nb*}Jr1XT
z3rFBTsC&ydLxe-JIcWyook9ND7ZPSbYt@D8F!OnlRk#Or6Aoh88hHlp!jeS)0{%q*
z9;V@W(nJ;HXViYiEE7N;j-g+Heyqj8*gVTNk?u*{a0oTh3kk2Frv5hS$|ue?C8<dm
zM)sW?$I*Hp#?doJgtE(3)Kq7^z;AII@>e09s2RR#(^yHvH<xH|J2qk3Jd>i`xR`zv
zFQWTJUM>6ub8+r`kpZ{{y|^AVkk3#9KaRS2|3%G+mz}GD1W^OAU!$RshLJMLIn<gB
ztumW12X(?G)cabo2(Mud4(DYjW|@qI_z`NLKj3=&lvhFnb1f8^Z!s4Rq2CaCxTkE{
zWE#?pdSM@W@Bog*C_ajp682&m{hO#O_#5^9>_w*b#W;?BJ?i-9n2d*zYDg4`<KbtU
zL_)66Fo(|C#L!`kM!H;Et#2Y_?gs0K)8YQW^0qUq%h9F(|A~~PjJLjvtV;RB`Zi*v
zE^;5`Qa#^JzQ>$pslR)Z154{x*VnBqajLS@2RN&Pp4?IU;!Uyc*s0jb_|Dk(@vX7W
Z_?B2lAa;VL4tJF}O;z!M&azP0`VS^|8R!52

delta 1952
zcmXxke{54#6u|NG5O8R_ZX>0w(@`L9-NrUSm^c)eFx?c971=}<O&tmZSU0w*Aov1k
zhIWo*g=q%i4+#lBoSQyobOA>A1AmZ^?yo5chGC-EV2~^lO$_=y-e=Rk&%O7(-goXf
z_q{v)*3EuvVBIA9ei2!fFOrGPn2R=+;z68--(e$;VJ%h_i1_hC9Kt^I;D(6Ez1WW0
z--TZ6a>ozh-Sm&44+kP*%Oo1-7?^?=Fb7jO8-KzK%qlcD450>EhWfunI1!iO46MO6
zOJoxU>0d1}f&7Kf)1O>y0$7W>u*PDW$!Tn7Kqp8b|CK(}OpLnY<M<4HKT$<7hD-1i
zK8$~$W~i{l%=dxoVVuKwKW5_?hHxBNn|N*V9Hvo@tyqt<@FMb+n;bO2yfTrQScaJx
z#iuZai|{z!gV&M8$~cBG?;(@P#W<b*X4D0C;$pPFpz%13+o%)IBissHidpzJYC!u?
z19DI^bq#f*iF3`0N>Oi6jjM12hVe8$fmiT-43n-+coKJWe+kSJS<65#9>&|a6c5Zd
z0sMe`CCy<AhRa2WRk~1DFpN9#AJmoad_*LU$FKo|3q)SWcGNv^1MkDiM@0hMUm9p=
zP1;av+=UO|Wn^Q^pBTU}Y0;W3z*>x<X2!t|97Vms%M01KcnbI8M~{iTi8DyE&ew}N
z|9M=^{pBi+YAmOaFQAQU@O#u0&t;i<z5%u7N0G1m#-R;MmYCFkjCzCfs3}h)F-S?J
zaU*K!j^b<hHQH=MDdp;o*nqmC3#chhqt+^ydU&t{i*Y|j@Eq!%_!Twq;4+iy7Mx1|
zI_BcvsCz3|#k&IwIA{j8RFQx7g(MizTAju1nERwi3-+LH!VH$Jk%zDw7rOmRc$xn1
zn1dHd6IGBOQTw496ToboMZX%S<7S+Koi(<Jw8y>R1Zt$0T(2N=$qm$%&wtvKB<7kx
z_MHskOuY_A(8ori>@tR$>b&JVS@<sUs*oYn4F6)&Xrd8(mMmZg?!u`nOo|TRi}W2F
z#mwhK*5l7ugez8xOu%jE#~rAFbfX47h`M?2pk`zmJ68iKL=D7#iH1g+K*}iJpw`S2
zHJdPkdVV*~!C@@GTS%-D;$bhv^{4^%;9J<lqo4t$aiv9LwF#iM&b+ABp+}$pxM|1^
z_r!ac$@Tm3K|F$!@mtpv=FlHST|pZ4`ar#@eLfb_kD-nyFavv$YRD1Pc=Yp*B<nnN
z*`L$g_TPXxe3m@p*<+nZR(e~llg^;`4a@&2XLMPbg8x5GveH*(4J2E9`>aorR#v^Y
zk5kS3zT(&Kyqa~(@4S+qGr_Ya-o7>57;kTmH&r;T5noaAS~TFCj(&Mpc6VxEWN$b%
TG_of(oI0C2Q{il_>$Ls_rEd}H

diff --git a/tests/datasets/data-loyalty-retailcrm.php b/tests/datasets/data-loyalty-retailcrm.php
index 082ccb3..6793410 100644
--- a/tests/datasets/data-loyalty-retailcrm.php
+++ b/tests/datasets/data-loyalty-retailcrm.php
@@ -78,25 +78,25 @@ class DataLoyaltyRetailCrm
                 'responseApiMethod' => [],
                 'wcUserType' => 'individual',
                 'throwMessage' => 'User not found in the system',
-                'isCorpActive' => 'no'
+                'isCorpActive' => false
             ],
             [
                 'responseApiMethod' => ['customer' => ['id' => 1]],
                 'wcUserType' => 'corp',
                 'throwMessage' => 'This user is a corporate person',
-                'isCorpActive' => 'yes',
+                'isCorpActive' => true
             ],
             [
                 'responseApiMethod' => ['customer' => ['id' => 1]],
                 'wcUserType' => 'corp',
                 'throwMessage' => null,
-                'isCorpActive' => 'no',
+                'isCorpActive' => false
             ],
             [
                 'responseApiMethod' => ['customer' => ['id' => 1]],
                 'wcUserType' => 'individual',
                 'throwMessage' => null,
-                'isCorpActive' => 'yes',
+                'isCorpActive' => true
             ],
         ];
     }