Prechádzať zdrojové kódy

Ticket #715 - Integration with Snipcart module.

AntonLV 9 rokov pred
rodič
commit
cfb25121e9

+ 2 - 2
modules/boonex/russian/data/langs/bx_shopify/ru.xml

@@ -195,8 +195,8 @@
     <string name="_bx_shopify_chart_growth"><![CDATA[Shopify: Развитие]]></string>
     <string name="_bx_shopify_chart_growth_speed"><![CDATA[Shopify: Скорость развития]]></string>
 
-    <string name="_bx_shopify_search_extended"><![CDATA[Поиск товаров]]></string>
-    <string name="_bx_shopify_search_extended_cmts"><![CDATA[Поиск комментариев к товарам]]></string>
+    <string name="_bx_shopify_search_extended"><![CDATA[Shopify: Поиск]]></string>
+    <string name="_bx_shopify_search_extended_cmts"><![CDATA[Shopify: Поиск комментариев]]></string>
 
     <string name="_bx_shopify_pre_lists_cats"><![CDATA[Категории товаров]]></string>
     <string name="_bx_shopify_cat_automotive_and_industrial"><![CDATA[Автомобили и Техника]]></string>

+ 13 - 1
modules/boonex/russian/data/langs/bx_snipcart/ru.xml

@@ -9,13 +9,14 @@
     <string name="_bx_snipcart_option_per_page_browse"><![CDATA[Количество элементов на странице]]></string>
     <string name="_bx_snipcart_option_per_page_profile"><![CDATA[Количество элементов на странице профайла]]></string>
 	<string name="_bx_snipcart_option_rss_num"><![CDATA[Количество элементов в ленте RSS]]></string>
-	<string name="_bx_snipcart_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+	<string name="_bx_snipcart_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
 
 	<string name="_bx_snipcart_form_entry"><![CDATA[Товары]]></string>
 	<string name="_bx_snipcart_form_entry_display_add"><![CDATA[Добавить товар]]></string>
 	<string name="_bx_snipcart_form_entry_display_edit"><![CDATA[Редактировать товар]]></string>
 	<string name="_bx_snipcart_form_entry_display_delete"><![CDATA[Удалить товар]]></string>
 	<string name="_bx_snipcart_form_entry_display_view"><![CDATA[Просмотреть товар]]></string>
+	<string name="_bx_snipcart_form_entry_input_author"><![CDATA[Автор]]></string>
 	<string name="_bx_snipcart_form_entry_input_sys_do_submit"><![CDATA[Выполнить]]></string>
 	<string name="_bx_snipcart_form_entry_input_do_submit"><![CDATA[Выполнить]]></string>
 	<string name="_bx_snipcart_form_entry_input_sys_do_publish"><![CDATA[Опубликовать]]></string>
@@ -138,6 +139,12 @@
     <string name="_bx_snipcart_page_title_settings"><![CDATA[Настройки]]></string>
     <string name="_bx_snipcart_page_block_title_system_settings"><![CDATA[Настройки]]></string>
     <string name="_bx_snipcart_page_block_title_settings"><![CDATA[Настройки]]></string>
+    <string name="_bx_snipcart_page_title_sys_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_snipcart_page_title_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_snipcart_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_snipcart_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
+    <string name="_bx_snipcart_page_block_title_search_form_cmts"><![CDATA[Форма поиска комментариев]]></string>
+    <string name="_bx_snipcart_page_block_title_search_results_cmts"><![CDATA[Результаты поиска комментариев]]></string>
 
     <string name="_bx_snipcart_menu_set_title_view_entry"><![CDATA[Действия с товаром]]></string>
     <string name="_bx_snipcart_menu_title_view_entry"><![CDATA[Действия с товаром]]></string>
@@ -154,6 +161,8 @@
     <string name="_bx_snipcart_menu_item_title_entries_home"><![CDATA[Магазин]]></string>
     <string name="_bx_snipcart_menu_item_title_system_entries_public"><![CDATA[Новые товары]]></string>
     <string name="_bx_snipcart_menu_item_title_entries_public"><![CDATA[Новые товары]]></string>
+    <string name="_bx_snipcart_menu_item_title_system_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_snipcart_menu_item_title_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_snipcart_menu_item_title_system_entries_manage"><![CDATA[Управление товарами]]></string>
     <string name="_bx_snipcart_menu_item_title_entries_manage"><![CDATA[Управление товарами]]></string>
     <string name="_bx_snipcart_menu_item_title_system_settings"><![CDATA[Настройки]]></string>
@@ -199,6 +208,9 @@
     <string name="_bx_snipcart_chart_growth"><![CDATA[Snipcart: Развитие]]></string>
     <string name="_bx_snipcart_chart_growth_speed"><![CDATA[Snipcart: Скорость развития]]></string>
 
+    <string name="_bx_snipcart_search_extended"><![CDATA[Snipcart: Поиск]]></string>
+    <string name="_bx_snipcart_search_extended_cmts"><![CDATA[Snipcart: Поиск комментариев]]></string>
+
     <string name="_bx_snipcart_pre_lists_cats"><![CDATA[Категории товаров]]></string>
     <string name="_bx_snipcart_cat_automotive_and_industrial"><![CDATA[Автомобили и Техника]]></string>
     <string name="_bx_snipcart_cat_beauty_health_food"><![CDATA[Красота, Здоровье и Еда]]></string>

+ 1 - 0
modules/boonex/snipcart/classes/BxSnipcartConfig.php

@@ -115,6 +115,7 @@ class BxSnipcartConfig extends BxBaseModTextConfig
             	'txt_sample_single_with_article' => '_bx_snipcart_txt_sample_single_with_article',
             	'txt_sample_comment_single' => '_bx_snipcart_txt_sample_comment_single',
             	'txt_sample_vote_single' => '_bx_snipcart_txt_sample_vote_single',
+            	'form_field_author' => '_bx_snipcart_form_entry_input_author',
             	'grid_action_err_delete' => '_bx_snipcart_grid_action_err_delete',
             	'grid_txt_account_manager' => '_bx_snipcart_grid_txt_account_manager',
 				'filter_item_active' => '_bx_snipcart_grid_filter_item_title_adm_active',

+ 6 - 0
modules/boonex/snipcart/classes/BxSnipcartModule.php

@@ -20,6 +20,12 @@ class BxSnipcartModule extends BxBaseModTextModule
     function __construct(&$aModule)
     {
         parent::__construct($aModule);
+
+        $CNF = &$this->_oConfig->CNF;
+        $this->_aSearchableNamesExcept = array_merge($this->_aSearchableNamesExcept, array(
+             $CNF['FIELD_PRICE'],
+             $CNF['FIELD_WEIGHT']
+        ));
     }
 
     public function getSettings($iProfileId = 0)

+ 13 - 1
modules/boonex/snipcart/install/langs/en.xml

@@ -9,13 +9,14 @@
 	<string name="_bx_snipcart_option_per_page_browse"><![CDATA[Number of items per page]]></string>
 	<string name="_bx_snipcart_option_per_page_profile"><![CDATA[Number of items per page on profile/group page]]></string>
 	<string name="_bx_snipcart_option_rss_num"><![CDATA[Number of items in RSS feed]]></string>
-	<string name="_bx_snipcart_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+	<string name="_bx_snipcart_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
 
 	<string name="_bx_snipcart_form_entry"><![CDATA[Goods]]></string>
 	<string name="_bx_snipcart_form_entry_display_add"><![CDATA[Add Goods]]></string>
 	<string name="_bx_snipcart_form_entry_display_edit"><![CDATA[Edit Goods]]></string>
 	<string name="_bx_snipcart_form_entry_display_delete"><![CDATA[Delete Goods]]></string>
 	<string name="_bx_snipcart_form_entry_display_view"><![CDATA[View Goods]]></string>
+	<string name="_bx_snipcart_form_entry_input_author"><![CDATA[Author]]></string>
 	<string name="_bx_snipcart_form_entry_input_sys_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_snipcart_form_entry_input_do_submit"><![CDATA[Submit]]></string>
 	<string name="_bx_snipcart_form_entry_input_sys_do_publish"><![CDATA[Publish]]></string>
@@ -138,6 +139,12 @@
     <string name="_bx_snipcart_page_title_settings"><![CDATA[Settings]]></string>
     <string name="_bx_snipcart_page_block_title_system_settings"><![CDATA[Settings]]></string>
     <string name="_bx_snipcart_page_block_title_settings"><![CDATA[Settings]]></string>
+    <string name="_bx_snipcart_page_title_sys_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_snipcart_page_title_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_snipcart_page_block_title_search_form"><![CDATA[Search Form]]></string>
+    <string name="_bx_snipcart_page_block_title_search_results"><![CDATA[Search Results]]></string>
+    <string name="_bx_snipcart_page_block_title_search_form_cmts"><![CDATA[Comments Search Form]]></string>
+    <string name="_bx_snipcart_page_block_title_search_results_cmts"><![CDATA[Comments Search Results]]></string>
 
     <string name="_bx_snipcart_menu_set_title_view_entry"><![CDATA[Goods Actions]]></string>
     <string name="_bx_snipcart_menu_title_view_entry"><![CDATA[Goods Actions]]></string>
@@ -154,6 +161,8 @@
     <string name="_bx_snipcart_menu_item_title_entries_home"><![CDATA[Shop]]></string>
     <string name="_bx_snipcart_menu_item_title_system_entries_public"><![CDATA[Latest]]></string>
     <string name="_bx_snipcart_menu_item_title_entries_public"><![CDATA[Latest]]></string>
+    <string name="_bx_snipcart_menu_item_title_system_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_snipcart_menu_item_title_entries_search"><![CDATA[Search]]></string>
     <string name="_bx_snipcart_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_snipcart_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_snipcart_menu_item_title_system_settings"><![CDATA[Settings]]></string>
@@ -199,6 +208,9 @@
     <string name="_bx_snipcart_chart_growth"><![CDATA[Snipcart: Growth]]></string>
     <string name="_bx_snipcart_chart_growth_speed"><![CDATA[Snipcart: Growth Speed]]></string>
 
+    <string name="_bx_snipcart_search_extended"><![CDATA[Snipcart Search]]></string>
+    <string name="_bx_snipcart_search_extended_cmts"><![CDATA[Snipcart Comments Search]]></string>
+
     <string name="_bx_snipcart_pre_lists_cats"><![CDATA[Goods categories]]></string>
     <string name="_bx_snipcart_cat_automotive_and_industrial"><![CDATA[Automotive & Industrial]]></string>
     <string name="_bx_snipcart_cat_beauty_health_food"><![CDATA[Beauty, Health & Food]]></string>

+ 3 - 1
modules/boonex/snipcart/install/sql/disable.sql

@@ -9,7 +9,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 
 -- PAGES
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_snipcart';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_snipcart' OR `object` IN('bx_snipcart_create_entry', 'bx_snipcart_edit_entry', 'bx_snipcart_delete_entry', 'bx_snipcart_view_entry', 'bx_snipcart_view_entry_comments', 'bx_snipcart_home', 'bx_snipcart_popular', 'bx_snipcart_updated', 'bx_snipcart_author');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_snipcart' OR `object` IN('bx_snipcart_create_entry', 'bx_snipcart_edit_entry', 'bx_snipcart_delete_entry', 'bx_snipcart_view_entry', 'bx_snipcart_view_entry_comments', 'bx_snipcart_home', 'bx_snipcart_popular', 'bx_snipcart_updated', 'bx_snipcart_author', 'bx_snipcart_search', 'bx_snipcart_manage');
 
 
 -- MENU
@@ -30,6 +30,8 @@ DELETE FROM `sys_acl_actions` WHERE `Module` = 'bx_snipcart';
 -- SEARCH
 DELETE FROM `sys_objects_search` WHERE `ObjectName` IN ('bx_snipcart', 'bx_snipcart_cmts');
 
+-- SEARCH EXTENDED
+DELETE FROM `sys_objects_search_extended` WHERE `module` = 'bx_snipcart';
 
 -- METATAGS
 DELETE FROM `sys_objects_metatags` WHERE `object` = 'bx_snipcart';

+ 20 - 3
modules/boonex/snipcart/install/sql/enable.sql

@@ -94,6 +94,16 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_snipcart_home', 2, 'bx_snipcart', '', '_bx_snipcart_page_block_title_popular_keywords', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:14:"keywords_cloud";s:6:"params";a:2:{i:0;s:11:"bx_snipcart";i:1;s:11:"bx_snipcart";}s:5:"class";s:20:"TemplServiceMetatags";}', 0, 1, 1, 0),
 ('bx_snipcart_home', 2, 'bx_snipcart', '', '_bx_snipcart_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"categories_list";s:6:"params";a:2:{i:0;s:16:"bx_snipcart_cats";i:1;a:1:{s:10:"show_empty";b:1;}}s:5:"class";s:20:"TemplServiceCategory";}', 0, 1, 1, 1);
 
+-- PAGE: search for entries
+INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
+('bx_snipcart_search', '_bx_snipcart_page_title_sys_entries_search', '_bx_snipcart_page_title_entries_search', 'bx_snipcart', 5, 2147483647, 1, 'snipcart-search', 'page.php?i=snipcart-search', '', '', '', 0, 1, 0, 'BxSnipcartPageBrowse', 'modules/boonex/snipcart/classes/BxSnipcartPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_snipcart_search', 1, 'bx_snipcart', '_bx_snipcart_page_block_title_search_form', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:8:"get_form";s:6:"params";a:1:{i:0;a:1:{s:6:"object";s:11:"bx_snipcart";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 1),
+('bx_snipcart_search', 1, 'bx_snipcart', '_bx_snipcart_page_block_title_search_results', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:11:"get_results";s:6:"params";a:1:{i:0;a:2:{s:6:"object";s:11:"bx_snipcart";s:10:"show_empty";b:1;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 2),
+('bx_snipcart_search', 1, 'bx_snipcart', '_bx_snipcart_page_block_title_search_form_cmts', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:8:"get_form";s:6:"params";a:1:{i:0;a:1:{s:6:"object";s:16:"bx_snipcart_cmts";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 3),
+('bx_snipcart_search', 1, 'bx_snipcart', '_bx_snipcart_page_block_title_search_results_cmts', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:11:"get_results";s:6:"params";a:1:{i:0;a:2:{s:6:"object";s:16:"bx_snipcart_cmts";s:10:"show_empty";b:1;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 0, 4);
+
 -- PAGE: module manage own
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_snipcart_manage', '_bx_snipcart_page_title_sys_manage', '_bx_snipcart_page_title_manage', 'bx_snipcart', 5, 2147483647, 1, 'snipcart-manage', 'page.php?i=snipcart-manage', '', '', '', 0, 1, 0, 'BxSnipcartPageBrowse', 'modules/boonex/snipcart/classes/BxSnipcartPageBrowse.php');
@@ -181,9 +191,10 @@ INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-home', '_bx_snipcart_menu_item_title_system_entries_public', '_bx_snipcart_menu_item_title_entries_public', 'page.php?i=snipcart-home', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-popular', '_bx_snipcart_menu_item_title_system_entries_popular', '_bx_snipcart_menu_item_title_entries_popular', 'page.php?i=snipcart-popular', '', '', '', '', 2147483647, 1, 1, 2),
-('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-manage', '_bx_snipcart_menu_item_title_system_entries_manage', '_bx_snipcart_menu_item_title_entries_manage', 'page.php?i=snipcart-manage', '', '', '', '', 2147483646, 1, 1, 3),
-('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-settings', '_bx_snipcart_menu_item_title_system_settings', '_bx_snipcart_menu_item_title_settings', 'page.php?i=snipcart-settings', '', '', '', '', 2147483646, 1, 1, 4),
-('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-dashboard', '_bx_snipcart_menu_item_title_system_dashboard', '_bx_snipcart_menu_item_title_dashboard', 'https://app.snipcart.com', '', '_blank', '', '', 2147483646, 1, 1, 5);
+('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-search', '_bx_snipcart_menu_item_title_system_entries_search', '_bx_snipcart_menu_item_title_entries_search', 'page.php?i=snipcart-search', '', '', '', '', 2147483647, 1, 1, 3),
+('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-manage', '_bx_snipcart_menu_item_title_system_entries_manage', '_bx_snipcart_menu_item_title_entries_manage', 'page.php?i=snipcart-manage', '', '', '', '', 2147483646, 1, 1, 4),
+('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-settings', '_bx_snipcart_menu_item_title_system_settings', '_bx_snipcart_menu_item_title_settings', 'page.php?i=snipcart-settings', '', '', '', '', 2147483646, 1, 1, 5),
+('bx_snipcart_submenu', 'bx_snipcart', 'snipcart-dashboard', '_bx_snipcart_menu_item_title_system_dashboard', '_bx_snipcart_menu_item_title_dashboard', 'https://app.snipcart.com', '', '_blank', '', '', 2147483646, 1, 1, 6);
 
 -- MENU: sub-menu for view entry
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
@@ -299,6 +310,12 @@ INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `ClassName`, `
 ('bx_snipcart_cmts', '_bx_snipcart_cmts', @iSearchOrder + 2, 'BxSnipcartCmtsSearchResult', 'modules/boonex/snipcart/classes/BxSnipcartCmtsSearchResult.php');
 
 
+-- SEARCH EXTENDED
+INSERT INTO `sys_objects_search_extended` (`object`, `object_content_info`, `module`, `title`, `active`, `class_name`, `class_file`) VALUES
+('bx_snipcart', 'bx_snipcart', 'bx_snipcart', '_bx_snipcart_search_extended', 1, '', ''),
+('bx_snipcart_cmts', 'bx_snipcart_cmts', 'bx_snipcart', '_bx_snipcart_search_extended_cmts', 1, 'BxTemplSearchExtendedCmts', '');
+
+
 -- METATAGS
 INSERT INTO `sys_objects_metatags` (`object`, `table_keywords`, `table_locations`, `table_mentions`, `override_class_name`, `override_class_file`) VALUES
 ('bx_snipcart', 'bx_snipcart_meta_keywords', 'bx_snipcart_meta_locations', '', '', '');