Better importer mapping options

- Rearranged fields to make easy to find
- Grouped price fields
- Include context to "Stock" since could means different things depending on the language

includes/admin/importers/class-wc-product-csv-importer-controller.php

@@ -457,11 +457,19 @@ class WC_Product_CSV_Importer_Controller {
 			'catalog_visibility' => __( 'Visibility in catalog', 'woocommerce' ),
 			'short_description'  => __( 'Short description', 'woocommerce' ),
 			'description'        => __( 'Description', 'woocommerce' ),
-			'date_on_sale_from'  => __( 'Date sale price starts', 'woocommerce' ),
+			'price'              => array(
-			'date_on_sale_to'    => __( 'Date sale price ends', 'woocommerce' ),
+				'name'    => __( 'Price', 'woocommerce' ),
+				'options' => array(
+					'regular_price'     => __( 'Regular price', 'woocommerce' ),
+					'sale_price'        => __( 'Sale price', 'woocommerce' ),
+					'date_on_sale_from' => __( 'Date sale price starts', 'woocommerce' ),
+					'date_on_sale_to'   => __( 'Date sale price ends', 'woocommerce' ),
+				),
+			),
 			'tax_status'         => __( 'Tax status', 'woocommerce' ),
 			'tax_class'          => __( 'Tax class', 'woocommerce' ),
 			'stock_status'       => __( 'In stock?', 'woocommerce' ),
+			'stock_quantity'     => _x( 'Stock', 'Quantity in stock', 'woocommerce' ),
 			'backorders'         => __( 'Backorders allowed?', 'woocommerce' ),
 			'sold_individually'  => __( 'Sold individually?', 'woocommerce' ),
 			/* translators: %s: weight unit */
@@ -477,11 +485,6 @@ class WC_Product_CSV_Importer_Controller {
 					'height'             => sprintf( __( 'Height (%s)', 'woocommerce' ), $dimension_unit ),
 				),
 			),
-			'reviews_allowed'    => __( 'Allow customer reviews?', 'woocommerce' ),
-			'purchase_note'      => __( 'Purchase note', 'woocommerce' ),
-			'sale_price'         => __( 'Sale price', 'woocommerce' ),
-			'regular_price'      => __( 'Regular Price', 'woocommerce' ),
-			'stock_quantity'     => __( 'Stock', 'woocommerce' ),
 			'category_ids'       => __( 'Categories', 'woocommerce' ),
 			'tag_ids'            => __( 'Tags', 'woocommerce' ),
 			'shipping_class_id'  => __( 'Shipping class', 'woocommerce' ),
@@ -516,6 +519,8 @@ class WC_Product_CSV_Importer_Controller {
 					'attributes:default' . $index  => __( 'Default attribute', 'woocommerce' ),
 				),
 			),
+			'reviews_allowed'    => __( 'Allow customer reviews?', 'woocommerce' ),
+			'purchase_note'      => __( 'Purchase note', 'woocommerce' ),
 			'meta:' . $meta      => __( 'Import as meta', 'woocommerce' ),
 		);