svn commit: r1235528 - in /ofbiz/trunk: applications/order/config/ applications/order/data/ applications/order/widget/ordermgr/ specialpurpose/myportal/data/

[erwan]

Author: erwan
Date: Tue Jan 24 22:15:10 2012
New Revision: 1235528

URL: http://svn.apache.org/viewvc?rev=1235528&view=rev
Log:
OFBIZ-2403 - Create a Portlet that show a list of returns placed by a customer

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/data/OrderPortletData.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1235528&r1=1235527&r2=1235528&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Jan 24 22:15:10 2012
@@ -4928,6 +4928,10 @@
         <value xml:lang="zh">送货数量</value>
         <value xml:lang="zh_TW">送貨數量</value>
     </property>
+    <property key="OrderMyReturns">
+        <value xml:lang="en">My returns</value>
+        <value xml:lang="fr">Mes retours</value>
+    </property>
     <property key="OrderNOTEMultipleShipmentsExist">
         <value xml:lang="de">Anmerkung: Mehrere Lieferungen vorhanden, verwenden Sie Lieferung aufteilen.</value>
         <value xml:lang="en">NOTE: Multiple shipments exist, use Split Shipment.</value>

Modified: ofbiz/trunk/applications/order/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderPortletData.xml?rev=1235528&r1=1235527&r2=1235528&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderPortletData.xml Tue Jan 24 22:15:10 2012
@@ -187,4 +187,13 @@
     <PortletPortletCategory portalPortletId="PDR_Report" portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" sequenceNum="12"/>
 
+    <PortletCategory portletCategoryId="CUST_ORDERS" description="Customer Orders"/>
+    <PortalPortlet portalPortletId="ListCustReturns"
+        portletName="Customer Returns"
+        screenName="ListCustReturns"
+        screenLocation="component://order/widget/ordermgr/CustRequestScreens.xml"
+        description="List of Returns by a customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW"
+        editFormName="EditCustRetStatusId"
+        editFormLocation="component://order/widget/ordermgr/CustRequestForms.xml"/>
+    <PortletPortletCategory portalPortletId="ListCustReturns" portletCategoryId="CUST_ORDERS"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1235528&r1=1235527&r2=1235528&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Tue Jan 24 22:15:10 2012
@@ -721,4 +721,28 @@ under the License.
             <sort-field name="submit"/>
         </sort-order>
     </form>
+    <form name="EditCustRetStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
+        <field name="statusId" entry-name="attributeMap.statusId">
+            <drop-down>
+                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                    <entity-constraint name="statusTypeId" operator="equals" value="ORDER_RETURN_STTS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="saveButton"><submit/></field>
+    </form>
+    <form name="ListReturns" type="list" title="" list-name="listIt"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-and entity-name="ReturnHeader">
+                <field-map field-name="fromPartyId" from-field="partyId"/>
+                <field-map field-name="statusId" from-field="statusId"/>
+            </entity-and>
+        </actions>
+        <field name="returnId" title="${uiLabelMap.OrderReturnId}"><display/></field>
+        <field name="entryDate" title="${uiLabelMap.OrderEntryDate}"><display/></field>
+        <field name="destinationFacilityId" title="${uiLabelMap.OrderReturnDestinationFacility}"><display/></field>
+        <field name="statusId"><display/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1235528&r1=1235527&r2=1235528&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Tue Jan 24 22:15:10 2012
@@ -701,5 +701,21 @@ under the License.
             </fail-widgets>
         </section>
     </screen>
-    
+
+    <screen name="ListCustReturns">
+        <section>
+            <actions>
+                <set field="partyId" from-field="userLogin.partyId"/>
+                <set field="screenletTitle" from-field="uiLabelMap.OrderMyReturns"/>
+                <entity-one entity-name="StatusItem" value-field="statusItem">
+                    <field-map field-name="statusId" from-field="statusId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <screenlet title="${screenletTitle} (${statusItem.description})" navigation-form-name="ListCustReturns" >
+                    <include-form name="ListReturns" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=1235528&r1=1235527&r2=1235528&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Jan 24 22:15:10 2012
@@ -45,6 +45,7 @@
     <PortalPage portalPageId="MYPORTAL_CUSTOMER2" sequenceNum="200" portalPageName="Invoices" description="The OFBiz My Portal Invoices page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/>
     <PortalPage portalPageId="MYPORTAL_CUSTOMER3" sequenceNum="300" portalPageName="Projects" description="The OFBiz My Portal Project page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/>
     <PortalPage portalPageId="MYPORTAL_CUSTOMER4" sequenceNum="400" portalPageName="Orders" description="The OFBiz My Portal Order page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/>
+    <PortalPage portalPageId="MYPORTAL_CUSTOMER5" sequenceNum="500" portalPageName="My Orders" description="The OFBiz My Portal Order page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/>
 
     <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001"/>
     <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00002" columnWidthPercentage="50"/>
@@ -74,6 +75,7 @@
     <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001"/>
     <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001"/>
     <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER4" columnSeqId="00001"/>
+    <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER5" columnSeqId="00001"/>
 
     <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
@@ -157,10 +159,11 @@
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002"  sequenceNum="8"/>
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListCustomerInvoices" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListCustomerProjects" portletSeqId="00001" columnSeqId="00001"  sequenceNum="0"/>
-    
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER4" portalPortletId="ListCustomerOrders" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortletAttribute portalPageId="MYPORTAL_CUSTOMER4" portalPortletId="ListCustomerOrders" portletSeqId="00001" attrName="statusId" attrValue="ORDER_APPROVED"/>
     <PortletAttribute portalPageId="MYPORTAL_CUSTOMER4" portalPortletId="ListCustomerOrders" portletSeqId="00001" attrName="roleTypeId" attrValue="PLACING_CUSTOMER"/>
+    <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER5" portalPortletId="ListCustReturns" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+    <PortletAttribute portalPageId="MYPORTAL_CUSTOMER5" portalPortletId="ListCustReturns" portletSeqId="00001" attrName="statusId" attrValue="RETURN_REQUESTED"/>
     
     <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/>
     <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/>