1.8.0: a coupon can carry a group's shipping rules
CI / WordPress latest + WooCommerce latest on PHP 8.3 (pull_request) Successful in 1m11s
Compatibility / WP latest / WC latest / PHP 7.4 (pull_request) Skipped
Compatibility / WP latest / WC beta / PHP 8.3 (pull_request) Skipped
Compatibility / WP latest / WC latest / PHP 8.3 (pull_request) Skipped
Compatibility / WP nightly / WC latest / PHP 8.3 (pull_request) Skipped
Compatibility / WP latest / WC latest / PHP 8.4 (pull_request) Skipped
Compatibility / Keep the compatibility headers honest (pull_request) Skipped
CI / Static checks (pull_request) Successful in 4m26s
CI / WordPress latest + WooCommerce latest on PHP 8.3 (pull_request) Successful in 1m11s
Compatibility / WP latest / WC latest / PHP 7.4 (pull_request) Skipped
Compatibility / WP latest / WC beta / PHP 8.3 (pull_request) Skipped
Compatibility / WP latest / WC latest / PHP 8.3 (pull_request) Skipped
Compatibility / WP nightly / WC latest / PHP 8.3 (pull_request) Skipped
Compatibility / WP latest / WC latest / PHP 8.4 (pull_request) Skipped
Compatibility / Keep the compatibility headers honest (pull_request) Skipped
CI / Static checks (pull_request) Successful in 4m26s
Shipping Rules gets a "Coupon codes" field per group. A customer with one of those coupons in the cart gets the group's shipping methods, including "Only" ones, whatever their email. Asked for on a live shop: free delivery reserved for one company's addresses had to reach people using that company's coupon too. Only the shipping follows the coupon; the group's percentage discount stays with its email assignments. An email assigned to a group still wins. The shipping package key now carries the effective group, so WooCommerce's rate cache follows a coupon being added or removed. Stored as groups.shipping_coupons (dbDelta adds the column on update). Smoke tests: 100 assertions. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
b9d8611ce2
commit
654d8632d2
@@ -56,7 +56,7 @@ class WC_EDM_Frontend {
|
||||
*/
|
||||
public function key_packages_to_match( $packages ) {
|
||||
$match = $this->get_current_match();
|
||||
$key = $match ? (int) $match->id : 0;
|
||||
$key = ( $match ? (int) $match->id : 0 ) . ':' . $this->shipping_group_id( $match );
|
||||
|
||||
foreach ( $packages as $index => $package ) {
|
||||
$packages[ $index ]['wc_edm_match'] = $key;
|
||||
@@ -367,12 +367,13 @@ class WC_EDM_Frontend {
|
||||
* @return array
|
||||
*/
|
||||
public function filter_shipping_rates( $rates, $package ) {
|
||||
$match = $this->get_current_match();
|
||||
$match = $this->get_current_match();
|
||||
$group_id = $this->shipping_group_id( $match );
|
||||
|
||||
// $match is null for a customer who matches nothing — the common case,
|
||||
// and the one this whole method exists to constrain now.
|
||||
if ( $match && 'group' === $match->assignment_type && $match->group_id ) {
|
||||
$rates = $this->apply_group_shipping_rules( $rates, (int) $match->group_id );
|
||||
// 0 for a customer who matches nothing and holds no linked coupon —
|
||||
// the common case, and the one this whole method exists to constrain.
|
||||
if ( $group_id ) {
|
||||
$rates = $this->apply_group_shipping_rules( $rates, $group_id );
|
||||
} else {
|
||||
// 🔴 Everyone else — including a matched customer whose assignment
|
||||
// is not a group — must not see a method some group reserved.
|
||||
@@ -397,6 +398,28 @@ class WC_EDM_Frontend {
|
||||
return $rates;
|
||||
}
|
||||
|
||||
/**
|
||||
* The group whose shipping rules apply to this customer, or 0.
|
||||
*
|
||||
* An email assigned to a group wins. Otherwise a coupon in the cart that a
|
||||
* group lists under "Coupon codes" gives that group's shipping rules — the
|
||||
* shipping only; the group's percentage discount stays with its emails.
|
||||
*
|
||||
* @param object|null $match Email assignment row.
|
||||
* @return int
|
||||
*/
|
||||
private function shipping_group_id( $match ) {
|
||||
if ( $match && 'group' === $match->assignment_type && $match->group_id ) {
|
||||
return (int) $match->group_id;
|
||||
}
|
||||
|
||||
if ( ! function_exists( 'WC' ) || ! WC()->cart ) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return WC_EDM_DB::group_for_coupons( WC()->cart->get_applied_coupons() );
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove every method some group reserved for itself.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user