Modified:
/getpaid.SalesforceOrderRecorder/trunk/getpaid/SalesforceOrderRecorder/CHANGES.txt
/getpaid.SalesforceOrderRecorder/trunk/getpaid/SalesforceOrderRecorder/content/salesforceorderrecorder.py
=======================================
---
/getpaid.SalesforceOrderRecorder/trunk/getpaid/SalesforceOrderRecorder/CHANGES.txt
Mon Aug 3 12:17:45 2009
+++
/getpaid.SalesforceOrderRecorder/trunk/getpaid/SalesforceOrderRecorder/CHANGES.txt
Mon Aug 3 14:05:04 2009
@@ -1,5 +1,7 @@
0.3 (unreleased)
----------------
+ * Fix shipping cost field nameing error
+ * Also fix an import
0.2 (2009-08-03)
----------------
=======================================
---
/getpaid.SalesforceOrderRecorder/trunk/getpaid/SalesforceOrderRecorder/content/salesforceorderrecorder.py
Mon Aug 3 12:15:53 2009
+++
/getpaid.SalesforceOrderRecorder/trunk/getpaid/SalesforceOrderRecorder/content/salesforceorderrecorder.py
Mon Aug 3 14:05:04 2009
@@ -17,6 +17,8 @@
from getpaid.core.interfaces import workflow_states, IShoppingCartUtility,
IShippableOrder, IShippingRateService, IShippableLineItem
from zope.app.component.hooks import getSite
+from ZODB.POSException import ConflictError
+
logger = logging.getLogger("SalesforceOrderRecorder")
def handleOrderWorkflowTransition( order, event ):
@@ -298,8 +300,8 @@
sfObject[props.gpsor_shipping_weight] =
getShipmentWeight(order)
if props.gpsor_shipping_cost:
- if order.getShippingCost() is not None:
- sfObject[props.gpsor_shipping_cost] = order.getShippingCost()
+ if order.shipping_cost is not None:
+ sfObject[props.gpsor_shipping_cost] = order.shipping_cost
def _mapItemFields(item, sfObject, props, parentSFObjectId=None):