Commit 0b362a4d by Jansa Jose

Merge branch 'master' into 'dev_production'

Master See merge request !200
parents 14b415f3 20613c4f
......@@ -875,8 +875,12 @@ function customQuote(thisObj){
var html ='',
imgCount = 0,
issueHtml = '',
optionalHtml = '',
issues_selected = jQuery.parseJSON(booking_data['issues_selected']);
optionalHtml = '';
var issues_selected = '';
if(booking_data['issues_selected'] != '' && booking_data['issues_selected'] != null && booking_data['issues_selected'] != undefined && booking_data['issues_selected'] != 'null' && booking_data['issues_selected'] != 'undefined' && booking_data['issues_selected'] != ' -- '){
issues_selected = jQuery.parseJSON(booking_data['issues_selected']);
}
if(issues_selected != ''){
var comma = '';
......@@ -1044,8 +1048,12 @@ function viewCustomQuote(thisObj){
imgCount = 0,
issueHtml = '',
optionalHtml = '',
issues_selected = jQuery.parseJSON(booking_data['issues_selected']),
custdescription = jQuery.parseJSON(booking_data['custom_service_quote']);
var issues_selected = '';
if(booking_data['issues_selected'] != '' && booking_data['issues_selected'] != null && booking_data['issues_selected'] != undefined && booking_data['issues_selected'] != 'null' && booking_data['issues_selected'] != 'undefined' && booking_data['issues_selected'] != ' -- '){
issues_selected = jQuery.parseJSON(booking_data['issues_selected']);
}
// console.log(custdescription);
if(issues_selected != ''){
var comma = '';
......@@ -1132,10 +1140,10 @@ jQuery('[id="showBookinDetails"]').on('click',function() {
issueHtml = '',
optionalHtml = '',
optional_data = jQuery.parseJSON(booking_data['custom_issue_data']);
var issues_selected = '';
if(booking_data['issues_selected'] != '' && booking_data['issues_selected'] != null && booking_data['issues_selected'] != undefined && booking_data['issues_selected'] != 'null' && booking_data['issues_selected'] != 'undefined'){
issues_selected = jQuery.parseJSON(booking_data['issues_selected'])
if(booking_data['issues_selected'] != '' && booking_data['issues_selected'] != null && booking_data['issues_selected'] != undefined && booking_data['issues_selected'] != 'null' && booking_data['issues_selected'] != 'undefined' && booking_data['issues_selected'] != ' -- '){
issues_selected = jQuery.parseJSON(booking_data['issues_selected']);
}
if(issues_selected != ''){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment