Skip to content

Commit b231986

Browse files
Merge pull request BroadleafCommerce#37 from BroadleafCommerce/qa-896-clear-bundle-dynamicprices
Dynamic price data is not cleared for each bundle item when clearing dynamic prices for product bundles
2 parents 5ff20ff + 671e73e commit b231986

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/domain/ProductBundleImpl.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,30 @@
2323
import org.broadleafcommerce.common.copy.MultiTenantCopyContext;
2424
import org.broadleafcommerce.common.money.BankersRounding;
2525
import org.broadleafcommerce.common.money.Money;
26-
import org.broadleafcommerce.common.presentation.*;
26+
import org.broadleafcommerce.common.presentation.AdminPresentation;
27+
import org.broadleafcommerce.common.presentation.AdminPresentationClass;
28+
import org.broadleafcommerce.common.presentation.AdminPresentationCollection;
29+
import org.broadleafcommerce.common.presentation.PopulateToOneFieldsEnum;
30+
import org.broadleafcommerce.common.presentation.RequiredOverride;
2731
import org.broadleafcommerce.common.presentation.client.SupportedFieldType;
2832
import org.broadleafcommerce.core.catalog.service.type.ProductBundlePricingModelType;
2933
import org.hibernate.annotations.BatchSize;
3034
import org.hibernate.annotations.Cache;
3135
import org.hibernate.annotations.CacheConcurrencyStrategy;
3236
import org.hibernate.annotations.Cascade;
3337

34-
import javax.persistence.*;
3538
import java.math.BigDecimal;
3639
import java.util.ArrayList;
3740
import java.util.List;
3841

42+
import javax.persistence.CascadeType;
43+
import javax.persistence.Column;
44+
import javax.persistence.Entity;
45+
import javax.persistence.Inheritance;
46+
import javax.persistence.InheritanceType;
47+
import javax.persistence.OneToMany;
48+
import javax.persistence.Table;
49+
3950
@Entity
4051
@Inheritance(strategy = InheritanceType.JOINED)
4152
@Table(name = "BLC_PRODUCT_BUNDLE")
@@ -136,6 +147,14 @@ public Money getBundleItemsSalePrice() {
136147
}
137148
return price;
138149
}
150+
151+
@Override
152+
public void clearDynamicPrices() {
153+
super.clearDynamicPrices();
154+
for (SkuBundleItem bundleItem : getSkuBundleItems()) {
155+
bundleItem.clearDynamicPrices();
156+
}
157+
}
139158

140159
@Override
141160
public Boolean getAutoBundle() {

core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/domain/SkuBundleItemImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ public void setSku(Sku sku) {
195195

196196
@Override
197197
public void clearDynamicPrices() {
198-
this.dynamicPrices = null;
198+
dynamicPrices = null;
199+
sku.clearDynamicPrices();
199200
}
200201

201202
@Override

0 commit comments

Comments
 (0)