Merge branch 'master' of github.com:unaio/una

modules/boonex/market/classes/BxMarketModule.php

@@ -39,6 +39,15 @@ class BxMarketModule extends BxBaseModTextModule
     	));
     }
 
+    public function serviceGetSearchableFields ()
+    {
+        $CNF = &$this->_oConfig->CNF;
+
+        $aResult = parent::serviceGetSearchableFields();
+        unset($aResult[$CNF['FIELD_PRICE_SINGLE']]);
+
+        return $aResult;
+    }
     public function serviceEntityCreate ()
     {
     	$oPayments = BxDolPayments::getInstance();

modules/boonex/market/install/langs/en.xml

@@ -86,11 +86,14 @@
     <string name="_bx_market_form_entry_input_added"><![CDATA[Created]]></string>
     <string name="_bx_market_form_entry_input_sys_changed"><![CDATA[Updated]]></string>
     <string name="_bx_market_form_entry_input_changed"><![CDATA[Updated]]></string>
+    <string name="_bx_market_form_entry_input_sys_warning_single"><![CDATA[Warning for single payments]]></string>
+    <string name="_bx_market_form_entry_input_sys_warning_recurring"><![CDATA[Warning for recurring payments]]></string>
 
 	<string name="_bx_market_acl_action_create_entry"><![CDATA[Create Product]]></string>
 	<string name="_bx_market_acl_action_delete_entry"><![CDATA[Delete Product]]></string>
 	<string name="_bx_market_acl_action_download_entry"><![CDATA[Download Product]]></string>
 	<string name="_bx_market_acl_action_view_entry"><![CDATA[View Product]]></string>
+	<string name="_bx_market_acl_action_set_cover"><![CDATA[Set Product Cover]]></string>
 	<string name="_bx_market_acl_action_set_thumb"><![CDATA[Set Product Thumbnail]]></string>
 	<string name="_bx_market_acl_action_edit_any_entry"><![CDATA[Edit Any Product]]></string>
 

modules/boonex/russian/data/langs/bx_market/ru.xml

@@ -86,12 +86,15 @@
     <string name="_bx_market_form_entry_input_added"><![CDATA[Создано]]></string>
     <string name="_bx_market_form_entry_input_sys_changed"><![CDATA[Обновлено]]></string>
     <string name="_bx_market_form_entry_input_changed"><![CDATA[Обновлено]]></string>
+    <string name="_bx_market_form_entry_input_sys_warning_single"><![CDATA[Предупреждение: Разовые платежи]]></string>
+    <string name="_bx_market_form_entry_input_sys_warning_recurring"><![CDATA[Предупреждение: Подписки]]></string>
 
 	<string name="_bx_market_acl_action_create_entry"><![CDATA[Создать продукт]]></string>
 	<string name="_bx_market_acl_action_delete_entry"><![CDATA[Удалить продукт]]></string>
 	<string name="_bx_market_acl_action_download_entry"><![CDATA[Скачать продукт]]></string>
 	<string name="_bx_market_acl_action_view_entry"><![CDATA[Просмотреть продукт]]></string>
-	<string name="_bx_market_acl_action_set_thumb"><![CDATA[Назначить значок продукта]]></string>
+	<string name="_bx_market_acl_action_set_cover"><![CDATA[Установить обложку продукта]]></string>
+	<string name="_bx_market_acl_action_set_thumb"><![CDATA[Установить значок продукта]]></string>
 	<string name="_bx_market_acl_action_edit_any_entry"><![CDATA[Редактировать любой продукт]]></string>
 
 	<string name="_bx_market_privacy_group_customers"><![CDATA[Клиенты]]></string>