From b72f329154c17250955fa97ce82e1ed660e9375b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”> Date: Tue, 10 Dec 2024 11:49:04 +0100 Subject: [PATCH] CM91 - RMA update --- .gitignore | 1 + api/v1/get/equipments.php | 8 +- api/v2/get/billing.php | 2 +- api/v2/get/equipments.php | 8 +- api/v2/get/history.php | 4 + api/v2/post/rma.php | 11 +- assets/images/tss-green.png | Bin 0 -> 16575 bytes assets/mail/email_template_new.php | 107 +++++-- rma.php | 323 ++++++++++++-------- rma_manage.php | 458 ++++++++++++++++++++++++++++ rmas.php | 43 ++- settings/settingsmenu.php | 4 +- settings/settingsprofiles.php | 4 +- settings/settingsviews.php | 1 + settings/systemrma.php | 30 ++ settings/systemservicetool_init.php | 178 ----------- 16 files changed, 839 insertions(+), 343 deletions(-) create mode 100644 assets/images/tss-green.png create mode 100644 rma_manage.php create mode 100644 settings/systemrma.php diff --git a/.gitignore b/.gitignore index d5a43b8..413b735 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ dev.php test.php +migration.php log_21.txt log_22.txt marketing/ diff --git a/api/v1/get/equipments.php b/api/v1/get/equipments.php index 61b7e18..27915d1 100644 --- a/api/v1/get/equipments.php +++ b/api/v1/get/equipments.php @@ -61,7 +61,7 @@ if(isset($get_content) && $get_content!=''){ $v = explode("=", $y); //INCLUDE VARIABLES IN ARRAY $criterias[$v[0]] = $v[1]; - if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='products' || $v[0] =='totals' || $v[0] =='history' || $v[0] =='success_msg' || $v[0] =='download' || $v[0] =='sort'){ + if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='products' || $v[0] =='list' || $v[0] =='totals' || $v[0] =='history' || $v[0] =='success_msg' || $v[0] =='download' || $v[0] =='sort'){ //do nothing } elseif ($v[0] == 'equipmentid') { @@ -188,6 +188,10 @@ elseif (isset($criterias['products']) && $criterias['products'] ==''){ //Request for all products in equipment view $sql = 'SELECT distinct(p.productcode), p.productname from equipment e LEFT JOIN products p ON e.productrowid = p.rowID '.$whereclause.' ORDER BY p.productcode'; } +elseif (isset($criterias['list']) && $criterias['list'] =='') { + //SQL for Paging + $sql = 'SELECT e.rowID, e.serialnumber FROM equipment e '.$whereclause.''; +} elseif (isset($criterias['totals']) && $criterias['totals'] =='' && isset($criterias['type'])){ //Request for total rows for history reports $sql ='SELECT count(*) as count FROM equipment_history h LEFT JOIN equipment e ON h.equipmentid = e.rowID '.$whereclause.''; @@ -320,7 +324,7 @@ if(isset($criterias['totals']) && $criterias['totals']==''){ $messages = $stmt->fetch(); $messages = $messages[0]; } -elseif ((isset($criterias['history']) && $criterias['history'] !='') || (isset($criterias['products']) && $criterias['products'] =='') || (isset($criterias['download']) && $criterias['download'] =='')){ +elseif ((isset($criterias['history']) && $criterias['history'] !='') || (isset($criterias['list']) && $criterias['list']=='') || (isset($criterias['products']) && $criterias['products'] =='') || (isset($criterias['download']) && $criterias['download'] =='')){ //Excute Query $stmt->execute(); //Get results diff --git a/api/v2/get/billing.php b/api/v2/get/billing.php index a53d3ed..e8832a7 100644 --- a/api/v2/get/billing.php +++ b/api/v2/get/billing.php @@ -34,7 +34,7 @@ if(isset($get_content) && $get_content!=''){ $ye = ((isset($criterias['year']) && $criterias['year'] !='' )? $criterias['year'] : $curYear); $mo = ((isset($criterias['month']) && $criterias['month'] !='')? $criterias['month'] : $curMonth); $qu = ((isset($criterias['month']) ? (int)ceil($mo / 3): $curQuarter)); -$da = $ye.'-'.$mo.'-01'; +$da = $ye.'-'.$mo.'-'.date("d"); //CALL TO API TO GET ALL ACTIVE CONTRACTS $api_url = '/v2/contracts/'.$GET_VALUES; diff --git a/api/v2/get/equipments.php b/api/v2/get/equipments.php index 5c82922..a31b9de 100644 --- a/api/v2/get/equipments.php +++ b/api/v2/get/equipments.php @@ -60,7 +60,7 @@ if(isset($get_content) && $get_content!=''){ $v = explode("=", $y); //INCLUDE VARIABLES IN ARRAY $criterias[$v[0]] = $v[1]; - if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='products' || $v[0] =='totals' || $v[0] =='history' || $v[0] =='success_msg' || $v[0] =='download' || $v[0] =='sort'){ + if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='products' || $v[0] =='list' || $v[0] =='totals' || $v[0] =='history' || $v[0] =='success_msg' || $v[0] =='download' || $v[0] =='sort'){ //do nothing } elseif ($v[0] == 'equipmentid') { @@ -179,6 +179,10 @@ elseif (isset($criterias['totals']) && $criterias['totals'] =='' && !isset($crit //Request for total rows $sql = 'SELECT count(*) as count from equipment e LEFT JOIN products p ON e.productrowid = p.rowID '.$whereclause.''; } +elseif (isset($criterias['list']) && $criterias['list'] =='') { + //SQL for Paging + $sql = 'SELECT e.rowID, e.serialnumber FROM equipment e '.$whereclause.''; +} elseif (isset($criterias['products']) && $criterias['products'] ==''){ //Request for all products in equipment view $sql = 'SELECT distinct(p.productcode), p.productname from equipment e LEFT JOIN products p ON e.productrowid = p.rowID '.$whereclause.' ORDER BY p.productcode'; @@ -315,7 +319,7 @@ if(isset($criterias['totals']) && $criterias['totals']==''){ $messages = $stmt->fetch(); $messages = $messages[0]; } -elseif ((isset($criterias['history']) && $criterias['history'] !='') || (isset($criterias['products']) && $criterias['products'] =='') || (isset($criterias['download']) && $criterias['download'] =='')){ +elseif ((isset($criterias['history']) && $criterias['history'] !='') || (isset($criterias['list']) && $criterias['list']=='') || (isset($criterias['products']) && $criterias['products'] =='') || (isset($criterias['download']) && $criterias['download'] =='')){ //Excute Query $stmt->execute(); //Get results diff --git a/api/v2/get/history.php b/api/v2/get/history.php index 152f939..205fb7b 100644 --- a/api/v2/get/history.php +++ b/api/v2/get/history.php @@ -69,6 +69,10 @@ if(isset($get_content) && $get_content!=''){ $filter_key_2 = '"ServiceReport"'; $clause .= ' AND h.type = '.$filter_key_2.' AND h.description like '.$filter_key_1; } + elseif ($v[0] == 'created') { + //build up search + $clause .= ' AND h.created > :'.$v[0]; + } else {//create clause $clause .= ' AND '.$v[0].' = :'.$v[0]; } diff --git a/api/v2/post/rma.php b/api/v2/post/rma.php index 3172784..496751d 100644 --- a/api/v2/post/rma.php +++ b/api/v2/post/rma.php @@ -15,7 +15,6 @@ $whereclause = ''; //SET PARAMETERS FOR QUERY $id = $post_content['rowID'] ?? ''; //check for rowID -$rma_id = $post_content['rmaID'] ?? 0; //check for rmaID $command = ($id == '')? 'insert' : 'update'; //IF rowID = empty then INSERT if (isset($post_content['delete'])){$command = 'delete';} //change command to delete @@ -44,10 +43,14 @@ if ($command == 'insert'){ $post_content['createdby'] = $username; } +//ENCODE HEADER AND QUESTIONS +if (isset($post_content['header'])){$post_content['header'] = json_encode($post_content['header'], JSON_UNESCAPED_UNICODE);} +if (isset($post_content['questions'])){$post_content['questions'] = json_encode($post_content['questions'], JSON_UNESCAPED_UNICODE);} + //CREAT NEW ARRAY AND MAP TO CLAUSE if(isset($post_content) && $post_content!=''){ foreach ($post_content as $key => $var){ - if ($key == 'submit' || $key == 'delete' || $key == 'rowID'){ + if ($key == 'save' ||$key == 'submit' || $key == 'delete' || $key == 'rowID'){ //do nothing } else { @@ -66,13 +69,13 @@ $clause_insert = substr($clause_insert, 2); //Clean clause - remove first comma $input_insert = substr($input_insert, 1); //Clean clause - remove first comma //QUERY AND VERIFY ALLOWED -if ($command == 'update' && $rma_id !=0 && isAllowed('rma',$profile,$permission,'U') === 1){ +if ($command == 'update' && isAllowed('rma',$profile,$permission,'U') === 1){ $sql = 'UPDATE rma SET '.$clause.' WHERE rowID = ? '.$whereclause.''; $execute_input[] = $id; $stmt = $pdo->prepare($sql); $stmt->execute($execute_input); } -elseif ($command == 'insert' && $rma_id !=0 && isAllowed('rma',$profile,$permission,'C') === 1){ +elseif ($command == 'insert' && isAllowed('rma',$profile,$permission,'C') === 1){ $sql = 'INSERT INTO rma ('.$clause_insert.') VALUES ('.$input_insert.')'; $stmt = $pdo->prepare($sql); $stmt->execute($execute_input); diff --git a/assets/images/tss-green.png b/assets/images/tss-green.png new file mode 100644 index 0000000000000000000000000000000000000000..43dcec9dab9875a6f17f32fd5edd3acfe089cc4e GIT binary patch literal 16575 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 literal 0 HcmV?d00001 diff --git a/assets/mail/email_template_new.php b/assets/mail/email_template_new.php index faabe91..54f32e0 100644 --- a/assets/mail/email_template_new.php +++ b/assets/mail/email_template_new.php @@ -5,8 +5,11 @@ defined($security_key) or exit; //------------------------------------------ $newuser_subject = 'CustomerPortal user created'; $newuser_header = 'Dear CustomerPortal user'; -$newuser_text = 'Your CustomerPortal administrator has provided access to the CustomerPortal. To complete your account you need to update your password via the link below.'; -$newuser_credential_label = 'Link to portal:'; + +$newuser_text = 'Your administrator has provided access to the CustomerPortal.'; +$newuser_credential_text_1 = 'Your account has been created with username '; +$newuser_credential_text_2 = 'Please click the button below to complete your registration.'; + $newuser_closure = 'For security reasons this link is only active for 10 minutes.'; //------------------------------------------ @@ -15,33 +18,77 @@ $newuser_closure = 'For security reasons this link is only active for 10 minutes $subject = $newuser_subject; $message = ' - - + + + + + ' . $subject . ' - - - ' . $newuser_header . ', -
-
- ' . $newuser_text . ' -

' . $newuser_credential_label . '

- -
- ' . $newuser_closure . ' -
-
- Kind regards,
-
-
- logo -
- - -'; + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ CustomerPortal +
+ ' . $newuser_header . ', +
+
+ '.$newuser_text.' '.$newuser_credential_text_1.''.$post_content['username'].' +
+
+ '.$newuser_credential_text_2.' +
+ + + + + +
+ Reset Password +
+
+ ' . $newuser_closure . ' +
+
+
+ + +'; \ No newline at end of file diff --git a/rma.php b/rma.php index 6875f6d..554fe99 100644 --- a/rma.php +++ b/rma.php @@ -6,10 +6,68 @@ if (debug && debug_id == $_SESSION['id']){ ini_set('display_startup_errors', '1'); error_reporting(E_ALL); } +//__________________________________________ +//MOVE TO TRANSLATION FILES: +//__________________________________________ +$button_create_rma = 'Create RMA'; + +//RMA +$rmas_h2 = 'Return Material'; +$rmas_p = 'View, manage, and search RMA details.'; +$rma_h2 = 'Return Material Request'; + +$message_rma_1 = 'RMA created successfully!'; +$message_rma_2 = 'RMA updated successfully!'; +$message_rma_3 = 'RMA deleted successfully!'; +$message_no_rma = 'There is no RMA'; + +$rma_search = 'Search RMA...'; + +$rma_rowID = 'Request number'; +$rma_status = 'Status'; + +$rma_status0_text = '1'; +$rma_status1_text = '2'; +$rma_status2_text = '3'; +$rma_status3_text = '4'; +$rma_status4_text = '5'; + +$rma_sw_version_latest = 'Latest software version'; +$rma_servicereport_latest = 'Servicereport created last 7days'; + +$rma_information = 'RMA information'; +$rma_return_reason = 'Return reason'; +$rma_return_reason0_text = ''; +$rma_return_reason1_text = ''; +$rma_return_reason2_text = ''; +$rma_return_reason3_text = ''; +$rma_return_reason4_text = ''; +$rma_return_reason5_text = ''; + +$rma_return_reasons_notes = 'Return reason notes'; + +$rma_return_tab1 = 'Return reason'; +$rma_return_tab2 = 'Questions'; + +$rma_question_allowed_label1 = 'Yes'; +$rma_question_allowed_label2 = 'No'; + +$rma_question_header_1 = ''; +$rma_question_1 = 'Batteries working?'; +$rma_question_2 = 'Button correctly working'; +$rma_question_3 = ''; +$rma_question_4 = ''; +$rma_question_5 = ''; +$rma_question_6 = ''; +$rma_question_7 = ''; +//__________________________________________ +//__________________________________________ +//__________________________________________ include_once './assets/functions.php'; include_once './settings/settings.php'; +include_once './settings/systemrma.php'; -$page = 'rmas'; +$page = 'rma'; //Check if allowed if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){ header('location: index.php'); @@ -20,154 +78,179 @@ $update_allowed = isAllowed($page ,$_SESSION['profile'],$_SESSION['permission'], $delete_allowed = isAllowed($page ,$_SESSION['profile'],$_SESSION['permission'],'D'); $create_allowed = isAllowed($page ,$_SESSION['profile'],$_SESSION['permission'],'C'); +$view_product = isAllowed('product' ,$_SESSION['profile'],$_SESSION['permission'],'R'); +$view_history = isAllowed('history' ,$_SESSION['profile'],$_SESSION['permission'],'C'); -//GET PARAMETERS -$pagination_page = isset($_GET['p']) ? $_GET['p'] : 1; -$search = isset($_GET['search']) ? '&search='.$_GET['search'] : ''; +$rowID = $_GET['rowID'] ?? ''; -// Determine the URL -$url = 'index.php?page='.$page.$search; -//GET Details from URL -$GET_VALUES = urlGETdetails($_GET) ?? ''; +if ($rowID !=''){ + $url = 'index.php?page=rma&rowID='.$rowID.''; +} else { + $url = 'index.php?page=rmas'; +} + +// ID param exists, edit an existing product //CALL TO API -$api_url = '/v2/rma/'.$GET_VALUES; +$api_url = '/v2/rma/rowID='.$_GET['rowID']; $responses = ioServer($api_url,''); //Decode Payload if (!empty($responses)){$responses = json_decode($responses,true);}else{$responses = null;} +$rma = json_decode(json_encode($responses[0]), true); + +//GET DETAILS +$rma_header = json_decode($rma['header'],true) ?? ''; +$rma_questions = json_decode($rma['questions'],true) ?? ''; + +//------------------------------ +//Variables +//------------------------------ +$status_text = 'rma_status'.$rma['status'].'_text'; -//Return QueryTotal from API -$api_url = '/v2/rma/'.$GET_VALUES.'&totals='; -$query_total = ioServer($api_url,''); -//Decode Payload -if (!empty($query_total)){$query_total = json_decode($query_total,true);}else{$query_total = null;} // Handle success messages if (isset($_GET['success_msg'])) { if ($_GET['success_msg'] == 1) { - $success_msg = $message_ct_1; + $success_msg = $message_rma_1; } if ($_GET['success_msg'] == 2) { - $success_msg = $message_ct_2; + $success_msg = $message_rma_2; } if ($_GET['success_msg'] == 3) { - $success_msg = $message_ct_3; + $success_msg = $message_rma_3; } -} +} -if (isset($_GET['download'])){ - downloadToExcel('rma',$responses); -} +template_header('RMA', 'rma','manage'); -template_header('rma', 'rma' ,'view'); $view = ' -
-
- -
-

'.$rma_h2.' ('.$query_total.')

-

'.$rma_p.'

-
-
-
'; +
+

'.($rma_h2 ?? 'Return Material Request').' - '.$_GET['rowID'].'

+ '.$button_cancel.' +'; + +if ($update_allowed === 1){ + $view .= 'Edit'; +} + +$view .= '
'; if (isset($success_msg)){ -$view .= '
- -

'.$success_msg.'

- -
'; + $view .= '
+ +

'.$success_msg.'

+ +
'; } -$view .= ' -
'; -if ($create_allowed ===1){ - $view .= ''.$button_create_rma.''; -} -$view .= ' -
- -
- '.$general_filters.' -
- - + +$view .= '
'; +$view .= '
+
+ '.($rma_information ?? 'RMA details').' +
+
+

'.$equipment_label3.'

+

'.$$status_text.'

+
+
+

'.$equipment_label2.'

+

'.$rma_header['serialnumber'].'

+
+ +
+

'.$product_code.'

+

'.(($view_product == 1)? ''.$rma_header['productcode'].'':'').'

+
+
+

'.$product_name.'

+

'.(($view_product == 1)? ''.$rma_header['productname'].'':'').'

+
+
+

'.$equipment_label10.'

+

+
+
+

'.($rma_sw_version_latest ?? 'Latest software version').'

+

+

+
+
+

'.($rma_servicereport_latest ?? 'Servicereport created last 7days').'

+

+

+
+ '; + +$view .=' +
+'; + +$view .='
+
+ '.$view_asset_partners.' +
+
+

'.$general_soldto.'

+

+
+
+

'.$general_shipto.'

+

+
+
+

'.$general_location.'

+

'; -//SHOW DOWNLOAD TO EXCELL OPTION ONLY TO ADMIN USERS -if ($_SESSION['permission'] == 3 || $_SESSION['permission'] == 4){ - $view .='
- -
'; -} -$view .= '
- + +$view .= '
'; +// ------------------------------- +//BUILD TO INPUT FORM BASED ON ARRAY +// ------------------------------ +// +$view .='
+ '.($rma_return_tab1 ?? 'Return reason').''; + +if($rma_header['servicereport_available'] == 0 ){ + $view .=''.($rma_return_tab2 ?? 'Questions').''; +} + +$view .= '
'; + +$view .= '
+
+
+

'.($rma_return_reason ?? 'Return reason').'

+

+

+
+
+

'.($rma_return_reason_note ?? 'Return reason note').'

+

+

+
+
+
'; + +$view .= '
+
'; + +$view .= '
- -
-'; + '; $view .= ' -
-
- - - - - - - - - - - - '; - - if (empty($responses)){ - - $view .= ' - - - '; - } - else { - foreach ($responses as $response){ - $view .= ' - - - - - - - - '; - } - } -$view .= ' - -
'.$rma_rowID.''.$rma_carbrand.''.$rma_cartype.''.$general_createdby.''.$general_actions.'
'.$message_no_ct.'
'.$response->rowID.''.$response->carbrand.''.$response->cartype.''.$response->createdby.''.$general_view.'
-
+
+ '; -$view.=''; //OUTPUT echo $view; diff --git a/rma_manage.php b/rma_manage.php new file mode 100644 index 0000000..8a943e8 --- /dev/null +++ b/rma_manage.php @@ -0,0 +1,458 @@ + '', + 'status' => 0, + 'header' => [ + 'rowID'=> '', + 'accounthierarchy'=> '', + 'serialnumber'=>'', + 'hw_version'=>'', + 'sw_version'=>'', + 'service_date'=>'', + 'warranty_date'=> '', + 'order_ref'=>'', + 'sw_version_latest'=>'', + 'servicereport_available' => '', + 'productrowid' => '', + 'productcode'=> '', + 'productname'=> '', + 'return_reason' => '', + 'return_reason_note' => '' + ], + 'questions' => [], + 'created' => '', + 'createdby' => '', + 'updated' => '', + 'updatedby' => '', + 'accounthierarchy' => '' +]; + +if (isset($_GET['rowID'])) { + // ID param exists, edit an existing product + //CALL TO API + $api_url = '/v2/rma/rowID='.$_GET['rowID']; + $responses = ioServer($api_url,''); + //Decode Payload + if (!empty($responses)){$responses = json_decode($responses,true);}else{$responses = null;} + $rma = json_decode(json_encode($responses[0]), true); + + //GET DETAILS + $rma['header'] = json_decode($rma['header'],true) ?? ''; + $rma['questions'] = json_decode($rma['questions'],true) ?? ''; + $serial_input = ''; + + if ($update_allowed === 1){ + if (isset($_POST['save'])) { + //UPLOAD ALL PICTURES + foreach ($_FILES["fileToUpload"]["name"] as $key => $value){ + //ONLY UPDATE PICTURES IF SOMETHING IS RETURNED + if($value !='' || !empty($value)){ + uploadrequest($key); + } + } + + //GET ALL POST DATA + $payload = json_encode($_POST, JSON_UNESCAPED_UNICODE); + + //API call + $responses = ioServer('/v2/rma', $payload); + if ($responses === 'NOK'){ + + } else { + header('Location: index.php?page=rma&rowID='.$_GET['rowID'].'&success_msg=2'); + exit; + } + } + } + + if ($delete_allowed === 1){ + if (isset($_POST['delete'])) { + //GET ALL POST DATA + $payload = json_encode($_POST , JSON_UNESCAPED_UNICODE); + + //API call + $responses = ioServer('/v2/rma', $payload); + // Redirect and delete equipment + if ($responses === 'NOK'){ + + } else { + header('Location: index.php?page=rmas&success_msg=3'); + exit; + } + } + } + +} else { + + if (isset($_POST['assetID'])){ + //GET RELATED DATA + $api_url = '/v2/equipments/serialnumber='.$_POST['assetID']; + $equipment = ioServer($api_url,''); + //Decode Payload + if (!empty($equipment)){$equipment = json_decode( $equipment,true);}else{$equipment = null;} + + if (isset($equipment[0]['rowID'])){ + //CHECK FOR LATEST SERVICEREPORT + $servicereport_date = date("Y-m-d", strtotime("-7 days")); + + $api_url = '/v2/history/equipmentid='.$equipment[0]['rowID'].'&type=servicereport&created='.$servicereport_date.'&totals='; + $servicereport = ioServer($api_url,''); + //Decode Payload + if (!empty($servicereport)){$servicereport = json_decode( $servicereport,true);}else{$servicereport = null;} + + //GetPartnerDetails + $partner_data = json_decode($equipment[0]['accounthierarchy'],true) ?? ''; + if (is_array($partner_data)){ + $soldto = getPartnerName($partner_data['soldto']) ?? '-'; + $shipto = getPartnerName($partner_data['shipto']) ?? '-'; + $location = getPartnerName($partner_data['location']) ?? '-'; + } + + $rma = [ + 'rowID' => '', + 'status' => 0, + 'header' => [ + 'rowID'=> $equipment[0]['rowID'], + 'serialnumber'=> $equipment[0]['serialnumber'], + 'hw_version'=> $equipment[0]['hw_version'], + 'sw_version'=>$equipment[0]['sw_version'], + 'service_date'=> date('Y-m-d', strtotime($equipment[0]['service_date']. ' + 365 days')), + 'warranty_date'=> date('Y-m-d', strtotime($equipment[0]['warranty_date']. ' + 365 days')), + 'order_ref'=>$equipment[0]['order_ref'], + 'sw_version_latest'=>$equipment[0]['sw_version_latest'], + 'servicereport_available' => (($servicereport !=0) ? 1 : 0), + 'productrowid'=> $equipment[0]['productrowid'], + 'productcode'=> $equipment[0]['productcode'], + 'productname'=> $equipment[0]['productname'], + 'return_reason' => '', + 'return_reason_note' => '', + 'soldto'=> $soldto, + 'shipto'=> $shipto, + 'location'=> $location + ], + 'questions' => [], + 'created' => '', + 'createdby' => '', + 'updated' => '', + 'updatedby' => '', + 'accounthierarchy' => '' + ]; + + $serial_input = ''; + + } else { + $serial_input = ''; + } + } else { + //GET RELATED SERIALNUMBERS + //CALL TO API + $api_url = '/v2/equipments/list='; + $assets_keys = ioServer($api_url,''); + + //Decode Payload + if (!empty($assets_keys)){$assets_keys = json_decode($assets_keys,true);}else{$assets_keys = null;} + //CREATE SERIALNUMBER DROPDOWN + $serial_input =' + '; + foreach ($assets_keys as $assets_key) { + $serial_input .= ''; + } + $serial_input .= ''; + //END DROPDOWN + } + + // Create a new equipment + if (isset($_POST['save'])) { + + //UPLOAD ALL PICTURES + foreach ($_FILES["fileToUpload"]["name"] as $key => $value){ + //ONLY UPDATE PICTURES IF SOMETHING IS RETURNED + if($value !='' || !empty($value)){ + uploadrequest($key); + } + } + + //GET ALL POST DATA + $payload = json_encode($_POST, JSON_UNESCAPED_UNICODE); + var_dump($payload); + //API call + $responses = ioServer('/v2/rma', $payload); + if ($responses === 'NOK'){ + + } else { + header('Location: index.php?page=rmas&success_msg=1'); + exit; + } + } +} + +template_header('RMA', 'rma','manage'); + +$view =' +
+
+

'.($rma_h2 ?? 'Return Material Request').'

+ '.$button_cancel.' + '; + +if ($delete_allowed === 1){ + $view .= ''; +} +if ($update_allowed === 1){ + $view .= ''; +} + +$view .= '
'; +$view .= '
'; +$view .= '
+
+ '.($rma_information ?? 'RMA details').' +
+
+

'.$equipment_label3.'

+

+
+
+

'.$equipment_label2.'

+

'.$serial_input.'

+
+ +
+

'.$product_code.'

+

'.(($view_product == 1)? ''.$rma['header']['productcode'].'':'').'

+
+
+

'.$product_name.'

+

'.(($view_product == 1)? ''.$rma['header']['productname'].'':'').'

+
+
+

'.$equipment_label10.'

+

+
+
+

'.($rma_sw_version_latest ?? 'Latest software version').'

+

+

+
+
+

'.($rma_servicereport_latest ?? 'Servicereport created last 7days').'

+

+

+
+ + + + + + + '; + +$view .=' +
+'; + +$view .='
+
+ '.$view_asset_partners.' +
+
+

'.$general_soldto.'

+

+
+
+

'.$general_shipto.'

+

+
+
+

'.$general_location.'

+

+
+
'; + +$view .= '
'; +// ------------------------------- +//BUILD TO INPUT FORM BASED ON ARRAY +// ------------------------------ +// +$view .='
+ '.($rma_return_tab1 ?? 'Return reason').''; + +if($rma['header']['servicereport_available'] == 0 ){ + $view .=''.($rma_return_tab2 ?? 'Questions').''; +} + +$view .= '
'; + +$view .= '
+
+
+

'.($rma_return_reason ?? 'Return reason').'

+

+

+
+
+

'.($rma_return_reason_note ?? 'Return reason note').'

+

+

+
+
+
'; + +$view .= '
+
'; +if($rma['header']['servicereport_available'] == 0 ){ + foreach($arrayQuestions_rma as $group){ + foreach($group['Questions_in_group'] as $question){ + + switch ($question['Type']) { + case 'dropdown': + $view .= ''; + $view .= ''; + break; + + case 'textarea': + $view .= ''; + $view .= ''; + break; + + case 'file'; + $view .= ''; + + if ($question['QuestionID'] !=''){ + $view .= ' + '; + } else { + $view .= ''; + } + + break; + } + } + } +} + +$view .= '
+
+
'; + +$view .= ' +
+
+ +'; + +//OUTPUT +echo $view; + +template_footer(); +?> \ No newline at end of file diff --git a/rmas.php b/rmas.php index 4659c99..d0ff180 100644 --- a/rmas.php +++ b/rmas.php @@ -4,12 +4,13 @@ defined(page_security_key) or exit; //__________________________________________ //MOVE TO TRANSLATION FILES: //__________________________________________ + $button_create_rma = 'Create RMA'; //RMA $rmas_h2 = 'Return Material'; $rmas_p = 'View, manage, and search RMA details.'; -$rma_h2 = 'RMA'; +$rma_h2 = 'Return Material Request'; $message_rma_1 = 'RMA created successfully!'; $message_rma_2 = 'RMA updated successfully!'; @@ -20,8 +21,40 @@ $rma_search = 'Search RMA...'; $rma_rowID = 'Request number'; $rma_status = 'Status'; +$rma_sw_version_latest = 'Latest software version'; +$rma_servicereport_latest = 'Servicereport created last 7days'; + +$rma_status0_text = '1'; +$rma_status1_text = '2'; +$rma_status2_text = '3'; +$rma_status3_text = '4'; +$rma_status4_text = '5'; $rma_information = 'RMA information'; +$rma_return_reason = 'Return reason'; +$rma_return_reason0_text = ''; +$rma_return_reason1_text = ''; +$rma_return_reason2_text = ''; +$rma_return_reason3_text = ''; +$rma_return_reason4_text = ''; +$rma_return_reason5_text = ''; + +$rma_return_reasons_notes = 'Return reason notes'; + +$rma_return_tab1 = 'Return reason'; +$rma_return_tab2 = 'Questions'; + +$rma_question_allowed_label1 = 'Yes'; +$rma_question_allowed_label2 = 'No'; + +$rma_question_header_1 = ''; +$rma_question_1 = 'Batteries working?'; +$rma_question_2 = 'Button correctly working'; +$rma_question_3 = ''; +$rma_question_4 = ''; +$rma_question_5 = ''; +$rma_question_6 = ''; +$rma_question_7 = ''; //__________________________________________ //__________________________________________ //__________________________________________ @@ -58,6 +91,7 @@ $GET_VALUES = urlGETdetails($_GET) ?? ''; //CALL TO API $api_url = '/v2/rma/'.$GET_VALUES; $responses = ioServer($api_url,''); + //Decode Payload if (!empty($responses)){$responses = json_decode($responses,true);}else{$responses = null;} @@ -163,10 +197,15 @@ $view .= ' } else { foreach ($responses as $response){ + //------------------------------ + //Variables + //------------------------------ + $status_text = 'rma_status'.$response['status'].'_text'; + $view .= ' '.$response['rowID'].' - '.$response['status'].' + '.$$status_text.' '.$response['created'].' '.$response['createdby'].' '.$response['updated'].' diff --git a/settings/settingsmenu.php b/settings/settingsmenu.php index 3d818b4..a61ad29 100644 --- a/settings/settingsmenu.php +++ b/settings/settingsmenu.php @@ -8,7 +8,7 @@ // into translation files and corresponding profile //------------------------------------------ //Menu Setup -$main_menu = array ('dashboard','sales','build','cartests','marketing','equipments','products','reporting','admin','settings'); +$main_menu = array ('dashboard','sales','buildtool','cartests','marketing','equipments','products','reporting','admin','settings'); //Sub menus $equipments_sub = array('equipments','servicereports','rmas','histories','firmwaretool','equipments_mass_update'); @@ -152,7 +152,7 @@ $urls = array( "icon" => "fas fa-tachometer-alt", "name" => "menu_marketing" ), - "build" => array( + "buildtool" => array( "url" => "buildtool", "selected" => "buildtool", "icon" => "fas fa-tachometer-alt", diff --git a/settings/settingsprofiles.php b/settings/settingsprofiles.php index b7f4a3f..358fd51 100644 --- a/settings/settingsprofiles.php +++ b/settings/settingsprofiles.php @@ -6,9 +6,9 @@ define('superuser_profile','dashboard,profile,assets,equipments,equipment,equipm /*Admin*/ define('admin_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,cartests,cartest,cartest_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,buildtool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,changelog,application'); /*AdminPlus*/ -define('adminplus_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,cartests,cartest,cartest_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,buildtool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,report_usage,config,settings,logfile,changelog,language,application,maintenance,profiles,vin'); +define('adminplus_profile','dashboard,profile,buildtool,sales,accounts,account,contracts,contract,contract_manage,cartests,cartest,cartest_manage,assets,equipments,equipment,equipment_healthindex,equipment_data,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,rmas,rma,rma_manage,rma_history,rma_history_manage,buildtool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,communications,communication,communication_send,marketing,reporting,report_build,report_contracts_billing,report_healthindex,report_usage,config,settings,logfile,changelog,language,application,maintenance,profiles,vin'); /*Build*/ -define('build','buildtool,firmwaretool,buildtool,products_software,application'); +define('build','dashboard,profile,buildtool,firmwaretool,buildtool,products_software,application'); /*Distribution*/ define('distribution','dashboard,profile,assets,equipments,equipment,equipment_manage,equipment_manage_edit,equipments_mass_update,histories,history,history_manage,firmwaretool,products,products_versions,products_software,product,product_manage,servicereports,servicereport,admin,partners,partner,users,user,user_manage,marketing,application'); /*Firmware*/ diff --git a/settings/settingsviews.php b/settings/settingsviews.php index b451f7e..fce6093 100644 --- a/settings/settingsviews.php +++ b/settings/settingsviews.php @@ -13,6 +13,7 @@ $all_views = [ "contracts", "contract", "contract_manage", + "billing", "cartests", "cartest", "cartest_manage", diff --git a/settings/systemrma.php b/settings/systemrma.php new file mode 100644 index 0000000..29b9186 --- /dev/null +++ b/settings/systemrma.php @@ -0,0 +1,30 @@ + "1", "Response" => $rma_question_allowed_label1), + array("responseID" => "2", "Response" => $rma_question_allowed_label2) +); + +//================================================================= +// RMA Tool questions =================================== +//================================================================= + +$arrayQuestions_rma = array( + array("Group" => $rma_question_header_1, + "Group_sequence" => '1', + "Questions_in_group" => array( + array("Question_sequence" => '1',"QuestionID" => "rma_1","Question" => $rma_question_1, "Type" => 'dropdown', "Response" => $allowedResponse_1), + array("Question_sequence" => '2',"QuestionID" => "rma_2","Question" => $rma_question_2, "Type" => 'dropdown', "Response" => $allowedResponse_1), + array("Question_sequence" => '3',"QuestionID" => "rma_3","Question" => $rma_question_3, "Type" => 'dropdown', "Response" => $allowedResponse_1), + array("Question_sequence" => '4',"QuestionID" => "rma_4","Question" => $rma_question_4, "Type" => 'dropdown', "Response" => $allowedResponse_1) + ) + ) +); + +//================================================================= +// =================================== +//================================================================= diff --git a/settings/systemservicetool_init.php b/settings/systemservicetool_init.php index 2c9e867..c1bfe88 100644 --- a/settings/systemservicetool_init.php +++ b/settings/systemservicetool_init.php @@ -96,182 +96,4 @@ $init = array( ) ); -//================================================================= -//SERVICE Tool allowed responses=================================== -//================================================================= - -$allowedResponseRadio = array( - array("responseID" => "1", "Response" => $service_allowed_label1), - array("responseID" => "2", "Response" => $service_allowed_label2) -); - -$allowedResponseDropdownDamage = array( - array("responseID" => "5", "Response" => $service_allowed_label5), - array("responseID" => "4", "Response" => $service_allowed_label4), - array("responseID" => "3", "Response" => $service_allowed_label3), - array("responseID" => "9", "Response" => $service_allowed_label9) -); - -$allowedResponseDropdownCorrosion = array( - array("responseID" => "6", "Response" => $service_allowed_label1), - array("responseID" => "7", "Response" => $service_allowed_label2) -); - -// Negative answers -$negative_results = array("2","3","6"); -//================================================================= -//SERVICE Tool Visual Inspection=================================== -//================================================================= - - -$arrayQuestions_visual = array( - array("Group" => $group_header_1, - "Group_sequence" => '1', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_visual_1","Question" => $service_visual_1, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_2","Question" => $service_visual_2, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '3',"QuestionID" => "service_visual_3","Question" => $service_visual_3, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '4',"QuestionID" => "service_visual_4","Question" => $service_visual_4, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - array("Group" => $group_header_2, - "Group_sequence" => '2', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_visual_5", "Question" => $service_visual_5, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_6", "Question" => $service_visual_6, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '3',"QuestionID" => "service_visual_7", "Question" => $service_visual_7, "Type" => 'Radiobutton', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '4',"QuestionID" => "service_visual_8", "Question" => $service_visual_8, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage) - ) - ), - array("Group" => $group_header_3, - "Group_sequence" => '3', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_visual_9", "Question" => $service_visual_9, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_10", "Question" => $service_visual_10, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '3',"QuestionID" => "service_visual_11", "Question" => $service_visual_11, "Type" => 'Radiobutton', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '4',"QuestionID" => "service_visual_12", "Question" => $service_visual_12, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage) - ) - ), - array("Group" => $group_header_4, - "Group_sequence" => '4', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_visual_13", "Question" => $service_visual_13, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_14", "Question" => $service_visual_14, "Type" => 'Radiobutton', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '2',"QuestionID" => "service_visual_15", "Question" => $service_visual_15, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_16", "Question" => $service_visual_16, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_17", "Question" => $service_visual_17, "Type" => 'Radiobutton', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '2',"QuestionID" => "service_visual_18", "Question" => $service_visual_18, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - array("Group" => $group_header_5, - "Group_sequence" => '5', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_visual_19", "Question" => $service_visual_19, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "service_visual_20", "Question" => $service_visual_20, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '3',"QuestionID" => "service_visual_21", "Question" => $service_visual_21, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '4',"QuestionID" => "service_visual_22", "Question" => $service_visual_22, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage) - ) - ) - ); - -//================================================================= -//SERVICE Tool Finalize =================================== -//================================================================= -$arrayQuestions_finalize = array( - array("Group" => $group_header_6, - "Group_sequence" => '1', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_action_clean", "Question" => $service_action_clean, "Type" => 'Checkbox', "Response" => ""), - array("Question_sequence" => '2',"QuestionID" => "service_action_battery", "Question" => $service_action_battery, "Type" => 'Checkbox', "Response" => "") - ) - ), - array("Group" => $group_header_7, - "Group_sequence" => '1', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_notes", "Question" => $service_notes, "Type" => 'Textarea', "Response" => "") - ) - ), - array("Group" => $group_header_8, - "Group_sequence" => '3', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_action_serial", "Question" => $service_action_serial, "Type" => 'Checkbox', "Response" => ""), - array("Question_sequence" => '2',"QuestionID" => "service_action_cover", "Question" => $service_action_cover, "Type" => 'Checkbox', "Response" => ""), - array("Question_sequence" => '3',"QuestionID" => "service_action_spudger", "Question" => $service_action_spudger, "Type" => 'Checkbox', "Response" => ""), - array("Question_sequence" => '4',"QuestionID" => "service_action_case", "Question" => $service_action_case, "Type" => 'Checkbox', "Response" => ""), - array("Question_sequence" => '5',"QuestionID" => "service_action_instructions", "Question" => $service_action_instructions, "Type" => 'Checkbox', "Response" => "") - ) - ), - array("Group" => $group_header_9, - "Group_sequence" => '4', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "service_mandatory_question", "Question" => $service_mandatory_question, "Type" => 'Checkbox', "Response" => "") - ) - ) - ); - -$arrayQuestions_legacy = array( - array("Group" => $group_header_legacy_1, - "Group_sequence" => '1', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question1","Question" => $question1, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "question2","Question" => $question2, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '3',"QuestionID" => "question3","Question" => $question3, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '4',"QuestionID" => "question4","Question" => $question4, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - array("Group" => $group_header_legacy_2, - "Group_sequence" => '2', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question5", "Question" => $question5, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - array("Group" => $group_header_legacy_3, - "Group_sequence" => '3', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question6", "Question" => $question6, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "question7", "Question" => $question7, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '3',"QuestionID" => "question8", "Question" => $question8, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '4',"QuestionID" => "question9", "Question" => $question9, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - array("Group" => $group_header_legacy_4, - "Group_sequence" => '4', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question11a", "Question" => $question11, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '2',"QuestionID" => "question12a", "Question" => $question12, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '3',"QuestionID" => "question13a", "Question" => $question13, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '4',"QuestionID" => "question14a", "Question" => $question14, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownCorrosion), - array("Question_sequence" => '5',"QuestionID" => "question18a", "Question" => $question18, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownCorrosion) - ) - ), - array("Group" => $group_header_legacy_5, - "Group_sequence" => '5', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question10", "Question" => $question10, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '2',"QuestionID" => "question11", "Question" => $question11, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '3',"QuestionID" => "question12", "Question" => $question12, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '4',"QuestionID" => "question13", "Question" => $question13, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '5',"QuestionID" => "question14", "Question" => $question14, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '6',"QuestionID" => "question15", "Question" => $question15, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '7',"QuestionID" => "question16", "Question" => $question16, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '8',"QuestionID" => "question17", "Question" => $question17, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage), - array("Question_sequence" => '9',"QuestionID" => "question18", "Question" => $question18, "Type" => 'Dropdown', "Response" => $allowedResponseDropdownDamage) - ) - ), - array("Group" => $group_header_legacy_6, - "Group_sequence" => '6', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question20", "Question" => $question20, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "question22", "Question" => $question22, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - array("Group" => $group_header_legacy_7, - "Group_sequence" => '7', - "Questions_in_group" => array( - array("Question_sequence" => '1',"QuestionID" => "question21", "Question" => $question21, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '2',"QuestionID" => "question23", "Question" => $question23, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio), - array("Question_sequence" => '3',"QuestionID" => "question24", "Question" => $question24, "Type" => 'Radiobutton', "Response" => $allowedResponseRadio) - ) - ), - ); ?> \ No newline at end of file