svn commit: r1407627 - in /ofbiz/branches/release12.04: ./ applications/accounting/src/or
Locked
svn commit: r1407627 - in /ofbiz/branches/release12.04: ./ applications/accounting/src/or
 
|
Author: jleroux
Date: Fri Nov 9 20:57:38 2012 New Revision: 1407627 URL: http://svn.apache.org/viewvc?rev=1407627&view=rev Log: Reverts r1407117 + 1407143 which were introduced for https://issues.apache.org/jira/browse/OFBIZ-3883. I will rather commit John's more cautious patch in branches Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/branches/release12.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java ofbiz/branches/release12.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java ofbiz/branches/release12.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ Reverse-merged /ofbiz/trunk:r1407116,1407142 Modified: ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original) +++ ofbiz/branches/release12.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Fri Nov 9 20:57:38 2012 @@ -246,8 +246,8 @@ public class PayPalServices { if (estimate == null || estimate.compareTo(BigDecimal.ZERO) < 0) { continue; } - cart.setAllShipmentMethodTypeId(shipMethod.getString("shipmentMethodTypeId")); - cart.setAllCarrierPartyId(shipMethod.getString("partyId")); + cart.setShipmentMethodTypeId(shipMethod.getString("shipmentMethodTypeId")); + cart.setCarrierPartyId(shipMethod.getString("partyId")); try { coh.calcAndAddTax(); } catch (GeneralException e) { @@ -594,18 +594,18 @@ public class PayPalServices { // that was shown to the customer String shipMethod = decoder.get("SHIPPINGOPTIONNAME"); if ("Calculated Offline".equals(shipMethod)) { - cart.setAllCarrierPartyId("_NA_"); - cart.setAllShipmentMethodTypeId("NO_SHIPPING"); + cart.setCarrierPartyId("_NA_"); + cart.setShipmentMethodTypeId("NO_SHIPPING"); } else { String[] shipMethodSplit = shipMethod.split(" - "); - cart.setAllCarrierPartyId(shipMethodSplit[0]); + cart.setCarrierPartyId(shipMethodSplit[0]); String shippingMethodTypeDesc = StringUtils.join(shipMethodSplit, " - ", 1, shipMethodSplit.length); try { EntityCondition cond = EntityCondition.makeCondition( UtilMisc.toMap("productStoreId", cart.getProductStoreId(), "partyId", shipMethodSplit[0], "roleTypeId", "CARRIER", "description", shippingMethodTypeDesc) ); GenericValue shipmentMethod = EntityUtil.getFirst(delegator.findList("ProductStoreShipmentMethView", cond, null, null, null, false)); - cart.setAllShipmentMethodTypeId(shipmentMethod.getString("shipmentMethodTypeId")); + cart.setShipmentMethodTypeId(shipmentMethod.getString("shipmentMethodTypeId")); } catch (GenericEntityException e1) { Debug.logError(e1, module); } @@ -619,7 +619,7 @@ public class PayPalServices { } } cart.cleanUpShipGroups(); - cart.setAllShippingContactMechId(postalContactId); + cart.setShippingContactMechId(postalContactId); Map<String, Object> result = ShippingEvents.getShipGroupEstimate(dispatcher, delegator, cart, 0); if (result.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_ERROR)) { return ServiceUtil.returnError((String) result.get(ModelService.ERROR_MESSAGE)); Modified: ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml (original) +++ ofbiz/branches/release12.04/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml Fri Nov 9 20:57:38 2012 @@ -194,31 +194,31 @@ under the License. <!-- Shopping Cart Set ShippingContactMechId--> <set field="contactMechId" value="9015"/> - <call-object-method method-name="setAllShippingContactMechId" obj-field="shoppingCart"> + <call-object-method method-name="setShippingContactMechId" obj-field="shoppingCart"> <field field="contactMechId" type="String"/> </call-object-method> <!-- Shopping Cart Set Method Type ID--> <set field="shipmentMethodTypeId" value="NEXT_DAY" type="String"/> - <call-object-method method-name="setAllShipmentMethodTypeId" obj-field="shoppingCart"> + <call-object-method method-name="setShipmentMethodTypeId" obj-field="shoppingCart"> <field field="shipmentMethodTypeId" type="String"/> </call-object-method> <!-- Shopping Cart Set Carrier Party ID--> <set field="carrierPartyId" value="UPS" type="String"/> - <call-object-method method-name="setAllCarrierPartyId" obj-field="shoppingCart"> + <call-object-method method-name="setCarrierPartyId" obj-field="shoppingCart"> <field field="carrierPartyId" type="String"/> </call-object-method> <!-- Shopping Cart Set Is Gift--> <set field="isGift" value="false" type="Boolean"/> - <call-object-method method-name="setAllIsGift" obj-field="shoppingCart"> + <call-object-method method-name="setIsGift" obj-field="shoppingCart"> <field field="isGift" type="Boolean"/> </call-object-method> <!-- Shopping Cart Set May Split--> <set field="maySplit" value="false" type="Boolean"/> - <call-object-method method-name="setAllMaySplit" obj-field="shoppingCart"> + <call-object-method method-name="setMaySplit" obj-field="shoppingCart"> <field field="maySplit" type="Boolean"/> </call-object-method> Modified: ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Nov 9 20:57:38 2012 @@ -4864,7 +4864,7 @@ public class OrderServices { // set checkout options cart.setDefaultCheckoutOptions(dispatcher); // the shipping address is the one of the customer - cart.setAllShippingContactMechId(shipGroup.getString("contactMechId")); + cart.setShippingContactMechId(shipGroup.getString("contactMechId")); // associate ship groups of sales and purchase orders ShoppingCart.CartShipInfo cartShipInfo = cart.getShipGroups().get(0); cartShipInfo.setAssociatedShipGroupSeqId(shipGroup.getString("shipGroupSeqId")); Modified: ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Fri Nov 9 20:57:38 2012 @@ -234,8 +234,8 @@ public class CheckOutEvents { // if no shipping applies, set the no shipment method and skip to payment if (!cart.shippingApplies()) { - cart.setAllShipmentMethodTypeId("NO_SHIPPING"); - cart.setAllCarrierPartyId("_NA_"); + cart.setShipmentMethodTypeId("NO_SHIPPING"); + cart.setCarrierPartyId("_NA_"); page = "payment"; } @@ -273,7 +273,7 @@ public class CheckOutEvents { ShoppingCart cart = (ShoppingCart) request.getSession().getAttribute("shoppingCart"); String shipToCustomerPartyId = request.getParameter("shipToCustomerPartyId"); cart.setShipToCustomerPartyId(shipToCustomerPartyId); - cart.setAllShippingContactMechId(null); + cart.setShippingContactMechId(null); return "success"; } Modified: ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Fri Nov 9 20:57:38 2012 @@ -115,7 +115,7 @@ public class CheckOutHelper { // set the shipping address if (UtilValidate.isNotEmpty(shippingContactMechId)) { - this.cart.setAllShippingContactMechId(shippingContactMechId); + this.cart.setShippingContactMechId(shippingContactMechId); } else if (cart.shippingApplies()) { // only return an error if shipping is required for this purchase errMsg = UtilProperties.getMessage(resource_error,"checkhelper.select_shipping_destination", (cart != null ? cart.getLocale() : Locale.getDefault())); @@ -166,8 +166,8 @@ public class CheckOutHelper { carrierPartyId = shippingMethod.substring(delimiterPos + 1); } - this.cart.setAllShipmentMethodTypeId(shipmentMethodTypeId); - this.cart.setAllCarrierPartyId(carrierPartyId); + this.cart.setShipmentMethodTypeId(shipmentMethodTypeId); + this.cart.setCarrierPartyId(carrierPartyId); } else if (cart.shippingApplies()) { // only return an error if shipping is required for this purchase errMsg = UtilProperties.getMessage(resource_error,"checkhelper.select_shipping_method", (cart != null ? cart.getLocale() : Locale.getDefault())); @@ -175,20 +175,20 @@ public class CheckOutHelper { } // set the shipping instructions - this.cart.setAllShippingInstructions(shippingInstructions); + this.cart.setShippingInstructions(shippingInstructions); if (UtilValidate.isNotEmpty(maySplit)) { - cart.setAllMaySplit(Boolean.valueOf(maySplit)); + cart.setMaySplit(Boolean.valueOf(maySplit)); } else { errMsg = UtilProperties.getMessage(resource_error,"checkhelper.select_splitting_preference", (cart != null ? cart.getLocale() : Locale.getDefault())); errorMessages.add(errMsg); } // set the gift message - this.cart.setAllGiftMessage(giftMessage); + this.cart.setGiftMessage(giftMessage); if (UtilValidate.isNotEmpty(isGift)) { - cart.setAllIsGift(Boolean.valueOf(isGift)); + cart.setIsGift(Boolean.valueOf(isGift)); } else { errMsg = UtilProperties.getMessage(resource_error, "checkhelper.specify_if_order_is_gift", (cart != null ? cart.getLocale() : Locale.getDefault())); errorMessages.add(errMsg); Modified: ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Fri Nov 9 20:57:38 2012 @@ -18,39 +18,10 @@ *******************************************************************************/ package org.ofbiz.order.shoppingcart; -import java.io.Serializable; -import java.math.BigDecimal; -import java.math.MathContext; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; - import javolution.util.FastList; import javolution.util.FastMap; -import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.GeneralException; -import org.ofbiz.base.util.GeneralRuntimeException; -import org.ofbiz.base.util.UtilDateTime; -import org.ofbiz.base.util.UtilFormatOut; -import org.ofbiz.base.util.UtilGenerics; -import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilNumber; -import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.base.util.*; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.DelegatorFactory; import org.ofbiz.entity.GenericEntityException; @@ -75,6 +46,13 @@ import org.ofbiz.product.store.ProductSt import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.MathContext; +import java.sql.Timestamp; +import java.util.*; +import java.util.Map.Entry; + /** * Shopping Cart Object */ @@ -2239,19 +2217,11 @@ public class ShoppingCart implements Ite } csi.setContactMechId(shippingContactMechId); } - - /** - * Sets @param shippingContactMechId in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param shippingContactMechId - */ - public void setAllShippingContactMechId(String shippingContactMechId) { - for(int x=0; x < shipInfo.size(); x++) { - this.setShippingContactMechId(x, shippingContactMechId); - } + + public void setShippingContactMechId(String shippingContactMechId) { + this.setShippingContactMechId(0, shippingContactMechId); } - + /** Returns the shipping contact mech id. */ public String getShippingContactMechId(int idx) { CartShipInfo csi = this.getShipInfo(idx); @@ -2267,19 +2237,11 @@ public class ShoppingCart implements Ite CartShipInfo csi = this.getShipInfo(idx); csi.shipmentMethodTypeId = shipmentMethodTypeId; } - - /** - * Sets @param shipmentMethodTypeId in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param shipmentMethodTypeId - */ - public void setAllShipmentMethodTypeId(String shipmentMethodTypeId) { - for(int x=0; x < shipInfo.size(); x++) { - this.setShipmentMethodTypeId(x, shipmentMethodTypeId); - } + + public void setShipmentMethodTypeId(String shipmentMethodTypeId) { + this.setShipmentMethodTypeId(0, shipmentMethodTypeId); } - + /** Returns the shipment method type ID */ public String getShipmentMethodTypeId(int idx) { CartShipInfo csi = this.getShipInfo(idx); @@ -2323,17 +2285,9 @@ public class ShoppingCart implements Ite CartShipInfo csi = this.getShipInfo(idx); csi.shippingInstructions = shippingInstructions; } - - /** - * Sets @param shippingInstructions in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param shippingInstructions - */ - public void setAllShippingInstructions(String shippingInstructions) { - for(int x=0; x < shipInfo.size(); x++) { - this.setShippingInstructions(x, shippingInstructions); - } + + public void setShippingInstructions(String shippingInstructions) { + this.setShippingInstructions(0, shippingInstructions); } /** Returns the shipping instructions. */ @@ -2352,19 +2306,10 @@ public class ShoppingCart implements Ite csi.setMaySplit(maySplit); } } - - /** - * Sets @param maySplit in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param maySplit - */ - public void setAllMaySplit(Boolean maySplit) { - for(int x=0; x < shipInfo.size(); x++) { - this.setMaySplit(x, maySplit); - } + + public void setMaySplit(Boolean maySplit) { + this.setMaySplit(0, maySplit); } - /** Returns Boolean.TRUE if the order may be split (null if unspecified) */ public String getMaySplit(int idx) { @@ -2381,18 +2326,10 @@ public class ShoppingCart implements Ite csi.giftMessage = giftMessage; } - /** - * Sets @param giftMessage in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param giftMessage - */ - public void setAllGiftMessage(String giftMessage) { - for(int x=0; x < shipInfo.size(); x++) { - this.setGiftMessage(x, giftMessage); - } + public void setGiftMessage(String giftMessage) { + this.setGiftMessage(0, giftMessage); } - + public String getGiftMessage(int idx) { CartShipInfo csi = this.getShipInfo(idx); return csi.giftMessage; @@ -2409,18 +2346,10 @@ public class ShoppingCart implements Ite } } - /** - * Sets @param isGift in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param isGift - */ - public void setAllIsGift(Boolean isGift) { - for(int x=0; x < shipInfo.size(); x++) { - this.setIsGift(x, isGift); - } + public void setIsGift(Boolean isGift) { + this.setIsGift(0, isGift); } - + public String getIsGift(int idx) { CartShipInfo csi = this.getShipInfo(idx); return csi.isGift; @@ -2434,19 +2363,11 @@ public class ShoppingCart implements Ite CartShipInfo csi = this.getShipInfo(idx); csi.carrierPartyId = carrierPartyId; } - - /** - * Sets @param carrierPartyId in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param carrierPartyId - */ - public void setAllCarrierPartyId(String carrierPartyId) { - for(int x=0; x < shipInfo.size(); x++) { - this.setCarrierPartyId(x, carrierPartyId); - } + + public void setCarrierPartyId(String carrierPartyId) { + this.setCarrierPartyId(0, carrierPartyId); } - + public String getCarrierPartyId(int idx) { CartShipInfo csi = this.getShipInfo(idx); return csi.carrierPartyId; @@ -2469,17 +2390,9 @@ public class ShoppingCart implements Ite CartShipInfo csi = this.getShipInfo(idx); csi.productStoreShipMethId = productStoreShipMethId; } - - /** - * Sets @param productStoreShipMethId in all ShipInfo(ShipGroups) associated - * with this ShoppingCart - * <p> - * @param productStoreShipMethId - */ - public void setAllProductStoreShipMethId(String productStoreShipMethId) { - for(int x=0; x < shipInfo.size(); x++) { - this.setProductStoreShipMethId(x, productStoreShipMethId); - } + + public void setProductStoreShipMethId(String productStoreShipMethId) { + this.setProductStoreShipMethId(0, productStoreShipMethId); } public void setShipGroupFacilityId(int idx, String facilityId) { @@ -2577,7 +2490,7 @@ public class ShoppingCart implements Ite Collection<GenericValue> shippingContactMechList = ContactHelper.getContactMech(orderParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); if (UtilValidate.isNotEmpty(shippingContactMechList)) { GenericValue shippingContactMech = (shippingContactMechList.iterator()).next(); - this.setAllShippingContactMechId(shippingContactMech.getString("contactMechId")); + this.setShippingContactMechId(shippingContactMech.getString("contactMechId")); } } catch (GenericEntityException e) { Debug.logError(e, "Error setting shippingContactMechId in setDefaultCheckoutOptions() method.", module); @@ -2587,8 +2500,8 @@ public class ShoppingCart implements Ite ShippingEstimateWrapper shipEstimateWrapper = org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper.getWrapper(dispatcher, this, 0); GenericValue carrierShipmentMethod = EntityUtil.getFirst(shipEstimateWrapper.getShippingMethods()); if (carrierShipmentMethod != null) { - this.setAllShipmentMethodTypeId(carrierShipmentMethod.getString("shipmentMethodTypeId")); - this.setAllCarrierPartyId(carrierShipmentMethod.getString("partyId")); + this.setShipmentMethodTypeId(carrierShipmentMethod.getString("shipmentMethodTypeId")); + this.setCarrierPartyId(carrierShipmentMethod.getString("partyId")); } } else { // checkout options for purchase orders @@ -2608,12 +2521,12 @@ public class ShoppingCart implements Ite } } // shipping options - this.setAllShipmentMethodTypeId("NO_SHIPPING"); - this.setAllCarrierPartyId("_NA_"); - this.setAllShippingInstructions(""); - this.setAllGiftMessage(""); - this.setAllMaySplit(Boolean.TRUE); - this.setAllIsGift(Boolean.FALSE); + this.setShipmentMethodTypeId(0, "NO_SHIPPING"); + this.setCarrierPartyId(0, "_NA_"); + this.setShippingInstructions(0, ""); + this.setGiftMessage(0, ""); + this.setMaySplit(0, Boolean.TRUE); + this.setIsGift(0, Boolean.FALSE); //this.setInternalCode(internalCode); } } Modified: ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original) +++ ofbiz/branches/release12.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Fri Nov 9 20:57:38 2012 @@ -20,9 +20,9 @@ package org.ofbiz.order.shoppinglist; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.Date; import java.util.Map; import javolution.util.FastMap; @@ -515,13 +515,13 @@ public class ShoppingListServices { listCart.addPayment(shoppingList.getString("paymentMethodId")); } if (UtilValidate.isNotEmpty(shoppingList.get("contactMechId"))) { - listCart.setAllShippingContactMechId(shoppingList.getString("contactMechId")); + listCart.setShippingContactMechId(0, shoppingList.getString("contactMechId")); } if (UtilValidate.isNotEmpty(shoppingList.get("shipmentMethodTypeId"))) { - listCart.setAllShipmentMethodTypeId(shoppingList.getString("shipmentMethodTypeId")); + listCart.setShipmentMethodTypeId(0, shoppingList.getString("shipmentMethodTypeId")); } if (UtilValidate.isNotEmpty(shoppingList.get("carrierPartyId"))) { - listCart.setAllCarrierPartyId(shoppingList.getString("carrierPartyId")); + listCart.setCarrierPartyId(0, shoppingList.getString("carrierPartyId")); } if (UtilValidate.isNotEmpty(shoppingList.getString("productPromoCodeId"))) { listCart.addProductPromoCode(shoppingList.getString("productPromoCodeId"), dispatcher); Modified: ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Fri Nov 9 20:57:38 2012 @@ -187,8 +187,8 @@ public class EbayHelper { } catch (GenericEntityException e) { Debug.logInfo("Unable to find EbayShippingMethod", module); } - cart.setAllCarrierPartyId(partyId); - cart.setAllShipmentMethodTypeId(shipmentMethodTypeId); + cart.setCarrierPartyId(partyId); + cart.setShipmentMethodTypeId(shipmentMethodTypeId); } public static boolean createPaymentFromPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, Modified: ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Fri Nov 9 20:57:38 2012 @@ -1201,8 +1201,8 @@ public class EbayOrderServices { cart.setEndUserCustomerPartyId(partyId); Debug.logInfo("Setting contact mech in cart: " + contactMechId, module); - cart.setAllShippingContactMechId(contactMechId); - cart.setAllMaySplit(Boolean.FALSE); + cart.setShippingContactMechId(contactMechId); + cart.setMaySplit(Boolean.FALSE); Debug.logInfo("Setting shipment method: " + (String) shippingServiceSelectedCtx.get("shippingService"), module); EbayHelper.setShipmentMethodType(cart, (String) shippingServiceSelectedCtx.get("shippingService"), productStoreId, delegator); Modified: ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original) +++ ofbiz/branches/release12.04/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Fri Nov 9 20:57:38 2012 @@ -781,8 +781,8 @@ public class ImportOrdersFromEbay { cart.setEndUserCustomerPartyId(partyId); Debug.logInfo("Setting contact mech in cart: " + contactMechId, module); - cart.setAllShippingContactMechId(contactMechId); - cart.setAllMaySplit(Boolean.FALSE); + cart.setShippingContactMechId(contactMechId); + cart.setMaySplit(Boolean.FALSE); Debug.logInfo("Setting shipment method: " + (String) parameters.get("shippingService"), module); EbayHelper.setShipmentMethodType(cart, (String) parameters.get("shippingService"), productStoreId, delegator); Modified: ofbiz/branches/release12.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (original) +++ ofbiz/branches/release12.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Fri Nov 9 20:57:38 2012 @@ -265,8 +265,8 @@ public class EbayStoreOrder { cart.setEndUserCustomerPartyId(partyId); Debug.logInfo("Setting contact mech in cart: " + contactMechId, module); - cart.setAllShippingContactMechId(contactMechId); - cart.setAllMaySplit(Boolean.FALSE); + cart.setShippingContactMechId(contactMechId); + cart.setMaySplit(Boolean.FALSE); Debug.logInfo("Setting shipment method: " + context.get("shippingService").toString(), module); EbayHelper.setShipmentMethodType(cart, context.get("shippingService").toString(), productStoreId, delegator); @@ -499,8 +499,8 @@ public class EbayStoreOrder { cart.setEndUserCustomerPartyId(partyId); Debug.logInfo("Setting contact mech in cart: " + contactMechId, module); - cart.setAllShippingContactMechId(contactMechId); - cart.setAllMaySplit(Boolean.FALSE); + cart.setShippingContactMechId(contactMechId); + cart.setMaySplit(Boolean.FALSE); Debug.logInfo("Setting shipment method: " + (String) shippingServiceSelectedCtx.get("shippingService"), module); EbayHelper.setShipmentMethodType(cart, (String) shippingServiceSelectedCtx.get("shippingService"), productStoreId, delegator); Modified: ofbiz/branches/release12.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original) +++ ofbiz/branches/release12.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Fri Nov 9 20:57:38 2012 @@ -279,7 +279,7 @@ public class GoogleCheckoutHelper { cart.setOrderPartyId(partyInfo[0]); cart.setPlacingCustomerPartyId(partyInfo[0]); - cart.setAllShippingContactMechId(partyInfo[1]); + cart.setShippingContactMechId(partyInfo[1]); // contact info String shippingEmail = shippingAddress.getEmail(); @@ -418,10 +418,10 @@ public class GoogleCheckoutHelper { String carrierPartyId = googleShipping.getString("carrierPartyId"); Boolean maySplit = Boolean.FALSE; - cart.setAllShipmentMethodTypeId(shipmentMethodTypeId); - cart.setAllCarrierPartyId(carrierPartyId); - cart.setAllMaySplit(maySplit); - cart.setAllShippingContactMechId(shipContactMechId); + cart.setShipmentMethodTypeId(shipmentMethodTypeId); + cart.setCarrierPartyId(carrierPartyId); + cart.setMaySplit(maySplit); + cart.setShippingContactMechId(shipContactMechId); } else { Debug.logWarning("No valid fulfillment method found! No shipping info set!", module); } Modified: ofbiz/branches/release12.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1407627&r1=1407626&r2=1407627&view=diff ============================================================================== --- ofbiz/branches/release12.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/branches/release12.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Nov 9 20:57:38 2012 @@ -819,8 +819,8 @@ public class PosTransaction implements S // attach the party ID to the cart cart.setOrderPartyId(partyId); // Set the shipping type - cart.setAllShipmentMethodTypeId("NO_SHIPPING"); - // cart.setAllCarrierPartyId(); + cart.setShipmentMethodTypeId("NO_SHIPPING"); + // cart.setCarrierPartyId(); // validate payment methods output.print(UtilProperties.getMessage(resource, "PosValidating", locale)); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |