You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/08/18 09:42:37 UTC
svn commit: r1618554 [6/38] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/config/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/invoice/ applic...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Mon Aug 18 07:42:27 2014
@@ -27,16 +27,16 @@ under the License.
<#if contactInfoList?has_content >
<#assign contactInfo1 = contactInfoList[0]/>
<#assign contactInfo2 = contactInfoList[1]/>
- <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId?if_exists}" />
- <input type="hidden" name="partyId" value="${contactInfo2.partyId?if_exists}" />
+ <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId!}" />
+ <input type="hidden" name="partyId" value="${contactInfo2.partyId!}" />
- <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId?if_exists}" />
- <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId?if_exists}" />
- <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId?if_exists}" />
+ <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId!}" />
+ <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId!}" />
+ <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId!}" />
- <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId?if_exists}" />
- <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId?if_exists}" />
- <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" />
+ <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId!}" />
+ <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId!}" />
+ <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId!}" />
<table >
<tr>
@@ -47,14 +47,14 @@ under the License.
</tr>
<tr>
<td width="20%">${uiLabelMap.PartyFirstName}</td>
- <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
- <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
+ <td width="30%"><h3>${contactInfo1.firstName!}</h3></td>
+ <td width="30%"><h3>${contactInfo2.firstName!}</h3></td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%">${uiLabelMap.PartyLastName}</td>
- <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
- <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
+ <td width="30%"><h3>${contactInfo1.lastName!}</h3></td>
+ <td width="30%"><h3>${contactInfo2.lastName!}</h3></td>
<td width="20%"></td>
</tr>
<tr>
@@ -63,65 +63,65 @@ under the License.
</tr>
<tr>
<td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
- <td width="30%">${contactInfo1.address1?if_exists}</td>
- <td width="30%">${contactInfo2.address1?if_exists}</td>
+ <td width="30%">${contactInfo1.address1!}</td>
+ <td width="30%">${contactInfo2.address1!}</td>
<td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td>
</tr>
<tr>
<td width="20%" >${uiLabelMap.PartyAddressLine2}</td>
- <td width="30%">${contactInfo1.address2?if_exists}</td>
- <td width="30%">${contactInfo2.address2?if_exists}</td>
+ <td width="30%">${contactInfo1.address2!}</td>
+ <td width="30%">${contactInfo2.address2!}</td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%" >${uiLabelMap.PartyCity}</td>
- <td width="30%">${contactInfo1.city?if_exists}</td>
- <td width="30%">${contactInfo2.city?if_exists}</td>
+ <td width="30%">${contactInfo1.city!}</td>
+ <td width="30%">${contactInfo2.city!}</td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%">${uiLabelMap.PartyState}</td>
- <td width="30%">${contactInfo1.state?if_exists}</td>
- <td width="30%">${contactInfo2.state?if_exists}</td>
+ <td width="30%">${contactInfo1.state!}</td>
+ <td width="30%">${contactInfo2.state!}</td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%">${uiLabelMap.PartyZipCode}</td>
- <td width="30%">${contactInfo1.postalCode?if_exists}</td>
- <td width="30%">${contactInfo2.postalCode?if_exists}</td>
+ <td width="30%">${contactInfo1.postalCode!}</td>
+ <td width="30%">${contactInfo2.postalCode!}</td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%" >${uiLabelMap.CommonCountry}</td>
- <td width="30%">${contactInfo1.country?if_exists}</td>
- <td width="30%">${contactInfo2.country?if_exists}</td>
+ <td width="30%">${contactInfo1.country!}</td>
+ <td width="30%">${contactInfo2.country!}</td>
<td width="20%"></td>
</tr>
<tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
<tr>
<td width="20%">${uiLabelMap.CommonCountryCode}</td>
- <td width="30%">${contactInfo1.countryCode?if_exists}</td>
- <td width="30%">${contactInfo2.countryCode?if_exists}</td>
+ <td width="30%">${contactInfo1.countryCode!}</td>
+ <td width="30%">${contactInfo2.countryCode!}</td>
<td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td>
</tr>
<tr>
<td width="20%" >${uiLabelMap.PartyAreaCode}</td>
- <td width="30%">${contactInfo1.areaCode?if_exists}</td>
- <td width="30%">${contactInfo2.areaCode?if_exists}</td>
+ <td width="30%">${contactInfo1.areaCode!}</td>
+ <td width="30%">${contactInfo2.areaCode!}</td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%" >${uiLabelMap.PartyPhoneNumber}</td>
- <td width="30%">${contactInfo1.contactNumber?if_exists}</td>
- <td width="30%">${contactInfo2.contactNumber?if_exists}</td>
+ <td width="30%">${contactInfo1.contactNumber!}</td>
+ <td width="30%">${contactInfo2.contactNumber!}</td>
<td width="20%"></td>
</tr>
<tr>
<td width="20%" >${uiLabelMap.PartyEmailAddress}</td>
- <td width="30%">${contactInfo1.primaryEmail?if_exists}</td>
- <td width="30%">${contactInfo2.primaryEmail?if_exists}</td>
+ <td width="30%">${contactInfo1.primaryEmail!}</td>
+ <td width="30%">${contactInfo2.primaryEmail!}</td>
<td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td>
</tr>
<tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml Mon Aug 18 07:42:27 2014
@@ -35,6 +35,9 @@
<value xml:lang="zh">å¿
须为éå®è®¢åéæ©ä¸ä¸ªäº§ååºéºã </value>
<value xml:lang="zh_TW">å¿
é çºé·å®è¨å®é¸æä¸åç¢ååºéªã </value>
</property>
+ <property key="OrderApproveOrderBeforeQuickDropShip">
+ <value xml:lang="en">Order must be approved before completing drop shipment.</value>
+ </property>
<property key="OrderAnAlternateGwpProductIdWasInPlaceButWasEitherNotValidOrIsNoLongerInStockForId">
<value xml:lang="de">Ein alternative Gratisbeigabe ist vorhanden, aber entweder nicht mehr gültig oder nicht mehr auf Lager : ${alternateGwpProductId}</value>
<value xml:lang="en">An alternateGwpProductId was in place, but was either not valid or is no longer in stock for ID : ${alternateGwpProductId}</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/email/default/emailprocessnotify.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/email/default/emailprocessnotify.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/email/default/emailprocessnotify.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/email/default/emailprocessnotify.ftl Mon Aug 18 07:42:27 2014
@@ -30,26 +30,26 @@ under the License.
<table width="70%">
<tr>
<td align="right"><b>Order #:</b></td>
- <td>${orderId?if_exists}</td>
+ <td>${orderId!}</td>
</tr>
<tr>
<td align="right"><b>Order Date:</b></td>
- <td>${orderDate?if_exists}</td>
+ <td>${orderDate!}</td>
</tr>
<tr>
<td colspan="2"> </td>
</tr>
<tr>
<td align="right"><b>Estimated Start Date:</b></td>
- <td>${estimatedStartDate?if_exists}</td>
+ <td>${estimatedStartDate!}</td>
</tr>
<tr>
<td align="right"><b>Actual Start Date:</b></td>
- <td>${actualStartDate?if_exists}</td>
+ <td>${actualStartDate!}</td>
</tr>
<tr>
<td align="right"><b>Current State:<b></td>
- <td>${omgStatusId?if_exists} <#--WfUtil.getOMGStatus(request.getParameter("currentStatusId"))--></td>
+ <td>${omgStatusId!} <#--WfUtil.getOMGStatus(request.getParameter("currentStatusId"))--></td>
</tr>
<tr>
<td colspan="2"> </td>
@@ -58,15 +58,15 @@ under the License.
<#list assignments as assign>
<tr>
<td align="right"><b>Assigned Party ID:</b></td>
- <td>${assign.partyId?if_exists}</td>
+ <td>${assign.partyId!}</td>
</tr>
<tr>
<td align="right"><b>Assigned Role Type:</b></td>
- <td>${assign.roleTypeId?if_exists}</td>
+ <td>${assign.roleTypeId!}</td>
</tr>
<tr>
<td align="right"><b>Assignment Status:</b></td>
- <td>${assign.statusId?if_exists}</td>
+ <td>${assign.statusId!}</td>
</tr>
</#list>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Mon Aug 18 07:42:27 2014
@@ -532,29 +532,33 @@ under the License.
<find-by-primary-key entity-name="ReturnHeader" map="lookupPKMap" value-field="returnHeader"/>
<find-by-and entity-name="ShipmentReceipt" map="lookupPKMap" list="shipmentReceipts"/>
<iterate list="shipmentReceipts" entry="receipt">
- <if-empty field="totalsMap.receipt.returnItemSeqId">
- <set field="totalsMap.receipt.returnItemSeqId" value="0" type="BigDecimal"/>
+ <if-empty field="totalsMap[receipt.returnItemSeqId]">
+ <set field="totalsMap[receipt.returnItemSeqId]" value="0" type="BigDecimal"/>
</if-empty>
- <set field="totalsMap.receipt.returnItemSeqId" value="${receipt.quantityAccepted + receipt.quantityRejected}" default-value="0" type="BigDecimal"/>
-
- <entity-one entity-name="ReturnItem" value-field="returnItem">
- <field-map field-name="returnId" from-field="receipt.returnId"/>
- <field-map field-name="returnItemSeqId" from-field="receipt.returnItemSeqId"/>
- </entity-one>
- <set field="returnItem.receivedQuantity" from-field="${totalsMap.receipt.returnItemSeqId}" type="BigDecimal"/>
- <set-service-fields service-name="updateReturnItem" map="returnItem" to-map="serviceInMap"/>
-
- <if-compare-field field="totalsMap.receipt.returnItemSeqId" to-field="returnItem.returnQuantity" operator="greater-equals" type="BigDecimal">
+ <calculate field="totalsMap[receipt.returnItemSeqId]">
+ <calcop field="totalsMap[receipt.returnItemSeqId]" operator="add">
+ <calcop field="receipt.quantityAccepted" operator="get"/>
+ <calcop field="receipt.quantityRejected" operator="get"/>
+ </calcop>
+ </calculate>
+ </iterate>
+ <get-related relation-name="ReturnItem" list="returnItems" value-field="returnHeader"/>
+ <iterate-map key="returnItemSeqId" value="value" map="totalsMap">
+ <set field="filterMap.returnItemSeqId" from-field="returnItemSeqId"/>
+ <filter-list-by-and list="returnItems" map="filterMap" to-list="items"/>
+ <first-from-list entry="item" list="items"/>
+ <set field="item.receivedQuantity" from-field="value" type="BigDecimal"/>
+ <set-service-fields service-name="updateReturnItem" map="item" to-map="serviceInMap"/>
+ <if-compare-field field="value" to-field="item.returnQuantity" operator="greater-equals" type="BigDecimal">
<!-- update the status for the item -->
<set field="serviceInMap.statusId" value="RETURN_RECEIVED"/>
- <call-service service-name="updateReturnItem" in-map-name="serviceInMap"/>
</if-compare-field>
<!-- update the returnItem with at least receivedQuantity, and also statusId if applicable -->
<call-service service-name="updateReturnItem" in-map-name="serviceInMap"/>
<clear-field field="serviceInMap"/>
- </iterate>
-
+ <clear-field field="filterMap"/>
+ </iterate-map>
<!-- check to see if all items have been received -->
<set field="allReceived" value="true"/>
<find-by-and entity-name="ReturnItem" map="lookupPKMap" list="allReturnItems"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderServices.xml Mon Aug 18 07:42:27 2014
@@ -483,8 +483,7 @@ under the License.
<if-not-empty field="partyAcctgPreference">
<get-related-one relation-name="OrderCustomMethod" value-field="partyAcctgPreference" to-value-field="customMethod"/>
<else>
- <property-to-field field="errorPartyPerf" resource="AccountingErrorUiLabels" property="AccountingPartyAcctgPreferenceNotDefine"/>
- <log level="warning" message="errorPartyPerf" />
+ <log level="warning" message="Acctg preference not defined for partyId [${parameters.partyId}]"/>
</else>
</if-not-empty>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Mon Aug 18 07:42:27 2014
@@ -33,8 +33,7 @@ under the License.
<if-not-empty field="partyAcctgPreference">
<get-related-one relation-name="QuoteCustomMethod" value-field="partyAcctgPreference" to-value-field="customMethod"/>
<else>
- <property-to-field field="errorPartyPerf" resource="AccountingErrorUiLabels" property="AccountingPartyAcctgPreferenceNotDefine"/>
- <log level="warning" message="errorPartyPerf" />
+ <log level="warning" message="Acctg preference not defined for partyId [${parameters.partyId}]"/>
</else>
</if-not-empty>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Mon Aug 18 07:42:27 2014
@@ -263,11 +263,7 @@ public class OrderReturnServices {
String xslfoAttachScreenLocation = productStoreEmail.getString("xslfoAttachScreenLocation");
sendMap.put("xslfoAttachScreenLocation", xslfoAttachScreenLocation);
- ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale);
- uiLabelMap.addBottomResourceBundle("OrderUiLabels");
- uiLabelMap.addBottomResourceBundle("CommonUiLabels");
-
- Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("returnHeader", returnHeader, "returnItems", returnItems, "returnAdjustments", returnAdjustments, "uiLabelMap", uiLabelMap, "locale", locale, "userLogin", userLogin);
+ Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("returnHeader", returnHeader, "returnItems", returnItems, "returnAdjustments", returnAdjustments, "locale", locale, "userLogin", userLogin);
sendMap.put("bodyParameters", bodyParameters);
sendMap.put("subject", productStoreEmail.getString("subject"));
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Aug 18 07:42:27 2014
@@ -3288,7 +3288,6 @@ public class OrderServices {
List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems"));
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
-
if (UtilValidate.isNotEmpty(orderItems)) {
// loop through the digital items to fulfill
for (GenericValue orderItem : orderItems) {
@@ -3307,10 +3306,13 @@ public class OrderServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
"OrderErrorCannotCheckForFulfillmentProductNotFound", locale));
}
+ List<EntityExpr> exprs = new ArrayList<EntityExpr>();
- List<GenericValue> allProductContent = product.getRelated("ProductContent", null, null, false);
+ exprs.add(EntityCondition.makeCondition("productContentTypeId", EntityOperator.IN, UtilMisc.toList("FULFILLMENT_EXTASYNC", "FULFILLMENT_EXTSYNC", "FULFILLMENT_EMAIL", "DIGITAL_DOWNLOAD")));
+ exprs.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, product.getString("productId")));
// try looking up the parent product if the product has no content and is a variant
+ List<GenericValue> allProductContent = delegator.findList("ProductContent", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, null, null, false);
if (UtilValidate.isEmpty(allProductContent) && ("Y".equals(product.getString("isVariant")))) {
GenericValue parentProduct = ProductWorker.getParentProduct(product.getString("productId"), delegator);
if (allProductContent == null) {
@@ -3331,7 +3333,6 @@ public class OrderServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
"OrderErrorCannotGetProductEntity", locale) + e.getMessage());
}
-
// now use the ProductContent to fulfill the item
if (UtilValidate.isNotEmpty(productContent)) {
for (GenericValue productContentItem : productContent) {
@@ -4071,6 +4072,7 @@ public class OrderServices {
// get the new orderItems, adjustments, shipping info, payments and order item attributes from the cart
List<Map<String, Object>> modifiedItems = FastList.newInstance();
+ List<Map<String, Object>> newItems = FastList.newInstance();
List<GenericValue> toStore = new LinkedList<GenericValue>();
List<GenericValue> toAddList = new ArrayList<GenericValue>();
toAddList.addAll(cart.makeAllAdjustments());
@@ -4221,6 +4223,12 @@ public class OrderServices {
// ignore promotion items. They are added/canceled automatically
if ("Y".equals(valueObj.getString("isPromo"))) {
+ //Fetching the new promo items and adding it to list so that we can create OrderStatus record for that items.
+ Map<String, Object> promoItem = FastMap.newInstance();
+ promoItem.put("orderId", valueObj.getString("orderId"));
+ promoItem.put("orderItemSeqId", valueObj.getString("orderItemSeqId"));
+ promoItem.put("quantity", valueObj.getBigDecimal("quantity"));
+ newItems.add(promoItem);
continue;
}
GenericValue oldOrderItem = null;
@@ -4293,6 +4301,7 @@ public class OrderServices {
appendedItem.put("quantity", valueObj.getBigDecimal("quantity"));
appendedItem.put("changeTypeEnumId", "ODR_ITM_APPEND");
modifiedItems.add(appendedItem);
+ newItems.add(appendedItem);
}
}
}
@@ -4342,6 +4351,20 @@ public class OrderServices {
}
}
+ //To create record of OrderStatus entity
+ if (UtilValidate.isNotEmpty(newItems)) {
+ for (Map<String, Object> newItem : newItems) {
+ String itemStatusId = delegator.getNextSeqId("OrderStatus");
+ GenericValue itemStatus = delegator.makeValue("OrderStatus", UtilMisc.toMap("orderStatusId", itemStatusId));
+ itemStatus.put("statusId", "ITEM_CREATED");
+ itemStatus.put("orderId", newItem.get("orderId"));
+ itemStatus.put("orderItemSeqId", newItem.get("orderItemSeqId"));
+ itemStatus.put("statusDatetime", UtilDateTime.nowTimestamp());
+ itemStatus.set("statusUserLogin", userLogin.get("userLogin"));
+ delegator.create(itemStatus);
+ }
+ }
+
// make the order item object map & the ship group assoc list
List<GenericValue> orderItemShipGroupAssoc = new LinkedList<GenericValue>();
Map<String, GenericValue> itemValuesBySeqId = new HashMap<String, GenericValue>();
@@ -5748,4 +5771,4 @@ public class OrderServices {
return ServiceUtil.returnSuccess();
}
-}
+}
\ No newline at end of file
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Mon Aug 18 07:42:27 2014
@@ -180,6 +180,65 @@ if (orderHeader) {
shipGroups = delegator.findByAnd("OrderItemShipGroup", [orderId : orderId], ["shipGroupSeqId"], false);
context.shipGroups = shipGroups;
+
+ orderItemDatas = [];
+ orderItemList.each { orderItem ->
+ BigDecimal cancelQuantity = orderItem.get("cancelQuantity");
+ BigDecimal quantity = orderItem.get("quantity");
+ if ( cancelQuantity != null ) {
+ quantityOrdered = quantity.subtract(cancelQuantity);
+ } else {
+ quantityOrdered = quantity;
+ }
+ OISGAssContents = [];
+ shipGroups.each { shipGroup ->
+ OISGAssContents.addAll(EntityUtil.filterByAnd(shipGroup.getRelated("OrderItemShipGroupAssoc"), UtilMisc.toMap("orderItemSeqId", orderItem.getString("orderItemSeqId"))));
+ }
+ BigDecimal totalQuantityPlanned = 0;
+ OISGAssContents.each { OISGAssContent ->
+ BigDecimal cancelQty = OISGAssContent.get("cancelQuantity");
+ BigDecimal qty = OISGAssContent.get("quantity");
+ if (qty != null) {
+ totalQuantityPlanned = totalQuantityPlanned.add(qty);
+ }
+ if (cancelQty != null){
+ OISGAssContent.set("quantity", qty.subtract(cancelQty));
+ } else {
+ OISGAssContent.set("quantity", qty);
+ }
+ }
+ totalQuantityToPlan = totalQuantityPlanned - quantityOrdered;
+ BigDecimal quantityNotAvailable = 0;
+ List<GenericValue> oisgirs = orderItem.getRelated("OrderItemShipGrpInvRes", null, null, false);
+ for (GenericValue oisgir : oisgirs) {
+ if (UtilValidate.isNotEmpty(oisgir.get("quantityNotAvailable"))) {
+ quantityNotAvailable = quantityNotAvailable.add(oisgir.getBigDecimal("quantityNotAvailable"));
+ }
+ }
+ orderItemData = [:];
+ orderItemData.put("orderItem", orderItem);
+ orderItemData.put("OISGAssContents", OISGAssContents);
+ orderItemData.put("product", orderItem.getRelatedOne("Product", false));
+ orderItemData.put("quantityOrdered", quantityOrdered);
+ orderItemData.put("totalQuantityPlanned", totalQuantityPlanned);
+ orderItemData.put("totalQuantityToPlan", totalQuantityToPlan);
+ orderItemData.put("quantityNotAvailable", quantityNotAvailable);
+ orderItemDatas.add(orderItemData);
+ }
+ context.put("orderItemDatas", orderItemDatas);
+
+ // create the actualDate for calendar
+ actualDateCal = Calendar.getInstance();
+ actualDateCal.setTime(new java.util.Date());
+ actualDateCal.set(Calendar.HOUR_OF_DAY, actualDateCal.getActualMinimum(Calendar.HOUR_OF_DAY));
+ actualDateCal.set(Calendar.MINUTE, actualDateCal.getActualMinimum(Calendar.MINUTE));
+ actualDateCal.set(Calendar.SECOND, actualDateCal.getActualMinimum(Calendar.SECOND));
+ actualDateCal.set(Calendar.MILLISECOND, actualDateCal.getActualMinimum(Calendar.MILLISECOND));
+ actualDateTs = new Timestamp(actualDateCal.getTimeInMillis());
+ actualDateStr = actualDateTs.toString();
+ actualDateStr = actualDateStr.substring(0, actualDateStr.indexOf('.'));
+ context.put("actualDateStr", actualDateStr);
+
// get Shipment tracking info
osisCond = EntityCondition.makeCondition([orderId : orderId], EntityOperator.AND);
osisOrder = ["shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId"];
@@ -357,45 +416,8 @@ if (orderHeader) {
context.requiredProductQuantityMap = FastMap.newInstance();
context.onOrderProductQuantityMap = FastMap.newInstance();
}
-}
-
-paramString = "";
-if (orderId) paramString += "orderId=" + orderId;
-if (workEffortId) paramString += "&workEffortId=" + workEffortId;
-if (assignPartyId) paramString += "&partyId=" + assignPartyId;
-if (assignRoleTypeId) paramString += "&roleTypeId=" + assignRoleTypeId;
-if (fromDate) paramString += "&fromDate=" + fromDate;
-context.paramString = paramString;
-
-workEffortStatus = null;
-if (workEffortId && assignPartyId && assignRoleTypeId && fromDate) {
- fields = [workEffortId : workEffortId, partyId : assignPartyId, roleTypeId : assignRoleTypeId, fromDate : fromDate];
- wepa = delegator.findOne("WorkEffortPartyAssignment", fields, false);
- if ("CAL_ACCEPTED".equals(wepa?.statusId)) {
- workEffort = delegator.findOne("WorkEffort", [workEffortId : workEffortId], false);
- workEffortStatus = workEffort.currentStatusId;
- if (workEffortStatus) {
- context.workEffortStatus = workEffortStatus;
- if (workEffortStatus.equals("WF_RUNNING") || workEffortStatus.equals("WF_SUSPENDED"))
- context.inProcess = true;
- }
-
- if (workEffort) {
- if ("true".equals(delegate) || "WF_RUNNING".equals(workEffortStatus)) {
- actFields = [packageId : workEffort.workflowPackageId, packageVersion : workEffort.workflowPackageVersion, processId : workEffort.workflowProcessId, processVersion : workEffort.workflowProcessVersion, activityId : workEffort.workflowActivityId];
- activity = delegator.findOne("WorkflowActivity", actFields, false);
- if (activity) {
- transitions = activity.getRelated("FromWorkflowTransition", null, ["-transitionId"], false);
- context.wfTransitions = transitions;
- }
- }
- }
- }
-}
-
-if (orderHeader) {
- // list to find all the POSTAL_ADDRESS for the shipment party.
+ // list to find all the POSTAL_ADDRESS for the shipment party.
orderParty = delegator.findOne("Party", [partyId : partyId], false);
shippingContactMechList = ContactHelper.getContactMech(orderParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false);
context.shippingContactMechList = shippingContactMechList;
@@ -428,9 +450,7 @@ if (orderHeader) {
context.currentCatalogName = currentCatalogName;
}
}
-}
-if (orderHeader) {
// list to find all the POSTAL_ADDRESS for the party.
orderParty = delegator.findOne("Party", [partyId : partyId], false);
postalContactMechList = ContactHelper.getContactMechByType(orderParty,"POSTAL_ADDRESS", false);
@@ -445,6 +465,41 @@ if (orderHeader) {
context.emailContactMechList = emailContactMechList;
}
+paramString = "";
+if (orderId) paramString += "orderId=" + orderId;
+if (workEffortId) paramString += "&workEffortId=" + workEffortId;
+if (assignPartyId) paramString += "&partyId=" + assignPartyId;
+if (assignRoleTypeId) paramString += "&roleTypeId=" + assignRoleTypeId;
+if (fromDate) paramString += "&fromDate=" + fromDate;
+context.paramString = paramString;
+
+workEffortStatus = null;
+if (workEffortId && assignPartyId && assignRoleTypeId && fromDate) {
+ fields = [workEffortId : workEffortId, partyId : assignPartyId, roleTypeId : assignRoleTypeId, fromDate : fromDate];
+ wepa = delegator.findOne("WorkEffortPartyAssignment", fields, false);
+
+ if ("CAL_ACCEPTED".equals(wepa?.statusId)) {
+ workEffort = delegator.findOne("WorkEffort", [workEffortId : workEffortId], false);
+ workEffortStatus = workEffort.currentStatusId;
+ if (workEffortStatus) {
+ context.workEffortStatus = workEffortStatus;
+ if (workEffortStatus.equals("WF_RUNNING") || workEffortStatus.equals("WF_SUSPENDED"))
+ context.inProcess = true;
+ }
+
+ if (workEffort) {
+ if ("true".equals(delegate) || "WF_RUNNING".equals(workEffortStatus)) {
+ actFields = [packageId : workEffort.workflowPackageId, packageVersion : workEffort.workflowPackageVersion, processId : workEffort.workflowProcessId, processVersion : workEffort.workflowProcessVersion, activityId : workEffort.workflowActivityId];
+ activity = delegator.findOne("WorkflowActivity", actFields, false);
+ if (activity) {
+ transitions = activity.getRelated("FromWorkflowTransition", null, ["-transitionId"], false);
+ context.wfTransitions = transitions;
+ }
+ }
+ }
+ }
+}
+
if (orderItems) {
orderItem = EntityUtil.getFirst(orderItems);
context.orderItem = orderItem;
@@ -453,45 +508,45 @@ if (orderItems) {
// getting online ship estimates corresponding to this Order from UPS when "Hold" button will be clicked, when user packs from weight package screen.
// This case comes when order's shipping amount is more then or less than default percentage (defined in shipment.properties) of online UPS shipping amount.
- condn = EntityCondition.makeCondition([
- EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId),
- EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "SHIPMENT_PICKED")],
- EntityOperator.AND);
- shipments = delegator.findList("Shipment", condn, null, null, null, false);
- if (shipments) {
- pickedShipmentId = EntityUtil.getFirst(shipments).shipmentId;
- shipmentRouteSegment = EntityUtil.getFirst(delegator.findList("ShipmentRouteSegment",EntityCondition.makeCondition([shipmentId : pickedShipmentId]), null, null, null, false));
- context.shipmentRouteSegmentId = shipmentRouteSegment.shipmentRouteSegmentId;
- context.pickedShipmentId = pickedShipmentId;
- if (pickedShipmentId && shipmentRouteSegment.trackingIdNumber) {
- if ("UPS" == shipmentRouteSegment.carrierPartyId && productStore) {
- resultMap = dispatcher.runSync('upsShipmentAlternateRatesEstimate', [productStoreId: productStore.productStoreId, shipmentId: pickedShipmentId]);
- shippingRates = resultMap.shippingRates;
- shippingRateList = [];
- shippingRates.each { shippingRate ->
- shippingMethodAndRate = [:];
- serviceCodes = shippingRate.keySet();
- serviceCodes.each { serviceCode ->
- carrierShipmentMethod = EntityUtil.getFirst(delegator.findByAnd("CarrierShipmentMethod", [partyId : "UPS", carrierServiceCode : serviceCode], null, false));
- shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
- rate = shippingRate.get(serviceCode);
- shipmentMethodDescription = EntityUtil.getFirst(carrierShipmentMethod.getRelated("ShipmentMethodType", null, null, false)).description;
- shippingMethodAndRate.shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
- shippingMethodAndRate.rate = rate;
- shippingMethodAndRate.shipmentMethodDescription = shipmentMethodDescription;
- shippingRateList.add(shippingMethodAndRate);
- }
- }
- context.shippingRateList = shippingRateList;
- }
+condn = EntityCondition.makeCondition([
+ EntityCondition.makeCondition("primaryOrderId", EntityOperator.EQUALS, orderId),
+ EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "SHIPMENT_PICKED")],
+ EntityOperator.AND);
+shipments = delegator.findList("Shipment", condn, null, null, null, false);
+if (shipments) {
+ pickedShipmentId = EntityUtil.getFirst(shipments).shipmentId;
+ shipmentRouteSegment = EntityUtil.getFirst(delegator.findList("ShipmentRouteSegment",EntityCondition.makeCondition([shipmentId : pickedShipmentId]), null, null, null, false));
+ context.shipmentRouteSegmentId = shipmentRouteSegment.shipmentRouteSegmentId;
+ context.pickedShipmentId = pickedShipmentId;
+ if (pickedShipmentId && shipmentRouteSegment.trackingIdNumber) {
+ if ("UPS" == shipmentRouteSegment.carrierPartyId && productStore) {
+ resultMap = dispatcher.runSync('upsShipmentAlternateRatesEstimate', [productStoreId: productStore.productStoreId, shipmentId: pickedShipmentId]);
+ shippingRates = resultMap.shippingRates;
+ shippingRateList = [];
+ shippingRates.each { shippingRate ->
+ shippingMethodAndRate = [:];
+ serviceCodes = shippingRate.keySet();
+ serviceCodes.each { serviceCode ->
+ carrierShipmentMethod = EntityUtil.getFirst(delegator.findByAnd("CarrierShipmentMethod", [partyId : "UPS", carrierServiceCode : serviceCode], null, false));
+ shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
+ rate = shippingRate.get(serviceCode);
+ shipmentMethodDescription = EntityUtil.getFirst(carrierShipmentMethod.getRelated("ShipmentMethodType", null, null, false)).description;
+ shippingMethodAndRate.shipmentMethodTypeId = carrierShipmentMethod.shipmentMethodTypeId;
+ shippingMethodAndRate.rate = rate;
+ shippingMethodAndRate.shipmentMethodDescription = shipmentMethodDescription;
+ shippingRateList.add(shippingMethodAndRate);
+ }
+ }
+ context.shippingRateList = shippingRateList;
}
}
+}
- // get orderAdjustmentId for SHIPPING_CHARGES
- orderAdjustmentId = null;
- orderAdjustments.each { orderAdjustment ->
- if(orderAdjustment.orderAdjustmentTypeId.equals("SHIPPING_CHARGES")) {
- orderAdjustmentId = orderAdjustment.orderAdjustmentId;
- }
+// get orderAdjustmentId for SHIPPING_CHARGES
+orderAdjustmentId = null;
+orderAdjustments.each { orderAdjustment ->
+ if(orderAdjustment.orderAdjustmentTypeId.equals("SHIPPING_CHARGES")) {
+ orderAdjustmentId = orderAdjustment.orderAdjustmentId;
}
- context.orderAdjustmentId = orderAdjustmentId;
+}
+context.orderAdjustmentId = orderAdjustmentId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if stepTitleId?exists>
+<#if stepTitleId??>
<#assign stepTitle = uiLabelMap.get(stepTitleId)>
</#if>
<div class="screenlet">
@@ -29,7 +29,7 @@ under the License.
<#else>
${uiLabelMap.OrderSalesOrder}
</#if>
- : ${stepTitle?if_exists}
+ : ${stepTitle!}
</li>
<#if isLastStep == "N">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/OrderEntryTabBar.ftl Mon Aug 18 07:42:27 2014
@@ -55,5 +55,6 @@ under the License.
</#if>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li>
</ul>
+ <br class="clear">
</div>
</div>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Mon Aug 18 07:42:27 2014
@@ -30,7 +30,7 @@ under the License.
<td>
<#list 1..shoppingCart.getShipGroupSize() as currIndex>
<#assign shipGroupIndex = currIndex - 1>
- <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)), false)?if_exists />
+ <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! />
<table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
@@ -65,7 +65,7 @@ under the License.
<input type="hidden" name="fromGroupIndex_o_${rowCount}" value="${shipGroupIndex}"/>
<tr>
<td>
- <div>[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()?if_exists}: ${shoppingCartItem.getDescription()?if_exists}</div>
+ <div>[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div>
</td>
<td>
<div>${shipGroupItemQuantity}</div>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SplitShip.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SplitShip.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/SplitShip.ftl Mon Aug 18 07:42:27 2014
@@ -83,7 +83,7 @@ function submitForm(form, mode, value) {
</#list>
</select>
</div>
- <#if cart.getShipmentMethodTypeId(groupIdx)?exists>
+ <#if cart.getShipmentMethodTypeId(groupIdx)??>
<#assign selectedShippingMethod = cart.getShipmentMethodTypeId(groupIdx) + "@" + cart.getCarrierPartyId(groupIdx)>
<#else>
<#assign selectedShippingMethod = "">
@@ -95,9 +95,9 @@ function submitForm(form, mode, value) {
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<option value="${shippingMethod}" <#if (shippingMethod == selectedShippingMethod)>selected="selected"</#if>>
<#if carrierShipmentMethod.partyId != "_NA_">
- ${carrierShipmentMethod.partyId?if_exists}
+ ${carrierShipmentMethod.partyId!}
</#if>
- ${carrierShipmentMethod.description?if_exists}
+ ${carrierShipmentMethod.description!}
<#if shippingEst?has_content>
-
<#if (shippingEst > -1)>
@@ -111,7 +111,7 @@ function submitForm(form, mode, value) {
</select>
<h2>${uiLabelMap.OrderSpecialInstructions}</h2>
- <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)?if_exists}</textarea>
+ <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea>
</td>
<td>
<div>
@@ -132,7 +132,7 @@ function submitForm(form, mode, value) {
</div>
<h2>${uiLabelMap.OrderGiftMessage}</h2>
- <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)?if_exists}</textarea>
+ <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea>
</td>
<td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td>
</tr>
@@ -173,19 +173,19 @@ function submitForm(form, mode, value) {
<input type="hidden" name="itemIndex" value="${cartLineIndex}"/>
<td>
<div class="tabletext">
- <#if cartLine.getProductId()?exists>
+ <#if cartLine.getProductId()??>
<#-- product item -->
<#-- start code to display a small image of the product -->
- <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)!>
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
<#if smallImageUrl?string?has_content>
<a href="<@o...@ofbizUrl>">
- <img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" />
+ <img src="<@o...@ofbizContentUrl>" class="cssImgSmall" alt="" />
</a>
</#if>
<#-- end code to display a small image of the product -->
<a href="<@o...@ofbizUrl>" class="buttontext">${cartLine.getProductId()} -
- ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists}
+ ${cartLine.getName()!}</a> : ${cartLine.getDescription()!}
<#-- display the registered ship groups and quantity -->
<#assign itemShipGroups = cart.getShipGroups(cartLine)>
@@ -205,7 +205,7 @@ function submitForm(form, mode, value) {
<#else>
<#-- this is a non-product item -->
- <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists}
+ <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!}
</#if>
</div>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl Mon Aug 18 07:42:27 2014
@@ -38,16 +38,16 @@ under the License.
<td>
<div>
<#if partyData[party].type == "person">
- ${partyData[party].firstName?if_exists}
+ ${partyData[party].firstName!}
<#else>
- ${partyData[party].groupName?if_exists}
+ ${partyData[party].groupName!}
</#if>
</div>
</td>
<td>
<div>
<#if partyData[party].type == "person">
- ${partyData[party].lastName?if_exists}
+ ${partyData[party].lastName!}
</#if>
</div>
</td>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/addrsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/addrsettings.ftl Mon Aug 18 07:42:27 2014
@@ -39,13 +39,13 @@ under the License.
<#-- postal addresses for chosen id -->
- <#if partyContactMechPurposes?exists>
+ <#if partyContactMechPurposes??>
<#list partyContactMechPurposes as partyContactMechPurpose>
<#assign shippingAddress = partyContactMechPurpose.getRelatedOne("PostalAddress", false)/>
<#-- skip non-postal addresses -->
- <#if shippingAddress.toName?exists>
+ <#if shippingAddress.toName??>
<tr>
<td valign="top" nowrap="nowrap">
<input type="radio" name="shipping_contact_mech_id" value="${partyContactMechPurpose.contactMechId}" />
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/billsettings.ftl Mon Aug 18 07:42:27 2014
@@ -21,9 +21,9 @@ under the License.
//<![CDATA[
function shipBillAddr() {
if (document.checkoutsetupform.useShipAddr.checked) {
- window.location = "<@o...@ofbizUrl>";
+ window.location = "<@o...@ofbizUrl>";
} else {
- window.location = "<@o...@ofbizUrl>";
+ window.location = "<@o...@ofbizUrl>";
}
}
@@ -36,7 +36,7 @@ function makeExpDate() {
<#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)>
<div class="screenlet">
<div class="screenlet-body">
- <#if request.getAttribute("paymentMethodId")?exists || ( (paymentMethodList?has_content || billingAccountList?has_content) && !requestParameters.createNew?exists)>
+ <#if request.getAttribute("paymentMethodId")?? || ( (paymentMethodList?has_content || billingAccountList?has_content) && !requestParameters.createNew??)>
<#-- initial screen when we have a associated party -->
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
<input type="hidden" name="finalizeMode" value="payment"/>
@@ -54,7 +54,7 @@ function makeExpDate() {
<option value=""></option>
<#list billingAccountList as billingAccount>
<#assign availableAmount = billingAccount.accountBalance?double>
- <#if (billingAccount.accountLimit)?exists>
+ <#if (billingAccount.accountLimit)??>
<#assign accountLimit = billingAccount.accountLimit?double />
<#else>
<#assign accountLimit = 0.00 />
@@ -81,7 +81,7 @@ function makeExpDate() {
</#if>
<tr>
<td width="1%">
- <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
+ <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
</td>
<td colspan="2" width="50%">
<label for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
@@ -90,7 +90,7 @@ function makeExpDate() {
<tr><td colspan="3"><hr /></td></tr>
<tr>
<td width="1%">
- <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
+ <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
</td>
<td colspan="2" width="50%">
<label for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label>
@@ -103,7 +103,7 @@ function makeExpDate() {
<#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
<tr>
<td width="1%">
- <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
<label for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}">
@@ -120,11 +120,11 @@ function makeExpDate() {
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<tr>
<td width="1%">
- <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
+ <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
<label for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}">
- EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}
+ EFT: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
</label>
</td>
@@ -138,14 +138,14 @@ function makeExpDate() {
</#if>
</table>
</form>
- <#elseif paymentMethodType?exists || finalizeMode?default("") == "payment">
+ <#elseif paymentMethodType?? || finalizeMode?default("") == "payment">
<#-- after initial screen; show detailed screens for selected type -->
<#if paymentMethodType == "CC">
<#if postalAddress?has_content>
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
- <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId?if_exists}"/>
- <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
- <#elseif requestParameters.useShipAddr?exists>
+ <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/>
+ <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/>
+ <#elseif requestParameters.useShipAddr??>
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
@@ -154,9 +154,9 @@ function makeExpDate() {
<#if paymentMethodType == "EFT">
<#if postalAddress?has_content>
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
- <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}"/>
- <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
- <#elseif requestParameters.useShipAddr?exists>
+ <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/>
+ <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/>
+ <#elseif requestParameters.useShipAddr??>
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
@@ -168,15 +168,15 @@ function makeExpDate() {
<input type="hidden" name="paymentMethodType" value="${paymentMethodType}"/>
<input type="hidden" name="finalizeMode" value="payment"/>
<input type="hidden" name="createNew" value="Y"/>
- <#if requestParameters.useShipAddr?exists>
+ <#if requestParameters.useShipAddr??>
<input type="hidden" name="contactMechId" value="${postalFields.contactMechId}"/>
</#if>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
- <#if cart.getShippingContactMechId()?exists>
+ <#if cart.getShippingContactMechId()??>
<tr>
<td width="26%" align="right"= valign="top">
- <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked="checked"</#if>/>
+ <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr??>checked="checked"</#if>/>
</td>
<td colspan="2" valign="center">
<div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
@@ -203,43 +203,43 @@ function makeExpDate() {
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonToName}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
+ <input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="60" name="attnName" value="${postalFields.attnName?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
+ <input type="text" size="30" maxlength="60" name="attnName" value="${postalFields.attnName!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="30" name="address1" value="${postalFields.address1?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
+ <input type="text" size="30" maxlength="30" name="address1" value="${postalFields.address1!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="30" name="address2" value="${postalFields.address2?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
+ <input type="text" size="30" maxlength="30" name="address2" value="${postalFields.address2!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCity}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="30" name="city" value="${postalFields.city?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
+ <input type="text" size="30" maxlength="30" name="city" value="${postalFields.city!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
<td width="5"> </td>
<td width="74%">
- <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>>
- <#if postalFields.stateProvinceGeoId?exists>
+ <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
+ <#if postalFields.stateProvinceGeoId??>
<option>${postalFields.stateProvinceGeoId}</option>
<option value="${postalFields.stateProvinceGeoId}">---</option>
</#if>
@@ -252,15 +252,15 @@ function makeExpDate() {
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
+ <input type="text" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
<td width="5"> </td>
<td width="74%">
- <select name="countryGeoId" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>>
- <#if postalFields.countryGeoId?exists>
+ <select name="countryGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>>
+ <#if postalFields.countryGeoId??>
<option>${postalFields.countryGeoId}</option>
<option value="${postalFields.countryGeoId}">---</option>
</#if>
@@ -274,7 +274,7 @@ function makeExpDate() {
<#if !creditCard?has_content>
<#assign creditCard = requestParameters>
</#if>
- <input type="hidden" name="expireDate" value="${creditCard.expireDate?if_exists}"/>
+ <input type="hidden" name="expireDate" value="${creditCard.expireDate!}"/>
<tr>
<td colspan="3"><hr /></td>
</tr>
@@ -283,7 +283,7 @@ function makeExpDate() {
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
+ <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard!}"/>
</td>
</tr>
<tr>
@@ -303,21 +303,21 @@ function makeExpDate() {
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
+ <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
+ <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/>
</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
+ <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/>
*</td>
</tr>
<tr>
@@ -342,7 +342,7 @@ function makeExpDate() {
<td width="5"> </td>
<td width="74%">
<select name="cardType">
- <#if creditCard.cartType?exists>
+ <#if creditCard.cartType??>
<option>${creditCard.cardType}</option>
<option value="${creditCard.cardType}">---</option>
</#if>
@@ -360,7 +360,7 @@ function makeExpDate() {
<td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
+ <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber!}"/>
*</td>
</tr>
<#--<tr>
@@ -376,24 +376,24 @@ function makeExpDate() {
<td width="74%">
<#assign expMonth = "">
<#assign expYear = "">
- <#if creditCard?exists && creditCard.expDate?exists>
+ <#if creditCard?? && creditCard.expDate??>
<#assign expDate = creditCard.expireDate>
- <#if (expDate?exists && expDate.indexOf("/") > 0)>
+ <#if (expDate?? && expDate.indexOf("/") > 0)>
<#assign expMonth = expDate.substring(0,expDate.indexOf("/"))>
<#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
</#if>
</#if>
<select name="expMonth" onchange="javascript:makeExpDate();">
- <#if creditCard?has_content && expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign ccExprMonth = requestParameters.expMonth?if_exists></#if>
+ <#if creditCard?has_content && expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign ccExprMonth = requestParameters.expMonth!></#if>
<#if ccExprMonth?has_content>
- <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
+ <option value="${ccExprMonth!}">${ccExprMonth!}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
</select>
<select name="expYear" onchange="javascript:makeExpDate();">
- <#if creditCard?has_content && expYear?has_content><#assign ccExprYear = expYear><#else><#assign ccExprYear = requestParameters.expYear?if_exists></#if>
+ <#if creditCard?has_content && expYear?has_content><#assign ccExprYear = expYear><#else><#assign ccExprYear = requestParameters.expYear!></#if>
<#if ccExprYear?has_content>
- <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
+ <option value="${ccExprYear!}">${ccExprYear!}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
</select>
@@ -403,7 +403,7 @@ function makeExpDate() {
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
+ <input type="text" size="20" maxlength="30" name="description" value="${creditCard.description!}"/>
</td>
</tr>
</#if>
@@ -420,28 +420,28 @@ function makeExpDate() {
<td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>
+ <input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/>
+ <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>
+ <input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>
+ <input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber!}"/>
*</td>
</tr>
<tr>
@@ -449,7 +449,7 @@ function makeExpDate() {
<td width="5"> </td>
<td width="74%">
<select name="accountType">
- <option>${eftAccount.accountType?if_exists}</option>
+ <option>${eftAccount.accountType!}</option>
<option></option>
<option>Checking</option>
<option>Savings</option>
@@ -460,14 +460,14 @@ function makeExpDate() {
<td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
+ <input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
+ <input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description!}"/>
</td>
</tr>
</#if>
@@ -491,14 +491,14 @@ function makeExpDate() {
<input type="hidden" name="finalizeMode" value="payment"/>
<input type="hidden" name="createNew" value="Y"/>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
- <#if !requestParameters.createNew?exists>
+ <#if !requestParameters.createNew??>
<tr>
- <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
+ <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
<td width='50%' nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
<tr>
- <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
+ <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td>
<td width="50%" nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl Mon Aug 18 07:42:27 2014
@@ -19,7 +19,7 @@ under the License.
<!-- Screenlet to add cart to shopping list. The shopping lists are presented in a dropdown box. -->
-<#if (shoppingLists?exists) && (shoppingCartSize > 0)>
+<#if (shoppingLists??) && (shoppingCartSize > 0)>
<div class="screenlet">
<div class="screenlet-title-bar">
<div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
@@ -31,7 +31,7 @@ under the License.
<form method="post" name="addBulkToShoppingList" action="<@o...@ofbizUrl>" style='margin: 0;'>
<#assign index = 0/>
<#list shoppingCart.items() as cartLine>
- <#if (cartLine.getProductId()?exists) && !cartLine.getIsPromo()>
+ <#if (cartLine.getProductId()??) && !cartLine.getIsPromo()>
<input type="hidden" name="selectedItem" value="${index}"/>
</#if>
<#assign index = index + 1/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl Mon Aug 18 07:42:27 2014
@@ -18,7 +18,7 @@ under the License.
-->
<#if (shoppingCart.getOrderType() == "SALES_ORDER")>
- <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)?if_exists>
+ <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)!>
</#if>
<#if associatedProducts?has_content>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl Mon Aug 18 07:42:27 2014
@@ -29,13 +29,13 @@ under the License.
<select name="productPromoId_1">
<option value=""></option>
<#list allProductPromos as productPromo>
- <option value="${productPromo.productPromoId}">${productPromo.promoName?if_exists}</option>
+ <option value="${productPromo.productPromoId}">${productPromo.promoName!}</option>
</#list>
</select>
<select name="productPromoId_2">
<option value=""></option>
<#list allProductPromos as productPromo>
- <option value="${productPromo.productPromoId}">${productPromo.promoName?if_exists}</option>
+ <option value="${productPromo.productPromoId}">${productPromo.promoName!}</option>
</#list>
</select>
<input type="submit" class="smallSubmit" value="${uiLabelMap.OrderDoPromotions}" />
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists>
+<#assign shoppingCart = sessionAttributes.shoppingCart!>
<#if shoppingCart?has_content>
<#assign shoppingCartSize = shoppingCart.size()>
<#else>
@@ -57,19 +57,19 @@ under the License.
<tr>
<td>${cartLine.getQuantity()?string.number}</td>
<td>
- <#if cartLine.getProductId()?exists>
- <#if cartLine.getParentProductId()?exists>
+ <#if cartLine.getProductId()??>
+ <#if cartLine.getParentProductId()??>
<a href="<@ofbizCatalogAltUrl productId=cartLine.getParentProductId()/>" class="linktext">${cartLine.getName()}</a>
<#else>
<a href="<@ofbizCatalogAltUrl productId=cartLine.getProductId()/>" class="linktext">${cartLine.getName()}</a>
</#if>
<#else>
- <strong>${cartLine.getItemTypeDescription()?if_exists}</strong>
+ <strong>${cartLine.getItemTypeDescription()!}</strong>
</#if>
</td>
<td><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></td>
</tr>
- <#if cartLine.getReservStart()?exists>
+ <#if cartLine.getReservStart()??>
<tr><td> </td><td colspan="2">(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else>${uiLabelMap.CommonDays}</#if>)</td></tr>
</#if>
</#list>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl Mon Aug 18 07:42:27 2014
@@ -27,7 +27,7 @@ under the License.
<form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" name="addpromocodeform" style="margin: 0;">
<input type="text" size="15" name="productPromoCodeId" value="" />
<input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}" />
- <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists>
+ <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())!>
<#if productPromoCodeIds?has_content>
${uiLabelMap.OrderEnteredPromoCodes}:
<#list productPromoCodeIds as productPromoCodeId>