Ticket #456 - module's submenus reorganization.

modules/boonex/payment/classes/BxPaymentCart.php

@@ -32,9 +32,10 @@ class BxPaymentCart extends BxBaseModPaymentCart
         if(empty($iUserId))
             return MsgBox(_t($CNF['T']['ERR_REQUIRED_LOGIN']));
 
+        $this->_oModule->setSiteSubmenu('menu_cart_submenu', 'cart');
+
         return array(
-        	'content' => $this->_oModule->_oTemplate->displayBlockCarts($iUserId),
-        	'menu' => $this->_oModule->_oConfig->getObject('menu_cart_submenu')
+        	'content' => $this->_oModule->_oTemplate->displayBlockCarts($iUserId)
         );
     }
 
@@ -54,11 +55,12 @@ class BxPaymentCart extends BxBaseModPaymentCart
     	if(empty($iSellerId))
     		return MsgBox(_t($CNF['T']['ERR_UNKNOWN_VENDOR']));
 
+        $this->_oModule->setSiteSubmenu('menu_cart_submenu', 'cart');
+
 		$aSeller = $this->_oModule->getProfileInfo();
         return array(
         	'title' => _t($CNF['T']['BLOCK_TITLE_CART'], $aSeller['name']),
-        	'content' => $this->_oModule->_oTemplate->displayBlockCart($iUserId, $iSellerId),
-        	'menu' => $this->_oModule->_oConfig->getObject('menu_cart_submenu')
+        	'content' => $this->_oModule->_oTemplate->displayBlockCart($iUserId, $iSellerId)
         );
     }
 
@@ -72,9 +74,10 @@ class BxPaymentCart extends BxBaseModPaymentCart
         if(empty($iUserId))
             return MsgBox(_t($CNF['T']['ERR_REQUIRED_LOGIN']));
 
+        $this->_oModule->setSiteSubmenu('menu_cart_submenu', 'cart-history');
+
         return array(
         	'content' => $this->_oModule->_oTemplate->displayBlockHistory($iUserId, $iSellerId),
-        	'menu' => $this->_oModule->_oConfig->getObject('menu_cart_submenu')
 		);
     }
 

modules/boonex/payment/classes/BxPaymentDetails.php

@@ -45,9 +45,10 @@ class BxPaymentDetails extends BxBaseModPaymentDetails
 		if(empty($sContent))
 			$sContent = MsgBox(_t($this->_sLangsPrefix . 'msg_no_results'));
 
+        $this->_oModule->setSiteSubmenu('menu_orders_submenu', 'details');
+
         return array(
-        	'content' => $sContent,
-        	'menu' => $this->_oModule->_oConfig->getObject('menu_orders_submenu')
+        	'content' => $sContent
         );
     }
 

modules/boonex/payment/classes/BxPaymentModule.php

@@ -639,6 +639,21 @@ class BxPaymentModule extends BxBaseModPaymentModule
 		bx_alert('system', 'cancel_subscription', 0, $aPending['client_id'], array('pending' => $aPending));
 		//--- 'System' -> 'Cancel Subscription' for Alerts Engine ---//
 	}
+
+    public function setSiteSubmenu($sSubmenu, $sSelected)
+    {
+        $oSiteSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu');
+        if(!$oSiteSubmenu)
+            return;
+
+        $sModuleSubmenu = $this->_oConfig->getObject($sSubmenu);
+        $oModuleSubmenu = BxDolMenu::getObjectInstance($sModuleSubmenu);
+        if(!$oModuleSubmenu) 
+            return;
+
+        $oSiteSubmenu->setObjectSubmenu($sModuleSubmenu, array('title' => _t('_bx_payment'), 'link' => '','icon' => ''));
+        $oModuleSubmenu->setSelected($this->_aModule['name'], $sSelected);
+    }
 }
 
 /** @} */

modules/boonex/payment/classes/BxPaymentOrders.php

@@ -33,11 +33,12 @@ class BxPaymentOrders extends BxBaseModPaymentOrders
     	if(!$this->_oModule->isLogged())
             return MsgBox(_t($this->_sLangsPrefix . 'err_required_login'));
 
+        $this->_oModule->setSiteSubmenu('menu_orders_submenu', 'orders-' . $sType);
+
         $iUserId = $iUserId != BX_PAYMENT_EMPTY_ID ? $iUserId : $this->_oModule->getProfileId();
         return array(
         	'title' => _t($this->_sLangsPrefix . 'page_block_title_orders_' . $sType),
-        	'content' => $this->_oModule->_oTemplate->displayBlockOrders($sType, $iUserId),
-        	'menu' => $this->_oModule->_oConfig->getObject('menu_orders_submenu')
+        	'content' => $this->_oModule->_oTemplate->displayBlockOrders($sType, $iUserId)
         );
     }
 

modules/boonex/payment/classes/BxPaymentSubscriptions.php

@@ -31,11 +31,6 @@ class BxPaymentSubscriptions extends BxBaseModPaymentSubscriptions
         return $this->_getBlock('history');
     }
 
-    public function serviceGetBlockDetails()
-    {
-        return $this->_getBlock('details');
-    }
-
 	public function serviceSubscribe($iSellerId, $sSellerProvider, $iModuleId, $iItemId, $iItemCount)
     {
     	$CNF = &$this->_oModule->_oConfig->CNF;
@@ -79,9 +74,11 @@ class BxPaymentSubscriptions extends BxBaseModPaymentSubscriptions
         if(empty($iUserId))
             return MsgBox(_t($CNF['T']['ERR_REQUIRED_LOGIN']));
 
+        $this->_oModule->setSiteSubmenu('menu_sbs_submenu', 'sbs-' . $sType);
+        
+
         return array(
-        	'content' => $this->_oModule->_oTemplate->$sMethod($iUserId),
-        	'menu' => $this->_oModule->_oConfig->getObject('menu_sbs_submenu')
+        	'content' => $this->_oModule->_oTemplate->$sMethod($iUserId)
         );
     }
 }

modules/boonex/payment/install/langs/en.xml

@@ -67,7 +67,7 @@
     <string name="_bx_payment_menu_item_title_system_sbs_list"><![CDATA[Subscriptions List]]></string>
     <string name="_bx_payment_menu_item_title_sbs_list"><![CDATA[Subscriptions]]></string>
     <string name="_bx_payment_menu_item_title_system_sbs_history"><![CDATA[Subscriptions History]]></string>
-    <string name="_bx_payment_menu_item_title_sbs_history"><![CDATA[Payments History]]></string>
+    <string name="_bx_payment_menu_item_title_sbs_history"><![CDATA[Payments]]></string>
 
     <string name="_bx_payment_menu_title_sbs_actions"><![CDATA[Subscription Actions]]></string>
     <string name="_bx_payment_menu_set_title_sbs_actions"><![CDATA[Subscription Actions]]></string>
@@ -367,8 +367,8 @@
 	<string name="_bx_payment_form_rcrl_card_input_card_number_sys"><![CDATA[Card Number]]></string>
 	<string name="_bx_payment_form_rcrl_card_input_card_number"><![CDATA[Card Number]]></string>
 	<string name="_bx_payment_form_rcrl_card_input_card_number_inf"><![CDATA[16 digits without spaces describing your card number]]></string>
-	<string name="_bx_payment_form_rcrl_card_input_card_expire_sys"><![CDATA[Expire Date]]></string>
-	<string name="_bx_payment_form_rcrl_card_input_card_expire"><![CDATA[Expire Date]]></string>
+	<string name="_bx_payment_form_rcrl_card_input_card_expire_sys"><![CDATA[Expiry Date]]></string>
+	<string name="_bx_payment_form_rcrl_card_input_card_expire"><![CDATA[Expiry Date]]></string>
 	<string name="_bx_payment_form_rcrl_card_input_card_expire_month"><![CDATA[Month]]></string>
 	<string name="_bx_payment_form_rcrl_card_input_card_expire_year"><![CDATA[Year]]></string>
 	<string name="_bx_payment_form_rcrl_card_input_card_expire_inf"><![CDATA[Use 'mm yyyy' format]]></string>
@@ -438,8 +438,8 @@
     <string name="_bx_payment_form_strp_card_input_card_number_sys"><![CDATA[Card Number]]></string>
     <string name="_bx_payment_form_strp_card_input_card_number"><![CDATA[Card Number]]></string>
     <string name="_bx_payment_form_strp_card_input_card_number_inf"><![CDATA[16 digits without spaces describing your card number]]></string>
-    <string name="_bx_payment_form_strp_card_input_card_expire_sys"><![CDATA[Expire Date]]></string>
-    <string name="_bx_payment_form_strp_card_input_card_expire"><![CDATA[Expire Date]]></string>
+    <string name="_bx_payment_form_strp_card_input_card_expire_sys"><![CDATA[Expiry Date]]></string>
+    <string name="_bx_payment_form_strp_card_input_card_expire"><![CDATA[Expiry Date]]></string>
     <string name="_bx_payment_form_strp_card_input_card_expire_month"><![CDATA[Month]]></string>
     <string name="_bx_payment_form_strp_card_input_card_expire_year"><![CDATA[Year]]></string>
     <string name="_bx_payment_form_strp_card_input_card_expire_inf"><![CDATA[Use 'mm yyyy' format]]></string>

modules/boonex/payment/install/sql/enable.sql

@@ -44,7 +44,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 
 -- MENU: cart submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_payment_menu_cart_submenu', '_bx_payment_menu_title_cart_submenu', 'bx_payment_menu_cart_submenu', 'bx_payment', 6, 0, 1, '', '');
+('bx_payment_menu_cart_submenu', '_bx_payment_menu_title_cart_submenu', 'bx_payment_menu_cart_submenu', 'bx_payment', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_payment_menu_cart_submenu', 'bx_payment', '_bx_payment_menu_set_title_cart_submenu', 0);
@@ -55,7 +55,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- MENU: subscriptions submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_payment_menu_sbs_submenu', '_bx_payment_menu_title_sbs_submenu', 'bx_payment_menu_sbs_submenu', 'bx_payment', 6, 0, 1, '', '');
+('bx_payment_menu_sbs_submenu', '_bx_payment_menu_title_sbs_submenu', 'bx_payment_menu_sbs_submenu', 'bx_payment', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_payment_menu_sbs_submenu', 'bx_payment', '_bx_payment_menu_set_title_sbs_submenu', 0);
@@ -76,7 +76,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- MENU: orders submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_payment_menu_orders_submenu', '_bx_payment_menu_title_orders_submenu', 'bx_payment_menu_orders_submenu', 'bx_payment', 6, 0, 1, '', '');
+('bx_payment_menu_orders_submenu', '_bx_payment_menu_title_orders_submenu', 'bx_payment_menu_orders_submenu', 'bx_payment', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_payment_menu_orders_submenu', 'bx_payment', '_bx_payment_menu_set_title_orders_submenu', 0);