diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..88876930c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "_build/env"] + path = _build/env + url = https://github.com/dimasites/modx-build-environment-gui diff --git a/_build/env b/_build/env new file mode 160000 index 000000000..f8ff67d04 --- /dev/null +++ b/_build/env @@ -0,0 +1 @@ +Subproject commit f8ff67d042cf10d9e07e3d0ad18e96c3fb82fa94 diff --git a/_build/build.config.php b/_build/minishop2/build.config.php similarity index 98% rename from _build/build.config.php rename to _build/minishop2/build.config.php index 1abdcaf93..e98add227 100644 --- a/_build/build.config.php +++ b/_build/minishop2/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/_build/build.model.php b/_build/minishop2/build.model.php similarity index 93% rename from _build/build.model.php rename to _build/minishop2/build.model.php index f05b217e4..d8ee98cf6 100644 --- a/_build/build.model.php +++ b/_build/minishop2/build.model.php @@ -5,10 +5,10 @@ } // Define sources -$root = dirname(__FILE__, 2) . '/'; +$root = dirname(__FILE__, 3) . '/'; $sources = [ 'root' => $root, - 'build' => $root . '_build/', + 'build' => $root . '_build/' . PKG_NAME_LOWER . '/', 'source_core' => $root . 'core/components/' . PKG_NAME_LOWER, 'model' => $root . 'core/components/' . PKG_NAME_LOWER . '/model/', 'schema' => $root . 'core/components/' . PKG_NAME_LOWER . '/model/schema/', diff --git a/_build/build.transport.php b/_build/minishop2/build.transport.php similarity index 96% rename from _build/build.transport.php rename to _build/minishop2/build.transport.php index 5bd9247b5..f80ee3bf1 100644 --- a/_build/build.transport.php +++ b/_build/minishop2/build.transport.php @@ -15,12 +15,13 @@ } // Define sources -$root = dirname(__FILE__, 2) . '/'; +$root = dirname(__FILE__, 3) . '/'; + $sources = [ 'root' => $root, - 'build' => $root . '_build/', - 'data' => $root . '_build/data/', - 'resolvers' => $root . '_build/resolvers/', + 'build' => $root . '_build/' . PKG_NAME_LOWER . '/', + 'data' => $root . '_build/' . PKG_NAME_LOWER . '/data/', + 'resolvers' => $root . '_build/' . PKG_NAME_LOWER . '/resolvers/', 'chunks' => $root . 'core/components/' . PKG_NAME_LOWER . '/elements/chunks/', 'snippets' => $root . 'core/components/' . PKG_NAME_LOWER . '/elements/snippets/', 'plugins' => $root . 'core/components/' . PKG_NAME_LOWER . '/elements/plugins/', @@ -303,8 +304,13 @@ } } $modx->log(modX::LOG_LEVEL_INFO, "\n
Execution time: {$totalTime}\n"); + +$download_url = '/_build/env/index.php?getpackage='.PKG_NAME_LOWER.'-'.PKG_VERSION.'-'.PKG_RELEASE; +$modx->log(modX::LOG_LEVEL_INFO,"\n
[DOWNLOAD PACKAGE]
\n"); + echo ''; if (!empty($_GET['download'])) { echo ''; } + diff --git a/_build/data/transport.chunks.php b/_build/minishop2/data/transport.chunks.php similarity index 100% rename from _build/data/transport.chunks.php rename to _build/minishop2/data/transport.chunks.php diff --git a/_build/data/transport.events.php b/_build/minishop2/data/transport.events.php similarity index 89% rename from _build/data/transport.events.php rename to _build/minishop2/data/transport.events.php index acf3cc9f3..b87bb4270 100644 --- a/_build/data/transport.events.php +++ b/_build/minishop2/data/transport.events.php @@ -54,6 +54,12 @@ 'msOnManagerCustomCssJs', + 'msOnBeforeVendorCreate', + 'msOnAfterVendorCreate', + 'msOnBeforeVendorUpdate', + 'msOnAfterVendorUpdate', + 'msOnBeforeVendorDelete', + 'msOnAfterVendorDelete', ]; foreach ($tmp as $k => $v) { diff --git a/_build/data/transport.menu.php b/_build/minishop2/data/transport.menu.php similarity index 100% rename from _build/data/transport.menu.php rename to _build/minishop2/data/transport.menu.php diff --git a/_build/data/transport.plugins.php b/_build/minishop2/data/transport.plugins.php similarity index 100% rename from _build/data/transport.plugins.php rename to _build/minishop2/data/transport.plugins.php diff --git a/_build/data/transport.policies.php b/_build/minishop2/data/transport.policies.php similarity index 100% rename from _build/data/transport.policies.php rename to _build/minishop2/data/transport.policies.php diff --git a/_build/data/transport.policytemplates.php b/_build/minishop2/data/transport.policytemplates.php similarity index 100% rename from _build/data/transport.policytemplates.php rename to _build/minishop2/data/transport.policytemplates.php diff --git a/_build/data/transport.settings.php b/_build/minishop2/data/transport.settings.php similarity index 100% rename from _build/data/transport.settings.php rename to _build/minishop2/data/transport.settings.php diff --git a/_build/data/transport.snippets.php b/_build/minishop2/data/transport.snippets.php similarity index 100% rename from _build/data/transport.snippets.php rename to _build/minishop2/data/transport.snippets.php diff --git a/_build/includes/functions.php b/_build/minishop2/includes/functions.php similarity index 100% rename from _build/includes/functions.php rename to _build/minishop2/includes/functions.php diff --git a/_build/properties/properties.ms_cart.php b/_build/minishop2/properties/properties.ms_cart.php similarity index 100% rename from _build/properties/properties.ms_cart.php rename to _build/minishop2/properties/properties.ms_cart.php diff --git a/_build/properties/properties.ms_gallery.php b/_build/minishop2/properties/properties.ms_gallery.php similarity index 100% rename from _build/properties/properties.ms_gallery.php rename to _build/minishop2/properties/properties.ms_gallery.php diff --git a/_build/properties/properties.ms_get_order.php b/_build/minishop2/properties/properties.ms_get_order.php similarity index 100% rename from _build/properties/properties.ms_get_order.php rename to _build/minishop2/properties/properties.ms_get_order.php diff --git a/_build/properties/properties.ms_minicart.php b/_build/minishop2/properties/properties.ms_minicart.php similarity index 100% rename from _build/properties/properties.ms_minicart.php rename to _build/minishop2/properties/properties.ms_minicart.php diff --git a/_build/properties/properties.ms_options.php b/_build/minishop2/properties/properties.ms_options.php similarity index 100% rename from _build/properties/properties.ms_options.php rename to _build/minishop2/properties/properties.ms_options.php diff --git a/_build/properties/properties.ms_order.php b/_build/minishop2/properties/properties.ms_order.php similarity index 100% rename from _build/properties/properties.ms_order.php rename to _build/minishop2/properties/properties.ms_order.php diff --git a/_build/properties/properties.ms_product_options.php b/_build/minishop2/properties/properties.ms_product_options.php similarity index 100% rename from _build/properties/properties.ms_product_options.php rename to _build/minishop2/properties/properties.ms_product_options.php diff --git a/_build/properties/properties.ms_products.php b/_build/minishop2/properties/properties.ms_products.php similarity index 100% rename from _build/properties/properties.ms_products.php rename to _build/minishop2/properties/properties.ms_products.php diff --git a/_build/resolvers/resolve.chunks.php b/_build/minishop2/resolvers/resolve.chunks.php similarity index 100% rename from _build/resolvers/resolve.chunks.php rename to _build/minishop2/resolvers/resolve.chunks.php diff --git a/_build/resolvers/resolve.extension.php b/_build/minishop2/resolvers/resolve.extension.php similarity index 100% rename from _build/resolvers/resolve.extension.php rename to _build/minishop2/resolvers/resolve.extension.php diff --git a/_build/resolvers/resolve.policy.php b/_build/minishop2/resolvers/resolve.policy.php similarity index 100% rename from _build/resolvers/resolve.policy.php rename to _build/minishop2/resolvers/resolve.policy.php diff --git a/_build/resolvers/resolve.settings.php b/_build/minishop2/resolvers/resolve.settings.php similarity index 100% rename from _build/resolvers/resolve.settings.php rename to _build/minishop2/resolvers/resolve.settings.php diff --git a/_build/resolvers/resolve.setup.php b/_build/minishop2/resolvers/resolve.setup.php similarity index 100% rename from _build/resolvers/resolve.setup.php rename to _build/minishop2/resolvers/resolve.setup.php diff --git a/_build/resolvers/resolve.sources.php b/_build/minishop2/resolvers/resolve.sources.php similarity index 100% rename from _build/resolvers/resolve.sources.php rename to _build/minishop2/resolvers/resolve.sources.php diff --git a/_build/resolvers/resolve.statuses.php b/_build/minishop2/resolvers/resolve.statuses.php similarity index 100% rename from _build/resolvers/resolve.statuses.php rename to _build/minishop2/resolvers/resolve.statuses.php diff --git a/_build/resolvers/resolve.tables.php b/_build/minishop2/resolvers/resolve.tables.php similarity index 100% rename from _build/resolvers/resolve.tables.php rename to _build/minishop2/resolvers/resolve.tables.php diff --git a/_build/setup.options.php b/_build/minishop2/setup.options.php similarity index 100% rename from _build/setup.options.php rename to _build/minishop2/setup.options.php 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/lexicon/be/default.inc.php b/core/components/minishop2/lexicon/be/default.inc.php index 0275b41c4..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]]'; @@ -124,6 +125,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'] = 'Спіс магчымых сувязяў тавараў адзін з адным. Тып сувязі характарызуе, як менавіта яна будзе працаваць, яго нельга ствараць, можна толькі выбраць з спісу.'; 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'] = 'Системные настройки & События'; 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'] = 'Памылкі пры загрузцы'; diff --git a/core/components/minishop2/lexicon/de/default.inc.php b/core/components/minishop2/lexicon/de/default.inc.php index 849550946..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]]'; @@ -124,6 +125,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.'; 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'] = 'Системные настройки & События'; 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'] = 'Ошибки при загрузке'; diff --git a/core/components/minishop2/lexicon/el/default.inc.php b/core/components/minishop2/lexicon/el/default.inc.php index 392bf5d85..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]]'; @@ -124,6 +125,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'] = 'Η λίστα των πιθανών συνδέσμων των προϊόντων μεταξύ τους. Ο τύπος σύνδεσης περιγράφει ακριβώς πως θα λειτουρήσει, είναι αδύνατο να δημιουργηθεί, μπορείτε μόνο να επιλέξετε από τη λίστα.'; 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'] = 'Системные настройки & События'; 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'] = 'Ошибки при загрузке'; diff --git a/core/components/minishop2/lexicon/en/default.inc.php b/core/components/minishop2/lexicon/en/default.inc.php index 80969e32e..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]]'; @@ -124,6 +125,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.'; 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'] = 'Системные настройки & События'; 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'; diff --git a/core/components/minishop2/lexicon/fr/default.inc.php b/core/components/minishop2/lexicon/fr/default.inc.php index 2abfb64b1..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]]'; @@ -124,6 +125,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.'; 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'] = 'Системные настройки & События'; 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'] = 'Ошибки при загрузке'; diff --git a/core/components/minishop2/lexicon/it/default.inc.php b/core/components/minishop2/lexicon/it/default.inc.php index 7d216c4e6..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]]'; @@ -124,6 +125,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ų.'; 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'] = 'Системные настройки & События'; 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ų'; diff --git a/core/components/minishop2/lexicon/lt/default.inc.php b/core/components/minishop2/lexicon/lt/default.inc.php index 4af10532b..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]]'; @@ -124,6 +125,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ų.'; 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'] = 'Системные настройки & События'; 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ų'; diff --git a/core/components/minishop2/lexicon/nl/default.inc.php b/core/components/minishop2/lexicon/nl/default.inc.php index 007cbc18c..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]]'; @@ -124,6 +125,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.'; 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'] = 'Системные настройки & События'; 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'; diff --git a/core/components/minishop2/lexicon/ro/default.inc.php b/core/components/minishop2/lexicon/ro/default.inc.php index 873cf3cb8..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,6 +125,8 @@ $_lang['ms2_frontend_tags'] = 'Tagg-uri'; $_lang['ms2_frontend_text_address'] = 'Adresa'; $_lang['ms2_frontend_weight_unit'] = 'kg.'; +$_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ă.'; 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..29006e06e --- /dev/null +++ b/core/components/minishop2/lexicon/ro/help.inc.php @@ -0,0 +1,43 @@ +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'] = 'Administrare dicţionare'; +$_lang['ms2_localization_href'] = 'https://crowdin.com/project/minishop2-ecommerce'; +$_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'] = 'Comenzi'; +$_lang['ms2_settings_href'] = '?a=mgr/settings&namespace=minishop2'; +$_lang['ms2_settings_text'] = 'Setări'; +$_lang['ms2_sys_settings_href'] = '?a=system/settings&ns=minishop2'; +$_lang['ms2_sys_settings_text'] = 'Setări de sistem și evenimente'; 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'; diff --git a/core/components/minishop2/lexicon/uk/default.inc.php b/core/components/minishop2/lexicon/uk/default.inc.php index 04ca9ec9f..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]]'; @@ -124,6 +125,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'] = 'Перелік доступних звʼязків товарів один з одним. Тип звʼязку характеризує те, як саме він буде працювати, його неможливо створювати, можна тільки вибрати із переліку.'; 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'] = 'Системные настройки & События'; 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'] = 'Помилка при завантаженні'; 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 */ 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