svn commit: r611802 - in /ofbiz/trunk/applications: accounting/src/org/ofbiz/accounting/payment/ content/src/org/ofbiz/content/content/ ecommerce/widget/ order/webapp/ordermgr/entry/ order/webapp/ordermgr/entry/catalog/ product/src/org/ofbiz/product/st...

[bibryam]

Author: bibryam
Date: Mon Jan 14 06:12:01 2008
New Revision: 611802

URL: http://svn.apache.org/viewvc?rev=611802&view=rev
Log:
Disabled 'Tell-A-Friend' and 'Customer Reviews' links from Order manager.
Small cleanups.

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
    ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
    ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
    ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Mon Jan 14 06:12:01 2008
@@ -1652,7 +1652,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/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Mon Jan 14 06:12:01 2008
@@ -1603,7 +1603,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/trunk/applications/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml?rev=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml Mon Jan 14 06:12:01 2008
@@ -230,7 +230,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/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Mon Jan 14 06:12:01 2008
@@ -240,12 +240,14 @@
         <div class="tabletext"><b>${uiLabelMap.ProductUsuallyShipsIn} <font color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
       </#if>
 
-      <#-- tell a friend -->
-      <div class="tabletext">&nbsp;</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">&nbsp;</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>&nbsp;</p>
         <#list disFeatureList as currentFeature>
@@ -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,11 +590,12 @@
     </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>
 </table>
+</#if>
 
 <#-- Upgrades/Up-Sell/Cross-Sell -->
   <#macro associated assocProducts beforeName showName afterName formNamePrefix targetRequestName>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Mon Jan 14 06:12:01 2008
@@ -372,12 +372,14 @@
         <div class="tabletext"><b>${uiLabelMap.ProductUsuallyShipsIn} <font color="red">${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
       </#if>
 
-      <#-- tell a friend -->
-      <div class="tabletext">&nbsp;</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">&nbsp;</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>&nbsp;</p>
@@ -559,7 +561,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>
@@ -600,11 +603,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>
   <#assign targetRequest = "product">

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=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Mon Jan 14 06:12:01 2008
@@ -276,7 +276,7 @@
                       </#list>
                       </b>
                       </div>
-                      <div class="tabletext">${uiLabelMap.OrderUpdateEmailAddress} <a href="<@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
+                      <div class="tabletext">${uiLabelMap.OrderUpdateEmailAddress} <a href="${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
                       <br/>
                       <div class="tabletext">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
                       <input type="text" class="inputBox" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/>

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=611802&r1=611801&r2=611802&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Mon Jan 14 06:12:01 2008
@@ -690,7 +690,7 @@
             return isInventoryAvailable;
 
         } else {
-            GenericValue product = productConfig.getProduct();;
+            GenericValue product = productConfig.getProduct();
             List productFacilities = null;
 
             try {