CM89 - contract changes

contracts.php

@@ -11,8 +11,8 @@ include_once './settings/settings.php';
 
 
 //SET PAGE ORIGIN FOR NAVIGATION AND SECURITY
+$page = $_SESSION['origin'] = 'contracts';
 $prev_page = ($_SESSION['origin'] == 'equipments') ? $_SESSION['prev_origin_equipment'] : (($_SESSION['origin'] == 'account')? $_SESSION['prev_origin'] :'');
-$page = 'contracts';
 
 //create backbutton to prev_origin
 $back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
@@ -78,7 +78,7 @@ $view .= ' <div class="msg success">
 }
 $view .= '
 <div class="content-header responsive-flex-column pad-top-5">
-    <a href="index.php?page=contract" class="btn">'.$button_create_contract.'</a>
+    <a href="index.php?page=contract_manage" class="btn">'.$button_create_contract.'</a>
     <form action="" method="get">
         <input type="hidden" name="page" value="contracts">
             <div class="filters">
@@ -136,12 +136,15 @@ $view .= '
                 $type = 'contract_type'.$response->type;
                 //calculate enddate from duration
                 $date = date('Y-m-d', strtotime('+'.$response->duration.' months', strtotime($response->start_date)));
-                    
+                
+                //GetPartnerDetails
+                $partner_data = json_decode($response->accounthierarchy);
+
                 $view .= ' 
                     <tr>
                     <td>'.$response->rowID.'</td>
                     <td>'.(($response->status == 1)? '<span class="status enabled">'.$$status:'<span class="status">'.$$status).'</td>
-                    <td>'.$response->accountID.'</td>
+                    <td>'.$partner_data->soldto.'</td>
                     <td>'.$$type.'</td>
                     <td>'.$response->start_date.'</td>
                     <td>'.$date.'</td>