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

Added: Tab wise permission restriction on the hotel feature delete process. #1031

Merged
merged 4 commits into from
May 21, 2024
Merged

Added: Tab wise permission restriction on the hotel feature delete process. #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5d7e34
Removed: Non required code from the AdminHotelFeatureController which…
vishal-singh-webkul May 7, 2024
4e87800
Added: tab wise permission restriction on the hotel feature delete pr…
vishal-singh-webkul May 7, 2024
3c17768
Merge branch 'develop' into gli-2055
vishal-singh-webkul May 15, 2024
ff24e26
Optimized code for the ajax request for the delete feature ajax process
vishal-singh-webkul May 21, 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
29 changes: 12 additions & 17 deletions modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,6 @@ public function postProcess()
$this->errors[] = $this->l('Please add atleast one Child features.');
}

foreach ($languages as $lang) {
if (!trim(Tools::getValue('parent_ftr_name_'.$lang['id_lang']))) {
$objHotelFeatures->name[$lang['id_lang']] = Tools::getValue(
'parent_ftr_name_'.$defaultLangId
);
} else {
$objHotelFeatures->name[$lang['id_lang']] = Tools::getValue(
'parent_ftr_name_'.$lang['id_lang']
);
}
}

if (!count($this->errors)) {
if (isset($parentFeatureId) && $parentFeatureId) {
$objHotelFeatures = new HotelFeatures($parentFeatureId);
Expand Down Expand Up @@ -297,13 +285,20 @@ public function postProcess()

public function ajaxProcessDeleteFeature()
{
$idFeature = Tools::getValue('feature_id');
$objHotelFeatures = new HotelFeatures();
if ($objHotelFeatures->deleteHotelFeatures($idFeature)) {
die('success');
$response = array('status' => false);
if ($this->tabAccess['delete']) {
$idFeature = Tools::getValue('feature_id');
$objHotelFeatures = new HotelFeatures();
if ($objHotelFeatures->deleteHotelFeatures($idFeature)) {
$response['status'] = true;
} else {
$response['msg'] = $this->l('Some error occurred while deleting feature. Please try again.');
}
} else {
echo 0;
$response['msg'] = $this->l('You do not have the permission to delete this.');
}

$this->ajaxDie(json_encode($response));
}

public function setMedia()
Expand Down
7 changes: 4 additions & 3 deletions modules/hotelreservationsystem/views/js/HotelReservationAdmin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,12 +463,13 @@ $(document).ready(function() {
action: 'deleteFeature',
},
method: 'POST',
success: function(data) {
if (data == 'success') {
dataType: 'json',
success: function(response) {
if (response.status) {
alert(success_delete_msg);
$('#grand_feature_div_' + ftr_id).remove();
} else {
alert(error_delete_msg);
alert(response.msg);
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
Expand Down