Author: hansbak
Date: Tue Sep 20 03:53:32 2011
New Revision: 1172967
URL: http://svn.apache.org/viewvc?rev=1172967&view=rev
Log:
enable to add a rental product to the shopping cart...was disabled in history
somehow...
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=1172967&r1=1172966&r2=1172967&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy
Tue Sep 20 03:53:32 2011
@@ -646,4 +646,9 @@ if (product) {
}
context.productImageList = productImageList;
}
+
+ // get reservation start date for rental product
+ if("ASSET_USAGE".equals(productTypeId) ||
"ASSET_USAGE_OUT_IN".equals(productTypeId)){
+ context.startDate =
UtilDateTime.addDaysToTimestamp(UtilDateTime.nowTimestamp(),
1).toString().substring(0,10); // should be tomorrow.
+ }
}
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1172967&r1=1172966&r2=1172967&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Tue
Sep 20 03:53:32 2011
@@ -118,11 +118,11 @@ function setAlternateGwp(field) {
${uiLabelMap.EcommerceProductNumber}<input type="text"
class="inputBox" name="add_product_id"
value="${requestParameters.add_product_id?if_exists}" />
<#-- check if rental data present insert extra fields in
Quick Add-->
<#if (product?exists && product.getString("productTypeId") ==
"ASSET_USAGE") || (product?exists && product.getString("productTypeId") ==
"ASSET_USAGE_OUT_IN")>
- ${uiLabelMap.EcommerceStartDate}: <input type="text"
class="inputBox" size="10" name="reservStart"
value=${requestParameters.reservStart?default("")} />
- ${uiLabelMap.EcommerceLength}: <input type="text"
class="inputBox" size="2" name="reservLength"
value=${requestParameters.reservLength?default("")} />
+ ${uiLabelMap.EcommerceStartDate}: <input type="text"
class="inputBox" size="10" name="reservStart"
value="${requestParameters.reservStart?default("")}" />
+ ${uiLabelMap.EcommerceLength}: <input type="text"
class="inputBox" size="2" name="reservLength"
value="${requestParameters.reservLength?default("")}" />
</div>
<div>
- ${uiLabelMap.OrderNbrPersons}: <input
type="text" class="inputBox" size="3" name="reservPersons"
value=${requestParameters.reservPersons?default("1")} />
+ ${uiLabelMap.OrderNbrPersons}: <input
type="text" class="inputBox" size="3" name="reservPersons"
value="${requestParameters.reservPersons?default("1")}" />
</#if>
${uiLabelMap.CommonQuantity}: <input type="text"
class="inputBox" size="5" name="quantity"
value="${requestParameters.quantity?default("1")}" />
<input type="submit" class="smallSubmit"
value="${uiLabelMap.OrderAddToCart}" />
@@ -344,7 +344,7 @@ function setAlternateGwp(field) {
${cartLine.getQuantity()?string.number}
</#if>
<#else><#-- Is Promo or Shoppinglist -->
- <#if fixedAssetExist == true><#if
cartLine.getReservStart()?exists><table><tr><td> </td><td><input
type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}"
value=${cartLine.getReservStart()?string}/></td><td><input type="text"
class="inputBox" size="2" name="reservLength_${cartLineIndex}"
value=${cartLine.getReservLength()?string.number}/></td></tr><tr><td> </td><td><input
type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}"
value=${cartLine.getReservPersons()?string.number} /></td><td
class="tabletext"><#else>
+ <#if fixedAssetExist == true><#if
cartLine.getReservStart()?exists><table><tr><td> </td><td><input
type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}"
value=${cartLine.getReservStart()?string}/></td><td><input type="text"
class="inputBox" size="2" name="reservLength_${cartLineIndex}"
value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td> </td><td><input
type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}"
value=${cartLine.getReservPersons()?string.number} /></td><td
class="tabletext"><#else>
<table><tr><td>--</td><td>--</td></tr><tr><td>--</td><td
class="tabletext"></#if>
<input size="6" class="inputBox" type="text"
name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}"
/></td></tr></table>
<#else><#-- fixedAssetExist -->
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1172967&r1=1172966&r2=1172967&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
Tue Sep 20 03:53:32 2011
@@ -630,15 +630,16 @@ ${virtualVariantJavaScript?if_exists}
<input type="text" size="5" name="add_amount" value=""/>
</div>
<#if product.productTypeId?if_exists == "ASSET_USAGE" ||
product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
- <div class="inline">
- <label>Start
Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action=""
name="reservStart" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservStart1"
dateType="date" shortDateInput=true timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- <label>End
Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action=""
name="reservEnd" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS"
value="" size="25" maxlength="30" id="reservEnd1" dateType="date"
shortDateInput=true timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
+ <div>
+ <label>Start
Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action=""
name="reservStart" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${startDate}" size="25" maxlength="30" id="reservStart1"
dateType="date" shortDateInput=true timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
<div>
<#--td nowrap="nowrap" align="right">Number<br />of
days</td><td><input type="textt" size="4"
name="reservLength"/></td></tr><tr><td> </td><td align="right"
nowrap="nowrap"> </td-->
+ Number of days<input type="text" size="4"
name="reservLength" value=""/>
Number of persons<input type="text" size="4"
name="reservPersons" value="2"/>
Number of rooms<input type="text" size="5" name="quantity"
value="1"/>
</div>
+ <a href="javascript:addItem()" class="buttontext"><span
style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
<#else>
<span><input name="quantity" id="quantity" value="1"
size="4" maxLength="4" type="text" <#if product.isVirtual!?upper_case ==
"Y">disabled="disabled"</#if> /></span><a href="javascript:addItem()"
id="addToCart" name="addToCart"
class="buttontext">${uiLabelMap.OrderAddToCart}</a>
<@showUnavailableVarients/>
@@ -689,11 +690,11 @@ ${virtualVariantJavaScript?if_exists}
<option value="">${uiLabelMap.OrderNewShoppingList}</option>
</select>
- <#assign nowDate =
Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("yyyy-MM-dd")>
+ <#--assign nowDate =
Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("yyyy-MM-dd")-->
<#if product.productTypeId?if_exists == "ASSET_USAGE">
- ${uiLabelMap.CommonStartDate}
(yyyy-mm-dd)<@htmlTemplate.renderDateTimeField name="reservStartStr" event=""
action="" value="${nowDate}" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" size="15" maxlength="30" id="reservStartStr" dateType="date"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/> Number
of days <input type="text" size="4" name="reservLength"
/> <br/>Number of persons <input type="text" size="4"
name="reservPersons" value="1" /> Qty <input type="text"
size="5" name="quantity" value="1" />
+ ${uiLabelMap.CommonStartDate}
(yyyy-mm-dd)<@htmlTemplate.renderDateTimeField name="reservStartStr" event=""
action="" value="${startDate}" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" size="15" maxlength="30" id="reservStartStr" dateType="date"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/> Number
of days <input type="text" size="4" name="reservLength"
/> <br/>Number of persons <input type="text" size="4"
name="reservPersons" value="1" /> Qty <input type="text"
size="5" name="quantity" value="1" />
<#elseif product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
- ${uiLabelMap.CommonStartDate}
(yyyy-mm-dd) <@htmlTemplate.renderDateTimeField
name="reservStartStr" event="" action="" value="${nowDate}" className=""
alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30"
id="reservStartStr" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/> Number
of days <input type="text" size="4" name="reservLength"
/><input type="hidden" size="4" name="reservPersons" value="1" /><br/>
+ ${uiLabelMap.CommonStartDate}
(yyyy-mm-dd) <@htmlTemplate.renderDateTimeField
name="reservStartStr" event="" action="" value="${startDate}" className=""
alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30"
id="reservStartStr" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/> Number
of days <input type="text" size="4" name="reservLength"
/><input type="hidden" size="4" name="reservPersons" value="1" /><br/>
Qty <input type="text" size="5" name="quantity" value="1"
/>
<#else>
<input type="text" size="5" name="quantity" value="1" />
