From 3e70603b727ef9d7e665389c5d63ae8e75ca13fc Mon Sep 17 00:00:00 2001 From: Sergey Chazov Date: Fri, 10 Jul 2020 15:36:09 +0300 Subject: [PATCH 1/3] task #67192 incubator --- resources/pot/retailcrm-es_ES.pot | 6 +++++ resources/pot/retailcrm-ru_RU.pot | 6 +++++ .../class-wc-retailcrm-abstracts-settings.php | 23 ++++++++++++++++++ src/include/class-wc-retailcrm-base.php | 13 +++++++++- src/languages/retailcrm-es_ES.mo | Bin 6445 -> 6470 bytes 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot index 536b254..41bc44c 100644 --- a/resources/pot/retailcrm-es_ES.pot +++ b/resources/pot/retailcrm-es_ES.pot @@ -148,6 +148,12 @@ msgstr "Los métodos de la formalización del pedido" msgid "Catalog settings" msgstr "Ajustes del catálogo" +msgid "Online assistant" +msgstr "Consultor en línea" + +msgid "Insert the javascript from the Retailcrm admin panel" +msgstr "Inserte javascript desde el panel de administración de Retailcrm" + msgid "Select API version" msgstr "Selecciona la versión de API" diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot index 30cf233..e723852 100644 --- a/resources/pot/retailcrm-ru_RU.pot +++ b/resources/pot/retailcrm-ru_RU.pot @@ -157,6 +157,12 @@ msgstr "Способы оформления заказа" msgid "Catalog settings" msgstr "Настройки каталога" +msgid "Online assistant" +msgstr "Онлайн консультант" + +msgid "Insert the javascript from the retailCRM admin panel" +msgstr "Вставьте javascript из административной панели retailCRM" + msgid "Select API version" msgstr "Выберите версию API" diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php index c0794e4..97c75f9 100644 --- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php +++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php @@ -147,6 +147,13 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration 'desc_tip' => true ); + $this->form_fields['online_assistant'] = array( + 'title' => __( 'Online assistant', 'retailcrm' ), + 'type' => 'textarea', + 'id' => 'online_assistant', + 'placeholder' => __( 'Insert the javascript from the retailCRM admin panel', 'retailcrm' ) + ); + $this->form_fields[] = array( 'title' => __( 'Catalog settings', 'retailcrm' ), 'type' => 'title', @@ -557,6 +564,22 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration return ob_get_clean(); } + /** + * Returns the original value for the online_consultant field (ignores woocommerce validation) + * @param $key + * @param $value + * @return string + */ + public function validate_online_assistant_field($key, $value) + { + $onlineAssistant = $_POST['woocommerce_integration-retailcrm_online_assistant']; + if (!empty($onlineAssistant) && is_string($onlineAssistant)) + { + return wp_unslash($onlineAssistant); + } + return ''; + } + /** * Validate API url * diff --git a/src/include/class-wc-retailcrm-base.php b/src/include/class-wc-retailcrm-base.php index 269c1b1..32fed81 100644 --- a/src/include/class-wc-retailcrm-base.php +++ b/src/include/class-wc-retailcrm-base.php @@ -100,6 +100,7 @@ if (!class_exists('WC_Retailcrm_Base')) { add_action('profile_update', array($this, 'update_customer'), 10, 2); add_action('wp_print_scripts', array($this, 'initialize_analytics'), 98); add_action('wp_print_scripts', array($this, 'initialize_daemon_collector'), 99); + add_action('wp_print_scripts', array($this, 'initialize_online_assistant'), 101); add_action('wp_print_footer_scripts', array($this, 'send_analytics'), 99); add_action('woocommerce_new_order', array($this, 'create_order'), 11, 1); @@ -122,7 +123,7 @@ if (!class_exists('WC_Retailcrm_Base')) { $this->init_settings(); } - /** + /** * @param $settings * * @return array @@ -422,6 +423,16 @@ if (!class_exists('WC_Retailcrm_Base')) { } } + /** + * Initialize online consultant + */ + public function initialize_online_assistant() + { + if (!is_admin()) { + echo $this->get_option('online_assistant'); + } + } + /** * Get retailcrm api client * diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo index 8cc5fc41c4c74d645d23e9293fbb2342c192ec81..a19d6a804652835f3f505627d279acbadf06a9f0 100644 GIT binary patch delta 1712 zcmY+EO;1xn6o#kR7TOvuZSlL>ilXIH%U2OaQK6|JBuK2pxKUx_2MDPqM#5dWbk&tR z{Q<7JChYtNZrr(bgFnIN?VR4kN#{QAJu`Fe%sFTJz5Jsb93JdvqC6aJk$#T8)aBeW zxEtl67I&^2L|_so;8B=^DOiN3;fTFg;YHq8VH&=NeUQ)Ch*yjSX4GX9Vq8GL5+k;(eO68^Gdcjj|rHA8CZik_!RPU+dQ-)2oRdUQdBKe+PSx}X_q9* z3SbuMy<{vyxtoP!um&%|570J=x`G8?sK=q2M=f#EAn#4c3!x(YT7Zo;rtEy!NTJzI zgi6^?vXcTFffcw6l|p|E%Re?-g&MZ}BZ;a_Y(zSWZ@De9!m!(g<_yJ8v%#rQX_mLC zUc9o8GVd(57-zT)i%`d@@(47rhEUiV(2{{FVZjaRL8!)1#a`+GuE6Vl1a&i1isLwL z2H`4H@$JEfeg;b0PiEVd7Pve@CmV!1!;HOGp+Z%MQ}7ME0ofADPWGQ7oGwL`t-%UB z?`NazPN6uBJcKHcv>HHd$OXPRklTjbEloFzSGo^gS#>a~qVzV42sYfA?LMlPv*-rZ zVcn0Q7P)_#gj8nw@vZFDpo;JnR7^IZZp1E(K~|txWJ=}dZ3?t=qLgtyd8mlsHS2g6zvL{hDw~;oJaT^Kuy`3 zBB8cGUr`toBIQU;f1L{X5xQ==N=~69IPNZ8W7p_Wy7E6kU!<$url*^~W7+24ShS>6 zsM7DzRSTUqZ=zrvZRX?OTEF67BCU@-f4Wa5nD55Rc$WPToXzkbw)Ug8!U!!RzH zky%&=7FyEmA_sFgaSgSzd+z)ZE@1u?b>k7Nz)38`GSZo7;oTQeBhpc zg1Y{dd;T3Z@qGKvfmXVKe6mOjqf*xF&QG~^qaKvR^>_nIaS*kzZ@30M?4lWKu@P_L zGJK0ZoIt8<9&V<4nU@2t%!gFNs&GDTM%6Nmemsk{cnejcH>ibpdgc;p zXV+0Xx`*0fzdL`5%FGbf;3up{FO8v%g_G_ta@19ND}2aitlsqis-`XI z;00t;_7!JK4(3x&zG|~kJ+umy$q=SrXQX6F8{mLN+A!)1W2j90Mm5n&US@j8 zHWRBgCsdj;LN}ZmTy6~n88$zmu``2hcU5MzNZofMQL6V}L#fbEYSb{=nHpsqv5BZ4 zR5$HZi_{1bN~y}E3~JZPkcKj(A0hfVy<6HQJ$ATGu~yHob!TKQJ@)ab5~#jPy@tA5 z4K|(7E2<_{L#j7aHZ^ZGkxi%}Ylsk`--AX%z45;hP^#5fdkB?bYV2|kR6C8T+da9x zOJiMUVqKAh<8M0`PsC0+U2%W>+!_9tuwA!%3%#kjysKF`k=9P9J@q_)JkNI|rjw38 p;&1DWI;Rs(+~4NjB-$N|r}{nbvkF3y)@Wxm5owR5E*B5y{sVu)p6mbs From 2de452a603d8855a25db2e06eefb46b7f9b8e35e Mon Sep 17 00:00:00 2001 From: Sergey Chazov Date: Fri, 10 Jul 2020 16:25:35 +0300 Subject: [PATCH 2/3] task #67192 incubator: bag-fix --- src/include/class-wc-retailcrm-base.php | 2 +- src/languages/retailcrm-es_ES.mo | Bin 6470 -> 6649 bytes src/languages/retailcrm-ru_RU.mo | Bin 7966 -> 8201 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/class-wc-retailcrm-base.php b/src/include/class-wc-retailcrm-base.php index 32fed81..43da580 100644 --- a/src/include/class-wc-retailcrm-base.php +++ b/src/include/class-wc-retailcrm-base.php @@ -123,7 +123,7 @@ if (!class_exists('WC_Retailcrm_Base')) { $this->init_settings(); } - /** + /** * @param $settings * * @return array diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo index a19d6a804652835f3f505627d279acbadf06a9f0..1a443aaeebb6e106ba3e5d44d7887765e469ea96 100644 GIT binary patch delta 1907 zcmY+^TWB0r9LMp0nq-@<#$0Wx#&+tpHA$^Wjfu6^m>QEPrKVuh2ZhP*1gFf-#+gY` zNLU1o^i7FD@S!CXsX(s6`*7B7T3nL%~DNe9oEOJ(vIg zoUHc#-Bv!JvfDp_!4Ts zqp9zt@6Vuq_a(MsE#Yd%^{C%Ntd0#^>_-E+jHpP zPdI=Lb`qQMcx2)Xp=EE;~>;-h#T$Bgh`@E!1uKFzuICY3P(+ zK;`~-)S>$a6^VL2WKDJt?!iZK8@`N>;~5;m4)UcGJc&xx^Qbd*0u_N3)S-SK>+x%3 zijsXxLx<`QRA}3|yt?nZQ8|7V*_h`Fx z#w+E4w54ci{>rY^R(?2Vm1wB1Fe$gARE18vzL~0XaT~Rtx`p}>RVh%}K~;Wr7O;OR!u*DZL z%bmq&rWm=2=j3MNq*(Bx*okLnc$e7l;&NkKd2sDQO}#r6c=___hRK@V*ozV;dCGGR zxrg027x^=ZGaVHRm3I?f;`%`@DmZSw;D^qP8+yTFOSaGy27c%{ZXEk@;)Y3iF58pY zw7;l{c;0{KLh#{6_Qnn(U}M*3Eu}>iMWsy*k|?1P<3^(!j2|^bW72R}ChqGW zaP7vVYr@XNAK=O#!P>a-c{_)jm^kU&=e=iU&Yd~uOn(=@7lMQRy=0V!qgCl=>1#dC zJ%Oz#54D(ceINo8FbngF4JET!PF*t%ph*n}`SgMCG`1$1toyoov(I zpTZNozlCy+6I4D_iiWqzomaBOc+A5TOu{-$!N-uFYx2;FAV6pWOHuVuY3JU?rd@(4 zD}WUkk9Y#+0288!0r~ z@lYw-33if!d02t#P$~4su>51QRj6spKa!~0#GS~Y;#=-DSz*|9qs%*lt(P-ggjuNL)OZ9M*g`05JJ6DWn#6(|)ZI|cqO!x(1H2Ef_z~2#P$`Z@ z+)Tj@sN&m&5Bv<2wx1a3R$Aaj5jxov)EO4-y#^Jk23&wI;Z?|%PbYFtn*+HfSBEOX7f>;I1$84@uotod#UfKGKW|gez0$u$l=4u5mmxcH zkDyk)fr{3_ez1qM;zLn;u0&TgXd{Y@>fkc{u*re4O(MG?mi?w4wCf(-xGCuJtcYlX zYN{VK#Y@++N9Wf~Rgo0wIeLYz+COXsgrcJeknnB<#-W;ujZkzes0@`jwPla+Ie}WR zH$_5il^!Sz3XyW8roT>w{0Ln)T_vYb5*&AnuCY0Kl&<{G)2no~8*~-e|C$n`y1z|V zWmrqP6;m1GO#5E!OFJ`|>WuY$jC8*CZ${ds#CGRfA{XoY8TuLN{7Sx$v_Gdlb>`AP GqJIJM6!a4S diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo index 9727ac5aa08e0a6dddb2700e54ec5307c90cbe00..f8117e5a50a1a807bb528fac129dca5061766b00 100644 GIT binary patch delta 1885 zcmY+^S!`5Q9LMp$l(ta7scoS{2kiw^wl2^`%VL3oSe6lNronSN}Ku9F;Km^KIuoi=cCi=oHCWNHH@PLVlrY3?s7>Ry=XD&uh=FI2Z?JWQE zzxQx+->USFB@+)CrHwj^`u+s7*YMYg{82tAFe}79EW(d)DjvcqcoJt~HaNb5VUEXe z4&K3HET@y{I3FX}j9gFK3p8}YyQq%#V+EeT2k~2+jaP9g-oYxYnPj#Tciw>sjSdcbT2GC4cLXxht*s0T(+ z6S%?O0vtyrQTQRVjo5(oxEtr&7oQp_TuHTQR?s z{l#|NftT?J&Mq@sgO^Yp<+Cg$h>n#T0{u@)7oZ;)WvJ=6fjJVg+!0ogul4cv~JSO;pL&#?o?unAkp+Q8!Q(^|_4i!uDS18dLPsF@vG8s>%qKVYNsiJqLR`!qf zj_&bK`)5Z##O!~&^w0Z)nOoDn@CDERnp=kbtUu(R_x>FrGp{^5=P>7oxO%}K_WUpX ii~cY@?)8UUe>^n0Cvzkm$*hlrGL7Ndf%@<-1^)nmfaeeZ delta 1697 zcmXZcOGs2v9LMp$<6}&%Y|KYxHCdKfYMJ?}%+l1!2+PExf?OyyW>E-HL8A*Hi6Anu z5X^!eNV=I-6tqZ+Vhn0gK_KC##VnFYXxaC7=N>%wbMBpc&*Ojo$HCgMn$WB-Vc00m z)Ld$>$E*`030x>=lFYo=fhl+n)36s)u^(69ZTJ2e=5QazJd9vE{>DsHXR9C!`8{N% zH1t9ns-rGkiG8>PM{ylaU=>DiD<&nI1#t&%!7=0~`-o-u1&h(UDAsQ|YJn|y7<(|C z@$EH@#XOk7rT7E2!l--y53{*XX8Br?AJuUk7U5;o_v5IAOu6@OP!pL!A9@Jaa?C`% zUx?|9ZgX?)podv+z*5x2+Hn&OU^`CYK1}4J z)!2xkwKO_uu|5o$qUTF_oztBq95bfr%KF2{_G?dO*n{pzYn+K z2og-2#@;xyPfLhDld?KS)84h9J~)n=z(p>bu@99r6WEOJa0mL9nXShLEXE+#-~+72 z@5rl`L3s7v2Gn~^sD)qg5&u>iBRuHFD4xXj46}zA#yV_e$v`F$vSJ!aj(xZnFW_#RLWMqxC$MCV z*>)U6b@a;hGwSyQ@PO0LmT*{B#nje?y{F5Wju{eMVEyvY4ej2=p zx|7OcorF7xDhjDebqr@kYBIJHcC~dR-G8E1L0i$&X;RS^?WcMe-)gBU+6EPcPeuEq zElJi5C6U@d4NwV+vud4pa?t9jv From ba74171a32420a45807e0b9b7c273eff98d0029e Mon Sep 17 00:00:00 2001 From: Sergey Chazov Date: Fri, 10 Jul 2020 16:37:04 +0300 Subject: [PATCH 3/3] task #67192 incubator: .pot .mo file bug-fix --- resources/pot/retailcrm-es_ES.pot | 4 ++-- src/languages/retailcrm-es_ES.mo | Bin 6649 -> 6649 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/pot/retailcrm-es_ES.pot b/resources/pot/retailcrm-es_ES.pot index 41bc44c..69806d0 100644 --- a/resources/pot/retailcrm-es_ES.pot +++ b/resources/pot/retailcrm-es_ES.pot @@ -151,8 +151,8 @@ msgstr "Ajustes del catálogo" msgid "Online assistant" msgstr "Consultor en línea" -msgid "Insert the javascript from the Retailcrm admin panel" -msgstr "Inserte javascript desde el panel de administración de Retailcrm" +msgid "Insert the javascript from the retailCRM admin panel" +msgstr "Inserte javascript desde el panel de administración de retailCRM" msgid "Select API version" msgstr "Selecciona la versión de API" diff --git a/src/languages/retailcrm-es_ES.mo b/src/languages/retailcrm-es_ES.mo index 1a443aaeebb6e106ba3e5d44d7887765e469ea96..38955269f198da5684e73806ebac728d53d02b8d 100644 GIT binary patch delta 56 zcmexq{L^^D0~SVx$q!ll8I>j*vW7F-ZSG{9!opdUT9TNV;~eC>S&b`&3yC{fB#jjS DH?R`^ delta 56 zcmexq{L^^D0~SWR$q!ll85t%UvW7D%ZSG{9!onGpT9TNVlU$U$S&b`&3yC{fB#jjS DKTH#T