Enhance the menu

compucorp · Sep 28, 2014 · 76ccff6 · 76ccff6
1 parent d81488f
commit 76ccff6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 47 deletions.
diff --git a/CRM/Booking/Form/Booking/Info.php b/CRM/Booking/Form/Booking/Info.php
@@ -334,26 +334,27 @@ function postProcess() {
         }
         // fixed bug of CVB-94
         // Ad-hoc charges - cannot save
-        $items = array_filter(CRM_Utils_Array::value('items', $adhocCharges));
-        $newAdhocChargesIds = array();
-         foreach ($items as $key => $item) {
-          $params = array(
-            'booking_id' =>  $bookingID,
-            'item_id' => CRM_Utils_Array::value('item_id', $item),
-            'quantity' => CRM_Utils_Array::value('quantity', $item),
-          );
-          if($this->_action == CRM_Core_Action::UPDATE){
-            list($isExist, $currentAdhocChargesId) =  CRM_Booking_BAO_AdhocCharges::findExistingAdhocCharges($params, $currentAdhocCharges);
-            if($isExist){
-              $params['id'] =  $currentAdhocChargesId;
+        if(!is_null(CRM_Utils_Array::value('items', $adhocCharges))){
+          $items = array_filter(CRM_Utils_Array::value('items', $adhocCharges));
+          $newAdhocChargesIds = array();
+           foreach ($items as $key => $item) {
+            $params = array(
+              'booking_id' =>  $bookingID,
+              'item_id' => CRM_Utils_Array::value('item_id', $item),
+              'quantity' => CRM_Utils_Array::value('quantity', $item),
+            );
+            if($this->_action == CRM_Core_Action::UPDATE){
+              list($isExist, $currentAdhocChargesId) =  CRM_Booking_BAO_AdhocCharges::findExistingAdhocCharges($params, $currentAdhocCharges);
+              if($isExist){
+                $params['id'] =  $currentAdhocChargesId;
+              }
             }
+            $result = civicrm_api3('AdhocCharges', 'create', $params);
+            $adhocChargesId =  CRM_Utils_Array::value('id', $result);
+            array_push($newAdhocChargesIds, $adhocChargesId);
           }
-          $result = civicrm_api3('AdhocCharges', 'create', $params);
-          $adhocChargesId =  CRM_Utils_Array::value('id', $result);
-          array_push($newAdhocChargesIds, $adhocChargesId);
         }
 
-
         if($this->_action == CRM_Core_Action::UPDATE){ //remove  adhoc charges that have been removed
           $adhocChargesToBeRemoved = array();
           foreach ($currentAdhocCharges as $key => $adc) {

diff --git a/booking.php b/booking.php
@@ -265,27 +265,27 @@ function booking_civicrm_navigationMenu( &$params ) {
         'child' =>  array(
         $key++ => array(
           'attributes' => array(
-            'label' => ts('Manage Resources'),
-            'name' => 'manage_resources',
-            'url' => 'civicrm/admin/resource&reset=1',
+            'label' => ts('Resource Configuration Set'),
+            'name' => 'resource_config_set',
+            'url' => 'civicrm/admin/resource/config_set&reset=1',
             'permission' => null,
             'operator' => null,
             'separator' => 0,
-            'parentID' => $nextAdminMenuKey,
+            'parentID' =>  $nextAdminMenuKey,
             'navID' => 2,
             'active' => 1
           ),
          'child' => null
         ),
         $key++ => array(
           'attributes' => array(
-            'label' => ts('Resource Configuration Set'),
-            'name' => 'resource_config_set',
-            'url' => 'civicrm/admin/resource/config_set&reset=1',
+            'label' => ts('Manage Resources'),
+            'name' => 'manage_resources',
+            'url' => 'civicrm/admin/resource&reset=1',
             'permission' => null,
             'operator' => null,
             'separator' => 0,
-            'parentID' =>  $nextAdminMenuKey,
+            'parentID' => $nextAdminMenuKey,
             'navID' => 2,
             'active' => 1
           ),
@@ -383,7 +383,7 @@ function booking_civicrm_navigationMenu( &$params ) {
               'permission' => null,
               'operator' => null,
               'separator' => 0,
-              'parentID' => $newbookingKey,
+              'parentID' => $nextAdminMenuKey,
               'navID' => 7,
               'active' => 1
             ),
@@ -454,28 +454,6 @@ function booking_civicrm_navigationMenu( &$params ) {
     )
   );
   array_push($params, $bookingMenu);
-// array_unshift($params, $bookingMenu);
-  /*
-  $searchMenuId = CRM_Core_DAO::getFieldValue('CRM_Core_BAO_Navigation', 'Search...', 'id', 'name');
-  if ($searchMenuId) {
-    $maxSearchMenuKey = max( array_keys($params[$searchMenuId]['child']));
-    $nextSearchMenuKey = $maxSearchMenuKey + 1;
-    $beforeMaxSearchMenuKey = $maxSearchMenuKey - 1;
-    //remove lasted seperator for lasted Find
-    $params[$searchMenuId]['child'][$beforeMaxSearchMenuKey]['attributes']['separator'] = 0;
-
-    $lastSearchMenu = $params[$searchMenuId]['child'][$maxSearchMenuKey];
-    unset($params[$searchMenuId]['child'][$maxSearchMenuKey]);
-    $findBooking['attributes']['separator'] = 1;
-    $params[$searchMenuId]['child'][$maxSearchMenuKey] = $findBooking;
-    $params[$searchMenuId]['child'][$nextSearchMenuKey] = $lastSearchMenu;
-
-    //move search menu to be at the first of the array
-    $searchMenuTemp =  $params[$searchMenuId];
-    unset($params[$searchMenuId]);
-    array_unshift($params, $searchMenuTemp);
-  }
-  */
 
 }