You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/03/28 13:14:24 UTC
svn commit: r1736868 [2/20] - in /ofbiz/trunk/applications/order: template/
template/entry/ template/entry/cart/ template/entry/catalog/
template/entry/order/ template/order/ template/product/ template/quote/
template/reports/ template/request/ templat...
Propchange: ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,105 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<script language="JavaScript" type="text/javascript">
+function toggle(e) {
+ e.checked = !e.checked;
+}
+function checkToggle(e) {
+ var cform = document.cartform;
+ if (e.checked) {
+ var len = cform.elements.length;
+ var allchecked = true;
+ for (var i = 0; i < len; i++) {
+ var element = cform.elements[i];
+ if (element.name == "selectedItem" && !element.checked) {
+ allchecked = false;
+ }
+ cform.selectAll.checked = allchecked;
+ }
+ } else {
+ cform.selectAll.checked = false;
+ }
+}
+function toggleAll() {
+ var cform = document.cartform;
+ var len = cform.elements.length;
+ for (var i = 0; i < len; i++) {
+ var e = cform.elements[i];
+ if (e.name == "selectedItem") {
+ toggle(e);
+ }
+ }
+}
+function removeSelected() {
+ var cform = document.cartform;
+ cform.removeSelected.value = true;
+ cform.submit();
+}
+function addToList() {
+ var cform = document.cartform;
+ cform.action = "<@o...@ofbizUrl>";
+ cform.submit();
+}
+function gwAll(e) {
+ var cform = document.cartform;
+ var len = cform.elements.length;
+ var selectedValue = e.value;
+ if (selectedValue == "") {
+ return;
+ }
+
+ var cartSize = ${shoppingCartSize};
+ var passed = 0;
+ for (var i = 0; i < len; i++) {
+ var element = cform.elements[i];
+ var ename = element.name;
+ var sname = ename.substring(0,16);
+ if (sname == "option^GIFT_WRAP") {
+ var options = element.options;
+ var olen = options.length;
+ var matching = -1;
+ for (var x = 0; x < olen; x++) {
+ var thisValue = element.options[x].value;
+ if (thisValue == selectedValue) {
+ element.selectedIndex = x;
+ passed++;
+ }
+ }
+ }
+ }
+ if (cartSize > passed && selectedValue != "NO^") {
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.OrderSelectedGiftNotAvailableForAll}");
+ }
+ cform.submit();
+}
+function quicklookup_popup(element) {
+ target = element; // note: global var target comes from fieldlookup.js
+ var searchTerm = element.value;
+ var obj_lookupwindow = window.open('LookupProduct?productId_op=like&productId_ic=Y&productId=' + searchTerm,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
+}
+function quicklookup(element) {
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ window.location='<@o...@ofbizUrl>?productId='+element.value;
+ <#else>
+ window.location='<@o...@ofbizUrl>?productId='+element.value;
+ </#if>
+}
+</script>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,46 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if allProductPromos?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3"> ${uiLabelMap.OrderManualPromotions}</div>
+ </div>
+ <div class="screenlet-body">
+ <div>
+ <form method="post" action="<@o...@ofbizUrl>" name="domanualpromotions" style="margin: 0;">
+ <!-- to enter more than two manual promotions, just add a new select box with name="productPromoId_n" -->
+ <select name="productPromoId_1">
+ <option value=""></option>
+ <#list allProductPromos as productPromo>
+ <option value="${productPromo.productPromoId}">${productPromo.promoName!}</option>
+ </#list>
+ </select>
+ <select name="productPromoId_2">
+ <option value=""></option>
+ <#list allProductPromos as productPromo>
+ <option value="${productPromo.productPromoId}">${productPromo.promoName!}</option>
+ </#list>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderDoPromotions}" />
+ </form>
+ </div>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,91 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#assign shoppingCart = sessionAttributes.shoppingCart!>
+<#if shoppingCart?has_content>
+ <#assign shoppingCartSize = shoppingCart.size()>
+<#else>
+ <#assign shoppingCartSize = 0>
+</#if>
+
+<div id="minicart">
+ <h3>${uiLabelMap.OrderCartSummary}</h3>
+ <div>
+ <#if (shoppingCartSize > 0)>
+ <#if hidetoplinks?default("N") != "Y">
+ <ul>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderViewCart}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckout}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckoutQuick}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
+ </ul>
+ </#if>
+ <table>
+ <thead>
+ <tr>
+ <th>${uiLabelMap.OrderQty}</th>
+ <th>${uiLabelMap.OrderItem}</th>
+ <th>${uiLabelMap.CommonSubtotal}</th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td colspan="3">
+ ${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/>
+ </td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <#list shoppingCart.items() as cartLine>
+ <tr>
+ <td>${cartLine.getQuantity()?string.number}</td>
+ <td>
+ <#if cartLine.getProductId()??>
+ <#if cartLine.getParentProductId()??>
+ <a href="<@ofbizCatalogAltUrl productId=cartLine.getParentProductId()/>" class="linktext">${cartLine.getName()}</a>
+ <#else>
+ <a href="<@ofbizCatalogAltUrl productId=cartLine.getProductId()/>" class="linktext">${cartLine.getName()}</a>
+ </#if>
+ <#else>
+ <strong>${cartLine.getItemTypeDescription()!}</strong>
+ </#if>
+ </td>
+ <td><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></td>
+ </tr>
+ <#if cartLine.getReservStart()??>
+ <tr><td> </td><td colspan="2">(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else>${uiLabelMap.CommonDays}</#if>)</td></tr>
+ </#if>
+ </#list>
+ </tbody>
+ </table>
+ <#if hidebottomlinks?default("N") != "Y">
+ <ul>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderViewCart}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckout}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderCheckoutQuick}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceOnePageCheckout}</a></li>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li>
+ </ul>
+ </#if>
+ <#else>
+ <p>${uiLabelMap.OrderShoppingCartEmpty}</p>
+ </#if>
+ </div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,41 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if shoppingCart.getOrderType() == "SALES_ORDER">
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3"> ${uiLabelMap.OrderPromotionCouponCodes}</div>
+ </div>
+ <div class="screenlet-body">
+ <div>
+ <form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" name="addpromocodeform" style="margin: 0;">
+ <input type="text" size="15" name="productPromoCodeId" value="" />
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}" />
+ <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())!>
+ <#if productPromoCodeIds?has_content>
+ ${uiLabelMap.OrderEnteredPromoCodes}:
+ <#list productPromoCodeIds as productPromoCodeId>
+ ${productPromoCodeId}
+ </#list>
+ </#if>
+ </form>
+ </div>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,46 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if showPromoText?? && showPromoText>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderSpecialOffers}</div>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" cellpadding="1" border="0">
+ <#-- show promotions text -->
+ <#list productPromos as productPromo>
+ <tr>
+ <td>
+ <div><a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${StringUtil.wrapString(productPromo.promoText!)}</div>
+ </td>
+ </tr>
+ <#if productPromo_has_next>
+ <tr><td><hr /></td></tr>
+ </#if>
+ </#list>
+ <tr><td><hr /></td></tr>
+ <tr>
+ <td>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a></div>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,77 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div>
+ <h1>${uiLabelMap.OrderPromotionInformation}:</h1>
+ <h3>${uiLabelMap.OrderPromotionsApplied}:</h3>
+ <ul>
+ <#list shoppingCart.getProductPromoUseInfoIter() as productPromoUseInfo>
+ <li>
+ <#-- TODO: when promo pretty print is done show promo short description here -->
+ ${uiLabelMap.OrderPromotion} <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a>
+ <#if productPromoUseInfo.productPromoCodeId?has_content> - ${uiLabelMap.OrderWithPromoCode} [${productPromoUseInfo.productPromoCodeId}]</#if>
+ <#if (productPromoUseInfo.totalDiscountAmount != 0)> - ${uiLabelMap.CommonTotalValue} <@ofbizCurrency amount=(-1*productPromoUseInfo.totalDiscountAmount) isoCode=shoppingCart.getCurrency()/></#if>
+ <#if productPromoUseInfo.productPromoCodeId?has_content>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderRemovePromotion}</a>
+ </#if>
+ </li>
+ <#if (productPromoUseInfo.quantityLeftInActions > 0)>
+ <li>- Could be used for ${productPromoUseInfo.quantityLeftInActions} more discounted item<#if (productPromoUseInfo.quantityLeftInActions > 1)>s</#if> if added to your cart.</li>
+ </#if>
+ </#list>
+ </ul>
+ <h3>${uiLabelMap.OrderCartItemUseinPromotions}:</h3>
+ <ul>
+ <#list shoppingCart.items() as cartLine>
+ <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
+ <#if cartLine.getIsPromo()>
+ <li>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()!}] - ${uiLabelMap.OrderIsAPromotionalItem}</li>
+ <#else>
+ <li>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()!}] - ${cartLine.getPromoQuantityUsed()?string.number}/${cartLine.getQuantity()?string.number} ${uiLabelMap.CommonUsed} - ${cartLine.getPromoQuantityAvailable()?string.number} ${uiLabelMap.CommonAvailable}
+ <ul>
+ <#list cartLine.getQuantityUsedPerPromoActualIter() as quantityUsedPerPromoActualEntry>
+ <#assign productPromoActualPK = quantityUsedPerPromoActualEntry.getKey()>
+ <#assign actualQuantityUsed = quantityUsedPerPromoActualEntry.getValue()>
+ <#assign isQualifier = "ProductPromoCond" == productPromoActualPK.getEntityName()>
+ <li> - ${actualQuantityUsed} ${uiLabelMap.CommonUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a></li>
+ <!-- productPromoActualPK ${productPromoActualPK.toString()} -->
+ </#list>
+ </ul>
+ <ul>
+ <#list cartLine.getQuantityUsedPerPromoFailedIter() as quantityUsedPerPromoFailedEntry>
+ <#assign productPromoFailedPK = quantityUsedPerPromoFailedEntry.getKey()>
+ <#assign failedQuantityUsed = quantityUsedPerPromoFailedEntry.getValue()>
+ <#assign isQualifier = "ProductPromoCond" == productPromoFailedPK.getEntityName()>
+ <li> - ${uiLabelMap.CommonCouldBeUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a></li>
+ <!-- Total times checked but failed: ${failedQuantityUsed}, productPromoFailedPK ${productPromoFailedPK.toString()} -->
+ </#list>
+ </ul>
+ <#list cartLine.getQuantityUsedPerPromoCandidateIter() as quantityUsedPerPromoCandidateEntry>
+ <#assign productPromoCandidatePK = quantityUsedPerPromoCandidateEntry.getKey()>
+ <#assign candidateQuantityUsed = quantityUsedPerPromoCandidateEntry.getValue()>
+ <#assign isQualifier = "ProductPromoCond" == productPromoCandidatePK.getEntityName()>
+ <!-- Left over not reset or confirmed, shouldn't happen: ${candidateQuantityUsed} Might be Used (Candidate) as <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} [${productPromoCandidatePK.productPromoId}] -->
+ <!-- productPromoCandidatePK ${productPromoCandidatePK.toString()} -->
+ </#list>
+ </li>
+ </#if>
+ </#list>
+ </ul>
+</div>
+
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,57 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if productPromoCategoryIncludeList?has_content || productPromoCategoryExcludeList?has_content || productPromoCategoryAlwaysList?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderPromotionCategories}:</div>
+ </div>
+ <div class="screenlet-body">
+ <#if productPromoCategoryIncludeList?has_content>
+ <div>${uiLabelMap.OrderPromotionProductsInCategories}:</div>
+ <#list productPromoCategoryIncludeList as productPromoCategory>
+ <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
+ <div>
+ - <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
+ <#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
+ </div>
+ </#list>
+ </#if>
+ <#if productPromoCategoryExcludeList?has_content>
+ <div>${uiLabelMap.OrderExcludeCategories}</div>
+ <#list productPromoCategoryExcludeList as productPromoCategory>
+ <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
+ <div>
+ - <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
+ <#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
+ </div>
+ </#list>
+ </#if>
+ <#if productPromoCategoryAlwaysList?has_content>
+ <div>${uiLabelMap.OrderAlwaysList}</div>
+ <#list productPromoCategoryAlwaysList as productPromoCategory>
+ <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)>
+ <div>
+ - <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
+ <#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
+ </div>
+ </#list>
+ </#if>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,28 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderPromotionDetails}:</div>
+ </div>
+ <div class="screenlet-body">
+ <div>${StringUtil.wrapString(productPromo.promoText!)}</div>
+ <div>${uiLabelMap.EcommerceGeneratedDescription} ${promoAutoDescription!}</div>
+ </div>
+</div>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,68 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if productIds?has_content>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderProductsForPromotion}:</div>
+ </div>
+ <div class="screenlet-body">
+ <#if (listSize > 0)>
+ <table border="0" width="100%" cellpadding="2">
+ <tr>
+ <td align="right">
+ <span>
+ <b>
+ <#if (viewIndex > 0)>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
+ </#if>
+ ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+ <#if (listSize > highIndex)>
+ | <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
+ </#if>
+ </b>
+ </span>
+ </td>
+ </tr>
+ </table>
+ </#if>
+
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom">
+ <tr>
+ <td><div>${uiLabelMap.CommonQualifier}</div></td>
+ <td><div>${uiLabelMap.CommonBenefit}</div></td>
+ <td><div> </div></td>
+ </tr>
+ <#if (listSize > 0)>
+ <#list productIds[lowIndex..highIndex-1] as productId>
+ <tr>
+ <td><div>[<#if productIdsCond.contains(productId)>x<#else> </#if>]</div></td>
+ <td><div>[<#if productIdsAction.contains(productId)>x<#else> </#if>]</div></td>
+ <td>
+ ${setRequestAttribute("optProductId", productId)}
+ ${setRequestAttribute("listIndex", productId_index)}
+ ${screens.render(productsummaryScreen)}
+ </td>
+ </tr>
+ </#list>
+ </#if>
+ </table>
+ </div>
+</div>
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,23 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if (shoppingCartSize?default(0) > 0)>
+ <br />
+ ${screens.render(promoUseDetailsInlineScreen)}
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,33 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div>
+ <h1>${uiLabelMap.OrderSpecialOffers}</h1>
+ <div>
+ <ul>
+ <#-- show promotions text -->
+ <#list productPromosAllShowable as productPromo>
+ <li><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a>${StringUtil.wrapString(productPromo.promoText!)}</li>
+ </#list>
+ </ul>
+ </div>
+</div>
+
+<#if (shoppingCartSize > 0)>
+ ${screens.render(promoUseDetailsInlineScreen)}
+</#if>
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,195 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<script language="JavaScript" type="text/javascript">
+ function showQohAtp() {
+ document.qohAtpForm.productId.value = document.quickaddform.add_product_id.value;
+ document.qohAtpForm.submit();
+ }
+ function quicklookupGiftCertificate() {
+ window.location='AddGiftCertificate';
+ }
+</script>
+<#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <#assign target="productAvailabalityByFacility">
+<#else>
+ <#assign target="getProductInventoryAvailable">
+</#if>
+<div class="screenlet">
+ <div class="screenlet-body">
+ <#if shoppingCart.getOrderType() == "SALES_ORDER">
+ <div>
+ <#if quantityOnHandTotal?? && availableToPromiseTotal?? && (productId)??>
+ <ul>
+ <li>
+ <label>${uiLabelMap.ProductQuantityOnHand}</label>: ${quantityOnHandTotal}
+ </li>
+ <li>
+ <label>${uiLabelMap.ProductAvailableToPromise}</label>: ${availableToPromiseTotal}
+ </li>
+ </ul>
+ </#if>
+ </div>
+ <#else>
+ <#if parameters.availabalityList?has_content>
+ <table>
+ <tr>
+ <td>${uiLabelMap.Facility}</td>
+ <td>${uiLabelMap.ProductQuantityOnHand}</td>
+ <td>${uiLabelMap.ProductAvailableToPromise}</td>
+ </tr>
+ <#list parameters.availabalityList as availabality>
+ <tr>
+ <td>${availabality.facilityId}</td>
+ <td>${availabality.quantityOnHandTotal}</td>
+ <td>${availabality.availableToPromiseTotal}</td>
+ </tr>
+ </#list>
+ </table>
+ </#if>
+ </#if>
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <form name="qohAtpForm" method="post" action="<@o...@ofbizUrl>">
+ <fieldset>
+ <input type="hidden" name="facilityId" value="${facilityId!}"/>
+ <input type="hidden" name="productId"/>
+ <input type="hidden" id="ownerPartyId" name="ownerPartyId" value="${shoppingCart.getBillToCustomerPartyId()!}" />
+ </fieldset>
+ </form>
+ <form method="post" action="<@o...@ofbizUrl>" name="quickaddform" style="margin: 0;">
+ <table border="0">
+ <tr>
+ <td align="right"><div>${uiLabelMap.ProductProductId} :</div></td>
+ <td>
+ <span class='tabletext'>
+ <#if orderType=="PURCHASE_ORDER">
+ <#if partyId?has_content>
+ <#assign fieldFormName="LookupSupplierProduct?partyId=${partyId}">
+ <#else>
+ <#assign fieldFormName="LookupSupplierProduct">
+ </#if>
+ <#else>
+ <#assign fieldFormName="LookupProduct">
+ </#if>
+ <@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/>
+ <a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
+ <a href="javascript:quicklookupGiftCertificate()" class="buttontext">${uiLabelMap.OrderAddGiftCertificate}</a>
+ <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
+ <a href="javascript:showQohAtp()" class="buttontext">${uiLabelMap.ProductAtpQoh}</a>
+ </#if>
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td align="right"><div>${uiLabelMap.OrderQuantity} :</div></td>
+ <td><input type="text" size="6" name="quantity" value=""/></td>
+ </tr>
+ <tr>
+ <td align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td>
+ <td>
+ <div>
+ <#if useAsDefaultDesiredDeliveryDate??>
+ <#assign value = defaultDesiredDeliveryDate>
+ </#if>
+ <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate" value="${value!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate??> checked="checked"</#if>/>
+ ${uiLabelMap.OrderUseDefaultDesiredDeliveryDate}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td align="right"><div>${uiLabelMap.OrderShipAfterDate} :</div></td>
+ <td>
+ <div>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td align="right"><div>${uiLabelMap.OrderShipBeforeDate} :</div></td>
+ <td>
+ <div>
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </div>
+ </td>
+ </tr>
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <tr>
+ <td align="right"><div>${uiLabelMap.OrderOrderItemType} :</div></td>
+ <td>
+ <div>
+ <select name="add_item_type">
+ <option value=""> </option>
+ <#list purchaseOrderItemTypeList as orderItemType>
+ <option value="${orderItemType.orderItemTypeId}">${orderItemType.description}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td align="right"><div>${uiLabelMap.CommonComment} :</div></td>
+ <td>
+ <div>
+ <input type="text" size="25" name="itemComment" value="${defaultComment!}" />
+ <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment??>checked="checked"</#if> />
+ ${uiLabelMap.OrderUseDefaultComment}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToOrder}"/></td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <tr><td><hr /></td></tr>
+ <tr>
+ <td>
+ <form method="post" action="<@o...@ofbizUrl>" name="bulkworkaddform" style="margin: 0;">
+ <div>
+ ${uiLabelMap.OrderOrderItemType}: <select name="add_item_type"><option value="BULK_ORDER_ITEM">${uiLabelMap.ProductBulkItem}</option><option value="WORK_ORDER_ITEM">${uiLabelMap.ProductWorkItem}</option></select>
+ <br/>${uiLabelMap.ProductProductCategory}:
+ <@htmlTemplate.lookupField formName="bulkworkaddform" value="${requestParameters.add_category_id!}" name="add_category_id" id="add_category_id" fieldFormName="LookupProductCategory"/>
+ </div>
+ <div>
+ ${uiLabelMap.CommonDescription}: <input type="text" size="25" name="add_item_description" value=""/>
+ ${uiLabelMap.OrderQuantity}: <input type="text" size="3" name="quantity" value="${requestParameters.quantity?default("1")}"/>
+ ${uiLabelMap.OrderPrice}: <input type="text" size="6" name="price" value="${requestParameters.price!}"/>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToOrder}"/>
+ </div>
+ </form>
+ </td>
+ </tr>
+ </#if>
+ </table>
+ </div>
+</div>
+
+<script language="JavaScript" type="text/javascript">
+ document.quickaddform.add_product_id.focus();
+</script>
+
+<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()!} locale=${shoppingCart.getLocale()!} currencyUom=${shoppingCart.getCurrency()!} userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))!} autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))!} -->
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,355 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#-- Continuation of showcart.ftl: List of order items and forms to modify them. -->
+<#macro showAssoc productAssoc>
+ <#assign productAssocType = (delegator.findOne("ProductAssocType", {"productAssocTypeId" : productAssoc.productAssocTypeId}, false))/>
+ <#assign assocProduct = (delegator.findOne("Product", {"productId" : productAssoc.productIdTo}, false))/>
+ <#if assocProduct?has_content>
+ <td><a href="<@o...@ofbizUrl>"class="buttontext">${productAssoc.productIdTo}</a></td>
+ <td>- ${(assocProduct.productName)!}<i>(${(productAssocType.description)?default("Unknown")})</i></td>
+ </#if>
+</#macro>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class='h3'>${uiLabelMap.OrderOrderItems}</div>
+ </div>
+ <div class="screenlet-body">
+ <#if (shoppingCartSize > 0)>
+ <form method="post" action="<@o...@ofbizUrl>" name="cartform" style="margin: 0;">
+ <input type="hidden" name="removeSelected" value="false"/>
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <input type="hidden" name="finalizeReqShipInfo" value="false"/>
+ <input type="hidden" name="finalizeReqOptions" value="false"/>
+ <input type="hidden" name="finalizeReqPayInfo" value="false"/>
+ <input type="hidden" name="finalizeReqAdditionalParty" value="false"/>
+ </#if>
+ <table cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td> </td>
+ <td colspan="2">
+ <div>
+ <b>${uiLabelMap.ProductProduct}</b>
+ <#if (shoppingCart.getOrderType() == 'SALES_ORDER') && (productStore.showCheckoutGiftOptions)?default('Y') != 'N'>
+ <select name="GWALL" onchange="javascript:gwAll(this);">
+ <option value="">${uiLabelMap.OrderGiftWrapAllItems}</option>
+ <option value="NO^">${uiLabelMap.OrderNoGiftWrap}</option>
+ <#if allgiftWraps?has_content>
+ <#list allgiftWraps as option>
+ <option value="${option.productFeatureId?default("")}">${option.description?default("")} : <@ofbizCurrency amount=option.defaultAmount?default(0) isoCode=currencyUomId/></option>
+ </#list>
+ </#if>
+ </select>
+ </#if>
+ </div>
+ </td>
+ <td align="center"><div><b>${uiLabelMap.OrderQuantity}</b></div></td>
+ <td align="right"><div><b>${uiLabelMap.CommonUnitPrice}</b></div></td>
+ <td align="right"><div><b>${uiLabelMap.OrderAdjustments}</b></div></td>
+ <td align="right"><div><b>${uiLabelMap.OrderItemTotal}</b></div></td>
+ <td align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);" /></td>
+ </tr>
+
+ <#assign itemsFromList = false>
+ <#list shoppingCart.items() as cartLine>
+ <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
+ <#assign lineOptionalFeatures = cartLine.getOptionalProductFeatures()>
+ <tr><td colspan="8"><hr/></td></tr>
+ <tr valign="top">
+ <td> </td>
+ <td>
+ <table border="0">
+ <tr><td colspan="2">
+ <div>
+ <#if cartLine.getProductId()??>
+ <#-- product item -->
+ <a href="<@o...@ofbizUrl>" class="buttontext">${cartLine.getProductId()}</a> -
+ <input size="60" type="text" name="description_${cartLineIndex}" value="${cartLine.getName()?default("")}"/><br />
+ <i>${cartLine.getDescription()!}</i>
+ <#if shoppingCart.getOrderType() != "PURCHASE_ORDER">
+ <#-- only applies to sales orders, not purchase orders -->
+ <#-- if inventory is not required check to see if it is out of stock and needs to have a message shown about that... -->
+ <#assign itemProduct = cartLine.getProduct()>
+ <#assign isStoreInventoryNotRequiredAndNotAvailable = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequiredAndAvailable(request, itemProduct, cartLine.getQuantity(), false, false)>
+ <#if isStoreInventoryNotRequiredAndNotAvailable && itemProduct.inventoryMessage?has_content>
+ <b>(${itemProduct.inventoryMessage})</b>
+ </#if>
+ </#if>
+ <#else>
+ <#-- this is a non-product item -->
+ <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!}
+ </#if>
+ <#-- display the item's features -->
+ <#assign features = "">
+ <#if cartLine.getFeaturesForSupplier(dispatcher,shoppingCart.getPartyId())?has_content>
+ <#assign features = cartLine.getFeaturesForSupplier(dispatcher, shoppingCart.getPartyId())>
+ <#elseif cartLine.getStandardFeatureList()?has_content>
+ <#assign features = cartLine.getStandardFeatureList()>
+ </#if>
+ <#if features?has_content>
+ <br /><i>${uiLabelMap.ProductFeatures}: <#list features as feature>${feature.description?default("")} </#list></i>
+ </#if>
+ <#-- show links to survey response for this item -->
+ <#if cartLine.getAttribute("surveyResponses")?has_content>
+ <br />Surveys:
+ <#list cartLine.getAttribute("surveyResponses") as surveyResponseId>
+ <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a>
+ </#list>
+ </#if>
+ </div>
+ </td></tr>
+ <#if cartLine.getRequirementId()?has_content>
+ <tr>
+ <td colspan="2">
+ <div><b>${uiLabelMap.OrderRequirementId}</b>: ${cartLine.getRequirementId()!}</div>
+ </td>
+ </tr>
+ </#if>
+ <#if cartLine.getQuoteId()?has_content>
+ <#if cartLine.getQuoteItemSeqId()?has_content>
+ <tr>
+ <td colspan="2">
+ <div><b>${uiLabelMap.OrderOrderQuoteId}</b>: ${cartLine.getQuoteId()!} - ${cartLine.getQuoteItemSeqId()!}</div>
+ </td>
+ </tr>
+ </#if>
+ </#if>
+ <#if cartLine.getItemComment()?has_content>
+ <tr><td><div>${uiLabelMap.CommonComment} : </div></td>
+ <td><div>${cartLine.getItemComment()!}</div>
+ </td></tr>
+ </#if>
+ <#if cartLine.getDesiredDeliveryDate()?has_content>
+ <tr><td><div>${uiLabelMap.OrderDesiredDeliveryDate}: </div></td>
+ <td><div>${cartLine.getDesiredDeliveryDate()!}</div>
+ </td></tr>
+ </#if>
+ <#-- inventory summary -->
+ <#if cartLine.getProductId()??>
+ <#assign productId = cartLine.getProductId()>
+ <#assign product = cartLine.getProduct()>
+ <tr>
+ <td colspan="2">
+ <div>
+ <a href="/catalog/control/EditProductInventoryItems?productId=${productId}" class="buttontext"><b>${uiLabelMap.ProductInventory}</b></a>:
+ ${uiLabelMap.ProductAtp} = ${availableToPromiseMap.get(productId)}, ${uiLabelMap.ProductQoh} = ${quantityOnHandMap.get(productId)}
+ <#if Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")>
+ ${uiLabelMap.ProductMarketingPackageATP} = ${mktgPkgATPMap.get(productId)}, ${uiLabelMap.ProductMarketingPackageQOH} = ${mktgPkgQOHMap.get(productId)}
+ <#if ( mktgPkgATPMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER')>
+ <#assign backOrdered = cartLine.getQuantity() - mktgPkgATPMap.get(cartLine.getProductId())/>
+ <span style="color: red; font-size: 15px;">[${backOrdered!} ${uiLabelMap.OrderBackOrdered}]</span>
+ </#if>
+ </#if>
+ <#if (availableToPromiseMap.get(cartLine.getProductId()) <= 0) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId! != "DIGITAL_GOOD" && product.productTypeId! != "MARKETING_PKG_AUTO" && product.productTypeId! != "MARKETING_PKG_PICK">
+ <span style="color: red;">[${cartLine.getQuantity()} ${uiLabelMap.OrderBackOrdered}]</span>
+ <#else>
+ <#if (availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId != "DIGITAL_GOOD" && product.productTypeId != "MARKETING_PKG_AUTO" && product.productTypeId != "MARKETING_PKG_PICK">
+ <#assign backOrdered = cartLine.getQuantity() - availableToPromiseMap.get(cartLine.getProductId())/>
+ <span style="color: red;">[${backOrdered!} ${uiLabelMap.OrderBackOrdered}]</span>
+ </#if>
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </#if>
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ <#assign currentOrderItemType = cartLine.getItemTypeGenericValue()!/>
+ <tr>
+ <td>
+ <div>
+ ${uiLabelMap.OrderOrderItemType}:
+ <select name="itemType_${cartLineIndex}">
+ <#if currentOrderItemType?has_content>
+ <option value="${currentOrderItemType.orderItemTypeId}">${currentOrderItemType.get("description",locale)}</option>
+ <option value="${currentOrderItemType.orderItemTypeId}">---</option>
+ </#if>
+ <option value=""> </option>
+ <#list purchaseOrderItemTypeList as orderItemType>
+ <option value="${orderItemType.orderItemTypeId}">${orderItemType.get("description",locale)}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ </#if>
+
+ <#-- ship before/after date -->
+ <tr>
+ <td colspan="2">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td>
+ <div>${uiLabelMap.OrderShipAfterDate}
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate_${cartLineIndex}" value="${cartLine.getShipAfterDate()?default('')}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30" id="shipAfterDate_${cartLineIndex}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </div>
+ </td>
+ <td> </td>
+ <td>
+ <div>${uiLabelMap.OrderShipBeforeDate}
+ <@htmlTemplate.renderDateTimeField name="shipBeforeDate_${cartLineIndex}" value="${cartLine.getShipBeforeDate()?default('')}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30" id="shipBeforeDate_${cartLineIndex}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <#-- Show Associated Products (not for Variants) -->
+ <#if cartLine.getProductId()??>
+ <#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc", null, Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"), false)!/>
+ </#if>
+ <#if itemProductAssocList?? && itemProductAssocList?has_content>
+ <tr><td colspan="8"><hr /></td></tr>
+ <tr>
+ <td>${uiLabelMap.OrderAssociatedProducts}</td>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickLookup}</a></td>
+ </tr>
+ <#assign relatedProdCount = 0/>
+ <#list itemProductAssocList! as itemProductAssoc>
+ <tr>
+ <#if "PRODUCT_VARIANT" != itemProductAssoc.productAssocTypeId>
+ <#assign relatedProdCount = relatedProdCount + 1/>
+ <#if (relatedProdCount > 3)><#break></#if>
+ <@showAssoc productAssoc=itemProductAssoc />
+ </#if>
+ </tr>
+ </#list>
+ </#if>
+ </table>
+
+ <#if (cartLine.getIsPromo() && cartLine.getAlternativeOptionProductIds()?has_content)>
+ <#-- Show alternate gifts if there are any... -->
+ <div>${uiLabelMap.OrderChooseFollowingForGift}:</div>
+ <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId>
+ <#assign alternativeOptionProduct = delegator.findOne("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId), true)>
+ <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher, "html")!>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div>
+ </#list>
+ </#if>
+ </td>
+
+ <#-- gift wrap option -->
+ <#assign showNoGiftWrapOptions = false>
+ <td nowrap="nowrap" align="right">
+ <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP!>
+ <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")!>
+ <#if giftWrapOption?has_content>
+ <select name="option^GIFT_WRAP_${cartLineIndex}" onchange="javascript:document.cartform.submit()">
+ <option value="NO^">${uiLabelMap.OrderNoGiftWrap}</option>
+ <#list giftWrapOption as option>
+ <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?? && selectedOption.productFeatureId == option.productFeatureId)>selected="selected"</#if>>${option.description} : <@ofbizCurrency amount=option.amount?default(0) isoCode=currencyUomId/></option>
+ </#list>
+ </select>
+ <#elseif showNoGiftWrapOptions>
+ <select name="option^GIFT_WRAP_${cartLineIndex}" onchange="javascript:document.cartform.submit()">
+ <option value="">${uiLabelMap.OrderNoGiftWrap}</option>
+ </select>
+ <#else>
+
+ </#if>
+ </td>
+ <#-- end gift wrap option -->
+ <td nowrap="nowrap" align="center">
+ <div>
+ <#if cartLine.getIsPromo() || cartLine.getShoppingListId()??>
+ ${cartLine.getQuantity()?string.number}
+ <#else>
+ <input size="6" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}"/>
+ </#if>
+ <#if (cartLine.getSelectedAmount() > 0) >
+ <br /><b>${uiLabelMap.OrderAmount}:</b><br /><input size="6" type="text" name="amount_${cartLineIndex}" value="${cartLine.getSelectedAmount()?string.number}"/>
+ </#if>
+ </div>
+ </td>
+ <td nowrap="nowrap" align="right">
+ <div>
+ <#if cartLine.getIsPromo() || (shoppingCart.getOrderType() == "SALES_ORDER" && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))>
+ <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=currencyUomId/>
+ <#else>
+ <#if (cartLine.getSelectedAmount() > 0) >
+ <#assign price = cartLine.getBasePrice() / cartLine.getSelectedAmount()>
+ <#else>
+ <#assign price = cartLine.getBasePrice()>
+ </#if>
+ <input size="8" type="text" name="price_${cartLineIndex}" value="<@ofbizAmount amount=price/>"/>
+ </#if>
+ </div>
+ </td>
+ <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=currencyUomId/></div></td>
+ <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=currencyUomId/></div></td>
+ <td nowrap="nowrap" align="center"><div><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);"/><#else> </#if></div></td>
+ </tr>
+ </#list>
+
+ <#if shoppingCart.getAdjustments()?has_content>
+ <tr><td colspan="7"><hr /></td></tr>
+ <tr>
+ <td colspan="4" nowrap="nowrap" align="right"><div>${uiLabelMap.OrderSubTotal}:</div></td>
+ <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=currencyUomId/></div></td>
+ <td> </td>
+ </tr>
+ <#list shoppingCart.getAdjustments() as cartAdjustment>
+ <#assign adjustmentType = cartAdjustment.getRelatedOne("OrderAdjustmentType", true)>
+ <#if adjustmentType.get("orderAdjustmentTypeId",locale) != 'SHIPPING_CHARGES'>
+ <tr>
+ <td colspan="4" nowrap="nowrap" align="right">
+ <div>
+ <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)!}
+ <#if cartAdjustment.productPromoId?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>:
+ </div>
+ </td>
+ <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td>
+ <td> </td>
+ </tr>
+ </#if>
+ </#list>
+ <#if orderShippingTotal != 0>
+ <tr>
+ <td align="right" colspan="4"><div>${uiLabelMap.FacilityShippingAndHandling}</div></td>
+ <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></div></td>
+ </tr>
+ </#if>
+ <#if orderTaxTotal != 0>
+ <tr>
+ <td align="right" colspan="4"><div>${uiLabelMap.OrderSalesTax}</div></td>
+ <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></div></td>
+ </tr>
+ </#if>
+ </#if>
+
+ <tr>
+ <td colspan="6" align="right" valign="bottom">
+ <div><b>${uiLabelMap.OrderCartTotal}:</b></div>
+ </td>
+ <td align="right" valign="bottom">
+ <hr />
+ <div><b><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="8"> </td>
+ </tr>
+ </table>
+ </form>
+ <#else>
+ <div>${uiLabelMap.OrderNoOrderItemsToDisplay}</div>
+ </#if>
+ </div>
+</div>
+
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,26 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if product?? && mainProducts??>
+ <select name="parentProductId" onchange="javascript:displayProductVirtualVariantId(this.value);">
+ <option value="">Select Unit Of Measure</option>
+ <#list mainProducts as mainProduct>
+ <option value="${mainProduct.productId}">${mainProduct.uomDesc} : ${mainProduct.piecesIncluded}</option>
+ </#list>
+ </select>
+</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/ProductUomDropDownOnly.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl?rev=1736868&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl (added)
+++ ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl Mon Mar 28 11:14:22 2016
@@ -0,0 +1,163 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#assign searchOptionsHistoryList = Static["org.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)>
+<#assign currentCatalogId = Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)>
+<h1>${uiLabelMap.ProductAdvancedSearchInCategory}</h1>
+<br />
+<form name="advtokeywordsearchform" method="post" action="<@o...@ofbizUrl>" style="margin: 0;">
+ <input type="hidden" name="VIEW_SIZE" value="10" />
+ <table border="0" wdith="100%">
+ <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" />
+ <#if searchCategory?has_content>
+ <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" />
+ <tr>
+ <td align="right" valign="middle">
+ <div>${uiLabelMap.ProductCategory}:</div>
+ </td>
+ <td valign="middle">
+ <div>
+ <b>"${(searchCategory.description)!}"</b>${uiLabelMap.ProductIncludeSubCategories}
+ ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" />
+ ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" />
+ </div>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td align="right" valign="middle">
+ <div>${uiLabelMap.ProductKeywords}:</div>
+ </td>
+ <td valign="middle">
+ <div>
+ <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" />
+ ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> />
+ ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> />
+ </div>
+ </td>
+ </tr>
+ <#list productFeatureTypeIdsOrdered as productFeatureTypeId>
+ <#assign findPftMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId)>
+ <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)>
+ <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
+ <tr>
+ <td align="right" valign="middle">
+ <div>${(productFeatureType.get("description",locale))!}:</div>
+ </td>
+ <td valign="middle">
+ <div>
+ <select name="pft_${productFeatureTypeId}">
+ <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
+ <#list productFeatures as productFeature>
+ <option value="${productFeature.productFeatureId}">${productFeature.get("description",locale)?default(productFeature.productFeatureId)}</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ </#list>
+ <tr>
+ <td align="right" valign="middle">
+ <div>${uiLabelMap.ProductSupplier}:</div>
+ </td>
+ <td valign="middle">
+ <div>
+ <select name="SEARCH_SUPPLIER_ID">
+ <option value="">- ${uiLabelMap.CommonSelectAny} -</option>
+ <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail>
+ <option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?? & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected="selected"</#if>>${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option>
+ </#list>
+ </select>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" valign="middle">
+ <div>${uiLabelMap.CommonSortedBy}:</div>
+ </td>
+ <td valign="middle">
+ <div>
+ <select name="sortOrder">
+ <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option>
+ <option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
+ <option value="SortProductField:internalName">${uiLabelMap.ProductInternalName}</option>
+ <option value="SortProductField:totalQuantityOrdered">${uiLabelMap.ProductPopularityByOrders}</option>
+ <option value="SortProductField:totalTimesViewed">${uiLabelMap.ProductPopularityByViews}</option>
+ <option value="SortProductField:averageCustomerRating">${uiLabelMap.ProductCustomerRating}</option>
+ <option value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option>
+ <option value="SortProductPrice:DEFAULT_PRICE">${uiLabelMap.ProductDefaultPrice}</option>
+ <option value="SortProductPrice:AVERAGE_COST">${uiLabelMap.ProductAverageCost}</option>
+ </select>
+ ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" />
+ ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N" />
+ </div>
+ </td>
+ </tr>
+ <#if searchConstraintStrings?has_content>
+ <tr>
+ <td align="right" valign="top">
+ <div>${uiLabelMap.ProductLastSearch}:</div>
+ </td>
+ <td valign="top">
+ <#list searchConstraintStrings as searchConstraintString>
+ <div> - ${searchConstraintString}</div>
+ </#list>
+ <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
+ <div>
+ ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" />
+ ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" />
+ </div>
+ </td>
+ </tr>
+ </#if>
+ <tr>
+ <td>
+ <div>
+ <a href="javascript:document.advtokeywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ <#if searchOptionsHistoryList?has_content>
+ <hr />
+
+ <h2>${uiLabelMap.OrderLastSearches}...</h2>
+
+ <div>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a>
+ ${uiLabelMap.OrderClearSearchHistoryNote}
+ </div>
+ <#list searchOptionsHistoryList as searchOptions>
+ <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
+ <div>
+ <b>${uiLabelMap.CommonSearch} #${searchOptions_index + 1}</b>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine}</a>
+ </div>
+ <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)>
+ <#list constraintStrings as constraintString>
+ <div> - ${constraintString}</div>
+ </#list>
+ <#if searchOptions_has_next>
+ <hr />
+ </#if>
+ </#list>
+ </#if>
+</form>
+
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain