Author: bibryam
Date: Wed Feb 6 01:31:41 2008
New Revision: 618934
URL: http://svn.apache.org/viewvc?rev=618934&view=rev
Log:
Applied fix from trunk for revision: 611802
Modified:
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/branches/release4.0/applications/ecommerce/widget/CatalogScreens.xml
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
Modified:
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=618934&r1=618933&r2=618934&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
(original)
+++
ofbiz/branches/release4.0/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
Wed Feb 6 01:31:41 2008
@@ -1614,7 +1614,7 @@
if (authResult != null) {
processAuthResult(dctx, result, userLogin, paymentPreference);
resultPassed = authResult.booleanValue();
- authServiceType = ("PAYMENT_NOT_AUTH".equals(initialStatus)) ?
AUTH_SERVICE_TYPE : REAUTH_SERVICE_TYPE;;
+ authServiceType = ("PAYMENT_NOT_AUTH".equals(initialStatus)) ?
AUTH_SERVICE_TYPE : REAUTH_SERVICE_TYPE;
}
if (captureResult != null) {
processCaptureResult(dctx, result, userLogin, paymentPreference,
authServiceType);
Modified:
ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=618934&r1=618933&r2=618934&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java
(original)
+++
ofbiz/branches/release4.0/applications/content/src/org/ofbiz/content/content/ContentWorker.java
Wed Feb 6 01:31:41 2008
@@ -1590,7 +1590,7 @@
String key = (String)it.next();
if ("request response session".indexOf(key) < 0) {
Object obj = map.get(key);
- s += spc + key + sep;;
+ s += spc + key + sep;
if (obj instanceof GenericValue) {
GenericValue gv = (GenericValue)obj;
GenericPK pk = gv.getPrimaryKey();
Modified:
ofbiz/branches/release4.0/applications/ecommerce/widget/CatalogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/widget/CatalogScreens.xml?rev=618934&r1=618933&r2=618934&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/widget/CatalogScreens.xml
(original)
+++ ofbiz/branches/release4.0/applications/ecommerce/widget/CatalogScreens.xml
Wed Feb 6 01:31:41 2008
@@ -229,7 +229,7 @@
<set field="leftbarScreenName" value="leftbar"/>
<set field="rightbarScreenName" value="rightbar"/>
<set field="MainColumnStyle" value="center"/>
-
+ <set field="isEcommerceScreen" value="Y"/>
<set field="titleProperty" value="PageTitleProductPage"/>
<set field="configproductdetailScreen"
value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh"/>
Modified:
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=618934&r1=618933&r2=618934&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
(original)
+++
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
Wed Feb 6 01:31:41 2008
@@ -240,11 +240,13 @@
<div class="tabletext"><b>${uiLabelMap.ProductUsuallyShipsIn} <font
color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
</#if>
- <#-- tell a friend -->
- <div class="tabletext"> </div>
- <div class="tabletext">
- <a
href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');"
class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
- </div>
+ <#-- show tell a friend details only in ecommerce application -->
+ <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
+ <div class="tabletext"> </div>
+ <div class="tabletext">
+ <a
href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');"
class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
+ </div>
+ </#if>
<#if disFeatureList?exists && 0 < disFeatureList.size()>
<p> </p>
@@ -532,6 +534,7 @@
<tr><td colspan="2"><hr class='sepbar'></td></tr>
<#-- Product Reviews -->
+ <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
<tr>
<td colspan="2">
<div class="tableheadtext">${uiLabelMap.EcommerceCustomerReviews}:</div>
@@ -587,9 +590,10 @@
</tr>
<tr>
<td colspan="2">
- <a
href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}!</a>
+ <a
href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
</td>
</tr>
+ </#if>
</#if>
</table>
Modified:
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=618934&r1=618933&r2=618934&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
(original)
+++
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
Wed Feb 6 01:31:41 2008
@@ -337,12 +337,14 @@
<div class="tabletext"><b>${uiLabelMap.ProductUsuallyShipsIn} <font
color="red">${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
</#if>
- <#-- tell a friend -->
- <div class="tabletext"> </div>
- <div class="tabletext">
- <a
href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');"
class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
- </div>
- <br/>
+ <#-- show tell a friend details only in ecommerce application -->
+ <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
+ <div class="tabletext"> </div>
+ <div class="tabletext">
+ <a
href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');"
class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
+ </div>
+ <br/>
+ </#if>
<#if disFeatureList?exists && 0 < disFeatureList.size()>
<p> </p>
@@ -523,7 +525,8 @@
<#-- Any attributes/etc may go here -->
<#-- Product Reviews -->
- <div id="reviews">
+ <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
+ <div id="reviews">
<div class="tableheadtext">${uiLabelMap.EcommerceCustomerReviews}:</div>
<#if averageRating?exists && (averageRating?double > 0) &&
numRatings?exists && (numRatings?double > 1)>
<div class="tabletext">${uiLabelMap.EcommerceAverageRating}:
${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings}
${uiLabelMap.EcommerceRatings})</#if></div>
@@ -564,10 +567,11 @@
<#else>
<div
class="tabletext">${uiLabelMap.ProductProductNotReviewedYet}.</div>
<div>
- <a
href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>"
class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}!</a>
+ <a
href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>"
class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
</div>
</#if>
- </div>
+ </div>
+ </#if>
<#-- Upgrades/Up-Sell/Cross-Sell -->
<#macro associated assocProducts beforeName showName afterName
formNamePrefix targetRequestName>
Modified:
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=618934&r1=618933&r2=618934&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
(original)
+++
ofbiz/branches/release4.0/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
Wed Feb 6 01:31:41 2008
@@ -690,7 +690,7 @@
return isInventoryAvailable;
} else {
- GenericValue product = productConfig.getProduct();;
+ GenericValue product = productConfig.getProduct();
List productFacilities = null;
try {
