From f20b6f93ce886a99d4e00473b4f43121dbfb46d7 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Mon, 10 Apr 2023 06:33:56 +0400 Subject: [PATCH 01/56] New Crowdin updates (#840) * New translations setting.inc.php (Romanian) * New translations setting.inc.php (French) * New translations setting.inc.php (Belarusian) * New translations setting.inc.php (German) * New translations setting.inc.php (Greek) * New translations setting.inc.php (Italian) * New translations setting.inc.php (Lithuanian) * New translations setting.inc.php (Dutch) * New translations setting.inc.php (Ukrainian) * New translations setting.inc.php (English) * New translations product.inc.php (Romanian) * New translations product.inc.php (English) * New translations manager.inc.php (Romanian) * New translations manager.inc.php (English) --- .../minishop2/lexicon/be/setting.inc.php | 4 ++++ .../minishop2/lexicon/de/setting.inc.php | 4 ++++ .../minishop2/lexicon/el/setting.inc.php | 4 ++++ .../minishop2/lexicon/en/manager.inc.php | 2 +- .../minishop2/lexicon/en/product.inc.php | 24 +++++++++---------- .../minishop2/lexicon/en/setting.inc.php | 8 +++++-- .../minishop2/lexicon/fr/setting.inc.php | 4 ++++ .../minishop2/lexicon/it/setting.inc.php | 4 ++++ .../minishop2/lexicon/lt/setting.inc.php | 4 ++++ .../minishop2/lexicon/nl/setting.inc.php | 4 ++++ .../minishop2/lexicon/ro/manager.inc.php | 2 +- .../minishop2/lexicon/ro/product.inc.php | 24 +++++++++---------- .../minishop2/lexicon/ro/setting.inc.php | 8 +++++-- .../minishop2/lexicon/uk/setting.inc.php | 4 ++++ 14 files changed, 70 insertions(+), 30 deletions(-) diff --git a/core/components/minishop2/lexicon/be/setting.inc.php b/core/components/minishop2/lexicon/be/setting.inc.php index 7c6b90ac1..523e33c75 100644 --- a/core/components/minishop2/lexicon/be/setting.inc.php +++ b/core/components/minishop2/lexicon/be/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Фармат нумарацыі замовы. Даступныя значэнні ў фармаце PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Раздзяляльнік для нумарацыі замовы'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Раздзяляльнік для нумарацыі замовы. Даступныя значэнні: "/", "," і "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Палі табліцы заказаў'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Спіс палёў, якія будуць паказаны ў табліцы заказаў. Даступныя: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".'; $_lang['setting_ms2_order_handler_class'] = 'Клас апрацоўшчык заказа'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Спіс палёў табліцы замоўленых тавараў. Даступныя: "count,price,weight,cost,options". Палі тавару паказваюцца з прэфіксам "product_", напрыклад "product_pagetitle,product_article". Дадаткова можна паказваць значэння з поля options з прэфіксам "option_", напрыклад: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Палі опцый прадукта ў замове'; $_lang['setting_ms2_order_product_options_desc'] = 'Пералік рэдагуемых опцый тавара ў акне замовы. Па змаўчанні: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Групы рэгістрацыі пакупнікоў'; $_lang['setting_ms2_order_user_groups_desc'] = 'Спіс груп, праз коску, у якія вы хочаце дадаваць новых пакупнікоў пры афармленні заказу.'; $_lang['setting_ms2_plugins'] = 'Убудовы крамы'; diff --git a/core/components/minishop2/lexicon/de/setting.inc.php b/core/components/minishop2/lexicon/de/setting.inc.php index aa9cb9b61..79102cf95 100644 --- a/core/components/minishop2/lexicon/de/setting.inc.php +++ b/core/components/minishop2/lexicon/de/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступные значения: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Поля таблицы заказов'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Список полей, которые будут показаны в таблице заказов. Доступны: "id,num,customer,status,cost,weight,delivery,payment,createdon,updatedon,comment".'; $_lang['setting_ms2_order_handler_class'] = 'Order handler class'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Список полей таблицы заказанных товаров. Доступны: "product_pagetitle,vendor_name,product_article,weight,price,count,cost". Поля товара указываются с префиксом "product_", например "product_pagetitle,product_article". Дополнительно можно указывать значения из поля options с префиксом "option_", например: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опций продукта в заказе'; $_lang['setting_ms2_order_product_options_desc'] = 'Перечень редактируемых опций товара в окне заказа. По умолчанию: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Groups for registering customers'; $_lang['setting_ms2_order_user_groups_desc'] = 'Comma-separated list of user groups for adding new users when they orders.'; $_lang['setting_ms2_plugins'] = 'Плагины магазина'; diff --git a/core/components/minishop2/lexicon/el/setting.inc.php b/core/components/minishop2/lexicon/el/setting.inc.php index df8ef905c..0a82f2312 100644 --- a/core/components/minishop2/lexicon/el/setting.inc.php +++ b/core/components/minishop2/lexicon/el/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступные значения: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Поля таблицы заказов'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Список полей, которые будут показаны в таблице заказов. Доступны: "id,num,customer,status,cost,weight,delivery,payment,createdon,updatedon,comment".'; $_lang['setting_ms2_order_handler_class'] = 'Класс обработчик заказа'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Список полей таблицы заказанных товаров. Доступны: "product_pagetitle,vendor_name,product_article,weight,price,count,cost". Поля товара указываются с префиксом "product_", например "product_pagetitle,product_article". Дополнительно можно указывать значения из поля options с префиксом "option_", например: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опций продукта в заказе'; $_lang['setting_ms2_order_product_options_desc'] = 'Перечень редактируемых опций товара в окне заказа. По умолчанию: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Группы регистрации покупателей'; $_lang['setting_ms2_order_user_groups_desc'] = 'Список групп, через запятую, в которые вы хотите добавлять новых покупателей при оформлении заказа.'; $_lang['setting_ms2_plugins'] = 'Плагины магазина'; diff --git a/core/components/minishop2/lexicon/en/manager.inc.php b/core/components/minishop2/lexicon/en/manager.inc.php index e3320e89e..700b8e4fc 100644 --- a/core/components/minishop2/lexicon/en/manager.inc.php +++ b/core/components/minishop2/lexicon/en/manager.inc.php @@ -46,7 +46,7 @@ $_lang['ms2_ft_caption'] = 'Caption'; $_lang['ms2_ft_checkbox'] = 'Checkbox'; $_lang['ms2_ft_combo-boolean'] = 'Yes/No'; -$_lang['ms2_ft_combo-colors'] = 'Множественный список цветов'; +$_lang['ms2_ft_combo-colors'] = 'Multiple color combobox'; $_lang['ms2_ft_combo-multiple'] = 'Multiple combobox'; $_lang['ms2_ft_combo-options'] = 'Superboxselect'; $_lang['ms2_ft_combobox'] = 'Combobox'; diff --git a/core/components/minishop2/lexicon/en/product.inc.php b/core/components/minishop2/lexicon/en/product.inc.php index 85ceecf68..9c9fada9a 100644 --- a/core/components/minishop2/lexicon/en/product.inc.php +++ b/core/components/minishop2/lexicon/en/product.inc.php @@ -8,18 +8,18 @@ * @subpackage lexicon */ -$_lang['ms2_drag_move_current_many'] = 'Перенести товары в данную категорию'; -$_lang['ms2_drag_move_current_many_success'] = 'Товары успешно перенесены в данную категорию'; -$_lang['ms2_drag_move_current_one'] = 'Перенести товар в данную категорию'; -$_lang['ms2_drag_move_current_one_success'] = 'Товар успешно перенесён в данную категорию'; -$_lang['ms2_drag_move_many'] = 'Перенести товары в категорию «{0}»'; -$_lang['ms2_drag_move_many_success'] = 'Товары успешно перенесены в категорию «{0}»'; -$_lang['ms2_drag_move_one'] = 'Перенести товар в категорию «{0}»'; -$_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; -$_lang['ms2_drag_self_many'] = 'Отмена'; -$_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_move_current_many'] = 'Move products to current category'; +$_lang['ms2_drag_move_current_many_success'] = 'Products was successfully moved to current category'; +$_lang['ms2_drag_move_current_one'] = 'Move product to current category'; +$_lang['ms2_drag_move_current_one_success'] = 'Product was successfully moved to current category'; +$_lang['ms2_drag_move_many'] = 'Move products to category «{0}»'; +$_lang['ms2_drag_move_many_success'] = 'Products was successfully moved to category «{0}»'; +$_lang['ms2_drag_move_one'] = 'Move product to category «{0}»'; +$_lang['ms2_drag_move_one_success'] = 'Product was successfully moved to category «{0}»'; +$_lang['ms2_drag_self_many'] = 'Cancel'; +$_lang['ms2_drag_self_one'] = 'Cancel'; +$_lang['ms2_drag_sort_many'] = 'Sort products'; +$_lang['ms2_drag_sort_one'] = 'Sort product'; $_lang['ms2_gallery_button_upload'] = 'Select files'; $_lang['ms2_gallery_emptymsg'] = '

Files not found.

You can load them by dragging directly into this pane, or by selecting the button at the top.

'; $_lang['ms2_gallery_errors'] = 'Errors on upload'; diff --git a/core/components/minishop2/lexicon/en/setting.inc.php b/core/components/minishop2/lexicon/en/setting.inc.php index 31801af73..6dd19ec20 100644 --- a/core/components/minishop2/lexicon/en/setting.inc.php +++ b/core/components/minishop2/lexicon/en/setting.inc.php @@ -36,8 +36,8 @@ $_lang['setting_ms2_cart_js_class_path_desc'] = 'Relative to the assets/components/minishop2/js/web/modules folder'; $_lang['setting_ms2_cart_max_count'] = 'Maximum number of products in cart for one operation'; $_lang['setting_ms2_cart_max_count_desc'] = 'Default is 1000. If this value is exceeded, will be displayed a notification.'; -$_lang['setting_ms2_cart_product_key_fields'] = 'Список полей для ключа товара в корзине'; -$_lang['setting_ms2_cart_product_key_fields_desc'] = 'Список полей товара через запятую, на основании которых формируется ключ товара в корзине'; +$_lang['setting_ms2_cart_product_key_fields'] = 'List of fields for product key in cart'; +$_lang['setting_ms2_cart_product_key_fields_desc'] = 'List of product fields separated by commas, on basis of which key of product in cart is formed'; $_lang['setting_ms2_category_content_default'] = 'Default content of category'; $_lang['setting_ms2_category_content_default_desc'] = 'Here you can specify the default content of new category. By default it lists children products.'; $_lang['setting_ms2_category_grid_fields'] = 'Fields of the table with goods'; @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Order numbering format. Available values in PHP strftime() format'; $_lang['setting_ms2_order_format_num_separator'] = 'Separator for order numbering'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Separator for order numbering. Available values: "/", "," and "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Phone validation format'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Phone validation format. Used in the "preg_replace" function, for example: /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Fields of the orders table'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Comma separated list of fields in the table of orders. Available: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".'; $_lang['setting_ms2_order_handler_class'] = 'Order handler class'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'which will be shown list of ordered products. Available: "count,price,weight,cost,options". Product fields specified with the prefix "product_", for example "product_pagetitle,product_article". Additionaly, you can specify a values from the options field with the prefix "option_", for example: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Product option fields in an order'; $_lang['setting_ms2_order_product_options_desc'] = 'Comma separated list of product option fields in the order window. By default: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'List of TV, separated by commas, that will be included in email template'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Specify the TV of product, separated by commas, to use them in email template chunk'; $_lang['setting_ms2_order_user_groups'] = 'Groups for registering customers'; $_lang['setting_ms2_order_user_groups_desc'] = 'Comma-separated list of user groups for adding new users when they orders.'; $_lang['setting_ms2_plugins'] = 'Store plugins'; diff --git a/core/components/minishop2/lexicon/fr/setting.inc.php b/core/components/minishop2/lexicon/fr/setting.inc.php index c0a1933f6..c9b3d08e6 100644 --- a/core/components/minishop2/lexicon/fr/setting.inc.php +++ b/core/components/minishop2/lexicon/fr/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступные значения: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Поля таблицы заказов'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Список полей, которые будут показаны в таблице заказов. Доступны: "id,num,customer,status,cost,weight,delivery,payment,createdon,updatedon,comment".'; $_lang['setting_ms2_order_handler_class'] = 'Order handler class'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Список полей таблицы заказанных товаров. Доступны: "product_pagetitle,vendor_name,product_article,weight,price,count,cost". Поля товара указываются с префиксом "product_", например "product_pagetitle,product_article". Дополнительно можно указывать значения из поля options с префиксом "option_", например: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опций продукта в заказе'; $_lang['setting_ms2_order_product_options_desc'] = 'Перечень редактируемых опций товара в окне заказа. По умолчанию: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Groups for registering customers'; $_lang['setting_ms2_order_user_groups_desc'] = 'Comma-separated list of user groups for adding new users when they orders.'; $_lang['setting_ms2_plugins'] = 'Плагины магазина'; diff --git a/core/components/minishop2/lexicon/it/setting.inc.php b/core/components/minishop2/lexicon/it/setting.inc.php index 0b883e755..d2ea6444b 100644 --- a/core/components/minishop2/lexicon/it/setting.inc.php +++ b/core/components/minishop2/lexicon/it/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступные значения: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Fields of the orders table'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Comma separated list of fields in the table of orders. Available: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".'; $_lang['setting_ms2_order_handler_class'] = 'Order handler class'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'which will be shown list of ordered products. Available: "count,price,weight,cost,options". Product fields specified with the prefix "product_", for example "product_pagetitle,product_article". Additionaly, you can specify a values from the options field with the prefix "option_", for example: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опций продукта в заказе'; $_lang['setting_ms2_order_product_options_desc'] = 'Перечень редактируемых опций товара в окне заказа. По умолчанию: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Groups for registering customers'; $_lang['setting_ms2_order_user_groups_desc'] = 'Comma-separated list of user groups for adding new users when they orders.'; $_lang['setting_ms2_plugins'] = 'Store plugins'; diff --git a/core/components/minishop2/lexicon/lt/setting.inc.php b/core/components/minishop2/lexicon/lt/setting.inc.php index 1c89521b2..4e9e93ecc 100644 --- a/core/components/minishop2/lexicon/lt/setting.inc.php +++ b/core/components/minishop2/lexicon/lt/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступные значения: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Поля таблицы заказов'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Список полей, которые будут показаны в таблице заказов. Доступны: "id,num,customer,status,cost,weight,delivery,payment,createdon,updatedon,comment".'; $_lang['setting_ms2_order_handler_class'] = 'Класс обработчик заказа'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Список полей таблицы заказанных товаров. Доступны: "product_pagetitle,vendor_name,product_article,weight,price,count,cost". Поля товара указываются с префиксом "product_", например "product_pagetitle,product_article". Дополнительно можно указывать значения из поля options с префиксом "option_", например: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опций продукта в заказе'; $_lang['setting_ms2_order_product_options_desc'] = 'Перечень редактируемых опций товара в окне заказа. По умолчанию: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Группы регистрации покупателей'; $_lang['setting_ms2_order_user_groups_desc'] = 'Список групп, через запятую, в которые вы хотите добавлять новых покупателей при оформлении заказа.'; $_lang['setting_ms2_plugins'] = 'Плагины магазина'; diff --git a/core/components/minishop2/lexicon/nl/setting.inc.php b/core/components/minishop2/lexicon/nl/setting.inc.php index 5ddaaa0fc..4fb592607 100755 --- a/core/components/minishop2/lexicon/nl/setting.inc.php +++ b/core/components/minishop2/lexicon/nl/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступные значения: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Fields of the orders table'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Comma separated list of fields in the table of orders. Available: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".'; $_lang['setting_ms2_order_handler_class'] = 'Order handler class'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'which will be shown list of ordered products. Available: "count,price,weight,cost,options". Product fields specified with the prefix "product_", for example "product_pagetitle,product_article". Additionaly, you can specify a values from the options field with the prefix "option_", for example: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опций продукта в заказе'; $_lang['setting_ms2_order_product_options_desc'] = 'Перечень редактируемых опций товара в окне заказа. По умолчанию: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Groups for registering customers'; $_lang['setting_ms2_order_user_groups_desc'] = 'Comma-separated list of user groups for adding new users when they orders.'; $_lang['setting_ms2_plugins'] = 'Store plugins'; diff --git a/core/components/minishop2/lexicon/ro/manager.inc.php b/core/components/minishop2/lexicon/ro/manager.inc.php index f15701d96..6243e4b87 100644 --- a/core/components/minishop2/lexicon/ro/manager.inc.php +++ b/core/components/minishop2/lexicon/ro/manager.inc.php @@ -46,7 +46,7 @@ $_lang['ms2_ft_caption'] = 'Denumire'; $_lang['ms2_ft_checkbox'] = 'Checkbox'; $_lang['ms2_ft_combo-boolean'] = 'Da/Nu'; -$_lang['ms2_ft_combo-colors'] = 'Множественный список цветов'; +$_lang['ms2_ft_combo-colors'] = 'Listă de culori multiple'; $_lang['ms2_ft_combo-multiple'] = 'Listă multiplă'; $_lang['ms2_ft_combo-options'] = ' Listă de sugestii de auto-completare'; $_lang['ms2_ft_combobox'] = 'Listă derulantă'; diff --git a/core/components/minishop2/lexicon/ro/product.inc.php b/core/components/minishop2/lexicon/ro/product.inc.php index 99a07292a..c99257def 100644 --- a/core/components/minishop2/lexicon/ro/product.inc.php +++ b/core/components/minishop2/lexicon/ro/product.inc.php @@ -8,18 +8,18 @@ * @subpackage lexicon */ -$_lang['ms2_drag_move_current_many'] = 'Перенести товары в данную категорию'; -$_lang['ms2_drag_move_current_many_success'] = 'Товары успешно перенесены в данную категорию'; -$_lang['ms2_drag_move_current_one'] = 'Перенести товар в данную категорию'; -$_lang['ms2_drag_move_current_one_success'] = 'Товар успешно перенесён в данную категорию'; -$_lang['ms2_drag_move_many'] = 'Перенести товары в категорию «{0}»'; -$_lang['ms2_drag_move_many_success'] = 'Товары успешно перенесены в категорию «{0}»'; -$_lang['ms2_drag_move_one'] = 'Перенести товар в категорию «{0}»'; -$_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; -$_lang['ms2_drag_self_many'] = 'Отмена'; -$_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_move_current_many'] = 'Mutați produsele în această categorie'; +$_lang['ms2_drag_move_current_many_success'] = 'Produsele au fost transferate cu succes în această categorie'; +$_lang['ms2_drag_move_current_one'] = 'Mutați produsul în această categorie'; +$_lang['ms2_drag_move_current_one_success'] = 'Produsul a fost transferat cu succes în această categorie'; +$_lang['ms2_drag_move_many'] = 'Mutați produsele în categoria «{0}»'; +$_lang['ms2_drag_move_many_success'] = 'Produsele au fost mutate cu succes în categoria «{0}»'; +$_lang['ms2_drag_move_one'] = 'Mutați produsul în categoria «{0}»'; +$_lang['ms2_drag_move_one_success'] = 'Produsul a fost mutat cu succes în categoria «{0}»'; +$_lang['ms2_drag_self_many'] = 'Anulare'; +$_lang['ms2_drag_self_one'] = 'Anulare'; +$_lang['ms2_drag_sort_many'] = 'Mutați produsele'; +$_lang['ms2_drag_sort_one'] = 'Mutați produsul'; $_lang['ms2_gallery_button_upload'] = 'Selectați fișierele'; $_lang['ms2_gallery_emptymsg'] = '

Fișierile nu au fost găsite.

Puteți să le descărcați, tragând direct pe acest panou sau selectând butonul din partea de sus.

'; $_lang['ms2_gallery_errors'] = 'Eroare la încărcare'; diff --git a/core/components/minishop2/lexicon/ro/setting.inc.php b/core/components/minishop2/lexicon/ro/setting.inc.php index 3ae1ad9c7..7af692dc3 100644 --- a/core/components/minishop2/lexicon/ro/setting.inc.php +++ b/core/components/minishop2/lexicon/ro/setting.inc.php @@ -36,8 +36,8 @@ $_lang['setting_ms2_cart_js_class_path_desc'] = 'Calea este relativă la directorul assets/components/minishop2/js/web/modules'; $_lang['setting_ms2_cart_max_count'] = 'Numărul maxim de articole în coș'; $_lang['setting_ms2_cart_max_count_desc'] = 'Setarea implicită este 1000. În cazul în care această valoare este depășită, se va afișa o notificare. '; -$_lang['setting_ms2_cart_product_key_fields'] = 'Список полей для ключа товара в корзине'; -$_lang['setting_ms2_cart_product_key_fields_desc'] = 'Список полей товара через запятую, на основании которых формируется ключ товара в корзине'; +$_lang['setting_ms2_cart_product_key_fields'] = 'Lista de câmpuri pentru cheia produsului din coș'; +$_lang['setting_ms2_cart_product_key_fields_desc'] = 'Lista câmpurilor de produse separate prin virgule, pe baza cărora se formează cheia produsului din coș'; $_lang['setting_ms2_category_content_default'] = 'Conținutul categoriilor în mod implicit'; $_lang['setting_ms2_category_content_default_desc'] = 'Aici puteți specifica conținutul categoriei nou create. Implicit este instalată afișarea produselor subordonate.'; $_lang['setting_ms2_category_grid_fields'] = 'Câmpurile tabelului de produse'; @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Formatul de numerotare a comenzii. Valori disponibile în format PHP strftime().'; $_lang['setting_ms2_order_format_num_separator'] = 'Separator pentru numerotarea comenzii'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Separator pentru numerotarea comenzii. Valori disponibile: "/", "," и "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Format de validare a telefonului'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Format de validare a telefonului. Folosit în funcția preg_replace. Exemplu /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Cîmpurile tabelului comenzilor'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Lista cîmpurilor care vor fi afișate în tabelul comenzilor. Sunt disponibile: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".'; $_lang['setting_ms2_order_handler_class'] = 'Clasa de prelucrare a comenzii'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Lista cîmpurilor tabelului produselor comandate. Sunt accesibile: "count,price,weight,cost,options". Cîmpurile produsului sunt afișate cu prefixul "product_", de exemplu "product_pagetitle,product_article". Suplimentar, puteți specifica valori din câmpul de opțiuni cu prefixul "option_", de exemplu: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Câmpurile de opțiuni de produs dintr-o comandă'; $_lang['setting_ms2_order_product_options_desc'] = 'Lista de opțiuni de produs editabile în fereastra de comandă. Culoare implicită, dimensiune'; +$_lang['setting_ms2_order_tv_list'] = 'Lista de TV separate prin virgule care vor fi incluse în scrisoare'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Introduceți o listă de produse TV, separate prin virgule, pentru a le utiliza într-o chancuri de e-mailuri'; $_lang['setting_ms2_order_user_groups'] = 'Grupurile de înregistrare a cumpărătorilor'; $_lang['setting_ms2_order_user_groups_desc'] = 'Lista grupurilor, separate prin virgulă, în care doriți să adăugați cumpărători noi la prelucrarea comenzii.'; $_lang['setting_ms2_plugins'] = 'Plugin-urile magazinului'; diff --git a/core/components/minishop2/lexicon/uk/setting.inc.php b/core/components/minishop2/lexicon/uk/setting.inc.php index c2cee479e..8a5d5f731 100644 --- a/core/components/minishop2/lexicon/uk/setting.inc.php +++ b/core/components/minishop2/lexicon/uk/setting.inc.php @@ -82,6 +82,8 @@ $_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерації замовлення. Доступні значення у форматі PHP strftime()'; $_lang['setting_ms2_order_format_num_separator'] = 'Розділювач для нумерації замовлення'; $_lang['setting_ms2_order_format_num_separator_desc'] = 'Роздільник для нумерації замовлення. Доступні значення: "/", "," та "-"'; +$_lang['setting_ms2_order_format_phone'] = 'Формат валидации телефона'; +$_lang['setting_ms2_order_format_phone_desc'] = 'Формат валидации телефона. Используется в функции preg_replace. Пример /[^-+()0-9]/u'; $_lang['setting_ms2_order_grid_fields'] = 'Поля таблиці замовлень'; $_lang['setting_ms2_order_grid_fields_desc'] = 'Список полів, що будуть показані в таблиці замовлень. Доступні: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".'; $_lang['setting_ms2_order_handler_class'] = 'Клас обробник замовлення'; @@ -94,6 +96,8 @@ $_lang['setting_ms2_order_product_fields_desc'] = 'Список полів таблиці замовлених товарів. Доступні: "count,price,weight,cost,options". Поля товару вказуються з префіксом "product_", наприклад "product_pagetitle,product_article". Додатково можна вказувати значення з поля options з префіксом "option_", наприклад: "option_color,option_size".'; $_lang['setting_ms2_order_product_options'] = 'Поля опцій продукту на замовлення'; $_lang['setting_ms2_order_product_options_desc'] = 'Перелік редагованих опцій товару у вікні замовлення. Типово: "color,size".'; +$_lang['setting_ms2_order_tv_list'] = 'Список TV через запятую, которые попадут в письмо'; +$_lang['setting_ms2_order_tv_list_desc'] = 'Введите список TV товара через запятую, для использования их в чанке писем'; $_lang['setting_ms2_order_user_groups'] = 'Групи реєстрації покупців'; $_lang['setting_ms2_order_user_groups_desc'] = 'Список груп, через кому, до яких ви бажаєте додавати нових покупців при оформленні замовлення.'; $_lang['setting_ms2_plugins'] = 'Плагіни магазину'; From 678ac2cca157085fb63312386ac33236fccdab5b Mon Sep 17 00:00:00 2001 From: webinmd <89poilo@gmail.com> Date: Tue, 11 Apr 2023 00:25:47 +0300 Subject: [PATCH 02/56] Add address fields in email chunk --- .../elements/chunks/chunk.ms_email.tpl | 20 +++++ .../chunks/chunk.ms_email_new_manager.tpl | 90 +++++++++++++++++++ .../minishop2/lexicon/ru/default.inc.php | 1 + 3 files changed, 111 insertions(+) diff --git a/core/components/minishop2/elements/chunks/chunk.ms_email.tpl b/core/components/minishop2/elements/chunks/chunk.ms_email.tpl index af9923a5f..3c959692a 100644 --- a/core/components/minishop2/elements/chunks/chunk.ms_email.tpl +++ b/core/components/minishop2/elements/chunks/chunk.ms_email.tpl @@ -122,6 +122,26 @@ + + + {block 'address'}{/block} + + + + + {block 'payment'}{/block} + + + + + {block 'delivery'}{/block} + + + + + {block 'link'}{/block} + + diff --git a/core/components/minishop2/elements/chunks/chunk.ms_email_new_manager.tpl b/core/components/minishop2/elements/chunks/chunk.ms_email_new_manager.tpl index a0aab1ca1..40aac7dbf 100644 --- a/core/components/minishop2/elements/chunks/chunk.ms_email_new_manager.tpl +++ b/core/components/minishop2/elements/chunks/chunk.ms_email_new_manager.tpl @@ -3,3 +3,93 @@ {block 'title'} {'ms2_email_subject_new_manager' | lexicon : $order} {/block} + +{block 'address'} + + + + + + + + + {if $address.comment} + + + + {/if} +
+

{'ms2_frontend_credentials' | lexicon}

+ + {foreach ['receiver','phone','email'] as $field} + {if $address[$field]} + + + + {/if} + {/foreach} +
{('ms2_frontend_' ~ $field) | lexicon}: {$address[$field]}
+
+

{'ms2_frontend_address' | lexicon}

+ + {foreach ['index','region','city', 'street', 'building', 'entrance','floor', 'room'] as $field} + {if $address[$field]} + + + + {/if} + {/foreach} +
{('ms2_frontend_' ~ $field) | lexicon}: {$address[$field]}
+
+

{'ms2_frontend_comment' | lexicon}

+ + + + +
{$address.comment}
+
+{/block} + +{block 'payment'} + + + + +
+

{'ms2_frontend_payment' | lexicon}

+ + + + +
{$payment.name}
+
+{/block} + +{block 'delivery'} + + + + +
+

{'ms2_frontend_delivery' | lexicon}

+ + + + +
{$delivery.name}
+
+{/block} + +{block 'link'} + + + + +
+ + + + +
{'ms2_email_link_to_order' | lexicon}
+
+{/block} diff --git a/core/components/minishop2/lexicon/ru/default.inc.php b/core/components/minishop2/lexicon/ru/default.inc.php index d93e2d4b5..232a0ade3 100644 --- a/core/components/minishop2/lexicon/ru/default.inc.php +++ b/core/components/minishop2/lexicon/ru/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Варианты доставки'; $_lang['ms2_deliveries_intro'] = 'Возможные варианты доставки. Логика рассчёта стоимости доставки в зависимости от расстояния и веса реализуется классом, который вы укажете в настройках.
Если вы не укажете свой класс, рассчеты будут производиться алгоритмом по умолчанию.'; $_lang['ms2_delivery'] = 'Доставка'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Ваш заказ #[[+num]] был отменён'; $_lang['ms2_email_subject_new_manager'] = 'У вас новый заказ #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Вы сделали заказ #[[+num]] на сайте [[++site_name]]'; From b5f963b1ca6e8b784c79fc6271fb5c4c1a7eb35b Mon Sep 17 00:00:00 2001 From: webinmd <89poilo@gmail.com> Date: Tue, 11 Apr 2023 02:14:18 +0300 Subject: [PATCH 03/56] Fix return json in msProducts --- .../elements/snippets/snippet.ms_products.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/components/minishop2/elements/snippets/snippet.ms_products.php b/core/components/minishop2/elements/snippets/snippet.ms_products.php index 377b246be..c80e36df1 100644 --- a/core/components/minishop2/elements/snippets/snippet.ms_products.php +++ b/core/components/minishop2/elements/snippets/snippet.ms_products.php @@ -189,6 +189,10 @@ $pdoFetch->setConfig(array_merge($default, $scriptProperties), false); $rows = $pdoFetch->run(); +if ($scriptProperties['return'] == 'json') { + $rows = json_decode($rows, true); +} + // Process rows $output = $additionalPlaceholders = []; if (!empty($rows) && is_array($rows)) { @@ -242,7 +246,7 @@ $opt_time_start = microtime(true); $options = $modx->call('msProductData', 'loadOptions', [$modx, $row['id']]); - $row = array_merge($additionalPlaceholders, $row, $options); + $rows[$k] = $row = array_merge($additionalPlaceholders, $row, $options); $opt_time += microtime(true) - $opt_time_start; $tpl = $pdoFetch->defineChunk($row); @@ -256,6 +260,10 @@ $log .= '
' . print_r($pdoFetch->getTime(), 1) . '
'; } +if ($scriptProperties['return'] == 'json') { + $rows = json_encode($rows); +} + // Return output if (is_string($rows)) { $modx->setPlaceholder('msProducts.log', $log); From eb414fa0fbe2d405bf6d3c5c9003a6d01b26f9e8 Mon Sep 17 00:00:00 2001 From: Electrica Date: Tue, 11 Apr 2023 23:47:24 +0600 Subject: [PATCH 04/56] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=BB=D0=B5=20rank=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20msVendor=20#850?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minishop2/js/mgr/settings/vendor/grid.js | 6 +- .../minishop2/mysql/msvendor.map.inc.php | 10 ++ .../model/schema/minishop2.mysql.schema.xml | 1 + .../mgr/settings/vendor/sort.class.php | 118 ++++++++++++++++++ 4 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 core/components/minishop2/processors/mgr/settings/vendor/sort.class.php diff --git a/assets/components/minishop2/js/mgr/settings/vendor/grid.js b/assets/components/minishop2/js/mgr/settings/vendor/grid.js index 0a87837e5..be7cb3b99 100644 --- a/assets/components/minishop2/js/mgr/settings/vendor/grid.js +++ b/assets/components/minishop2/js/mgr/settings/vendor/grid.js @@ -10,6 +10,9 @@ miniShop2.grid.Vendor = function (config) { }, stateful: true, stateId: config.id, + ddGroup: 'ms2-settings-vendor', + ddAction: 'mgr/settings/vendor/sort', + enableDragDrop: true, multi_select: true, }); miniShop2.grid.Vendor.superclass.constructor.call(this, config); @@ -18,7 +21,7 @@ Ext.extend(miniShop2.grid.Vendor, miniShop2.grid.Default, { getFields: function () { return [ 'id', 'name', 'resource', 'country', 'email', 'logo', 'pagetitle', - 'address', 'phone', 'fax', 'description', 'actions' + 'address', 'phone', 'fax', 'description', 'actions', 'rank' ]; }, @@ -40,6 +43,7 @@ Ext.extend(miniShop2.grid.Vendor, miniShop2.grid.Default, { {header: _('ms2_address'), dataIndex: 'address', width: 100, sortable: true, hidden: true}, {header: _('ms2_phone'), dataIndex: 'phone', width: 75, sortable: true}, {header: _('ms2_fax'), dataIndex: 'fax', width: 75, sortable: true, hidden: true}, + {header: _('ms2_rank'), dataIndex: 'rank', width: 35, hidden: true}, { header: _('ms2_actions'), dataIndex: 'actions', diff --git a/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php b/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php index aa31f5de8..3d75b20c6 100644 --- a/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php +++ b/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php @@ -17,9 +17,19 @@ 'email' => null, 'description' => null, 'properties' => null, + 'rank' => 0 ], 'fieldMeta' => [ + 'rank' => + [ + 'dbtype' => 'tinyint', + 'precision' => '1', + 'attributes' => 'unsigned', + 'phptype' => 'integer', + 'null' => true, + 'default' => 0, + ], 'name' => [ 'dbtype' => 'varchar', diff --git a/core/components/minishop2/model/schema/minishop2.mysql.schema.xml b/core/components/minishop2/model/schema/minishop2.mysql.schema.xml index 6ff8f3c33..33b7caab2 100644 --- a/core/components/minishop2/model/schema/minishop2.mysql.schema.xml +++ b/core/components/minishop2/model/schema/minishop2.mysql.schema.xml @@ -85,6 +85,7 @@ + diff --git a/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php b/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php new file mode 100644 index 000000000..e37bff365 --- /dev/null +++ b/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php @@ -0,0 +1,118 @@ +modx->hasPermission($this->permission)) { + return $this->modx->lexicon('access_denied'); + } + + return parent::initialize(); + } + + /** + * @return array|string + */ + public function process() + { + if (!$this->modx->getCount($this->classKey, $this->getProperty('target'))) { + return $this->failure(); + } + + $sources = json_decode($this->getProperty('sources'), true); + if (!is_array($sources)) { + return $this->failure(); + } + + foreach ($sources as $id) { + /** @var msVendor $source */ + $source = $this->modx->getObject($this->classKey, compact('id')); + /** @var msVendor $target */ + $target = $this->modx->getObject($this->classKey, ['id' => $this->getProperty('target')]); + $this->sort($source, $target); + } + $this->updateIndex(); + + return $this->modx->error->success(); + } + + /** + * @param msVendor $source + * @param msVendor $target + * + * @return array|string + */ + public function sort(msVendor $source, msVendor $target) + { + $c = $this->modx->newQuery($this->classKey); + $c->command('UPDATE'); + if ($source->get('rank') < $target->get('rank')) { + $c->query['set']['menuindex'] = [ + 'value' => '`menuindex` - 1', + 'type' => false, + ]; + $c->andCondition([ + 'rank:<=' => $target->rank, + 'rank:>' => $source->rank, + ]); + $c->andCondition([ + 'rank:>' => 0, + ]); + } else { + $c->query['set']['rank'] = [ + 'value' => '`rank` + 1', + 'type' => false, + ]; + $c->andCondition([ + 'rank:>=' => $target->rank, + 'rank:<' => $source->rank, + ]); + } + $c->prepare(); + $c->stmt->execute(); + + $source->set('rank', $target->rank); + $source->save(); + } + + /** + * + */ + public function updateIndex() + { + // Check if need to update indexes + $c = $this->modx->newQuery($this->classKey); + $c->groupby('rank'); + $c->select('COUNT(rank) as idx'); + $c->sortby('idx', 'DESC'); + $c->limit(1); + if ($c->prepare() && $c->stmt->execute()) { + if ($c->stmt->fetchColumn() == 1) { + return; + } + } + + // Update indexes + $c = $this->modx->newQuery($this->classKey); + $c->select('id'); + $c->sortby('rank ASC, id', 'ASC'); + if ($c->prepare() && $c->stmt->execute()) { + $table = $this->modx->getTableName($this->classKey); + $update = $this->modx->prepare("UPDATE {$table} SET rank = ? WHERE id = ?"); + $i = 0; + while ($id = $c->stmt->fetch(PDO::FETCH_COLUMN)) { + $update->execute([$i, $id]); + $i++; + } + } + } +} + +return 'msVendorSortProcessor'; From 0bd87c19168ecf086ef81c1bdbb241d6ef5e2011 Mon Sep 17 00:00:00 2001 From: Electrica Date: Wed, 12 Apr 2023 20:08:58 +0600 Subject: [PATCH 05/56] =?UTF-8?q?=D0=9E=D1=82=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BA=D0=BE=D0=BD=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/components/minishop2/lexicon/ru/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/ru/product.inc.php b/core/components/minishop2/lexicon/ru/product.inc.php index 947e4c346..3ab3d67cf 100644 --- a/core/components/minishop2/lexicon/ru/product.inc.php +++ b/core/components/minishop2/lexicon/ru/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Выбрать файлы'; $_lang['ms2_gallery_emptymsg'] = '

Файлов не найдено.

Вы можете загрузить их, перетащив прямо на эту панель или выбрав кнопкой вверху.

'; $_lang['ms2_gallery_errors'] = 'Ошибки при загрузке'; From b5a83375ad5bcbfe88d15462e20c9f410f1efe25 Mon Sep 17 00:00:00 2001 From: Electrica Date: Wed, 12 Apr 2023 22:59:28 +0600 Subject: [PATCH 06/56] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D1=83=20=D1=80=D0=B0=D0=BD=D0=B3=D0=B0=20=D0=B2=20=D0=B3=D1=80?= =?UTF-8?q?=D0=B8=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/minishop2/js/mgr/settings/vendor/grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/components/minishop2/js/mgr/settings/vendor/grid.js b/assets/components/minishop2/js/mgr/settings/vendor/grid.js index be7cb3b99..73f860db3 100644 --- a/assets/components/minishop2/js/mgr/settings/vendor/grid.js +++ b/assets/components/minishop2/js/mgr/settings/vendor/grid.js @@ -43,7 +43,7 @@ Ext.extend(miniShop2.grid.Vendor, miniShop2.grid.Default, { {header: _('ms2_address'), dataIndex: 'address', width: 100, sortable: true, hidden: true}, {header: _('ms2_phone'), dataIndex: 'phone', width: 75, sortable: true}, {header: _('ms2_fax'), dataIndex: 'fax', width: 75, sortable: true, hidden: true}, - {header: _('ms2_rank'), dataIndex: 'rank', width: 35, hidden: true}, + {header: _('ms2_rank'), dataIndex: 'rank', width: 35, sortable: true, hidden: true}, { header: _('ms2_actions'), dataIndex: 'actions', From fc663b091ba2f3d1165bbb7e8d44e0eb62af6dd9 Mon Sep 17 00:00:00 2001 From: Bochkarev Ivan Date: Thu, 13 Apr 2023 08:56:44 +0600 Subject: [PATCH 07/56] =?UTF-8?q?fix(badge)=20=D0=98=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=85=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=20=D0=BB=D0=B8=D0=BD=D1=82=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=D0=B0=20(#854)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(badge) Исправлено отображение прохождения тестов линтинга * fix(styles) Исправлены warning при тестировании файлов в PR * refactor(styles) Форматирование кода --- README.md | 2 +- .../minishop2/css/mgr/bootstrap.buttons.css | 42 +- assets/components/minishop2/css/mgr/main.css | 541 ++++++++++++++---- .../components/minishop2/css/web/default.css | 142 ++++- 4 files changed, 573 insertions(+), 154 deletions(-) diff --git a/README.md b/README.md index 41aa3f65f..ba4d021f9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # miniShop 2 ![Code Quality](https://github.com/modx-pro/miniShop2/actions/workflows/phpcs.yml/badge.svg) -![Test](https://github.com/modx-pro/miniShop2/actions/workflows/eslint.yml/badge.svg) +![Linting](https://github.com/modx-pro/miniShop2/actions/workflows/lint.yml/badge.svg) [![Contributors](https://img.shields.io/github/contributors/modx-pro/miniShop2.svg?style=flat-square)](https://github.com/modx-pro/miniShop2/graphs/contributors) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-2.0) diff --git a/assets/components/minishop2/css/mgr/bootstrap.buttons.css b/assets/components/minishop2/css/mgr/bootstrap.buttons.css index 3332befb7..63d1e09e5 100644 --- a/assets/components/minishop2/css/mgr/bootstrap.buttons.css +++ b/assets/components/minishop2/css/mgr/bootstrap.buttons.css @@ -4,23 +4,27 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ .btn { + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + display: inline-block; + margin-bottom: 0; + padding: 6px 12px; + + font-size: 14px; font-weight: normal; + line-height: 1.4286; text-align: center; + white-space: nowrap; vertical-align: middle; - cursor: pointer; + background-image: none; border: 1px solid transparent; - white-space: nowrap; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857143; - border-radius: 4px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none + border-radius: 4px } .btn:focus, .btn:active:focus, .btn.active:focus { @@ -35,16 +39,18 @@ } .btn:active, .btn.active { - outline: 0; background-image: none; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) + outline: 0; + -webkit-box-shadow: inset 0 3px 5px rgb(0 0 0 / 12.5%); + box-shadow: inset 0 3px 5px rgb(0 0 0 / 12.5%) } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { - cursor: not-allowed; pointer-events: none; + cursor: not-allowed; + opacity: .65; + /* stylelint-disable-next-line function-no-unknown */ filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none @@ -207,9 +213,9 @@ } .btn-link { - color: #428bca; - font-weight: normal; cursor: pointer; + font-weight: normal; + color: #428bca; border-radius: 0 } @@ -258,8 +264,8 @@ .btn-block { display: block; width: 100%; - padding-left: 0; - padding-right: 0 + padding-right: 0; + padding-left: 0 } .btn-block + .btn-block { diff --git a/assets/components/minishop2/css/mgr/main.css b/assets/components/minishop2/css/mgr/main.css index 21d17e548..fd24f19c8 100644 --- a/assets/components/minishop2/css/mgr/main.css +++ b/assets/components/minishop2/css/mgr/main.css @@ -1,30 +1,97 @@ /* Main styles */ -a.link, a.ms2-link { color: #005580; } -.x-color-palette { width: 80%; height: auto; cursor: pointer; } -.action-red { color: darkred !important; } -.x-btn-over .action-red { color: white !important; } -.action-green { color: darkgreen !important; } -.x-btn-over .action-green { color: white !important; } -.action-blue { color: cadetblue !important; } -.x-btn-over .action-blue { color: white !important; } -.action-yellow { color: goldenrod !important; } -.x-btn-over .action-yellow { color: white !important; } -.action-gray { color: dimgray !important; } -.x-btn-over .action-gray { color: white !important; } -.x-form-field-trigger-wrap.disabled input { color: #aaa; } +a.link, +a.ms2-link { + color: #005580; +} + +.x-color-palette { + cursor: pointer; + width: 80%; + height: auto; +} + +.action-red { + color: darkred !important; +} + +.x-btn-over .action-red { + color: white !important; +} + +.action-green { + color: darkgreen !important; +} + +.x-btn-over .action-green { + color: white !important; +} + +.action-blue { + color: cadetblue !important; +} + +.x-btn-over .action-blue { + color: white !important; +} + +.action-yellow { + color: goldenrod !important; +} + +.x-btn-over .action-yellow { + color: white !important; +} + +.action-gray { + color: dimgray !important; +} + +.x-btn-over .action-gray { + color: white !important; +} + +.x-form-field-trigger-wrap.disabled input { + color: #aaa; +} + /* Search field */ .x-field-search-clear, -.x-field-search-go { border-left: 1px solid #e4e4e4 !important; } +.x-field-search-go { + border-left: 1px solid #e4e4e4 !important; +} + .x-field-search-clear:hover, -.x-field-search-go:hover { border-left-color: transparent !important; } -.x-field-search-clear:before { content: '\f00d' !important; } -.x-field-search-go { right: 31px !important; border-radius: 0 !important; } -.x-field-search-go:before { content: '\f002' !important; } +.x-field-search-go:hover { + border-left-color: transparent !important; +} + +.x-field-search-clear::before { + content: "\f00d" !important; +} + +.x-field-search-go { + right: 31px !important; + border-radius: 0 !important; +} + +.x-field-search-go::before { + content: "\f002" !important; +} + /* Grids */ -.minishop2-grid .x-grid3 { border: 1px solid #e4e9ee; } +.minishop2-grid .x-grid3 { + border: 1px solid #e4e9ee; +} + .minishop2-grid .x-grid3-row-last, -.minishop2-grid .x-grid3-row-last.x-grid3-row-selected { border-bottom-color: transparent !important; } -.minishop2-grid .x-grid-group-hd div.x-grid-group-title { padding: 8px 4px 12px 5px; } +.minishop2-grid .x-grid3-row-last.x-grid3-row-selected { + border-bottom-color: transparent !important; +} + +.minishop2-grid .x-grid-group-hd div.x-grid-group-title { + padding: 8px 4px 12px 5px; +} + .minishop2-row-unpublished div, .minishop2-row-unpublished span, .minishop2-row-unpublished a, @@ -32,166 +99,432 @@ a.link, a.ms2-link { color: #005580; } font-style: italic; color: #aaa !important; } + .minishop2-row-deleted div, .minishop2-row-deleted span, .minishop2-row-deleted a { color: brown !important; text-decoration: line-through !important; } + .minishop2-row-unpublished img, .minishop2-row-deleted img, .minishop2-row-inactive img, .minishop2-row-unpublished .minishop2-row-actions, .minishop2-row-deleted .minishop2-row-actions, .minishop2-row-inactive .minishop2-row-actions { - opacity: .5; + opacity: 0.5; } + .minishop2-row-required div { font-weight: bold; } + .minishop2-row-badge { padding: 4px 10px; - border-radius: 3px; background-color: #cacaca; + border-radius: 3px; +} + +.tbar-checkbox { + text-align: left; } -.tbar-checkbox { text-align: left; } -.tbar-checkbox label { padding: 2px 0 0 22px !important; line-height: normal; } + +.tbar-checkbox label { + padding: 2px 0 0 22px !important; + line-height: normal; +} + /* Grid actions and menu */ ul.minishop2-row-actions { margin: 0; padding: 0; list-style: none; } -ul.minishop2-row-actions li { float: left; } + +ul.minishop2-row-actions li { + float: left; +} + ul.minishop2-row-actions .btn { - padding: 2px; - margin-right: 2px; min-width: 26px; + margin-right: 2px; + padding: 2px; +} + +ul.minishop2-row-actions .btn.actions-menu { + width: 40px; +} + +ul.minishop2-row-actions .btn.actions-menu::after { + content: " \f107"; +} + +a.x-menu-item .x-menu-item-text * { + cursor: pointer; +} + +a.x-menu-item .x-menu-item-text .icon { + top: auto; + line-height: 16px; +} + +.x-menu-list .icon { + min-width: 1em; + text-align: center; +} + +.ext-strict .x-menu-item-icon { + top: 5px; +} + +.x-menu-list-item:hover .icon { + color: inherit !important; +} + +.x-tab-strip li { + list-style: none; +} + +.x-grid3-col-actions { + padding: 5px 0 0 5px !important; +} + +.x-grid3-col-actions .action-red, +.x-menu .action-red { + color: darkred !important; +} + +.x-grid3-col-actions .action-green, +.x-menu .action-green { + color: darkgreen !important; +} + +.x-grid3-col-actions .action-blue, +.x-menu .action-blue { + color: cadetblue !important; +} + +.x-grid3-col-actions .action-yellow, +.x-menu .action-yellow { + color: goldenrod !important; +} + +.x-grid3-col-actions .action-gray, +.x-menu .action-gray { + color: dimgray !important; +} + +.x-grid3 .green { + color: darkgreen; } -ul.minishop2-row-actions .btn.actions-menu { width: 40px; } -ul.minishop2-row-actions .btn.actions-menu:after { content: " \f107"; } -a.x-menu-item .x-menu-item-text * { cursor: pointer; } -a.x-menu-item .x-menu-item-text .icon { line-height: 16px; top: auto; } -.x-menu-list .icon { min-width: 1em; text-align: center; } -.ext-strict .x-menu-item-icon { top: 5px; } -.x-menu-list-item:hover .icon { color: inherit !important; } -.x-tab-strip li { list-style: none; } -.x-grid3-col-actions { padding: 5px 0 0 5px !important; } -.x-grid3-col-actions .action-red, .x-menu .action-red { color: darkred !important; } -.x-grid3-col-actions .action-green, .x-menu .action-green { color: darkgreen !important; } -.x-grid3-col-actions .action-blue, .x-menu .action-blue { color: cadetblue !important; } -.x-grid3-col-actions .action-yellow, .x-menu .action-yellow { color: goldenrod !important; } -.x-grid3-col-actions .action-gray, .x-menu .action-gray { color: dimgray !important; } -.x-grid3 .green { color: darkgreen; } -.x-grid3 .red { color: darkred; } + +.x-grid3 .red { + color: darkred; +} + /* Btn */ -.x-btn.x-btn-small button.x-btn-small {font-size: 12px;padding: 0px!important; } -.minishop2-btn-action {padding: 3px 20px 3px 6px!important;} -.minishop2-btn-action i.icon {padding-right: 3px;width: 15px;} +.x-btn.x-btn-small button.x-btn-small { + padding: 0 !important; + font-size: 12px; +} + +.minishop2-btn-action { + padding: 3px 20px 3px 6px !important; +} + +.minishop2-btn-action i.icon { + width: 15px; + padding-right: 3px; +} + /* Windows */ -.minishop2-window .x-form-label-top .x-form-item label.x-form-item-label { padding-top: 15px !important; } +.minishop2-window .x-form-label-top .x-form-item label.x-form-item-label { + padding-top: 15px !important; +} + .minishop2-window .x-panel-mc, -.minishop2-window .x-tab-panel-bwrap > .x-tab-panel-body > .x-panel { margin-top: -14px; } -.minishop2-window .x-window-body.tabs { padding: 5px 10px 0 10px; } -.minishop2-window .desc { font-style: italic; padding-top: 5px; color: #555555; } +.minishop2-window .x-tab-panel-bwrap > .x-tab-panel-body > .x-panel { + margin-top: -14px; +} + +.minishop2-window .x-window-body.tabs { + padding: 5px 10px 0; +} + +.minishop2-window .desc { + padding-top: 5px; + font-style: italic; + color: #555; +} + /* Tree */ .minishop2-panel .x-tree-root-ct, -.minishop2-window .x-tree-root-ct { overflow: visible; } +.minishop2-window .x-tree-root-ct { + overflow: visible; +} + .minishop2-panel .x-tree-root-ct input, -.minishop2-window .x-tree-root-ct input { vertical-align: top; } +.minishop2-window .x-tree-root-ct input { + vertical-align: top; +} + /* Orders */ -#minishop2-form-orders { padding-top: 10px; padding-bottom: 0; } -#minishop2-form-orders .x-toolbar-left-row td:first-of-type .x-btn {margin-left: 1px;} -#minishop2-grid-orders { padding-top: 0px; } +#minishop2-form-orders { + padding-top: 10px; + padding-bottom: 0; +} + +#minishop2-form-orders .x-toolbar-left-row td:first-of-type .x-btn { + margin-left: 1px; +} + +#minishop2-grid-orders { + padding-top: 0; +} + #minishop2-orders-info { - background: #f9f9f9; height: 95px; padding: 10px; - border-radius: 5px; + text-align: center; + + background: #f9f9f9; + border-radius: 5px; } -#minishop2-orders-info table { width: 100%; } -#minishop2-orders-info td { width: 50%; } -#minishop2-orders-info .top td { font-size: 10px; } -#minishop2-orders-info .top td span { font-size: 30px; line-height: 30px; } -#minishop2-orders-info .bottom td { padding-top: 10px; font-size: 10px; } -#minishop2-orders-info .bottom td span { font-size: 30px; line-height: 30px; } + +#minishop2-orders-info table { + width: 100%; +} + +#minishop2-orders-info td { + width: 50%; +} + +#minishop2-orders-info .top td { + font-size: 10px; +} + +#minishop2-orders-info .top td span { + font-size: 30px; + line-height: 30px; +} + +#minishop2-orders-info .bottom td { + padding-top: 10px; + font-size: 10px; +} + +#minishop2-orders-info .bottom td span { + font-size: 30px; + line-height: 30px; +} + /* Order products search field */ -#minishop2-grid-order-products .x-toolbar-layout-ct table{ width: 100%; } -#minishop2-grid-order-products .x-form-field-wrap.x-form-field-trigger-wrap{ width: 99% !important; } +#minishop2-grid-order-products .x-toolbar-layout-ct table { + width: 100%; +} + +#minishop2-grid-order-products .x-form-field-wrap.x-form-field-trigger-wrap { + width: 99% !important; +} + /* Products */ .x-grid3-col-product-title, .x-grid3-col-product-image, .x-grid3-col-product-thumb, .x-grid3-col-vendor-logo, .x-grid3-col-image { + margin: 0; padding-top: 0; padding-bottom: 0; - margin: 0; } + .x-grid3-col-product-image img, .x-grid3-col-product-thumb img, .x-grid3-col-vendor-logo img, .x-grid3-col-image img { - max-height: 40px; display: block; + max-height: 40px; } -.x-grid3-col-product-title .id { font-size: 90%; padding-right: 5px; color: #555; } -.x-grid3-col-product-title .product-category { font-size: 80%; padding-top: 7px; color: #555; } -.x-grid3-col-product-title .product-category a { color: #555; text-decoration: none; } -.x-grid3-col-product-title .product-category a:hover { color: #005580; text-decoration: underline; } -.x-grid3-col-product-title .native-product { padding-top: 13px; } -.x-grid3-col-product-title .native-product .ms2-link { font-weight: bold; } -.x-grid3-col-product-title .nested-product { padding-top: 5px; } -.x-grid3-col-product-title .nested-product .ms2-link { } -#minishop2-product-tabs { margin-top: 0; padding: 5px 2px; overflow: hidden; } -#minishop2-product-tabs > .x-tab-panel-header { padding: 0 10px; } -#minishop2-product-tabs .x-tab-strip { background-color: transparent !important; } -#minishop2-product-tabs > .x-tab-panel-header > .x-tab-strip-wrap > .x-tab-strip > .x-tab-strip-active { - box-shadow: 0 -3px 0 #aaa, -1px 0 0 transparent; - border-left: 1px solid #f0f0f0; + +.x-grid3-col-product-title .id { + padding-right: 5px; + font-size: 90%; + color: #555; +} + +.x-grid3-col-product-title .product-category { + padding-top: 7px; + font-size: 80%; + color: #555; +} + +.x-grid3-col-product-title .product-category a { + color: #555; + text-decoration: none; +} + +.x-grid3-col-product-title .product-category a:hover { + color: #005580; + text-decoration: underline; +} + +.x-grid3-col-product-title .native-product { + padding-top: 13px; +} + +.x-grid3-col-product-title .native-product .ms2-link { + font-weight: bold; +} + +.x-grid3-col-product-title .nested-product { + padding-top: 5px; +} + +#minishop2-product-tabs { + overflow: hidden; + margin-top: 0; + padding: 5px 2px; +} + +#minishop2-product-tabs > .x-tab-panel-header { + padding: 0 10px; +} + +#minishop2-product-tabs .x-tab-strip { + background-color: transparent !important; +} + +#minishop2-product-tabs + > .x-tab-panel-header + > .x-tab-strip-wrap + > .x-tab-strip + > .x-tab-strip-active { border-right: 1px solid #f0f0f0; + border-left: 1px solid #f0f0f0; + -webkit-box-shadow: 0 -3px 0 #aaa, -1px 0 0 transparent; + box-shadow: 0 -3px 0 #aaa, -1px 0 0 transparent; +} + +#minishop2-product-tabs .x-tab-strip li.x-tab-strip-active::before { + top: 100%; +} + +#minishop2-product-tabs .x-tab-strip li { + color: #111; +} + +#minishop2-product-tabs .x-tab-strip .x-tab-strip-text { + font-size: 90%; + line-height: 2; +} + +#minishop2-product-tabs > .x-tab-panel-bwrap { + margin-top: -1px; + border: 1px solid #f0f0f0; } -#minishop2-product-tabs .x-tab-strip li.x-tab-strip-active:before { top: 100%; } -#minishop2-product-tabs .x-tab-strip li { color: #111; } -#minishop2-product-tabs .x-tab-strip .x-tab-strip-text { line-height: 2; font-size: 90%; } -#minishop2-product-tabs > .x-tab-panel-bwrap { border: 1px solid #f0f0f0; margin-top: -1px; } -#minishop2-categories-tree { overflow: hidden; } -#minishop2-product-image-wrap { text-align: center; } -#minishop2-product-image { max-width: 100%; height: auto; } + +#minishop2-categories-tree { + overflow: hidden; +} + +#minishop2-product-image-wrap { + text-align: center; +} + +#minishop2-product-image { + max-width: 100%; + height: auto; +} + /* Gallery */ -#minishop2-gallery-page.drag-over:after { +#minishop2-gallery-page.drag-over::after { content: ""; + + position: absolute; top: 0; right: 0; bottom: 0; left: 0; - position: absolute; + display: block; + opacity: 0.1; background: forestgreen; border: 5px solid darkgreen; } + /* Images list */ -.minishop2-gallery-images { float: left; } -#minishop2-gallery-images-view { min-height: 150px; } -.minishop2-gallery-thumb-wrap:hover { border: 1px solid #aaa; } -.minishop2-gallery-thumb { width: 120px; height: 90px; } -.minishop2-gallery-thumb img { max-width: 120px; max-height: 90px; display: block; margin: auto; } -.minishop2-gallery-window-thumb { border: 1px solid #e4e4e4; border-radius: 2px; background: #fdfdfd; } +.minishop2-gallery-images { + float: left; +} + +#minishop2-gallery-images-view { + min-height: 150px; +} + +.minishop2-gallery-thumb-wrap:hover { + border: 1px solid #aaa; +} + +.minishop2-gallery-thumb { + width: 120px; + height: 90px; +} + +.minishop2-gallery-thumb img { + display: block; + max-width: 120px; + max-height: 90px; + margin: auto; +} + +.minishop2-gallery-window-thumb { + background: #fdfdfd; + border: 1px solid #e4e4e4; + border-radius: 2px; +} + /* Gallery image window */ -.minishop2-gallery-cba .x-form-cb-label { margin-top: 6px; } -.minishop2-gallery-window-link { width: 100%; display: block; text-align: center; } -.minishop2-gallery-window-details { width: 100%; font-size: 12px; } -.minishop2-gallery-window-details th { text-align: right; padding-right: 5px; width: 50%; } +.minishop2-gallery-cba .x-form-cb-label { + margin-top: 6px; +} + +.minishop2-gallery-window-link { + display: block; + width: 100%; + text-align: center; +} + +.minishop2-gallery-window-details { + width: 100%; + font-size: 12px; +} + +.minishop2-gallery-window-details th { + width: 50%; + padding-right: 5px; + text-align: right; +} + /* Settings */ -.x-grid3-col-color { padding-top: 10px; padding-bottom: 10px; } -.status-color { width: 30px; height: 20px; border-radius: 3px; } +.x-grid3-col-color { + padding-top: 10px; + padding-bottom: 10px; +} + +.status-color { + width: 30px; + height: 20px; + border-radius: 3px; +} /* Product extra options */ .option-in-extra-column.option-xdatetime.x-no-time .ux-datetime-time { display: none; } + .option-in-extra-column.option-xdatetime.x-no-time .x-datetime-wrap { - margin-top: 0px; + margin-top: 0; } diff --git a/assets/components/minishop2/css/web/default.css b/assets/components/minishop2/css/web/default.css index f843c41d7..c019df028 100644 --- a/assets/components/minishop2/css/web/default.css +++ b/assets/components/minishop2/css/web/default.css @@ -1,13 +1,23 @@ /* Messages */ @import url("./lib/jquery.jgrowl.min.css"); + div.jGrowl > .ui-state-highlight { - background: inherit; color: inherit; + background: inherit; border: inherit; } -.ms2-message-success { background-color: green !important; } -.ms2-message-error { background-color: brown !important; } -.ms2-message-info { background-color: black !important; } + +.ms2-message-success { + background-color: green !important; +} + +.ms2-message-error { + background-color: brown !important; +} + +.ms2-message-info { + background-color: black !important; +} /* Cart */ #msCart th.count, @@ -17,63 +27,133 @@ div.jGrowl > .ui-state-highlight { .ms-count, .ms-weight, .ms-price, -.ms-remove { width: 15%; } -.js #msCart [type="submit"][value="cart/change"] { display: none; } +.ms-remove { + width: 15%; +} + +.js #msCart [type="submit"][value="cart/change"] { + display: none; +} + +#msMiniCart, +.msMiniCart { + font-size: 0.8em; +} + +#msMiniCart h5, +.msMiniCart h5 { + margin: 0; +} -#msMiniCart, .msMiniCart { font-size: .8em; } -#msMiniCart h5, .msMiniCart h5 { margin: 0; } -#msMiniCart .empty, .msMiniCart .empty { display: block; } -#msMiniCart .not_empty, .msMiniCart .not_empty { display: none; } -#msMiniCart.full .empty, .msMiniCart.full .empty { display: none; } -#msMiniCart.full .not_empty, .msMiniCart.full .not_empty { display: block; } +#msMiniCart .empty, +.msMiniCart .empty { + display: block; +} + +#msMiniCart .not_empty, +.msMiniCart .not_empty { + display: none; +} + +#msMiniCart.full .empty, +.msMiniCart.full .empty { + display: none; +} + +#msMiniCart.full .not_empty, +.msMiniCart.full .not_empty { + display: block; +} /* Product */ -#msProduct .old_price, #msCart .old_price, .ms2_product .old_price { - color: brown; +#msProduct .old_price, +#msCart .old_price, +.ms2_product .old_price { font-style: italic; + color: brown; text-decoration: line-through; } /* Order */ -#msOrder { margin-top: 50px; } -#msOrder .radio { min-height: 30px; margin-bottom: 10px; } -#msOrder .radio img { max-height: 30px; margin-top: -2px; padding: 0 10px; } -#msOrder .required-star { display: none; color: brown; } -#msOrder .required .required-star { display: inline; } -#msOrder .error { border: 1px solid brown !important; } +#msOrder { + margin-top: 50px; +} + +#msOrder .radio { + min-height: 30px; + margin-bottom: 10px; +} + +#msOrder .radio img { + max-height: 30px; + margin-top: -2px; + padding: 0 10px; +} + +#msOrder .required-star { + display: none; + color: brown; +} + +#msOrder .required .required-star { + display: inline; +} + +#msOrder .error { + border: 1px solid brown !important; +} /* Logs */ -.msProductsLog, .msGalleryLog, .msCartLog, .msOrderLog, .msGetOrderLog { - width: 100%; +.msProductsLog, +.msGalleryLog, +.msCartLog, +.msOrderLog, +.msGetOrderLog { overflow: auto; + width: 100%; word-wrap: normal; white-space: pre; } /* Input Number */ -.ms-hidden{ +.ms-hidden { position: absolute !important; - opacity: 0; - visibility: hidden; z-index: -10000 !important; + visibility: hidden; + opacity: 0; } -.ms-input-number-wrap{ + +.ms-input-number-wrap { + display: -webkit-box; + display: flexbox; display: flex; font-size: 16px; } -.ms-input-number-emulator{ + +.ms-input-number-emulator { width: 3em; text-align: center; - border: none; background-color: transparent; + border: none; } -.ms-input-number-emulator:focus, .ms-input-number-emulator:active{ + +.ms-input-number-emulator:focus, +.ms-input-number-emulator:active { + border: none; outline: none; + -webkit-box-shadow: none; box-shadow: none; - border: none; } -.ms-input-number-btn{ + +.ms-input-number-btn { + display: -webkit-box; + display: flexbox; display: flex; align-items: center; justify-content: center; + + -webkit-box-align: center; + -webkit-box-pack: center; + -ms-flex-align: center; + -ms-flex-pack: center; } From 7234212049472199c15754a251dc6d79fc093a70 Mon Sep 17 00:00:00 2001 From: Electrica Date: Thu, 13 Apr 2023 15:34:38 +0600 Subject: [PATCH 08/56] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D1=83=20msVendor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/minishop2/mysql/msvendor.map.inc.php | 4 ++-- .../processors/mgr/settings/vendor/create.class.php | 12 ++++++++++++ .../processors/mgr/settings/vendor/sort.class.php | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php b/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php index 3d75b20c6..bf7d36af2 100644 --- a/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php +++ b/core/components/minishop2/model/minishop2/mysql/msvendor.map.inc.php @@ -23,8 +23,8 @@ [ 'rank' => [ - 'dbtype' => 'tinyint', - 'precision' => '1', + 'dbtype' => 'int', + 'precision' => '10', 'attributes' => 'unsigned', 'phptype' => 'integer', 'null' => true, diff --git a/core/components/minishop2/processors/mgr/settings/vendor/create.class.php b/core/components/minishop2/processors/mgr/settings/vendor/create.class.php index f8fc703d5..7d99f5f71 100644 --- a/core/components/minishop2/processors/mgr/settings/vendor/create.class.php +++ b/core/components/minishop2/processors/mgr/settings/vendor/create.class.php @@ -20,6 +20,18 @@ public function initialize() return parent::initialize(); } + /** + * @return bool + */ + public function beforeSave() + { + $this->object->fromArray([ + 'rank' => $this->modx->getCount($this->classKey), + ]); + + return parent::beforeSave(); + } + /** * @return bool */ diff --git a/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php b/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php index e37bff365..3a613885b 100644 --- a/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php +++ b/core/components/minishop2/processors/mgr/settings/vendor/sort.class.php @@ -54,8 +54,8 @@ public function sort(msVendor $source, msVendor $target) $c = $this->modx->newQuery($this->classKey); $c->command('UPDATE'); if ($source->get('rank') < $target->get('rank')) { - $c->query['set']['menuindex'] = [ - 'value' => '`menuindex` - 1', + $c->query['set']['rank'] = [ + 'value' => '`rank` - 1', 'type' => false, ]; $c->andCondition([ From d42f92fe3f2576efdb507b30c0a3b0b8e4ddcb3c Mon Sep 17 00:00:00 2001 From: Electrica Date: Thu, 13 Apr 2023 21:43:06 +0600 Subject: [PATCH 09/56] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D1=83=20=D0=B2=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=85=20=D0=BE=D0=BF=D0=BB=D0=B0=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minishop2/model/minishop2/mysql/mspayment.map.inc.php | 4 ++-- .../minishop2/model/schema/minishop2.mysql.schema.xml | 2 +- .../minishop2/processors/mgr/settings/payment/sort.class.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/components/minishop2/model/minishop2/mysql/mspayment.map.inc.php b/core/components/minishop2/model/minishop2/mysql/mspayment.map.inc.php index cdc494a83..be4d852fc 100644 --- a/core/components/minishop2/model/minishop2/mysql/mspayment.map.inc.php +++ b/core/components/minishop2/model/minishop2/mysql/mspayment.map.inc.php @@ -48,8 +48,8 @@ ], 'rank' => [ - 'dbtype' => 'tinyint', - 'precision' => '1', + 'dbtype' => 'int', + 'precision' => '10', 'attributes' => 'unsigned', 'phptype' => 'integer', 'null' => true, diff --git a/core/components/minishop2/model/schema/minishop2.mysql.schema.xml b/core/components/minishop2/model/schema/minishop2.mysql.schema.xml index 6ff8f3c33..b6c91bbfd 100644 --- a/core/components/minishop2/model/schema/minishop2.mysql.schema.xml +++ b/core/components/minishop2/model/schema/minishop2.mysql.schema.xml @@ -204,7 +204,7 @@ - diff --git a/core/components/minishop2/processors/mgr/settings/payment/sort.class.php b/core/components/minishop2/processors/mgr/settings/payment/sort.class.php index 7ee4ac7b1..a0bfee359 100644 --- a/core/components/minishop2/processors/mgr/settings/payment/sort.class.php +++ b/core/components/minishop2/processors/mgr/settings/payment/sort.class.php @@ -53,8 +53,8 @@ public function sort(msPayment $source, msPayment $target) $c = $this->modx->newQuery($this->classKey); $c->command('UPDATE'); if ($source->get('rank') < $target->get('rank')) { - $c->query['set']['menuindex'] = [ - 'value' => '`menuindex` - 1', + $c->query['set']['rank'] = [ + 'value' => '`rank` - 1', 'type' => false, ]; $c->andCondition([ From 269498ddd41692fca6d34f96f39b0a311cd7b452 Mon Sep 17 00:00:00 2001 From: webinmd <89poilo@gmail.com> Date: Wed, 19 Apr 2023 00:37:12 +0300 Subject: [PATCH 10/56] Fix issue 845 - wrong delivery price --- core/components/minishop2/handlers/msdeliveryhandler.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/components/minishop2/handlers/msdeliveryhandler.class.php b/core/components/minishop2/handlers/msdeliveryhandler.class.php index 669e4e4dc..d4d6bb179 100644 --- a/core/components/minishop2/handlers/msdeliveryhandler.class.php +++ b/core/components/minishop2/handlers/msdeliveryhandler.class.php @@ -47,7 +47,7 @@ public function getCost(msOrderInterface $order, msDelivery $delivery, $cost = 0 $add_price = $delivery->get('price'); if (preg_match('/%$/', $add_price)) { $add_price = str_replace('%', '', $add_price); - $add_price = $cost / 100 * $add_price; + $add_price = $cart['total_cost'] / 100 * $add_price; } } From ec46435b78fbe64628ac70a3dcf8f792718882df Mon Sep 17 00:00:00 2001 From: Ruslan-Aleev Date: Wed, 19 Apr 2023 14:55:57 +0400 Subject: [PATCH 11/56] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF=D1=83=D0=BD?= =?UTF-8?q?=D0=BA=D1=82=20=D0=BC=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _build/data/transport.menu.php | 6 ++++++ core/components/minishop2/lexicon/ru/default.inc.php | 2 ++ 2 files changed, 8 insertions(+) diff --git a/_build/data/transport.menu.php b/_build/data/transport.menu.php index 0ac64c04d..9a6859a97 100644 --- a/_build/data/transport.menu.php +++ b/_build/data/transport.menu.php @@ -30,6 +30,12 @@ 'action' => 'system/settings', 'params' => '&ns=minishop2', ], + 'ms2_help' => [ + 'description' => 'ms2_help_desc', + 'parent' => 'minishop2', + 'menuindex' => 3, + 'action' => 'mgr/help', + ], ]; foreach ($tmp as $k => $v) { diff --git a/core/components/minishop2/lexicon/ru/default.inc.php b/core/components/minishop2/lexicon/ru/default.inc.php index d93e2d4b5..339f02ac8 100644 --- a/core/components/minishop2/lexicon/ru/default.inc.php +++ b/core/components/minishop2/lexicon/ru/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Теги'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'кг.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Связь товаров'; $_lang['ms2_links'] = 'Связи товаров'; $_lang['ms2_links_intro'] = 'Список возможных связей товаров друг с другом. Тип связи характеризует, как именно она будет работать, его нельзя создавать, можно только выбрать из списка.'; From f8d37eae5e2a5a3eac7150ebe702db3cb07ebcef Mon Sep 17 00:00:00 2001 From: Ruslan-Aleev Date: Wed, 19 Apr 2023 15:06:12 +0400 Subject: [PATCH 12/56] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/components/minishop2/css/mgr/help.css | 101 +++++++++++ .../minishop2/controllers/mgr/help.class.php | 51 ++++++ .../minishop2/lexicon/ru/help.inc.php | 43 +++++ .../minishop2/templates/default/help.tpl | 161 ++++++++++++++++++ 4 files changed, 356 insertions(+) create mode 100644 assets/components/minishop2/css/mgr/help.css create mode 100644 core/components/minishop2/controllers/mgr/help.class.php create mode 100644 core/components/minishop2/lexicon/ru/help.inc.php create mode 100644 core/components/minishop2/templates/default/help.tpl diff --git a/assets/components/minishop2/css/mgr/help.css b/assets/components/minishop2/css/mgr/help.css new file mode 100644 index 000000000..1df94cf14 --- /dev/null +++ b/assets/components/minishop2/css/mgr/help.css @@ -0,0 +1,101 @@ +#minishop2-help-text { + width: 100%; + background: #fff; + border: 1px solid #e4e4e4; + border-radius: 3px; + box-sizing: border-box; + box-shadow: 0 1px 0 #e4e4e4; + margin: 1.5em 0; + padding: 18px; +} + +#minishop2-help-text .icon { + margin-right: 5px; +} + +#minishop2-help-text img { + float: right; + max-height: 100px; + padding-left: 30px; +} + +#minishop2-help-text p { + margin-bottom: 1.2em; +} + +#minishop2-help-text p:last-child { + margin-bottom: 0; +} + +#minishop2-help-text textarea { + width: calc(100% - 10px); + height: 250px; +} + +#minishop2-help-links { + width: 100%; + margin-bottom: 1em; + overflow: hidden; +} + +#minishop2-help-links ul { + margin: 0; + width: 100%; +} + +#minishop2-help-links ul li { + float: left; + display: table; + min-height: 130px; + position: relative; + box-sizing: border-box; + margin: 0; + padding: 0 1%; + width: 16.5%; +} + +@media (max-width: 1023px) { + #minishop2-help-links ul li { + padding: 5px; + width: 33%; + } +} + +#minishop2-help-links ul li a { + background-color: #fff; + border: 1px solid #e4e4e4; + border-radius: 3px; + box-shadow: 0 1px 0 #e4e4e4; + color: #53595f; + display: table-cell; + font-weight: bold; + padding: 10px; + position: relative; + text-align: center; + text-decoration: none; + vertical-align: middle; +} + +#minishop2-help-links ul li a span { + display: block; + line-height: 1.2; +} + +#minishop2-help-links ul li a .title { + font-size: 12px; +} + +#minishop2-help-links ul li a .text { + font-weight: normal; +} + +#minishop2-help-links ul li a .icon { + display: block; + margin: 0 auto; + padding: 0 0 10px; + width: auto; +} + +#minishop2-help-links ul li a:hover .icon { + color: #3697cd; +} \ No newline at end of file diff --git a/core/components/minishop2/controllers/mgr/help.class.php b/core/components/minishop2/controllers/mgr/help.class.php new file mode 100644 index 000000000..ee31ba417 --- /dev/null +++ b/core/components/minishop2/controllers/mgr/help.class.php @@ -0,0 +1,51 @@ +modx->lexicon('ms2_help') . ' | miniShop2'; + } + + /** + * @return array + */ + public function getLanguageTopics() + { + return ['minishop2:help']; + } + + /** + * + */ + public function loadCustomCssJs() + { + $this->addCss($this->miniShop2->config['cssUrl'] . 'mgr/help.css'); + } + + /** + * @param array $scriptProperties + * @return mixed + */ + public function process(array $scriptProperties = []) { + $placeholders = []; + $placeholders['logo'] = $this->miniShop2->config['defaultThumb']; + $placeholders['changelog'] = file_get_contents(dirname(__FILE__, 3) . '/docs/changelog.txt'); + + return $placeholders; + } + + /** + * @return string + */ + public function getTemplateFile() { + return dirname(__FILE__, 3) . '/templates/default/help.tpl'; + } +} diff --git a/core/components/minishop2/lexicon/ru/help.inc.php b/core/components/minishop2/lexicon/ru/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/ru/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; diff --git a/core/components/minishop2/templates/default/help.tpl b/core/components/minishop2/templates/default/help.tpl new file mode 100644 index 000000000..50128e86d --- /dev/null +++ b/core/components/minishop2/templates/default/help.tpl @@ -0,0 +1,161 @@ +
+
+

{$_lang.ms2_help}

+ +
+ {if $logo} + + {/if} + +

+ {$_lang.ms2_help_text} +

+ + + +
+ +

+ {$_lang.ms2_help_text_support} +

+
+ + + + {if $changelog} +
+ +
+ {/if} +
+
From 65d3b6122bc52dd7d482d7eedea23df02ce0b2bf Mon Sep 17 00:00:00 2001 From: Bochkarev Ivan Date: Wed, 19 Apr 2023 20:25:51 +0600 Subject: [PATCH 13/56] Update help.css --- assets/components/minishop2/css/mgr/help.css | 48 ++++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/assets/components/minishop2/css/mgr/help.css b/assets/components/minishop2/css/mgr/help.css index 1df94cf14..59b740939 100644 --- a/assets/components/minishop2/css/mgr/help.css +++ b/assets/components/minishop2/css/mgr/help.css @@ -1,14 +1,16 @@ #minishop2-help-text { + box-sizing: border-box; width: 100%; + margin: 24px 0; + padding: 18px; + background: #fff; border: 1px solid #e4e4e4; border-radius: 3px; - box-sizing: border-box; box-shadow: 0 1px 0 #e4e4e4; - margin: 1.5em 0; - padding: 18px; } + #minishop2-help-text .icon { margin-right: 5px; } @@ -20,7 +22,7 @@ } #minishop2-help-text p { - margin-bottom: 1.2em; + margin-bottom: 20px; } #minishop2-help-text p:last-child { @@ -33,47 +35,53 @@ } #minishop2-help-links { + overflow: hidden; width: 100%; margin-bottom: 1em; - overflow: hidden; } #minishop2-help-links ul { - margin: 0; width: 100%; + margin: 0; } #minishop2-help-links ul li { + position: relative; + float: left; display: table; - min-height: 130px; - position: relative; + box-sizing: border-box; + width: 16.5%; + min-height: 130px; margin: 0; padding: 0 1%; - width: 16.5%; } -@media (max-width: 1023px) { +@media (width <= 1023px) { #minishop2-help-links ul li { - padding: 5px; width: 33%; + padding: 5px; } } #minishop2-help-links ul li a { - background-color: #fff; - border: 1px solid #e4e4e4; - border-radius: 3px; - box-shadow: 0 1px 0 #e4e4e4; - color: #53595f; + position: relative; + display: table-cell; - font-weight: bold; + padding: 10px; - position: relative; + + font-weight: bold; + color: #53595f; text-align: center; text-decoration: none; vertical-align: middle; + + background-color: #fff; + border: 1px solid #e4e4e4; + border-radius: 3px; + box-shadow: 0 1px 0 #e4e4e4; } #minishop2-help-links ul li a span { @@ -91,11 +99,11 @@ #minishop2-help-links ul li a .icon { display: block; + width: auto; margin: 0 auto; padding: 0 0 10px; - width: auto; } #minishop2-help-links ul li a:hover .icon { color: #3697cd; -} \ No newline at end of file +} From ec7e5562e3a76955018f1e0d5ff7d60fcae5806f Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:06 +0400 Subject: [PATCH 14/56] New translations default.inc.php (Romanian) --- core/components/minishop2/lexicon/ro/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/ro/default.inc.php b/core/components/minishop2/lexicon/ro/default.inc.php index 873cf3cb8..3751cf56a 100644 --- a/core/components/minishop2/lexicon/ro/default.inc.php +++ b/core/components/minishop2/lexicon/ro/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Tagg-uri'; $_lang['ms2_frontend_text_address'] = 'Adresa'; $_lang['ms2_frontend_weight_unit'] = 'kg.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Legătura produselor'; $_lang['ms2_links'] = 'Legăturile produselor'; $_lang['ms2_links_intro'] = 'Lista posibilelor legături ale mărfurilor între ele. Tipul de legătură caracterizează modul în care va funcționa, el nu poate fi creat, numai ales din listă.'; From ffab039932218110982b175ade91dbe6a88da6b9 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:07 +0400 Subject: [PATCH 15/56] New translations help.inc.php (Romanian) --- .../minishop2/lexicon/ro/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/ro/help.inc.php diff --git a/core/components/minishop2/lexicon/ro/help.inc.php b/core/components/minishop2/lexicon/ro/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/ro/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From 8798269d21edbf487a3cc014fbd6593ba6ce18d8 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:08 +0400 Subject: [PATCH 16/56] New translations default.inc.php (French) --- core/components/minishop2/lexicon/fr/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/fr/default.inc.php b/core/components/minishop2/lexicon/fr/default.inc.php index 2abfb64b1..4e1d826de 100644 --- a/core/components/minishop2/lexicon/fr/default.inc.php +++ b/core/components/minishop2/lexicon/fr/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Étiquettes'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'kg'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Lien de produits'; $_lang['ms2_links'] = 'Lien de produits'; $_lang['ms2_links_intro'] = 'Liste des liens possible de produits entre eux. Le type de connexion décrit exactement comment il va fonctionner, il n\'est pas possible d\'en créer de nouveau, vous pouvez seulement le sélectionner dans la liste.'; From 3c72bded3f77349d4c2b7dd1bfc0f471e57914b3 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:09 +0400 Subject: [PATCH 17/56] New translations help.inc.php (French) --- .../minishop2/lexicon/fr/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/fr/help.inc.php diff --git a/core/components/minishop2/lexicon/fr/help.inc.php b/core/components/minishop2/lexicon/fr/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/fr/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From e68f84269d879c49e2593da0afb689bdb17429b6 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:10 +0400 Subject: [PATCH 18/56] New translations default.inc.php (Belarusian) --- core/components/minishop2/lexicon/be/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/be/default.inc.php b/core/components/minishop2/lexicon/be/default.inc.php index 0275b41c4..49d73eee3 100644 --- a/core/components/minishop2/lexicon/be/default.inc.php +++ b/core/components/minishop2/lexicon/be/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Тэгі'; $_lang['ms2_frontend_text_address'] = 'Адрас адным радком'; $_lang['ms2_frontend_weight_unit'] = 'кг.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Сувязь тавараў'; $_lang['ms2_links'] = 'Сувязі тавараў'; $_lang['ms2_links_intro'] = 'Спіс магчымых сувязяў тавараў адзін з адным. Тып сувязі характарызуе, як менавіта яна будзе працаваць, яго нельга ствараць, можна толькі выбраць з спісу.'; From 839501c14f6c3777985373c0eb83248011ddf5a9 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:11 +0400 Subject: [PATCH 19/56] New translations help.inc.php (Belarusian) --- .../minishop2/lexicon/be/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/be/help.inc.php diff --git a/core/components/minishop2/lexicon/be/help.inc.php b/core/components/minishop2/lexicon/be/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/be/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From b3a8f0cbdcfb2137a4572215ad6e53782c0a71be Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:12 +0400 Subject: [PATCH 20/56] New translations default.inc.php (German) --- core/components/minishop2/lexicon/de/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/de/default.inc.php b/core/components/minishop2/lexicon/de/default.inc.php index 849550946..419149ee4 100644 --- a/core/components/minishop2/lexicon/de/default.inc.php +++ b/core/components/minishop2/lexicon/de/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Tags'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'kg'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Produktlink'; $_lang['ms2_links'] = 'Produktlinks'; $_lang['ms2_links_intro'] = 'The list of possible links of goods with each other. Connection type describes exactly how it will work, it is impossible to create, you can only select from the list.'; From a3072291e0ca272b3108d1100f5a3388f8a64941 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:13 +0400 Subject: [PATCH 21/56] New translations help.inc.php (German) --- .../minishop2/lexicon/de/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/de/help.inc.php diff --git a/core/components/minishop2/lexicon/de/help.inc.php b/core/components/minishop2/lexicon/de/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/de/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From 99d8ae1501b6c54f7ebd7d42ff6708c410ce5bb9 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:14 +0400 Subject: [PATCH 22/56] New translations default.inc.php (Greek) --- core/components/minishop2/lexicon/el/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/el/default.inc.php b/core/components/minishop2/lexicon/el/default.inc.php index 392bf5d85..86b1d626d 100644 --- a/core/components/minishop2/lexicon/el/default.inc.php +++ b/core/components/minishop2/lexicon/el/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Ετικέτες'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'pt.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Σύνδεσμος των προϊόντων'; $_lang['ms2_links'] = 'Σύνδεσμοι των προϊόντων'; $_lang['ms2_links_intro'] = 'Η λίστα των πιθανών συνδέσμων των προϊόντων μεταξύ τους. Ο τύπος σύνδεσης περιγράφει ακριβώς πως θα λειτουρήσει, είναι αδύνατο να δημιουργηθεί, μπορείτε μόνο να επιλέξετε από τη λίστα.'; From ef7d4c1846a72080db31d5040e31ae1087d9b29e Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:14 +0400 Subject: [PATCH 23/56] New translations help.inc.php (Greek) --- .../minishop2/lexicon/el/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/el/help.inc.php diff --git a/core/components/minishop2/lexicon/el/help.inc.php b/core/components/minishop2/lexicon/el/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/el/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From 4cd2f0ccab32edd5381a179ad766e41595448385 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:15 +0400 Subject: [PATCH 24/56] New translations default.inc.php (Italian) --- core/components/minishop2/lexicon/it/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/it/default.inc.php b/core/components/minishop2/lexicon/it/default.inc.php index 7d216c4e6..619182f55 100644 --- a/core/components/minishop2/lexicon/it/default.inc.php +++ b/core/components/minishop2/lexicon/it/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Gairės'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'kg'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Prekių sąryšis'; $_lang['ms2_links'] = 'Prekių sąryšiai'; $_lang['ms2_links_intro'] = 'Galimų prekių tarpusavio susiejimo būdų sąrašas. Sąryšio tipas nurodo, kaip būtent sąryšis veiks. Naujų sąryšio tipų kurti negalima, privaloma rinktis vieną iš esamų.'; From c8493ff442ea59a1df0a875b7b356f39c025472f Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:16 +0400 Subject: [PATCH 25/56] New translations help.inc.php (Italian) --- .../minishop2/lexicon/it/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/it/help.inc.php diff --git a/core/components/minishop2/lexicon/it/help.inc.php b/core/components/minishop2/lexicon/it/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/it/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From d928edec00fe622332c8b7e15ae2b9af48e2a580 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:17 +0400 Subject: [PATCH 26/56] New translations default.inc.php (Lithuanian) --- core/components/minishop2/lexicon/lt/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/lt/default.inc.php b/core/components/minishop2/lexicon/lt/default.inc.php index 4af10532b..3250df45d 100644 --- a/core/components/minishop2/lexicon/lt/default.inc.php +++ b/core/components/minishop2/lexicon/lt/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Gairės'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'kg'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Prekių sąryšis'; $_lang['ms2_links'] = 'Prekių sąryšiai'; $_lang['ms2_links_intro'] = 'Galimų prekių tarpusavio susiejimo būdų sąrašas. Sąryšio tipas nurodo, kaip būtent sąryšis veiks. Naujų sąryšio tipų kurti negalima, privaloma rinktis vieną iš esamų.'; From b670b2e166c67db17d892cc23c3b0d2739236b19 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:18 +0400 Subject: [PATCH 27/56] New translations help.inc.php (Lithuanian) --- .../minishop2/lexicon/lt/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/lt/help.inc.php diff --git a/core/components/minishop2/lexicon/lt/help.inc.php b/core/components/minishop2/lexicon/lt/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/lt/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From 113c930d2e8c7b2ce75ad040b0d2e6bec5ca858e Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:19 +0400 Subject: [PATCH 28/56] New translations default.inc.php (Dutch) --- core/components/minishop2/lexicon/nl/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/nl/default.inc.php b/core/components/minishop2/lexicon/nl/default.inc.php index 007cbc18c..e088995bb 100755 --- a/core/components/minishop2/lexicon/nl/default.inc.php +++ b/core/components/minishop2/lexicon/nl/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Tags'; $_lang['ms2_frontend_text_address'] = 'Адрес одной строкой'; $_lang['ms2_frontend_weight_unit'] = 'kg.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Verband tussen goederen'; $_lang['ms2_links'] = 'Verbanden tussen goederen'; $_lang['ms2_links_intro'] = 'Lijst van mogelijke onderlingen verbanden tussen producten. Het geselecteerde verband beschrijft precies hoe het zal werken. Het is niet mogelijk om verbanden toe te voegen, je kunt alleen een verband selecteren uit de lijst.'; From 78a9ff05439da3a67a18b5ff1dd4da0cbe585812 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:20 +0400 Subject: [PATCH 29/56] New translations help.inc.php (Dutch) --- .../minishop2/lexicon/nl/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/nl/help.inc.php diff --git a/core/components/minishop2/lexicon/nl/help.inc.php b/core/components/minishop2/lexicon/nl/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/nl/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From 7aba37b6c60c8329ed16015fd1e66318176d2a8a Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:21 +0400 Subject: [PATCH 30/56] New translations default.inc.php (Ukrainian) --- core/components/minishop2/lexicon/uk/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/uk/default.inc.php b/core/components/minishop2/lexicon/uk/default.inc.php index 04ca9ec9f..6ab1a9675 100644 --- a/core/components/minishop2/lexicon/uk/default.inc.php +++ b/core/components/minishop2/lexicon/uk/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Теги'; $_lang['ms2_frontend_text_address'] = 'Адреса одним рядком'; $_lang['ms2_frontend_weight_unit'] = 'кг.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Звʼязок товарів'; $_lang['ms2_links'] = 'Звʼязки товарів'; $_lang['ms2_links_intro'] = 'Перелік доступних звʼязків товарів один з одним. Тип звʼязку характеризує те, як саме він буде працювати, його неможливо створювати, можна тільки вибрати із переліку.'; From 535d8300bf4131c89860d5971515be60e71b2dbc Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:21 +0400 Subject: [PATCH 31/56] New translations help.inc.php (Ukrainian) --- .../minishop2/lexicon/uk/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/uk/help.inc.php diff --git a/core/components/minishop2/lexicon/uk/help.inc.php b/core/components/minishop2/lexicon/uk/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/uk/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From 0c5654c274a49cfb306a54a41a8dc2339f023286 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:22 +0400 Subject: [PATCH 32/56] New translations default.inc.php (English) --- core/components/minishop2/lexicon/en/default.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/components/minishop2/lexicon/en/default.inc.php b/core/components/minishop2/lexicon/en/default.inc.php index 80969e32e..695c02bc4 100644 --- a/core/components/minishop2/lexicon/en/default.inc.php +++ b/core/components/minishop2/lexicon/en/default.inc.php @@ -124,6 +124,8 @@ $_lang['ms2_frontend_tags'] = 'Tags'; $_lang['ms2_frontend_text_address'] = 'Address'; $_lang['ms2_frontend_weight_unit'] = 'lbs.'; +$_lang['ms2_help'] = 'Помощь и поддержка'; +$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; $_lang['ms2_link'] = 'Product link'; $_lang['ms2_links'] = 'Product links'; $_lang['ms2_links_intro'] = 'The list of possible links of goods with each other. Connection type describes exactly how it will work, it is impossible to create, you can only select from the list.'; From 892b5bd863c7e0b7d1cadab9534c0ab96cda4439 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Wed, 19 Apr 2023 21:54:23 +0400 Subject: [PATCH 33/56] New translations help.inc.php (English) --- .../minishop2/lexicon/en/help.inc.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 core/components/minishop2/lexicon/en/help.inc.php diff --git a/core/components/minishop2/lexicon/en/help.inc.php b/core/components/minishop2/lexicon/en/help.inc.php new file mode 100644 index 000000000..e2bf258db --- /dev/null +++ b/core/components/minishop2/lexicon/en/help.inc.php @@ -0,0 +1,43 @@ +Вы можете поддержать miniShop2: +
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; +
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; +
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; +$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_lang['ms2_localization_text'] = 'Помогите с переводом'; +$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; +$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; From a51d9907fd2cc6bab937e7541a45d0ed69343fbc Mon Sep 17 00:00:00 2001 From: Electrica Date: Thu, 20 Apr 2023 20:40:17 +0600 Subject: [PATCH 34/56] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=B2=D0=B5=D0=BD=D0=B4=D0=BE=D1=80=D0=B0=20#861?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _build/data/transport.events.php | 6 ++++++ .../processors/mgr/settings/vendor/create.class.php | 2 ++ .../processors/mgr/settings/vendor/remove.class.php | 2 ++ .../processors/mgr/settings/vendor/update.class.php | 2 ++ 4 files changed, 12 insertions(+) diff --git a/_build/data/transport.events.php b/_build/data/transport.events.php index acf3cc9f3..b87bb4270 100644 --- a/_build/data/transport.events.php +++ b/_build/data/transport.events.php @@ -54,6 +54,12 @@ 'msOnManagerCustomCssJs', + 'msOnBeforeVendorCreate', + 'msOnAfterVendorCreate', + 'msOnBeforeVendorUpdate', + 'msOnAfterVendorUpdate', + 'msOnBeforeVendorDelete', + 'msOnAfterVendorDelete', ]; foreach ($tmp as $k => $v) { diff --git a/core/components/minishop2/processors/mgr/settings/vendor/create.class.php b/core/components/minishop2/processors/mgr/settings/vendor/create.class.php index 7d99f5f71..936954f58 100644 --- a/core/components/minishop2/processors/mgr/settings/vendor/create.class.php +++ b/core/components/minishop2/processors/mgr/settings/vendor/create.class.php @@ -7,6 +7,8 @@ class msVendorCreateProcessor extends modObjectCreateProcessor public $classKey = 'msVendor'; public $languageTopics = ['minishop2']; public $permission = 'mssetting_save'; + public $beforeSaveEvent = 'msOnBeforeVendorCreate'; + public $afterSaveEvent = 'msOnAfterVendorCreate'; /** * @return bool|null|string diff --git a/core/components/minishop2/processors/mgr/settings/vendor/remove.class.php b/core/components/minishop2/processors/mgr/settings/vendor/remove.class.php index 8da8d2dd9..ae9c1db17 100644 --- a/core/components/minishop2/processors/mgr/settings/vendor/remove.class.php +++ b/core/components/minishop2/processors/mgr/settings/vendor/remove.class.php @@ -7,6 +7,8 @@ class msVendorRemoveProcessor extends modObjectRemoveProcessor public $classKey = 'msVendor'; public $languageTopics = ['minishop2']; public $permission = 'mssetting_save'; + public $beforeRemoveEvent = 'msOnBeforeVendorDelete'; + public $afterRemoveEvent = 'msOnAfterVendorDelete'; /** * @return bool|null|string diff --git a/core/components/minishop2/processors/mgr/settings/vendor/update.class.php b/core/components/minishop2/processors/mgr/settings/vendor/update.class.php index af2fb3b67..6f4a6cbd2 100644 --- a/core/components/minishop2/processors/mgr/settings/vendor/update.class.php +++ b/core/components/minishop2/processors/mgr/settings/vendor/update.class.php @@ -7,6 +7,8 @@ class msVendorUpdateProcessor extends modObjectUpdateProcessor public $classKey = 'msVendor'; public $languageTopics = ['minishop2']; public $permission = 'mssetting_save'; + public $beforeSaveEvent = 'msOnBeforeVendorUpdate'; + public $afterSaveEvent = 'msOnAfterVendorUpdate'; /** * @return bool|null|string From 141426ca684e1a591d82273755e60bd09446550f Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:00 +0400 Subject: [PATCH 35/56] New translations default.inc.php (Romanian) --- core/components/minishop2/lexicon/ro/default.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/ro/default.inc.php b/core/components/minishop2/lexicon/ro/default.inc.php index 3751cf56a..c1c8eef72 100644 --- a/core/components/minishop2/lexicon/ro/default.inc.php +++ b/core/components/minishop2/lexicon/ro/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Metode de livrare'; $_lang['ms2_deliveries_intro'] = 'Posibile opțiuni de livrare. Logica calculării costului livrării în funcție de distanță și greutate este implementată de clasa pe care o specificați în setări.
Dacă nu precizați clasa, calculele vor fi efectuate prin algoritmul implicit.'; $_lang['ms2_delivery'] = 'Livrare'; +$_lang['ms2_email_link_to_order'] = 'Comanda în panoul de control →'; $_lang['ms2_email_subject_cancelled_user'] = 'Comanda Dvs #[[+num]] a fost anulată'; $_lang['ms2_email_subject_new_manager'] = 'Aveți comanda nouă #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Ați făcut comanda #[[+num]] pe site-ul [[++site_name]]'; @@ -124,8 +125,8 @@ $_lang['ms2_frontend_tags'] = 'Tagg-uri'; $_lang['ms2_frontend_text_address'] = 'Adresa'; $_lang['ms2_frontend_weight_unit'] = 'kg.'; -$_lang['ms2_help'] = 'Помощь и поддержка'; -$_lang['ms2_help_desc'] = 'Полезные ссылки и информация'; +$_lang['ms2_help'] = 'Ajutor și suport'; +$_lang['ms2_help_desc'] = 'Link-uri si informații utile'; $_lang['ms2_link'] = 'Legătura produselor'; $_lang['ms2_links'] = 'Legăturile produselor'; $_lang['ms2_links_intro'] = 'Lista posibilelor legături ale mărfurilor între ele. Tipul de legătură caracterizează modul în care va funcționa, el nu poate fi creat, numai ales din listă.'; From 12b78d158b20044ac24f914c8ac8a3bebbf626a8 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:01 +0400 Subject: [PATCH 36/56] New translations help.inc.php (Romanian) --- .../minishop2/lexicon/ro/help.inc.php | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/core/components/minishop2/lexicon/ro/help.inc.php b/core/components/minishop2/lexicon/ro/help.inc.php index e2bf258db..29006e06e 100644 --- a/core/components/minishop2/lexicon/ro/help.inc.php +++ b/core/components/minishop2/lexicon/ro/help.inc.php @@ -9,35 +9,35 @@ */ $_lang['ms2_components_href'] = 'https://modstore.pro/search?query=minishop'; -$_lang['ms2_components_text'] = 'Платные и бесплатные дополнения'; -$_lang['ms2_components_title'] = 'Дополнения'; +$_lang['ms2_components_text'] = 'Componente plătite și gratuite'; +$_lang['ms2_components_title'] = 'Componente'; $_lang['ms2_demo_href'] = 'https://minishop2.com/'; -$_lang['ms2_demo_text'] = 'Перейти на демо-сайт'; -$_lang['ms2_demo_title'] = 'Демо'; +$_lang['ms2_demo_text'] = 'Accesați site-ul demonstrativ'; +$_lang['ms2_demo_title'] = 'Demo'; $_lang['ms2_docs_href'] = 'https://docs.modx.pro/komponentyi/minishop2'; -$_lang['ms2_docs_text'] = 'Официальная документация'; -$_lang['ms2_docs_title'] = 'Документация'; +$_lang['ms2_docs_text'] = 'Documentaţia oficială'; +$_lang['ms2_docs_title'] = 'Documentaţie'; $_lang['ms2_forum_href'] = 'https://modx.pro/'; -$_lang['ms2_forum_text'] = 'Помощь от сообщества'; -$_lang['ms2_forum_title'] = 'Форум'; +$_lang['ms2_forum_text'] = 'Ajutor din partea comunității'; +$_lang['ms2_forum_title'] = 'Forum'; $_lang['ms2_github_href'] = 'https://github.com/modx-pro/miniShop2'; -$_lang['ms2_github_text'] = 'Нашли проблему? Сообщите об этом!'; +$_lang['ms2_github_text'] = 'Ați găsit o problemă? Raportați!'; $_lang['ms2_github_title'] = 'github.com'; -$_lang['ms2_help'] = 'Помощь и поддержка'; -$_lang['ms2_help_text'] = 'miniShop2 - самый гибкий и быстрый компонент интернет-магазина для MODX Revolution.'; -$_lang['ms2_help_text_support'] = 'Вы можете поддержать miniShop2: -
- Переводом на карту Тинькофф https://www.tinkoff.ru/sl/2V9U9RrcJZP; -
- Переводом на Qiwi-кошелек http://qiwi.com/p/77012827737; -
- Переводом на YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; -
- Переводом на Казахстан Каспи, по номеру +7 701 282 77 37;'; +$_lang['ms2_help'] = 'Ajutor și suport'; +$_lang['ms2_help_text'] = 'miniShop2 este cea mai flexibilă și mai rapidă componentă a magazinului online pentru MODX Revolution.'; +$_lang['ms2_help_text_support'] = 'Puteți să susțineți miniShop2: +
- Transfer pe cardul Tinkoff https://www.tinkoff.ru/sl/2V9U9RrcJZP ; +
- Transfer în portofelul Qiwi http://qiwi.com/p/77012827737; +
- Transfer la YooMoney https://yoomoney.ru/fundraise/RPkkYwNcL7A.230131; +
- Transfer în Kazahstan Kaspi, la numărul +7 701 282 77 37;'; $_lang['ms2_lexicons_href'] = '?a=workspaces/lexicon&ns=minishop2'; -$_lang['ms2_lexicons_text'] = 'Управление словарями'; +$_lang['ms2_lexicons_text'] = 'Administrare dicţionare'; $_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; -$_lang['ms2_localization_text'] = 'Помогите с переводом'; -$_lang['ms2_localization_title'] = 'Локализация'; +$_lang['ms2_localization_text'] = 'Ajutor cu traducerea'; +$_lang['ms2_localization_title'] = 'Localizare'; $_lang['ms2_orders_href'] = '?a=mgr/orders&namespace=minishop2'; -$_lang['ms2_orders_text'] = 'Заказы'; +$_lang['ms2_orders_text'] = 'Comenzi'; $_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; -$_lang['ms2_settings_text'] = 'Настройки'; +$_lang['ms2_settings_text'] = 'Setări'; $_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; -$_lang['ms2_sys_settings_text'] = 'Системные настройки & События'; +$_lang['ms2_sys_settings_text'] = 'Setări de sistem și evenimente'; From 2804154bdb5345ca6859095f2df26ed7b3ce4d86 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:02 +0400 Subject: [PATCH 37/56] New translations default.inc.php (French) --- core/components/minishop2/lexicon/fr/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/fr/default.inc.php b/core/components/minishop2/lexicon/fr/default.inc.php index 4e1d826de..39e05ff86 100644 --- a/core/components/minishop2/lexicon/fr/default.inc.php +++ b/core/components/minishop2/lexicon/fr/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Options de livraisons'; $_lang['ms2_deliveries_intro'] = 'Options possibles pour la livraison. Définit la logique du calcul des coûts d\'expédition en fonction de la distance et de la catégorie de poids.
Si vous ne spécifiez pas de classe, les calculs seront effectués par l\'algorithme par défaut.'; $_lang['ms2_delivery'] = 'Livraison'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Votre commande n°[[+num]] a été annulée'; $_lang['ms2_email_subject_new_manager'] = 'Vous avez une nouvelle commande n°[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Vous avez passé la commande n°[[+num]] sur le site [[++site_name]]'; From b70acbb6dba59c8afd7b5bc19b28b20a183e967f Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:03 +0400 Subject: [PATCH 38/56] New translations default.inc.php (Belarusian) --- core/components/minishop2/lexicon/be/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/be/default.inc.php b/core/components/minishop2/lexicon/be/default.inc.php index 49d73eee3..85b41fe0b 100644 --- a/core/components/minishop2/lexicon/be/default.inc.php +++ b/core/components/minishop2/lexicon/be/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Варыянты дастаўкі'; $_lang['ms2_deliveries_intro'] = 'Магчымыя варыянты дастаўкі. Логіка падлічвання кошту дастаўкі ў залежнасці ад адлегласці і вагі рэалізуецца класам, які вы пакажа ў наладах.
Калі вы не пазначыце свой клас, разлік будзе вырабляцца алгарытмам па змаўчанні.'; $_lang['ms2_delivery'] = 'Дастаўка'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Ваш заказ #[[+num]] быў адменены'; $_lang['ms2_email_subject_new_manager'] = 'У вас новы заказ #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Вы зрабілі заказ #[[+num]] на сайце [[++site_name]]'; From 3aacb1bd3df1effb985aedebdd7c612bf5234e0b Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:04 +0400 Subject: [PATCH 39/56] New translations default.inc.php (German) --- core/components/minishop2/lexicon/de/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/de/default.inc.php b/core/components/minishop2/lexicon/de/default.inc.php index 419149ee4..c435af4d4 100644 --- a/core/components/minishop2/lexicon/de/default.inc.php +++ b/core/components/minishop2/lexicon/de/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Lieferungen'; $_lang['ms2_deliveries_intro'] = 'Verschiedene Varianten der Lieferung. Die Logik der Preiskalkulation der Lieferung (abhängig von der Distanz und dem Gewicht der Ware) ist in Form einer Klasse implementiert, die in den Einstellungen festgelegt werden kann.
Wenn Sie keine Klasse angeben, wird der Standard-Algorythmus die Berechnung vornehmen.'; $_lang['ms2_delivery'] = 'Lieferung'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Ihre Bestellung #[[+num]] wurde gestrichen'; $_lang['ms2_email_subject_new_manager'] = 'Neue Bestellung #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Ihre Bestellung #[[+num]] auf [[++site_name]]'; From a138b49afbc149ee5ac9f0f5b3d1c518b62b6716 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:05 +0400 Subject: [PATCH 40/56] New translations default.inc.php (Greek) --- core/components/minishop2/lexicon/el/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/el/default.inc.php b/core/components/minishop2/lexicon/el/default.inc.php index 86b1d626d..ad71cf824 100644 --- a/core/components/minishop2/lexicon/el/default.inc.php +++ b/core/components/minishop2/lexicon/el/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Διανομές'; $_lang['ms2_deliveries_intro'] = 'Πιθανές παραλλαγές διανομής. Η λογική του υπολογισμού του κόστους παράδοσης ανάλογα μ την απόσταση και το βάρος υλοποιείται από μία κλάση, την οποία εσείς καθορίζετε στις ρυθμίσεις.
Εάν δεν καθορίσετε μία κλάση, οι υπολογισμοί θα γίνουν στον αλγόριθμο από προεπιλογή.'; $_lang['ms2_delivery'] = 'Διανομή'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Η παραγγελία σας #[[+num]] ακυρώθηκε'; $_lang['ms2_email_subject_new_manager'] = 'Έχετε μία νέα παραγγελία #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Κάνατε την παραγγελία σας #[[+num]] στο [[++site_name]]'; From eafa57a950ca30a5c9bd32bcd8e61690b085477b Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:06 +0400 Subject: [PATCH 41/56] New translations default.inc.php (Italian) --- core/components/minishop2/lexicon/it/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/it/default.inc.php b/core/components/minishop2/lexicon/it/default.inc.php index 619182f55..35465461c 100644 --- a/core/components/minishop2/lexicon/it/default.inc.php +++ b/core/components/minishop2/lexicon/it/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Consegne'; $_lang['ms2_deliveries_intro'] = 'Galimi pristatymo būdai. Kainos paskaičiavimo priklausomai nuo svorio ir atstumo logiką turi įgyvendinti nurodyta klasė.
Nenuordžius klasės, bus naudojamas numatytasis kainos skaičiavimo algoritmas.'; $_lang['ms2_delivery'] = 'Consegna'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Jūsų užsakymas Nr. [[+num]] atšauktas'; $_lang['ms2_email_subject_new_manager'] = 'Atliktas naujas užsakymas Nr. [[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Jūs atlikote užsakymą Nr. [[+num]] svetainėje [[++site_name]]'; From 51d81717775bb06d3f5b044118137d9e9adf54a1 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:07 +0400 Subject: [PATCH 42/56] New translations default.inc.php (Lithuanian) --- core/components/minishop2/lexicon/lt/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/lt/default.inc.php b/core/components/minishop2/lexicon/lt/default.inc.php index 3250df45d..45883b535 100644 --- a/core/components/minishop2/lexicon/lt/default.inc.php +++ b/core/components/minishop2/lexicon/lt/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Pristatymo būdai'; $_lang['ms2_deliveries_intro'] = 'Galimi pristatymo būdai. Kainos paskaičiavimo priklausomai nuo svorio ir atstumo logiką turi įgyvendinti nurodyta klasė.
Nenuordžius klasės, bus naudojamas numatytasis kainos skaičiavimo algoritmas.'; $_lang['ms2_delivery'] = 'Pristatymas'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Jūsų užsakymas Nr. [[+num]] atšauktas'; $_lang['ms2_email_subject_new_manager'] = 'Atliktas naujas užsakymas Nr. [[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Jūs atlikote užsakymą Nr. [[+num]] svetainėje [[++site_name]]'; From e4a11a11c325a60abfb94bdb15bfe8cdc689837d Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:08 +0400 Subject: [PATCH 43/56] New translations default.inc.php (Dutch) --- core/components/minishop2/lexicon/nl/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/nl/default.inc.php b/core/components/minishop2/lexicon/nl/default.inc.php index e088995bb..5b9bce0c5 100755 --- a/core/components/minishop2/lexicon/nl/default.inc.php +++ b/core/components/minishop2/lexicon/nl/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Verzendmethoden'; $_lang['ms2_deliveries_intro'] = 'Mogelijke verzendmethoden. De berekening van de verzendkosten afhankelijk van de afstand en gewicht zijn geimplementeerd in een class, welke je specificeerd in de instellingen.
Als je geen class specificeerd, dan zullen de berekeningen worden gemaakt op basis van een standaard algoritme.'; $_lang['ms2_delivery'] = 'Verzendmethode'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Je bestelling met bestelnummer #[[+num]] is geannuleerd.'; $_lang['ms2_email_subject_new_manager'] = 'Je hebt een nieuwe bestelling #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Je hebt de bestelling #[[+num]] gedaan op de website [[++site_name]]'; From bb946fc079831b8cd6b423930998356cf2d1e41c Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:09 +0400 Subject: [PATCH 44/56] New translations default.inc.php (Ukrainian) --- core/components/minishop2/lexicon/uk/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/uk/default.inc.php b/core/components/minishop2/lexicon/uk/default.inc.php index 6ab1a9675..db7c655a2 100644 --- a/core/components/minishop2/lexicon/uk/default.inc.php +++ b/core/components/minishop2/lexicon/uk/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Варіанти доставки'; $_lang['ms2_deliveries_intro'] = 'Доступні варіанти доставки. Логіка розрахунку вартості доставки в залежності від відстані та ваги реалізується класом, що ви зазначите в налаштуваннях.
Якщо ви не вкажете свій клас, розрахунки будуть проводитись за алгоритмом по замовчуванню.'; $_lang['ms2_delivery'] = 'Доставка'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Ваше замовлення #[[+num]] було скасовано'; $_lang['ms2_email_subject_new_manager'] = 'У вас нове замовлення #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'Ви зробили замовлення #[[+num]] на сайті [[++site_name]]'; From ba6e6c7a20a762bd30964ddf2ca82065b8b35e19 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:10 +0400 Subject: [PATCH 45/56] New translations default.inc.php (English) --- core/components/minishop2/lexicon/en/default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/components/minishop2/lexicon/en/default.inc.php b/core/components/minishop2/lexicon/en/default.inc.php index 695c02bc4..b861d752e 100644 --- a/core/components/minishop2/lexicon/en/default.inc.php +++ b/core/components/minishop2/lexicon/en/default.inc.php @@ -58,6 +58,7 @@ $_lang['ms2_deliveries'] = 'Deliveries'; $_lang['ms2_deliveries_intro'] = 'Possible variants of delivery. The logic of the calculation of the cost of delivery depending on the distance and weight is implemented by a class, which you specify in the settings.
If you do not specify a class, the calculations will be made to the algorithm by default.'; $_lang['ms2_delivery'] = 'Delivery'; +$_lang['ms2_email_link_to_order'] = 'Заказ в панели управления →'; $_lang['ms2_email_subject_cancelled_user'] = 'Your order #[[+num]] was cancelled'; $_lang['ms2_email_subject_new_manager'] = 'You have a new order #[[+num]]'; $_lang['ms2_email_subject_new_user'] = 'You made the order #[[+num]] on the [[++site_name]]'; From 70a1d88880140eef557e579b8d3d59d0aae1299b Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:11 +0400 Subject: [PATCH 46/56] New translations product.inc.php (Romanian) --- core/components/minishop2/lexicon/ro/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/ro/product.inc.php b/core/components/minishop2/lexicon/ro/product.inc.php index c99257def..4ebc8b26b 100644 --- a/core/components/minishop2/lexicon/ro/product.inc.php +++ b/core/components/minishop2/lexicon/ro/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Produsul a fost mutat cu succes în categoria «{0}»'; $_lang['ms2_drag_self_many'] = 'Anulare'; $_lang['ms2_drag_self_one'] = 'Anulare'; -$_lang['ms2_drag_sort_many'] = 'Mutați produsele'; -$_lang['ms2_drag_sort_one'] = 'Mutați produsul'; +$_lang['ms2_drag_sort_many'] = 'Mutați cele selectate'; +$_lang['ms2_drag_sort_one'] = 'Mutare'; $_lang['ms2_gallery_button_upload'] = 'Selectați fișierele'; $_lang['ms2_gallery_emptymsg'] = '

Fișierile nu au fost găsite.

Puteți să le descărcați, tragând direct pe acest panou sau selectând butonul din partea de sus.

'; $_lang['ms2_gallery_errors'] = 'Eroare la încărcare'; From 533a8749321e4e5a10ebf225a116d9549191e3d8 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:12 +0400 Subject: [PATCH 47/56] New translations product.inc.php (French) --- core/components/minishop2/lexicon/fr/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/fr/product.inc.php b/core/components/minishop2/lexicon/fr/product.inc.php index 297f34684..a157ef1b5 100644 --- a/core/components/minishop2/lexicon/fr/product.inc.php +++ b/core/components/minishop2/lexicon/fr/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Célectionnez votre fichier'; $_lang['ms2_gallery_emptymsg'] = 'Glisser/déplacer les fichiers dans ce tableau pour le télécharger, ou sélectionnez les en cliquant sur le bouton du haut.'; $_lang['ms2_gallery_errors'] = 'Ошибки при загрузке'; From ecf41e62a02bfa9b0f59a79c4137e4c3853eaa66 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:13 +0400 Subject: [PATCH 48/56] New translations product.inc.php (Belarusian) --- core/components/minishop2/lexicon/be/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/be/product.inc.php b/core/components/minishop2/lexicon/be/product.inc.php index e039be207..c1d133b82 100644 --- a/core/components/minishop2/lexicon/be/product.inc.php +++ b/core/components/minishop2/lexicon/be/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Выбраць файлы'; $_lang['ms2_gallery_emptymsg'] = '

Файлаў не знойдзена.

вы можаце загрузіць іх, перацягнуўшы прама на гэтую панэль або выбраўшы кнопкай уверсе.

'; $_lang['ms2_gallery_errors'] = 'Памылкі пры загрузцы'; From 3f378a074d24a1bb3764bae712a2d04b8bfb1d58 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:14 +0400 Subject: [PATCH 49/56] New translations product.inc.php (German) --- core/components/minishop2/lexicon/de/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/de/product.inc.php b/core/components/minishop2/lexicon/de/product.inc.php index 44dc698a6..d14ae47c9 100644 --- a/core/components/minishop2/lexicon/de/product.inc.php +++ b/core/components/minishop2/lexicon/de/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Dateien wählen'; $_lang['ms2_gallery_emptymsg'] = 'Für Bilderupload gewünschte Bilder per Drag & Drop auf dieses Feld ziehen oder Button benutzen.'; $_lang['ms2_gallery_errors'] = 'Ошибки при загрузке'; From 936e98ec9df361802db29ec4b606331aabe1ba04 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:15 +0400 Subject: [PATCH 50/56] New translations product.inc.php (Greek) --- core/components/minishop2/lexicon/el/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/el/product.inc.php b/core/components/minishop2/lexicon/el/product.inc.php index 947e4c346..3ab3d67cf 100644 --- a/core/components/minishop2/lexicon/el/product.inc.php +++ b/core/components/minishop2/lexicon/el/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Выбрать файлы'; $_lang['ms2_gallery_emptymsg'] = '

Файлов не найдено.

Вы можете загрузить их, перетащив прямо на эту панель или выбрав кнопкой вверху.

'; $_lang['ms2_gallery_errors'] = 'Ошибки при загрузке'; From 0e0aa1a96c2bb24930f41af0891ae8f88d8e1a36 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:16 +0400 Subject: [PATCH 51/56] New translations product.inc.php (Italian) --- core/components/minishop2/lexicon/it/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/it/product.inc.php b/core/components/minishop2/lexicon/it/product.inc.php index 0af46720a..293c94041 100644 --- a/core/components/minishop2/lexicon/it/product.inc.php +++ b/core/components/minishop2/lexicon/it/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Rinktis failus'; $_lang['ms2_gallery_emptymsg'] = 'Užvilkite ir numeskite ant šios lentelės norimus įkelti failus, arba įkelkite juos, pasinaudodami mygtuku viršuje.'; $_lang['ms2_gallery_errors'] = 'Įkeliant failus, pasitaikė klaidų'; From 1365e8ce92273b7e50326e8c964057780db31812 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:17 +0400 Subject: [PATCH 52/56] New translations product.inc.php (Lithuanian) --- core/components/minishop2/lexicon/lt/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/lt/product.inc.php b/core/components/minishop2/lexicon/lt/product.inc.php index fea106ed8..c25fb851e 100644 --- a/core/components/minishop2/lexicon/lt/product.inc.php +++ b/core/components/minishop2/lexicon/lt/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Rinktis failus'; $_lang['ms2_gallery_emptymsg'] = 'Užvilkite ir numeskite ant šios lentelės norimus įkelti failus, arba įkelkite juos, pasinaudodami mygtuku viršuje.'; $_lang['ms2_gallery_errors'] = 'Įkeliant failus, pasitaikė klaidų'; From 0ddb7987a2d996557b6d90f69b758ae867f7503b Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:18 +0400 Subject: [PATCH 53/56] New translations product.inc.php (Dutch) --- core/components/minishop2/lexicon/nl/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/nl/product.inc.php b/core/components/minishop2/lexicon/nl/product.inc.php index b49a05f7d..cd4ada72d 100755 --- a/core/components/minishop2/lexicon/nl/product.inc.php +++ b/core/components/minishop2/lexicon/nl/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Selecteer bestanden'; $_lang['ms2_gallery_emptymsg'] = '

Bestanden niet gevonden.

Je kunt deze uploaden door ze hier naartoe te slepen of via de knop bovenin.

'; $_lang['ms2_gallery_errors'] = 'Fouten tijdens het uploaden'; From f4f67333e3797fa28de87368b208a799993f944f Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:19 +0400 Subject: [PATCH 54/56] New translations product.inc.php (Ukrainian) --- core/components/minishop2/lexicon/uk/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/uk/product.inc.php b/core/components/minishop2/lexicon/uk/product.inc.php index 76172df74..7d940bbd7 100644 --- a/core/components/minishop2/lexicon/uk/product.inc.php +++ b/core/components/minishop2/lexicon/uk/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Товар успешно перенесён в категорию «{0}»'; $_lang['ms2_drag_self_many'] = 'Отмена'; $_lang['ms2_drag_self_one'] = 'Отмена'; -$_lang['ms2_drag_sort_many'] = 'Переместить товары'; -$_lang['ms2_drag_sort_one'] = 'Переместить товар'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Вибрати файли'; $_lang['ms2_gallery_emptymsg'] = '

Файли не знайдено.

Ви можете завантажити їх, перетягнувши прямо на цю панель, чи вибрати кнопкою зверху.

'; $_lang['ms2_gallery_errors'] = 'Помилка при завантаженні'; From bea29da85df84f1967bf932f350eb6e0861c7474 Mon Sep 17 00:00:00 2001 From: Ruslan Aleev Date: Thu, 20 Apr 2023 21:54:20 +0400 Subject: [PATCH 55/56] New translations product.inc.php (English) --- core/components/minishop2/lexicon/en/product.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/components/minishop2/lexicon/en/product.inc.php b/core/components/minishop2/lexicon/en/product.inc.php index 9c9fada9a..8b32ffef1 100644 --- a/core/components/minishop2/lexicon/en/product.inc.php +++ b/core/components/minishop2/lexicon/en/product.inc.php @@ -18,8 +18,8 @@ $_lang['ms2_drag_move_one_success'] = 'Product was successfully moved to category «{0}»'; $_lang['ms2_drag_self_many'] = 'Cancel'; $_lang['ms2_drag_self_one'] = 'Cancel'; -$_lang['ms2_drag_sort_many'] = 'Sort products'; -$_lang['ms2_drag_sort_one'] = 'Sort product'; +$_lang['ms2_drag_sort_many'] = 'Переместить выбранные'; +$_lang['ms2_drag_sort_one'] = 'Переместить'; $_lang['ms2_gallery_button_upload'] = 'Select files'; $_lang['ms2_gallery_emptymsg'] = '

Files not found.

You can load them by dragging directly into this pane, or by selecting the button at the top.

'; $_lang['ms2_gallery_errors'] = 'Errors on upload'; From 4abc57bb6547695c924e5c1eb4c411921510472f Mon Sep 17 00:00:00 2001 From: biz87 Date: Mon, 1 May 2023 01:39:41 +0600 Subject: [PATCH 56/56] 4.2.0 --- _build/build.config.php | 2 +- core/components/minishop2/docs/changelog.txt | 13 +++++++++++++ .../minishop2/model/minishop2/minishop2.class.php | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/_build/build.config.php b/_build/build.config.php index 1abdcaf93..e98add227 100644 --- a/_build/build.config.php +++ b/_build/build.config.php @@ -4,7 +4,7 @@ const PKG_NAME = 'miniShop2'; define('PKG_NAME_LOWER', strtolower(PKG_NAME)); -const PKG_VERSION = '4.1.5'; +const PKG_VERSION = '4.2.0'; const PKG_RELEASE = 'pl'; const PKG_AUTO_INSTALL = true; diff --git a/core/components/minishop2/docs/changelog.txt b/core/components/minishop2/docs/changelog.txt index eb40f72c3..dc111a31f 100644 --- a/core/components/minishop2/docs/changelog.txt +++ b/core/components/minishop2/docs/changelog.txt @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.2.0-pl] - 2022-05-01 + +### Added +- Additional Events for Vendors +- New section with information and useful links +- New field rank for msVendor +- Information about the customer in emails to the manager + +### Fixed +- The problem of additional shipping costs if it is indicated as a percentage +- Sorting in payment options +- Improved use of return = json mode in msProducts + ## [4.1.5-pl] - 2022-04-09 ### Fixed diff --git a/core/components/minishop2/model/minishop2/minishop2.class.php b/core/components/minishop2/model/minishop2/minishop2.class.php index 718a91b86..e8b7fc7cf 100644 --- a/core/components/minishop2/model/minishop2/minishop2.class.php +++ b/core/components/minishop2/model/minishop2/minishop2.class.php @@ -2,7 +2,7 @@ class miniShop2 { - public $version = '4.1.5-pl'; + public $version = '4.2.0-pl'; /** @var modX $modx */ public $modx; /** @var pdoFetch $pdoTools */