[Opentaps-crmcommits] [opentaps commits] r3942 - in versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa: WEB-INF/actions/marketing marketing

[Leon T. <le...@ea...>]

Author: leon
Date: 2007-07-23 11:17:45 -0700 (Mon, 23 Jul 2007)
New Revision: 3942

Modified:
   versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/actions/marketing/calculate3605Postage.bsh
   versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/marketing/calculate3605Postage.ftl
Log:
Fix 3605 calculation issues with zones 1 and 2.  Fix column ordering so they are correct.

Modified: versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/actions/marketing/calculate3605Postage.bsh
===================================================================
--- versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/actions/marketing/calculate3605Postage.bsh	2007-07-23 17:38:36 UTC (rev 3941)
+++ versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/WEB-INF/actions/marketing/calculate3605Postage.bsh	2007-07-23 18:17:45 UTC (rev 3942)
@@ -111,6 +111,7 @@
         row1.put("piecesSubtotal", piecesSubtotal);
         row1.put("poundsSubtotal", poundsSubtotal);
         row1.put("total", piecesSubtotal + poundsSubtotal);
+        row1.put("uspsBPMRateZone", "1 & 2");
         report.put("1", row1);
     }
 }

Modified: versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/marketing/calculate3605Postage.ftl
===================================================================
--- versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/marketing/calculate3605Postage.ftl	2007-07-23 17:38:36 UTC (rev 3941)
+++ versions/1.0/trunk/hot-deploy/crmsfa/webapp/crmsfa/marketing/calculate3605Postage.ftl	2007-07-23 18:17:45 UTC (rev 3942)
@@ -45,23 +45,23 @@
     <#list report as row>
       <tr class="${tableRowClass(row_index)}">
         <@displayCell text=row.uspsBPMRateZone />
+        <@displayCell text=row.pounds?default(0) blockClass="tabletextright" />
+        <@displayCell text="$${row.ratePerPound}" blockClass="tabletextright" />
+        <@displayCurrencyCell amount=row.poundsSubtotal currencyUomId="USD" />
         <@displayCell text=row.pieces?default(0) blockClass="tabletextright" />
         <@displayCell text="$${row.ratePerPiece}" blockClass="tabletextright" />
         <@displayCurrencyCell amount=row.piecesSubtotal currencyUomId="USD" />
-        <@displayCell text=row.pounds?default(0) blockClass="tabletextright" />
-        <@displayCell text="$${row.ratePerPound}" blockClass="tabletextright" />
-        <@displayCurrencyCell amount=row.poundsSubtotal currencyUomId="USD" />
         <@displayCurrencyCell amount=row.total currencyUomId="USD" />
       </tr>
     </#list>
     <tr class="totalRow">
         <@displayCell text=uiLabelMap.CommonTotal />
+        <@displayCell text=totals.totalPounds?default(0) blockClass="tabletextright" />
+        <td>&nbsp;</td>
+        <@displayCurrencyCell amount=totals.poundsGrandTotal currencyUomId="USD" />
         <@displayCell text=totals.totalPieces?default(0) blockClass="tabletextright" />
         <td>&nbsp;</td>
         <@displayCurrencyCell amount=totals.piecesGrandTotal currencyUomId="USD" />
-        <@displayCell text=totals.totalPounds?default(0) blockClass="tabletextright" />
-        <td>&nbsp;</td>
-        <@displayCurrencyCell amount=totals.poundsGrandTotal currencyUomId="USD" />
         <@displayCurrencyCell amount=totals.grandTotal currencyUomId="USD" />
     </tr>
   </table>