diff --git a/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl b/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl index a310337523e..ca7c654387d 100644 --- a/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl +++ b/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl @@ -18,6 +18,7 @@ under the License. --> -
<#macro paginationControls> <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize)?double / viewSize?double)> <#if (viewIndexMax?int > 0)> @@ -85,24 +86,25 @@ under the License.
${uiLabelMap.CommonCreateNew}
-

 ${uiLabelMap.EcommerceShoppingLists}

+

${uiLabelMap.EcommerceShoppingLists}

<#if shoppingLists?has_content> -
- -    - ${uiLabelMap.CommonEdit} + +
+ + ${uiLabelMap.CommonEdit} +
<#else> -
${uiLabelMap.EcommerceNoShoppingListsCreate}.
+ ${uiLabelMap.CommonCreateNew}
@@ -114,93 +116,86 @@ under the License.
-
- -
${uiLabelMap.OrderCreateCustRequestFromShoppingList}
 -
-
- -
${uiLabelMap.OrderCreateQuoteFromShoppingList}
 -
- ${uiLabelMap.CommonSave} + ${uiLabelMap.OrderCreateCustRequestFromShoppingList} + ${uiLabelMap.OrderCreateQuoteFromShoppingList} + ${uiLabelMap.CommonSave}
-
${uiLabelMap.EcommerceShoppingListDetail} - ${shoppingList.listName}
+

${uiLabelMap.EcommerceShoppingListDetail} - ${shoppingList.listName}

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${uiLabelMap.EcommerceListName}
 -
${uiLabelMap.CommonDescription}
 -
${uiLabelMap.OrderListType}
 - -
${uiLabelMap.EcommercePublic}?
 - -
${uiLabelMap.EcommerceActive}?
 - -
${uiLabelMap.EcommerceParentList}
 - - <#if parentShoppingList??> - ${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}) - -
 
 - ${uiLabelMap.CommonSave} -
+ +
+ +
+
+
+
+ +
+
+
+
+ + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + <#if parentShoppingList??> + ${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)}) + +
+
+ +
+
@@ -212,71 +207,65 @@ under the License.
${uiLabelMap.CommonSave}
-
-  ${uiLabelMap.EcommerceShoppingListReorder} - ${shoppingList.listName} +

+ ${uiLabelMap.EcommerceShoppingListReorder} - ${shoppingList.listName} <#if shoppingList.isActive?default("N") == "N"> - ${uiLabelMap.EcommerceOrderNotActive} + ${uiLabelMap.EcommerceOrderNotActive} -

+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ ${uiLabelMap.CommonSave} + ${uiLabelMap.PartyAddNewAddress} + ${uiLabelMap.EcommerceNewCreditCard} + ${uiLabelMap.EcommerceNewEFTAccount} +
<#if shoppingList.isActive?default("N") == "Y"> - - -
${uiLabelMap.EcommerceRecurrence}
 - <#if recurrenceInfo?has_content> - <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule", false)!> +
+ +
+ + + <#if recurrenceInfo?has_content> + <#assign recurrenceRule = recurrenceInfo.getRelatedOne("RecurrenceRule", false)!> + + + + + + + + Calendar + + + + + Calendar + +
+
+ + - - - - - - - -   - -
 
${uiLabelMap.CommonStartDate}
 - <@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=""/> -  
${uiLabelMap.CommonEndDate}
 - <@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=""/> -  
${uiLabelMap.OrderShipTo}
 - -  
${uiLabelMap.OrderShipVia}
 + + + -  
${uiLabelMap.OrderPayBy}
 + + -  
- -
- <#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 lastSlOrderDate?has_content> - <#assign lastOrderedString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)!> +
+ <#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 lastSlOrderDate?has_content> + <#assign lastOrderedString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)!> + +
+
- - - + + + - - - + + +
${uiLabelMap.OrderLastOrderedDate}
:
${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}
${uiLabelMap.OrderLastOrderedDate}:${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}
${uiLabelMap.EcommerceEstimateNextOrderDate}
:
${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}
${uiLabelMap.EcommerceEstimateNextOrderDate}:${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}
@@ -375,40 +354,43 @@ under the License.
${uiLabelMap.EcommerceAddChildListsToCart}
-
 ${uiLabelMap.EcommerceChildShoppingList} - ${shoppingList.listName}
+

 ${uiLabelMap.EcommerceChildShoppingList} - ${shoppingList.listName}

- - - - - - - +
${uiLabelMap.EcommerceListName}
${uiLabelMap.EcommerceTotalPrice}
  
+ + + + + + + + + <#list childShoppingListDatas as childShoppingListData> <#assign childShoppingList = childShoppingListData.childShoppingList/> <#assign totalPrice = childShoppingListData.totalPrice/> - - - - - + - +
${uiLabelMap.EcommerceListName}${uiLabelMap.EcommerceListName}  
- ${childShoppingList.listName?default(childShoppingList.shoppingListId)} + + ${childShoppingList.listName?default(childShoppingList.shoppingListId)} -
<@ofbizCurrency amount=totalPrice isoCode=currencyUomId/>
+ 		+ <@ofbizCurrency amount=totalPrice isoCode=currencyUomId/> - ${uiLabelMap.EcommerceGoToList} - ${uiLabelMap.EcommerceAddListToCart} + + ${uiLabelMap.EcommerceGoToList} + ${uiLabelMap.EcommerceAddListToCart}
 
 -
<@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/>
+ 		  + <@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/>
 
 
@@ -420,21 +402,24 @@ under the License.
${uiLabelMap.EcommerceAddListToCart}
-
 ${uiLabelMap.EcommerceListItems} - ${shoppingList.listName}
+

${uiLabelMap.EcommerceListItems} - ${shoppingList.listName}

<#if shoppingListItemDatas?has_content> <#-- Pagination --> <@paginationControls/> - - - - - <#-- --> - - - - +
${uiLabelMap.OrderProduct}
- ${uiLabelMap.EcommerceStartdate} -- ${uiLabelMap.EcommerceNbrOfDays} -
- ${uiLabelMap.EcommerceNbrOfPersons} -- ${uiLabelMap.CommonQuantity} -
Purchased
${uiLabelMap.EcommercePrice}
${uiLabelMap.OrderTotal}
 
+ + + + + <#-- --> + + + + + + <#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")/> -
${uiLabelMap.OrderProduct}
- ${uiLabelMap.EcommerceStartdate} -- ${uiLabelMap.EcommerceNbrOfDays} -
- ${uiLabelMap.EcommerceNbrOfPersons} -- ${uiLabelMap.CommonQuantity} -
Purchased
${uiLabelMap.EcommercePrice}${uiLabelMap.OrderTotal} 
- + ${shoppingListItem.productId} - + ${productContentWrapper.get("PRODUCT_NAME", "html")?default("No Name")} : ${productContentWrapper.get("DESCRIPTION", "html")!} -
- - - -
- <#if product.productTypeId == "ASSET_USAGE" || product.productTypeId == "ASSET_USAGE_OUT_IN"> - - - - - - - - <#if product.productTypeId == "ASSET_USAGE"> - - - <#else> - - - -
 <@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=""/>
    - <#else> - - - - - - - -
----
-- - - -
- + 		+ +
+ + + + <#if product.productTypeId == "ASSET_USAGE"> + + + + + + + + + + <#-- @@ -492,54 +476,58 @@ under the License.
${shoppingListItem.quantityPurchased?default(0)?string.number}
--> - - - - + - - + + <#----> - - + - + +
  + + + +
  + + + <#else> + + + + + + + +
----
-- + + +
+ 		-
<@ofbizCurrency amount=unitPrice isoCode=currencyUomId/>
+ 		+ <@ofbizCurrency amount=unitPrice isoCode=currencyUomId/> -
<@ofbizCurrency amount=totalPrice isoCode=currencyUomId/>
+ 		+ <@ofbizCurrency amount=totalPrice isoCode=currencyUomId/> - ${uiLabelMap.CommonUpdate} - ${uiLabelMap.CommonRemove} + + ${uiLabelMap.CommonUpdate} + ${uiLabelMap.CommonRemove} <#if isVirtual && productVariantAssocs?has_content> - <#assign replaceItemAction = "/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_!> - <#assign addToCartAction = "/additem/" + requestAttributes._CURRENT_VIEW_!> -
-
- - - - + + + -
- ${uiLabelMap.EcommerceReplaceWithVariation} -
- ${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.EcommerceVariationToCart} + + + +
<#else> - ${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart} + ${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}
 
 
  
 
 
 -
<@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/>
+ 		  + <@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/>
 
 
<#else>

${uiLabelMap.EcommerceShoppingListEmpty}.

@@ -548,53 +536,34 @@ under the License.
-
-
${uiLabelMap.EcommerceShoppingListPriceTotals} - ${shoppingList.listName}
-
+

${uiLabelMap.EcommerceShoppingListPriceTotals} - ${shoppingList.listName}

- - - - - - - - - - - - - - - - -
-
${uiLabelMap.EcommerceChildListTotalPrice}
- 		-
<@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/>
-
 
-
${uiLabelMap.EcommerceListItemsTotalPrice} 
- 		-
<@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/>
-
 
-
${uiLabelMap.OrderGrandTotal}
- 		-
<@ofbizCurrency amount=shoppingListTotalPrice isoCode=currencyUomId/>
-
 
+
+ + <@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/> +
+
+ + <@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/> +
+
+ + <@ofbizCurrency amount=shoppingListTotalPrice isoCode=currencyUomId/> +
-
-
${uiLabelMap.CommonQuickAddList}
-
+

${uiLabelMap.CommonQuickAddList}

- - - <#if reservStart??>
${uiLabelMap.EcommerceStartDate} ${uiLabelMap.EcommerceLength}:
  ${uiLabelMap.OrderNbrPersons}: ${uiLabelMap.CommonQuantity} : - - +
+ + <#if reservStart?exists> + + +