manual merge to 1.0.13

gine · Jan 29, 2017 · 999f233 · 999f233
2 parents 25db86f + b7b3811
commit 999f233
Show file tree

Hide file tree

Showing 11 changed files with 412 additions and 475 deletions.
diff --git a/assets/css/admin-styles.css b/assets/css/admin-styles.css
@@ -137,7 +137,7 @@ span.wpbo_product_values {
 }
 
 /* --------- wpbo company notice ---------- */
-#wpbo-company-notice .inside {
+#wpqu-company-notice .inside {
 	text-align: center;
 }
 

diff --git a/assets/img/rapid-order-logo.png b/assets/img/rapid-order-logo.png
diff --git a/assets/img/wpbo-logo.png b/assets/img/wpbo-logo.png
diff --git a/assets/js/ipq_input_value_validation.js b/assets/js/ipq_input_value_validation.js
@@ -62,7 +62,7 @@ jQuery(document).ready( function($) {
 			new_qty = +new_qty + (+step - +rem);
 
 			// Max Value Validation
-			if ( +new_qty > +max ) {
+			if ( max > 0 && +new_qty > +max ) {
 				new_qty = +new_qty - +step;
 			}
 		}

diff --git a/includes/class-wcqu-filters.php b/includes/class-wcqu-filters.php
@@ -77,7 +77,6 @@ public function input_min_value( $default, $product ) {
 
 		// Get Value from Rule
 		$min = wcqu_get_value_from_rule( 'min', $product, $rule );
-
 		// Return Value
 		if ( $min == '' or $min == null or (isset($min['min']) and $min['min'] == "")) {
 			return $default;