Author: deepak
Date: Mon Dec 21 05:25:56 2015
New Revision: 1721092
URL: http://svn.apache.org/viewvc?rev=1721092&view=rev
Log:
(OFBIZ-3074) Applied slightly modified patch from OFBIZ-3074
============================================================ HTML clean up for
editShoppingList.ftl.
============================================================
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1721092&r1=1721091&r2=1721092&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
Mon Dec 21 05:25:56 2015
@@ -18,6 +18,7 @@ under the License.
-->
<script type="text/javascript">
+//<![CDATA[
<!-- function to add extra info for Timestamp format -->
function TimestampSubmit(obj) {
reservStartStr = jQuery(obj).find("input[name='reservStartStr']");
@@ -51,8 +52,8 @@ under the License.
}
});
}
+//]]>
</script>
-<br />
<#macro paginationControls>
<#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize)?double /
viewSize?double)>
<#if (viewIndexMax?int > 0)>
@@ -85,24 +86,25 @@ under the License.
<div class="boxlink">
<a
href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>"
class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
</div>
- <h3> ${uiLabelMap.EcommerceShoppingLists}</h3>
+ <h3>${uiLabelMap.EcommerceShoppingLists}</h3>
<div class="screenlet-body">
<#if shoppingLists?has_content>
- <form name="selectShoppingList" method="post"
action="<@ofbizUrl>editShoppingList</@ofbizUrl>">
- <select name="shoppingListId" class="selectBox">
- <#if shoppingList?has_content>
- <option
value="${shoppingList.shoppingListId}">${shoppingList.listName}</option>
- <option value="${shoppingList.shoppingListId}">--</option>
- </#if>
- <#list shoppingLists as list>
- <option
value="${list.shoppingListId}">${list.listName}</option>
- </#list>
- </select>
-
- <a href="javascript:document.selectShoppingList.submit();"
class="buttontext">${uiLabelMap.CommonEdit}</a>
+ <form id="selectShoppingList" method="post"
action="<@ofbizUrl>editShoppingList</@ofbizUrl>">
+ <fieldset>
+ <select name="shoppingListId">
+ <#if shoppingList?has_content>
+ <option
value="${shoppingList.shoppingListId}">${shoppingList.listName}</option>
+ <option
value="${shoppingList.shoppingListId}">--</option>
+ </#if>
+ <#list shoppingLists as list>
+ <option
value="${list.shoppingListId}">${list.listName}</option>
+ </#list>
+ </select>
+ <a href="javascript:$('selectShoppingList').submit();"
class="button">${uiLabelMap.CommonEdit}</a>
+ </fieldset>
</form>
<#else>
- <div>${uiLabelMap.EcommerceNoShoppingListsCreate}.</div>
+ <label>${uiLabelMap.EcommerceNoShoppingListsCreate}.</label>
<a
href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>"
class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
</#if>
</div>
@@ -114,93 +116,86 @@ under the License.
<div class="screenlet">
<div class="screenlet-title-bar">
<div class="boxlink">
- <form name= "createCustRequestFromShoppingList" method= "post"
action= "<@ofbizUrl>createCustRequestFromShoppingList</@ofbizUrl>">
- <input type= "hidden" name= "shoppingListId" value=
"${shoppingList.shoppingListId}"/>
- <a
href='javascript:document.createCustRequestFromShoppingList.submit()'><div
class='submenutext'>${uiLabelMap.OrderCreateCustRequestFromShoppingList}</div></a>
- </form>
- <form name="createQuoteFromShoppingList" method="post"
action="<@ofbizUrl>createQuoteFromShoppingList</@ofbizUrl>">
- <input type="hidden" name="shoppingListId"
value="${shoppingList.shoppingListId}"/>
- <a
href='javascript:document.createQuoteFromShoppingList.submit()'><div
class='submenutext'>${uiLabelMap.OrderCreateQuoteFromShoppingList}</div></a>
- </form>
- <a href="javascript:document.updateList.submit();"
class="submenutextright">${uiLabelMap.CommonSave}</a>
+ <a class='submenutext'
href='javascript:$('createCustRequestFromShoppingList').submit()'>${uiLabelMap.OrderCreateCustRequestFromShoppingList}</a>
+ <a class='submenutext'
href='javascript:$('createQuoteFromShoppingList').submit()'>${uiLabelMap.OrderCreateQuoteFromShoppingList}</a>
+ <a href="javascript:$('updateList').submit();"
class="submenutextright">${uiLabelMap.CommonSave}</a>
</div>
- <div class="h3">${uiLabelMap.EcommerceShoppingListDetail} -
${shoppingList.listName}</div>
+ <h3>${uiLabelMap.EcommerceShoppingListDetail} -
${shoppingList.listName}</h3>
</div>
<div class="screenlet-body">
- <form name="updateList" method="post"
action="<@ofbizUrl>updateShoppingList</@ofbizUrl>">
- <input type="hidden" class="inputBox" name="shoppingListId"
value="${shoppingList.shoppingListId}"/>
- <input type="hidden" class="inputBox" name="partyId"
value="${shoppingList.partyId!}"/>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.EcommerceListName}</div></td>
- <td><input type="text" class="inputBox" size="25"
name="listName" value="${shoppingList.listName}" />
- </tr>
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
- <td><input type="text" class="inputBox" size="70"
name="description" value="${shoppingList.description!}" />
- </tr>
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.OrderListType}</div></td>
- <td>
- <select name="shoppingListTypeId" class="selectBox">
- <#if shoppingListType??>
- <option
value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
- <option
value="${shoppingListType.shoppingListTypeId}">--</option>
- </#if>
- <#list shoppingListTypes as shoppingListType>
- <option
value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
- </#list>
- </select>
- </td>
- </tr>
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.EcommercePublic}?</div></td>
- <td>
- <select name="isPublic" class="selectBox">
- <#if (((shoppingList.isPublic)!"") == "Y")><option
value="Y">${uiLabelMap.CommonY}</option></#if>
- <#if (((shoppingList.isPublic)!"") == "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>
- <td><div
class="tableheadtext">${uiLabelMap.EcommerceActive}?</div></td>
- <td>
- <select name="isActive" class="selectBox">
- <#if (((shoppingList.isActive)!"") == "Y")><option
value="Y">${uiLabelMap.CommonY}</option></#if>
- <#if (((shoppingList.isActive)!"") == "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>
- <td><div
class="tableheadtext">${uiLabelMap.EcommerceParentList}</div></td>
- <td>
- <select name="parentShoppingListId" class="selectBox">
- <#if parentShoppingList??>
- <option
value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option>
- </#if>
- <option value="">${uiLabelMap.EcommerceNoParent}</option>
- <#list allShoppingLists as newParShoppingList>
- <option
value="${newParShoppingList.shoppingListId}">${newParShoppingList.listName?default(newParShoppingList.shoppingListId)}</option>
- </#list>
- </select>
- <#if parentShoppingList??>
- <a
href="<@ofbizUrl>editShoppingList?shoppingListId=${parentShoppingList.shoppingListId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonGotoParent}
(${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a>
- </#if>
- </td>
- </tr>
- <tr>
- <td><div class="tableheadtext"> </div></td>
- <td>
- <a href="javascript:document.updateList.submit();"
class="buttontext">${uiLabelMap.CommonSave}</a>
- </td>
- </tr>
- </table>
+ <form id= "createCustRequestFromShoppingList" method= "post" action=
"<@ofbizUrl>createCustRequestFromShoppingList</@ofbizUrl>">
+ <fieldset>
+ <input type= "hidden" name= "shoppingListId" value=
"${shoppingList.shoppingListId}"/>
+ </fieldset>
+ </form>
+ <form name="createQuoteFromShoppingList" method="post"
action="<@ofbizUrl>createQuoteFromShoppingList</@ofbizUrl>">
+ <fieldset>
+ <input type="hidden" name="shoppingListId"
value="${shoppingList.shoppingListId}"/>
+ </fieldset>
+ </form>
+ <form id="updateList" method="post"
action="<@ofbizUrl>updateShoppingList</@ofbizUrl>">
+ <fieldset class="inline">
+ <input type="hidden" class="inputBox" name="shoppingListId"
value="${shoppingList.shoppingListId}" />
+ <input type="hidden" class="inputBox" name="partyId"
value="${shoppingList.partyId?if_exists}" />
+ <div>
+ <label for="listName">${uiLabelMap.EcommerceListName}</label>
+ <input type="text" size="25" name="listName" id="listName"
value="${shoppingList.listName}" />
+ </div>
+ <div>
+ <label for="description">${uiLabelMap.CommonDescription}</label>
+ <input type="text" size="70" name="description" id="description"
value="${shoppingList.description?if_exists}" />
+ </div>
+ <div>
+ <label
for="shoppingListTypeId">${uiLabelMap.OrderListType}</label>
+ <select name="shoppingListTypeId" id="shoppingListTypeId">
+ <#if shoppingListType??>
+ <option
value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
+ <option
value="${shoppingListType.shoppingListTypeId}">--</option>
+ </#if>
+ <#list shoppingListTypes as shoppingListType>
+ <option
value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
+ </#list>
+ </select>
+ </div>
+ <div>
+ <label for="isPublic">${uiLabelMap.EcommercePublic}?</label>
+ <select name="isPublic" id="isPublic">
+ <#if (((shoppingList.isPublic)!"") == "Y")><option
value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if (((shoppingList.isPublic)!"") == "N")><option
value="N">${uiLabelMap.CommonN}</option></#if>
+ <option></option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ <option value="N">${uiLabelMap.CommonN}</option>
+ </select>
+ </div>
+ <div>
+ <label for="isActive">${uiLabelMap.EcommerceActive}?</label>
+ <select name="isActive" id="isActive">
+ <#if (((shoppingList.isActive)!"") == "Y")><option
value="Y">${uiLabelMap.CommonY}</option></#if>
+ <#if (((shoppingList.isActive)!"") == "N")><option
value="N">${uiLabelMap.CommonN}</option></#if>
+ <option></option>
+ <option value="Y">${uiLabelMap.CommonY}</option>
+ <option value="N">${uiLabelMap.CommonN}</option>
+ </select>
+ </div>
+ <div>
+ <label
for="parentShoppingListId">${uiLabelMap.EcommerceParentList}</label>
+ <select name="parentShoppingListId" id="parentShoppingListId">
+ <#if parentShoppingList??>
+ <option
value="${parentShoppingList.shoppingListId}">${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}</option>
+ </#if>
+ <option value="">${uiLabelMap.EcommerceNoParent}</option>
+ <#list allShoppingLists as newParShoppingList>
+ <option
value="${newParShoppingList.shoppingListId}">${newParShoppingList.listName?default(newParShoppingList.shoppingListId)}</option>
+ </#list>
+ </select>
+ <#if parentShoppingList??>
+ <a
href="<@ofbizUrl>editShoppingList?shoppingListId=${parentShoppingList.shoppingListId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonGotoParent}
(${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a>
+ </#if>
+ </div>
+ <div>
+ <input type="submit" class="button" name="submit"
value="${uiLabelMap.CommonSave}">
+ </div>
+ </fieldset>
</form>
</div>
</div>
@@ -212,71 +207,65 @@ under the License.
<div class="boxlink">
<a href="javascript:document.reorderinfo.submit();"
class="submenutextright">${uiLabelMap.CommonSave}</a>
</div>
- <div class="h3">
- ${uiLabelMap.EcommerceShoppingListReorder} -
${shoppingList.listName}
+ <h3>
+ ${uiLabelMap.EcommerceShoppingListReorder} -
${shoppingList.listName}
<#if shoppingList.isActive?default("N") == "N">
- <font
color="yellow">${uiLabelMap.EcommerceOrderNotActive}</font>
+ ${uiLabelMap.EcommerceOrderNotActive}
</#if>
- </div>
+ </h3>
</div>
<div class="screenlet-body">
<form name="reorderinfo" method="post"
action="<@ofbizUrl>updateShoppingList</@ofbizUrl>">
- <input type="hidden" name="shoppingListId"
value="${shoppingList.shoppingListId}"/>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.EcommerceRecurrence}</div></td>
- <td>
- <#if recurrenceInfo?has_content>
- <#assign recurrenceRule =
recurrenceInfo.getRelatedOne("RecurrenceRule", false)!>
+ <fieldset class="inline">
+ <input type="hidden" name="shoppingListId"
value="${shoppingList.shoppingListId}" />
+ <div>
+ <span>
+ <label>${uiLabelMap.EcommerceRecurrence}</label>
+ <#if recurrenceInfo?has_content>
+ <#assign recurrenceRule =
recurrenceInfo.getRelatedOne("RecurrenceRule", false)!>
+ </#if>
+ <select name="intervalNumber" class="selectBox">
+ <option
value="">${uiLabelMap.EcommerceSelectInterval}</option>
+ <option value="1" <#if
(recurrenceRule.intervalNumber)?default(0) ==
1>selected="selected"</#if>>${uiLabelMap.EcommerceEveryDay}</option>
+ <option value="2" <#if
(recurrenceRule.intervalNumber)?default(0) ==
2>selected="selected"</#if>>${uiLabelMap.EcommerceEveryOther}</option>
+ <option value="3" <#if
(recurrenceRule.intervalNumber)?default(0) ==
3>selected="selected"</#if>>${uiLabelMap.EcommerceEvery3rd}</option>
+ <option value="6" <#if
(recurrenceRule.intervalNumber)?default(0) ==
6>selected="selected"</#if>>${uiLabelMap.EcommerceEvery6th}</option>
+ <option value="9" <#if
(recurrenceRule.intervalNumber)?default(0) ==
9>selected="selected"</#if>>${uiLabelMap.EcommerceEvery9th}</option>
+ </select>
+ <select name="frequency" class="selectBox">
+ <option
value="">${uiLabelMap.EcommerceSelectFrequency}</option>
+ <option value="4" <#if
(recurrenceRule.frequency)?default("") ==
"DAILY">selected="selected"</#if>>${uiLabelMap.CommonDay}</option>
+ <option value="5" <#if
(recurrenceRule.frequency)?default("") ==
"WEEKLY">selected="selected"</#if>>${uiLabelMap.CommonWeek}</option>
+ <option value="6" <#if
(recurrenceRule.frequency)?default("") ==
"MONTHLY">selected="selected"</#if>>${uiLabelMap.CommonMonth}</option>
+ <option value="7" <#if
(recurrenceRule.frequency)?default("") ==
"YEARLY">selected="selected"</#if>>${uiLabelMap.CommonYear}</option>
+ </select>
+ </span>
+ <span>
+ <label>${uiLabelMap.CommonStartDate}</label>
+ <input type="text" class="textBox" name="startDateTime"
size="22" value="${(recurrenceInfo.startDateTime)?if_exists}" />
+ <a
href="javascript:call_cal(document.reorderinfo.startDateTime,
'${nowTimestamp.toString()}');"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" alt="Calendar" /></a>
+ </span>
+ <span>
+ <label>${uiLabelMap.CommonEndDate}</label>
+ <input type="text" class="textBox" name="endDateTime"
size="22" value="${(recurrenceRule.untilDateTime)?if_exists}">
+ <a href="javascript:call_cal(document.reorderinfo.endDateTime,
'${nowTimestamp.toString()}');"><img
src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16"
height="16" border="0" alt="Calendar"></a>
+ </span>
+ </div>
+ <div>
+ <span><label>${uiLabelMap.OrderShipTo}</label>
+ <select name="contactMechId" class="selectBox"
onchange="javascript:document.reorderinfo.submit()">
+ <option
value="">${uiLabelMap.OrderSelectAShippingAddress}</option>
+ <#if shippingContactMechList?has_content>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress =
shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <option value="${shippingContactMech.contactMechId}"<#if
(shoppingList.contactMechId)?default("") == shippingAddress.contactMechId>
selected="selected"</#if>>${shippingAddress.address1}</option>
+ </#list>
+ <#else>
+ <option
value="">${uiLabelMap.OrderNoAddressesAvailable}</option>
</#if>
- <select name="intervalNumber" class="selectBox">
- <option
value="">${uiLabelMap.EcommerceSelectInterval}</option>
- <option value="1" <#if
(recurrenceRule.intervalNumber)?default(0) ==
1>selected="selected"</#if>>${uiLabelMap.EcommerceEveryDay}</option>
- <option value="2" <#if
(recurrenceRule.intervalNumber)?default(0) ==
2>selected="selected"</#if>>${uiLabelMap.EcommerceEveryOther}</option>
- <option value="3" <#if
(recurrenceRule.intervalNumber)?default(0) ==
3>selected="selected"</#if>>${uiLabelMap.EcommerceEvery3rd}</option>
- <option value="6" <#if
(recurrenceRule.intervalNumber)?default(0) ==
6>selected="selected"</#if>>${uiLabelMap.EcommerceEvery6th}</option>
- <option value="9" <#if
(recurrenceRule.intervalNumber)?default(0) ==
9>selected="selected"</#if>>${uiLabelMap.EcommerceEvery9th}</option>
- </select>
-
- <select name="frequency" class="selectBox">
- <option
value="">${uiLabelMap.EcommerceSelectFrequency}</option>
- <option value="4" <#if
(recurrenceRule.frequency)?default("") ==
"DAILY">selected="selected"</#if>>${uiLabelMap.CommonDay}</option>
- <option value="5" <#if
(recurrenceRule.frequency)?default("") ==
"WEEKLY">selected="selected"</#if>>${uiLabelMap.CommonWeek}</option>
- <option value="6" <#if
(recurrenceRule.frequency)?default("") ==
"MONTHLY">selected="selected"</#if>>${uiLabelMap.CommonMonth}</option>
- <option value="7" <#if
(recurrenceRule.frequency)?default("") ==
"YEARLY">selected="selected"</#if>>${uiLabelMap.CommonYear}</option>
- </select>
- </td>
- <td> </td>
- <td><div
class="tableheadtext">${uiLabelMap.CommonStartDate}</div></td>
- <td>
- <@htmlTemplate.renderDateTimeField name="startDateTime"
className="" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)!}" size="25"
maxlength="30" id="startDateTime1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
- </td>
- <td> </td>
- <td><div
class="tableheadtext">${uiLabelMap.CommonEndDate}</div></td>
- <td>
- <@htmlTemplate.renderDateTimeField name="endDateTime"
className="textBox" event="" action="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)!}" size="25"
maxlength="30" id="endDateTime1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
- </td>
- <td> </td>
- </tr>
- <tr><td colspan="9"><hr /></td></tr>
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.OrderShipTo}</div></td>
- <td>
- <select name="contactMechId" class="selectBox"
onchange="javascript:document.reorderinfo.submit()">
- <option
value="">${uiLabelMap.OrderSelectAShippingAddress}</option>
- <#if shippingContactMechList?has_content>
- <#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress =
shippingContactMech.getRelatedOne("PostalAddress", false)>
- <option
value="${shippingContactMech.contactMechId}"<#if
(shoppingList.contactMechId)?default("") == shippingAddress.contactMechId>
selected="selected"</#if>>${shippingAddress.address1}</option>
- </#list>
- <#else>
- <option
value="">${uiLabelMap.OrderNoAddressesAvailable}</option>
- </#if>
- </select>
- </td>
- <td> </td>
- <td><div
class="tableheadtext">${uiLabelMap.OrderShipVia}</div></td>
- <td>
+ </select>
+ </span>
+ <span><label>${uiLabelMap.OrderShipVia}</label>
<select name="shippingMethodString" class="selectBox">
<option
value="">${uiLabelMap.OrderSelectShippingMethod}</option>
<#if carrierShipMethods?has_content>
@@ -302,10 +291,8 @@ under the License.
<option
value="">${uiLabelMap.OrderSelectAddressFirst}</option>
</#if>
</select>
- </td>
- <td> </td>
- <td><div
class="tableheadtext">${uiLabelMap.OrderPayBy}</div></td>
- <td>
+ </span>
+ <span><label>${uiLabelMap.OrderPayBy}</label>
<select name="paymentMethodId" class="selectBox">
<option
value="">${uiLabelMap.OrderSelectPaymentMethod}</option>
<#list paymentMethodList as paymentMethod>
@@ -318,45 +305,37 @@ under the License.
</#if>
</#list>
</select>
- </td>
- <td> </td>
- </tr>
- <tr><td colspan="9"><hr /></td></tr>
- <tr>
- <td align="right" colspan="9">
- <div>
- <a href="javascript:document.reorderinfo.submit();"
class="buttontext">${uiLabelMap.CommonSave}</a>
- <a
href="<@ofbizUrl>editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=editShoppingList</@ofbizUrl>"
class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
- <a
href="<@ofbizUrl>editcreditcard?DONE_PAGE=editShoppingList</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceNewCreditCard}</a>
- <a
href="<@ofbizUrl>editeftaccount?DONE_PAGE=editShoppingList</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceNewEFTAccount}</a>
- </div>
- </td>
- </tr>
+ </span>
+ </div>
+ <div>
+ <a href="javascript:document.reorderinfo.submit();"
class="buttontext">${uiLabelMap.CommonSave}</a>
+ <a
href="<@ofbizUrl>editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=editShoppingList</@ofbizUrl>"
class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
+ <a
href="<@ofbizUrl>editcreditcard?DONE_PAGE=editShoppingList</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceNewCreditCard}</a>
+ <a
href="<@ofbizUrl>editeftaccount?DONE_PAGE=editShoppingList</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceNewEFTAccount}</a>
+ </div>
<#if shoppingList.isActive?default("N") == "Y">
- <tr><td colspan="9"><hr /></td></tr>
- <tr>
- <td colspan="9">
- <#assign nextTime = recInfo.next(lastSlOrderTime)!>
- <#if nextTime?has_content>
- <#assign nextTimeStamp =
Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(nextTime)!>
- <#if nextTimeStamp?has_content>
- <#assign nextTimeString =
Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(nextTimeStamp)!>
- </#if>
- </#if>
- <#if lastSlOrderDate?has_content>
- <#assign lastOrderedString =
Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)!>
+ <div>
+ <#assign nextTime = recInfo.next(lastSlOrderTime)?if_exists
/>
+ <#if nextTime?has_content>
+ <#assign nextTimeStamp =
Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(nextTime)?if_exists />
+ <#if nextTimeStamp?has_content>
+ <#assign nextTimeString =
Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(nextTimeStamp)?if_exists
/>
</#if>
- <div>
- <table cellspacing="2" cellpadding="2" border="0">
+ </#if>
+ <#if lastSlOrderDate?has_content>
+ <#assign lastOrderedString =
Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)!>
+ </#if>
+ <div class="tabletext">
+ <table>
<tr>
- <td><div
class="tableheadtext">${uiLabelMap.OrderLastOrderedDate}</div></td>
- <td><div class="tableheadtext">:</div></td>
-
<td><div>${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}</div></td>
+ <td>${uiLabelMap.OrderLastOrderedDate}</div></td>
+ <td>:</td>
+
<td>${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}</td>
</tr>
<tr>
- <td><div
class="tableheadtext">${uiLabelMap.EcommerceEstimateNextOrderDate}</div></td>
- <td><div class="tableheadtext">:</div></td>
-
<td><div>${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}</div></td>
+ <td>${uiLabelMap.EcommerceEstimateNextOrderDate}</td>
+ <td>:</td>
+
<td>${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}</td>
</tr>
</table>
</div>
@@ -375,40 +354,43 @@ under the License.
<div class="boxlink">
<a
href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>"
class="submenutextright">${uiLabelMap.EcommerceAddChildListsToCart}</a>
</div>
- <div class="h3"> ${uiLabelMap.EcommerceChildShoppingList} -
${shoppingList.listName}</div>
+ <h3> ${uiLabelMap.EcommerceChildShoppingList} -
${shoppingList.listName}</h3>
</div>
<div class="screenlet-body">
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td><div><b>${uiLabelMap.EcommerceListName}</b></div></td>
- <td
align="right"><div><b>${uiLabelMap.EcommerceTotalPrice}</b></div></td>
- <td> </td>
- <td> </td>
- </tr>
+ <table>
+ <thead>
+ <tr>
+ <th>${uiLabelMap.EcommerceListName}</th>
+ <th>${uiLabelMap.EcommerceListName}</th>
+ <th> </th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
<#list childShoppingListDatas as childShoppingListData>
<#assign childShoppingList =
childShoppingListData.childShoppingList/>
<#assign totalPrice = childShoppingListData.totalPrice/>
<tr>
- <td nowrap="nowrap">
- <a
href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>"
class="buttontext">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a>
+ <td>
+ <a
href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>"
class="button">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a>
</td>
- <td nowrap="nowrap" align="right">
- <div><@ofbizCurrency amount=totalPrice
isoCode=currencyUomId/></div>
+ <td>
+ <@ofbizCurrency amount=totalPrice isoCode=currencyUomId/>
</td>
- <td align="right">
- <a
href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceGoToList}</a>
- <a
href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.EcommerceAddListToCart}</a>
+ <td>
+ <a
href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>"
class="button">${uiLabelMap.EcommerceGoToList}</a>
+ <a
href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>"
class="button">${uiLabelMap.EcommerceAddListToCart}</a>
</td>
</tr>
</form>
</#list>
<tr><td colspan="6"><hr /></td></tr>
<tr>
- <td><div> </div></td>
- <td nowrap="nowrap" align="right">
- <div class="tableheadtext"><@ofbizCurrency
amount=shoppingListChildTotal isoCode=currencyUomId/></div>
+ <td> </td>
+ <td>
+ <@ofbizCurrency amount=shoppingListChildTotal
isoCode=currencyUomId/>
</td>
- <td><div> </div></td>
+ <td> </td>
</tr>
</table>
</div>
@@ -420,21 +402,24 @@ under the License.
<div class="boxlink">
<a
href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>"
class="submenutextright">${uiLabelMap.EcommerceAddListToCart}</a>
</div>
- <div class="h3"> ${uiLabelMap.EcommerceListItems} -
${shoppingList.listName}</div>
+ <h3>${uiLabelMap.EcommerceListItems} - ${shoppingList.listName}</h3>
</div>
<div class="screenlet-body">
<#if shoppingListItemDatas?has_content>
<#-- Pagination -->
<@paginationControls/>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td><div><b>${uiLabelMap.OrderProduct}</b></div></td>
- <td><table><tr><td nowrap="nowrap" align="center"><b>-
${uiLabelMap.EcommerceStartdate} -</b></td><td nowrap="nowrap"><b>-
${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td nowrap="nowrap"><b>-
${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td nowrap="nowrap"
align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td>
- <#-- <td nowrap="nowrap"
align="center"><div><b>Purchased</b></div></td> -->
- <td
align="right"><div><b>${uiLabelMap.EcommercePrice}</b></div></td>
- <td
align="right"><div><b>${uiLabelMap.OrderTotal}</b></div></td>
- <td> </td>
- </tr>
+ <table width="100%">
+ <thead>
+ <tr>
+ <th>${uiLabelMap.OrderProduct}</th>
+ <th><table><tr><th>- ${uiLabelMap.EcommerceStartdate}
-</th><th>- ${uiLabelMap.EcommerceNbrOfDays} -</th></tr><tr><th>-
${uiLabelMap.EcommerceNbrOfPersons} -</th><th>- ${uiLabelMap.CommonQuantity}
-</th></tr></table></th>
+ <#-- <td nowrap="nowrap"
align="center"><div><b>Purchased</b></div></td> -->
+ <th>${uiLabelMap.EcommercePrice}</th>
+ <th>${uiLabelMap.OrderTotal}</th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
<#list shoppingListItemDatas[lowIndex-1..highIndex-1] as
shoppingListItemData>
<#assign shoppingListItem =
shoppingListItemData.shoppingListItem/>
<#assign product = shoppingListItemData.product/>
@@ -445,46 +430,45 @@ under the License.
<#assign isVirtual = product.isVirtual?? &&
product.isVirtual.equals("Y")/>
<tr>
<td>
- <div>
- <a
href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>"
class="buttontext">${shoppingListItem.productId} -
- ${productContentWrapper.get("PRODUCT_NAME",
"html")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION",
"html")!}
- </div>
+ <a
href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>"
class="button">${shoppingListItem.productId} -
+ ${productContentWrapper.get("PRODUCT_NAME",
"html")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION",
"html")!}
</td>
- <td nowrap="nowrap" align="center">
- <form method="post"
action="<@ofbizUrl>updateShoppingListItem</@ofbizUrl>"
name="listform_${shoppingListItem.shoppingListItemSeqId}" style="margin: 0;">
- <input type="hidden" name="shoppingListId"
value="${shoppingListItem.shoppingListId}"/>
- <input type="hidden" name="shoppingListItemSeqId"
value="${shoppingListItem.shoppingListItemSeqId}"/>
- <input type="hidden" name="reservStart"/>
- <div>
- <#if product.productTypeId == "ASSET_USAGE" ||
product.productTypeId == "ASSET_USAGE_OUT_IN">
- <table border="0" width="100%">
- <tr>
- <td width="1%"> </td>
- <td><@htmlTemplate.renderDateTimeField
event="" action="" name="reservStartStr" className="inputBox" alert=""
title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="${shoppingListItem.reservStart!}" size="15" maxlength="30"
id="reservStartStr_${shoppingListItem.shoppingListItemSeqId}" dateType="date"
shortDateInput=true timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/></td>
- <td><input type="text" class="inputBox"
size="2" name="reservLength" value="${shoppingListItem.reservLength!}"/></td>
- </tr>
- <tr>
- <#if product.productTypeId == "ASSET_USAGE">
- <td> </td>
- <td><input type="text" class="inputBox"
size="3" name="reservPersons" value="${shoppingListItem.reservPersons!}"/></td>
- <#else>
- <td> </td>
- <td> </td>
- </#if>
- <td>
- <#else>
- <table width="100%">
- <tr>
- <td width="62%" align="center">--</td>
- <td align="center">--</td>
- </tr>
- <tr>
- <td align="center">--</td>
- <td><input type="hidden"
name="reservStartStr" value=""/>
- </#if>
- <input size="6" class="inputBox" type="text"
name="quantity" value="${shoppingListItem.quantity?string.number}"/>
- </td></tr></table>
- </div>
+ <td>
+ <form method="post"
action="<@ofbizUrl>updateShoppingListItem</@ofbizUrl>"
name="listform_${shoppingListItem.shoppingListItemSeqId}">
+ <fieldset>
+ <input type="hidden" name="shoppingListId"
value="${shoppingListItem.shoppingListId}" />
+ <input type="hidden" name="shoppingListItemSeqId"
value="${shoppingListItem.shoppingListItemSeqId}" />
+ <input type="hidden" name="reservStart" />
+ <#if product.productTypeId == "ASSET_USAGE">
+ <table>
+ <tr>
+ <td> </td>
+ <td>
+ <input type="text" class="inputBox" size="10"
name="reservStartStr" value="${shoppingListItem.reservStart?if_exists}" />
+ </td>
+ <td>
+ <input type="text" class="inputBox" size="2"
name="reservLength" value="${shoppingListItem.reservLength?if_exists}" />
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <input type="text" class="inputBox" size="3"
name="reservPersons" value="${shoppingListItem.reservPersons?if_exists}" />
+ </td>
+ <td>
+ <#else>
+ <table>
+ <tr>
+ <td>--</td>
+ <td>--</td>
+ </tr>
+ <tr>
+ <td>--</td>
+ <td><input type="hidden" name="reservStartStr"
value="" />
+ </#if>
+ <input size="6" class="inputBox" type="text"
name="quantity" value="${shoppingListItem.quantity?string.number}" />
+ </td></tr></table>
+ </fieldset>
</form>
</td>
<#--
@@ -492,54 +476,58 @@ under the License.
<div>${shoppingListItem.quantityPurchased?default(0)?string.number}</div>
</td>
-->
- <td nowrap="nowrap" align="right">
- <div><@ofbizCurrency amount=unitPrice
isoCode=currencyUomId/></div>
+ <td>
+ <@ofbizCurrency amount=unitPrice isoCode=currencyUomId/>
</td>
- <td nowrap="nowrap" align="right">
- <div><@ofbizCurrency amount=totalPrice
isoCode=currencyUomId/></div>
+ <td>
+ <@ofbizCurrency amount=totalPrice isoCode=currencyUomId/>
</td>
- <td align="right">
- <a href="#"
onclick="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});"
class="buttontext">${uiLabelMap.CommonUpdate}</a>
- <a
href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRemove}</a>
+ <td>
+ <a
href="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});"
class="button">${uiLabelMap.CommonUpdate}</a>
+ <a
href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>"
class="button">${uiLabelMap.CommonRemove}</a>
<#if isVirtual && productVariantAssocs?has_content>
- <#assign replaceItemAction =
"/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_!>
- <#assign addToCartAction = "/additem/" +
requestAttributes._CURRENT_VIEW_!>
- <br />
- <form method="post"
action="<@ofbizUrl>${addToCartAction}</@ofbizUrl>"
name="listreplform_${shoppingListItem.shoppingListItemSeqId}" style="margin:
0;">
- <input type="hidden" name="shoppingListId"
value="${shoppingListItem.shoppingListId}"/>
- <input type="hidden" name="shoppingListItemSeqId"
value="${shoppingListItem.shoppingListItemSeqId}"/>
- <input type="hidden" name="quantity"
value="${shoppingListItem.quantity}"/>
- <select name="add_product_id" class="selectBox">
+ <#assign replaceItemAction =
"/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_?if_exists />
+ <#assign addToCartAction = "/additem/" +
requestAttributes._CURRENT_VIEW_?if_exists />
+ <form method="post"
action="<@ofbizUrl>${addToCartAction}</@ofbizUrl>"
name="listreplform_${shoppingListItem.shoppingListItemSeqId}">
+ <fieldset>
+ <input type="hidden" name="shoppingListId"
value="${shoppingListItem.shoppingListId}" />
+ <input type="hidden" name="shoppingListItemSeqId"
value="${shoppingListItem.shoppingListItemSeqId}" />
+ <input type="hidden" name="quantity"
value="${shoppingListItem.quantity}" />
+ <select name="add_product_id" class="selectBox">
<#list productVariantAssocs as
productVariantAssoc>
- <#assign variantProduct =
productVariantAssoc.getRelatedOne("AssocProduct", true)>
+ <#assign variantProduct =
productVariantAssoc.getRelatedOneCache("AssocProduct") />
<#if variantProduct??>
- <#assign variantProductContentWrapper =
Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(variantProduct,
request)>
+ <#assign variantProductContentWrapper =
Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(variantProduct,
request) />
<option
value="${variantProduct.productId}">${variantproductContentWrapper.get("PRODUCT_NAME",
"html")?default("No Name")} [${variantProduct.productId}]</option>
</#if>
</#list>
- </select>
- <br />
- <a
href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${replaceItemAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();"
class="buttontext">${uiLabelMap.EcommerceReplaceWithVariation}</a>
- <br />
- <a
href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${addToCartAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();"
class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.EcommerceVariationToCart}</a>
+ </select>
+ <div>
+ <a
href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${replaceItemAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();"
class="button">${uiLabelMap.EcommerceReplaceWithVariation}</a>
+ </div>
+ <div>
+ <a
href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${addToCartAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();"
class="button">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.EcommerceVariationToCart}</a>
+ </div>
+ </fieldset>
</form>
<#else>
- <a href="<@ofbizUrl>additem<#if
requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if>?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}&quantity=${shoppingListItem.quantity}&reservStart=${shoppingListItem.reservStart!}&reservPersons=${shoppingListItem.reservPersons!}&reservLength=${shoppingListItem.reservLength!}&configId=${shoppingListItem.configId!}&add_product_id=${shoppingListItem.productId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}</a>
+ <a href="<@ofbizUrl>additem<#if
requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if>?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}&quantity=${shoppingListItem.quantity}&reservStart=${shoppingListItem.reservStart?if_exists}&reservPersons=${shoppingListItem.reservPersons?if_exists}&reservLength=${shoppingListItem.reservLength?if_exists}&configId=${shoppingListItem.configId?if_exists}&add_product_id=${shoppingListItem.productId}</@ofbizUrl>"
class="button">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}</a>
</#if>
</td>
</tr>
</#list>
- <tr><td colspan="6"><hr /></td></tr>
+ <tr><td><hr /></td></tr>
<tr>
- <td><div> </div></td>
- <td><div> </div></td>
+ <td> </td>
+ <td> </td>
<#--<td><div> </div></td>-->
- <td><div> </div></td>
- <td nowrap="nowrap" align="right">
- <div class="tableheadtext"><@ofbizCurrency
amount=shoppingListItemTotal isoCode=currencyUomId/></div>
+ <td> </td>
+ <td>
+ <@ofbizCurrency amount=shoppingListItemTotal
isoCode=currencyUomId/>
</td>
- <td><div> </div></td>
+ <td> </td>
</tr>
+ </tbody>
</table>
<#else>
<h2>${uiLabelMap.EcommerceShoppingListEmpty}.</h2>
@@ -548,53 +536,34 @@ under the License.
</div>
<div class="screenlet">
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.EcommerceShoppingListPriceTotals} -
${shoppingList.listName}</div>
- </div>
+ <h3>${uiLabelMap.EcommerceShoppingListPriceTotals} -
${shoppingList.listName}</h3>
<div class="screenlet-body">
- <table width="100%" border="0" cellspacing="1" cellpadding="1">
- <tr>
- <td width="5%" nowrap="nowrap">
- <div>${uiLabelMap.EcommerceChildListTotalPrice}</div>
- </td>
- <td align="right" width="5%" nowrap="nowrap">
- <div><@ofbizCurrency amount=shoppingListChildTotal
isoCode=currencyUomId/></div>
- </td>
- <td width="90%"><div> </div></td>
- </tr>
- <tr>
- <td nowrap="nowrap">
- <div>${uiLabelMap.EcommerceListItemsTotalPrice} </div>
- </td>
- <td align="right" nowrap="nowrap">
- <div><@ofbizCurrency amount=shoppingListItemTotal
isoCode=currencyUomId/></div>
- </td>
- <td><div> </div></td>
- </tr>
- <tr>
- <td nowrap="nowrap">
- <div class="tableheadtext">${uiLabelMap.OrderGrandTotal}</div>
- </td>
- <td align="right" nowrap="nowrap">
- <div class="tableheadtext"><@ofbizCurrency
amount=shoppingListTotalPrice isoCode=currencyUomId/></div>
- </td>
- <td><div> </div></td>
- </tr>
- </table>
+ <div>
+ <label>${uiLabelMap.EcommerceChildListTotalPrice}</label>
+ <@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/>
+ </div>
+ <div>
+ <label>${uiLabelMap.EcommerceListItemsTotalPrice}</label>
+ <@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/>
+ </div>
+ <div>
+ <label>${uiLabelMap.OrderGrandTotal}</label>
+ <@ofbizCurrency amount=shoppingListTotalPrice isoCode=currencyUomId/>
+ </div>
</div>
</div>
<div class="screenlet">
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.CommonQuickAddList}</div>
- </div>
+ <h3>${uiLabelMap.CommonQuickAddList}</h3>
<div class="screenlet-body">
<form name="addToShoppingList" method="post"
action="<@ofbizUrl>addItemToShoppingList</@ofbizUrl>">
- <input type="hidden" name="shoppingListId"
value="${shoppingList.shoppingListId}"/>
- <input type="text" class="inputBox" name="productId"
value="${requestParameters.add_product_id!}"/>
- <#if
reservStart??></td><td>${uiLabelMap.EcommerceStartDate}</td><td><input
type="text" class="inputBox" size="10" name="reservStart"
value="${requestParameters.reservStart?default("")}" /></td><td>
${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox"
size="2" name="reservLength"
value="${requestParameters.reservLength?default("")}"
/></td></tr><tr><td> </td><td> </td><td>${uiLabelMap.OrderNbrPersons}:</td><td><input
type="text" class="inputBox" size="3" name="reservPersons"
value="${requestParameters.reservPersons?default("1")}" /></td><td
nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input
type="text" class="inputBox" size="5" name="quantity"
value="${requestParameters.quantity?default("1")}" /></td><td>
- <!-- <input type="text" class="inputBox" size="5" name="quantity"
value="${requestParameters.quantity?default("1")}" />-->
- <input type="submit" class="smallSubmit"
value="${uiLabelMap.OrderAddToShoppingList}"/>
+ <fieldset class="inline>
+ <input type="hidden" name="shoppingListId"
value="${shoppingList.shoppingListId}" />
+ <input type="text" class="inputBox" name="productId"
value="${requestParameters.add_product_id?if_exists}" />
+ <#if
reservStart?exists><label>${uiLabelMap.EcommerceStartDate}</label><input
type="text" class="inputBox" size="10" name="reservStart"
value="${requestParameters.reservStart?default("")}" /><label>
${uiLabelMap.EcommerceLength}:</label><input type="text" class="inputBox"
size="2" name="reservLength"
value="${requestParameters.reservLength?default("")}"
><label>${uiLabelMap.OrderNbrPersons}:</label><input type="text"
class="inputBox" size="3" name="reservPersons"
value="${requestParameters.reservPersons?default("1")}" /></#if>
<label>${uiLabelMap.CommonQuantity} :</label><input type="text"
class="inputBox" size="5" name="quantity"
value="${requestParameters.quantity?default("1")}" />
+ <!-- <input type="text" class="inputBox" size="5" name="quantity"
value="${requestParameters.quantity?default("1")}" />-->
+ <input type="submit" class="smallSubmit"
value="${uiLabelMap.OrderAddToShoppingList}" />
+ </fieldset>
</form>
</div>
</div>
