Ticket #851

inc/js/functions.js

@@ -512,10 +512,17 @@ function bx_menu_show_live_update(oData) {
 		var oMenuItem = $('.bx-menu-object-' + oData.mi_parent.menu_object + ' #bx-menu-toolbar-item-' + oData.mi_parent.menu_item);
 		var oMenuItemAddon = oMenuItem.find('.bx-menu-item-addon');
 
+		var iSum = 0;
+		$('.bx-menu-object-' + oData.mi_child.menu_object + ' .bx-menu-item .bx-menu-item-addon').each(function() {
+			iValue = parseInt($(this).html());
+			if(iValue && iValue > 0)
+				iSum += iValue;
+		});
+
 		if(oMenuItemAddon.length > 0)
-			oMenuItemAddon.html(parseInt(oMenuItemAddon.html()) + (oData.count_new - oData.count_old));
+			oMenuItemAddon.html(iSum);
 		else
-			oMenuItem.append(oData.code.replace('{count}', oData.count_new));
+			oMenuItem.append(oData.code.replace('{count}', iSum));
 	}
 }
 /**

install/sql/system.sql

@@ -3342,8 +3342,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_account_notifications', 'system', 'account-settings', '_sys_menu_item_title_system_account_settings', '_sys_menu_item_title_account_settings', 'page.php?i=account-settings-email', '', '', 'cog', '', '', 2147483646, 1, 1, 3),
 ('sys_account_notifications', 'system', 'add-content', '_sys_menu_item_title_system_add_content', '_sys_menu_item_title_add_content', 'javascript:void(0);', 'bx_menu_slide(\'#bx-sliding-menu-sys_add_content\', $(\'bx-menu-toolbar-item-add-content a\').get(0), \'site\');', '', 'plus', '', '', 2147483646, 1, 1, 4),
 ('sys_account_notifications', 'system', 'studio', '_sys_menu_item_title_system_studio', '_sys_menu_item_title_studio', '{studio_url}', '', '', 'wrench', '', '', 2147483646, 1, 0, 5),
-('sys_account_notifications', 'system', 'notifications-cart', '_sys_menu_item_title_system_cart', '_sys_menu_item_title_cart', 'cart.php', '', '', 'cart-plus col-red3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:20:"get_cart_items_count";s:6:"params";a:0:{}s:5:"class";s:21:"TemplPaymentsServices";}', '', 2147483646, 1, 1, 6),
-('sys_account_notifications', 'system', 'notifications-orders', '_sys_menu_item_title_system_orders', '_sys_menu_item_title_orders', 'orders.php', '', '', 'cart-arrow-down col-green3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"get_orders_count";s:6:"params";a:1:{i:0;s:3:"new";}s:5:"class";s:21:"TemplPaymentsServices";}', '', 2147483646, 0, 1, 7),
+('sys_account_notifications', 'system', 'cart', '_sys_menu_item_title_system_cart', '_sys_menu_item_title_cart', 'cart.php', '', '', 'cart-plus col-red3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:20:"get_cart_items_count";s:6:"params";a:0:{}s:5:"class";s:21:"TemplPaymentsServices";}', '', 2147483646, 1, 1, 6),
+('sys_account_notifications', 'system', 'orders', '_sys_menu_item_title_system_orders', '_sys_menu_item_title_orders', 'orders.php', '', '', 'cart-arrow-down col-green3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"get_orders_count";s:6:"params";a:1:{i:0;s:3:"new";}s:5:"class";s:21:"TemplPaymentsServices";}', '', 2147483646, 0, 1, 7),
 ('sys_account_notifications', 'system', 'logout', '_sys_menu_item_title_system_logout', '_sys_menu_item_title_logout', 'logout.php', '', '', 'sign-out', '', '', 2147483646, 1, 1, 9999);
 
 -- account settings menu

modules/boonex/convos/classes/BxCnvModule.php

@@ -237,7 +237,7 @@ class BxCnvModule extends BxBaseModTextModule
     {
         $iProfileId = (int)bx_get_logged_profile_id();
         $iCountNew = $this->_oDb->getUnreadMessagesNum($iProfileId);
-        if($iCountNew <= $iCount)
+        if($iCountNew == $iCount)
 			return false;
 
         return array(

modules/boonex/notifications/classes/BxNtfsModule.php

@@ -102,7 +102,7 @@ class BxNtfsModule extends BxBaseModNotificationsModule
     {
         $iOwnerId = $this->getUserId();
         $iCountNew = $this->serviceGetUnreadNotificationsNum($iOwnerId);
-        if($iCountNew <= $iCount)
+        if($iCountNew == $iCount)
 			return false;
 
         return array(

template/menu_floating_blocks_wide.html

@@ -1,6 +1,6 @@
 
 <ul class="bx-menu-floating-blocks-wide bx-menu-object-__object__ bx-clearfix">
-    <bx_repeat:menu_items><li class="bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
+    <bx_repeat:menu_items><li class="bx-menu-item bx-menu-item-__name__ bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
         <a href="__link__" target="__target__" onclick="__onclick__">
             <div class="bx-menu-floating-blocks-icon">
                 <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>

template/scripts/BxBasePaymentsServices.php

@@ -35,7 +35,7 @@ class BxBasePaymentsServices extends BxDol
     public function serviceGetLiveUpdatesCart($aMenuItemParent, $aMenuItemChild, $iCount = 0)
     {
         $iCountNew = BxDolPayments::getInstance()->getCartItemsCount();
-        if($iCountNew <= $iCount)
+        if($iCountNew == $iCount)
 			return false;
 
         return array(
@@ -54,7 +54,7 @@ class BxBasePaymentsServices extends BxDol
     public function serviceGetLiveUpdatesOrders($aMenuItemParent, $aMenuItemChild, $iCount = 0)
     {
         $iCountNew = BxDolPayments::getInstance()->getOrdersCount('new');
-        if($iCountNew <= $iCount)
+        if($iCountNew == $iCount)
 			return false;
 
         return array(

template/scripts/BxBaseServiceConnections.php

@@ -72,8 +72,8 @@ class BxBaseServiceConnections extends BxDol
         if(!$oProfile || $oProfile->getModule() != $sModule)
             return false;
 
-        $iCountNew = $this->serviceGetUnconfirmedConnectionsNum($sConnectionsObject, $iProfile);
-        if($iCountNew <= $iCount)
+        $iCountNew = (int)$this->serviceGetUnconfirmedConnectionsNum($sConnectionsObject, $iProfile);
+        if($iCountNew == (int)$iCount)
 			return false;
 
         return array(