diff --git a/resources/pot/retailcrm-ru_RU.pot b/resources/pot/retailcrm-ru_RU.pot index 178491e..ae63783 100644 --- a/resources/pot/retailcrm-ru_RU.pot +++ b/resources/pot/retailcrm-ru_RU.pot @@ -140,7 +140,7 @@ msgid "When working with coupons through CRM, it is impossible to transfer manua msgstr "При работе с купонами через CRM, невозможно передавать ручные скидки." msgid "The custom field must be in the form of a string or text. An example of filling in a field in CRM: `code_coupon` or `code_coupon1; code_coupon2`" -msgstr "Пользовательское поле должно быть формата string или text. Пример заполнения поля в CRM при использовании нескольких купонов: code_coupon_1; code_coupon_2" +msgstr "Пользовательское поле должно быть формата string или text. При использовании нескольких купонов, поддреживается разделение пробельными символами, а также знаками `;` `,`. Пример: code_coupon_1; code_coupon_2, code_coupon_3 code_coupon_4" msgid "Payment types" msgstr "Способы оплаты" diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php index d6f14a9..f9d7b2d 100644 --- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php +++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php @@ -363,7 +363,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration $this->form_fields['coupon_notification'] = [ 'id' => 'coupon_options', - 'css' => 'max-width:400px;resize: none;height:150px;', + 'css' => 'max-width:400px;resize: none;height:200px;', 'type' => 'textarea', 'title' => __('Attention!', 'retailcrm'), 'value' => '', diff --git a/src/include/class-wc-retailcrm-history.php b/src/include/class-wc-retailcrm-history.php index 30cb14b..dc57419 100644 --- a/src/include/class-wc-retailcrm-history.php +++ b/src/include/class-wc-retailcrm-history.php @@ -1054,7 +1054,7 @@ if (!class_exists('WC_Retailcrm_History')) : } if (!empty($orderHistory['customFields'][$couponField])) { - $masCoupons = explode('; ', $orderHistory['customFields'][$couponField]); + $masCoupons = preg_split("/[\s,;]+/", $orderHistory['customFields'][$couponField]); foreach (array_diff($masCoupons, $wcOrderCoupons) as $coupon) { $wcOrder->apply_coupon($coupon); diff --git a/src/languages/retailcrm-ru_RU.mo b/src/languages/retailcrm-ru_RU.mo index 6406c89..b46f5b1 100644 Binary files a/src/languages/retailcrm-ru_RU.mo and b/src/languages/retailcrm-ru_RU.mo differ