Author: bibryam
Date: Wed Dec 12 01:18:48 2007
New Revision: 603518
URL: http://svn.apache.org/viewvc?rev=603518&view=rev
Log:
Small fixups.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
ofbiz/trunk/applications/order/config/OrderUiLabels.properties
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
Wed Dec 12 01:18:48 2007
@@ -103,14 +103,18 @@
price = calcPriceOutMap.get("price");
totalPrice = price * shoppingListItem.getDouble("quantity");
// similar code at ShoppingCartItem.java getRentalAdjustment
- if ("ASSET_USAGE".equals(product.getString("productTypeId")))
{
+ if ("ASSET_USAGE".equals(product.getString("productTypeId"))) {
persons = shoppingListItem.getDouble("reservPersons");
- reservNthPPPerc =
product.get("reservNthPPPerc").doubleValue();
- reserv2ndPPPerc =
product.get("reserv2ndPPPerc").doubleValue();
+ if
(UtilValidate.isNotEmpty(product.get("reservNthPPPerc"))) {
+ reservNthPPPerc =
product.get("reservNthPPPerc").doubleValue();
+ }
+ if
(UtilValidate.isNotEmpty(product.get("reserv2ndPPPerc"))) {
+ reserv2ndPPPerc =
product.get("reserv2ndPPPerc").doubleValue();
+ }
if (persons == null) persons = 0;
rentalValue = 0;
- if (persons > 1) {
- if (persons > 2 ) {
+ if (persons > 1) {
+ if (persons > 2) {
persons -= 2;
if(reservNthPPPerc != null && reservNthPPPerc > 0)
rentalValue = persons * reservNthPPPerc;
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Wed Dec 12
01:18:48 2007
@@ -424,6 +424,7 @@
OrderChooseFacilityDifferentDefault=You may choose a facility instead of the
default one
OrderChooseFollowingForGift=You may also choose one of the following for your
gift
OrderClearOrder=Clear Order
+OrderCOD=COD
OrderCommaSeperatedEmailAddresses=You may add other comma separated email
addresses here that will be used only for the current order
OrderCompanyName=OFBiz: Order Manager
OrderCompanySubtitle=Part of the Open For Business Family of Open Source
Software
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
Wed Dec 12 01:18:48 2007
@@ -48,7 +48,7 @@
<if-empty field-name="listName" map-name="newEntity">
<property-to-field field-name="newEntity.listName"
- resource="EcommerceUiLabels"
property="EcommerceNewShoppingList" default="New Shopping List"/>
+ resource="OrderUiLabels" property="EcommerceNewShoppingList"
default="New Shopping List"/>
</if-empty>
<if-empty field-name="isPublic" map-name="newEntity">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed
Dec 12 01:18:48 2007
@@ -493,6 +493,12 @@
<response name="success" type="request" value="addFromShoppingList"/>
<response name="error" type="view" value="checkinits"/>
</request-map>
+ <request-map uri="addItemToShoppingList">
+ <security auth="true" https="true"/>
+ <event type="service" path="" invoke="createShoppingListItem"/>
+ <response name="success" type="view" value="editShoppingList"/>
+ <response name="error" type="view" value="editShoppingList"/>
+ </request-map>
<request-map uri="loadCartFromShoppingList">
<security https="true" auth="true"/>
<event type="java"
path="org.ofbiz.order.shoppingcart.ShoppingCartEvents"
invoke="loadCartFromShoppingList"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Wed
Dec 12 01:18:48 2007
@@ -87,7 +87,7 @@
<input type="radio" name="checkOutPaymentId" value="EXT_COD"
<#if checkOutPaymentId?exists && checkOutPaymentId ==
"EXT_COD">checked="checked"</#if>/>
</td>
<td colspan="2" width="50%">
- <span
class="tabletext">${uiLabelMap.FormFieldTitle_paymentCOD}</span>
+ <span class="tabletext">${uiLabelMap.OrderCOD}</span>
</td>
</tr>
<tr><td colspan="3"><hr class="sepbar"/></td></tr>
@@ -508,7 +508,7 @@
<tr><td colspan="2"><hr class="sepbar"/></td></tr>
<tr>
<td width="1%" nowrap><input type="radio"
name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists &&
checkOutPaymentId == "EXT_COD">checked="checked"</#if>
onchange="setCheckoutPaymentId(this.value)"
onClick="setCheckoutPaymentId(this.value)"/></td>
- <td width="50%"nowrap><div
class="tabletext">${uiLabelMap.FormFieldTitle_paymentCOD}</div></td>
+ <td width="50%"nowrap><div
class="tabletext">${uiLabelMap.OrderCOD}</div></td>
</tr>
<tr><td colspan="2"><hr class="sepbar"/></td></tr>
</#if>
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
Wed Dec 12 01:18:48 2007
@@ -44,6 +44,8 @@
<#list shoppingLists as shoppingList>
<option
value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
</#list>
+ <option value="">---</option>
+ <option
value="">${uiLabelMap.EcommerceNewShoppingList}</option>
</select>
<input type="submit" class="smallSubmit"
value="${uiLabelMap.EcommerceAddtoShoppingList}"/>
</div>
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=603518&r1=603517&r2=603518&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
Wed Dec 12 01:18:48 2007
@@ -331,7 +331,7 @@
<input type="radio" name="checkOutPaymentId"
value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
- <span
class="tabletext">${uiLabelMap.FormFieldTitle_paymentCOD}</span>
+ <span class="tabletext">${uiLabelMap.OrderCOD}</span>
</td>
</tr>
</#if>
