Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wp 5.5 #49

Merged
merged 10 commits into from
Aug 29, 2020
Merged

Wp 5.5 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7e6d3d5
fix: get current custom type from post
ndvo Aug 11, 2020
bdef78f
fix issue with quantity field
ndvo Aug 11, 2020
12535d3
translation: add pt-br
ndvo Aug 11, 2020
fa16278
fix translation pt_BR Order Desk
ndvo Aug 11, 2020
8a13ff1
Updating Tested up to value to 5.5
ndvo Aug 12, 2020
2930ae0
fix(admin): remove warning in sub and order list
ndvo Aug 20, 2020
23b19cb
fix(admin): replace jQuery live() with on()
ndvo Aug 20, 2020
b6151c9
fix(product form): input quantity width
ndvo Aug 21, 2020
8b7e89c
Update stable tag version
rijarobinson Aug 29, 2020
6b16aa9
Update version in comment
rijarobinson Aug 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions adminfunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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");
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions css/foxyshop.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -452,4 +452,4 @@ label.foxyshop_no_width {
}
.foxyshop_addon_container .foxyshop_price {

}
}
1 change: 1 addition & 0 deletions customposttype.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
4 changes: 2 additions & 2 deletions foxyshop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

**************************************************************************
Expand Down Expand Up @@ -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'];
Expand Down
Loading