svn commit: r600770 - in /ofbiz/trunk/applications/accounting: config/ script/org/ofbiz/accounting/payment/ servicedef/ webapp/accounting/WEB-INF/ widget/

[apatel-2]

Author: apatel
Date: Mon Dec  3 18:13:13 2007
New Revision: 600770

URL: http://svn.apache.org/viewvc?rev=600770&view=rev
Log:
Implement CRUD services and screens for CreditCardTypeGlAccount entity

Thanks Alok Agnihori for providing implementation And also our thanks to Vikas Mayur, Ashish Vijaywargiya, Mridul Pathak, Pankaj Savita and others for managing and helping the team implementing these services.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=600770&r1=600769&r2=600770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Mon Dec  3 18:13:13 2007
@@ -147,6 +147,7 @@
 AccountingCreditCardBillingAddNotFoundError=Billing Address associated with Credit Card not found.
 AccountingCreditCardEmailAddNotFoundError=Bill To Email Address not found.
 AccountingCreditCardManualAuthFailedError=Not creating credit card.  Credit card not verified, authentication failed.
+AccountingCreditCardTypeGlAccount=Credit Card Type GlAccount
 AccountingCustomer=Customer
 AccountingCustNr=Cust.Nr
 AccountingDataExchange=DataExchange

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=600770&r1=600769&r2=600770&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 Mon Dec  3 18:13:13 2007
@@ -101,4 +101,22 @@
             <call-service service-name="updateEftAccount" in-map-name="ueaMap" break-on-error="false"/>
         </iterate>
     </simple-method>
+    <!--CreateCreditCardTypeGlAccount methods -->
+    <simple-method method-name="createCreditCardTypeGlAccount" short-description="Create a Credit Card Gl Account">
+        <make-value entity-name="CreditCardTypeGlAccount" value-name="newEntity"/>
+        <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <create-value value-name="newEntity"/>
+    </simple-method>
+    
+    <simple-method method-name="updateCreditCardTypeGlAccount" short-description="Update a Credit Card Gl Account">
+        <entity-one entity-name="CreditCardTypeGlAccount" value-name="lookedUpValue"/>
+        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="deleteCreditCardTypeGlAccount" short-description="Delete a Credit Card Gl Account">
+        <entity-one entity-name="CreditCardTypeGlAccount" value-name="lookedUpValue"/>
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml?rev=600770&r1=600769&r2=600770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml Mon Dec  3 18:13:13 2007
@@ -678,4 +678,24 @@
         <attribute name="productStoreId" type="String" mode="IN" optional="true"/>
         <attribute name="mode" type="String" mode="IN" optional="false"/>
     </service>
+
+    <!-- CreditCardTypeGlAccount Services -->
+    <service name="createCreditCardTypeGlAccount" default-entity-name="CreditCardTypeGlAccount" engine="simple"
+                location="org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="createCreditCardTypeGlAccount" 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="org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="updateCreditCardTypeGlAccount" 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="org/ofbiz/accounting/payment/PaymentMethodServices.xml" invoke="deleteCreditCardTypeGlAccount" auth="true">
+        <description>delete a Credit Card Gl Account</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    
 </services>

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=600770&r1=600769&r2=600770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Dec  3 18:13:13 2007
@@ -1355,6 +1355,34 @@
         <response name="error" type="view" value="EditVarianceReasonGlAccounts"/>
     </request-map>
     
+    <!--request-uri CreditCardTypeGlAccount -->
+    
+    <request-map uri="editCreditCardTypeGlAccounts">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditCreditCardTypeGlAccounts"/>
+    </request-map>
+    
+    <request-map uri="createCreditCardTypeGlAccount">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createCreditCardTypeGlAccount"/>
+        <response name="success" type="view" value="EditCreditCardTypeGlAccounts"/>
+        <response name="error" type="view" value="EditCreditCardTypeGlAccounts"/>
+    </request-map>
+    
+    <request-map uri="updateCreditCardTypeGlAccount">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateCreditCardTypeGlAccount"/>
+        <response name="success" type="view" value="EditCreditCardTypeGlAccounts"/>
+        <response name="error" type="view" value="EditCreditCardTypeGlAccounts"/>
+    </request-map>
+    
+    <request-map uri="deleteCreditCardTypeGlAccount">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteCreditCardTypeGlAccount"/>
+        <response name="success" type="view" value="EditCreditCardTypeGlAccounts"/>
+        <response name="error" type="view" value="EditCreditCardTypeGlAccounts"/>
+    </request-map>
+    
     <!-- Actually reconcile account -->
     <request-map uri="reconcileGlAccount">
         <security https="true" auth="true"/>
@@ -1706,6 +1734,7 @@
     <view-map name="EditProductGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditProductGlAccounts"/>
     <view-map name="EditProductCategoryGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditProductCategoryGlAccounts"/>    
     <view-map name="EditVarianceReasonGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditVarianceReasonGlAccounts"/>
+    <view-map name="EditCreditCardTypeGlAccounts" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditCreditCardTypeGlAccounts"/>
         
     <!-- Manual Credit Card Transaction -->
     <view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=600770&r1=600769&r2=600770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Mon Dec  3 18:13:13 2007
@@ -613,5 +613,36 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-  
+    
+    <form name="ListCreditCardTypeGlAccounts" type="list" target="updateCreditCardTypeGlAccount" list-name="creditCardTypeGlAccounts">
+        <auto-fields-service service-name="updateCreditCardTypeGlAccount" default-field-type="display"/>
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
+            <drop-down allow-empty="false">
+                <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+            </drop-down>
+        </field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+            <hyperlink target="deleteCreditCardTypeGlAccount?organizationPartyId=${organizationPartyId}&amp;cardType=${cardType}" description="${uiLabelMap.CommonRemove}"/>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
+    <form name="AddCreditCardTypeGlAccount" type="single" target="createCreditCardTypeGlAccount">
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="cardType">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="enumId">
+                    <entity-constraint name="enumTypeId" operator="equals" value="CREDIT_CARD_TYPE"/>
+                    <entity-order-by field-name="enumId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
+            <drop-down allow-empty="false">
+               <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=600770&r1=600769&r2=600770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Mon Dec  3 18:13:13 2007
@@ -477,4 +477,38 @@
             </widgets>    
         </section>
     </screen>
+    
+    <screen name="EditCreditCardTypeGlAccounts">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="titleProperty" value="CreditCardTypeGlAccounts"/>
+                <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="CreditCardTypeGlAccount"/>
+                <set field="labelTitleProperty" value="${uiLabelMap.CreditCardTypeGlAccount}"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+                <entity-condition entity-name="CreditCardTypeGlAccount" list-name="creditCardTypeGlAccounts">
+                    <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+                </entity-condition>
+                <entity-condition entity-name="GlAccountOrganizationAndClass" list-name="glAccounts" use-cache="true">
+                    <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+                    <order-by field-name="accountCode"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonAdminDecorator">
+                    <decorator-section name="body">
+                        <container>
+                            <include-form name="ListCreditCardTypeGlAccounts" location="component://accounting/widget/GlSetupForms.xml"/>
+                            <container>
+                                <label style="head2">${uiLabelMap.ProductAddCategoryGlAccount}</label>
+                            </container>
+                            <include-form name="AddCreditCardTypeGlAccount" location="component://accounting/widget/GlSetupForms.xml"/>
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
 </screens>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=600770&r1=600769&r2=600770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Dec  3 18:13:13 2007
@@ -487,6 +487,9 @@
         <menu-item name="VarianceReasonGlAccounts" title="${uiLabelMap.VarianceReasonGlAccounts}">
             <link target="editVarianceReasonGlAccounts?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
+        <menu-item name="CreditCardTypeGlAccount" title="${uiLabelMap.AccountingCreditCardTypeGlAccount}">
+            <link target="editCreditCardTypeGlAccounts?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
     </menu>
     <menu name="PartyAccountingChecksTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">