svn commit: r535589 - in /ofbiz/trunk: applications/ecommerce/data/ applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/order/webapp/ordermgr/WEB-INF/actions/entry/ applicatio...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r535589 - in /ofbiz/trunk: applications/ecommerce/data/ applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/order/webapp/ordermgr/WEB-INF/actions/entry/ applicatio...

hansbak-2
Author: hansbak
Date: Sun May  6 02:37:10 2007
New Revision: 535589

URL: http://svn.apache.org/viewvc?view=rev&rev=535589
Log:
make dropshipment orders in the ecommerce frontend work which will create purchase orders for the different suppliers to be dropshipped. Also added some demo data and login Id's so the dropshippers can see the purchase orders sent to them. contribution from my employee Wisut.

Added:
    ofbiz/trunk/framework/images/webapp/images/products/large/dropShip1.jpg   (with props)
    ofbiz/trunk/framework/images/webapp/images/products/medium/
    ofbiz/trunk/framework/images/webapp/images/products/medium/dropShip1.jpg   (with props)
    ofbiz/trunk/framework/images/webapp/images/products/small/dropShip1.jpg   (with props)
Modified:
    ofbiz/trunk/applications/ecommerce/data/DemoPurchasing.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl

Modified: ofbiz/trunk/applications/ecommerce/data/DemoPurchasing.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoPurchasing.xml?view=diff&rev=535589&r1=535588&r2=535589
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoPurchasing.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoPurchasing.xml Sun May  6 02:37:10 2007
@@ -29,17 +29,20 @@
     <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
     <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
     <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
+    <UserLogin userLoginId="DemoSupplier" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="DemoSupplier" />
+    
     
     <Party partyId="BigSupplier" partyTypeId="PARTY_GROUP" supplierProductName="" supplierProductId=""/>
     <PartyGroup partyId="BigSupplier" groupName="Big Supplier" supplierProductName="" supplierProductId=""/>
     <PartyRole partyId="BigSupplier" roleTypeId="SUPPLIER" supplierProductName="" supplierProductId=""/>
     <ContactMech contactMechId="9002" contactMechTypeId="POSTAL_ADDRESS"/>
     <PartyContactMech partyId="BigSupplier" contactMechId="9002" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
-    <PostalAddress contactMechId="9002" toName="Big Supplier Company" address1="2005 Industrial Park Blvd" city="City of Industry" postalCode="90000" countryGeoId="USA" stateProvinceGeoId="CA"/>
+    <PostalAddress contactMechId="9002" toName="Big Supplier Company" address1="2005 Industrial Park Blvd" city="New York" postalCode="10000" countryGeoId="USA" stateProvinceGeoId="NY"/>
     <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
     <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
     <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
-
+    <UserLogin userLoginId="BigSupplier" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="BigSupplier" />
+    
     <Party partyId="EuroSupplier" partyTypeId="PARTY_GROUP" supplierProductName="" supplierProductId=""/>
     <PartyGroup partyId="EuroSupplier" groupName="European Supplier" supplierProductName="" supplierProductId=""/>
     <PartyRole partyId="EuroSupplier" roleTypeId="SUPPLIER" supplierProductName="" supplierProductId=""/>
@@ -49,7 +52,8 @@
     <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
     <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
     <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
-
+    <UserLogin userLoginId="EuroSupplier" currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="EuroSupplier" />
+    
     <!-- supplier pricing -->
     <SupplierProduct partyId="DemoSupplier" supplierPrefOrderId="10_MAIN_SUPPL" minimumOrderQuantity="0" currencyUomId="USD" productId="GZ-1000" lastPrice="7.5" supplierProductId="GZ-1000-0" availableFromDate="2005-01-01 00:00:00.000"/>
     <SupplierProduct partyId="DemoSupplier" supplierPrefOrderId="10_MAIN_SUPPL" minimumOrderQuantity="0" currencyUomId="USD" productId="GZ-1001" lastPrice="12.99" supplierProductId="GZ-1001-0" availableFromDate="2005-01-01 00:00:00.000"/>
@@ -209,4 +213,26 @@
     <Agreement agreementId="1002" partyIdFrom="Company" partyIdTo="EuroSupplier" roleTypeIdTo="SUPPLIER" agreementTypeId="PURCHASE_AGREEMENT" description="Purchasing Agreement with EuroSupplier-New York"/>
     <AgreementItem agreementId="1002" agreementItemSeqId="0001" currencyUomId="USD" agreementItemTypeId="AGREEMENT_PRICING_PR" agreementText="Price list in US Dollars"/>
     <AgreementTerm agreementTermId="1210" termTypeId="FIN_PAYMENT_TERM" agreementId="1002" termDays="30"/>
+    
+    <!-- Drop ship products -->
+    <ProductCategory description="DropShip Products" primaryParentCategoryId="CATALOG1" productCategoryId="dropShip" productCategoryTypeId="CATALOG_CATEGORY"/>
+    <ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="CATALOG1" productCategoryId="dropShip"/>
+
+    <Product productId="dropShip1" productTypeId="FINISHED_GOOD" internalName="DropShip from DemoSupplier" productName="DropShip from DemoSupplier" smallImageUrl="/images/products/small/dropShip1.jpg" mediumImageUrl="/images/products/medium/dropShip1.jpg" largeImageUrl="/images/products/large/dropShip1.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_DS" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" lastModifiedDate="2007-05-05 15:05:41.62" lastModifiedByUserLogin="admin" inShippingBox="N" lastUpdatedStamp="2007-05-06 15:02:03.466" lastUpdatedTxStamp="2007-05-06 15:02:02.465" createdStamp="2007-05-05 14:50:58.586" createdTxStamp="2007-05-05 14:50:58.21"/>  
+    <ProductCategoryMember productCategoryId="dropShip" productId="dropShip1" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/>
+    <ProductPrice productId="dropShip1" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="13.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+    <SupplierProduct productId="dropShip1" partyId="DemoSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="10.0" currencyUomId="USD" supplierProductName="Drop ship product from demo supplier" supplierProductId="dropShip1-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/>
+
+    <Product productId="dropShip2" productTypeId="FINISHED_GOOD" internalName="DropShip from BigSupplier" productName="DropShip from BigSupplier" smallImageUrl="/images/products/small/dropShip1.jpg" mediumImageUrl="/images/products/medium/dropShip1.jpg" largeImageUrl="/images/products/large/dropShip1.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_DS" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" lastModifiedDate="2007-05-05 15:05:41.62" lastModifiedByUserLogin="admin" inShippingBox="N" lastUpdatedStamp="2007-05-06 15:02:03.466" lastUpdatedTxStamp="2007-05-06 15:02:02.465" createdStamp="2007-05-05 14:50:58.586" createdTxStamp="2007-05-05 14:50:58.21"/>  
+    <ProductCategoryMember productCategoryId="dropShip" productId="dropShip2" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/>
+    <ProductPrice productId="dropShip2" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="15.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+    <SupplierProduct productId="dropShip2" partyId="BigSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="12.0" currencyUomId="USD" supplierProductName="Drop ship product from big supplier" supplierProductId="dropShip2-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/>
+    
+    <Product productId="dropShip3" productTypeId="FINISHED_GOOD" internalName="DropShip from EuroSupplier" productName="DropShip from EuroSupplier" smallImageUrl="/images/products/small/dropShip1.jpg" mediumImageUrl="/images/products/medium/dropShip1.jpg" largeImageUrl="/images/products/large/dropShip1.jpg" isVirtual="N" isVariant="N" requirementMethodEnumId="PRODRQM_DS" billOfMaterialLevel="0" createdDate="2007-05-05 14:50:58.584" createdByUserLogin="admin" lastModifiedDate="2007-05-05 15:05:41.62" lastModifiedByUserLogin="admin" inShippingBox="N" lastUpdatedStamp="2007-05-06 15:02:03.466" lastUpdatedTxStamp="2007-05-06 15:02:02.465" createdStamp="2007-05-05 14:50:58.586" createdTxStamp="2007-05-05 14:50:58.21"/>  
+    <ProductCategoryMember productCategoryId="dropShip" productId="dropShip3" sequenceNum="1" fromDate="2001-05-13 12:00:00.0"/>
+    <ProductPrice productId="dropShip3" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="EUR" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="14.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+    <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="EUR" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/>
+    <ProductPrice productId="dropShip3" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="14.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+    <SupplierProduct productId="dropShip3" partyId="EuroSupplier" availableFromDate="2007-01-01 14:51:52.627" minimumOrderQuantity="0.0" lastPrice="11.0" currencyUomId="USD" supplierProductName="Drop ship product from Euro supplier" supplierProductId="dropShip3-DS" canDropShip="Y" supplierCommissionPerc="20.0" lastUpdatedStamp="2007-05-05 14:53:35.248" lastUpdatedTxStamp="2007-05-05 14:53:35.15" createdStamp="2007-05-05 14:53:35.248" createdTxStamp="2007-05-05 14:53:35.15"/>
+    
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh?view=diff&rev=535589&r1=535588&r2=535589
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh Sun May  6 02:37:10 2007
@@ -33,6 +33,18 @@
 context.put("orderItems", orderItems);
 
 orderAdjustments = cart.makeAllAdjustments();
+
+List orderItemShipGroupInfo = cart.makeAllShipGroupInfos();
+if (orderItemShipGroupInfo != null && orderItemShipGroupInfo.size() > 0) {
+    Iterator osiInfos = orderItemShipGroupInfo.iterator();
+    while (osiInfos.hasNext()) {
+        GenericValue valueObj = (GenericValue) osiInfos.next();
+        if ("OrderAdjustment".equals(valueObj.getEntityName())) {
+            // shipping / tax adjustment(s)
+            orderAdjustments.add(valueObj);
+        }
+    }
+}
 context.put("orderAdjustments", orderAdjustments);
 
 workEfforts = cart.makeWorkEfforts();   // if required make workefforts for rental fixed assets too.

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?view=diff&rev=535589&r1=535588&r2=535589
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Sun May  6 02:37:10 2007
@@ -80,10 +80,21 @@
         ShoppingCart cart = (ShoppingCart) session.getAttribute("shoppingCart");
         LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
         GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
-        CheckOutHelper checkOutHelper = new CheckOutHelper(dispatcher, delegator, cart);
+
         GenericValue userLogin = cart.getUserLogin();
         if (userLogin == null) userLogin = (GenericValue) session.getAttribute("userLogin");
-
+        if (curPage == null) {
+            try {
+                cart.createDropShipGroups(dispatcher);
+            } catch (CartItemModifyException e) {
+                Debug.logError(e, module);
+            }
+        }else if ("shippingoptions".equals(curPage) == true){
+            //remove empty ship group
+            cart.cleanUpShipGroups();
+        }
+        CheckOutHelper checkOutHelper = new CheckOutHelper(dispatcher, delegator, cart);
+        
         if ("shippingaddress".equals(curPage) == true) {
             // Set the shipping address options
             String shippingContactMechId = request.getParameter("shipping_contact_mech_id");
@@ -92,6 +103,18 @@
             String partyTaxId = request.getParameter("partyTaxId");
             String isExempt = request.getParameter("isExempt");
             
+            List errorMessages = new ArrayList();
+            Map errorMaps = new HashMap();
+            for (int shipGroupIndex = 0; shipGroupIndex < cart.getShipGroupSize(); shipGroupIndex++) {
+                // set the shipping method
+                if (shippingContactMechId == null) {
+                    shippingContactMechId = (String) request.getAttribute("contactMechId"); // FIXME
+                }
+                String supplierPartyId = (String) request.getAttribute(shipGroupIndex + "_supplierPartyId");
+                Map callResult = checkOutHelper.finalizeOrderEntryShip(shipGroupIndex, shippingContactMechId, supplierPartyId);
+                ServiceUtil.addErrors(errorMessages, errorMaps, callResult);
+            }
+
             // if taxAuthPartyGeoIds is not empty drop that into the database
             if (UtilValidate.isNotEmpty(taxAuthPartyGeoIds)) {
                 try {
@@ -124,13 +147,14 @@
             String giftMessage = request.getParameter("gift_message");
             String isGift = request.getParameter("is_gift");
             String internalCode = request.getParameter("internalCode");
-            String shipBeforeDate = request.getParameter("shipBeforeDate");
+            String shipBeforeDate =  request.getParameter("shipBeforeDate");
             String shipAfterDate = request.getParameter("shipAfterDate");
-            Map callResult = checkOutHelper.setCheckOutShippingOptions(shippingMethod, shippingInstructions,
-                    orderAdditionalEmails, maySplit, giftMessage, isGift, internalCode, shipBeforeDate, shipAfterDate);
-
-            ServiceUtil.getMessages(request, callResult, null);
-
+            Map callResult = ServiceUtil.returnSuccess();
+            
+            for (int shipGroupIndex = 0; shipGroupIndex < cart.getShipGroupSize(); shipGroupIndex++) {
+                callResult = checkOutHelper.finalizeOrderEntryOptions(shipGroupIndex, shippingMethod, shippingInstructions, maySplit, giftMessage, isGift, internalCode, shipBeforeDate, shipAfterDate, orderAdditionalEmails);
+                ServiceUtil.getMessages(request, callResult, null);
+            }
             if (!(callResult.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_ERROR))) {
                 // No errors so push the user onto the next page
                 curPage = "payment";

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?view=diff&rev=535589&r1=535588&r2=535589
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Sun May  6 02:37:10 2007
@@ -1308,6 +1308,11 @@
      * any error messages
      */
     public Map finalizeOrderEntryOptions(int shipGroupIndex, String shippingMethod, String shippingInstructions, String maySplit,
+            String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate, String orderAdditionalEmails) {
+        this.cart.setOrderAdditionalEmails(orderAdditionalEmails);
+        return finalizeOrderEntryOptions(shipGroupIndex, shippingMethod, shippingInstructions, maySplit, giftMessage, isGift, internalCode, shipBeforeDate, shipAfterDate);
+    }
+    public Map finalizeOrderEntryOptions(int shipGroupIndex, String shippingMethod, String shippingInstructions, String maySplit,
             String giftMessage, String isGift, String internalCode, String shipBeforeDate, String shipAfterDate) {
 
         Map result;

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh?view=diff&rev=535589&r1=535588&r2=535589
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh Sun May  6 02:37:10 2007
@@ -29,6 +29,11 @@
 party = userLogin.getRelatedOne("Party");
 productStoreId = ProductStoreWorker.getProductStoreId(request);
 
+String shippingContactMechId = request.getParameter("shipping_contact_mech_id");
+for (int shipGroupIndex = 0; shipGroupIndex < cart.getShipGroupSize(); shipGroupIndex++) {
+    supplierPartyId = cart.getSupplierPartyId(shipGroupIndex);
+    context.put(shipGroupIndex+"_supplierPartyId",supplierPartyId);
+}
 
 context.put("shoppingCart", cart);
 context.put("userLogin", userLogin);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?view=diff&rev=535589&r1=535588&r2=535589
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Sun May  6 02:37:10 2007
@@ -68,7 +68,7 @@
                   <a href="<@ofbizUrl>splitship</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitShipment}</a>
                   <a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
                   <#if (cart.getShipGroupSize() > 1)>
-                    <div class="tabletext" style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExis}</div>
+                    <div class="tabletext" style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}</div>
                   </#if>
                 </td>
               </tr>

Added: ofbiz/trunk/framework/images/webapp/images/products/large/dropShip1.jpg
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/products/large/dropShip1.jpg?view=auto&rev=535589
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/images/webapp/images/products/large/dropShip1.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: ofbiz/trunk/framework/images/webapp/images/products/medium/dropShip1.jpg
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/products/medium/dropShip1.jpg?view=auto&rev=535589
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/images/webapp/images/products/medium/dropShip1.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: ofbiz/trunk/framework/images/webapp/images/products/small/dropShip1.jpg
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/products/small/dropShip1.jpg?view=auto&rev=535589
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/images/webapp/images/products/small/dropShip1.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg