From 1eb9f83f777bfb5a456bb0b87176b5ed06cf4291 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Thu, 24 Dec 2015 12:16:02 +0000
Subject: [PATCH 1/4] Hide attributes and shipping classes from quick edit

Closes #9882
---
 includes/class-wc-post-types.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php
index 0c492fcb18b..ae990f74c22 100644
--- a/includes/class-wc-post-types.php
+++ b/includes/class-wc-post-types.php
@@ -147,6 +147,7 @@ class WC_Post_types {
 						'new_item_name'     => __( 'New Shipping Class Name', 'woocommerce' )
 					),
 				'show_ui'               => true,
+				'show_in_quick_edit'    => false,
 				'show_in_nav_menus'     => false,
 				'query_var'             => is_admin(),
 				'capabilities'          => array(
@@ -184,16 +185,17 @@ class WC_Post_types {
 								'add_new_item'      => sprintf( __( 'Add New %s', 'woocommerce' ), $label ),
 								'new_item_name'     => sprintf( __( 'New %s', 'woocommerce' ), $label )
 							),
-						'show_ui'           => true,
-						'show_in_menu'      => false,
-						'show_in_nav_menus' => false,
-						'meta_box_cb'       => false,
-						'query_var'         => 1 === $tax->attribute_public,
-						'rewrite'           => false,
-						'sort'              => false,
-						'public'            => 1 === $tax->attribute_public,
-						'show_in_nav_menus' => 1 === $tax->attribute_public && apply_filters( 'woocommerce_attribute_show_in_nav_menus', false, $name ),
-						'capabilities'      => array(
+						'show_ui'            => true,
+						'show_in_quick_edit' => false,
+						'show_in_menu'       => false,
+						'show_in_nav_menus'  => false,
+						'meta_box_cb'        => false,
+						'query_var'          => 1 === $tax->attribute_public,
+						'rewrite'            => false,
+						'sort'               => false,
+						'public'             => 1 === $tax->attribute_public,
+						'show_in_nav_menus'  => 1 === $tax->attribute_public && apply_filters( 'woocommerce_attribute_show_in_nav_menus', false, $name ),
+						'capabilities'       => array(
 							'manage_terms' => 'manage_product_terms',
 							'edit_terms'   => 'edit_product_terms',
 							'delete_terms' => 'delete_product_terms',

From c1b8a20d39a7ea62c5e0eb661e240d87f26d45aa Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Sun, 27 Dec 2015 21:32:55 +0000
Subject: [PATCH 2/4] Order attributes by name

Closes #9879
---
 includes/wc-attribute-functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/wc-attribute-functions.php b/includes/wc-attribute-functions.php
index dd1de197117..4bc58c5eb80 100644
--- a/includes/wc-attribute-functions.php
+++ b/includes/wc-attribute-functions.php
@@ -31,7 +31,7 @@ function wc_get_attribute_taxonomies() {
 	if ( false === ( $attribute_taxonomies = get_transient( 'wc_attribute_taxonomies' ) ) ) {
 		global $wpdb;
 
-		$attribute_taxonomies = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies" );
+		$attribute_taxonomies = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies order by attribute_name ASC;" );
 
 		set_transient( 'wc_attribute_taxonomies', $attribute_taxonomies );
 	}

From 3cbe88082f4c98cdacb02cb6f6604ec52ce30d30 Mon Sep 17 00:00:00 2001
From: Claudio Sanches <contato@claudiosmweb.com>
Date: Mon, 28 Dec 2015 16:07:05 -0200
Subject: [PATCH 3/4] Fixed simplify commerce admin notices position, closes
 #9911

---
 .../simplify-commerce/class-wc-gateway-simplify-commerce.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php b/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
index 996c96eeb7c..8f1c18db81e 100644
--- a/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
+++ b/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
@@ -62,7 +62,6 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 
 		// Hooks
 		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'admin_notices', array( $this, 'checks' ) );
 		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
 		add_action( 'woocommerce_receipt_' . $this->id, array( $this, 'receipt_page' ) );
 		add_action( 'woocommerce_api_wc_gateway_simplify_commerce', array( $this, 'return_handler' ) );
@@ -101,6 +100,8 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 			<p><?php _e( 'Simplify Commerce is your merchant account and payment gateway all rolled into one. Choose Simplify Commerce as your WooCommerce payment gateway to get access to your money quickly with a powerful, secure payment engine backed by MasterCard.', 'woocommerce' ); ?></p>
 		<?php endif; ?>
 
+		<?php $this->checks(); ?>
+
 		<table class="form-table">
 			<?php $this->generate_settings_html(); ?>
 			<script type="text/javascript">
@@ -120,7 +121,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
 				jQuery( '#woocommerce_simplify_commerce_mode' ).on( 'change', function() {
 					var color = jQuery( '#woocommerce_simplify_commerce_modal_color' ).closest( 'tr' );
 
-					if ( 'standard' == jQuery( this ).val() ) {
+					if ( 'standard' === jQuery( this ).val() ) {
 						color.hide();
 					} else {
 						color.show();

From 03ba8539f6905cc2e492ef3c7a7eec156d0673f5 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Tue, 29 Dec 2015 13:16:43 +0000
Subject: [PATCH 4/4] Stop coupon logic when 0 is hit so coupons can apply to
 other lines

Fixes #9870
---
 includes/class-wc-cart.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
index 1304a67043d..a548126c09d 100644
--- a/includes/class-wc-cart.php
+++ b/includes/class-wc-cart.php
@@ -1851,7 +1851,7 @@ class WC_Cart {
 
 				foreach ( $this->coupons as $code => $coupon ) {
 					if ( $coupon->is_valid() && ( $coupon->is_valid_for_product( $product, $values ) || $coupon->is_valid_for_cart() ) ) {
-						$discount_amount = $coupon->get_discount_amount( ( 'yes' === get_option( 'woocommerce_calc_discounts_sequentially', 'no' ) ? $price : $undiscounted_price ), $values, true );
+						$discount_amount = $coupon->get_discount_amount( 'yes' === get_option( 'woocommerce_calc_discounts_sequentially', 'no' ) ? $price : $undiscounted_price, $values, true );
 						$discount_amount = min( $price, $discount_amount );
 						$price           = max( $price - $discount_amount, 0 );
 
@@ -1873,6 +1873,11 @@ class WC_Cart {
 							$this->increase_coupon_applied_count( $code, $values['quantity'] );
 						}
 					}
+
+					// If the price is 0, we can stop going through coupons because there is nothing more to discount for this product.
+					if ( 0 >= $price ) {
+						break;
+					}
 				}
 			}