GX-Bug #54892 » filter_for_search_result_page.patch
| src/GXMainComponents/Controllers/HttpView/ShopAjax/FilterController.inc.php (date 1516196665000) | ||
|---|---|---|
| 163 | 163 |
$filterManager->reset(); |
| 164 | 164 |
} |
| 165 | 165 |
|
| 166 |
if($listingContentControl->determine_category_depth() === 'top') |
|
| 166 |
if($listingContentControl->determine_category_depth() === 'top' |
|
| 167 |
&& strpos($_GET['filter_url'], 'advanced_search_result.php') === false) |
|
| 167 | 168 |
{
|
| 168 | 169 |
$result = array( |
| 169 | 170 |
'success' => true, |
| src/GXModules/Gambio/Hub/Shop/Overloads/payment/GambioHubPayment.inc.php (date 1515505670000) | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/* -------------------------------------------------------------- |
| 3 |
GambioHubPayment.inc.php 2017-10-05
|
|
| 3 |
GambioHubPayment.inc.php 2018-01-08
|
|
| 4 | 4 |
Gambio GmbH |
| 5 | 5 |
http://www.gambio.de |
| 6 |
Copyright (c) 2017 Gambio GmbH
|
|
| 6 |
Copyright (c) 2018 Gambio GmbH
|
|
| 7 | 7 |
Released under the GNU General Public License (Version 2) |
| 8 | 8 |
[http://www.gnu.org/licenses/gpl-2.0.html] |
| 9 | 9 |
-------------------------------------------------------------- |
| ... | ... | |
| 32 | 32 |
*/ |
| 33 | 33 |
protected $moneyOrderModuleCode = 'MoneyOrderHub'; |
| 34 | 34 |
|
| 35 |
/** |
|
| 36 |
* @var array |
|
| 37 |
*/ |
|
| 38 |
protected $allowedPaymentModules; |
|
| 39 |
|
|
| 35 | 40 |
|
| 36 | 41 |
/** |
| 37 | 42 |
* Module selection method overload. |
| ... | ... | |
| 281 | 286 |
*/ |
| 282 | 287 |
protected function _getHubPaymentModules() |
| 283 | 288 |
{
|
| 289 |
if($this->allowedPaymentModules !== null) |
|
| 290 |
{
|
|
| 291 |
return $this->allowedPaymentModules; |
|
| 292 |
} |
|
| 293 |
|
|
| 284 | 294 |
$helper = MainFactory::create('HubCheckoutHelper');
|
| 285 | 295 |
|
| 286 | 296 |
// Hub transactions API client. |
| 287 | 297 |
$hubTransactionsApiClient = $helper->createHubTransactionsApiClient(new HubSessionKey($_SESSION['gambio_hub_session_key'])); |
| 288 | 298 |
|
| 289 |
$cartContent = $helper->getCartContent($GLOBALS['order']); |
|
| 290 |
$customerInformation = $helper->getCustomerInformation($GLOBALS['order']); |
|
| 291 |
$hubClientInformation = $helper->getHubClientInformation(); |
|
| 292 |
$clientSessionInformation = $helper->getClientSessionInformation($GLOBALS['order']); |
|
| 293 |
$allowedPaymentModules = $hubTransactionsApiClient->getAllowedPaymentModules($cartContent,
|
|
| 294 |
$customerInformation, |
|
| 295 |
$hubClientInformation, |
|
| 296 |
$clientSessionInformation, |
|
| 297 |
$this->_getUnallowedModuleCodes()); |
|
| 299 |
$cartContent = $helper->getCartContent($GLOBALS['order']);
|
|
| 300 |
$customerInformation = $helper->getCustomerInformation($GLOBALS['order']);
|
|
| 301 |
$hubClientInformation = $helper->getHubClientInformation();
|
|
| 302 |
$clientSessionInformation = $helper->getClientSessionInformation($GLOBALS['order']);
|
|
| 303 |
$this->allowedPaymentModules = $hubTransactionsApiClient->getAllowedPaymentModules($cartContent,
|
|
| 304 |
$customerInformation,
|
|
| 305 |
$hubClientInformation,
|
|
| 306 |
$clientSessionInformation,
|
|
| 307 |
$this->_getUnallowedModuleCodes());
|
|
| 298 | 308 |
|
| 299 |
return $allowedPaymentModules; |
|
| 309 |
return $this->allowedPaymentModules;
|
|
| 300 | 310 |
} |
| 301 | 311 |
|
| 302 | 312 |
|
| src/system/classes/filter/FilterBoxContentView.inc.php (date 1516196642000) | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/* -------------------------------------------------------------- |
| 3 |
FilterBoxContentView.inc.php 2017-10-06
|
|
| 3 |
FilterBoxContentView.inc.php 2018-01-17
|
|
| 4 | 4 |
Gambio GmbH |
| 5 | 5 |
http://www.gambio.de |
| 6 |
Copyright (c) 2017 Gambio GmbH
|
|
| 6 |
Copyright (c) 2018 Gambio GmbH
|
|
| 7 | 7 |
Released under the GNU General Public License (Version 2) |
| 8 | 8 |
[http://www.gnu.org/licenses/gpl-2.0.html] |
| 9 | 9 |
-------------------------------------------------------------- |
| ... | ... | |
| 215 | 215 |
elseif($t_action_url === '') |
| 216 | 216 |
{
|
| 217 | 217 |
$t_action_url = ''; |
| 218 |
if(gm_get_conf('SUPPRESS_INDEX_IN_URL') !== 'true')
|
|
| 218 |
if(strpos(gm_get_env_info('REQUEST_URI'), 'advanced_search_result.php') !== false)
|
|
| 219 |
{
|
|
| 220 |
$t_action_url = 'advanced_search_result.php'; |
|
| 221 |
} |
|
| 222 |
elseif(gm_get_conf('SUPPRESS_INDEX_IN_URL') !== 'true')
|
|
| 219 | 223 |
{
|
| 220 | 224 |
$t_action_url = 'index.php'; |
| 221 | 225 |
} |
| src/system/classes/listing/ProductListingContentControl.inc.php (date 1516196728000) | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/* -------------------------------------------------------------- |
| 3 |
ProductListingContentControl.inc.php 2017-10-05
|
|
| 3 |
ProductListingContentControl.inc.php 2018-01-17
|
|
| 4 | 4 |
Gambio GmbH |
| 5 | 5 |
http://www.gambio.de |
| 6 |
Copyright (c) 2017 Gambio GmbH
|
|
| 6 |
Copyright (c) 2018 Gambio GmbH
|
|
| 7 | 7 |
Released under the GNU General Public License (Version 2) |
| 8 | 8 |
[http://www.gnu.org/licenses/gpl-2.0.html] |
| 9 | 9 |
-------------------------------------------------------------- |
| ... | ... | |
| 170 | 170 |
switch($p_action) |
| 171 | 171 |
{
|
| 172 | 172 |
case 'search_result': |
| 173 |
$this->init_feature_filter(); |
|
| 174 |
|
|
| 175 |
// get feature_value_groups from FilterManager |
|
| 176 |
$t_feature_value_group_array = $this->coo_filter_manager->get_feature_value_group_array(); |
|
| 177 |
$coo_filter_selection_content_view = MainFactory::create_object('FilterSelectionContentView');
|
|
| 178 |
$coo_filter_selection_content_view->set_('feature_value_group_array', $t_feature_value_group_array);
|
|
| 179 |
$coo_filter_selection_content_view->set_('language_id', $_SESSION['languages_id']);
|
|
| 180 |
$this->filter_selection_html = $coo_filter_selection_content_view->get_html(); |
|
| 181 |
|
|
| 173 | 182 |
$this->build_search_result_sql(); |
| 174 | 183 |
|
| 175 | 184 |
break; |
| src/templates/Honeygrid/javascript/engine/widgets/filter.js (date 1516196593000) | ||
|---|---|---|
| 1 | 1 |
/* -------------------------------------------------------------- |
| 2 |
filter.js 2017-03-17
|
|
| 2 |
filter.js 2018-01-17
|
|
| 3 | 3 |
Gambio GmbH |
| 4 | 4 |
http://www.gambio.de |
| 5 |
Copyright (c) 2017 Gambio GmbH
|
|
| 5 |
Copyright (c) 2018 Gambio GmbH
|
|
| 6 | 6 |
Released under the GNU General Public License (Version 2) |
| 7 | 7 |
[http://www.gnu.org/licenses/gpl-2.0.html] |
| 8 | 8 |
-------------------------------------------------------------- |
| ... | ... | |
| 246 | 246 |
} |
| 247 | 247 |
} |
| 248 | 248 |
|
| 249 |
if (location.href.search(/advanced_search_result\.php/g) !== -1) {
|
|
| 250 |
$('h1').css('visibility', 'hidden');
|
|
| 251 |
} |
|
| 252 |
|
|
| 249 | 253 |
// reinitialize widgets in updated DOM |
| 250 | 254 |
window.gambio.widgets.init($this); |
| 251 | 255 |
|
| src/advanced_search_result.php (date 1516196625000) | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/* -------------------------------------------------------------- |
| 3 |
advanced_search_result.php 2016-09-21
|
|
| 3 |
advanced_search_result.php 2018-01-17
|
|
| 4 | 4 |
Gambio GmbH |
| 5 | 5 |
http://www.gambio.de |
| 6 | 6 |
Copyright (c) 2016 Gambio GmbH |
| ... | ... | |
| 80 | 80 |
$coo_listing_control->set_('categories_id', $_GET['categories_id']);
|
| 81 | 81 |
} |
| 82 | 82 |
|
| 83 |
$coo_listing_control->set_('coo_filter_manager', $_SESSION['coo_filter_manager']);
|
|
| 83 | 84 |
$coo_listing_control->set_('coo_product', $GLOBALS['product']);
|
| 84 | 85 |
$coo_listing_control->set_('currency_code', $_SESSION['currency']);
|
| 85 | 86 |
$coo_listing_control->set_('current_category_id', $GLOBALS['current_category_id']);
|