svn commit: r1060651 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

[hansbak-2]

Author: hansbak
Date: Wed Jan 19 02:20:24 2011
New Revision: 1060651

URL: http://svn.apache.org/viewvc?rev=1060651&view=rev
Log:
add orderpayment info if the order is a purchase order

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1060651&r1=1060650&r2=1060651&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Wed Jan 19 02:20:24 2011
@@ -40,6 +40,39 @@ under the License.
   </div>
   <div class="screenlet-body">
      <table class="basic-table" cellspacing='0'>
+     <#assign orderTypeId = orderReadHelper.getOrderTypeId()>
+     <#if orderTypeId == "PURCHASE_ORDER">
+       <tr>
+         <th>${uiLabelMap.AccountingPaymentID}</th>
+         <th>${uiLabelMap.CommonTo}</th>
+         <th>${uiLabelMap.CommonAmount}</th>
+         <th>${uiLabelMap.CommonStatus}</th>
+       </tr>
+       <#list orderPaymentPreferences as orderPaymentPreference>
+         <#assign payments = delegator.findByAnd("Payment", {"paymentPreferenceId" : orderPaymentPreference.orderPaymentPreferenceId})>
+         <#list payments as payment>
+           <#assign statusItem = payment.getRelatedOne("StatusItem")>
+           <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)>
+           <tr>
+             <#if security.hasPermission("PAY_INFO_VIEW", session) || security.hasPermission("PAY_INFO_ADMIN", session)>
+               <td><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td>
+             <#else>
+               <td>${payment.paymentId}</td>
+             </#if>
+             <td>${partyName.groupName?if_exists}${partyName.lastName?if_exists} ${partyName.firstName?if_exists} ${partyName.middleName?if_exists}
+             <#if security.hasPermission("PARTYMGR_VIEW", session) || security.hasPermission("PARTYMGR_ADMIN", session)>
+               [<a href="/partymgr/control/viewprofile?partyId=${partyId}">${partyId}</a>]
+             <#else>
+               [${partyId}]
+             </#if>
+             </td>
+             <td><@ofbizCurrency amount=payment.amount?if_exists/></td>
+             <td>${statusItem.description}</td>
+           </tr>
+         </#list>
+       </#list>
+     <#else>
+    
      <#-- order payment status -->
      <tr>
        <td align="center" valign="top" width="29%" class="label">&nbsp;${uiLabelMap.OrderStatusHistory}</td>
@@ -485,6 +518,7 @@ under the License.
    </form>
    </td></tr>
 </#if>
+</#if>
 </table>
 </div>
 </div>