Author: nmalin
Date: Fri Jan 22 22:26:09 2016
New Revision: 1726334
URL: http://svn.apache.org/viewvc?rev=1726334&view=rev
Log:
I converted CreditCardTypeGlAccount crud service from simple to entity-auto
engine.
I also convert updatePaymentMethodType and removePaymentContent service
Related Issue OFBIZ-6852
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/servicedef/services_payment.xml
ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.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=1726334&r1=1726333&r2=1726334&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
Fri Jan 22 22:26:09 2016
@@ -70,41 +70,17 @@ under the License.
<set field="ueaMap.partyId" from-field="parameters.partyId"/>
<!-- use the service so it will expire the old account and
create a new one; don't break on error since this is a background process, just
get whatever we can done... -->
<call-service service-name="updateEftAccount"
in-map-name="ueaMap" break-on-error="false"/>
- </if-empty>
+ </if-empty>
</iterate>
</simple-method>
- <!--CreateCreditCardTypeGlAccount methods -->
- <simple-method method-name="createCreditCardTypeGlAccount"
short-description="Create a Credit Card Gl Account">
- <make-value entity-name="CreditCardTypeGlAccount"
value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <simple-method method-name="updateCreditCardTypeGlAccount"
short-description="Update a Credit Card Gl Account">
- <entity-one entity-name="CreditCardTypeGlAccount"
value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteCreditCardTypeGlAccount"
short-description="Delete a Credit Card Gl Account">
- <entity-one entity-name="CreditCardTypeGlAccount"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- Updates a Payment Method Type default glAccountId -->
- <simple-method method-name="updatePaymentMethodType"
short-description="Updates a Payment Method Type default glAccountId">
- <entity-one entity-name="PaymentMethodType"
value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
<simple-method method-name="expirePaymentGroupMember"
short-description="expire a Payment Group Member">
<entity-one entity-name="PaymentGroupMember"
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">
<make-value value-field="newPaymentMethod"
entity-name="PaymentMethod"/>
<set-pk-fields value-field="newPaymentMethod" map="parameters"/>
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=1726334&r1=1726333&r2=1726334&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
Fri Jan 22 22:26:09 2016
@@ -1186,10 +1186,4 @@ under the License.
<set-service-fields service-name="updateContent" map="parameters"
to-map="updateContent"/>
<call-service service-name="updateContent"
in-map-name="updateContent"/>
</simple-method>
- <simple-method method-name="removePaymentContent"
short-description="Remove Content From Payment">
- <make-value value-field="lookupPKMap" entity-name="PaymentContent"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_payment.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml?rev=1726334&r1=1726333&r2=1726334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_payment.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_payment.xml Fri Jan
22 22:26:09 2016
@@ -266,10 +266,8 @@ under the License.
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes entity-name="Content" include="nonpk" mode="IN"
optional="true"/>
</service>
- <service name="removePaymentContent" default-entity-name="PaymentContent"
engine="simple"
-
location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml"
invoke="removePaymentContent" auth="true">
+ <service name="removePaymentContent" default-entity-name="PaymentContent"
engine="entity-auto" invoke="delete" auth="true">
<description>Remove Content From Payment</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
</services>
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml?rev=1726334&r1=1726333&r2=1726334&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
(original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
Fri Jan 22 22:26:09 2016
@@ -781,32 +781,28 @@ under the License.
</service>
<!-- CreditCardTypeGlAccount Services -->
- <service name="createCreditCardTypeGlAccount"
default-entity-name="CreditCardTypeGlAccount" engine="simple"
-
location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml"
invoke="createCreditCardTypeGlAccount" auth="true">
+ <service name="createCreditCardTypeGlAccount"
default-entity-name="CreditCardTypeGlAccount" engine="entity-auto"
invoke="create" auth="true">
<description>create a Credit Card Gl Account</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="false"/>
</service>
- <service name="updateCreditCardTypeGlAccount"
default-entity-name="CreditCardTypeGlAccount" engine="simple"
-
location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml"
invoke="updateCreditCardTypeGlAccount" auth="true">
+ <service name="updateCreditCardTypeGlAccount"
default-entity-name="CreditCardTypeGlAccount" engine="entity-auto"
invoke="update" auth="true">
<description>Update a Credit Card Gl Account </description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="false"/>
</service>
- <service name="deleteCreditCardTypeGlAccount"
default-entity-name="CreditCardTypeGlAccount" engine="simple"
-
location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml"
invoke="deleteCreditCardTypeGlAccount" auth="true">
+ <service name="deleteCreditCardTypeGlAccount"
default-entity-name="CreditCardTypeGlAccount" engine="entity-auto"
invoke="delete" auth="true">
<description>delete a Credit Card Gl Account</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- Update updatePaymentMethodType -->
- <service name="updatePaymentMethodType"
default-entity-name="PaymentMethodType" engine="simple"
-
location="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml"
invoke="updatePaymentMethodType" auth="true">
+ <service name="updatePaymentMethodType"
default-entity-name="PaymentMethodType" engine="entity-auto" invoke="update"
auth="true">
<description>Update a Payment Method Type</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
-
+
<!-- Payment Group -->
<service name="createPaymentGroup" default-entity-name="PaymentGroup"
engine="entity-auto" invoke="create" auth="true">
<description>Create a Payment Group</description>
