Author: sichen
Date: Fri Sep 29 16:40:50 2006
New Revision: 451493

URL: http://svn.apache.org/viewvc?view=rev&rev=451493
Log:
ability to cancel order payment preferences from orders which have not been 
completed, canceled, or rejected

Modified:
    
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl

Modified: 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=451493&r1=451492&r2=451493
==============================================================================
--- 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml 
(original)
+++ 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml 
Fri Sep 29 16:40:50 2006
@@ -1351,6 +1351,13 @@
         <response name="success" type="view" value="orderview"/>
     </request-map>
     
+    <request-map uri="updateOrderPaymentPreference">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateOrderPaymentPreference"/>
+        <response name="success" type="view" value="orderview"/>
+        <response name="error" type="view" value="orderview"/>
+    </request-map>
+    
     <!-- Lookup request mappings -->
     <request-map uri="LookupPerson"><security https="true" 
auth="true"/><response name="success" type="view" 
value="LookupPerson"/></request-map>
     <request-map uri="LookupPartyGroup"><security https="true" 
auth="true"/><response name="success" type="view" 
value="LookupPartyGroup"/></request-map>

Modified: 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl
URL: 
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl?view=diff&rev=451493&r1=451492&r2=451493
==============================================================================
--- 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl 
(original)
+++ 
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderheader.ftl 
Fri Sep 29 16:40:50 2006
@@ -300,6 +300,13 @@
                             <a valign="top" 
href="<@ofbizUrl>receivepayment?${paramString}</@ofbizUrl>" 
class="buttontext">${uiLabelMap.AccountingReceivePayment}</a>
                           </td>
                         </#if>
+                        <td>
+                           <#if 
(!orderHeader.statusId.equals("ORDER_COMPLETED")) && 
!(orderHeader.statusId.equals("ORDER_REJECTED")) && 
!(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                           <#if orderPaymentPreference.statusId != 
"PAYMENT_SETTLED">                        
+                              <a 
href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
+                           </#if>
+                           </#if>
+                        </td>
                       </tr>
                     </#if>
                   <#else>
@@ -371,6 +378,13 @@
                             </div>
                           </#if>
                         </td>
+                        <td>
+                           <#if 
(!orderHeader.statusId.equals("ORDER_COMPLETED")) && 
!(orderHeader.statusId.equals("ORDER_REJECTED")) && 
!(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                           <#if orderPaymentPreference.statusId != 
"PAYMENT_SETTLED">                        
+                              <a 
href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
+                           </#if>
+                           </#if>
+                        </td>
                       </tr>
                     <#elseif paymentMethod.paymentMethodTypeId?if_exists == 
"EFT_ACCOUNT">
                       <#assign eftAccount = 
paymentMethod.getRelatedOne("EftAccount")>
@@ -398,6 +412,13 @@
                             </#if>
                           </div>
                         </td>
+                        <td>
+                           <#if 
(!orderHeader.statusId.equals("ORDER_COMPLETED")) && 
!(orderHeader.statusId.equals("ORDER_REJECTED")) && 
!(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                           <#if orderPaymentPreference.statusId != 
"PAYMENT_SETTLED">                        
+                              <a 
href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
+                           </#if>
+                           </#if>
+                        </td>
                       </tr>
                     <#elseif paymentMethod.paymentMethodTypeId?if_exists == 
"GIFT_CARD">
                       <#assign giftCard = 
paymentMethod.getRelatedOne("GiftCard")>
@@ -442,6 +463,13 @@
                               ${uiLabelMap.CommonInformation} 
${uiLabelMap.CommonNot} ${uiLabelMap.CommonAvailable}
                             </#if>
                           </div>
+                        </td>
+                        <td>
+                           <#if 
(!orderHeader.statusId.equals("ORDER_COMPLETED")) && 
!(orderHeader.statusId.equals("ORDER_REJECTED")) && 
!(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                           <#if orderPaymentPreference.statusId != 
"PAYMENT_SETTLED">                        
+                              <a 
href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.CommonCancel}</a>&nbsp;
+                           </#if>
+                           </#if>
                         </td>
                       </tr>
                     </#if>


Reply via email to