diff --git a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/PriceOrderIfNecessaryActivity.java b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/PriceOrderIfNecessaryActivity.java
new file mode 100644
index 00000000000..0eca3b16433
--- /dev/null
+++ b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/PriceOrderIfNecessaryActivity.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.broadleafcommerce.core.order.service.workflow;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.broadleafcommerce.core.order.domain.Order;
+import org.broadleafcommerce.core.order.service.OrderService;
+import org.broadleafcommerce.core.workflow.BaseActivity;
+import org.broadleafcommerce.core.workflow.ProcessContext;
+
+import javax.annotation.Resource;
+
+public class PriceOrderIfNecessaryActivity extends BaseActivity {
+ private static Log LOG = LogFactory.getLog(PriceOrderIfNecessaryActivity.class);
+
+ @Resource(name = "blOrderService")
+ protected OrderService orderService;
+
+ public ProcessContext execute(ProcessContext context) throws Exception {
+ CartOperationRequest request = ((CartOperationContext) context).getSeedData();
+ Order order = request.getOrder();
+
+ order = orderService.save(order, request.isPriceOrder());
+ request.setOrder(order);
+
+ return context;
+ }
+
+}
diff --git a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/add/AddOrderItemActivity.java b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/add/AddOrderItemActivity.java
index ce60f3aa4ba..cf13fd9dc87 100644
--- a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/add/AddOrderItemActivity.java
+++ b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/add/AddOrderItemActivity.java
@@ -95,7 +95,7 @@ public ProcessContext execute(ProcessContext context) throws Exception {
item.setOrder(order);
item = orderItemService.saveOrderItem(item);
order.getOrderItems().add(item);
- order = orderService.save(order, request.isPriceOrder());
+ order = orderService.save(order, false);
request.setOrder(order);
request.setAddedOrderItem(item);
diff --git a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/remove/RemoveOrderItemActivity.java b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/remove/RemoveOrderItemActivity.java
index d148d2a5ffc..44a6991e5d8 100644
--- a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/remove/RemoveOrderItemActivity.java
+++ b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/workflow/remove/RemoveOrderItemActivity.java
@@ -61,7 +61,7 @@ public ProcessContext execute(ProcessContext context) throws Exception {
itemFromOrder.setOrder(null);
orderItemService.delete(itemFromOrder);
- order = orderService.save(order, request.isPriceOrder());
+ order = orderService.save(order, false);
request.setOrder(order);
return context;
diff --git a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/strategy/FulfillmentGroupItemStrategyImpl.java b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/strategy/FulfillmentGroupItemStrategyImpl.java
index 94769ab4ae1..b0cc8a31875 100644
--- a/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/strategy/FulfillmentGroupItemStrategyImpl.java
+++ b/core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/strategy/FulfillmentGroupItemStrategyImpl.java
@@ -77,8 +77,8 @@ public CartOperationRequest onItemAdded(CartOperationRequest request) throws Pri
fulfillmentGroupItemRequest.setQuantity(orderItem.getQuantity());
fulfillmentGroupItemRequest.setFulfillmentGroup(fulfillmentGroup);
- fulfillmentGroup = fulfillmentGroupService.addItemToFulfillmentGroup(fulfillmentGroupItemRequest, request.isPriceOrder());
- order = fulfillmentGroup.getOrder();
+ fulfillmentGroup = fulfillmentGroupService.addItemToFulfillmentGroup(fulfillmentGroupItemRequest, false);
+ order = fulfillmentGroup.getOrder();
request.setOrder(order);
return request;
@@ -140,7 +140,7 @@ public CartOperationRequest onItemUpdated(CartOperationRequest request) throws P
throw new IllegalStateException("Could not find matching fulfillment group item for the given order item");
}
- order = orderService.save(order, request.isPriceOrder());
+ order = orderService.save(order, false);
request.setOrder(order);
return request;
}
@@ -152,7 +152,6 @@ public CartOperationRequest onItemRemoved(CartOperationRequest request) {
fulfillmentGroupService.removeOrderItemFromFullfillmentGroups(order, orderItem);
-
return request;
}
diff --git a/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-workflow.xml b/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-workflow.xml
index 2c712945893..3f66a01a197 100644
--- a/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-workflow.xml
+++ b/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-workflow.xml
@@ -97,6 +97,7 @@
+
@@ -114,6 +115,7 @@
+
@@ -130,6 +132,7 @@
+