From 8ac713a43c299c5d70af22c803c4b08a8efb109b Mon Sep 17 00:00:00 2001 From: Ivan Chaplygin Date: Wed, 10 Apr 2024 15:17:25 +0300 Subject: [PATCH] ref #72067 Edit output text --- resources/pot/retailcrm-ru_RU.pot | 23 ++++++++++++--------- src/assets/js/retailcrm-loyalty-actions.js | 2 +- src/include/class-wc-retailcrm-base.php | 14 +++++++------ src/include/class-wc-retailcrm-loyalty.php | 22 ++++++++++---------- src/languages/retailcrm-ru_RU.mo | Bin 20251 -> 20393 bytes 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot index 8c451d5..b7db938 100644 --- a/resources/pot/retailcrm-ru_RU.pot +++ b/resources/pot/retailcrm-ru_RU.pot @@ -508,8 +508,8 @@ msgstr "Активировать участие в программе лояль msgid "Send" msgstr "Отправить" -msgid "To register in the Loyalty Program, fill in the form:" -msgstr "Для регистрации в Программе лояльности заполните форму:" +msgid "To register in the loyalty program, fill in the form:" +msgstr "Для регистрации в программе лояльности заполните форму:" msgid " I agree with " msgstr " Я согласен с " @@ -523,8 +523,8 @@ msgstr "условиями обработки персональных данн msgid "Phone" msgstr "Телефон" -msgid "Error while registering in the loyalty program. Try again later." -msgstr "Ошибка при регистрации в программе лояльности. Попробуйте позже." +msgid "Error while registering in the loyalty program. Try again later" +msgstr "Ошибка при регистрации в программе лояльности. Попробуйте позже" msgid "The card is not linked" msgstr "Карта не привязана" @@ -535,8 +535,8 @@ msgstr "Обычные товары" msgid "Promotional products" msgstr "Акционные товары" -msgid "bonus for every" -msgstr "бонус за каждые" +msgid "accrual of 1 bonus for each" +msgstr "начисление 1 бонуса за каждые" msgid "of the purchase amount" msgstr "от суммы покупки" @@ -547,8 +547,11 @@ msgstr "начисление бонусов в размере" msgid "discount" msgstr "скидка" -msgid "Error while retrieving data. Try again later." -msgstr "Ошибка при получении данных. Попробуйте позже." +msgid "Error while retrieving data. Try again later" +msgstr "Ошибка при получении данных. Попробуйте позже" -msgid "Error when activating the loyalty program. Try again later." -msgstr "Ошибка при активации программы лояльности. Попробуйте позже." +msgid "Error when activating the loyalty program. Try again later" +msgstr "Ошибка при активации программы лояльности. Попробуйте позже" + +msgid "Enter the correct phone number" +msgstr "Введите корректный номер телефона" diff --git a/src/assets/js/retailcrm-loyalty-actions.js b/src/assets/js/retailcrm-loyalty-actions.js index cee73ca..2c0fec9 100644 --- a/src/assets/js/retailcrm-loyalty-actions.js +++ b/src/assets/js/retailcrm-loyalty-actions.js @@ -20,7 +20,7 @@ jQuery(function() { let phone = jQuery('#phoneLoyalty'); if (!phone.val().match(/(?:\+|\d)[\d\-\(\) ]{7,}\d/)) { - phone.parent().append('test') + phone.parent().append('' + messagePhone + '') event.preventDefault(); return false; diff --git a/src/include/class-wc-retailcrm-base.php b/src/include/class-wc-retailcrm-base.php index fbbd701..0cc1fcf 100644 --- a/src/include/class-wc-retailcrm-base.php +++ b/src/include/class-wc-retailcrm-base.php @@ -640,18 +640,18 @@ if (!class_exists('WC_Retailcrm_Base')) { if (empty($site)) { writeBaseLogs('Error with CRM credentials: need an valid apiKey assigned to one certain site'); - echo json_encode(['error' => __('Error while registering in the loyalty program. Try again later.', 'retailcrm')]); + echo json_encode(['error' => __('Error while registering in the loyalty program. Try again later', 'retailcrm')]); } if (!$userId || !$phone) { writeBaseLogs('Errors when registering a loyalty program. Passed parameters: userId = ' . ($userId ?? 'NULL') . ' phone = ' . ($phone ?? 'NULL')); - echo json_encode(['error' => __('Error while registering in the loyalty program. Try again later.', 'retailcrm')]); + echo json_encode(['error' => __('Error while registering in the loyalty program. Try again later', 'retailcrm')]); } $isSuccessful = $this->loyalty->registerCustomer($userId, $phone, $site); if (!$isSuccessful) { - echo json_encode(['error' => __('Error while registering in the loyalty program. Try again later.', 'retailcrm')]); + echo json_encode(['error' => __('Error while registering in the loyalty program. Try again later', 'retailcrm')]); } else { echo json_encode(['isSuccessful' => true]); } @@ -665,13 +665,13 @@ if (!class_exists('WC_Retailcrm_Base')) { if (!$loyaltyId) { writeBaseLogs('Errors when activate loyalty program. loyaltyId is missing'); - echo json_encode(['error' => __('Error when activating the loyalty program. Try again later.', 'retailcrm')]); + echo json_encode(['error' => __('Error when activating the loyalty program. Try again later', 'retailcrm')]); } $isSuccessful = $this->loyalty->activateLoyaltyCustomer($loyaltyId); if (!$isSuccessful) { - echo json_encode(['error' => __('Error when activating the loyalty program. Try again later.', 'retailcrm')]); + echo json_encode(['error' => __('Error when activating the loyalty program. Try again later', 'retailcrm')]); } else { echo json_encode(['isSuccessful' => true]); } @@ -898,16 +898,18 @@ if (!class_exists('WC_Retailcrm_Base')) { $jsScript = 'retailcrm-loyalty-actions'; $loyaltyUrl = ['url' => get_admin_url()]; $jsScriptsPath = plugins_url() . '/woo-retailcrm/assets/js/'; + $messagePhone = __('Enter the correct phone number', 'retailcrm'); wp_register_script($jsScript, $jsScriptsPath . $jsScript . '.js', false, '0.1'); wp_enqueue_script($jsScript, $jsScriptsPath . $jsScript . '.js', '', '', true); wp_localize_script($jsScript, 'LoyaltyUrl', $loyaltyUrl); wp_localize_script($jsScript, 'customerId', $userId); + wp_localize_script($jsScript, 'messagePhone', $messagePhone); $result = $this->loyalty->getForm($userId); if ([] === $result) { - echo '

'. __('Error while retrieving data. Try again later.', 'retailcrm') . '

'; + echo '

'. __('Error while retrieving data. Try again later', 'retailcrm') . '

'; } else { wp_localize_script($jsScript, 'loyaltyId', $result['loyaltyId'] ?? null); echo $result['form']; diff --git a/src/include/class-wc-retailcrm-loyalty.php b/src/include/class-wc-retailcrm-loyalty.php index 599bead..56c1e5c 100644 --- a/src/include/class-wc-retailcrm-loyalty.php +++ b/src/include/class-wc-retailcrm-loyalty.php @@ -31,15 +31,15 @@ if (!class_exists('WC_Retailcrm_Loyalty')) : { $result = []; - $response = $this->apiClient->customersGet($userId); - - if (!isset($response['customer']['id'])) { - return $result; - } - - $filter['customerId'] = $response['customer']['id']; - try { + $response = $this->apiClient->customersGet($userId); + + if (!isset($response['customer']['id'])) { + return $result; + } + + $filter['customerId'] = $response['customer']['id']; + $response = $this->apiClient->getLoyaltyAccountList($filter); } catch (Throwable $exception) { writeBaseLogs('Exception get loyalty accounts: ' . $exception->getMessage()); @@ -79,7 +79,7 @@ if (!class_exists('WC_Retailcrm_Loyalty')) :

', - __('To register in the Loyalty Program, fill in the form:', 'retailcrm'), + __('To register in the loyalty program, fill in the form:', 'retailcrm'), __(' I agree with ', 'retailcrm'), __('loyalty program terms', 'retailcrm'), __(' I agree with ', 'retailcrm'), @@ -149,8 +149,8 @@ if (!class_exists('WC_Retailcrm_Loyalty')) : switch ($loyaltyAccount['level']['type']) { case 'bonus_converting': - $data[] = __('Ordinary goods', 'retailcrm') . ': 1 ' . __('bonus for every', 'retailcrm') . ' '. $loyaltyAccount['level']['privilegeSize']; - $data[] = __('Promotional products', 'retailcrm') . ': 1 ' . __('bonus for every', 'retailcrm') . ' '. $loyaltyAccount['level']['privilegeSizePromo']; + $data[] = __('Ordinary goods', 'retailcrm') . ': ' . __('accrual of 1 bonus for each', 'retailcrm') . ' '. $loyaltyAccount['level']['privilegeSize'] . ' ' . $loyaltyAccount['loyalty']['currency']; + $data[] = __('Promotional products', 'retailcrm') . ': ' . __('accrual of 1 bonus for each', 'retailcrm') . ' '. $loyaltyAccount['level']['privilegeSizePromo']. ' ' . $loyaltyAccount['loyalty']['currency']; break; case 'bonus_percent': $data[] = __('Ordinary goods', 'retailcrm') . ': ' . __('bonus accrual in the amount of', 'retailcrm'). ' ' . $loyaltyAccount['level']['privilegeSize'] . '% ' . __('of the purchase amount', 'retailcrm'); diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo index 7ca912e9ac377f65a204fb27a6c8706e2b38bc6c..6f527a6d48fab0a644775e9c0945993e21e985a9 100644 GIT binary patch delta 3986 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 delta 3956 zcmZA3dr(wm9LDkA8eTwM;_6*jMG+86B*OB7Ac_end8xdFmP%epxk;KER!C7;Y^5b? zg;rXYx|ZZv*^D-s&A3cc%~a@gw|mx<(>Pte59jz#@9^yBeb4Tmeb4WG&(XcRJll7A z{AZ)X9yi)y(w`jbY<2#?LA?$)bqE7rfMx%!pjbkwehq&WR?8|r(_QDbj$7ICWPhOE{~L2KnQ~}CtI%IWXEPmL!AE#K{*2j}Og&j6TY{fJc2{zXkJmUYqhhN4cGf!bs_sEOpGCRUC5UIS{vPouu~v7e4kd>*Ib zB~%IXxEHtJjTnYsAb<8PFWoR~fOEp0$ZFXT)LzL#ZNeK+pPPl6zyf!?1~t*U@GA7z z(@CJyiYiSz>I*+1RW{E+=eFvLTN#f+{_GSlsdygwsKs+{CSnHad-G8hti(CE54E%& zpR*_Oaii}4g>mrzTV!J8D>axqQ!e+eC(pb>A!Jy?w4L!Hvj!=sGXpe8hua%qXOP^HX69iNF5 z!%9$<-00efn($84-gq9hMEfzC-?t-lv|Hapeefb`P4%4BjN?%g9ELiWu36WwHZe--jCXp=a4(lE+BKV?%d0&RC+S?FQ-$?0jg^!QMb)^s1x>1 zan>>kr!X$S@%R`<;0MS@?JW8*oHA+;C8H{u&kMh4l{f)+;W#{ps_cMN>VF-bk!)rC zU@2-M>rfME#zA-*b)p|oR}#mYI(`+-#Odh67RVGFr$7(!|voVW%PIo~g@=&$Cs0qJ~ z)9_PNg%bG@R@eM_bo9Yh$a32KSd1^DDxt^KEJ(mFu?FjL!L?Kgzd@a-gnLXU-i)(x z59Z?~ycs8rVFTh0R3$GW@B3{q_1D@iN3GEztiaz;Coa9-*^FCo8RLVfiS--nRAvII z#CKv3{0!L+_8sbi;#ly0I3A;Lt~*|dUfuuobnl&Lg)E>I13h#bVcms8W`p zuB;VR!mnJt>^N4%vT%q#hi%w|6u}nfnk~g=kma{-lbpL_9BTjBayqMVJ2qeh<*3Cc zP!;JtnSZG;6HC#{dTA3@VJCbB<8U`>0!L93Zb$8{;S5xX@u&$DBX^+Ho=5I1%e=vv&=OqFc-%B+0v*+k;WbfR{U?C9t@F9o2@vYOmQ>dAdX?G*=G zj@yZD=W^0l3==ZX)YQ3sI{j^T{LRF*1}~ZnNCZWPFM|OEO6u=|Ns3 zR}i(nfB6Gxn_-tOc#;1DHf+ynVMuZoX z)ht?BQRABtOdOnkMW8aFIP$i#)s^MGrDbb