Skip to content
This repository has been archived by the owner on Oct 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #324 from FlowzPlatform/hotfixes_qa
Browse files Browse the repository at this point in the history 
website web1 changes.
  • Loading branch information
@Jignasha22
Jignasha22 authored May 21, 2018
2 parents 59f52e7 + 7aff166 commit c573d73
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 61 deletions.
14 changes: 7 additions & 7 deletions plugins/WebsiteTemplates/web1/Partials/Footer/default.partial
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,19 @@ body {
<div class="social-icon-box">
<div class="pull-left">
<ul class="list-unstyled footer-link">
<li class="social-icon"><a href="https://www.facebook.com/KeyInnovations/" target="_blank"><i class="fb-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://www.facebook.com/" target="_blank"><i class="fb-icon strip-icon"></i></a>
</li>
<li class="social-icon"><a href="https://twitter.com/KeyInnovations" target="_blank"><i class="twitter-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://twitter.com/" target="_blank"><i class="twitter-icon strip-icon"></i></a>
</li>
<li class="social-icon"><a href="https://www.pinterest.com/brandingproducts/" target="_blank"><i class="g-plus-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://www.pinterest.com/" target="_blank"><i class="g-plus-icon strip-icon"></i></a>
</li>
<li class="social-icon"><a href="https://www.linkedin.com/company/key-innovations-inc-" target="_blank"><i class="in-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://www.linkedin.com/" target="_blank"><i class="in-icon strip-icon"></i></a>
</li>
<li class="social-icon"><a href="https://www.youtube.com/channel/UCQs3fbfBWmUGpw81jUaONpw" target="_blank"><i class="yt-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://www.youtube.com/" target="_blank"><i class="yt-icon strip-icon"></i></a>
</li>
<li class="social-icon"><a href="https://www.instagram.com/key_innovations/" target="_blank"><i class="instagram-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://www.instagram.com/" target="_blank"><i class="instagram-icon strip-icon"></i></a>
</li>
<li class="social-icon"><a href="https://plus.google.com/+Keypromo" target="_blank"><i class="gpl-icon strip-icon"></i></a>
<li class="social-icon"><a href="https://plus.google.com/" target="_blank"><i class="gpl-icon strip-icon"></i></a>
</li>
</ul>
</div>
Expand Down
53 changes: 0 additions & 53 deletions plugins/WebsiteTemplates/web1/public/assets/client-plugins/client-detail-page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -873,19 +873,6 @@ $(document).ready( async function(){
total_setup_charge = total_setup_charge + setup_charge;
}
}

if(typeof imprintMethodName != 'undefined' && no_of_color != 0 && selColorsHtml != '') {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div><div class="js_product_summary_imprint_location"><div class="js_imprint_method_summary">Imprint Method : <span>'+imprintMethodName+'</span></div><div class="estimate-row js_selected_color_summary">How many colors : <span>'+no_of_color+' color(s)</span><br><br>'+selColorsHtml+'</div></div></div>');
}
else if(typeof imprintMethodName != 'undefined' && no_of_color != 0) {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div><div class="js_product_summary_imprint_location"><div class="js_imprint_method_summary">Imprint Method : <span>'+imprintMethodName+'</span></div><div class="estimate-row js_selected_color_summary">How many colors : <span>'+no_of_color+' color(s)</span><br></div></div></div>');
}
else if(typeof imprintMethodName != 'undefined') {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div><div class="js_product_summary_imprint_location"><div class="js_imprint_method_summary">Imprint Method : <span>'+imprintMethodName+'</span></div></div></div>');
}
else {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div></div>');
}
});
$('.js-setup-charge-summary').find('span').html("$"+parseFloat(total_setup_charge).toFixed(project_settings.price_decimal))
$('.js-setup-charge-summary').removeClass('hide');
Expand Down Expand Up @@ -945,7 +932,6 @@ $(document).ready( async function(){
}
parentObj.find(".js-color-div-append").html(replaceColorHtml)
}
parentObj.find(".js-color-div-append").html(replaceColorHtml)

let imprintColorsHexVal = await replaceColorSwatchWithHexaCodes(imprint_color_val.imprint_color,"imprintcolor");
// console.log("imprintColorsHexVal",imprintColorsHexVal);
Expand All @@ -961,45 +947,6 @@ $(document).ready( async function(){

parentObj.find(".js_select_color_from_list").html(dropDownColorHtml)
parentObj.find('.js-color-div-append').removeClass('hide');

//summary for how many colors
$('.js_print_postion_location').html('');
$(activetab+' .js_add_imprint_location_request_quote:checked').each(function(i) {
let positionName = $(this).val()
let position_name = replaceWithUnderscore($(this).val());

let imprint_method_name = $(activetab).find("#js_imprint_request_quote_box_"+position_name+" .imprint-method-select button").attr('data-dropval');
let imprintMethodName = $(activetab).find("#js_imprint_request_quote_box_"+position_name+" .imprint-method-select button").attr('data-method');

var no_of_color = 0;
if($(activetab).find("#js_imprint_request_quote_box_"+position_name+" .imprint-color-select button").attr('data-value')) {
no_of_color = $(activetab).find("#js_imprint_request_quote_box_"+position_name+" .imprint-color-select button").attr('data-value');
}

let selColorsHtml = "";
if(no_of_color.length > 0) {
for(var k=1;k<=no_of_color;k++) {
let selectedColor = $(activetab).find('#js_selected_color_id_'+position_name+'_'+imprint_method_name+'_'+k).val();
if(selectedColor != "" && typeof selectedColor != "undefined") {
selColorsHtml = selColorsHtml + '<div class="js_selected_color_'+k+'">color'+k+' : <span>'+selectedColor+'</span></div><br>';
}
}
}

if(typeof imprintMethodName != 'undefined' && no_of_color != 0 && selColorsHtml != '') {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div><div class="js_product_summary_imprint_location"><div class="js_imprint_method_summary">Imprint Method : <span>'+imprintMethodName+'</span></div><div class="estimate-row js_selected_color_summary">How many colors : <span>'+no_of_color+' color(s)</span><br><br>'+selColorsHtml+'</div></div></div>');
}
else if(typeof imprintMethodName != 'undefined' && no_of_color != 0) {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div><div class="js_product_summary_imprint_location"><div class="js_imprint_method_summary">Imprint Method : <span>'+imprintMethodName+'</span></div><div class="estimate-row js_selected_color_summary">How many colors : <span>'+no_of_color+' color(s)</span><br></div></div></div>');
}
else if(typeof imprintMethodName != 'undefined') {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div><div class="js_product_summary_imprint_location"><div class="js_imprint_method_summary">Imprint Method : <span>'+imprintMethodName+'</span></div></div></div>');
}
else {
$('.js_print_postion_location').append('<div class="js_summary_imprint_location"><div class="estimate-row heading"><span>Print Position: '+positionName+'</span></div></div>');
}
});
$('#Quantity-quote, .js_print_postion_location').removeClass('hide');
});

$(document).on("click",".js_select_color_from_list li",function(){
Expand Down
2 changes: 1 addition & 1 deletion plugins/WebsiteTemplates/web1/public/assets/project_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"product_api_image_url": "http://image.promoworld.ca/migration-api-hidden-new/web/images/",
"search_api_url": "https://349d6e5f56299a9f7b9ff68ccd099977.us-west-2.aws.found.io:9243/pdm1/_search",
"search_api_auth_token": "Basic NTk5MTQwNTU2YzcxZDEwMDFjMDIwNzI5OjEyMzQ1Ng==",
"supplier_id" : 5,
"supplier_id" : 5,
"login_api": "https://api.flowzqa.tk/auth/api/login",
"user_detail_api": "https://api.flowzqa.tk/auth/api/userdetails",
"user_detail_by_id":"https://api.flowzqa.tk/user/getuserdetails/",
Expand Down

0 comments on commit c573d73

Please sign in to comment.