Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: fix testing issue

Browse Source
This commit is contained in:
amit sharma
2026-08-19 11:18:13 +05:30
parent 81b5dd76fc
commit 55c74dad59
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
classes/BusinessSource.php
View File

@@ -59,6 +59,10 @@ class BusinessSourceCore extends ObjectModel
public function update($nullValues = false)
{
if (!$this->active && $this->hasUnremovableSource()) {
return false;
}
$result = parent::update($nullValues);
if ($result && !$this->active) {
@@ -177,11 +181,14 @@ class BusinessSourceCore extends ObjectModel
return !$this->unremovable;
}
/**
* @return bool True if any Booking Source under this Business Source — deleted or not —
* is referenced by an order. A soft-deleted Booking Source still referenced by a historical
* order must keep resolving to a Business Source name too, so this still blocks deletion.
*/
public function hasUnremovableSource()
{
return (bool)Db::getInstance()->getValue(
'SELECT COUNT(*) FROM `'._DB_PREFIX_.'source`
WHERE `id_business_source` = '.(int)$this->id.' AND `unremovable` = 1 AND `deleted` = 0'
);
}
public function hasSourceUsedByOrder()
{
return (bool)Db::getInstance()->getValue(
@@ -191,11 +198,6 @@ class BusinessSourceCore extends ObjectModel
);
}
/**
* @return int Total orders placed across every Booking Source under this Business Source —
* the denominator for each Booking Source's own percentage within this category's
* drill-down list (as opposed to a share of every order in the system).
*/
public function getOrderCount()
{
return (int)Db::getInstance()->getValue(
@@ -205,12 +207,6 @@ class BusinessSourceCore extends ObjectModel
);
}
/**
* Deleting a Business Source deletes every Booking Source under it (each through its own
* delete() rule — soft-deleted if order-linked, hard-deleted otherwise). If any of them
* turns out to be order-linked, this Business Source is soft-deleted too, the same way, so
* historical orders keep resolving a category name; otherwise it hard-deletes for real.
*/
public function delete()
{
if (!$this->isRemovable()) {

24
controllers/admin/AdminSourcesController.php
View File

@@ -466,6 +466,8 @@ class AdminSourcesControllerCore extends AdminController
return $this->postProcessBulkDeleteSource();
} elseif (Tools::isSubmit('submitAddbusiness_source') || Tools::isSubmit('submitAddbusiness_sourceAndStay')) {
return $this->postProcessBusinessSource();
} elseif (Tools::isSubmit('status'.$this->table)) {
return $this->postProcessStatusBusinessSource();
} elseif (Tools::isSubmit('delete'.$this->table)) {
return $this->postProcessDeleteBusinessSource();
} elseif (Tools::isSubmit('submitBulkdelete'.$this->table)) {
@@ -504,6 +506,21 @@ class AdminSourcesControllerCore extends AdminController
}
}
protected function postProcessStatusBusinessSource()
{
if (Validate::isLoadedObject($objBusinessSource = new BusinessSource((int)Tools::getValue('id_business_source')))) {
$newActive = !$objBusinessSource->active;
if (!$newActive && $objBusinessSource->hasUnremovableSource()) {
$this->errors[] = $this->l('You cannot disable this Business Source because it has one or more permanent (built-in) Booking Sources under it.');
} else {
$objBusinessSource->active = $newActive;
if ($objBusinessSource->save()) {
$this->redirect_after = self::$currentIndex.'&token='.$this->token.'&conf=5';
}
}
}
}
protected function postProcessBulkDeleteSource()
{
$idBusinessSource = 0;
@@ -697,6 +714,13 @@ class AdminSourcesControllerCore extends AdminController
}
}
if ($idBusinessSource && !(int)Tools::getValue('active')) {
$objBusinessSource = new BusinessSource($idBusinessSource);
if ($objBusinessSource->hasUnremovableSource()) {
$this->errors[] = $this->l('You cannot disable this Business Source because it has one or more permanent (built-in) Booking Sources under it.');
}
}
if (count($this->errors)) {
$this->display = $idBusinessSource ? 'edit' : 'add';
return false;