Author: apatel
Date: Wed Jul 29 08:09:25 2009
New Revision: 798805
URL: http://svn.apache.org/viewvc?rev=798805&view=rev
Log:
Expire instead of deleting PaymentGroupMembers.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=798805&r1=798804&r2=798805&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
Wed Jul 29 08:09:25 2009
@@ -128,8 +128,9 @@
</simple-method>
<simple-method method-name="expirePaymentGroupMember"
short-description="expire a Payment Group Member">
<entity-one entity-name="PaymentGroupMember"
value-field="paymentGroupMember"/>
- <now-timestamp field="paymentGroupMember.thruDate"/>
- <store-value value-field="paymentGroupMember"/>
+ <set-service-fields service-name="updatePaymentGroupMember"
map="paymentGroupMember" to-map="updatePaymentGroupMemberMap"/>
+ <now-timestamp field="updatePaymentGroupMemberMap.thruDate"/>
+ <call-service service-name="updatePaymentGroupMember"
in-map-name="updatePaymentGroupMemberMap"/>
</simple-method>
<simple-method method-name="createPayPalPaymentMethod"
short-description="Create a PayPal Payment Method">
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=798805&r1=798804&r2=798805&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
Wed Jul 29 08:09:25 2009
@@ -472,8 +472,8 @@
<field-map field-name="paymentGroupId"/>
</entity-and>
<iterate list="paymentGroupMembers" entry="paymentGroupMember">
- <set-service-fields service-name="deletePaymentGroupMember"
map="paymentGroupMember" to-map="deletePaymentGroupMemberMap"/>
- <call-service service-name="deletePaymentGroupMember"
in-map-name="deletePaymentGroupMemberMap"/>
+ <set-service-fields service-name="expirePaymentGroupMember"
map="paymentGroupMember" to-map="expirePaymentGroupMemberMap"/>
+ <call-service service-name="expirePaymentGroupMember"
in-map-name="expirePaymentGroupMemberMap"/>
</iterate>
</simple-method>
@@ -614,8 +614,8 @@
<get-related-one relation-name="Payment"
value-field="paymentGroupMember" to-value-field="payment"/>
<set-service-fields service-name="voidPayment" map="payment"
to-map="voidPaymentMap"/>
<call-service service-name="voidPayment"
in-map-name="voidPaymentMap"/>
- <set-service-fields service-name="deletePaymentGroupMember"
map="paymentGroupMember" to-map="deletePaymentGroupMemberMap"/>
- <call-service service-name="deletePaymentGroupMember"
in-map-name="deletePaymentGroupMemberMap"/>
+ <set-service-fields service-name="expirePaymentGroupMember"
map="paymentGroupMember" to-map="expirePaymentGroupMemberMap"/>
+ <call-service service-name="expirePaymentGroupMember"
in-map-name="expirePaymentGroupMemberMap"/>
</iterate>
</simple-method>
</simple-methods>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=798805&r1=798804&r2=798805&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Wed Jul 29 08:09:25 2009
@@ -419,9 +419,9 @@
<response name="success" type="view" value="EditPaymentGroupMember"/>
<response name="error" type="view" value="EditPaymentGroupMember"/>
</request-map>
- <request-map uri="deletePaymentGroupMember">
+ <request-map uri="expirePaymentGroupMember">
<security https="true" auth="true"/>
- <event type="service" invoke="deletePaymentGroupMember"/>
+ <event type="service" invoke="expirePaymentGroupMember"/>
<response name="success" type="view" value="EditPaymentGroupMember"/>
<response name="error" type="view" value="EditPaymentGroupMember"/>
</request-map>
@@ -1851,9 +1851,9 @@
<response name="success" type="view"
value="EditDepositSlipAndMembers"/>
<response name="error" type="view" value="EditDepositSlipAndMembers"/>
</request-map>
- <request-map uri="deleteDepositSlipMember">
+ <request-map uri="expireDepositSlipMember">
<security https="true" auth="true"/>
- <event type="service" invoke="deletePaymentGroupMember"/>
+ <event type="service" invoke="expirePaymentGroupMember"/>
<response name="success" type="view"
value="EditDepositSlipAndMembers"/>
<response name="error" type="view" value="EditDepositSlipAndMembers"/>
</request-map>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=798805&r1=798804&r2=798805&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Wed Jul 29
08:09:25 2009
@@ -252,7 +252,7 @@
</form>
<form name="ListDepositSlipMember" type="list"
target="updateDepositSlipMember" extends="ListPaymentGroupMember"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink target="deleteDepositSlipMember"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink target="expireDepositSlipMember"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="paymentId"/>
<parameter param-name="fromDate"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=798805&r1=798804&r2=798805&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Wed Jul 29
08:09:25 2009
@@ -96,7 +96,7 @@
<field name="fromDate"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="" widget-style="buttontext">
- <hyperlink target="deletePaymentGroupMember"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink target="expirePaymentGroupMember"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
<parameter param-name="paymentId"/>
<parameter param-name="fromDate"/>
