Ticket #3265 - Different fixes.

unacms · May 18, 2021 · f7cea74 · f7cea74
1 parent 9f96f61
commit f7cea74
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/modules/boonex/ads/classes/BxAdsConfig.php b/modules/boonex/ads/classes/BxAdsConfig.php
@@ -9,6 +9,8 @@
  * @{
  */
 
+bx_import('BxDolInformer');
+
 class BxAdsConfig extends BxBaseModTextConfig
 {
     protected $_oDb;

diff --git a/modules/boonex/ads/classes/BxAdsDb.php b/modules/boonex/ads/classes/BxAdsDb.php
@@ -154,6 +154,8 @@ public function getCategories($aParams = array())
                 $sWhereClause = " AND `tc`.`parent_id`=:parent_id";
                 if(isset($aParams['with_content']) && $aParams['with_content'] === true)
                     $sWhereClause .= " AND `tc`.`items`>0";
+                if(isset($aParams['active']) && $aParams['active'] === true)
+                    $sWhereClause .= " AND `tc`.`active`=1";
                 break;
 
             case 'parent_id_count':
@@ -164,6 +166,8 @@ public function getCategories($aParams = array())
 
                 $sSelectClause = "COUNT(`tc`.`id`)";
                 $sWhereClause = " AND `tc`.`parent_id`=:parent_id";
+                if(isset($aParams['active']) && $aParams['active'] === true)
+                    $sWhereClause .= " AND `tc`.`active`=1";
                 break;
 
             case 'parent_id_order':

diff --git a/modules/boonex/ads/classes/BxAdsMenuView.php b/modules/boonex/ads/classes/BxAdsMenuView.php
@@ -75,7 +75,7 @@ protected function _isVisible ($a)
 
                 $bResult = true;
                 $this->addMarkers(array(
-                    'add_to_cart_title' => _t('_bx_market_menu_item_title_add_to_cart', $aCurrency['sign'], $this->_aContentInfo[$CNF['FIELD_PRICE']]),
+                    'add_to_cart_title' => _t('_bx_ads_menu_item_title_add_to_cart', $aCurrency['sign'], $this->_aContentInfo[$CNF['FIELD_PRICE']]),
                     'add_to_cart_onclick' => $sJsMethod
                 ));
                 break;

diff --git a/modules/boonex/ads/classes/BxAdsModule.php b/modules/boonex/ads/classes/BxAdsModule.php
@@ -1230,7 +1230,7 @@ protected function _serviceEntityForm ($sFormMethod, $iContentId = 0, $sDisplay
 
     protected function _getCategoryOptions($iParentId, &$aValues)
     {
-        $aCategories = $this->_oDb->getCategories(array('type' => 'parent_id', 'parent_id' => $iParentId));
+        $aCategories = $this->_oDb->getCategories(array('type' => 'parent_id', 'parent_id' => $iParentId, 'active' => true));
         foreach($aCategories as $aCategory) {
             $aValues[] = array('key' => $aCategory['id'], 'value' => str_repeat('--', (int)$aCategory['level']) . ' ' . _t($aCategory['title']));
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ @@
      * @{
      */
+    bx_import('BxDolInformer');
     class BxAdsConfig extends BxBaseModTextConfig
     {
         protected $_oDb;
@@ Expand Down @@