From 6220dd99dd5ab15a5032a9e1ef6e48bc833cb4d3 Mon Sep 17 00:00:00 2001 From: Kocmonavtik <61938582+Kocmonavtik@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:48:51 +0300 Subject: [PATCH] ref #73401 Functionality of activation of data exchange by loyalty program (#325) --- resources/pot/retailcrm-es_ES.pot | 24 ++++++++++++ resources/pot/retailcrm-ru_RU.pot | 24 ++++++++++++ src/assets/js/retailcrm-loyalty.js | 36 ++++++++++++++++++ .../class-wc-retailcrm-abstracts-settings.php | 36 ++++++++++++++++++ src/include/class-wc-retailcrm-base.php | 18 +++++++++ src/languages/retailcrm-es_ES.mo | Bin 13576 -> 14427 bytes src/languages/retailcrm-ru_RU.mo | Bin 16757 -> 17803 bytes tests/loyalty/test-wc-retailcrm-client-v5.php | 4 -- 8 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 src/assets/js/retailcrm-loyalty.js diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot index 970ebdc..ee3d17e 100644 --- a/resources/pot/retailcrm-es_ES.pot +++ b/resources/pot/retailcrm-es_ES.pot @@ -450,3 +450,27 @@ msgstr "Descarga de servicios" msgid "Goods with the 'virtual' option enabled will be uploaded to Simla as services" msgstr "Los bienes con la opción 'virtual' activada se cargarán en Simla como servicios" + +msgid "Loyalty program" +msgstr "Programa de fidelización" + +msgid "Activate program loyalty" +msgstr "Activar el programa de fidelización" + +msgid "Enable this setting for activate program loyalty on site" +msgstr "Active esta opción para activar el programa de fidelización en el sitio web" + +msgid "Terms of loyalty program" +msgstr "Condiciones del programa de fidelidad" + +msgid "Insert the terms and conditions of the loyalty program" +msgstr "Inserte las condiciones de participación en el programa de fidelidad" + +msgid "Conditions of personal data processing" +msgstr "Condiciones del tratamiento de datos personales" + +msgid "Insert the terms and conditions for processing personal data" +msgstr "Inserte las condiciones para el tratamiento de datos personales" + +msgid "To activate the loyalty program it is necessary to activate the 'enable use of coupons option'" +msgstr "Para activar el programa de fidelización es necesario activar la opción 'habilitar uso de cupones'." diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot index b353e9a..67e62fb 100644 --- a/resources/pot/retailcrm-ru_RU.pot +++ b/resources/pot/retailcrm-ru_RU.pot @@ -459,3 +459,27 @@ msgstr "Выгрузка услуг" msgid "Goods with the 'virtual' option enabled will be uploaded to Simla as services" msgstr "Товары с включенной опцией 'виртуальные' будут выгружаться в CRM как услуги" + +msgid "Loyalty program" +msgstr "Программа лояльности" + +msgid "Activate program loyalty" +msgstr "Активировать программу лояльности" + +msgid "Enable this setting for activate program loyalty on site" +msgstr "Активируйте эту настройку для активации программы лояльности на сайте" + +msgid "Terms of loyalty program" +msgstr "Условия программы лояльности" + +msgid "Insert the terms and conditions of the loyalty program" +msgstr "Вставьте условия участия в программе лояльности" + +msgid "Conditions of personal data processing" +msgstr "Условия обработки персональных данных" + +msgid "Insert the terms and conditions for processing personal data" +msgstr "Вставьте условия обработки персональных данных" + +msgid "To activate the loyalty program it is necessary to activate the 'enable use of coupons option'" +msgstr "Для активации программы лояльности необходимо активировать опцию 'включить использование купонов'" diff --git a/src/assets/js/retailcrm-loyalty.js b/src/assets/js/retailcrm-loyalty.js new file mode 100644 index 0000000..c043d51 --- /dev/null +++ b/src/assets/js/retailcrm-loyalty.js @@ -0,0 +1,36 @@ +jQuery(function() { + if (jQuery('#woocommerce_integration-retailcrm_loyalty').is(':checked')) { + checkActiveCoupon(); + } + + jQuery('#woocommerce_integration-retailcrm_loyalty').change(function () { + if (this.checked) { + checkActiveCoupon(); + } + }) + + function checkActiveCoupon() + { + jQuery.ajax({ + url: AdminUrl.url + '/admin-ajax.php?action=get_status_coupon', + method: 'POST', + timeout: 0, + data: {ajax: 1}, + dataType: 'json' + }) + .done(function (response) { + if (response.coupon_status !== 'yes') { + var checkElement = jQuery('#woocommerce_integration-retailcrm_loyalty'); + checkElement.parent().css('color', 'red'); + checkElement.css('border-color', 'red'); + checkElement.prop('checked', false); + + if (!jQuery('#coupon_warning').length) { + checkElement.parent().parent().append( + "

" + response.translate.coupon_warning + "

" + ); + } + } + }) + } +}); diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php index ba8bbef..9adf83b 100644 --- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php +++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php @@ -117,6 +117,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration $this->form_fields['online_assistant'] = [ 'title' => __('Online assistant', 'retailcrm'), + 'css' => 'width:400px; height:215px; resize: horizontal;', 'type' => 'textarea', 'id' => 'online_assistant', 'placeholder' => __('Insert the Online consultant code here', 'retailcrm') @@ -593,6 +594,41 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration 'description' => __('WhatsApp chat will be opened with this contact', 'retailcrm') ]; + /** + * Loyalty Program + */ + + $this->form_fields[] = [ + 'title' => __('Loyalty program', 'retailcrm'), + 'type' => 'heading', + 'description' => '', + 'id' => 'loyalty_options' + ]; + + $this->form_fields['loyalty'] = [ + 'label' => __('Activate program loyalty', 'retailcrm'), + 'title' => __('Loyalty program', 'retailcrm'), + 'class' => 'checkbox', + 'type' => 'checkbox', + 'description' => __('Enable this setting for activate program loyalty on site', 'retailcrm') + ]; + + $this->form_fields['loyalty_terms'] = [ + 'title' => __('Terms of loyalty program', 'retailcrm'), + 'css' => 'width:400px; height:215px; resize: horizontal;', + 'type' => 'textarea', + 'id' => 'loyalty_terms', + 'placeholder' => __('Insert the terms and conditions of the loyalty program', 'retailcrm') + ]; + + $this->form_fields['loyalty_personal'] = [ + 'title' => __('Conditions of personal data processing', 'retailcrm'), + 'css' => 'width:400px; height:215px; resize: horizontal;', + 'type' => 'textarea', + 'id' => 'loyalty_personal', + 'placeholder' => __('Insert the terms and conditions for processing personal data', 'retailcrm') + ]; + /** * Generate icml file */ diff --git a/src/include/class-wc-retailcrm-base.php b/src/include/class-wc-retailcrm-base.php index 707d1c2..6144498 100644 --- a/src/include/class-wc-retailcrm-base.php +++ b/src/include/class-wc-retailcrm-base.php @@ -86,6 +86,7 @@ if (!class_exists('WC_Retailcrm_Base')) { add_action('wp_ajax_generate_icml', [$this, 'generate_icml']); add_action('wp_ajax_upload_selected_orders', [$this, 'upload_selected_orders']); add_action('wp_ajax_clear_cron_tasks', [$this, 'clear_cron_tasks']); + add_action('wp_ajax_get_status_coupon', [$this, 'get_status_coupon']); add_action('admin_print_footer_scripts', [$this, 'ajax_generate_icml'], 99); add_action('woocommerce_update_customer', [$this, 'update_customer'], 10, 1); add_action('user_register', [$this, 'create_customer'], 10, 2); @@ -607,6 +608,22 @@ if (!class_exists('WC_Retailcrm_Base')) { $this->include_js_scripts_for_admin(); } + public function get_status_coupon() + { + echo json_encode( + [ + 'coupon_status' => get_option('woocommerce_enable_coupons'), + 'translate' => [ + 'coupon_warning' => __( + "To activate the loyalty program it is necessary to activate the 'enable use of coupons option'", + 'retailcrm' + ) + ] + ]); + + wp_die(); + } + /** * In this method we include CSS file * @@ -645,6 +662,7 @@ if (!class_exists('WC_Retailcrm_Base')) { 'retailcrm-cron-info', 'retailcrm-meta-fields', 'retailcrm-module-settings', + 'retailcrm-loyalty', ]; $wpAdminUrl = ['url' => get_admin_url()]; diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo index 3b176fa7e3896dce16b8ba6d7e623916cdaae174..ff37eac100f20d93e40fcd6fdadfd5181d931c42 100644 GIT binary patch delta 4275 zcma*neQ;FO8OQOHO~Pw#TiIp^-#bS9PgV{t)`p&TS85q~H!=5_qeaDFI#MaB%pcW^qM#SvIG${4EV z5*&$DI0kEREH1|hxIVbQ6~}YE6EDF-c(pMZ^E{O>e|#7`P%_$>DO^{gI=T^8;969} zy;zFJu@GMg{y&N3T)&BGZv>+mg5^llrV@*>Hn?uWiS%#QQz_%dHq@lMP$PT@)#04J3t4xED3>-y?0Av#6PdF7lUREH-d$q3*Y%mhAT6{w~a@fu7)xBRG@m z=WrwT;bLqo@f+HQ{AEs}X8c#w^Z!7l-eO(q@H(82ccY$v24~}Is0sZWmEl?A$p2g_ zP2>C#??BC9KdQlpQ6qmT`2Tl!CD(7E)^;MJXVPXWG6r)c>itGkhigy+*o|uE+oT@$mGm> z*oi}#jo#mlA$$aNTz`PdNG3}~Yw;7*Ox{MN_I)JF=AXg+(X^stS&cQ=jM@Wxk-p4B zsFWW=z4sT4;J>gLH!v$@@FKpJXT!U)3EBOC$=-_Eo2lb5p zAhw_e{4T2fPf+&@=lK6mKrMA<7M0;t>QNt#>rn&Qh$Hm?4#Rz@H9dej9WS8|&ip;{&La_o4=J1jpf1sOMe_JcY&dZ{DDyP4PY|)sxv- z>YyA;unx6E&6tPUA1e7o2k}kfYlO-zKDkftbwPaqEvw2(pWKGesA0`gB}p_BH|c_6 z5%;SS6lFn$r8eIpYKdJ)`@ejze0T)(MsGyY#{b%{Z;l7^9k*P zF+@4R1|2N=$ZR3BA6kemg6)ti_53yw4pBsC^R^KxD|`lj7gAdmTwRNqFY(h(+(#4> zi;20!T0%ufPRDbbE+{%;n{qY(XBXTZT*t7G(4?*=t|xRNRukh1ZEls6k6EQh=W)Te zA@{Xfj$?^~#0|ti*%(wj97)_uj3AZ}Yls=d7m2Hg5YbJj^bk{WHDkVvr9pi^9>~?Z zn~HkJq|(Xuw7uDiC%4;iZ+rHgqUCwh6496!OD0?^*=D7jw3|%WaVu(jw#DNS$8}?g z_H6a&k)iQ+#EWgUJx4b_(@uEo{!sR#;(PNlu9NmGufwrCC%xIV>_pUxBnNwFOQz3h z^s~L0#>9nRW_W5i82i8&c+GPdjHY0vy7!knJ!XYJyMZUNjiqz)%W}h^iSu61ZW~`6 z$|SA9sr{EOte9uTTr1%y8FqTR<(>C@oo#ibowfxP3sZKxvtV1K(sewKw7C`a6;8r# zjXTyB*HMBa$t|f|u2ULtMO~F$Z&r0bHt{#vuJGi-NltuV)V39MthQLxiO24+Be55= ziR|~SHF;G_mCXq6IxbJdEsv?&n`2IbLGcFbmUIUb>$utesj1L1$8ucOGnvXYWTou1 z9n3gwU8qaTN$9?-4U*k3?NlgxPsN}8MP?yv*I(OUG`Uv)_lSaZ{`~ulo+dmdm+~hZ z^d4-sPZLrQi`vm{XT~QJR{Hz!(_4eNvS;?^Pd`6bpKD1CW!KGK7s{;s|5Fm|1UnrY u*am5GF__#7ZiWuKH5QL~cAEW=Td#<=gX0d#?S$FcqjU1|vOlk0l>Z;nv5Wu! delta 3483 zcmYk;d2q~U9LMn|8%KhOxFf;Ok*G7ot#Krd2$B#-Q}Qb9|rY*>Sye%hKSD zmJRkA${r$_INrdR3z!khAIj8b#x%xhn1Zik6AU8%Of`R+;y#SWT5N$KOvLl{^BdTe z>w7pH`UUG_o_O2LD8j{4wf-c&3$ry-)+oKpvTF?1HoG=M|`dRO49u z05#Kl*ay4QxEH5kZ~Pn^)4#bxMK3(SEKH_14PXK0VI^wBmylP?Ez}GjB5j-JI056C zuAa|AvTPQko(E9hSJ~GGF_-J(80bpYJK!a__zaH%3#vnY5jqnOGCi5%OhWQ)yo}+D~ zqZX)+N23~=j(XpXIk*ayfit)hFQYd1e9{nut5NM%wIlzuZ4PjQESeLjjeo{|@f%b} zSMBS&sDV7hG<=TTF^wIpRL?-Y@5X&tft|1g>)996up`dH9=JM4g?CIXDg&o*7CuBR z!9;c-eVCo7509Y(FQAUyB~%8kqEdbvHNzNoqB5C)Oy0CdJx@cOvI11bf@M^OQQ3&v z)u)kv<~#mqP3th+0Qqxqorcq}29>$n_!&M!4d@d_snnlEW$Js>{oha-szV*$e~?TE z&2uUmNi2EN=1E4)AO|&|0@Mdi0ZR^+>0s1Apt);b4u zT<4=Qz7Ct{{2!pA2S+grzeN4w#d1?7pw>7M)!`^C!pW!%e2mK2c~r`8p(b<(8IyTx z-|s;FHK8u3jP}Pi^l!4M@Q#^>`XGqPz!6Nr4^eA;8P(BE)PSC$I3}P;2a_vI1*x05+so{n8D^A((~vScw|oS6F~`sDWpsMp8W= zm7x;UOjqLstVU((2hJLqSo*x zYK@)RLS;t=T2iu8&HOG}sX{xE_HT;3{pYbhOlb49AhLQSe;r`95TzCmTp-nV_(3&nFmJ_Q9?fUw%hKe?kN-D9G7_AGtOsub< zj^#4@x&Vub6@-h3Q~y3H8;Lw(7V##b6ETPAPSlrmRCLrP6P<}7VgsSgSYIYl(eHvv z3NbQVdQ|yb^kke@v+t*?{ zpF^*7fLa8G++vjupBhLd% zJXVi#Z&_fav$%)lD-C#kC6=eeSyb$C^G0#8RphZ&mKOV*Zf*p8)^zXkVyETwTYgVj zx!2|KhfcNH5moa=oAaUFZPTJdza*wPYBncdZEQae<#+7aFm$MEUQ{TlyU!82minz@ z+7zGPD)M?tJbueXe>CVTb$QQ)N?sa^(-rWRJKat?vRuxx#m=&G?`dfE2wcA9K6?ya upFdRF^N*;SrhT4i0K0M!_ZNKOO1W z&pWd-^FHtMzVF(9t4*k{Pl$e)oOH-=yhaQo{+eXW4ZPly503P{#&pLaI1;n47cRs; zxEy=qv)CUu;Sk*6T|a~aIX{W%81uZ2j~Ej*pU}wTiyr-q8H$Cd8`ohbZbfx?1dH(v z9Dtu<3aZzxkczrK3`gO3)caOqHw+GW?F&=`kN4B%-Ti>aik z(ift>e;f;OD=LwTxD5`tC`I_XyhwU_pe7y!AqErEjSfFL)||*)tCvGpUV7e zWSh94j*sFbY(pjRC)7y(je21pvZQ)uGV1z#d<>UkH{6R9!yG_zGbd5^okw-}6I23s zQ19uUPW|;jIxB7wjzyJbGd5x^YF8vv?;ei!U_5-;MD*p8Z_ z6tZWq<{8|H5!CZ{FcG5zIn(|fj4FwRnu=W1NLHdsyB3)RQ-Se{JA{AA-;i&7msEQS!_Wcr6 z=~tkpaxH32g-`=Hj!Nhh>i%=cZ=7kvNCNYJm4@bg3d326g{Wp8fX^Aenc$8j=#h^3g!gzG(9JojQQ{hOmSw20opFy2I-F;DP&tI|bK z559@?XJv#n_GXgC*mP|0pCWRG4t61T6{s&s@{)mAoB*Q^p}wJXL^u5xtmd_`<5cPnQ~;& znMTw=Kb}DSHRoN~l(%pV?!#I1z74OTUNk2+{^E_eit{~Kgg5ai968CD)wmN?v0tFR zPh*J{JmSGCvqa25)|cOuHG%m#Rb& zR^fK6$3I{VMp)7s@#pwH4rWVet=z^$Or!28n1R|o6Hy7Sz%=?d$7pEeEvSyKp*p^c z^kE*I6JM?6xSI3tBhzk@=Emo6DlXxC9kQ;>X;dP=!W|f6Ybb%7d2HzfrU`p-et14p z8l`bk4g3M>i#B9yo42tW-uAqMO7x$o1p6}KD*X&pi5Ge2VeG+qEz+MmonX2U&l63A z`qdHrdR(&=7kTXtGHLWCmU|a8I=xtB)bR~s1yQ0Cjx6H4ZYw^OrCwXrIz*_N4FrXC z|ENLKEaUUr#J7l!L-VX-H1Ra?O`UKICu)hs#H&OG@gi}6NGEiJiQPnySV!ncisSxB zy+B*jyxG0hQ3p_a|7>pkoy=*lorCZ}6Hf z+xUFNyRZ}Y5YK&~e|N4!-VLIX7)g{7`w1VRm9OI^Vj95@p1aTWW8x=t)DdIdR(#>D zqCeXjNoRR=dz z`zo!9;C5d{WP5C8-^B?ds>%Y9K(H!o1N)6zKGA__ELX19H`n5tLxW0 zG2K@h32gC2{QBa)_f!sONsI*tH6%pC{_2Po+32?-{_4uG<*O>QN`v=$C=XVD;idQY zW)@X_^~0p67kjyP$2|4FZ;%+`$>{ix5yJa^wm1Lz&=gJjl z5A%G$`pN~zTDZtOAD}#~POa0>^lm{$3YEC%)Ug<}3|KDi%8Ol?;UvUP<-eEoA5#2j A=l}o! delta 3514 zcmYk-32anF9LMq59^6F=w1raaD=ieNP%W1rRG?BoD7T;}VxdKrE?r8Oaq58iHXRQ2sKbOpn?axB>{_~5j7zZDj2j9(fIxCK8yqZ_nCL>yqW*ZyjE4Yey?=- zziS(_%TRPkAj5Qd9@t#j*G~CSfweQ3rES zBg{kIVJ2Wc7CQG2BeP&mI`=<8{r(bapbhBP598YzQ-Eohg841 zY0Xk4+a?3GHu|BS8-jY#DCc}Ssw1;88-1982T_?lhkCvq_ux%@5Z5uUJ@KHQN@pr{ zn2EQLXG{lHoHFnzPQlrzDL94n(ZsOA^t%*{!hxu5I2e_IQK*zpLv?%wDwFGxWSDBC zDdRs#MGw}Zw%s*U>Y~WcW0-)N>#@i!GaZ%kC8&lD<1DPj37Af=l);5qgH@=G%DwP>bko)JW=49lC~k{xGL7hS8FLTyqB6^v z$+!}=yDp+S{0%BYzhRp8e>9u72N$}cMmP@nZ%R0f#%k=1^{A1?kuEh*=2(f3avngf znX_1qmoXhjb5O>-sNWqxZkcy5m-m}GD*B+rvvRbZQqaN?sE*CSCvXQ2#yV66+VDLd zh^eTCry)(564VQ~p?-fFSytvcreYLZZW4AuzeS~j$}rr6oAC;kU@vVN74>vCDia?&-oOy&iT(M0<8_>kUHK@`7qbP)y7>r|fd(wa)B)^y z+={C)nOr}KI{z3I9?eWOm&qa;267|Aes283`b*K^Zun#Al za4|lMJCWHi4XC-d21ow5jYRE=-FO+#;xg_3S92p@td30hco*MsY{3JohD7GF%5g91 z`di3OGDooqUUIyO>hMpfjy7Uz%orNUY;V;0bZmwmbn$*OlUPh>9qc4jG=lbo8eC4~ z6KYgtLWJ;^Bg^4+v&gxoFKIWTDY1(P5GoZB!k=bl(i9UG(L<^2K$HwW(a&Cng!m;vy7q(N^{<>eZ zWL2^vn3r*~Qy1FA3kbHMVWpd?#FI*E5us8_@YM>J^&FF(x(|C3<<5C3YJ=Y|UMjJ~ z3?k9F*u}9gwj}Zh4^d6T5t|4%q3H>Ku;W#sXu~Zda)@a}2GNR8c`!owxP#-C|D6w~ zK81M6xi$u$3navSXg9wEu85oF5(G~$C_DeEu8Q178Y^A=d~ue=XnaP!g8y;ctM4GR&lxAqkXk2 zkd=7G{wFaz+RjhTjtbmK`L(HY-@e@W`&hd%{RfwAb?YBvU&(qnX4D(O)4^lGqoGxy zDl4?wqFxjHAhb2KA$UA^ihrkrCoK-Oq4mKNTsmoG^2iAuuMDjT9_7(3!Be5C;PK2r z*ZvtDk6C#W3oM#A8mzHGYeK7eU`@~tp0H!GyF>?~dnehqa-MbBWqr=Y+GPU|M%y=Y QFSwfj_n>`b$hDY%0facg?*IS* diff --git a/tests/loyalty/test-wc-retailcrm-client-v5.php b/tests/loyalty/test-wc-retailcrm-client-v5.php index 01e128a..967ed1d 100644 --- a/tests/loyalty/test-wc-retailcrm-client-v5.php +++ b/tests/loyalty/test-wc-retailcrm-client-v5.php @@ -44,10 +44,6 @@ class WC_Retailcrm_Loyalty_Client_Test extends WC_Retailcrm_Test_Case_Helper $this->setMockResponse($this->apiMock, 'makeRequest', $this->responseMock); $this->clientMock = new \WC_Retailcrm_Client_V5('https://test@retailcrm.ru', 'test', 'test'); - /* $this->clientMock = $this->getMockBuilder('\WC_Retailcrm_Client_V5') - ->disableOriginalConstructor() - ->getMock() - ;*/ $reflection = new ReflectionClass($this->clientMock); $reflection_property = $reflection->getProperty('client');