From 66acc8dcfc60a7824c08eb292e55d3401a2696c7 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Sat, 26 May 2012 17:42:26 +0100 Subject: [PATCH] Fix cancel. Closes #1054. --- assets/js/admin/write-panels.js | 2 ++ assets/js/admin/write-panels.min.js | 2 +- readme.txt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/js/admin/write-panels.js b/assets/js/admin/write-panels.js index a55a6e3c3ec..9a95ebe87d6 100644 --- a/assets/js/admin/write-panels.js +++ b/assets/js/admin/write-panels.js @@ -767,6 +767,8 @@ jQuery( function($){ }); + } else { + $('.woocommerce_attributes').unblock(); } return false; diff --git a/assets/js/admin/write-panels.min.js b/assets/js/admin/write-panels.min.js index e81f8f93fd6..530c111bee7 100644 --- a/assets/js/admin/write-panels.min.js +++ b/assets/js/admin/write-panels.min.js @@ -1 +1 @@ -jQuery(function(a){function e(){a(".woocommerce_attributes .woocommerce_attribute").each(function(b,c){a(".attribute_position",c).val(parseInt(a(c).index(".woocommerce_attributes .woocommerce_attribute")))})}a("#upsell_product_data").bind("keypress",function(a){if(a.keyCode==13)return!1});a("ul.tabs").show();a("div.panel-wrap").each(function(){a("div.panel:not(div.panel:first)",this).hide()});a("ul.tabs a").click(function(){var b=a(this).closest("div.panel-wrap");a("ul.tabs li",b).removeClass("active");a(this).parent().addClass("active");a("div.panel",b).hide();a(a(this).attr("href")).show();return!1});jQuery("select.chosen_select").chosen();jQuery("select.chosen_select_nostd").chosen({allow_single_deselect:"true"});jQuery("select.ajax_chosen_select_products").ajaxChosen({method:"GET",url:woocommerce_writepanel_params.ajax_url,dataType:"json",afterTypeDelay:100,data:{action:"woocommerce_json_search_products",security:woocommerce_writepanel_params.search_products_nonce}},function(b){var c={};a.each(b,function(a,b){c[a]=b});return c});jQuery("select.ajax_chosen_select_products_and_variations").ajaxChosen({method:"GET",url:woocommerce_writepanel_params.ajax_url,dataType:"json",afterTypeDelay:100,data:{action:"woocommerce_json_search_products_and_variations",security:woocommerce_writepanel_params.search_products_nonce}},function(b){var c={};a.each(b,function(a,b){c[a]=b});return c});jQuery("#woocommerce-order-actions input, #woocommerce-order-actions a").click(function(){window.onbeforeunload=""});a("a.edit_address").click(function(b){a(this).hide();a(this).closest(".order_data").find("div.address").hide();a(this).closest(".order_data").find("div.edit_address").show();b.preventDefault()});a("#order_items_list .remove_row").live("click",function(){var b=confirm(woocommerce_writepanel_params.remove_item_notice);if(b){a(this).closest("tr.item").hide();a("input",a(this).closest("tr.item")).val("")}return!1});a("button.calc_line_taxes").live("click",function(){a(".woocommerce_order_items_wrapper").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});var b=confirm(woocommerce_writepanel_params.calc_line_taxes);if(b){var c=a("#order_items_list tr.item"),d=a("#_shipping_country").val();if(d)var e=a("#_shipping_state").val(),f=a("#_shipping_postcode").val();else{d=a("#_billing_country").val();var e=a("#_billing_state").val(),f=a("#_billing_postcode").val()}c.each(function(b){var g=a(this),h={action:"woocommerce_calc_line_taxes",item_id:g.find("input.item_id").val(),line_subtotal:g.find("input.line_subtotal").val(),line_total:g.find("input.line_total").val(),tax_class:g.find("select.tax_class").val(),country:d,state:e,postcode:f,security:woocommerce_writepanel_params.calc_totals_nonce};a.post(woocommerce_writepanel_params.ajax_url,h,function(d){result=jQuery.parseJSON(d);g.find("input.line_subtotal_tax").val(result.line_subtotal_tax);g.find("input.line_tax").val(result.line_tax);b==c.size()-1&&a(".woocommerce_order_items_wrapper").unblock()})})}else a(".woocommerce_order_items_wrapper").unblock();return!1}).hover(function(){a("#order_items_list input.line_subtotal_tax, #order_items_list input.line_tax").css("background-color","#d8c8d2")},function(){a("#order_items_list input.line_subtotal_tax, #order_items_list input.line_tax").css("background-color","")});a("button.calc_totals").live("click",function(){a("#woocommerce-order-totals").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});var b=confirm(woocommerce_writepanel_params.calc_totals);if(b){var c=0,d=0,e=0,f=0,g=0,h=parseFloat(a("#_order_shipping").val()),i=parseFloat(a("#_order_shipping_tax").val()),j=parseFloat(a("#_order_discount").val());h||(h=0);i||(i=0);j||(j=0);a("#order_items_list tr.item").each(function(){var b=parseFloat(a(this).find("input.line_subtotal").val()),f=parseFloat(a(this).find("input.line_subtotal_tax").val()),h=parseFloat(a(this).find("input.line_total").val()),i=parseFloat(a(this).find("input.line_tax").val());c=parseFloat(c+b);d=parseFloat(d+f);e=parseFloat(e+h);woocommerce_writepanel_params.round_at_subtotal=="no"&&(i=parseFloat(i.toFixed(2)));g=parseFloat(g+i)});woocommerce_writepanel_params.round_at_subtotal=="yes"&&(g=parseFloat(g.toFixed(2)));var f=c+d-(e+g);f<0&&(f=0);f=f.toFixed(2);var k=e+g+h+i-j;k=k.toFixed(2);a("#_cart_discount").val(f);a("#_order_tax").val(g);a("#_order_total").val(k);a("#tax_rows").empty();a("#woocommerce-order-totals").unblock()}else a("#woocommerce-order-totals").unblock();return!1}).hover(function(){a("#woocommerce-order-totals .calculated").css("background-color","#d8c8d2")},function(){a("#woocommerce-order-totals .calculated").css("background-color","")});a("button.add_shop_order_item").click(function(){var b=a("select#add_item_id").val();if(b){count=b.length;a("table.woocommerce_order_items").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});a.each(b,function(b,c){var d=a("table.woocommerce_order_items tbody tr.item").size(),e={action:"woocommerce_add_order_item",item_to_add:c,index:d,security:woocommerce_writepanel_params.add_order_item_nonce};a.post(woocommerce_writepanel_params.ajax_url,e,function(b){a("table.woocommerce_order_items tbody#order_items_list").append(b);if(!--count){a("select#add_item_id, #add_item_id_chzn .chzn-choices").css("border-color","").val("");jQuery(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50});a("select#add_item_id").trigger("liszt:updated");a("table.woocommerce_order_items").unblock()}})})}else a("select#add_item_id, #add_item_id_chzn .chzn-choices").css("border-color","red")});a("button.add_meta").live("click",function(){var b=a(this).closest("tr.item").attr("rel");a(this).closest("table.meta").find(".meta_items").append('');return!1});a("button.remove_meta").live("click",function(){var b=confirm("Remove this meta key?");b&&a(this).closest("tr").remove();return!1});a("button.load_customer_billing").live("click",function(){var b=confirm(woocommerce_writepanel_params.load_billing);if(b){var c=a("#customer_user").val();if(!c){alert(woocommerce_writepanel_params.no_customer_selected);return!1}var d={user_id:c,type_to_load:"billing",action:"woocommerce_get_customer_details",security:woocommerce_writepanel_params.get_customer_details_nonce};a(this).closest(".edit_address").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});a.ajax({url:woocommerce_writepanel_params.ajax_url,data:d,type:"POST",success:function(b){var c=jQuery.parseJSON(b);if(c){a("input#_billing_first_name").val(c.billing_first_name);a("input#_billing_last_name").val(c.billing_last_name);a("input#_billing_company").val(c.billing_company);a("input#_billing_address_1").val(c.billing_address_1);a("input#_billing_address_2").val(c.billing_address_2);a("input#_billing_city").val(c.billing_city);a("input#_billing_postcode").val(c.billing_postcode);a("input#_billing_country").val(c.billing_country);a("input#_billing_state").val(c.billing_state);a("input#_billing_email").val(c.billing_email);a("input#_billing_phone").val(c.billing_phone)}a(".edit_address").unblock()}})}return!1});a("button.load_customer_shipping").live("click",function(){var b=confirm(woocommerce_writepanel_params.load_shipping);if(b){var c=a("#customer_user").val();if(!c){alert(woocommerce_writepanel_params.no_customer_selected);return!1}var d={user_id:c,type_to_load:"shipping",action:"woocommerce_get_customer_details",security:woocommerce_writepanel_params.get_customer_details_nonce};a(this).closest(".edit_address").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});a.ajax({url:woocommerce_writepanel_params.ajax_url,data:d,type:"POST",success:function(b){var c=jQuery.parseJSON(b);if(c){a("input#_shipping_first_name").val(c.shipping_first_name);a("input#_shipping_last_name").val(c.shipping_last_name);a("input#_shipping_company").val(c.shipping_company);a("input#_shipping_address_1").val(c.shipping_address_1);a("input#_shipping_address_2").val(c.shipping_address_2);a("input#_shipping_city").val(c.shipping_city);a("input#_shipping_postcode").val(c.shipping_postcode);a("input#_shipping_country").val(c.shipping_country);a("input#_shipping_state").val(c.shipping_state)}a(".edit_address").unblock()}})}return!1});a("button.billing-same-as-shipping").live("click",function(){var b=confirm(woocommerce_writepanel_params.copy_billing);if(b){a("input#_shipping_first_name").val(a("input#_billing_first_name").val());a("input#_shipping_last_name").val(a("input#_billing_last_name").val());a("input#_shipping_company").val(a("input#_billing_company").val());a("input#_shipping_address_1").val(a("input#_billing_address_1").val());a("input#_shipping_address_2").val(a("input#_billing_address_2").val());a("input#_shipping_city").val(a("input#_billing_city").val());a("input#_shipping_postcode").val(a("input#_billing_postcode").val());a("input#_shipping_country").val(a("input#_billing_country").val());a("input#_shipping_state").val(a("input#_billing_state").val())}return!1});a("a.add_tax_row").live("click",function(){var b=a("#tax_rows .tax_row").size();a("#tax_rows").append('

×
');return!1});a("a.delete_tax_row").live("click",function(){$tax_row=a(this).closest(".tax_row");$tax_row.find("input").val("");$tax_row.hide();return!1});a("select#product-type").change(function(){var b=a(this).val();a(".hide_if_grouped, .hide_if_external").show();a(".show_if_simple, .show_if_variable, .show_if_grouped, .show_if_external").hide();if(b=="simple"){a(".show_if_simple").show();a("input#_manage_stock").change()}else if(b=="variable"){a(".show_if_variable").show();a("input#_manage_stock").change();a("input#_downloadable").prop("checked",!1).change();a("input#_virtual").removeAttr("checked").change()}else if(b=="grouped"){a(".show_if_grouped").show();a("input#_downloadable").prop("checked",!1).change();a("input#_virtual").removeAttr("checked").change();a(".hide_if_grouped").hide()}else if(b=="external"){a(".show_if_external").show();a("input#_downloadable").prop("checked",!1).change();a("input#_virtual").removeAttr("checked").change();a(".hide_if_external").hide()}a("ul.tabs li:visible").eq(0).find("a").click();a("body").trigger("woocommerce-product-type-change",b,a(this))}).change();a("input#_downloadable").change(function(){a(".show_if_downloadable").hide();a("input#_downloadable").is(":checked")&&a(".show_if_downloadable").show();a(".downloads_tab").is(".active")&&a("ul.tabs li:visible").eq(0).find("a").click()}).change();a("input#_virtual").change(function(){a(".show_if_virtual").hide();a(".hide_if_virtual").show();if(a("input#_virtual").is(":checked")){a(".show_if_virtual").show();a(".hide_if_virtual").hide()}}).change();var b=!1;a(".sale_price_dates_fields input").each(function(){a(this).val()!=""&&(b=!0)});if(b){a(".sale_schedule").hide();a(".sale_price_dates_fields").show()}else{a(".sale_schedule").show();a(".sale_price_dates_fields").hide()}a(".sale_schedule").click(function(){a(this).hide();a(".sale_price_dates_fields").show();return!1});a(".cancel_sale_schedule").click(function(){a(this).closest("p").find("input").val("");a(".sale_schedule").show();a(".sale_price_dates_fields").hide();return!1});a("input#_manage_stock").change(function(){a(this).is(":checked")?a("div.stock_fields").show():a("div.stock_fields").hide()}).change();var c=a("#_sale_price_dates_from, #_sale_price_dates_to").datepicker({defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,showOn:"button",buttonImage:woocommerce_writepanel_params.calendar_image,buttonImageOnly:!0,onSelect:function(b){var d=this.id=="_sale_price_dates_from"?"minDate":"maxDate",e=a(this).data("datepicker"),f=a.datepicker.parseDate(e.settings.dateFormat||a.datepicker._defaults.dateFormat,b,e.settings);c.not(this).datepicker("option",d,f)}});a(".date-picker").datepicker({dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,showOn:"button",buttonImage:woocommerce_writepanel_params.calendar_image,buttonImageOnly:!0});a(".date-picker-field").datepicker({dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0});jQuery(".expand_all").click(function(){jQuery(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox table").show();return!1});jQuery(".close_all").click(function(){jQuery(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox table").hide();return!1});jQuery(".wc-metaboxes-wrapper").on("click",".wc-metabox h3",function(b){if(a(b.target).filter(":input, option").length)return;jQuery(this).next(".wc-metabox-content").toggle()});jQuery(".wc-metabox.closed").each(function(){jQuery(this).find(".wc-metabox-content").hide()});a(".woocommerce_attributes select.multiselect").chosen();var d=a(".woocommerce_attributes").find(".woocommerce_attribute").get();d.sort(function(b,c){var d=parseInt(a(b).attr("rel")),e=parseInt(a(c).attr("rel"));return de?1:0});a(d).each(function(b,c){a(".woocommerce_attributes").append(c)});a("button.add_attribute").on("click",function(){var b=a(".woocommerce_attributes .woocommerce_attribute").size(),c=a("select.attribute_taxonomy").val();if(!c){var d=a("select#product-type").val();d!="variable"?enable_variation='style="display:none;"':enable_variation="";a(".woocommerce_attributes").append('
")}else{var f=a(".woocommerce_attributes .woocommerce_attribute."+c);a(".woocommerce_attributes").append(a(f));a(f).show().find(".woocommerce_attribute_data").show();e()}a("select.attribute_taxonomy").val("")});a(".woocommerce_attributes").on("blur","input.attribute_name",function(){a(this).closest(".woocommerce_attribute").find("strong.attribute_name").text(a(this).val())});a(".woocommerce_attributes").on("click","button.select_all_attributes",function(){a(this).closest("td").find("select option").attr("selected","selected");a(this).closest("td").find("select").trigger("liszt:updated");return!1});a(".woocommerce_attributes").on("click","button.select_no_attributes",function(){a(this).closest("td").find("select option").removeAttr("selected");a(this).closest("td").find("select").trigger("liszt:updated");return!1});a(".woocommerce_attributes").on("click","button.remove_row",function(){var b=confirm(woocommerce_writepanel_params.remove_attribute);if(b){var c=a(this).parent().parent();if(c.is(".taxonomy")){c.find("select, input[type=text]").val("");c.hide()}else{c.find("select, input[type=text]").val("");c.hide();e()}}return!1});a(".woocommerce_attributes").sortable({items:".woocommerce_attribute",cursor:"move",axis:"y",handle:"h3",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style");e()}});a(".woocommerce_attributes").on("click","button.add_new_attribute",function(){a(".woocommerce_attributes").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});var b=a(this).attr("data-attribute"),c=a(this).closest(".woocommerce_attribute_data"),d=prompt(woocommerce_writepanel_params.new_attribute_prompt);if(d){var e={action:"woocommerce_add_new_attribute",taxonomy:b,term:d,security:woocommerce_writepanel_params.add_attribute_nonce};a.post(woocommerce_writepanel_params.ajax_url,e,function(b){result=jQuery.parseJSON(b);if(result.error)alert(result.error);else if(result.slug){c.find("select.attribute_values").append('");c.find("select.attribute_values").trigger("liszt:updated")}a(".woocommerce_attributes").unblock()})}return!1});var f;window.send_to_editor_default=window.send_to_editor;jQuery(".upload_file_button").live("click",function(){f=jQuery(this).parent().find(".file_path");formfield=jQuery(f).attr("name");window.send_to_editor=window.send_to_download_url;tb_show("","media-upload.php?post_id="+woocommerce_writepanel_params.post_id+"&type=downloadable_product&from=wc01&TB_iframe=true");return!1});window.send_to_download_url=function(a){file_url=jQuery(a).attr("href");file_url&&jQuery(f).val(file_url);tb_remove();window.send_to_editor=window.send_to_editor_default}}); \ No newline at end of file +jQuery(function(a){function e(){a(".woocommerce_attributes .woocommerce_attribute").each(function(b,c){a(".attribute_position",c).val(parseInt(a(c).index(".woocommerce_attributes .woocommerce_attribute")))})}a("#upsell_product_data").bind("keypress",function(a){if(a.keyCode==13)return!1});a("ul.tabs").show();a("div.panel-wrap").each(function(){a("div.panel:not(div.panel:first)",this).hide()});a("ul.tabs a").click(function(){var b=a(this).closest("div.panel-wrap");a("ul.tabs li",b).removeClass("active");a(this).parent().addClass("active");a("div.panel",b).hide();a(a(this).attr("href")).show();return!1});jQuery("select.chosen_select").chosen();jQuery("select.chosen_select_nostd").chosen({allow_single_deselect:"true"});jQuery("select.ajax_chosen_select_products").ajaxChosen({method:"GET",url:woocommerce_writepanel_params.ajax_url,dataType:"json",afterTypeDelay:100,data:{action:"woocommerce_json_search_products",security:woocommerce_writepanel_params.search_products_nonce}},function(b){var c={};a.each(b,function(a,b){c[a]=b});return c});jQuery("select.ajax_chosen_select_products_and_variations").ajaxChosen({method:"GET",url:woocommerce_writepanel_params.ajax_url,dataType:"json",afterTypeDelay:100,data:{action:"woocommerce_json_search_products_and_variations",security:woocommerce_writepanel_params.search_products_nonce}},function(b){var c={};a.each(b,function(a,b){c[a]=b});return c});jQuery("#woocommerce-order-actions input, #woocommerce-order-actions a").click(function(){window.onbeforeunload=""});a("a.edit_address").click(function(b){a(this).hide();a(this).closest(".order_data").find("div.address").hide();a(this).closest(".order_data").find("div.edit_address").show();b.preventDefault()});a("#order_items_list .remove_row").live("click",function(){var b=confirm(woocommerce_writepanel_params.remove_item_notice);if(b){a(this).closest("tr.item").hide();a("input",a(this).closest("tr.item")).val("")}return!1});a("button.calc_line_taxes").live("click",function(){a(".woocommerce_order_items_wrapper").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});var b=confirm(woocommerce_writepanel_params.calc_line_taxes);if(b){var c=a("#order_items_list tr.item"),d=a("#_shipping_country").val();if(d)var e=a("#_shipping_state").val(),f=a("#_shipping_postcode").val();else{d=a("#_billing_country").val();var e=a("#_billing_state").val(),f=a("#_billing_postcode").val()}c.each(function(b){var g=a(this),h={action:"woocommerce_calc_line_taxes",item_id:g.find("input.item_id").val(),line_subtotal:g.find("input.line_subtotal").val(),line_total:g.find("input.line_total").val(),tax_class:g.find("select.tax_class").val(),country:d,state:e,postcode:f,security:woocommerce_writepanel_params.calc_totals_nonce};a.post(woocommerce_writepanel_params.ajax_url,h,function(d){result=jQuery.parseJSON(d);g.find("input.line_subtotal_tax").val(result.line_subtotal_tax);g.find("input.line_tax").val(result.line_tax);b==c.size()-1&&a(".woocommerce_order_items_wrapper").unblock()})})}else a(".woocommerce_order_items_wrapper").unblock();return!1}).hover(function(){a("#order_items_list input.line_subtotal_tax, #order_items_list input.line_tax").css("background-color","#d8c8d2")},function(){a("#order_items_list input.line_subtotal_tax, #order_items_list input.line_tax").css("background-color","")});a("button.calc_totals").live("click",function(){a("#woocommerce-order-totals").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});var b=confirm(woocommerce_writepanel_params.calc_totals);if(b){var c=0,d=0,e=0,f=0,g=0,h=parseFloat(a("#_order_shipping").val()),i=parseFloat(a("#_order_shipping_tax").val()),j=parseFloat(a("#_order_discount").val());h||(h=0);i||(i=0);j||(j=0);a("#order_items_list tr.item").each(function(){var b=parseFloat(a(this).find("input.line_subtotal").val()),f=parseFloat(a(this).find("input.line_subtotal_tax").val()),h=parseFloat(a(this).find("input.line_total").val()),i=parseFloat(a(this).find("input.line_tax").val());c=parseFloat(c+b);d=parseFloat(d+f);e=parseFloat(e+h);woocommerce_writepanel_params.round_at_subtotal=="no"&&(i=parseFloat(i.toFixed(2)));g=parseFloat(g+i)});woocommerce_writepanel_params.round_at_subtotal=="yes"&&(g=parseFloat(g.toFixed(2)));var f=c+d-(e+g);f<0&&(f=0);f=f.toFixed(2);var k=e+g+h+i-j;k=k.toFixed(2);a("#_cart_discount").val(f);a("#_order_tax").val(g);a("#_order_total").val(k);a("#tax_rows").empty();a("#woocommerce-order-totals").unblock()}else a("#woocommerce-order-totals").unblock();return!1}).hover(function(){a("#woocommerce-order-totals .calculated").css("background-color","#d8c8d2")},function(){a("#woocommerce-order-totals .calculated").css("background-color","")});a("button.add_shop_order_item").click(function(){var b=a("select#add_item_id").val();if(b){count=b.length;a("table.woocommerce_order_items").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});a.each(b,function(b,c){var d=a("table.woocommerce_order_items tbody tr.item").size(),e={action:"woocommerce_add_order_item",item_to_add:c,index:d,security:woocommerce_writepanel_params.add_order_item_nonce};a.post(woocommerce_writepanel_params.ajax_url,e,function(b){a("table.woocommerce_order_items tbody#order_items_list").append(b);if(!--count){a("select#add_item_id, #add_item_id_chzn .chzn-choices").css("border-color","").val("");jQuery(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50});a("select#add_item_id").trigger("liszt:updated");a("table.woocommerce_order_items").unblock()}})})}else a("select#add_item_id, #add_item_id_chzn .chzn-choices").css("border-color","red")});a("button.add_meta").live("click",function(){var b=a(this).closest("tr.item").attr("rel");a(this).closest("table.meta").find(".meta_items").append('');return!1});a("button.remove_meta").live("click",function(){var b=confirm("Remove this meta key?");b&&a(this).closest("tr").remove();return!1});a("button.load_customer_billing").live("click",function(){var b=confirm(woocommerce_writepanel_params.load_billing);if(b){var c=a("#customer_user").val();if(!c){alert(woocommerce_writepanel_params.no_customer_selected);return!1}var d={user_id:c,type_to_load:"billing",action:"woocommerce_get_customer_details",security:woocommerce_writepanel_params.get_customer_details_nonce};a(this).closest(".edit_address").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});a.ajax({url:woocommerce_writepanel_params.ajax_url,data:d,type:"POST",success:function(b){var c=jQuery.parseJSON(b);if(c){a("input#_billing_first_name").val(c.billing_first_name);a("input#_billing_last_name").val(c.billing_last_name);a("input#_billing_company").val(c.billing_company);a("input#_billing_address_1").val(c.billing_address_1);a("input#_billing_address_2").val(c.billing_address_2);a("input#_billing_city").val(c.billing_city);a("input#_billing_postcode").val(c.billing_postcode);a("input#_billing_country").val(c.billing_country);a("input#_billing_state").val(c.billing_state);a("input#_billing_email").val(c.billing_email);a("input#_billing_phone").val(c.billing_phone)}a(".edit_address").unblock()}})}return!1});a("button.load_customer_shipping").live("click",function(){var b=confirm(woocommerce_writepanel_params.load_shipping);if(b){var c=a("#customer_user").val();if(!c){alert(woocommerce_writepanel_params.no_customer_selected);return!1}var d={user_id:c,type_to_load:"shipping",action:"woocommerce_get_customer_details",security:woocommerce_writepanel_params.get_customer_details_nonce};a(this).closest(".edit_address").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});a.ajax({url:woocommerce_writepanel_params.ajax_url,data:d,type:"POST",success:function(b){var c=jQuery.parseJSON(b);if(c){a("input#_shipping_first_name").val(c.shipping_first_name);a("input#_shipping_last_name").val(c.shipping_last_name);a("input#_shipping_company").val(c.shipping_company);a("input#_shipping_address_1").val(c.shipping_address_1);a("input#_shipping_address_2").val(c.shipping_address_2);a("input#_shipping_city").val(c.shipping_city);a("input#_shipping_postcode").val(c.shipping_postcode);a("input#_shipping_country").val(c.shipping_country);a("input#_shipping_state").val(c.shipping_state)}a(".edit_address").unblock()}})}return!1});a("button.billing-same-as-shipping").live("click",function(){var b=confirm(woocommerce_writepanel_params.copy_billing);if(b){a("input#_shipping_first_name").val(a("input#_billing_first_name").val());a("input#_shipping_last_name").val(a("input#_billing_last_name").val());a("input#_shipping_company").val(a("input#_billing_company").val());a("input#_shipping_address_1").val(a("input#_billing_address_1").val());a("input#_shipping_address_2").val(a("input#_billing_address_2").val());a("input#_shipping_city").val(a("input#_billing_city").val());a("input#_shipping_postcode").val(a("input#_billing_postcode").val());a("input#_shipping_country").val(a("input#_billing_country").val());a("input#_shipping_state").val(a("input#_billing_state").val())}return!1});a("a.add_tax_row").live("click",function(){var b=a("#tax_rows .tax_row").size();a("#tax_rows").append('

×
');return!1});a("a.delete_tax_row").live("click",function(){$tax_row=a(this).closest(".tax_row");$tax_row.find("input").val("");$tax_row.hide();return!1});a("select#product-type").change(function(){var b=a(this).val();a(".hide_if_grouped, .hide_if_external").show();a(".show_if_simple, .show_if_variable, .show_if_grouped, .show_if_external").hide();if(b=="simple"){a(".show_if_simple").show();a("input#_manage_stock").change()}else if(b=="variable"){a(".show_if_variable").show();a("input#_manage_stock").change();a("input#_downloadable").prop("checked",!1).change();a("input#_virtual").removeAttr("checked").change()}else if(b=="grouped"){a(".show_if_grouped").show();a("input#_downloadable").prop("checked",!1).change();a("input#_virtual").removeAttr("checked").change();a(".hide_if_grouped").hide()}else if(b=="external"){a(".show_if_external").show();a("input#_downloadable").prop("checked",!1).change();a("input#_virtual").removeAttr("checked").change();a(".hide_if_external").hide()}a("ul.tabs li:visible").eq(0).find("a").click();a("body").trigger("woocommerce-product-type-change",b,a(this))}).change();a("input#_downloadable").change(function(){a(".show_if_downloadable").hide();a("input#_downloadable").is(":checked")&&a(".show_if_downloadable").show();a(".downloads_tab").is(".active")&&a("ul.tabs li:visible").eq(0).find("a").click()}).change();a("input#_virtual").change(function(){a(".show_if_virtual").hide();a(".hide_if_virtual").show();if(a("input#_virtual").is(":checked")){a(".show_if_virtual").show();a(".hide_if_virtual").hide()}}).change();var b=!1;a(".sale_price_dates_fields input").each(function(){a(this).val()!=""&&(b=!0)});if(b){a(".sale_schedule").hide();a(".sale_price_dates_fields").show()}else{a(".sale_schedule").show();a(".sale_price_dates_fields").hide()}a(".sale_schedule").click(function(){a(this).hide();a(".sale_price_dates_fields").show();return!1});a(".cancel_sale_schedule").click(function(){a(this).closest("p").find("input").val("");a(".sale_schedule").show();a(".sale_price_dates_fields").hide();return!1});a("input#_manage_stock").change(function(){a(this).is(":checked")?a("div.stock_fields").show():a("div.stock_fields").hide()}).change();var c=a("#_sale_price_dates_from, #_sale_price_dates_to").datepicker({defaultDate:"",dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,showOn:"button",buttonImage:woocommerce_writepanel_params.calendar_image,buttonImageOnly:!0,onSelect:function(b){var d=this.id=="_sale_price_dates_from"?"minDate":"maxDate",e=a(this).data("datepicker"),f=a.datepicker.parseDate(e.settings.dateFormat||a.datepicker._defaults.dateFormat,b,e.settings);c.not(this).datepicker("option",d,f)}});a(".date-picker").datepicker({dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0,showOn:"button",buttonImage:woocommerce_writepanel_params.calendar_image,buttonImageOnly:!0});a(".date-picker-field").datepicker({dateFormat:"yy-mm-dd",numberOfMonths:1,showButtonPanel:!0});jQuery(".expand_all").click(function(){jQuery(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox table").show();return!1});jQuery(".close_all").click(function(){jQuery(this).closest(".wc-metaboxes-wrapper").find(".wc-metabox table").hide();return!1});jQuery(".wc-metaboxes-wrapper").on("click",".wc-metabox h3",function(b){if(a(b.target).filter(":input, option").length)return;jQuery(this).next(".wc-metabox-content").toggle()});jQuery(".wc-metabox.closed").each(function(){jQuery(this).find(".wc-metabox-content").hide()});a(".woocommerce_attributes select.multiselect").chosen();var d=a(".woocommerce_attributes").find(".woocommerce_attribute").get();d.sort(function(b,c){var d=parseInt(a(b).attr("rel")),e=parseInt(a(c).attr("rel"));return de?1:0});a(d).each(function(b,c){a(".woocommerce_attributes").append(c)});a("button.add_attribute").on("click",function(){var b=a(".woocommerce_attributes .woocommerce_attribute").size(),c=a("select.attribute_taxonomy").val();if(!c){var d=a("select#product-type").val();d!="variable"?enable_variation='style="display:none;"':enable_variation="";a(".woocommerce_attributes").append('
")}else{var f=a(".woocommerce_attributes .woocommerce_attribute."+c);a(".woocommerce_attributes").append(a(f));a(f).show().find(".woocommerce_attribute_data").show();e()}a("select.attribute_taxonomy").val("")});a(".woocommerce_attributes").on("blur","input.attribute_name",function(){a(this).closest(".woocommerce_attribute").find("strong.attribute_name").text(a(this).val())});a(".woocommerce_attributes").on("click","button.select_all_attributes",function(){a(this).closest("td").find("select option").attr("selected","selected");a(this).closest("td").find("select").trigger("liszt:updated");return!1});a(".woocommerce_attributes").on("click","button.select_no_attributes",function(){a(this).closest("td").find("select option").removeAttr("selected");a(this).closest("td").find("select").trigger("liszt:updated");return!1});a(".woocommerce_attributes").on("click","button.remove_row",function(){var b=confirm(woocommerce_writepanel_params.remove_attribute);if(b){var c=a(this).parent().parent();if(c.is(".taxonomy")){c.find("select, input[type=text]").val("");c.hide()}else{c.find("select, input[type=text]").val("");c.hide();e()}}return!1});a(".woocommerce_attributes").sortable({items:".woocommerce_attribute",cursor:"move",axis:"y",handle:"h3",scrollSensitivity:40,forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"wc-metabox-sortable-placeholder",start:function(a,b){b.item.css("background-color","#f6f6f6")},stop:function(a,b){b.item.removeAttr("style");e()}});a(".woocommerce_attributes").on("click","button.add_new_attribute",function(){a(".woocommerce_attributes").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_writepanel_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",opacity:.6}});var b=a(this).attr("data-attribute"),c=a(this).closest(".woocommerce_attribute_data"),d=prompt(woocommerce_writepanel_params.new_attribute_prompt);if(d){var e={action:"woocommerce_add_new_attribute",taxonomy:b,term:d,security:woocommerce_writepanel_params.add_attribute_nonce};a.post(woocommerce_writepanel_params.ajax_url,e,function(b){result=jQuery.parseJSON(b);if(result.error)alert(result.error);else if(result.slug){c.find("select.attribute_values").append('");c.find("select.attribute_values").trigger("liszt:updated")}a(".woocommerce_attributes").unblock()})}else a(".woocommerce_attributes").unblock();return!1});var f;window.send_to_editor_default=window.send_to_editor;jQuery(".upload_file_button").live("click",function(){f=jQuery(this).parent().find(".file_path");formfield=jQuery(f).attr("name");window.send_to_editor=window.send_to_download_url;tb_show("","media-upload.php?post_id="+woocommerce_writepanel_params.post_id+"&type=downloadable_product&from=wc01&TB_iframe=true");return!1});window.send_to_download_url=function(a){file_url=jQuery(a).attr("href");file_url&&jQuery(f).val(file_url);tb_remove();window.send_to_editor=window.send_to_editor_default}}); \ No newline at end of file diff --git a/readme.txt b/readme.txt index bb904c8df10..0d5b98133e1 100644 --- a/readme.txt +++ b/readme.txt @@ -160,6 +160,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc * Fix - fix for https://bugs.php.net/bug.php?id=61166 (thanks Max Rice) * Fix - postcode validation when country is different for shipping vs billing * Fix - user_email typo +* Fix - Cancelling adding an attribute blocks panel = 1.5.6 - 17/05/2012 = * Feature - Default display for shipping methods is radio buttons. Before, when methods were enabled/disabled based on coupons or customer, changed methods could go unnoticed. Radio options are always visible.