svn commit: r1761678 - in /ofbiz/trunk/specialpurpose/birt: config/ data/ webapp/ordermgr/WEB-INF/ webapp/ordermgr/reports/ widget/order/

Author: jleroux
Date: Wed Sep 21 06:36:00 2016
New Revision: 1761678

URL: http://svn.apache.org/viewvc?rev=1761678&view=rev
Log:
Fixes: Order By Referrer is not working
(OFBIZ-7318)

See
https://ofbiz-vm.apache.org:8443/ordermgr/control/OrderPurchaseReportOptions
Section : Order By Referrer

Found out that in OrderByReferrer.rptdesign we tried to fetch nonexisting fields
like "visitId" and "initialReferrer" from SalesOrderItemFact which causing
problem in this report. On rev #886743 SalesOrderItemFact extended with visitId
and initialReferrer and on rev #1055774 these field has been removed.
So I think we need to clean references of visitId and initialReferrer from the
report and if we removed these fields then report will not make any sense.
So in my opinion it is better to remove this report from OFBIZ.

Thanks: Rohit Koushalfor report and patch

Removed:
    ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign
Modified:
    ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
    ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
    ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
    ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml

Modified: ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml?rev=1761678&r1=1761677&r2=1761678&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/config/BirtUiLabels.xml Wed Sep 21 06:36:00 2016
@@ -93,11 +93,6 @@
         <value xml:lang="fr">Tous les lignes de commandes ayant des codes promotionels</value>
         <value xml:lang="zh">所有带有折扣优惠码的订单明细</value>
     </property>
-    <property key="BirtOrderReportAllReferrer">
-        <value xml:lang="en">All Referrer</value>
-        <value xml:lang="fr">Tous apporteurs d'affaires</value>
-        <value xml:lang="zh">所有访问来源</value>
-    </property>
     <property key="BirtOrderReportCouponSalesReport">
         <value xml:lang="en">Coupon Sales Report</value>
         <value xml:lang="fr">Ventes promotionelles</value>
@@ -118,11 +113,6 @@
         <value xml:lang="fr">Net avant frais généraux</value>
         <value xml:lang="zh">计入制造费用前的净值报表</value>
     </property>
-    <property key="BirtOrderReportOrderByReferrer">
-        <value xml:lang="en">Order By Referrer</value>
-        <value xml:lang="fr">Commandes par apporteurs d'affaires</value>
-        <value xml:lang="zh">按访问来源排序</value>
-    </property>
     <property key="BirtOrderReportProductDemandReport">
         <value xml:lang="en">Product Demand Report</value>
         <value xml:lang="fr">Demandes par produit</value>

Modified: ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml?rev=1761678&r1=1761677&r2=1761678&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/data/OrderPortletData.xml Wed Sep 21 06:36:00 2016
@@ -18,14 +18,6 @@
     under the License.
 -->
 <entity-engine-xml>
-    <PortalPortlet portalPortletId="OrderByReferrer"
-                   portletName="Sale Orders By Referrer Report"
-                   screenName="SaleOrdersByReferrerReport"
-                   screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
-    <PortletPortletCategory portalPortletId="OrderByReferrer" portletCategoryId="REPORT"/>
-    <PortalPagePortlet portalPageId="OrderReportPage" portalPortletId="OrderByReferrer" portletSeqId="00001" columnSeqId="00001" sequenceNum="5"/>
-
     <PortalPortlet portalPortletId="OrderByChannel"
                    portletName="Sale Orders by Channel"
                    screenName="SaleOrdersByChannelReport"

Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml?rev=1761678&r1=1761677&r2=1761678&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/controller.xml Wed Sep 21 06:36:00 2016
@@ -94,9 +94,6 @@ under the License.
         <response name="success" type="view" value="ProductDemandOrderReport"/>
     </request-map>
 
-    <request-map uri="OrderByReferrer.pdf"><security https="true" auth="true"/>
-        <response name="success" type="view" value="OrderByReferrerReport"/>
-    </request-map>
     <request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
         <event type="groovy" path="component://birt/groovyScripts/order/OrderByChannel.groovy"/>
         <response name="success" type="view" value="OrdersByChannelReport"/>
@@ -124,7 +121,6 @@ under the License.
     <view-map name="SalesOrderReportMonthHTML" type="birt" page="component://birt/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="text/html"/>
     <view-map name="NetBeforeOverheadOrderReport" type="birt" page="component://birt/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign" content-type="application/pdf"/>
     <view-map name="ProductDemandOrderReport" type="birt" page="component://birt/webapp/ordermgr/reports/ProductDemandReport.rptdesign" content-type="application/pdf"/>
-    <view-map name="OrderByReferrerReport" type="birt" page="component://birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign" content-type="application/pdf"/>
     <view-map name="OrdersByChannelReport" type="birt" page="component://birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign" content-type="application/pdf"/>
     <view-map name="SaleOrderDiscountCodeReport" type="birt" page="component://birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign" content-type="application/pdf"/>
     <view-map name="Last3MonthsSalesReport" type="birt" page="component://birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign" content-type="application/pdf"/>

Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1761678&r1=1761677&r2=1761678&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Wed Sep 21 06:36:00 2016
@@ -67,11 +67,6 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
-    <form name="OrderByReferrer" type="single" target="OrderByReferrer.pdf" target-window="_BLANK">
-        <!--field name="referrerUrl"><text-find default-option="contains"/></field-->
-        <field name="referrerUrl" title=" "><display description="${uiLabelMap.BirtOrderReportAllReferrer}"></display></field>
-        <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field>
-    </form>
     <form name="SaleOrdersByChannel" type="single" target="OrdersByChannel.pdf" target-window="_BLANK">
         <field name="SalesChannel" title="${uiLabelMap.OrderSalesChannel}">
             <drop-down allow-empty="true">

Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml?rev=1761678&r1=1761677&r2=1761678&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderScreens.xml Wed Sep 21 06:36:00 2016
@@ -64,19 +64,6 @@ under the License.
             </widgets>
         </section>
     </screen>
-    <!-- Sale Order By Referrer -->
-    <screen name="SaleOrdersByReferrerReport">        
-        <section>
-            <actions>
-                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>                
-            </actions>
-            <widgets>
-                <screenlet title="${uiLabelMap.BirtOrderReportOrderByReferrer}">
-                    <include-form name="OrderByReferrer" location="component://birt/widget/order/OrderForms.xml"/>
-                </screenlet>
-            </widgets>
-        </section>
-    </screen>
     <!-- Sale Order By Channel -->
     <screen name="SaleOrdersByChannelReport">
         <section>