Merge pull request #49 from FoxyCart/wp-5.5

Wp 5.5
FoxyCart · Aug 29, 2020 · c46a019 · c46a019
2 parents 52b3dd1 + 6b16aa9
commit c46a019
Show file tree

Hide file tree

Showing 9 changed files with 2,026 additions and 21 deletions.
diff --git a/adminfunctions.php b/adminfunctions.php
@@ -978,7 +978,7 @@ function foxyshop_manage_attributes_jquery($att_type) {
 	});
 
 	//Cancel New Form
-	$(".foxyshop_cancel_new_attribute").live("click", function(e) {
+	$(".foxyshop_attribute_list").on("click", ".foxyshop_cancel_new_attribute", function(e) {
 		var id = $(this).attr("rel");
 		$("#new_attribute_container_" + id).remove();
 		$(".foxyshop_add_attribute[rel='" + id + "']").show();
@@ -987,7 +987,7 @@ function foxyshop_manage_attributes_jquery($att_type) {
 	});
 
 	//Cancel Edit Form
-	$(".foxyshop_cancel_save_attribute").live("click", function(e) {
+	$(".foxyshop_attribute_list").on("click", ".foxyshop_cancel_save_attribute", function(e) {
 		var id = $(this).attr("rel");
 		var original_text = $(this).attr("original_text").replace("\n", "<br />\n");
 		var parent_tr = $(this).parents(".foxyshop_attribute_list tr");
@@ -998,7 +998,7 @@ function foxyshop_manage_attributes_jquery($att_type) {
 	});
 
 	//Add New
-	$(".foxyshop_add_new_attribute").live("click", function(e) {
+	$(".foxyshop_attribute_list").on("click", ".foxyshop_add_new_attribute", function(e) {
 		var id = $(this).attr("rel");
 		var att_name = $(".new_attribute_name[rel='" + id + "']").val();
 		var att_value = $(".new_attribute_value[rel='" + id + "']").val();
@@ -1018,7 +1018,7 @@ function foxyshop_manage_attributes_jquery($att_type) {
 	});
 
 	//Save Attribute
-	$(".foxyshop_save_attribute").live("click", function(e) {
+	$(".foxyshop_attribute_list").on("click", ".foxyshop_save_attribute", function(e) {
 		var id = $(this).attr("rel");
 		var parent_tr = $(this).parents(".foxyshop_attribute_list tr");
 		var att_name = parent_tr.children(".col1").text();
@@ -1037,7 +1037,7 @@ function foxyshop_manage_attributes_jquery($att_type) {
 	});
 
 	//Start Editing
-	$(".foxyshop_attribute_edit").live("click", function(e) {
+	$(".foxyshop_attribute_list").on("click", ".foxyshop_attribute_edit", function(e) {
 		var id = $(this).attr("rel");
 		var parent_tr = $(this).parents(".foxyshop_attribute_list tr");
 		var att_value = parent_tr.find(".col2 div").text();
@@ -1050,7 +1050,7 @@ function foxyshop_manage_attributes_jquery($att_type) {
 	});
 
 	//Delete
-	$(".foxyshop_attribute_delete").live("click", function(e) {
+	$(".foxyshop_attribute_list").on("click", ".foxyshop_attribute_delete", function(e) {
 		var id = $(this).attr("rel");
 		var att_name = $(this).attr("attname");
 		var parent_tr = $(this).parents(".foxyshop_attribute_list tr");

diff --git a/css/foxyshop.css b/css/foxyshop.css
@@ -227,7 +227,7 @@ http://www.foxy-shop.com/documentation/theme-customization/
 	margin-bottom: 7px;
 }
 input[type="text"].foxyshop_quantity {
-	width: 30px;
+	width: calc( 5ch + 1.5rem * 2 );
 }
 .foxyshop_oldprice {
 	text-decoration: line-through;
@@ -452,4 +452,4 @@ label.foxyshop_no_width {
 }
 .foxyshop_addon_container .foxyshop_price {
 
-}
+}
diff --git a/customposttype.php b/customposttype.php
@@ -594,6 +594,7 @@ function foxyshop_product_pricing_setup() {
 			<?php
 			foreach ($discount_types as $key => $val) {
 				echo '<option value="' . $key . '"';
+				$current_discount_type = get_post_meta($post->ID, '_discount_type', 1);
 				if ($current_discount_type == $key) echo ' selected="selected"';
 				echo ">$val</option>\n";
 			}

diff --git a/foxyshop.php b/foxyshop.php
@@ -5,7 +5,7 @@
 Plugin URI: http://www.foxy-shop.com/
 Description: FoxyShop is a full integration for FoxyCart and WordPress, providing a robust shopping cart and inventory management tool.
 Author: SparkWeb Interactive, Inc.
-Version: 4.7.4
+Version: 4.7.5
 Author URI: http://www.foxy-shop.com/
 
 **************************************************************************
@@ -38,7 +38,7 @@
 if (!defined('ABSPATH')) exit();
 
 //Setup Plugin Variables
-define('FOXYSHOP_VERSION', "4.7.4");
+define('FOXYSHOP_VERSION', "4.7.5");
 define('FOXYSHOP_DIR', (is_ssl() ? str_replace("http://", "https://", WP_PLUGIN_URL) : WP_PLUGIN_URL) . "/foxyshop");
 define('FOXYSHOP_PATH', dirname(__FILE__));
 $foxyshop_document_root = $_SERVER['DOCUMENT_ROOT'];