Skip to content

Commit 15f87bc

Browse files
author
Leonix
committed
* Shop-Script v.11.3.0
* Added support for custom headers for sending order notifications as HTTP requests to third-party services. * Streamlined the processing of orders paid via the mobile POS to mark them as completed rather than simply paid. * Products section made more convenient in the new Webasyst 2 interface: * improved support for large product catalogs, * increased category description editing field, * fixed the functioning of the View in the storefront link in the product editor. * Fixed found errors: * selection of order pickup points on the Google map during the checkout, * import of product images from a CSV file, * functioning of the “Sync shopping cart items on all devices for authorized customers” setting, * use of variables in product fields for social media, * display of dynamic product sets on category pages containing products with special prices set via promo campaigns, * application of tax rates set for country regions, * saving of fractional tax rates for country regions, * editing of the shipping address in the mobile app, * fore premium license users: * display of company-type customers’ names in the order list’s kanban mode. * For developers: * Added hook affiliate_transaction for tracking operations on customers’ bonus points. * Added hooks products_remove_sets.before and products_remove_sets.after triggered right before and after products are excluded from sets. * In the backend_prod_filters hook, added the option to display custom icons for product filters added by plugins. * Fixed additional product filtering, applied by plugins using method shopProductsCollection->addWhere(), in the search results.
1 parent 7bd3f80 commit 15f87bc

File tree

8 files changed

+93
-12
lines changed

8 files changed

+93
-12
lines changed

lib/classes/blockpage/shopProductButtonBlockType.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ public function render(siteBlockData $data, bool $is_backend, array $tmpl_vars=[
1212
$data->data['product_id'] = $tmpl_vars['product']['id'];
1313
$data->data['sku_id'] = $tmpl_vars['sku_id'];
1414
if ($tmpl_vars['product']['status'] < 0) {
15-
$data->data['html'] = _w('Not available for sale');
15+
$data->data['html'] = _w('Unavailable for purchase');
1616
}
1717
$tmpl_vars['modification'] = $tmpl_vars['sku_id'];
1818
//$result = $this->additionalData($data);
19-
// $tmpl_vars['html'] = $tmpl_vars['product']['price'];//$result['html'];
19+
// $tmpl_vars['html'] = $tmpl_vars['product']['price'];//$result['html'];
2020
return parent::render($data, $is_backend, $tmpl_vars);
2121
}
2222

lib/classes/blockpage/shopProductInfoBlockType.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function render(siteBlockData $data, bool $is_backend, array $tmpl_vars=[
1212
$tmpl_vars['html'] = $data->data['additional']['html'];
1313

1414
if ($tmpl_vars['product']['status'] < 0) {
15-
$data->data['additional']['html'] = _w('Not available for sale');
15+
$data->data['additional']['html'] = _w('Unavailable for purchase');
1616
}
1717
return parent::render($data, $is_backend, $tmpl_vars);
1818
}
@@ -57,7 +57,7 @@ public function additionalData(siteBlockData $data)
5757

5858
public function getExampleBlockData()
5959
{
60-
60+
6161
$result = $this->getEmptyBlockData();
6262
$result->data = ['info_type' => 'name', 'tag' => 'p', 'block_props' => ['font-header' => "t-rgl", 'font-size' => ["name" => "Size #3", "value" => "t-3", "unit" => "px", "type" => "library"], 'margin-top' => "m-t-0", 'margin-bottom' => "m-b-12", 'align' => "t-l"]];
6363
return $result;

lib/classes/blockpage/shopProductPictureBlockType.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public function render(siteBlockData $data, bool $is_backend, array $tmpl_vars=[
99
$tmpl_vars['product'] = $data->data['additional']['product'];
1010
//$tmpl_vars['html'] = $data->data['additional']['html'];
1111
if ($tmpl_vars['product']['status'] < 0) {
12-
$data->data['html'] = _w('Not available for sale');
12+
$data->data['html'] = _w('Unavailable for purchase');
1313
}
1414
return parent::render($data, $is_backend, $tmpl_vars);
1515
}

lib/classes/blockpage/shopProductSaleWidgetBlockType.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public function render(siteBlockData $data, bool $is_backend, array $tmpl_vars=[
1010
{
1111
$tmpl_vars['product'] = $data->data['additional']['product'];
1212
if ($tmpl_vars['product']['status'] < 0) {
13-
$data->data['html'] = _w('Not available for sale');
13+
$data->data['html'] = _w('Unavailable for purchase');
1414
}
1515
if (!$tmpl_vars['product']['id']) {
1616
$data->data['html'] = _w('Choose product');
@@ -104,13 +104,13 @@ protected function getRawBlockSettingsFormConfig()
104104
'name' => _w('Product'),
105105
],
106106
[ 'type' => 'ProductSkuGroup',
107-
'name' => _w('Modification'),
107+
'name' => _w('Variant'),
108108
],
109109
[ 'type' => 'RowsAlignGroup',
110110
'name' => _w('Alignment'),
111111
],
112112
[ 'type' => 'RowsWrapGroup',
113-
'name' => _w('Wrap Line'),
113+
'name' => _w('Wrap line'),
114114
],
115115
[ 'type' => 'TabsWrapperGroup',
116116
'name' => _w('Tabs'),

lib/classes/blockpage/shopProductSkuBlockType.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function render(siteBlockData $data, bool $is_backend, array $tmpl_vars=[
1313
$tmpl_vars['modification'] = $tmpl_vars['sku_id'];
1414
$tmpl_vars['articles'] = ifset($tmpl_vars['product']['skus'], false);
1515
//$result = $this->additionalData($data);
16-
//$tmpl_vars['html'] = $tmpl_vars['product']['price'];//$result['html'];
16+
//$tmpl_vars['html'] = $tmpl_vars['product']['price'];//$result['html'];
1717
return parent::render($data, $is_backend, $tmpl_vars);
1818
}
1919

@@ -27,7 +27,7 @@ public function getExampleBlockData()
2727
protected function getRawBlockSettingsFormConfig()
2828
{
2929
return [
30-
'type_name' => _w('Modification'),
30+
'type_name' => _w('Variant'),
3131
'sections' => [
3232
/*[ 'type' => 'FontHeaderGroup',
3333
'name' => _w('Font header'),

lib/config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'pages' => true,
1414
'mobile' => true,
1515
'my_account' => true,
16-
'version' => '11.3.0', // developer preview
16+
'version' => '11.3.0',
1717
'critical' => '11.3.0',
1818
'vendor' => 'webasyst',
1919
'csrf' => true,

locale/ru_RU/LC_MESSAGES/shop.mo

1.56 KB
Binary file not shown.

locale/ru_RU/LC_MESSAGES/shop.po

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ msgstr ""
1212
"Plural-Forms: nplurals=3; plural=((((n%10)==1)&&((n%100)!=11))?(0):(((((n%10)>=2)&&((n%10)<=4))&&(((n%100)<10)||((n%100)>=20)))?(1):2));\n"
1313
"X-Poedit-SourceCharset: utf-8\n"
1414
"X-Poedit-Basepath: .\n"
15-
"X-Generator: Poedit 3.3.2\n"
15+
"X-Generator: Poedit 3.4.2\n"
1616
"X-Poedit-SearchPath-0: .\n"
1717
"X-Poedit-SearchPath-1: .\n"
1818

@@ -13524,3 +13524,84 @@ msgstr "Сделано на Shop-Script"
1352413524

1352513525
msgid "Made on <a href=\"https://www.shop-script.com\" target=\"_blank\">Shop-Script</a>"
1352613526
msgstr "Сделано на <a href=\"https://www.shop-script.ru\" target=\"_blank\">Shop-Script</a>"
13527+
13528+
msgid "HTTP headers"
13529+
msgstr "HTTP-заголовки"
13530+
13531+
msgid "Copying error"
13532+
msgstr "Ошибка копирования"
13533+
13534+
msgid "Unavailable for purchase"
13535+
msgstr "Недоступен для покупки"
13536+
13537+
msgid "Product price"
13538+
msgstr "Цена товара"
13539+
13540+
msgid "Product picture"
13541+
msgstr "Изображение товара"
13542+
13543+
msgid "Type of product picture"
13544+
msgstr "Тип изображения товара"
13545+
13546+
msgid "Tabs"
13547+
msgstr "Вкладки"
13548+
13549+
msgid "Margin"
13550+
msgstr "Отступ"
13551+
13552+
msgid "Shadows"
13553+
msgstr "Тени"
13554+
13555+
msgid "Border"
13556+
msgstr "Граница"
13557+
13558+
msgid "Angle"
13559+
msgstr "Угол"
13560+
13561+
msgid "Visibility on devices"
13562+
msgstr "Видимость на устройствах"
13563+
13564+
msgid "Identifier (ID)"
13565+
msgstr "Идентификатор (ID)"
13566+
13567+
msgid "Variant"
13568+
msgstr "Модификация"
13569+
13570+
msgid "Font header"
13571+
msgstr ""
13572+
13573+
msgid "Choose product"
13574+
msgstr "Выберите товар"
13575+
13576+
msgid "Widget with a shopping button"
13577+
msgstr "Виджет с кнопкой покупки"
13578+
13579+
msgid "Alignment"
13580+
msgstr "Выравнивание"
13581+
13582+
msgid "Wrap line"
13583+
msgstr "Перенос строки"
13584+
13585+
msgid "Price info"
13586+
msgstr "Информация о цене"
13587+
13588+
msgid "Font"
13589+
msgstr "Шрифт"
13590+
13591+
msgid "Font style"
13592+
msgstr "Стиль шрифта"
13593+
13594+
msgid "Line height"
13595+
msgstr "Высота строки"
13596+
13597+
msgid "Product info"
13598+
msgstr "Информация о товаре"
13599+
13600+
msgid "Type of product information"
13601+
msgstr "Вид информации о товаре"
13602+
13603+
msgid "Action"
13604+
msgstr "Действие"
13605+
13606+
msgid "Style"
13607+
msgstr "Стиль"

0 commit comments

Comments
 (0)