CM93 - mass update mandatory items
This commit is contained in:
@@ -270,7 +270,7 @@ $view .= '<div class="content-block tab-content">
|
||||
//Dropdown
|
||||
|
||||
$partner_data = json_decode($_SESSION['partnerhierarchy']);
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$accounthierarchy->soldto);
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$accounthierarchy->soldto,'');
|
||||
|
||||
$view .= '<div class="content-block tab-content">
|
||||
|
||||
|
||||
@@ -1943,7 +1943,7 @@ function serviceReport($history, $request, $country_code)
|
||||
//------------------------------------------
|
||||
// LIST PARTNER
|
||||
//------------------------------------------
|
||||
function listPartner($partnertype, $user_right, $input)
|
||||
function listPartner($partnertype, $user_right, $input, $required)
|
||||
{
|
||||
include dirname(__FILE__,2).'/settings/settings.php';
|
||||
|
||||
@@ -1974,7 +1974,7 @@ if ($input !='' && !empty($input)){
|
||||
}
|
||||
|
||||
$view ='
|
||||
<input list="'.$partnertype.'" name="'.$partnertype.'" placeholder="'.$input.'" class="datalist">
|
||||
<input list="'.$partnertype.'" name="'.$partnertype.'" placeholder="'.$input.'" value="'.$input.'" class="datalist" '.((isset($required) && $required != '') ? ' required' : '').'>
|
||||
<datalist id="'.$partnertype.'">
|
||||
'.$partner_available.'
|
||||
';
|
||||
|
||||
@@ -251,10 +251,10 @@ $view .=' </div>
|
||||
$partner_data = json_decode($contract['accounthierarchy']);
|
||||
|
||||
//BUID UP DROPDOWNS
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto);
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location);
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto,'');
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location,'');
|
||||
|
||||
//DISPLAY
|
||||
$view .= '<div class="content-block tab-content">
|
||||
|
||||
@@ -219,10 +219,10 @@ $view .= '<div class="content-block tab-content active">
|
||||
//GET PARTNERDATA
|
||||
$partner_data = json_decode($equipment['accounthierarchy']);
|
||||
//BUID UP DROPDOWNS
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto);
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location);
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto,'');
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location,'');
|
||||
if (isset($partner_data->section)){$section = getPartnerName($partner_data->section) ?? 'Not specified';} else {$section = 'Not specified';}
|
||||
|
||||
|
||||
|
||||
@@ -161,11 +161,14 @@ $view .= '<form action="" method="post">
|
||||
<div class="content-block-wrapper">
|
||||
';
|
||||
|
||||
|
||||
//BUID UP DROPDOWNS
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],'');
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],'');
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],'');
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],'');
|
||||
$partner = json_decode($_SESSION['partnerhierarchy'],true);
|
||||
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner['salesid'],'yes');
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],'','yes');
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],'','');
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],'','');
|
||||
|
||||
$view .='<div class="content-block order-details">
|
||||
<div class="block-header">
|
||||
@@ -202,7 +205,7 @@ $view .= ' <div class="content-block order-details">
|
||||
<h3><label for="status">'.$equipment_label11.'</label></h3>
|
||||
</div>
|
||||
<div class="order-detail">
|
||||
<input id="name" type="text" name="order_ref">
|
||||
<input id="name" type="text" name="order_ref" required>
|
||||
</div>
|
||||
<div class="order-detail">
|
||||
<h3><label for="status">'.$equipment_label3.'</label></h3>
|
||||
|
||||
@@ -159,8 +159,8 @@ $view .= '</div>
|
||||
//GET PARTNERDATA
|
||||
$partner_data = json_decode($partner['salesID'])?? json_decode($_SESSION['partnerhierarchy']) ;
|
||||
//BUID UP DROPDOWNS
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
|
||||
|
||||
//DISPLAY
|
||||
$view .= '<div class="content-block tab-content">
|
||||
|
||||
8
user.php
8
user.php
@@ -266,10 +266,10 @@ $view .= '</div>
|
||||
//GET PARTNERDATA
|
||||
$partner_data = json_decode($user['partnerhierarchy'])?? json_decode($_SESSION['partnerhierarchy']) ;
|
||||
//BUID UP DROPDOWNS
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid);
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto);
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto);
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location);
|
||||
$salesid_dropdown = listPartner('salesid',$_SESSION['permission'],$partner_data->salesid,'');
|
||||
$soldto_dropdown = listPartner('soldto',$_SESSION['permission'],$partner_data->soldto,'');
|
||||
$shipto_dropdown = listPartner('shipto',$_SESSION['permission'],$partner_data->shipto,'');
|
||||
$location_dropdown = listPartner('location',$_SESSION['permission'],$partner_data->location,'');
|
||||
|
||||
//DISPLAY
|
||||
$view .= '<div class="content-block tab-content">
|
||||
|
||||
Reference in New Issue
Block a user