Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tabs to spaces

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924378 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 81776c6c96ca9336a171deba3e7cadf6fdb2b486 1 parent 15695d8
@lektran lektran authored
Showing with 5,161 additions and 5,161 deletions.
  1. +15 −15 .project
  2. +8 −8 ant
  3. +1 −1  applications/accounting/config/AccountingUiLabels.xml
  4. +1 −1  applications/accounting/webapp/accounting/WEB-INF/controller.xml
  5. +25 −25 applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
  6. +1 −1  applications/accounting/widget/AccountingMenus.xml
  7. +7 −7 applications/accounting/widget/CommonScreens.xml
  8. +4 −4 applications/accounting/widget/PaymentScreens.xml
  9. +1 −1  applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
  10. +2 −2 applications/humanres/entitydef/entitymodel.xml
  11. +1 −1  applications/humanres/widget/GlobalHRSettingScreens.xml
  12. +13 −13 applications/order/data/SalesOrderDemoData.xml
  13. +64 −64 applications/order/data/helpdata/HELP_ORDER_Report.xml
  14. +3 −3 applications/order/entitydef/entitymodel_olap.xml
  15. +2 −2 applications/order/script/org/ofbiz/order/olap/FactServices.xml
  16. +2 −2 applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml
  17. +9 −9 applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
  18. +2 −2 applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
  19. +4 −4 applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
  20. +3 −3 applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
  21. +1 −1  applications/order/webapp/ordermgr/WEB-INF/controller.xml
  22. +32 −32 applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
  23. +49 −49 applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
  24. +594 −594 applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
  25. +10 −10 applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
  26. +3 −3 applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
  27. +36 −36 applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
  28. +402 −402 applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
  29. +1 −1  applications/order/widget/ordermgr/ReportScreens.xml
  30. +4 −4 applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
  31. +34 −34 applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
  32. +1 −1  framework/base/dtd/ofbiz-component.xsd
  33. +2 −2 framework/base/src/org/ofbiz/base/json/JSON.jj
  34. +1 −1  framework/bi/script/org/ofbiz/bi/DimensionServices.xml
  35. +1 −1  framework/birt/build.xml
  36. +7 −7 framework/birt/data/helpdata/HELP_BIRT.xml
  37. +20 −20 framework/common/data/GeoData_CN.xml
  38. +3 −3 framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
  39. +389 −389 framework/datafile/src/org/ofbiz/datafile/Record.java
  40. +5 −5 framework/documents/Framework.xml
  41. +5 −5 framework/entity/documents/EntityEngine.xml
  42. +671 −671 framework/example/webapp/birt/WEB-INF/birt.tld
  43. +90 −90 framework/example/webapp/birt/WEB-INF/server-config.wsdd
  44. +671 −671 framework/example/webapp/example/WEB-INF/birt.tld
  45. +1 −1  framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js
  46. +5 −5 framework/images/webapp/images/selectall.js
  47. +7 −7 framework/minilang/documents/MiniLang.xml
  48. +4 −4 framework/service/documents/ServiceEngine.xml
  49. +4 −4 framework/service/dtd/service-group.xsd
  50. +461 −461 framework/sql/src/org/ofbiz/sql/Parser.jj
  51. +27 −27 framework/sql/src/org/ofbiz/sql/test/GoodParseAll.sql
  52. +13 −13 framework/sql/src/org/ofbiz/sql/test/TestSelect.sql
  53. +5 −5 framework/testtools/documents/TestTools.xml
  54. +76 −76 framework/testtools/dtd/SeleniumXml.xsd
  55. +1 −1  framework/testtools/dtd/test-suite.xsd
  56. +72 −72 framework/testtools/testdef/seleniumxml/example/recorded/AjaxExample.html
  57. +78 −78 framework/testtools/testdef/seleniumxml/example/recorded/NewExample.html
  58. +51 −51 framework/testtools/testdef/seleniumxml/example/recorded/NewFeature.html
  59. +4 −4 framework/webtools/data/helpdata/HELP_WEBTOOLS.xml
  60. +10 −10 framework/webtools/webapp/webtools/entity/EditEntity.jsp
  61. +2 −2 framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
  62. +1 −1  specialpurpose/build.xml
  63. +4 −4 specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml
  64. +8 −8 specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml
  65. +19 −19 specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml
  66. +15 −15 specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml
  67. +5 −5 specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml
  68. +16 −16 specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml
  69. +7 −7 specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml
  70. +5 −5 specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml
  71. +34 −34 specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml
  72. +1 −1  specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
  73. +2 −2 specialpurpose/ebaystore/build.xml
  74. +12 −12 specialpurpose/ebaystore/data/DemoEbayStoreData.xml
  75. +6 −6 specialpurpose/ebaystore/data/EbayStoreTypeData.xml
  76. +18 −18 specialpurpose/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml
  77. +2 −2 specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
  78. +8 −8 specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
  79. +1 −1  specialpurpose/ebaystore/widget/EbayAccountForms.xml
  80. +2 −2 specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
  81. +3 −3 specialpurpose/ecommerce/webapp/ecommerce/images/profile.js
  82. +203 −203 specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css
  83. +19 −19 specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css
  84. +100 −100 specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js
  85. +1 −1  specialpurpose/projectmgr/entitydef/entitymodel.xml
  86. +3 −3 specialpurpose/projectmgr/widget/forms/ProjectForms.xml
  87. +323 −323 themes/bizznesstime/webapp/bizznesstime/css/legacy.css
  88. +66 −66 themes/bizznesstime/webapp/bizznesstime/css/login.css
  89. +114 −114 themes/bizznesstime/webapp/bizznesstime/js/application.js
  90. +114 −114 themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js
  91. +1 −1  themes/flatgrey/webapp/flatgrey/maincss.css
  92. +27 −27 themes/tomahawk/webapp/tomahawk/css/style.css
View
30 .project
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>ofbiz</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+ <name>ofbiz</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
View
16 ant
@@ -26,14 +26,14 @@ else
fi
find_jar() {
- top="$(cd "$(dirname "$0")"; echo "$PWD")"
- set -- "$top"/framework/base/lib/ant-launcher-*.jar
- if [ $# = 1 ] && [ -e "$1" ]; then
- echo "$1"
- else
- echo "Couldn't find ant-launcher.jar" 1>&2
- exit 1
- fi
+ top="$(cd "$(dirname "$0")"; echo "$PWD")"
+ set -- "$top"/framework/base/lib/ant-launcher-*.jar
+ if [ $# = 1 ] && [ -e "$1" ]; then
+ echo "$1"
+ else
+ echo "Couldn't find ant-launcher.jar" 1>&2
+ exit 1
+ fi
}
"$JAVA" -jar "$(find_jar)" "$@"
View
2  applications/accounting/config/AccountingUiLabels.xml
@@ -6690,7 +6690,7 @@
<value xml:lang="en">Organization GL Settings</value>
<value xml:lang="fr">Configurations internes du GL</value>
<value xml:lang="hi_IN">संगठन जीएल(Gl) सेटिंग्स</value>
- <value xml:lang="nl">Organisatie grootboek instellingen</value>
+ <value xml:lang="nl">Organisatie grootboek instellingen</value>
<value xml:lang="zh">组织机构总账设置</value>
</property>
<property key="AccountingOrganizationPartyId">
View
2  applications/accounting/webapp/accounting/WEB-INF/controller.xml
@@ -2531,7 +2531,7 @@ under the License.
<!-- Reports -->
<request-map uri="paymentReport">
- <security https="true" auth="true"/>
+ <security https="true" auth="true"/>
<response name="success" type="view" value="paymentReport"/>
</request-map>
<request-map uri="paymentReportHtml">
View
50 applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
@@ -333,22 +333,22 @@ try {
input = FastMap.newInstance();
inputFields = FastMap.newInstance();
if(params!=null){
- inputFields.put("partyIdTo", params["partyIdTo"]);
- inputFields.put("paymentId", params["paymentId"]);
- inputFields.put("paymentTypeId", params["paymentTypeId"]);
- inputFields.put("paymentId_op", params["paymentId_op"]);
- inputFields.put("paymentRefNum_ic", params["paymentRefNum_ic"]);
- inputFields.put("noConditionFind", params["noConditionFind"]);
- inputFields.put("partyIdFrom", params["partyIdFrom"]);
- inputFields.put("paymentRefNum_op", params["paymentRefNum_op"]);
- inputFields.put("amount", params["amount"]);
- inputFields.put("statusId", params["statusId"]);
- inputFields.put("paymentGatewayResponseId", params["paymentGatewayResponseId"]);
- inputFields.put("paymentId_ic", params["paymentId_ic"]);
- inputFields.put("paymentRefNum", params["paymentRefNum"]);
- inputFields.put("comments_ic", params["comments_ic"]);
- inputFields.put("comments_op", params["comments_op"]);
- inputFields.put("comments", params["comments"]);
+ inputFields.put("partyIdTo", params["partyIdTo"]);
+ inputFields.put("paymentId", params["paymentId"]);
+ inputFields.put("paymentTypeId", params["paymentTypeId"]);
+ inputFields.put("paymentId_op", params["paymentId_op"]);
+ inputFields.put("paymentRefNum_ic", params["paymentRefNum_ic"]);
+ inputFields.put("noConditionFind", params["noConditionFind"]);
+ inputFields.put("partyIdFrom", params["partyIdFrom"]);
+ inputFields.put("paymentRefNum_op", params["paymentRefNum_op"]);
+ inputFields.put("amount", params["amount"]);
+ inputFields.put("statusId", params["statusId"]);
+ inputFields.put("paymentGatewayResponseId", params["paymentGatewayResponseId"]);
+ inputFields.put("paymentId_ic", params["paymentId_ic"]);
+ inputFields.put("paymentRefNum", params["paymentRefNum"]);
+ inputFields.put("comments_ic", params["comments_ic"]);
+ inputFields.put("comments_op", params["comments_op"]);
+ inputFields.put("comments", params["comments"]);
}
input.put("userLogin",userLogin);
input.put("inputFields",inputFields);
@@ -364,16 +364,16 @@ try {
}]]></method>
<method name="fetch"><![CDATA[if(payments==null)return false;
if(payment=payments.next()){
- row["paymentId"] = payment.getString("paymentId");
- row["paymentType"] = payment.getString("paymentTypeId");
- row["status"] = payment.getString("statusId");
- row["from"] = payment.getString("partyIdFrom");
- row["to"] = payment.getString("partyIdTo");
- row["date"] = payment.getString("effectiveDate");
- row["amount"] = payment.getString("amount");
+ row["paymentId"] = payment.getString("paymentId");
+ row["paymentType"] = payment.getString("paymentTypeId");
+ row["status"] = payment.getString("statusId");
+ row["from"] = payment.getString("partyIdFrom");
+ row["to"] = payment.getString("partyIdTo");
+ row["date"] = payment.getString("effectiveDate");
+ row["amount"] = payment.getString("amount");
}else{
- payments.close();
- return false;
+ payments.close();
+ return false;
}
return true;]]></method>
</script-data-set>
View
2  applications/accounting/widget/AccountingMenus.xml
@@ -378,7 +378,7 @@ under the License.
<parameter param-name="paymentId" from-field="payment.paymentId"/>
</link>
</menu-item>
- <menu-item name="paymentReport" title="Payment Report">
+ <menu-item name="paymentReport" title="Payment Report">
<link target="paymentReport"/>
</menu-item>
</menu>
View
14 applications/accounting/widget/CommonScreens.xml
@@ -73,13 +73,13 @@ under the License.
<widgets>
<include-menu name="PaymentSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
- <section>
- <condition>
- <not><if-empty field="paymentId"/></not>
- </condition>
- <widgets>
- <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
- </widgets>
+ <section>
+ <condition>
+ <not><if-empty field="paymentId"/></not>
+ </condition>
+ <widgets>
+ <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
+ </widgets>
</section>
</container>
<decorator-section-include name="body"/>
View
8 applications/accounting/widget/PaymentScreens.xml
@@ -542,7 +542,7 @@ under the License.
<screen name="PaymentReport">
<section>
<actions>
- <set field="headerItem" value="payments"/>
+ <set field="headerItem" value="payments"/>
<set field="tabButtonItem" value="paymentReport"/>
</actions>
<widgets>
@@ -550,9 +550,9 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <screenlet title="Payment Report">
- <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
- </screenlet>
+ <screenlet title="Payment Report">
+ <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
View
2  applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
@@ -39,5 +39,5 @@ if("website".equals(tabButtonItemTop)){
context.showScreen = "message";
return;
}
- context.webSite = webSite;
+ context.webSite = webSite;
}
View
4 applications/humanres/entitydef/entitymodel.xml
@@ -436,7 +436,7 @@ under the License.
<field name="fromDate" type="date-time"/>
<field name="thruDate" type="date-time"/>
<field name="approverPartyId" type="id-ne"/>
- <field name="leaveStatus" type="short-varchar"/>
+ <field name="leaveStatus" type="short-varchar"/>
<field name="description" type="description"/>
<prim-key field="partyId"/>
<prim-key field="leaveTypeId"/>
@@ -452,7 +452,7 @@ under the License.
</relation>
<relation type="one" fk-name="EMPL_LEAVE_APPR" title="Approver" rel-entity-name="Party">
<key-map field-name="approverPartyId" rel-field-name="partyId"/>
- </relation>
+ </relation>
</entity>
<entity entity-name="EmplLeaveType"
package-name="org.ofbiz.humanres.employment"
View
2  applications/humanres/widget/GlobalHRSettingScreens.xml
@@ -238,7 +238,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveReasonTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveReasonTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet id="AddEmplLeaveTypePanel" title="${uiLabelMap.HumanResAddEmplLeaveType}" collapsible="true">
<include-form name="AddEmplLeaveType" location="component://humanres/widget/forms/GlobalHrSettingForms.xml"/>
</screenlet>
View
26 applications/order/data/SalesOrderDemoData.xml
@@ -1761,7 +1761,7 @@ under the License.
<ProductPromo productPromoId="DEMO_PROMO004" promoName="Demo Promotion 4" promoText="With special code [9021] get products in the Featured Products category for their special promotion price." userEntered="Y" showToCustomer="Y" requireCode="Y" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromo productPromoId="DEMO_PROMO005" promoName="Demo Promotion 5" promoText="With special code [9021] get products in the Featured Products category for their special promotion price." userEntered="Y" showToCustomer="Y" requireCode="Y" createdDate="2001-05-13 12:00:00.0"/>
- <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE001" productPromoId="DEMO_PROMO001" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
+ <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE001" productPromoId="DEMO_PROMO001" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE002" productPromoId="DEMO_PROMO002" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE003" productPromoId="DEMO_PROMO003" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE004" productPromoId="DEMO_PROMO003" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
@@ -1771,16 +1771,16 @@ under the License.
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE008" productPromoId="DEMO_PROMO004" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE009" productPromoId="DEMO_PROMO004" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE010" productPromoId="DEMO_PROMO005" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
-
- <OrderProductPromoCode orderId="DEMO_B2C_AU01" productPromoCodeId="DEMO_PROMOCODE001"/>
- <OrderProductPromoCode orderId="DEMO_B2C_CA01" productPromoCodeId="DEMO_PROMOCODE002"/>
- <OrderProductPromoCode orderId="DEMO_B2C_IE01" productPromoCodeId="DEMO_PROMOCODE003"/>
- <OrderProductPromoCode orderId="DEMO_B2C_SG01" productPromoCodeId="DEMO_PROMOCODE004"/>
- <OrderProductPromoCode orderId="DEMO_B2C_UK01" productPromoCodeId="DEMO_PROMOCODE005"/>
- <OrderProductPromoCode orderId="DEMO_B2C_US01" productPromoCodeId="DEMO_PROMOCODE006"/>
- <OrderProductPromoCode orderId="DEMO_B2C_DE01" productPromoCodeId="DEMO_PROMOCODE007"/>
- <OrderProductPromoCode orderId="DEMO_B2C_ES01" productPromoCodeId="DEMO_PROMOCODE008"/>
- <OrderProductPromoCode orderId="DEMO_B2C_FR01" productPromoCodeId="DEMO_PROMOCODE009"/>
- <OrderProductPromoCode orderId="DEMO_B2C_IT01" productPromoCodeId="DEMO_PROMOCODE010"/>
-
+
+ <OrderProductPromoCode orderId="DEMO_B2C_AU01" productPromoCodeId="DEMO_PROMOCODE001"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_CA01" productPromoCodeId="DEMO_PROMOCODE002"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_IE01" productPromoCodeId="DEMO_PROMOCODE003"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_SG01" productPromoCodeId="DEMO_PROMOCODE004"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_UK01" productPromoCodeId="DEMO_PROMOCODE005"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_US01" productPromoCodeId="DEMO_PROMOCODE006"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_DE01" productPromoCodeId="DEMO_PROMOCODE007"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_ES01" productPromoCodeId="DEMO_PROMOCODE008"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_FR01" productPromoCodeId="DEMO_PROMOCODE009"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_IT01" productPromoCodeId="DEMO_PROMOCODE010"/>
+
</entity-engine-xml>
View
128 applications/order/data/helpdata/HELP_ORDER_Report.xml
@@ -19,81 +19,81 @@
xmlns="http://docbook.org/ns/docbook">
<title>Order Reports Help.</title>
<para>
- The Order Reports provide general information about orders in the system.
+ The Order Reports provide general information about orders in the system.
</para>
<section>
- <title>
- Initial steps.
- </title>
- <section>
+ <title>
+ Initial steps.
+ </title>
+ <section>
<para>
If your reports look empty it may be required to initialize the warehouse entities in the BI component.
</para>
- <orderedlist>
- <listitem>
- <para>Go to :<link xl:href="https://localhost:8443/bi/control/main">Business Intelligence</link></para>
- </listitem>
- <listitem>
- <para>Click "Quick Init DataWarehouse". System will automatic initial Data in the warehouse for Reports</para>
- </listitem>
- <listitem>
- <para>Go back to : <link xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions">Order Reports.</link></para>
- </listitem>
- </orderedlist>
- </section>
+ <orderedlist>
+ <listitem>
+ <para>Go to :<link xl:href="https://localhost:8443/bi/control/main">Business Intelligence</link></para>
+ </listitem>
+ <listitem>
+ <para>Click "Quick Init DataWarehouse". System will automatic initial Data in the warehouse for Reports</para>
+ </listitem>
+ <listitem>
+ <para>Go back to : <link xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions">Order Reports.</link></para>
+ </listitem>
+ </orderedlist>
+ </section>
</section>
<section>
<title>Reports List</title>
<section>
- <title>1. Sales Order By Referrer Report</title>
- <para>
- There are referrers, link, totals orders, quantity totals and amount totals. They are grouped by referrer.
- </para>
+ <title>1. Sales Order By Referrer Report</title>
+ <para>
+ There are referrers, link, totals orders, quantity totals and amount totals. They are grouped by referrer.
+ </para>
</section>
<section>
- <title>2. Sales Order By Channel Report</title>
- <para>
- There are total Orders, total Items, quantity totals and amount totals. They are grouped by Sales Channel.
- </para>
+ <title>2. Sales Order By Channel Report</title>
+ <para>
+ There are total Orders, total Items, quantity totals and amount totals. They are grouped by Sales Channel.
+ </para>
+ </section>
+ <section>
+ <title>3. Sale Orders Discount Code Report</title>
+ <para>
+ There are order, product, promotion and discount. This report is list of All orders.
+ </para>
+ </section>
+ <section>
+ <title>4. Last Three Months Sales Report</title>
+ <para>
+ There are products, prices, stock, sale out quantity and sale out total amount.
+ This report is list of all products, it contains the sales and movements in last 3 months.
+ </para>
+ </section>
+ <section>
+ <title>5. Coupon Sales Report</title>
+ <para>
+ This report lists promotions, total orders, percent of total orders, total orders amount, percent of total orders amount and shipping amounts.
+ </para>
+ </section>
+ <section>
+ <title>6. Sales Report</title>
+ <para>
+ This Sales report contains paid and unpaid sales orders.
+ </para>
+ </section>
+ <section>
+ <title>7. Net Before Overhead Report</title>
+ <para>
+ Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost.
+ They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id "B2CStore")
+ </para>
+ </section>
+ <section>
+ <title>8. Product Demand Report</title>
+ <para>
+ Product Demand Report is the report to show us which product sells good and which product doesn’t sell good or not selling at all in one account as well as for all accounts in last 4 weeks.
+ They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id "B2CStore")
+ </para>
</section>
- <section>
- <title>3. Sale Orders Discount Code Report</title>
- <para>
- There are order, product, promotion and discount. This report is list of All orders.
- </para>
- </section>
- <section>
- <title>4. Last Three Months Sales Report</title>
- <para>
- There are products, prices, stock, sale out quantity and sale out total amount.
- This report is list of all products, it contains the sales and movements in last 3 months.
- </para>
- </section>
- <section>
- <title>5. Coupon Sales Report</title>
- <para>
- This report lists promotions, total orders, percent of total orders, total orders amount, percent of total orders amount and shipping amounts.
- </para>
- </section>
- <section>
- <title>6. Sales Report</title>
- <para>
- This Sales report contains paid and unpaid sales orders.
- </para>
- </section>
- <section>
- <title>7. Net Before Overhead Report</title>
- <para>
- Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost.
- They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id "B2CStore")
- </para>
- </section>
- <section>
- <title>8. Product Demand Report</title>
- <para>
- Product Demand Report is the report to show us which product sells good and which product doesn’t sell good or not selling at all in one account as well as for all accounts in last 4 weeks.
- They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id "B2CStore")
- </para>
- </section>
</section>
</section>
View
6 applications/order/entitydef/entitymodel_olap.xml
@@ -39,7 +39,7 @@ under the License.
<field name="origCurrencyDimId" type="id-ne"></field>
<field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO: implement the dimension -->
- <field name="productStoreId" type="id-ne"></field>
+ <field name="productStoreId" type="id-ne"></field>
<field name="salesChannelEnumId" type="id-ne"></field>
<field name="saleChannel" type="description"></field>
<field name="orderStatus" type="description"></field>
@@ -215,8 +215,8 @@ under the License.
<exclude field="salesChannelEnumId"/>
<exclude field="saleChannel"/>
<exclude field="orderStatus"/>
- <exclude field="visitId"/>
- <exclude field="initialReferrer"/>
+ <exclude field="visitId"/>
+ <exclude field="initialReferrer"/>
<exclude field="productPromoCode"/>
<exclude field="categoryName"/>
</alias-all>
View
4 applications/order/script/org/ofbiz/order/olap/FactServices.xml
@@ -266,8 +266,8 @@ under the License.
<field-map field-name="visitId" from-field="orderHeader.visitId"/>
</entity-one>
<if-not-empty field="visit">
- <set field="fact.visitId" from-field="visit.visitId"/>
- <set field="fact.initialReferrer" from-field="visit.initialReferrer"/>
+ <set field="fact.visitId" from-field="visit.visitId"/>
+ <set field="fact.initialReferrer" from-field="visit.initialReferrer"/>
</if-not-empty>
</if-not-empty>
View
4 applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml
@@ -26,7 +26,7 @@
<set field="DateYear" value="2009"/>
<set field="DateMonth" value="12"/>
<entity-condition entity-name="SalesOrderItemStarSchema" list="countdates" distinct="true">
- <condition-list combine="and">
+ <condition-list combine="and">
<condition-expr field-name="orderDateYearName" operator="equals" from-field="DateYear"/>
<condition-expr field-name="orderDateMonthOfYear" operator="equals" from-field="DateMonth"/>
<condition-expr field-name="productStoreId" operator="equals" from-field="productStoreId"/>
@@ -45,7 +45,7 @@
<select-field field-name="NBO"/>
</entity-condition>
<entity-condition entity-name="SalesOrderItemStarSchema" list="saleschannels" distinct="true">
- <condition-list combine="and">
+ <condition-list combine="and">
<condition-expr field-name="orderDateYearName" operator="equals" from-field="DateYear"/>
<condition-expr field-name="orderDateMonthOfYear" operator="equals" from-field="DateMonth"/>
<condition-expr field-name="productStoreId" operator="equals" from-field="productStoreId"/>
View
18 applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
@@ -30,26 +30,26 @@ DateYear = DateStr.substring(0,4);
if (DateMonth == "01"||DateMonth == "03"||DateMonth == "05"||DateMonth == "07"||DateMonth == "08"||DateMonth == "10"||DateMonth == "12")
{
- NunberDate = 31;
+ NunberDate = 31;
}
else if (DateMonth == "02")
{
- NunberDate = 29;
+ NunberDate = 29;
}
else
{
- NunberDate = 30;
+ NunberDate = 30;
}
birtParameters = [:];
try {
- birtParameters.productStoreId = productStoreId;
- birtParameters.DateDay = DateDay;
- birtParameters.DateMonth = DateMonth;
- birtParameters.DateYear = DateYear;
- birtParameters.NunberDate = NunberDate;
+ birtParameters.productStoreId = productStoreId;
+ birtParameters.DateDay = DateDay;
+ birtParameters.DateMonth = DateMonth;
+ birtParameters.DateYear = DateYear;
+ birtParameters.NunberDate = NunberDate;
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "");
}
request.setAttribute("birtParameters", birtParameters);
View
4 applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
@@ -21,9 +21,9 @@ import org.ofbiz.base.util.*;
birtParameters = [:];
if(request.getParameter("saleChannel")){
- birtParameters.saleChannel = request.getParameter("saleChannel");
+ birtParameters.saleChannel = request.getParameter("saleChannel");
}else{
- birtParameters.saleChannel = "null";
+ birtParameters.saleChannel = "null";
}
request.setAttribute("birtParameters", birtParameters);
View
8 applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
@@ -28,11 +28,11 @@ int Year = cal.get(Calendar.YEAR);
birtParameters = [:];
try
{
- birtParameters.productStoreId = productStoreId;
- birtParameters.Week = Week;
- birtParameters.Year = Year;
+ birtParameters.productStoreId = productStoreId;
+ birtParameters.Week = Week;
+ birtParameters.Year = Year;
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "");
}
request.setAttribute("birtParameters", birtParameters);
View
6 applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
@@ -24,10 +24,10 @@ thruDateStr = parameters.thruDate;
birtParameters = [:];
try {
- birtParameters.fromDate = Date.valueOf(fromDateStr);
- birtParameters.thruDate = Date.valueOf(thruDateStr);
+ birtParameters.fromDate = Date.valueOf(fromDateStr);
+ birtParameters.thruDate = Date.valueOf(thruDateStr);
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "");
}
request.setAttribute("birtParameters", birtParameters);
View
2  applications/order/webapp/ordermgr/WEB-INF/controller.xml
@@ -1103,7 +1103,7 @@ under the License.
<response name="success" type="view" value="OrderByReferrerReport"/>
</request-map>
<request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/>
<response name="success" type="view" value="OrdersByChannelReport"/>
</request-map>
<request-map uri="OrderDiscountCode.pdf">
View
64 applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
@@ -167,38 +167,38 @@ totalShippingCharge = 0;
totalShippingBalance = 0;
productPromoCodes = delegator.findList("ProductPromoCode", EntityCondition.makeCondition("productPromoId", EntityOperator.EQUALS, productPromoId), null, null, null, false);
if(productPromoCodes.size()>0){
- productPromoCodeId = productPromoCodes.get(0).getString("productPromoCodeId");
- orderProductPromoCodes = delegator.findList("OrderProductPromoCode", EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId), null, null, null, false);
- totalOrders = orderProductPromoCodes.size();
- for(i = 0; i < totalOrders; i++){
- orderId = orderProductPromoCodes.get(i).getString("orderId");
- input.put("userLogin",userLogin);
- input.put("orderId",orderId);
- //Order Total
- orderInfo = dispatcher.runSync("getOrderHeaderInformation", input);
- amount = orderInfo.get("grandTotal");
- totalOrdersAmount = totalOrdersAmount + amount;
- //Shipping Total
- cond = FastList.newInstance();
- cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId));
- cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES"));
- orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
- orderAdjustmentSize = orderAdjustments.size();
- for(j = 0; j < orderAdjustmentSize; j++){
- shippingCharge = 0;
- shippingCharge = orderAdjustments.get(j).get("amount");
- if(shippingCharge){
- shippingCharge = shippingCharge.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
- }
- totalShippingCharge = totalShippingCharge + shippingCharge;
- }
- shippingAmount = dispatcher.runSync("getOrderShippingAmount", input);
- amount = shippingAmount.get("shippingAmount");
- if(amount){
- amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
- }
- totalShippingAmount = totalShippingAmount + amount;
- }
+ productPromoCodeId = productPromoCodes.get(0).getString("productPromoCodeId");
+ orderProductPromoCodes = delegator.findList("OrderProductPromoCode", EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId), null, null, null, false);
+ totalOrders = orderProductPromoCodes.size();
+ for(i = 0; i < totalOrders; i++){
+ orderId = orderProductPromoCodes.get(i).getString("orderId");
+ input.put("userLogin",userLogin);
+ input.put("orderId",orderId);
+ //Order Total
+ orderInfo = dispatcher.runSync("getOrderHeaderInformation", input);
+ amount = orderInfo.get("grandTotal");
+ totalOrdersAmount = totalOrdersAmount + amount;
+ //Shipping Total
+ cond = FastList.newInstance();
+ cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId));
+ cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES"));
+ orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
+ orderAdjustmentSize = orderAdjustments.size();
+ for(j = 0; j < orderAdjustmentSize; j++){
+ shippingCharge = 0;
+ shippingCharge = orderAdjustments.get(j).get("amount");
+ if(shippingCharge){
+ shippingCharge = shippingCharge.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ totalShippingCharge = totalShippingCharge + shippingCharge;
+ }
+ shippingAmount = dispatcher.runSync("getOrderShippingAmount", input);
+ amount = shippingAmount.get("shippingAmount");
+ if(amount){
+ amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ totalShippingAmount = totalShippingAmount + amount;
+ }
}
row["productPromoId"] = productPromoId;
row["promoName"] = promoName;
View
98 applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
@@ -224,51 +224,51 @@ try {
month = thisMonth;
while(i<3){
i = i + 1;
- switch(month)
- {
- case 1:
- months.add(1);
- break;
- case 2:
- months.add(2);
- break;
- case 3:
- months.add(3);
- break;
- case 4:
- months.add(4);
- break;
- case 5:
- months.add(5);
- break;
- case 6:
- months.add(6);
- break;
- case 7:
- months.add(7);
- break;
- case 8:
- months.add(8);
- break;
- case 9:
- months.add(9);
- break;
- case 10:
- months.add(10);
- break;
- case 11:
- months.add(11);
- break;
- case 12:
- months.add(12);
- break;
- }
- month = month - 1
- }
- Debug.log("================ Last 3 Months Sale Order Report====="+months);
- cond = FastList.newInstance();
- cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
- cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear));
+ switch(month)
+ {
+ case 1:
+ months.add(1);
+ break;
+ case 2:
+ months.add(2);
+ break;
+ case 3:
+ months.add(3);
+ break;
+ case 4:
+ months.add(4);
+ break;
+ case 5:
+ months.add(5);
+ break;
+ case 6:
+ months.add(6);
+ break;
+ case 7:
+ months.add(7);
+ break;
+ case 8:
+ months.add(8);
+ break;
+ case 9:
+ months.add(9);
+ break;
+ case 10:
+ months.add(10);
+ break;
+ case 11:
+ months.add(11);
+ break;
+ case 12:
+ months.add(12);
+ break;
+ }
+ month = month - 1
+ }
+ Debug.log("================ Last 3 Months Sale Order Report====="+months);
+ cond = FastList.newInstance();
+ cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
+ cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear));
salesOrderItemStarSchemas = delegator.findList("SalesOrderItemStarSchema", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
} catch(e) {
Debug.logError(e,"");
@@ -298,13 +298,13 @@ price = 0;
internalName = "None";
input = FastMap.newInstance();
try {
- product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")));
- input.put("product", product);
- input.put("userLogin", userLogin);
+ product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")));
+ input.put("product", product);
+ input.put("userLogin", userLogin);
result = dispatcher.runSync("calculateProductPrice", input);
price = result.get("price");
if(product.get("internalName")){
- internalName = product.get("internalName");
+ internalName = product.get("internalName");
}
} catch (e) {
Debug.logError(e, module);
View
1,188 applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
@@ -543,7 +543,7 @@ classLoader = appContext.get(EngineConstants.APPCONTEXT_CLASSLOADER_KEY);
starschemas = null;
try
{
- productStoreId = params["productStoreId"].value;
+ productStoreId = params["productStoreId"].value;
DateMonth = params["DateMonth"].value;
DateYear = params["DateYear"].value;
methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE);
@@ -580,261 +580,261 @@ if (starschemas)
}]]></method>
<method name="fetch"><![CDATA[if (currentRow >= totalRows) return false;
{
- starschema = starschemas.get(currentRow);
- orderDateDateValue = starschema.getString("orderDateDateValue");
- orderDateDayName = starschema.getString("orderDateDayName");
- orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth");
- orderDateMonthName = starschema.getString("orderDateMonthName");
- orderDateYearName = starschema.getString("orderDateYearName");
- orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay");
- orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear");
- orderDateDescription = starschema.getString("orderDateDescription");
-
- quantity = starschema.getString("quantity");
- GS = starschema.getString("GrossSales");
- GMS = starschema.getString("GrossMerchandizeSales");
- GMP = starschema.getString("GrossMerchandizeProfit");
- GSP = starschema.getString("GrossShippingProfit");
- GP = starschema.getString("GrossProfit");
- eBay = starschema.getString("eBay");
- RRC = starschema.getString("RRC");
- Others = starschema.getString("OtherFree");
- NBO = starschema.getString("NBO");
-
- salesChannelEnumId = starschema.getString("salesChannelEnumId");
+ starschema = starschemas.get(currentRow);
+ orderDateDateValue = starschema.getString("orderDateDateValue");
+ orderDateDayName = starschema.getString("orderDateDayName");
+ orderDateDayOfMonth = starschema.getString("orderDateDayOfMonth");
+ orderDateMonthName = starschema.getString("orderDateMonthName");
+ orderDateYearName = starschema.getString("orderDateYearName");
+ orderDateYearMonthDay = starschema.getString("orderDateYearMonthDay");
+ orderDateMonthOfYear = starschema.getString("orderDateMonthOfYear");
+ orderDateDescription = starschema.getString("orderDateDescription");
+
+ quantity = starschema.getString("quantity");
+ GS = starschema.getString("GrossSales");
+ GMS = starschema.getString("GrossMerchandizeSales");
+ GMP = starschema.getString("GrossMerchandizeProfit");
+ GSP = starschema.getString("GrossShippingProfit");
+ GP = starschema.getString("GrossProfit");
+ eBay = starschema.getString("eBay");
+ RRC = starschema.getString("RRC");
+ Others = starschema.getString("OtherFree");
+ NBO = starschema.getString("NBO");
+
+ salesChannelEnumId = starschema.getString("salesChannelEnumId");
- if (orderDateMonthOfYear == DateMonth)
- {
- row["Daily"] = 1;
- }
- else
- {
- row["Daily"] = 2;
- }
-
- if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_AU;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_CA;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_IE;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_SG;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_UK;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_US;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_DE;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_ES;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_FR;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
- if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_IT;
- row["Date"] = orderDateYearMonthDay;
- row["Month"] = orderDateMonthOfYear;
- row["MonthName"] = orderDateMonthName;
- row["Today"] = DateDay;
- }
-
- currentRow ++;
+ if (orderDateMonthOfYear == DateMonth)
+ {
+ row["Daily"] = 1;
+ }
+ else
+ {
+ row["Daily"] = 2;
+ }
+
+ if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_AU;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_CA;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_IE;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_SG;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_UK;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_US;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_DE;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_ES;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_FR;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+ if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_IT;
+ row["Date"] = orderDateYearMonthDay;
+ row["Month"] = orderDateMonthOfYear;
+ row["MonthName"] = orderDateMonthName;
+ row["Today"] = DateDay;
+ }
+
+ currentRow ++;
}
return true;]]></method>
@@ -1167,7 +1167,7 @@ classLoader = appContext.get(EngineConstants.APPCONTEXT_CLASSLOADER_KEY);
starschemas = null;
try
{
- productStoreId = params["productStoreId"].value;
+ productStoreId = params["productStoreId"].value;
DateDay = params["DateDay"].value;
methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE);
methodContext.putEnv("productStoreId", productStoreId);
@@ -1201,242 +1201,242 @@ if (Date_starschemas)
}]]></method>
<method name="fetch"><![CDATA[if (currentRow >= totalRows) return false;
{
- Date_starschema = Date_starschemas.get(currentRow);
- orderDateDateValue = Date_starschema.getString("orderDateDateValue");
- orderDateDayName = Date_starschema.getString("orderDateDayName");
- orderDateDayOfMonth = Date_starschema.getString("orderDateDayOfMonth");
- orderDateMonthName = Date_starschema.getString("orderDateMonthName");
- orderDateYearName = Date_starschema.getString("orderDateYearName");
- orderDateYearMonthDay = Date_starschema.getString("orderDateYearMonthDay");
- orderDateMonthOfYear = Date_starschema.getString("orderDateMonthOfYear");
- orderDateDescription = Date_starschema.getString("orderDateDescription");
-
- quantity = Date_starschema.getString("quantity");
- GS = Date_starschema.getString("GrossSales");
- GMS = Date_starschema.getString("GrossMerchandizeSales");
- GMP = Date_starschema.getString("GrossMerchandizeProfit");
- GSP = Date_starschema.getString("GrossShippingProfit");
- GP = Date_starschema.getString("GrossProfit");
- eBay = Date_starschema.getString("eBay");
- RRC = Date_starschema.getString("RRC");
- Others = Date_starschema.getString("OtherFree");
- NBO = Date_starschema.getString("NBO");
-
- salesChannelEnumId = Date_starschema.getString("salesChannelEnumId");
-
- if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_AU;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_CA;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_IE;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_SG;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_UK;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_US;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_DE;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_ES;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_FR;
- row["Date"] = orderDateYearMonthDay;
- }
- if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateDayOfMonth"] = orderDateDayOfMonth;
- row["orderDateMonthName"] = orderDateMonthName;
- row["orderDateYearName"] = orderDateYearName;
- row["orderDateDateValue"] = orderDateDateValue;
- row["Parcel"] = quantity;
- row["GS"] = GS;
- row["GMS"] = GMS;
- row["GMP"] = GMP;
- row["GSP"] = GSP;
- row["GP"] = GP;
- row["eBay"] = eBay;
- row["RRC"] = RRC;
- row["Others"] = Others;
- row["NBO"] = NBO;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_IT;
- row["Date"] = orderDateYearMonthDay;
- }
-
- currentRow ++;
+ Date_starschema = Date_starschemas.get(currentRow);
+ orderDateDateValue = Date_starschema.getString("orderDateDateValue");
+ orderDateDayName = Date_starschema.getString("orderDateDayName");
+ orderDateDayOfMonth = Date_starschema.getString("orderDateDayOfMonth");
+ orderDateMonthName = Date_starschema.getString("orderDateMonthName");
+ orderDateYearName = Date_starschema.getString("orderDateYearName");
+ orderDateYearMonthDay = Date_starschema.getString("orderDateYearMonthDay");
+ orderDateMonthOfYear = Date_starschema.getString("orderDateMonthOfYear");
+ orderDateDescription = Date_starschema.getString("orderDateDescription");
+
+ quantity = Date_starschema.getString("quantity");
+ GS = Date_starschema.getString("GrossSales");
+ GMS = Date_starschema.getString("GrossMerchandizeSales");
+ GMP = Date_starschema.getString("GrossMerchandizeProfit");
+ GSP = Date_starschema.getString("GrossShippingProfit");
+ GP = Date_starschema.getString("GrossProfit");
+ eBay = Date_starschema.getString("eBay");
+ RRC = Date_starschema.getString("RRC");
+ Others = Date_starschema.getString("OtherFree");
+ NBO = Date_starschema.getString("NBO");
+
+ salesChannelEnumId = Date_starschema.getString("salesChannelEnumId");
+
+ if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_AU;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_CA;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_IE;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_SG;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_UK;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_US;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_DE;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_ES;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_FR;
+ row["Date"] = orderDateYearMonthDay;
+ }
+ if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateDayOfMonth"] = orderDateDayOfMonth;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["orderDateYearName"] = orderDateYearName;
+ row["orderDateDateValue"] = orderDateDateValue;
+ row["Parcel"] = quantity;
+ row["GS"] = GS;
+ row["GMS"] = GMS;
+ row["GMP"] = GMP;
+ row["GSP"] = GSP;
+ row["GP"] = GP;
+ row["eBay"] = eBay;
+ row["RRC"] = RRC;
+ row["Others"] = Others;
+ row["NBO"] = NBO;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_IT;
+ row["Date"] = orderDateYearMonthDay;
+ }
+
+ currentRow ++;
}
return true;]]></method>
@@ -1559,7 +1559,7 @@ classLoader = appContext.get(EngineConstants.APPCONTEXT_CLASSLOADER_KEY);
starschemas = null;
try
{
- productStoreId = params["productStoreId"].value;
+ productStoreId = params["productStoreId"].value;
DateMonth = params["DateMonth"].value;
DateYear = params["DateYear"].value;
methodContext = new MethodContext(appContext, classLoader, MethodContext.SERVICE);
@@ -1595,106 +1595,106 @@ if (starschemas)
}]]></method>
<method name="fetch"><![CDATA[if (currentRow >= totalRows) return false;
{
- starschema = starschemas.get(currentRow);
+ starschema = starschemas.get(currentRow);
- salesChannelEnumId = starschema.getString("salesChannelEnumId");
- orderDateMonthName = starschema.getString("orderDateMonthName");
- orderDateYearName = starschema.getString("orderDateYearName");
- NBO = starschema.getString("NBO");
- CountDate = starschema.getString("CountDate");
-
- if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_AU;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_CA;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_IE;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_SG;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_UK;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod1;
- row["Account"] = account_B2C_US;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_DE;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_ES;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_FR;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
- if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
- {
- row["SalesChannel"] = salesChannelEnumId;
- row["orderDateMonthName"] = orderDateMonthName;
- row["Pod"] = pod2;
- row["Account"] = account_B2C_IT;
- row["NBO"] = NBO;
- row["CountDate"] = CountDate;
- }
-
- currentRow ++;
+ salesChannelEnumId = starschema.getString("salesChannelEnumId");
+ orderDateMonthName = starschema.getString("orderDateMonthName");
+ orderDateYearName = starschema.getString("orderDateYearName");
+ NBO = starschema.getString("NBO");
+ CountDate = starschema.getString("CountDate");
+
+ if (salesChannelEnumId == "B2C_AU_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_AU;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_CA_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_CA;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_IE_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_IE;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_SG_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_SG;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_UK_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_UK;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_US_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod1;
+ row["Account"] = account_B2C_US;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_DE_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_DE;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_ES_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_ES;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_FR_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_FR;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+ if (salesChannelEnumId == "B2C_IT_SALES_CHANNEL")
+ {
+ row["SalesChannel"] = salesChannelEnumId;
+ row["orderDateMonthName"] = orderDateMonthName;
+ row["Pod"] = pod2;
+ row["Account"] = account_B2C_IT;
+ row["NBO"] = NBO;
+ row["CountDate"] = CountDate;
+ }
+
+ currentRow ++;
}
return true;]]></method>
@@ -4299,11 +4299,11 @@ return true;]]></method>
<property name="name">Show_Daily</property>
<expression name="expression">if(dimension["Account"]["Daily"]==1)
{
- "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3)
+ "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3)
}
else if(dimension["Account"]["Daily"]==2)
{
- "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3)
+ "Daily Avg in "+dimension["Account"]["Daily"]["orderDateMonthName"].substring(0,3)
}</expression>
<property name="dataType">string</property>
</structure>
View
20 applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
@@ -118,7 +118,7 @@ try {
input = FastMap.newInstance();
inputFields = FastMap.newInstance();
if(params!=null){
- inputFields.put("noConditionFind", "Y");
+ inputFields.put("noConditionFind", "Y");
}
input.put("userLogin",userLogin);
@@ -134,16 +134,16 @@ try {
}]]></method>
<method name="fetch"><![CDATA[if(orders == null)return false;
if(order = orders.next()){
- row["orderId"] = order.getString("orderId");
- row["productId"] = order.getString("productProductId");
- row["productName"] = order.getString("productInternalName");
- row["discount"] = order.getString("extDiscountAmount");
- row["promoCode"] = order.getString("productPromoCode");
- Debug.logInfo("-----------order---------"+order.getString("orderId"),module);
- return true;
+ row["orderId"] = order.getString("orderId");
+ row["productId"] = order.getString("productProductId");
+ row["productName"] = order.getString("productInternalName");
+