Merge branch 'release/1.3.8'

Author: Misplon

changelog.txt

@@ -2,6 +2,11 @@
 
 View full release information on [Github](https://github.com/siteorigin/siteorigin-north/releases).
 
+= 1.3.8 - 02 May 2017 =
+* Fixed WooCommerce notification missing padding.
+* Updated WooCommerce templates to latest version.
+* Included backwards compatibility for WooCommerce templates.
+
 = 1.3.7 - 25 April 2017 =
 * Remove undesired spacing as a result of hentry removal on pages.
 * Added ability to close header search bar using the escape key.

inc/settings

@@ -42,7 +42,6 @@
 	.woocommerce-message {
 		border-top-color: $color__primary_accent;
 		background: #fbfbfb;
-		padding: 0;
 
 		.button {
 			float: right;

sass/woocommerce/_elements.scss

@@ -172,7 +172,7 @@ function siteorigin_north_woocommerce_update_cart_count( $fragments ) {
 function siteorigin_north_woocommerce_quick_view_button() {
 	global $product;
 	if( siteorigin_setting( 'woocommerce_display_quick_view' ) ) :
-		echo '<a href="#" id="product-id-' . $product->id . '" class="button product-quick-view-button" data-product-id="' . $product->id . '">' . __( 'Quick View', 'siteorigin-north') . '</a>';
+		echo '<a href="#" id="product-id-' . $product->get_id() . '" class="button product-quick-view-button" data-product-id="' . $product->get_id() . '">' . __( 'Quick View', 'siteorigin-north') . '</a>';
 	endif;
 }
 endif;

woocommerce.css

@@ -57,7 +57,7 @@
 		<?php endif; ?>
 	</div>
 
-	<?php if ( get_option( 'woocommerce_review_rating_verification_required' ) === 'no' || wc_customer_bought_product( '', get_current_user_id(), $product->id ) ) : ?>
+	<?php if ( get_option( 'woocommerce_review_rating_verification_required' ) === 'no' || wc_customer_bought_product( '', get_current_user_id(), $product->get_id() ) ) : ?>
 
 		<div id="review_form_wrapper">
 			<div id="review_form">

woocommerce/functions.php

@@ -12,13 +12,20 @@
 	exit; // Exit if accessed directly
 }
 
-global $product;
+global $product, $woocommerce;
 
 if ( ! $product->is_purchasable() ) {
 	return;
 }
 
-echo wc_get_stock_html( $product );
+if ( version_compare( $woocommerce->version, 3.0, '>' ) ) {
+	echo wc_get_stock_html( $product );
+} else {
+	// Availability.
+	$availability      = $product->get_availability();
+	$availability_html = empty( $availability['availability'] ) ? '' : '<p class="stock ' . esc_attr( $availability['class'] ) . '">' . esc_html( $availability['availability'] ) . '</p>';
+	echo apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $product );	
+}
 ?>
 
 <?php if ( $product->is_in_stock() ) : ?>
@@ -31,11 +38,21 @@
 		<?php do_action( 'woocommerce_before_add_to_cart_quantity' ); ?>
 
 	 	<?php
-		woocommerce_quantity_input( array(
-			'min_value'   => apply_filters( 'woocommerce_quantity_input_min', $product->get_min_purchase_quantity(), $product ),
-			'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->get_max_purchase_quantity(), $product ),
-			'input_value' => isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : $product->get_min_purchase_quantity(),
-		) );
+	 	if ( version_compare( $woocommerce->version, 3.0, '>' ) ) {
+			woocommerce_quantity_input( array(
+				'min_value'   => apply_filters( 'woocommerce_quantity_input_min', $product->get_min_purchase_quantity(), $product ),
+				'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->get_max_purchase_quantity(), $product ),
+				'input_value' => isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : $product->get_min_purchase_quantity(),
+			) );
+		} else {
+	 		if ( ! $product->is_sold_individually() ) {
+	 			woocommerce_quantity_input( array(
+	 				'min_value'   => apply_filters( 'woocommerce_quantity_input_min', 1, $product ),
+	 				'max_value'   => apply_filters( 'woocommerce_quantity_input_max', $product->backorders_allowed() ? '' : $product->get_stock_quantity(), $product ),
+	 				'input_value' => ( isset( $_POST['quantity'] ) ? wc_stock_amount( $_POST['quantity'] ) : 1 )
+	 			) );
+	 		}	
+		}	
 	 	?>
 
 		<?php do_action( 'woocommerce_after_add_to_cart_quantity' ); ?>