svn commit: r1761135 [11/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/template/customer/ ecommerce/template/customer/pr
Locked
svn commit: r1761135 [11/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/template/customer/ ecommerce/template/customer/pr
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl Sat Sep 17 07:17:15 2016 @@ -18,276 +18,357 @@ under the License. --> <script language="JavaScript" type="text/javascript"> -function shipBillAddr() { + function shipBillAddr() { <#if requestParameters.singleUsePayment?default("N") == "Y"> <#assign singleUse = "&singleUsePayment=Y"> <#else> <#assign singleUse = ""> </#if> if (document.billsetupform.useShipAddr.checked) { - window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}&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!}&paymentMethodType=${paymentMethodType!}${singleUse}"); + window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc!}&paymentMethodType=${paymentMethodType!}${singleUse}"); } -} + } </script> <div class="screenlet"> - <div class="screenlet-title-bar"> - <div class="boxlink"> - <#if requestParameters.singleUsePayment?default("N") != "Y"> - <div> - ${screens.render(anonymoustrailScreen)} - </div> - </#if> + <div class="screenlet-title-bar"> + <div class="boxlink"> + <#if requestParameters.singleUsePayment?default("N") != "Y"> + <div> + ${screens.render(anonymoustrailScreen)} </div> - <div class='h3'>${uiLabelMap.AccountingPaymentInformation}</div> + </#if> </div> - <div class="screenlet-body"> - <#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!}" /> - <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"> - </#if> - </#if> - <#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!}" /> - <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"> - </#if> - </#if> - <#if paymentMethodType == "GC"> - <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform"> - </#if> + <div class='h3'>${uiLabelMap.AccountingPaymentInformation}</div> + </div> + <div class="screenlet-body"> + <#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!}"/> + <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"> + </#if> + </#if> + <#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!}"/> + <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"> + </#if> + </#if> + <#if paymentMethodType == "GC"> + <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform"> + </#if> + + <#if requestParameters.singleUsePayment?default("N") == "Y"> + <input type="hidden" name="singleUsePayment" value="Y"/> + <input type="hidden" name="appendPayment" value="Y"/> + </#if> + + <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/> + <input type="hidden" name="partyId" value="${partyId}"/> + <input type="hidden" name="paymentMethodType" value="${paymentMethodType}"/> + <input type="hidden" name="finalizeMode" value="payment"/> + <input type="hidden" name="createNew" value="Y"/> + <#if requestParameters.useShipAddr??> + <input type="hidden" name="contactMechId" value="${postalFields.contactMechId}"/> + </#if> + + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <#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??>checked="checked"</#if>/> + </td> + <td colspan="2" valign="center"> + <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div> + </td> + </tr> + <tr> + <td colspan="3"> + <hr/> + </td> + </tr> + </#if> - <#if requestParameters.singleUsePayment?default("N") == "Y"> - <input type="hidden" name="singleUsePayment" value="Y" /> - <input type="hidden" name="appendPayment" value="Y" /> - </#if> + <#if (paymentMethodType == "CC" || paymentMethodType == "EFT")> + <tr> + <td width="26%" align="right" valign="top"> + <div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div> + </td> + <td width="5"> </td> + <td width="74%"> </td> + </tr> + ${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")} + </#if> - <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS" /> - <input type="hidden" name="partyId" value="${partyId}" /> - <input type="hidden" name="paymentMethodType" value="${paymentMethodType}" /> - <input type="hidden" name="finalizeMode" value="payment" /> - <input type="hidden" name="createNew" value="Y" /> - <#if requestParameters.useShipAddr??> - <input type="hidden" name="contactMechId" value="${postalFields.contactMechId}" /> + <#-- credit card fields --> + <#if paymentMethodType == "CC"> + <#if !creditCard?has_content> + <#assign creditCard = requestParameters> </#if> + <tr> + <td colspan="3"> + <hr/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="top"> + <div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div> + </td> + <td width="5"> </td> + <td width="74%"> </td> + </tr> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#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??>checked="checked"</#if> /> - </td> - <td colspan="2" valign="center"> - <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div> - </td> - </tr> - <tr> - <td colspan="3"><hr /></td> - </tr> - </#if> - - <#if (paymentMethodType == "CC" || paymentMethodType == "EFT")> - <tr> - <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div></td> - <td width="5"> </td> - <td width="74%"> </td> - </tr> - ${screens.render("component://ecommerce/widget/OrderScreens.xml#genericaddress")} - </#if> - - <#-- credit card fields --> - <#if paymentMethodType == "CC"> - <#if !creditCard?has_content> - <#assign creditCard = requestParameters> - </#if> - <tr> - <td colspan="3"><hr /></td> - </tr> - <tr> - <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div></td> - <td width="5"> </td> - <td width="74%"> </td> - </tr> - - ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} - </#if> - - <#-- eft fields --> - <#if paymentMethodType =="EFT"> - <#if !eftAccount?has_content> - <#assign eftAccount = requestParameters> - </#if> - <tr> - <td colspan="3"><hr /></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!}" /> - *</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!}" /> - </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!}" /> - *</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!}" /> - *</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!}</option> - <option></option> - <option>Checking</option> - <option>Savings</option> - </select> - *</td> - </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!}" /> - *</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!}" /> - </td> - </tr> - </#if> - - <#-- gift card fields --> - <#if requestParameters.useGc?default("") == "GC" || paymentMethodType == "GC"> - <#assign giftCard = requestParameters> - <input type="hidden" name="addGiftCard" value="Y" /> - <#if paymentMethodType != "GC"> - <tr> - <td colspan="3"><hr /></td> - </tr> - </#if> - <tr> - <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingGiftCardInformation}</div></td> - <td width="5"> </td> - <td width="74%"> </td> - </tr> - <tr> - <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!}" /> - *</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!}" /> - *</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!}" /> - </td> - </tr> - <#if paymentMethodType != "GC"> - <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!}" /> - *</td> - </tr> - </#if> - </#if> + ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} + </#if> + + <#-- eft fields --> + <#if paymentMethodType =="EFT"> + <#if !eftAccount?has_content> + <#assign eftAccount = requestParameters> + </#if> + <tr> + <td colspan="3"> + <hr/> + </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!}"/>* + </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!}"/> + </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!}"/>* + </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!}"/>* + </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!}</option> + <option></option> + <option>Checking</option> + <option>Savings</option> + </select>* + </td> + </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!}"/>* + </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!}"/> + </td> + </tr> + </#if> + <#-- gift card fields --> + <#if requestParameters.useGc?default("") == "GC" || paymentMethodType == "GC"> + <#assign giftCard = requestParameters> + <input type="hidden" name="addGiftCard" value="Y"/> + <#if paymentMethodType != "GC"> <tr> - <td align="center" colspan="3"> - <input type="submit" class="smallsubmit" value="Continue" /> + <td colspan="3"> + <hr/> </td> </tr> - </table> - <#else> - <#-- initial screen show a list of options --> - <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform"> - <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??> - <tr> - <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??> - <tr> - <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??> - <tr> - <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??> - <tr> - <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> - <tr> - <td align="center" colspan="2"> - <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}" /> - </td> - </tr> - </table> - </form> + </#if> + <tr> + <td width="26%" align="right" valign="top"> + <div class="tableheadtext">${uiLabelMap.AccountingGiftCardInformation}</div> + </td> + <td width="5"> </td> + <td width="74%"> </td> + </tr> + <tr> + <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!}"/>* + </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!}"/>* + </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!}"/> + </td> + </tr> + <#if paymentMethodType != "GC"> + <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!}"/>* + </td> + </tr> + </#if> </#if> - </div> + + <tr> + <td align="center" colspan="3"> + <input type="submit" class="smallsubmit" value="Continue"/> + </td> + </tr> + </table> + <#else> + <#-- initial screen show a list of options --> + <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform"> + <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??> + <tr> + <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??> + <tr> + <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??> + <tr> + <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??> + <tr> + <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> + <tr> + <td align="center" colspan="2"> + <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"/> + </td> + </tr> + </table> + </form> + </#if> + </div> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/CcInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/CcInfo.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/CcInfo.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/CcInfo.ftl Sat Sep 17 07:17:15 2016 @@ -20,7 +20,11 @@ under the License. <#if !creditCard?has_content> <#assign creditCard = requestParameters> </#if> -<tr><td colspan="3"><hr /></td></tr> +<tr> + <td colspan="3"> + <hr/> + </td> +</tr> ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutReview.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutReview.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutReview.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutReview.ftl Sat Sep 17 07:17:15 2016 @@ -18,45 +18,50 @@ under the License. --> <script language="JavaScript" type="text/javascript"> -<!-- - var clicked = 0; - function processOrder() { - if (clicked == 0) { - clicked++; - //window.location.replace("<@ofbizUrl>processorder</@ofbizUrl>"); - document.${parameters.formNameValue}.processButton.value="${uiLabelMap.OrderSubmittingOrder}"; - document.${parameters.formNameValue}.processButton.disabled=true; - document.${parameters.formNameValue}.submit(); - } else { - showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.YoureOrderIsBeingProcessed}"); - } + <!-- + var clicked = 0; + function processOrder() { + if (clicked == 0) { + clicked++; + //window.location.replace("<@ofbizUrl>processorder</@ofbizUrl> + "); + document.${parameters.formNameValue}.processButton.value = "${uiLabelMap.OrderSubmittingOrder}"; + document.${parameters.formNameValue}.processButton.disabled = true; + document.${parameters.formNameValue}.submit(); + } else { + showErrorAlert("${uiLabelMap.CommonErrorMessage2}", "${uiLabelMap.YoureOrderIsBeingProcessed}"); } -// --> + } + // --> </script> <h1>${uiLabelMap.OrderFinalCheckoutReview}</h1> -<#if !isDemoStore?? && isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> +<#if !isDemoStore?? && isDemoStore> + <p>${uiLabelMap.OrderDemoFrontNote}.</p> +</#if> <#if cart?? && 0 < cart.size()> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} - <br /> + <br/> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} <table border="0" cellpadding="1" width="100%"> - <tr> + <tr> <td colspan="4"> </td> <td align="right"> <form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}"> <#if (requestParameters.checkoutpage)?has_content> - <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}" /> + <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"/> </#if> <#if (requestAttributes.issuerId)?has_content> - <input type="hidden" name="issuerId" value="${requestAttributes.issuerId}" /> + <input type="hidden" name="issuerId" value="${requestAttributes.issuerId}"/> </#if> - <input type="button" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();" class="mediumSubmit" /> + <input type="button" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onclick="processOrder();" + class="mediumSubmit"/> </form> - <#-- doesn't work with Safari, seems to work with IE, Mozilla <a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}] </a> --> + <#-- doesn't work with Safari, seems to work with IE, Mozilla + <a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}] </a> --> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl Sat Sep 17 07:17:15 2016 @@ -18,44 +18,44 @@ under the License. --> <script language="javascript" type="text/javascript"> -//<![CDATA[ -function submitForm(form, mode, value) { + //<![CDATA[ + function submitForm(form, mode, value) { if (mode == "DN") { - // done action; checkout - form.action="<@ofbizUrl>checkoutoptions</@ofbizUrl>"; - form.submit(); + // done action; checkout + form.action = "<@ofbizUrl>checkoutoptions</@ofbizUrl>"; + form.submit(); } else if (mode == "CS") { - // continue shopping - form.action="<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>"; - form.submit(); + // continue shopping + form.action = "<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>"; + form.submit(); } else if (mode == "NA") { - // new address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>"; - form.submit(); + // new address + form.action = "<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>"; + form.submit(); } else if (mode == "EA") { - // edit address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>"; - form.submit(); + // edit address + form.action = "<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+ value+"</@ofbizUrl>"; + form.submit(); } else if (mode == "NC") { - // new credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions</@ofbizUrl>"; - form.submit(); + // new credit card + form.action = "<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions</@ofbizUrl>"; + form.submit(); } else if (mode == "EC") { - // edit credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>"; - form.submit(); + // edit credit card + form.action = "<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&paymentMethodId="+ value+"</@ofbizUrl>"; + form.submit(); } else if (mode == "NE") { - // new eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions</@ofbizUrl>"; - form.submit(); + // new eft account + form.action = "<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions</@ofbizUrl>"; + form.submit(); } else if (mode == "EE") { - // edit eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>"; - form.submit(); + // edit eft account + form.action = "<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&paymentMethodId="+ value+"</@ofbizUrl>"; + form.submit(); } -} + } -//]]> + //]]> </script> <form method="post" name="checkoutInfoForm" style="margin:0;"> @@ -63,141 +63,187 @@ function submitForm(form, mode, value) { <input type="hidden" name="checkoutpage" value="shippingoptions"/> <div class="screenlet" style="height: 100%;"> - <div class="screenlet-title-bar"> - <div class="h3">2) ${uiLabelMap.OrderHowShallWeShipIt}?</div> - </div> - <div class="screenlet-body" style="height: 100%;"> - <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> - <#list carrierShipmentMethodList as carrierShipmentMethod> - <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> - <tr> - <td width="1%" valign="top" > - <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if> /> - </td> - <td valign="top"> - <div> - <#if shoppingCart.getShippingContactMechId()??> - <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)> - </#if> - <#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?? || carrierShipmentMethodList?size == 0> - <tr> - <td width="1%" valign="top"> - <input type="radio" name="shipping_method" value="Default" checked="checked" /> - </td> - <td valign="top"> - <div>${uiLabelMap.OrderUseDefault}.</div> - </td> - </tr> - </#if> - <tr><td colspan="2"><hr /></td></tr> - <tr> - <td colspan="2"> - <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2> - </td> - </tr> - <tr> - <td valign="top"> - <input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false" /> - </td> - <td valign="top"> - <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div> - </td> - </tr> - <tr> - <td valign="top"> - <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true" /> - </td> - <td valign="top"> - <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div> - </td> - </tr> - <tr><td colspan="2"><hr /></td></tr> - <tr> - <td colspan="2"> - <h2>${uiLabelMap.OrderSpecialInstructions}</h2> - </td> - </tr> - <tr> - <td colspan="2"> - <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()?? && shoppingCart.getPoNumber() != "(none)"> - <#assign currentPoNumber = shoppingCart.getPoNumber()> + <div class="screenlet-title-bar"> + <div class="h3">2) ${uiLabelMap.OrderHowShallWeShipIt}?</div> + </div> + <div class="screenlet-body" style="height: 100%;"> + <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> + <#list carrierShipmentMethodList as carrierShipmentMethod> + <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> + <tr> + <td width="1%" valign="top"> + <input type="radio" name="shipping_method" value="${shippingMethod}" + <#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if>/> + </td> + <td valign="top"> + <div> + <#if shoppingCart.getShippingContactMechId()??> + <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)> + </#if> + <#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> - <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${currentPoNumber!}"/> - </td> - </tr> - <#if productStore.showCheckoutGiftOptions! != "N"> - <tr><td colspan="2"><hr /></td></tr> - <tr> - <td colspan="2"> - <div> - <h2>${uiLabelMap.OrderIsThisGift}</h2> - <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span> - <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span> - </div> - </td> - </tr> - <tr><td colspan="2"><hr /></td></tr> - <tr> - <td colspan="2"> - <h2>${uiLabelMap.OrderGiftMessage}</h2> - </td> - </tr> - <tr> - <td colspan="2"> - <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea> - </td> - </tr> - <#else> - <input type="hidden" name="is_gift" value="false"/> + </#if> + </div> + </td> + </tr> + </#list> + <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> + <tr> + <td width="1%" valign="top"> + <input type="radio" name="shipping_method" value="Default" checked="checked"/> + </td> + <td valign="top"> + <div>${uiLabelMap.OrderUseDefault}.</div> + </td> + </tr> + </#if> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2> + </td> + </tr> + <tr> + <td valign="top"> + <input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> + name="may_split" value="false"/> + </td> + <td valign="top"> + <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div> + </td> + </tr> + <tr> + <td valign="top"> + <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" + name="may_split" value="true"/> + </td> + <td valign="top"> + <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <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()?? && shoppingCart.getPoNumber() != "(none)"> + <#assign currentPoNumber = shoppingCart.getPoNumber()> </#if> - <tr><td colspan="2"><hr /></td></tr> - <tr> - <td colspan="2"> - <h2>${uiLabelMap.PartyEmailAddresses}</h2> - </td> - </tr> - <tr> - <td colspan="2"> - <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div> - <div> - <b> - <#list emailList as email> - ${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()!}"/> - </td> - </tr> - </table> - </div> + <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${currentPoNumber!}"/> + </td> + </tr> + <#if productStore.showCheckoutGiftOptions! != "N"> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <div> + <h2>${uiLabelMap.OrderIsThisGift}</h2> + <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> + name="is_gift" value="true"/><span>${uiLabelMap.CommonYes}</span> + <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if> + name="is_gift" value="false"/><span>${uiLabelMap.CommonNo}</span> + </div> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderGiftMessage}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <textarea class="textAreaBox" cols="30" rows="3" wrap="hard" + name="gift_message">${shoppingCart.getGiftMessage()!}</textarea> + </td> + </tr> + <#else> + <input type="hidden" name="is_gift" value="false"/> + </#if> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.PartyEmailAddresses}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div> + <div> + <b> + <#list emailList as email> + ${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()!}"/> + </td> + </tr> + </table> + </div> </div> </fieldset> </form> <table width="100%"> <tr valign="top"> - <td> - <a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');" class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a> + <td> + <a href="javascript:submitForm(document.checkoutInfoForm, 'CS', '');" + class="buttontextbig">${uiLabelMap.OrderBacktoShoppingCart}</a> </td> <td align="right"> - <a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" class="buttontextbig">${uiLabelMap.CommonNext}</a> + <a href="javascript:submitForm(document.checkoutInfoForm, 'DN', '');" + class="buttontextbig">${uiLabelMap.CommonNext}</a> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/CustSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/CustSettings.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/CustSettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/CustSettings.ftl Sat Sep 17 07:17:15 2016 @@ -19,13 +19,14 @@ under the License. <p> <h3>${uiLabelMap.EcommerceYourNamePhoneAndEmail}</h3> -<form id="editCustomerNamePhoneAndEmail" name="${parameters.formNameValue}" method="post" action="<@ofbizUrl>processCustomerSettings</@ofbizUrl>"> +<form id="editCustomerNamePhoneAndEmail" name="${parameters.formNameValue}" method="post" + action="<@ofbizUrl>processCustomerSettings</@ofbizUrl>"> <input type="hidden" name="partyId" value="${parameters.partyId!}"/> <fieldset> <div> - <span> - <label for="personalTitle">${uiLabelMap.CommonTitle}</label> - <select name="personalTitle"> + <span> + <label for="personalTitle">${uiLabelMap.CommonTitle}</label> + <select name="personalTitle"> <#if requestParameters.personalTitle?has_content > <option>${parameters.personalTitle}</option> <option value="${parameters.personalTitle}"> -- </option> @@ -36,29 +37,30 @@ under the License. <option>${uiLabelMap.CommonTitleMrs}</option> <option>${uiLabelMap.CommonTitleMs}</option> <option>${uiLabelMap.CommonTitleDr}</option> - </select> - </span> - <span> + </select> + </span> + <span> <label for="firstName">${uiLabelMap.PartyFirstName}</label> - <input type="text" name="firstName" value="${parameters.firstName!}" /> * + <input type="text" name="firstName" value="${parameters.firstName!}"/> * </span> - <span> + <span> <label for="middleName">${uiLabelMap.PartyMiddleInitial}</label> - <input type="text" name="middleName" value="${parameters.middleName!}" /> + <input type="text" name="middleName" value="${parameters.middleName!}"/> </span> - <span> + <span> <label for="lastName">${uiLabelMap.PartyLastName}</label> - <input type="text" name="lastName" value="${parameters.lastName!}" /> * + <input type="text" name="lastName" value="${parameters.lastName!}"/> * </span> - <span> + <span> <label for="suffix">${uiLabelMap.PartySuffix}</label> - <input type="text" class='inputBox' name="suffix" value="${parameters.suffix!}" /> + <input type="text" class='inputBox' name="suffix" value="${parameters.suffix!}"/> </span> </div> </fieldset> - <table summary="Tabular form for entering multiple telecom numbers for different purposes. Each row allows user to enter telecom number for a purpose"> - <caption>${uiLabelMap.PartyPhoneNumbers}</caption> + <table summary="Tabular form for entering multiple telecom numbers for different purposes. + Each row allows user to enter telecom number for a purpose"> + <caption>${uiLabelMap.PartyPhoneNumbers}</caption> <tr> <th></th> <th scope="col">${uiLabelMap.CommonCountry}</th> @@ -68,60 +70,68 @@ under the License. <th scope="col">${uiLabelMap.PartyAllowSolicitation}</th> </tr> <tr> - <th scope="row">${uiLabelMap.PartyHomePhone}</th> - <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> - <#if (((parameters.homeSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> - <option></option> - <option value="Y">${uiLabelMap.CommonY}</option> - <option value="N">${uiLabelMap.CommonN}</option> - </select> - </td> - </tr> - <tr> - <th scope="row">${uiLabelMap.PartyBusinessPhone}</th> - <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> - <#if (((parameters.workSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> - <option></option> - <option value="Y">${uiLabelMap.CommonY}</option> - <option value="N">${uiLabelMap.CommonN}</option> - </select> - </td> - </tr> -</table> + <th scope="row">${uiLabelMap.PartyHomePhone}</th> + <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> + <#if (((parameters.homeSol)!"") == "N")> + <option value="N">${uiLabelMap.CommonN}</option></#if> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> + <tr> + <th scope="row">${uiLabelMap.PartyBusinessPhone}</th> + <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> + <#if (((parameters.workSol)!"") == "N")> + <option value="N">${uiLabelMap.CommonN}</option> + </#if> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> + </select> + </td> + </tr> + </table> <fieldset> <div> - <span> - <label for="emailAddress">${uiLabelMap.PartyEmailAddress}</label> - <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId!}"/> - <input type="text" class="inputBox" name="emailAddress" value="${parameters.emailAddress!}"/> * - </span> - <span> + <span> + <label for="emailAddress">${uiLabelMap.PartyEmailAddress}</label> + <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> <select name="emailSol" class="selectBox"> - <#if (((parameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> - <#if (((parameters.emailSol)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if> - <option></option> + <#if (((parameters.emailSol)!"") == "Y")> + <option value="Y">${uiLabelMap.CommonY}</option></#if> + <#if (((parameters.emailSol)!"") == "N")> + <option value="N">${uiLabelMap.CommonN}</option></#if> + <option></option> <option value="Y">${uiLabelMap.CommonY}</option> <option value="N">${uiLabelMap.CommonN}</option> </select> </span> - </div> - <div class="buttons"> - <input type="submit" value="${uiLabelMap.CommonContinue}"/> - </div> + </div> + <div class="buttons"> + <input type="submit" value="${uiLabelMap.CommonContinue}"/> + </div> </fieldset> </form> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/EftInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/EftInfo.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/EftInfo.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/EftInfo.ftl Sat Sep 17 07:17:15 2016 @@ -19,28 +19,64 @@ 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!}"/></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 colspan="3"> + <hr/> + <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!}"/>*</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!}"/></td> + <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!}"/> + </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!}"/>*</td> + <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!}"/>* + </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!}"/>*</td> + <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!}"/>* + </td> </tr> <tr> - <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountType}</div></td><td width="5"> </td> + <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!}</option> @@ -51,10 +87,22 @@ under the License. </td> </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!}"/>*</td> + <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!}"/>* + </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!}"/></td> + <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!}"/> + </td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/GcInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/GcInfo.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/GcInfo.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/GcInfo.ftl Sat Sep 17 07:17:15 2016 @@ -18,45 +18,59 @@ under the License. --> <#-- gift card fields --> - <input type="hidden" name="addGiftCard" value="Y"/> - <#assign giftCard = giftCard!> - <#if paymentMethodTypeId! != "GIFT_CARD"> - <tr> - <td colspan="3"><hr /></td> - </tr> - </#if> - <tr> - <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingGiftCardInformation}</div></td> - <td width="5"> </td> - <td width="74%"> </td> - </tr> - <tr> - <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!}"/> - *</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!}"/> - *</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!}"/> - </td> - </tr> - <#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!}"/> - *</td> - </tr> - </#if> +<input type="hidden" name="addGiftCard" value="Y"/> +<#assign giftCard = giftCard!> +<#if paymentMethodTypeId! != "GIFT_CARD"> +<tr> + <td colspan="3"> + <hr/> + </td> +</tr> +</#if> +<tr> + <td width="26%" align="right" valign="top"> + <div class="tableheadtext">${uiLabelMap.AccountingGiftCardInformation}</div> + </td> + <td width="5"> </td> + <td width="74%"> </td> +</tr> +<tr> + <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!}"/> + * + </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!}"/> + * + </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!}"/> + </td> +</tr> +<#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!}"/>* + </td> +</tr> +</#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/GenericAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/GenericAddress.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/order/GenericAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/order/GenericAddress.ftl Sat Sep 17 07:17:15 2016 @@ -29,42 +29,59 @@ under the License. </#if> <tr> - <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyToName}</div></td> + <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??>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="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 requestParameters.useShipAddr??>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="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 requestParameters.useShipAddr??>disabled</#if>/> - *</td> + <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="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 requestParameters.useShipAddr??>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="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 requestParameters.useShipAddr??>disabled</#if>/> - *</td> + <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="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??>disabled</#if>> @@ -75,18 +92,23 @@ under the License. <option value="">${uiLabelMap.PartyNoState}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#states")} - </select> - *</td> + </select>* + </td> </tr> <tr> - <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyZipCode}</div></td> + <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 requestParameters.useShipAddr??>disabled</#if>/> - *</td> + <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="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??>disabled</#if>> @@ -95,16 +117,22 @@ under the License. <option value="${parameters.countryGeoId}">---</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#countries")} - </select> - *</td> + </select>* + </td> </tr> <tr> - <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAllowSolicitation}?</div></td> + <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??>disabled</#if>> - <#if (((parameters.allowSolicitation)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> - <#if (((parameters.allowSolicitation)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#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> <option value="Y">${uiLabelMap.CommonY}</option> <option value="N">${uiLabelMap.CommonN}</option> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |