2.4.1

Author: fahadmahmood8

src/inc/functions.php

@@ -241,11 +241,13 @@ function slw_clear_debug_log(){
 		wp_die();
 	}
 }
+
 add_action( 'pmxi_saved_post', function( $id )
 {
+	$import_id = ( isset( $_GET['id'] ) ? $_GET['id'] : ( isset( $_GET['import_id'] ) ? $_GET['import_id'] : 'new' ) );
 	// get locations total stock
 	$locations_total_stock = \SLW\SRC\Helpers\SlwProductHelper::get_product_locations_stock_total( $id );
-	
+
 	// update stock
 	slw_update_product_stock_status( $id, $locations_total_stock );
 

src/readme.txt

@@ -152,6 +152,11 @@ On settings page you can define a number. If location stock value will be less t
 
 
 == Changelog ==
+
+= 2.4.1 =
+- Fix: Products get put from out of stock to backorder automatically.  [Thanks to Ole Straume Andersen][23/11/2022]
+- Fix: Total Stock was wrong when stock locations has negative value. [Thanks to michaelw90][27/12/2022]
+
 = 2.4.0 =
 - Improvement: Default location will be set for the recently modified/new products.  [Thanks to PHILIPP GOLOB][19/11/2022]
 

src/src/classes/class-slw-stock-locations-tab.php

@@ -136,7 +136,7 @@ public function tab_content_stock_locations_wc_product( $array )
 					echo '<div id="' . $this->tab_stock_locations . '_total"><u>' . __('Total Stock:', 'stock-locations-for-woocommerce') . ' <b>' . ($product->get_stock_quantity() + 0) . '</b></u></div>';
 					echo '<hr>';
 				}
-
+				//pree($product->get_stock_quantity());pree($postmeta);
 				// Convert $postmeta array values from string to int
 
 				// Check if the total stock matches the sum of the locations stock, if not show warning message
@@ -316,7 +316,7 @@ public static function save_tab_data_stock_locations_wc_product_save( $post_id,
 
 				}
 			}
-
+			
 			// Product location terms
 			$product_stock_location_terms = wp_get_post_terms($post_id, SlwLocationTaxonomy::get_tax_Names('singular'));
 
@@ -326,7 +326,7 @@ public static function save_tab_data_stock_locations_wc_product_save( $post_id,
 			} else{
 				$terms_total = count($product_stock_location_terms);
 			}
-
+			
 			// On product update
 			if( $update ){
 
@@ -348,18 +348,21 @@ public static function save_tab_data_stock_locations_wc_product_save( $post_id,
 
 							$stock_value = self::update_product_stock($item_id, $product_stock_location_terms, $terms_total, $force);
 
-							
-							$master_stock_value += $stock_value;
+							if($stock_value>0){
+								$master_stock_value += $stock_value;
+							}
 
 						}
 
 
 
 					}else{
-						$master_stock_value = $stock_value;
+						if($stock_value>0){
+							$master_stock_value = $stock_value;
+						}
 					}
 
-					
+					//pree($master_stock_value);exit;
 					slw_update_product_stock_status($post_id, $master_stock_value);
 
 
@@ -519,7 +522,14 @@ public static function update_product_stock( $id, $product_stock_location_terms,
 
 						if(!$slw_location_status){ continue; }
 						// Save input amounts to array					
-						$input_amounts[] = sanitize_slw_data($_POST[$stock_input_id]);
+						
+						$input_amount = sanitize_slw_data($_POST[$stock_input_id]);
+						
+						if($input_amount>0){
+							$input_amounts[] = $input_amount;
+						}else{
+							continue;
+						}
 
 
 						// Check if input is empty

src/src/classes/frontend/class-slw-frontend-cart.php

@@ -128,15 +128,18 @@ public function add_cart_item_stock_locations( $cart_item, $cart_item_key )
 			$lock_default_location = isset( $this->plugin_settings['lock_default_location_in_frontend'] ) && $this->plugin_settings['lock_default_location_in_frontend'] == 'on' ? true : false;
 			$stock_location_selected = ((isset($woocommerce->session) && $woocommerce->session->has_session())?$woocommerce->session->get('stock_location_selected'):0);
 
+			
 			$different_location_per_cart_item = (isset($this->plugin_settings['different_location_per_cart_item'])?$this->plugin_settings['different_location_per_cart_item']:'');
 			$different_location_per_cart_item_no = (isset($this->plugin_settings['different_location_per_cart_item_no'])?$this->plugin_settings['different_location_per_cart_item_no']:'');
 
 
 
 			if(array_key_exists('stock_location', $cart_item) && !is_array($cart_item['stock_location']) && $cart_item['stock_location']>0){
+				$stock_location_selected = ($stock_location_selected?$stock_location_selected:$cart_item['stock_location']);
 				$cart_item['stock_location'] = (is_array($cart_item['stock_location'])?$cart_item['stock_location']:array($product_id=>$cart_item['stock_location']));
 			}
-
+			
+			
 			if( !empty($stock_locations) ) {
 
 				if( isset($this->plugin_settings['show_in_cart']) && $this->plugin_settings['show_in_cart'] == 'yes' ) {
@@ -146,7 +149,7 @@ public function add_cart_item_stock_locations( $cart_item, $cart_item_key )
 						$stock_locations_arr[] = $location['term_id'];
 					}
 
-					if(!in_array($stock_location_selected, $stock_locations_arr) && $different_location_per_cart_item=='no' && $different_location_per_cart_item_no == 'continue'){
+					if($stock_location_selected && !in_array($stock_location_selected, $stock_locations_arr) && $different_location_per_cart_item=='no' && $different_location_per_cart_item_no == 'continue'){
 						$product_name = ($cart_item['data']->get_data()['name']);
 
 						$slw_notice_msg = apply_filters('slw_notice_msg', sprintf( __('This product item is not available on the selected store location. %s', 'stock-locations-for-woocommerce'), '<a class="button alt slw-dismiss-notice">'.__('Dismiss', 'stock-locations-for-woocommerce').'</a>'), $product_id, $product_name, $stock_location_selected, $stock_locations_arr);
@@ -156,27 +159,33 @@ public function add_cart_item_stock_locations( $cart_item, $cart_item_key )
 					}
 
 					if( 
-							isset($this->plugin_settings['different_location_per_cart_item']) 
-						&& 
 							(
-									$this->plugin_settings['different_location_per_cart_item'] == 'yes' 
-								
-								||
-								
-									(
-											$this->plugin_settings['different_location_per_cart_item'] == 'no' 
-										&&
-											(
-													in_array($stock_location_selected, $stock_locations_arr)
-												//||
-													//$different_location_per_cart_item_no == 'continue'
-											)
-											
-									)
+								isset($this->plugin_settings['different_location_per_cart_item']) 
+							&& 
+								(
+										$this->plugin_settings['different_location_per_cart_item'] == 'yes' 
+									
+									||
+									
+										(
+												$this->plugin_settings['different_location_per_cart_item'] == 'no' 
+											&&
+												(
+														in_array($stock_location_selected, $stock_locations_arr)
+													//||
+														//$different_location_per_cart_item_no == 'continue'
+												)
+												
+										)
+								)
 							)
+						
+						||
+						
+							!$stock_location_selected
 					) {
 
-						echo '<label class="slw_cart_item_stock_location_label">'.__('Nearest Location', 'stock-locations-for-woocommerce').':</label>';
+						echo '<label class="slw_cart_item_stock_location_label">'.__('Location', 'stock-locations-for-woocommerce').':</label>';
 
 						// lock to default location if enabled
 						if( $lock_default_location && $default_location != 0 ) {

src/stock-locations-for-woocommerce.php

@@ -93,7 +93,7 @@
 
 	class SlwMain{
 		// versions
-		public           $version  = '2.4.0';
+		public           $version  = '2.4.1';
 		public           $import_export_addon_version = '1.1.1';
 
 		// others