Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: Notices and display issue when there is no rooms and no hotel available. #1018

Merged
merged 10 commits into from
Jul 2, 2024
Merged

Fixed: Notices and display issue when there is no rooms and no hotel available. #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9cfb775
Fixed: Notice in Admin products when QloApps is installed without the…
vishal-singh-webkul Apr 3, 2024
0be773c
Updated: Select fields created with fields_options will now show empt…
vishal-singh-webkul Apr 19, 2024
f54a672
Fixed: The make booking button on the mobile screen when there is no …
vishal-singh-webkul May 9, 2024
6e21fb1
Merge branch 'develop' into gli-1818
vishal-singh-webkul May 15, 2024
0e46e07
Revert changes for the getPriceStatic() call in admin products contro…
vishal-singh-webkul May 28, 2024
a95de12
Merge branch 'develop' into gli-1818
vishal-singh-webkul Jun 12, 2024
79d6dba
Fixed: Admin normal products page errors when no hotel is created
vishal-singh-webkul Jun 21, 2024
e98e60f
Updated the changes made in the previous commits
vishal-singh-webkul Jun 21, 2024
d857b8c
revert: the changes made to options.tpl
vishal-singh-webkul Jun 27, 2024
ab52e1a
Merge branch 'develop' into gli-1818
vishal-singh-webkul Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/admin/AdminNormalProductsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public function __construct()
$idServiceCategory = Configuration::get('PS_SERVICE_CATEGORY');
$this->objLocationsCategory = new Category($idServiceCategory, $this->context->language->id);
$nestedCategories = Category::getNestedCategories($idServiceCategory);
if ($nestedCategories) {
if (isset($nestedCategories[$idServiceCategory]['children']) && $nestedCategories[$idServiceCategory]['children']) {
foreach ($nestedCategories[$idServiceCategory]['children'] as $childCategory) {
$this->buildCategoryOptions($childCategory);
}
Expand Down
7 changes: 4 additions & 3 deletions controllers/admin/AdminProductsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,10 @@ public function __construct()
);
} else {
$hotels = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1);
$hotelsArray = array();
foreach ($hotels as $hotel) {
$addressInfo = HotelBranchInformation::getAddress($hotel['id_hotel']);
$this->hotelsArray[$hotel['id_hotel']] = $hotel['hotel_name'].', '.$addressInfo['city'];
$hotelsArray[$hotel['id_hotel']] = $hotel['hotel_name'].', '.$addressInfo['city'];
}

$this->fields_list['hotel_name'] = array(
Expand All @@ -256,7 +257,7 @@ public function __construct()
'multiple' => true,
'operator' => 'or',
'filter_key' => 'hrt!id_hotel',
'list' => $this->hotelsArray,
'list' => $hotelsArray,
'optional' => true,
'class' => 'chosen',
'visible_default' => true,
Expand Down Expand Up @@ -399,7 +400,7 @@ public function __construct()
$idLocationsCategory = Configuration::get('PS_LOCATIONS_CATEGORY');
$this->objLocationsCategory = new Category($idLocationsCategory, $this->context->language->id);
$nestedCategories = Category::getNestedCategories($idLocationsCategory);
if ($nestedCategories) {
if (isset($nestedCategories[$idLocationsCategory]['children']) && $nestedCategories[$idLocationsCategory]['children']) {
foreach ($nestedCategories[$idLocationsCategory]['children'] as $childCategory) {
$this->buildCategoryOptions($childCategory);
}
Expand Down
5 changes: 4 additions & 1 deletion modules/wkroomsearchblock/wkroomsearchblock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ public function hookDisplayAfterHookTop($params)
// In the xs sceen the booking button on the landing page
public function hookDisplayAfterHeaderHotelDesc()
{
return $this->display(__FILE__, 'landingPageXsBtn.tpl');
$objHotelInfo = new HotelBranchInformation();
if ($objHotelInfo->hotelBranchesInfo(0, 1)) {
return $this->display(__FILE__, 'landingPageXsBtn.tpl');
}
}

// search panel block on the category page on left block
Expand Down