svn commit: r1618313 [7/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
Locked
svn commit: r1618313 [7/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sat Aug 16 08:40:28 2014 @@ -18,7 +18,7 @@ under the License. --> <div> - <#assign shoppingCart = sessionAttributes.shoppingCart?if_exists /> + <#assign shoppingCart = sessionAttributes.shoppingCart! /> <h2>${uiLabelMap.OrderCheckout}</h2> <#if shoppingCart?has_content && shoppingCart.size() > 0> <div id="checkoutPanel"> @@ -59,19 +59,19 @@ under the License. <div id="editShippingPanel" style="display: none;"> <form id="shippingForm" action="<@ofbizUrl>createUpdateShippingAddress</@ofbizUrl>" method="post"> <fieldset> - <input type="hidden" id="shipToContactMechId" name="shipToContactMechId" value="${shipToContactMechId?if_exists}" /> - <input type="hidden" id="billToContactMechIdInShipingForm" name="billToContactMechId" value="${billToContactMechId?if_exists}" /> - <input type="hidden" id="shipToPartyId" name="partyId" value="${partyId?if_exists}" /> - <input type="hidden" id="shipToPhoneContactMechId" name="shipToPhoneContactMechId" value="${(shipToTelecomNumber.contactMechId)?if_exists}" /> - <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${emailContactMechId?if_exists}" /> - <input type="hidden" name="shipToName" value="${shipToName?if_exists}" /> - <input type="hidden" name="shipToAttnName" value="${shipToAttnName?if_exists}" /> - <#if userLogin?exists> + <input type="hidden" id="shipToContactMechId" name="shipToContactMechId" value="${shipToContactMechId!}" /> + <input type="hidden" id="billToContactMechIdInShipingForm" name="billToContactMechId" value="${billToContactMechId!}" /> + <input type="hidden" id="shipToPartyId" name="partyId" value="${partyId!}" /> + <input type="hidden" id="shipToPhoneContactMechId" name="shipToPhoneContactMechId" value="${(shipToTelecomNumber.contactMechId)!}" /> + <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${emailContactMechId!}" /> + <input type="hidden" name="shipToName" value="${shipToName!}" /> + <input type="hidden" name="shipToAttnName" value="${shipToAttnName!}" /> + <#if userLogin??> <input type="hidden" name="keepAddressBook" value="Y" /> <input type="hidden" name="setDefaultShipping" value="Y" /> - <input type="hidden" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" /> + <input type="hidden" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId!}" /> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <#else> <input type="hidden" name="keepAddressBook" value="N" /> </#if> @@ -81,13 +81,13 @@ under the License. <label for="firstName">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstName" style="display: none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="firstName" name="firstName" class="required" type="text" value="${firstName?if_exists}" /> + <input id="firstName" name="firstName" class="required" type="text" value="${firstName!}" /> </span> <span> <label for="lastName">${uiLabelMap.PartyLastName}* <span id="advice-required-lastName" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="lastName" name="lastName" class="required" type="text" value="${lastName?if_exists}" /> + <input id="lastName" name="lastName" class="required" type="text" value="${lastName!}" /> </span> </div> <div> @@ -96,46 +96,46 @@ under the License. <label for="shipToCountryCode">${uiLabelMap.CommonCountry}* <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode!}" size="5" maxlength="10" /> - </span> <span> <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode!}" size="5" maxlength="10" /> - </span> <span> <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="15" /> - + <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber!}" size="10" maxlength="15" /> - </span> <span> <label for="shipToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="shipToExtension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="10" /> + <input type="text" name="shipToExtension" id="shipToExtension" value="${shipToExtension!}" size="5" maxlength="10" /> </span> <#else> <span> <label for="shipToCountryCode">${uiLabelMap.CommonCountry}* <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${parameters.shipToCountryCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${parameters.shipToCountryCode!}" size="5" maxlength="10" /> - </span> <span> <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${parameters.shipToAreaCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${parameters.shipToAreaCode!}" size="5" maxlength="10" /> - </span> <span> <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${parameters.shipToContactNumber?if_exists}" size="10" maxlength="15" /> - + <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${parameters.shipToContactNumber!}" size="10" maxlength="15" /> - </span> <span> <label for="shipToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="shipToExtension" id="shipToExtension" value="${parameters.shipToExtension?if_exists}" size="5" maxlength="10" /> + <input type="text" name="shipToExtension" id="shipToExtension" value="${parameters.shipToExtension!}" size="5" maxlength="10" /> </span> </#if> </div> @@ -144,7 +144,7 @@ under the License. <label for="emailAddress">${uiLabelMap.PartyEmailAddress}* <span id="advice-required-emailAddress" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="emailAddress" name="emailAddress" class="required validate-email" maxlength="255" size="40" type="text" value="${emailAddress?if_exists}" /> + <input id="emailAddress" name="emailAddress" class="required validate-email" maxlength="255" size="40" type="text" value="${emailAddress!}" /> </span> </div> <div> @@ -152,13 +152,13 @@ under the License. <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1?if_exists}" maxlength="255" size="40" /> + <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1!}" maxlength="255" size="40" /> </span> </div> <div> <span> <label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input id="shipToAddress2" name="shipToAddress2" type="text" value="${shipToAddress2?if_exists}" maxlength="255" size="40" /> + <input id="shipToAddress2" name="shipToAddress2" type="text" value="${shipToAddress2!}" maxlength="255" size="40" /> </span> </div> <div> @@ -166,7 +166,7 @@ under the License. <label for="shipToCity">${uiLabelMap.CommonCity}* <span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity?if_exists}" maxlength="255" size="40" /> + <input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity!}" maxlength="255" size="40" /> </span> </div> <div> @@ -174,7 +174,7 @@ under the License. <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode?if_exists}" size="12" maxlength="10" /> + <input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode!}" size="12" maxlength="10" /> </span> </div> <div> @@ -183,8 +183,8 @@ under the License. <span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> <select name="shipToCountryGeoId" id="shipToCountryGeoId"> - <#if shipToCountryGeoId?exists> - <option value="${shipToCountryGeoId?if_exists}">${shipToCountryProvinceGeo?default(shipToCountryGeoId?if_exists)}</option> + <#if shipToCountryGeoId??> + <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo?default(shipToCountryGeoId!)}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> @@ -197,7 +197,7 @@ under the License. </label> <select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId"> <#if shipToStateProvinceGeoId?has_content> - <option value='${shipToStateProvinceGeoId?if_exists}'>${shipToStateProvinceGeo?default(shipToStateProvinceGeoId?if_exists)}</option> + <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo?default(shipToStateProvinceGeoId!)}</option> <#else> <option value="_NA_">${uiLabelMap.PartyNoState}</option> </#if> @@ -283,20 +283,20 @@ under the License. <div id="editBillingPanel" class="screenlet-body" style="display: none;"> <form id="billingForm" class="theform" action="<@ofbizUrl></@ofbizUrl>" method="post"> <fieldset class="col"> - <input type="hidden" id ="billToContactMechId" name="billToContactMechId" value="${billToContactMechId?if_exists}" /> - <input type="hidden" id="shipToContactMechIdInBillingForm" name="shipToContactMechId" value="${shipToContactMechId?if_exists}" /> - <input type="hidden" id="paymentMethodId" name="paymentMethodId" value="${paymentMethodId?if_exists}" /> + <input type="hidden" id ="billToContactMechId" name="billToContactMechId" value="${billToContactMechId!}" /> + <input type="hidden" id="shipToContactMechIdInBillingForm" name="shipToContactMechId" value="${shipToContactMechId!}" /> + <input type="hidden" id="paymentMethodId" name="paymentMethodId" value="${paymentMethodId!}" /> <input type="hidden" id="paymentMethodTypeId" name="paymentMethodTypeId" value="${paymentMethodTypeId?default("CREDIT_CARD")}" /> - <input type="hidden" id="billToPartyId" name="partyId" value="${parameters.partyId?if_exists}" /> - <input type="hidden" name="expireDate" value="${expireDate?if_exists}" /> - <input type="hidden" id="billToPhoneContactMechId" name="billToPhoneContactMechId" value="${(billToTelecomNumber.contactMechId)?if_exists}" /> - <input type="hidden" name="billToName" value="${billToName?if_exists}" /> - <input type="hidden" name="billToAttnName" value="${billToAttnName?if_exists}" /> - <#if userLogin?exists> + <input type="hidden" id="billToPartyId" name="partyId" value="${parameters.partyId!}" /> + <input type="hidden" name="expireDate" value="${expireDate!}" /> + <input type="hidden" id="billToPhoneContactMechId" name="billToPhoneContactMechId" value="${(billToTelecomNumber.contactMechId)!}" /> + <input type="hidden" name="billToName" value="${billToName!}" /> + <input type="hidden" name="billToAttnName" value="${billToAttnName!}" /> + <#if userLogin??> <input type="hidden" name="keepAddressBook" value="Y" /> <input type="hidden" name="setDefaultBilling" value="Y" /> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" /> + <input type="hidden" name="productStoreId" value="${productStoreId!}" /> <#else> <input type="hidden" name="keepAddressBook" value="N" /> </#if> @@ -306,13 +306,13 @@ under the License. <label for="firstNameOnCard">${uiLabelMap.PartyFirstName}* <span id="advice-required-firstNameOnCard" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="firstNameOnCard" name="firstNameOnCard" class="required" type="text" value="${firstNameOnCard?if_exists}" /> + <input id="firstNameOnCard" name="firstNameOnCard" class="required" type="text" value="${firstNameOnCard!}" /> </span> <span> <label for="lastNameOnCard">${uiLabelMap.PartyLastName}* <span id="advice-required-lastNameOnCard" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="lastNameOnCard" name="lastNameOnCard" class="required" type="text" value="${lastNameOnCard?if_exists}" /> + <input id="lastNameOnCard" name="lastNameOnCard" class="required" type="text" value="${lastNameOnCard!}" /> </span> </div> <div> @@ -321,46 +321,46 @@ under the License. <label for="billToCountryCode">${uiLabelMap.CommonCountry}* <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode!}" size="5" maxlength="10" /> - </span> <span> <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode!}" size="5" maxlength="10" /> - </span> <span> <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="15" /> - + <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber!}" size="10" maxlength="15" /> - </span> <span> <label for="billToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="billToExtension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="10" /> + <input type="text" name="billToExtension" id="billToExtension" value="${billToExtension!}" size="5" maxlength="10" /> </span> <#else> <span> <label for="billToCountryCode">${uiLabelMap.CommonCountry}* <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${parameters.billToCountryCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${parameters.billToCountryCode!}" size="5" maxlength="10" /> - </span> <span> <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${parameters.billToAreaCode?if_exists}" size="5" maxlength="10" /> - + <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${parameters.billToAreaCode!}" size="5" maxlength="10" /> - </span> <span> <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${parameters.billToContactNumber?if_exists}" size="10" maxlength="15" /> - + <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${parameters.billToContactNumber!}" size="10" maxlength="15" /> - </span> <span> <label for="billToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="billToExtension" id="billToExtension" value="${parameters.billToExtension?if_exists}" size="5" maxlength="10" /> + <input type="text" name="billToExtension" id="billToExtension" value="${parameters.billToExtension!}" size="5" maxlength="10" /> </span> </#if> </div> @@ -369,7 +369,7 @@ under the License. <label for="cardType">${uiLabelMap.AccountingCardType}*<span id="advice-required-cardType" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span></label> <select name="cardType" id="cardType"> <#if cardType?has_content> - <option label="${cardType?if_exists}" value="${cardType?if_exists}">${cardType?if_exists}</option> + <option label="${cardType!}" value="${cardType!}">${cardType!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#cctypes")} </select> @@ -380,7 +380,7 @@ under the License. <label for="cardNumber">${uiLabelMap.AccountingCardNumber}* <span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="cardNumber" name="cardNumber" class="required creditcard" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16" /> + <input id="cardNumber" name="cardNumber" class="required creditcard" type="text" value="${cardNumber!}" size="30" maxlength="16" /> </span> <span> <label for="billToCardSecurityCode">CVV2</label> @@ -394,7 +394,7 @@ under the License. </label> <select id="expMonth" name="expMonth" class="required"> <#if expMonth?has_content> - <option label="${expMonth?if_exists}" value="${expMonth?if_exists}">${expMonth?if_exists}</option> + <option label="${expMonth!}" value="${expMonth!}">${expMonth!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} </select> @@ -405,7 +405,7 @@ under the License. </label> <select id="expYear" name="expYear" class="required"> <#if expYear?has_content> - <option value="${expYear?if_exists}">${expYear?if_exists}</option> + <option value="${expYear!}">${expYear!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} </select> @@ -421,31 +421,31 @@ under the License. <label for="billToAddress1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}" /> + <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1!}" /> </div> <div> <label for="billToAddress2">${uiLabelMap.PartyAddressLine2}</label> - <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size="30" /> + <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2!}" size="30" /> </div> <div> <label for="billToCity">${uiLabelMap.CommonCity}* <span id="advice-required-billToCity" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity?if_exists}" /> + <input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity!}" /> </div> <div> <label for="billToPostalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10" /> + <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode!}" size="12" maxlength="10" /> </div> <div> <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> <select name="billToCountryGeoId" id="billToCountryGeoId"> - <#if billToCountryGeoId?exists> - <option value='${billToCountryGeoId?if_exists}'>${billToCountryProvinceGeo?default(billToCountryGeoId?if_exists)}</option> + <#if billToCountryGeoId??> + <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo?default(billToCountryGeoId!)}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> @@ -456,7 +456,7 @@ under the License. </label> <select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId"> <#if billToStateProvinceGeoId?has_content> - <option value='${billToStateProvinceGeoId?if_exists}'>${billToStateProvinceGeo?default(billToStateProvinceGeoId?if_exists)}</option> + <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo?default(billToStateProvinceGeoId!)}</option> <#else> <option value="_NA_">${uiLabelMap.PartyNoState}</option> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymousCheckoutLinks.ftl Sat Aug 16 08:40:28 2014 @@ -22,29 +22,29 @@ function submitForm(form) { } </script> <div> - <a href="<@ofbizUrl>setCustomer</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Personal Info</a> - <#if (enableShippingAddress)?exists> - <a href="<@ofbizUrl>setShipping</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Address</a> + <a href="<@ofbizUrl>setCustomer</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Personal Info</a> + <#if (enableShippingAddress)??> + <a href="<@ofbizUrl>setShipping</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Shipping Address</a> <#else> <span class="buttontextdisabled">Shipping Address</span> </#if> - <#if (enableShipmentMethod)?exists> - <a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Shipping Options</a> + <#if (enableShipmentMethod)??> + <a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Shipping Options</a> <#else> <span class="buttontextdisabled">Shipping Options</span> </#if> - <#if (enablePaymentOptions)?exists> - <a href="<@ofbizUrl>setPaymentOption</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Payment Options</a> + <#if (enablePaymentOptions)??> + <a href="<@ofbizUrl>setPaymentOption</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Payment Options</a> <#else> <span class="buttontextdisabled">Payment Options</span> </#if> - <#if (enablePaymentInformation)?exists> - <a href="<@ofbizUrl>setPaymentInformation?paymentMethodTypeId=${requestParameters.paymentMethodTypeId?if_exists}</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Payment Information</a> + <#if (enablePaymentInformation)??> + <a href="<@ofbizUrl>setPaymentInformation?paymentMethodTypeId=${requestParameters.paymentMethodTypeId!}</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Payment Information</a> <#else> <span class="buttontextdisabled">Payment Information</span> </#if> - <#if (enableReviewOrder)?exists> - <a href="<@ofbizUrl>reviewOrder</@ofbizUrl>" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Review Order</a> + <#if (enableReviewOrder)??> + <a href="<@ofbizUrl>reviewOrder</@ofbizUrl>" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Review Order</a> <#else> <span class="buttontextdisabled">Review Order</span> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl Sat Aug 16 08:40:28 2014 @@ -17,4 +17,4 @@ specific language governing permissions under the License. --> -<#if shipAddr?exists><a href="<@ofbizUrl>setShipping</@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a><#if shipOptions?exists><a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a><#if billing?exists><a href="<@ofbizUrl>setBilling?resetType=Y</@ofbizUrl>" class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a></#if></#if></#if> +<#if shipAddr??><a href="<@ofbizUrl>setShipping</@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a><#if shipOptions??><a href="<@ofbizUrl>setShipOptions</@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a><#if billing??><a href="<@ofbizUrl>setBilling?resetType=Y</@ofbizUrl>" class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a></#if></#if></#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl Sat Aug 16 08:40:28 2014 @@ -25,9 +25,9 @@ function shipBillAddr() { <#assign singleUse = ""> </#if> if (document.billsetupform.useShipAddr.checked) { - window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc?if_exists}&paymentMethodType=${paymentMethodType?if_exists}&useShipAddr=Y${singleUse}"); + window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}&useShipAddr=Y${singleUse}"); } else { - window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc?if_exists}&paymentMethodType=${paymentMethodType?if_exists}${singleUse}"); + window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}${singleUse}"); } } </script> @@ -44,14 +44,14 @@ function shipBillAddr() { <div class='h3'>${uiLabelMap.AccountingPaymentInformation}</div> </div> <div class="screenlet-body"> - <#if (paymentMethodType?exists && !requestParameters.resetType?has_content) || finalizeMode?default("") == "payment"> + <#if (paymentMethodType?? && !requestParameters.resetType?has_content) || finalizeMode?default("") == "payment"> <#-- after initial screen; show detailed screens for selected type --> <#if paymentMethodType == "CC"> <#if creditCard?has_content && postalAddress?has_content> <form method="post" action="<@ofbizUrl>changeCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform"> - <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="<@ofbizUrl>enterCreditCard</@ofbizUrl>" name="billsetupform"> <#else> <form method="post" action="<@ofbizUrl>enterCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform"> @@ -60,9 +60,9 @@ function shipBillAddr() { <#if paymentMethodType == "EFT"> <#if eftAccount?has_content && postalAddress?has_content> <form method="post" action="<@ofbizUrl>changeEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform"> - <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="<@ofbizUrl>enterEftAccount</@ofbizUrl>" name="billsetupform"> <#else> <form method="post" action="<@ofbizUrl>enterEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform"> @@ -82,15 +82,15 @@ function shipBillAddr() { <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 && paymentMethodType != "GC"> + <#if cart.getShippingContactMechId()?? && paymentMethodType != "GC"> <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> @@ -144,28 +144,28 @@ function shipBillAddr() { <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}" /> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingBankName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingRoutingNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}" /> + <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber!}" /> *</td> </tr> <tr> @@ -173,7 +173,7 @@ function shipBillAddr() { <td width="5"> </td> <td width="74%"> <select name="accountType" class='selectBox'> - <option>${eftAccount.accountType?if_exists}</option> + <option>${eftAccount.accountType!}</option> <option></option> <option>Checking</option> <option>Savings</option> @@ -184,14 +184,14 @@ function shipBillAddr() { <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}" /> + <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description!}" /> </td> </tr> </#if> @@ -214,21 +214,21 @@ function shipBillAddr() { <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingGiftCardNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}" /> + <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPINNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}" /> + <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber!}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}" /> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description!}" /> </td> </tr> <#if paymentMethodType != "GC"> @@ -236,7 +236,7 @@ function shipBillAddr() { <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAmountToUse}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}" /> + <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber!}" /> *</td> </tr> </#if> @@ -254,30 +254,30 @@ function shipBillAddr() { <input type="hidden" name="finalizeMode" value="payment" /> <input type="hidden" name="createNew" value="Y" /> <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> <tr> - <td width='5%' nowrap="nowrap"><input type="checkbox" name="useGc" value="GC" <#if paymentMethodType?exists && paymentMethodType == "GC">checked="checked"</#if> /></td> + <td width='5%' nowrap="nowrap"><input type="checkbox" name="useGc" value="GC" <#if paymentMethodType?? && paymentMethodType == "GC">checked="checked"</#if> /></td> <td width='95%' nowrap="nowrap"><div>${uiLabelMap.AccountingCheckGiftCard}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> <tr> - <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="offline" <#if paymentMethodType?exists && paymentMethodType == "offline">checked="checked"</#if> /></td> + <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="offline" <#if paymentMethodType?? && paymentMethodType == "offline">checked="checked"</#if> /></td> <td width='95%'nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> <tr> - <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="CC" <#if paymentMethodType?exists && paymentMethodType == "CC">checked="checked"</#if> /></td> + <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="CC" <#if paymentMethodType?? && paymentMethodType == "CC">checked="checked"</#if> /></td> <td width='95%' nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <tr> - <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="EFT" <#if paymentMethodType?exists && paymentMethodType == "EFT">checked="checked"</#if> /></td> + <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="EFT" <#if paymentMethodType?? && paymentMethodType == "EFT">checked="checked"</#if> /></td> <td width='95%' nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td> </tr> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Sat Aug 16 08:40:28 2014 @@ -84,7 +84,7 @@ var issuerId = ""; </script> -<#assign cart = shoppingCart?if_exists /> +<#assign cart = shoppingCart! /> <form method="post" id="checkoutInfoForm" action=""> <fieldset> @@ -100,38 +100,38 @@ var issuerId = ""; <#-- Payment Method Selection --> <div> <label>${uiLabelMap.CommonAdd}:</label> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'NC', '');" class="button">${uiLabelMap.AccountingCreditCard}</a> </#if> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'NE', '');" class="button">${uiLabelMap.AccountingEFTAccount}</a> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> </div> <div> <input type="radio" id="checkOutPaymentId_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if> /> <label for="checkOutPaymentId_OFFLINE">${uiLabelMap.OrderMoneyOrder}</label> </div> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_COD?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_COD??> <div> <input type="radio" id="checkOutPaymentId_COD" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if> /> <label for="checkOutPaymentId_COD">${uiLabelMap.OrderCOD}</label> </div> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??> <div> <input type="radio" id="checkOutPaymentId_WORLDPAY" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if> /> <label for="checkOutPaymentId_WORLDPAY">${uiLabelMap.AccountingPayWithWorldPay}</label> </div> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??> <div> <input type="radio" id="checkOutPaymentId_PAYPAL" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if> /> <label for="checkOutPaymentId_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label> </div> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_IDEAL?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_IDEAL??> <div> <input type="radio" id="checkOutPaymentId_IDEAL" name="checkOutPaymentId" value="EXT_IDEAL" <#if "EXT_IDEAL" == checkOutPaymentId>checked="checked"</#if> /> <label for="checkOutPaymentId_IDEAL">${uiLabelMap.AccountingPayWithiDEAL}</label> @@ -155,7 +155,7 @@ var issuerId = ""; <#else> <#list paymentMethodList as paymentMethod> <#if paymentMethod.paymentMethodTypeId == "GIFT_CARD"> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false) /> <#if giftCard?has_content && giftCard.cardNumber?has_content> @@ -183,7 +183,7 @@ var issuerId = ""; </div> </#if> <#elseif paymentMethod.paymentMethodTypeId == "CREDIT_CARD"> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false) /> <div> <input type="checkbox" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if> /> @@ -194,11 +194,11 @@ var issuerId = ""; </div> </#if> <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT"> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false) /> <div> <input type="radio" id="checkOutPayment_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if> /> - <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</label> + <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingEFTAccount}:${eftAccount.bankName!}: ${eftAccount.accountNumber!}</label> <#if paymentMethod.description?has_content><p>(${paymentMethod.description})</p></#if> <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EE', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a> </div> @@ -208,7 +208,7 @@ var issuerId = ""; </#if> <#-- special billing account functionality to allow use w/ a payment method --> - <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??> <#if billingAccountList?has_content> <div> <select name="billingAccountId" id="billingAccountId"> @@ -229,7 +229,7 @@ var issuerId = ""; </#if> <#-- end of special billing account functionality --> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> <div> <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" /> <input type="hidden" name="singleUseGiftCard" value="Y" /> @@ -237,24 +237,24 @@ var issuerId = ""; </div> <div> <label for="giftCardNumber">${uiLabelMap.AccountingNumber}</label> - <input type="text" size="15" class="inputBox" id="giftCardNumber" name="giftCardNumber" value="${(requestParameters.giftCardNumber)?if_exists}" onfocus="document.getElementById('addGiftCard').checked=true;" /> + <input type="text" size="15" class="inputBox" id="giftCardNumber" name="giftCardNumber" value="${(requestParameters.giftCardNumber)!}" onfocus="document.getElementById('addGiftCard').checked=true;" /> </div> <#if cart.isPinRequiredForGC(delegator)> <div> <label for="giftCardPin">${uiLabelMap.AccountingPIN}</label> - <input type="text" size="10" class="inputBox" id="giftCardPin" name="giftCardPin" value="${(requestParameters.giftCardPin)?if_exists}" onfocus="document.getElementById('addGiftCard').checked=true;" /> + <input type="text" size="10" class="inputBox" id="giftCardPin" name="giftCardPin" value="${(requestParameters.giftCardPin)!}" onfocus="document.getElementById('addGiftCard').checked=true;" /> </div> </#if> <div> <label for="giftCardAmount">${uiLabelMap.AccountingAmount}</label> - <input type="text" size="6" class="inputBox" id="giftCardAmount" name="giftCardAmount" value="${(requestParameters.giftCardAmount)?if_exists}" onfocus="document.getElementById('addGiftCard').checked=true;" /> + <input type="text" size="6" class="inputBox" id="giftCardAmount" name="giftCardAmount" value="${(requestParameters.giftCardAmount)!}" onfocus="document.getElementById('addGiftCard').checked=true;" /> </div> </#if> <div> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists><a href="<@ofbizUrl>setBilling?paymentMethodType=CC&singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseCreditCard}</a></#if> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists><a href="<@ofbizUrl>setBilling?paymentMethodType=GC&singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseGiftCard}</a></#if> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists><a href="<@ofbizUrl>setBilling?paymentMethodType=EFT&singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseEFTAccount}</a></#if> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??><a href="<@ofbizUrl>setBilling?paymentMethodType=CC&singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseCreditCard}</a></#if> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??><a href="<@ofbizUrl>setBilling?paymentMethodType=GC&singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseGiftCard}</a></#if> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??><a href="<@ofbizUrl>setBilling?paymentMethodType=EFT&singleUsePayment=Y</@ofbizUrl>" class="button">${uiLabelMap.AccountingSingleUseEFTAccount}</a></#if> </div> <#-- End Payment Method Selection --> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl Sat Aug 16 08:40:28 2014 @@ -35,9 +35,9 @@ under the License. </script> <h1>${uiLabelMap.OrderFinalCheckoutReview}</h1> -<#if !isDemoStore?exists && isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> +<#if !isDemoStore?? && isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> -<#if cart?exists && 0 < cart.size()> +<#if cart?? && 0 < cart.size()> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} <br /> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Sat Aug 16 08:40:28 2014 @@ -75,16 +75,16 @@ function submitForm(form, mode, value) { </td> <td valign="top"> <div> - <#if shoppingCart.getShippingContactMechId()?exists> + <#if shoppingCart.getShippingContactMechId()??> <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)> </#if> - <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists} + <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if> </div> </td> </tr> </#list> - <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> + <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> <tr> <td width="1%" valign="top"> <input type="radio" name="shipping_method" value="Default" checked="checked" /> @@ -124,20 +124,20 @@ function submitForm(form, mode, value) { </tr> <tr> <td colspan="2"> - <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea> + <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea> </td> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderPoNumber}</h2> - <#if shoppingCart.getPoNumber()?exists && shoppingCart.getPoNumber() != "(none)"> + <#if shoppingCart.getPoNumber()?? && shoppingCart.getPoNumber() != "(none)"> <#assign currentPoNumber = shoppingCart.getPoNumber()> </#if> - <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${currentPoNumber?if_exists}"/> + <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${currentPoNumber!}"/> </td> </tr> - <#if productStore.showCheckoutGiftOptions?if_exists != "N"> + <#if productStore.showCheckoutGiftOptions! != "N"> <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> @@ -156,7 +156,7 @@ function submitForm(form, mode, value) { </tr> <tr> <td colspan="2"> - <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea> + <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea> </td> </tr> <#else/> @@ -174,14 +174,14 @@ function submitForm(form, mode, value) { <div> <b> <#list emailList as email> - ${email.infoString?if_exists}<#if email_has_next>,</#if> + ${email.infoString!}<#if email_has_next>,</#if> </#list> </b> </div> <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div> <br /> <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div> - <input type="text" class="inputBox" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/> + <input type="text" class="inputBox" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()!}"/> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl Sat Aug 16 08:40:28 2014 @@ -20,7 +20,7 @@ under the License. <p> <h3>${uiLabelMap.EcommerceYourNamePhoneAndEmail}</h3> <form id="editCustomerNamePhoneAndEmail" name="${parameters.formNameValue}" method="post" action="<@ofbizUrl>processCustomerSettings</@ofbizUrl>"> - <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/> + <input type="hidden" name="partyId" value="${parameters.partyId!}"/> <fieldset> <div> <span> @@ -40,19 +40,19 @@ under the License. </span> <span> <label for="firstName">${uiLabelMap.PartyFirstName}</label> - <input type="text" name="firstName" value="${parameters.firstName?if_exists}" /> * + <input type="text" name="firstName" value="${parameters.firstName!}" /> * </span> <span> <label for="middleName">${uiLabelMap.PartyMiddleInitial}</label> - <input type="text" name="middleName" value="${parameters.middleName?if_exists}" /> + <input type="text" name="middleName" value="${parameters.middleName!}" /> </span> <span> <label for="lastName">${uiLabelMap.PartyLastName}</label> - <input type="text" name="lastName" value="${parameters.lastName?if_exists}" /> * + <input type="text" name="lastName" value="${parameters.lastName!}" /> * </span> <span> <label for="suffix">${uiLabelMap.PartySuffix}</label> - <input type="text" class='inputBox' name="suffix" value="${parameters.suffix?if_exists}" /> + <input type="text" class='inputBox' name="suffix" value="${parameters.suffix!}" /> </span> </div> </fieldset> @@ -69,11 +69,11 @@ under the License. </tr> <tr> <th scope="row">${uiLabelMap.PartyHomePhone}</th> - <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId?if_exists}"/> - <td><input type="text" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}" /></td> - <td><input type="text" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}" /></td> - <td><input type="text" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}" /></td> - <td><input type="text" name="homeExt" value="${parameters.homeExt?if_exists}" /></td> + <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId!}"/> + <td><input type="text" name="homeCountryCode" value="${parameters.homeCountryCode!}" /></td> + <td><input type="text" name="homeAreaCode" value="${parameters.homeAreaCode!}" /></td> + <td><input type="text" name="homeContactNumber" value="${parameters.homeContactNumber!}" /></td> + <td><input type="text" name="homeExt" value="${parameters.homeExt!}" /></td> <td> <select name="homeSol"> <#if (((parameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -86,11 +86,11 @@ under the License. </tr> <tr> <th scope="row">${uiLabelMap.PartyBusinessPhone}</th> - <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/> - <td><input type="text" name="workCountryCode" value="${parameters.workCountryCode?if_exists}" /></td> - <td><input type="text" name="workAreaCode" value="${parameters.workAreaCode?if_exists}" /></td> - <td><input type="text" name="workContactNumber" value="${parameters.workContactNumber?if_exists}" /></td> - <td><input type="text" name="workExt" value="${parameters.workExt?if_exists}" /></td> + <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId!}"/> + <td><input type="text" name="workCountryCode" value="${parameters.workCountryCode!}" /></td> + <td><input type="text" name="workAreaCode" value="${parameters.workAreaCode!}" /></td> + <td><input type="text" name="workContactNumber" value="${parameters.workContactNumber!}" /></td> + <td><input type="text" name="workExt" value="${parameters.workExt!}" /></td> <td> <select name="workSol"> <#if (((parameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -106,8 +106,8 @@ under the License. <div> <span> <label for="emailAddress">${uiLabelMap.PartyEmailAddress}</label> - <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/> - <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress?if_exists}"/> * + <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId!}"/> + <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress!}"/> * </span> <span> <label for="emailSol">${uiLabelMap.PartyAllowSolicitation}</label> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl Sat Aug 16 08:40:28 2014 @@ -20,30 +20,30 @@ under the License. <#-- eft fields --> <#if !eftAccount?has_content><#assign eftAccount = requestParameters></#if> <tr><td colspan="3"><hr /> -<input type="hidden" name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/></td></tr> +<input type="hidden" name="paymentMethodId" value="${parameters.paymentMethodId!}"/></td></tr> <tr><td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td><td width="5"> </td><td width="74%"> </td></tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingNameOnAccount}</div></td> <td width="5"> </td> - <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>*</td> + <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>*</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td><td width="5"> </td> - <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/></td> + <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/></td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingBankName}</div></td> - <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>*</td> + <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName!}"/>*</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingRoutingNumber}</div></td> - <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>*</td> + <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber!}"/>*</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountType}</div></td><td width="5"> </td> <td width="74%"> <select name="accountType" class='selectBox'> - <option>${eftAccount.accountType?if_exists}</option> + <option>${eftAccount.accountType!}</option> <option></option> <option>Checking</option> <option>Savings</option> @@ -52,9 +52,9 @@ under the License. </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountNumber}</div></td> - <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>*</td> + <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber!}"/>*</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td> - <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/></td> + <td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description!}"/></td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl Sat Aug 16 08:40:28 2014 @@ -19,8 +19,8 @@ under the License. <#-- gift card fields --> <input type="hidden" name="addGiftCard" value="Y"/> - <#assign giftCard = giftCard?if_exists> - <#if paymentMethodTypeId?if_exists != "GIFT_CARD"> + <#assign giftCard = giftCard!> + <#if paymentMethodTypeId! != "GIFT_CARD"> <tr> <td colspan="3"><hr /></td> </tr> @@ -34,29 +34,29 @@ under the License. <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingGiftCardNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"/> + <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPINNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"/> + <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"/> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description!}"/> </td> </tr> - <#if paymentMethodTypeId?if_exists != "GIFT_CARD"> + <#if paymentMethodTypeId! != "GIFT_CARD"> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAmountToUse}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/> + <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber!}"/> *</td> </tr> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl Sat Aug 16 08:40:28 2014 @@ -18,8 +18,8 @@ under the License. --> <#-- generic address information --> -<#assign toName = (parameters.toName)?if_exists> -<#if !toName?has_content && person?exists && person?has_content> +<#assign toName = (parameters.toName)!> +<#if !toName?has_content && person?? && person?has_content> <#assign toName = ""> <#if person.personalTitle?has_content><#assign toName = person.personalTitle + " "></#if> <#assign toName = toName + person.firstName + " "> @@ -32,43 +32,43 @@ under the License. <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyToName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled</#if>/> + <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr??>disabled</#if>/> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAttentionName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(parameters.attnName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/> + <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(parameters.attnName)!}" <#if requestParameters.useShipAddr??>disabled</#if>/> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine1}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(parameters.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/> + <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(parameters.address1)!}" <#if requestParameters.useShipAddr??>disabled</#if>/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine2}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(parameters.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/> + <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(parameters.address2)!}" <#if requestParameters.useShipAddr??>disabled</#if>/> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyCity}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(parameters.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/> + <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(parameters.city)!}" <#if requestParameters.useShipAddr??>disabled</#if>/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyState}</div></td> <td width="5"> </td> <td width="74%"> - <select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>> - <#if (parameters.stateProvinceGeoId)?exists> + <select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr??>disabled</#if>> + <#if (parameters.stateProvinceGeoId)??> <option>${parameters.stateProvinceGeoId}</option> <option value="${parameters.stateProvinceGeoId}">---</option> <#else> @@ -82,15 +82,15 @@ under the License. <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyZipCode}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(parameters.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/> + <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(parameters.postalCode)!}" <#if requestParameters.useShipAddr??>disabled</#if>/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonCountry}</div></td> <td width="5"> </td> <td width="74%"> - <select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>> - <#if (parameters.countryGeoId)?exists> + <select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr??>disabled</#if>> + <#if (parameters.countryGeoId)??> <option>${parameters.countryGeoId}</option> <option value="${parameters.countryGeoId}">---</option> </#if> @@ -102,7 +102,7 @@ under the License. <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAllowSolicitation}?</div></td> <td width="5"> </td> <td width="74%"> - <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>> + <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr??>disabled</#if>> <#if (((parameters.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> <#if (((parameters.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> <option></option> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |