svn commit: r1370126 [3/15] - in /ofbiz/branches/jackrabbit2012
Locked
svn commit: r1370126 [3/15] - in /ofbiz/branches/jackrabbit2012
 
|
Modified: ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue Aug 7 06:25:59 2012 @@ -1155,92 +1155,8 @@ under the License. <request-map uri="PurchasesByOrganizationReport.pdf"><security https="true" auth="true"/> <response name="success" type="view" value="PurchasesByOrganizationReport"/> </request-map> - - <request-map uri="checkReportBy"> - <security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/CheckReportBy.groovy"/> - <response name="dayPDF" type="request" value="SalesReport.pdf"/> - <response name="weekPDF" type="request" value="SalesReportWeek.pdf"/> - <response name="monthPDF" type="request" value="SalesReportMonth.pdf"/> - <response name="dayExcel" type="request" value="SalesReport.excel"/> - <response name="weekExcel" type="request" value="SalesReportWeek.excel"/> - <response name="monthExcel" type="request" value="SalesReportMonth.excel"/> - <response name="dayHTML" type="request" value="SalesReport.html"/> - <response name="weekHTML" type="request" value="SalesReportWeek.html"/> - <response name="monthHTML" type="request" value="SalesReportMonth.html"/> - <response name="error" type="request-redirect" value="OrderPurchaseReportOptions"> - <redirect-parameter name="fromDate"/> - <redirect-parameter name="reportBy" from="parameters.reportDate"/> - </response> - </request-map> - <request-map uri="SalesReport.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportPDF"/> - </request-map> - <request-map uri="SalesReportWeek.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportWeekPDF"/> - </request-map> - <request-map uri="SalesReportMonth.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportMonthPDF"/> - </request-map> - <request-map uri="SalesReport.excel"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportExcel"/> - </request-map> - <request-map uri="SalesReportWeek.excel"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportWeekExcel"/> - </request-map> - <request-map uri="SalesReportMonth.excel"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportMonthExcel"/> - </request-map> - <request-map uri="SalesReport.html"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportHTML"/> - </request-map> - <request-map uri="SalesReportWeek.html"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportWeekHTML"/> - </request-map> - <request-map uri="SalesReportMonth.html"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy"/> - <response name="success" type="view" value="SalesOrderReportMonthHTML"/> - </request-map> - <request-map uri="NetBeforeOverheadReport.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy"/> - <response name="success" type="view" value="NetBeforeOverheadOrderReport"/> - </request-map> - <request-map uri="ProductDemandReport.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy"/> - <response name="success" type="view" value="ProductDemandOrderReport"/> - </request-map> - <request-map uri="ProductContributionReport.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/ProductContributionReport.groovy"/> - <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://order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy"/> - <response name="success" type="view" value="OrdersByChannelReport"/> - </request-map> - <request-map uri="OrderDiscountCode.pdf"> - <security https="true" auth="true"/> - <response name="success" type="view" value="SaleOrderDiscountCodeReport"/> - </request-map> - <request-map uri="Last3MonthsSalesReport.pdf"><security https="true" auth="true"/> - <response name="success" type="view" value="Last3MonthsSalesReport"/> - </request-map> - <request-map uri="CouponSalesReport.pdf"><security https="true" auth="true"/> - <response name="success" type="view" value="CouponSalesReport"/> - </request-map> - - <!-- Requirement request mappings --> + <!-- Requirement request mappings --> <request-map uri="FindRequirements"> <security https="true" auth="true"/> <response name="success" type="view" value="FindRequirements"/> @@ -2023,23 +1939,6 @@ under the License. <view-map name="OpenOrderItemsReport" type="screen" page="component://order/widget/ordermgr/ReportScreens.xml#OpenOrderItemsReport"/> <view-map name="PurchasesByOrganizationReport" type="screenfop" page="component://order/widget/ordermgr/ReportScreens.xml#PurchasesByOrganizationReport" content-type="application/pdf" encoding="none"/> - <view-map name="SalesOrderReportPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/pdf"/> - <view-map name="SalesOrderReportWeekPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/pdf"/> - <view-map name="SalesOrderReportMonthPDF" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/pdf"/> - <view-map name="SalesOrderReportExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="application/vnd.ms-excel"/> - <view-map name="SalesOrderReportWeekExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="application/vnd.ms-excel"/> - <view-map name="SalesOrderReportMonthExcel" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="application/vnd.ms-excel"/> - <view-map name="SalesOrderReportHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReport.rptdesign" content-type="text/html"/> - <view-map name="SalesOrderReportWeekHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportWeek.rptdesign" content-type="text/html"/> - <view-map name="SalesOrderReportMonthHTML" type="birt" page="component://order/webapp/ordermgr/reports/SalesReportMonth.rptdesign" content-type="text/html"/> - <view-map name="NetBeforeOverheadOrderReport" type="birt" page="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign" content-type="application/pdf"/> - <view-map name="ProductDemandOrderReport" type="birt" page="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign" content-type="application/pdf"/> - <view-map name="OrderByReferrerReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderByReferrer.rptdesign" content-type="application/pdf"/> - <view-map name="OrdersByChannelReport" type="birt" page="component://order/webapp/ordermgr/reports/OrdersByChannel.rptdesign" content-type="application/pdf"/> - <view-map name="SaleOrderDiscountCodeReport" type="birt" page="component://order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign" content-type="application/pdf"/> - <view-map name="Last3MonthsSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign" content-type="application/pdf"/> - <view-map name="CouponSalesReport" type="birt" page="component://order/webapp/ordermgr/reports/CouponSalesReport.rptdesign" content-type="application/pdf"/> - <view-map name="FindRequirements" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#FindRequirements"/> <view-map name="EditRequirement" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirement"/> <view-map name="ListRequirementCustRequests" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementCustRequests"/> Modified: ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/WEB-INF/web.xml Tue Aug 7 06:25:59 2012 @@ -40,12 +40,6 @@ under the License. <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> </context-param> - <context-param> - <param-name>serviceReaderUrls</param-name> - <param-value>/WEB-INF/services.xml</param-value> - <description>Configuration File(s) For The Service Dispatcher</description> - </context-param> - <filter> <filter-name>ContextFilter</filter-name> <display-name>ContextFilter</display-name> Modified: ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/findOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/findOrders.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/findOrders.ftl Tue Aug 7 06:25:59 2012 @@ -532,12 +532,12 @@ document.lookuporder.orderId.focus(); </#list> </#if> </form> - <form name="massOrderChangeForm" method="post" action="javascript:void();"> + <form name="massOrderChangeForm" method="post" action="javascript:void(0);"> <div> </div> <div align="right"> <input type="hidden" name="screenLocation" value="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF"/> <select name="serviceName" onchange="javascript:setServiceName(this);"> - <option value="javascript:void();"> </option> + <option value="javascript:void(0);"> </option> <option value="<@ofbizUrl>massApproveOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</option> <option value="<@ofbizUrl>massHoldOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderHold}</option> <option value="<@ofbizUrl>massProcessOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderProcessOrder}</option> @@ -550,7 +550,7 @@ document.lookuporder.orderId.focus(); <option value="<@ofbizUrl>massCreateFileForOrders?hideFields=${requestParameters.hideFields?default('N')}${paramList}</@ofbizUrl>">${uiLabelMap.ContentCreateFile}</option> </select> <select name="printerName"> - <option value="javascript:void();"> </option> + <option value="javascript:void(0);"> </option> <#list printers as printer> <option value="${printer}">${printer}</option> </#list> Modified: ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue Aug 7 06:25:59 2012 @@ -54,7 +54,7 @@ under the License. <#assign statusItem = payment.getRelatedOne("StatusItem", false)> <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)> <tr> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)> <td><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td> <#else> <td>${payment.paymentId}</td> @@ -342,7 +342,7 @@ under the License. <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> <br /> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)> ${creditCard.cardType} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate} @@ -469,7 +469,7 @@ under the License. <td valign="top" width="60%"> <div> <#if giftCard?has_content> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)> ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}] [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] <#else> @@ -596,7 +596,7 @@ under the License. <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> <#assign creditCard = paymentMethodValueMap.creditCard/> <#if (creditCard?has_content)> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)> ${creditCard.cardType?if_exists} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate?if_exists} <#else> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} Modified: ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportForms.xml Tue Aug 7 06:25:59 2012 @@ -195,78 +195,4 @@ under the License. <field name="thruOrderDate" title="${uiLabelMap.CommonThruDate}"><date-time type="timestamp"/></field> <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - - <!--New From--> - <form name="SalesReport" type="single" target="checkReportBy" title="" - header-row-style="header-row" default-table-style="basic-table"> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field> - <field name="reportBy" title="Report By"> - <drop-down> - <option key="day" description="Days"></option> - <option key="week" description="Weeks"></option> - <option key="month" description="Months"></option> - </drop-down> - </field> - <field name="exportType" title="Format Type"> - <drop-down> - <option key="pdf" description="PDF"></option> - <option key="excel" description="Excel"></option> - <option key="html" description="HTML"></option> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="NetBeforeOverheadReport" type="single" target="NetBeforeOverheadReport.pdf" title="" - header-row-style="header-row" default-table-style="basic-table"> - <field name="productStoreId"> - <drop-down allow-empty="false"> - <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> - <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]"> - <entity-order-by field-name="storeName"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonRun}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="ProductDemandReport" type="single" target="ProductDemandReport.pdf" title="" - header-row-style="header-row" default-table-style="basic-table"> - <field name="productStoreId"> - <drop-down allow-empty="false"> - <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> - <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]"> - <entity-order-by field-name="storeName"/> - </entity-options> - </drop-down> - </field> - <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="All Referrer"></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="saleChannel"> - <drop-down allow-empty="false"> - <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/> - <entity-options description="${description}" entity-name="Enumeration" key-field-name="description"> - <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/> - </entity-options> - </drop-down> - </field> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field> - </form> - <form name="SaleOrderDiscountCode" type="single" target="OrderDiscountCode.pdf" target-window="_BLANK"> - <field name="discountCodeUrl" title=" "><display description="All order items with discount code"></display></field> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field> - </form> - <form name="Last3MonthsSalesReport" type="single" target="Last3MonthsSalesReport.pdf" target-window="_BLANK"> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field> - </form> - <form name="CouponSalesReport" type="single" target="CouponSalesReport.pdf" target-window="_BLANK"> - <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field> - </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportScreens.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/widget/ordermgr/ReportScreens.xml Tue Aug 7 06:25:59 2012 @@ -107,46 +107,6 @@ under the License. </widgets> </section> </screen> - - <!--New Screen--> - <screen name="SalesReport"> - <section> - <actions> - <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <screenlet title="Sales Report"> - <include-form name="SalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - - <screen name="NetBeforeOverheadReport"> - <section> - <actions> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <screenlet title="Net Before Overhead Report"> - <include-form name="NetBeforeOverheadReport" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - - <screen name="ProductDemandReport"> - <section> - <actions> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <screenlet title="Product Demand Report"> - <include-form name="ProductDemandReport" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> <screen name="OrderPurchaseReportPayment"> <section> @@ -331,93 +291,4 @@ under the License. </widgets> </section> </screen> - - <screen name="SalesOrderReport"> - <section> - <actions> - <entity-condition entity-name="SalesOrderItemStarSchema" list="SalesReportList"> - <condition-list combine="and"> - <condition-expr field-name="orderDate" operator="greater-equals" from-field="parameters.fromOrderDate" ignore-if-null="true"/> - <condition-expr field-name="orderDate" operator="less" from-field="parameters.thruOrderDate" ignore-if-null="true"/> - </condition-list> - </entity-condition> - </actions> - <widgets> - <platform-specific> - <xml><html-template location="component://order/webapp/ordermgr/reports/SalesReport.rptdesign"/></xml> - </platform-specific> - </widgets> - </section> - </screen> - - <screen name="NetBeforeOverheadOrderReport"> - <section> - <widgets> - <platform-specific> - <xml><html-template location="component://order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign"/></xml> - </platform-specific> - </widgets> - </section> - </screen> - - <screen name="ProductDemandOrderReport "> - <section> - <widgets> - <platform-specific> - <xml><html-template location="component://order/webapp/ordermgr/reports/ProductDemandReport.rptdesign"/></xml> - </platform-specific> - </widgets> - </section> - </screen> - - <!-- Sale Order By Referrer --> - <screen name="SaleOrdersByReferrerReport"> - <section> - <widgets> - <screenlet title="Sale Orders by Referrer Report"> - <include-form name="OrderByReferrer" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - <!-- Sale Order By Channel --> - <screen name="SaleOrdersByChannelReport"> - <section> - <widgets> - <screenlet title="Sale Orders By Channel Report"> - <include-form name="SaleOrdersByChannel" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - <!-- Sale Order with Discount Code --> - <screen name="SaleOrderDiscountCodeReport"> - <section> - <widgets> - <screenlet title="Sale Orders Discount Code Report"> - <include-form name="SaleOrderDiscountCode" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - <!-- Last Three Months Sales Report --> - <screen name="Last3MonthsSalesReport"> - <section> - <widgets> - <screenlet title="Last Three Months Sales Report"> - <include-form name="Last3MonthsSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - <!-- Coupon Sales Report --> - <screen name="CouponSalesReport"> - <section> - <widgets> - <screenlet title="Coupon Sales Report"> - <include-form name="CouponSalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy (original) +++ ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy Tue Aug 7 06:25:59 2012 @@ -23,7 +23,7 @@ context.hasCreatePermission = security.h context.hasUpdatePermission = security.hasEntityPermission("PARTYMGR", "_UPDATE", session); context.hasDeletePermission = security.hasEntityPermission("PARTYMGR", "_DELETE", session); // extended pay_info permissions -context.hasPayInfoPermission = security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session); +context.hasPayInfoPermission = security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session); // extended pcm (party contact mechanism) permissions context.hasPcmCreatePermission = security.hasEntityPermission("PARTYMGR_PCM", "_CREATE", session); context.hasPcmUpdatePermission = security.hasEntityPermission("PARTYMGR_PCM", "_UPDATE", session); Modified: ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/web.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/web.xml Tue Aug 7 06:25:59 2012 @@ -40,11 +40,6 @@ under the License. <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description> </context-param> <context-param> - <param-name>serviceReaderUrls</param-name> - <param-value>/WEB-INF/services.xml</param-value> - <description>Configuration File(s) For The Service Dispatcher</description> - </context-param> - <context-param> <param-name>scriptLocationPath</param-name> <param-value>/WEB-INF/bsh</param-value> <description>BeanShell Script Location</description> Modified: ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/editShoppingList.ftl Tue Aug 7 06:25:59 2012 @@ -196,7 +196,7 @@ under the License. <td> </td> </tr> <#assign alt_row = false> - <#list shoppingListItemDatas[lowIndex-1..highIndex-1] as shoppingListItemData> + <#list shoppingListItemDatas[lowIndex..highIndex-1] as shoppingListItemData> <#assign shoppingListItem = shoppingListItemData.shoppingListItem> <#assign product = shoppingListItemData.product> <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)> Modified: ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Tue Aug 7 06:25:59 2012 @@ -38,7 +38,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.PartyPaymentMethodInformation}</li> - <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session) || security.hasEntityPermission("ACCOUNTING", "_CREATE", session)> <li><a href="<@ofbizUrl>editeftaccount?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li> <li><a href="<@ofbizUrl>editgiftcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li> <li><a href="<@ofbizUrl>editcreditcard?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li> @@ -67,7 +67,7 @@ under the License. ${creditCard.lastNameOnCard} <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> - - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)> ${creditCard.cardType} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate} @@ -83,7 +83,7 @@ under the License. <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a> </#if> - <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)> <a href="<@ofbizUrl>editcreditcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#-- </td> --> @@ -93,7 +93,7 @@ under the License. ${uiLabelMap.AccountingGiftCard} </td> <td> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)> ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}] <#else> <@maskSensitiveNumber cardNumber=giftCard.cardNumber?if_exists/> @@ -105,7 +105,7 @@ under the License. <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</b></#if> </td> <td class="button-col"> - <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)> <a href="<@ofbizUrl>editgiftcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#-- </td> --> @@ -121,7 +121,7 @@ under the License. <#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate.toString()}</#if> </td> <td class="button-col"> - <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)> <a href="<@ofbizUrl>editeftaccount?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#-- </td> --> @@ -143,7 +143,7 @@ under the License. <td class="button-col"> </#if> - <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session) || security.hasEntityPermission("ACCOUNTING", "_DELETE", session)> <a href="<@ofbizUrl>deletePaymentMethod/viewprofile?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonExpire}</a> <#else> Modified: ofbiz/branches/jackrabbit20120501/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/widget/partymgr/PartyForms.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/party/widget/partymgr/PartyForms.xml Tue Aug 7 06:25:59 2012 @@ -1015,11 +1015,16 @@ under the License. <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> <form name="AddPartyMainRole" type="single" title="${uiLabelMap.PartyAddToMainRole}" target="addrole/viewroles"> + <actions> + <entity-condition entity-name="RoleType" list="parentRoleList"> + <condition-expr field-name="parentTypeId" operator="equals" from-field="nullField"/> + <order-by field-name="description"/> + </entity-condition> + </actions> <field name="partyId"><hidden value="${parameters.partyId}"/></field> <field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', jQuery('#AddPartyMainRole').serialize());" entry-name="dummy"> <drop-down allow-empty="false"> <entity-options entity-name="RoleType" description="${description}"> - <entity-constraint name="parentTypeId" value=""/> <entity-order-by field-name="description"/> </entity-options> </drop-down> @@ -1039,6 +1044,7 @@ under the License. <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field> </form> <form name="AddRoleType" type="single" title="Add a new roletype" target="createroletype" list-name="parentRoleList"> + <field name="partyId"><hidden value="${parameters.partyId}"/></field> <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" required-field="true" entry-name="dummy" position="1"><text/></field> <field name="parentTypeId" position="2"> <drop-down allow-empty="true"> Modified: ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml Tue Aug 7 06:25:59 2012 @@ -2333,7 +2333,7 @@ <value xml:lang="zh_TW">使ç¨è¨æ¸è¡¨</value> </property> <property key="ProductMeterType.description.TRIP_METER"> - <value xml:lang="en">Tageskilometerzähler</value> + <value xml:lang="de">Tageskilometerzähler</value> <value xml:lang="en">Use Trip Meter</value> <value xml:lang="fr">Utiliser le compteur de distance par trajet</value> <value xml:lang="vi">Sá» dụng Äá»ng há» Äo quãng ÄÆ°á»ng chuyến Äi</value> Modified: ofbiz/branches/jackrabbit20120501/applications/product/config/ProductErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/config/ProductErrorUiLabels.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/config/ProductErrorUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/config/ProductErrorUiLabels.xml Tue Aug 7 06:25:59 2012 @@ -188,6 +188,12 @@ <value xml:lang="zh">已请æ±éè´§ã</value> <value xml:lang="zh_TW">å·²è«æ±é貨ã</value> </property> + <property key="ProductReviewErrorCouldNotChangeOrderStatusFromTo"> + <value xml:lang="de">Status ist keine gültige Ãnderung: von ${productReview.statusId} nach ${parameters.statusId}</value> + <value xml:lang="en">Status is not a valid change: from ${productReview.statusId} to ${parameters.statusId}</value> + <value xml:lang="fr">Le changement de statut de ${productReview.statusId} à ${parameters.statusId} n'est pas autorisé</value> + <value xml:lang="it">Cambio di stato non è valido: da ${productReview.statusId} a ${parameters.statusId}</value> + </property> <property key="productSearchEvents.added_param_features"> <value xml:lang="de">${numAdded} Merkmale hinzugefügt mit ID ${productFeatureId}</value> <value xml:lang="en">Added ${numAdded} features with ID ${productFeatureId}</value> Modified: ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml Tue Aug 7 06:25:59 2012 @@ -3527,7 +3527,7 @@ <value xml:lang="de">Wert ID</value> <value xml:lang="en">Id Value</value> <value xml:lang="es">Valor de identificación</value> - <value xml:lang="fr">Réf. de valeur</value> + <value xml:lang="fr">Valeur</value> <value xml:lang="it">Valore</value> <value xml:lang="th">à¸à¹à¸²à¸£à¸«à¸±à¸ª</value> <value xml:lang="vi">Giá trá» (value)</value> @@ -22652,6 +22652,17 @@ <value xml:lang="zh">éæ°ç´¢å¼å ³é®å</value> <value xml:lang="zh_TW">éæ°ç´¢å¼ééµå</value> </property> + <property key="ProductReviewBy"> + <value xml:lang="de">Bewertung durch</value> + <value xml:lang="en">Review By</value> + <value xml:lang="es">Revisión por</value> + <value xml:lang="fr">A approuver par</value> + <value xml:lang="it">Recensito da</value> + <value xml:lang="th">à¸à¸²à¸£à¸à¸£à¸§à¸à¸ªà¸à¸à¹à¸à¸¢</value> + <value xml:lang="vi">Xem xét bá»i</value> + <value xml:lang="zh">æ£æ¥å</value> + <value xml:lang="zh_TW">檢æ¥å¡</value> + </property> <property key="ProductReWeighPackage"> <value xml:lang="de">Paket neu wägeny</value> <value xml:lang="en">Re-Weigh Package</value> Modified: ofbiz/branches/jackrabbit20120501/applications/product/data/ProductTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/data/ProductTypeData.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/data/ProductTypeData.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/data/ProductTypeData.xml Tue Aug 7 06:25:59 2012 @@ -650,4 +650,10 @@ under the License. <Enumeration description="Remove Logo" enumCode="REMOVE_LOGO" enumId="REMOVE_LOGO" sequenceId="02" enumTypeId="IMAGE_REJECT_REASON"/> <Enumeration description="Other" enumCode="OTHER" enumId="OTHER" sequenceId="03" enumTypeId="IMAGE_REJECT_REASON"/> + <!-- Group Order --> + <StatusType description="Group Order Status" hasTable="N" parentTypeId="" statusTypeId="GROUP_ORDER_STATUS"/> + <StatusItem description="Created" sequenceId="01" statusCode="CREATED" statusId="GO_CREATED" statusTypeId="GROUP_ORDER_STATUS"/> + <StatusItem description="Success" sequenceId="02" statusCode="SUCCESS" statusId="GO_SUCCESS" statusTypeId="GROUP_ORDER_STATUS"/> + <StatusItem description="Cancelled" sequenceId="03" statusCode="CANCELLED" statusId="GO_CANCELLED" statusTypeId="GROUP_ORDER_STATUS"/> + </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20120501/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/entitydef/entitymodel.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/entitydef/entitymodel.xml Tue Aug 7 06:25:59 2012 @@ -2717,7 +2717,7 @@ under the License. <field name="inventoryMessage" type="description"></field> <field name="requireInventory" type="indicator"></field> <field name="quantityUomId" type="id"></field> - <field name="quantityIncluded" type="fixed-point"></field> + <field name="quantityIncluded" type="fixed-point"><description>If you have a six-pack of 12oz soda cans you would have quantityIncluded=12, quantityUomId=oz, piecesIncluded=6.</description></field> <field name="piecesIncluded" type="numeric"></field> <field name="requireAmount" type="indicator"></field> <field name="fixedAmount" type="currency-amount"><description>Use this for products which are sold in fixed denominations, such as gift certificates or calling cards.</description></field> @@ -4812,6 +4812,7 @@ under the License. <field name="productId" type="id-ne"></field> <field name="fromDate" type="date-time"></field> <field name="thruDate" type="date-time"></field> + <field name="statusId" type="id-ne"></field> <field name="reqOrderQty" type="fixed-point"></field> <field name="soldOrderQty" type="fixed-point"></field> <field name="jobId" type="id-ne"></field> @@ -4819,6 +4820,9 @@ under the License. <relation type="one" fk-name="PROD_GROUP_ORDER" rel-entity-name="Product"> <key-map field-name="productId"/> </relation> + <relation type="one" fk-name="GROUP_ORDER_STATUS" rel-entity-name="StatusItem"> + <key-map field-name="statusId"/> + </relation> <relation type="one" fk-name="GROUP_ORDER_JOB" rel-entity-name="JobSandbox"> <key-map field-name="jobId"/> </relation> Modified: ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Aug 7 06:25:59 2012 @@ -307,9 +307,12 @@ under the License. </check-permission> <check-errors/> - <if-not-empty field="parameters.condValueInput"> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_QUANTITY"> <set field="parameters.condValue" from-field="parameters.condValueInput"/> - </if-not-empty> + </if-compare> + <if-compare field="parameters.inputParamEnumId" operator="equals" value="PRIP_LIST_PRICE"> + <set field="parameters.condValue" from-field="parameters.condValueInput"/> + </if-compare> <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceCond" map="lookupPKMap" value-field="lookedUpValue"/> Modified: ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Aug 7 06:25:59 2012 @@ -1064,17 +1064,26 @@ under the License. <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/> <set-nonpk-fields value-field="productGroupOrder" map="parameters"/> <store-value value-field="productGroupOrder"/> - - <entity-one entity-name="JobSandbox" value-field="jobSandbox"> - <field-map field-name="jobId" from-field="productGroupOrder.jobId"/> - </entity-one> - <if-not-empty field="jobSandbox"> - <set field="jobSandbox.runTime" from-field="parameters.thruDate"/> - <store-value value-field="jobSandbox"/> - </if-not-empty> + + <if-compare field="productGroupOrder.statusId" operator="equals" value="GO_CREATED"> + <entity-one entity-name="JobSandbox" value-field="jobSandbox"> + <field-map field-name="jobId" from-field="productGroupOrder.jobId"/> + </entity-one> + <if-not-empty field="jobSandbox"> + <set field="jobSandbox.runTime" from-field="parameters.thruDate"/> + <store-value value-field="jobSandbox"/> + </if-not-empty> + </if-compare> </simple-method> <simple-method method-name="deleteProductGroupOrder" short-description="Delete ProductGroupOrder"> + <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> + <field-map field-name="groupOrderId" from-field="parameters.groupOrderId"/> + </entity-and> + <iterate entry="orderItemGroupOrder" list="orderItemGroupOrders"> + <remove-value value-field="orderItemGroupOrder"/> + </iterate> + <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/> <remove-value value-field="productGroupOrder"/> @@ -1114,7 +1123,7 @@ under the License. <make-value entity-name="JobSandbox" value-field="jobSandbox"/> <sequenced-id sequence-name="JobSandbox" field="jobSandbox.jobId"/> <set field="jobId" from-field="jobSandbox.jobId"/> - <set field="jobSandbox.jobName" value="Check Product GroupOrder Expired"/> + <set field="jobSandbox.jobName" value="Check ProductGroupOrder Expired"/> <set field="jobSandbox.runTime" from-field="parameters.thruDate"/> <set field="jobSandbox.poolId" value="pool"/> <set field="jobSandbox.statusId" value="SERVICE_PENDING"/> @@ -1130,7 +1139,6 @@ under the License. </simple-method> <simple-method method-name="checkOrderItemForProductGroupOrder" short-description="Check OrderItem For ProductGroupOrder"> - <entity-one entity-name="OrderHeader" value-field="orderHeader"/> <entity-and entity-name="OrderItem" list="orderItems"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> @@ -1151,89 +1159,122 @@ under the License. <entity-and entity-name="ProductGroupOrder" list="productGroupOrders" filter-by-date="true"> <field-map field-name="productId" from-field="productId"/> </entity-and> - <iterate entry="productGroupOrder" list="productGroupOrders"> - <if-compare field="orderHeader.statusId" operator="equals" value="ORDER_CREATED"> - <calculate field="productGroupOrder.soldOrderQty"> - <calcop field="productGroupOrder.soldOrderQty" operator="add"> - <calcop field="orderItem.quantity" operator="get"/> - </calcop> - </calculate> - </if-compare> - <if-compare field="orderHeader.statusId" operator="equals" value="ORDER_CANCELLED"> - <calculate field="productGroupOrder.soldOrderQty"> - <calcop field="productGroupOrder.soldOrderQty" operator="subtract"> - <calcop field="orderItem.quantity" operator="get"/> - </calcop> - </calculate> - </if-compare> + <if-not-empty field="productGroupOrders"> + <first-from-list entry="productGroupOrder" list="productGroupOrders"/> + <calculate field="productGroupOrder.soldOrderQty"> + <calcop field="productGroupOrder.soldOrderQty" operator="add"> + <calcop field="orderItem.quantity" operator="get"/> + </calcop> + </calculate> <store-value value-field="productGroupOrder"/> - </iterate> + + <set field="createOrderItemGroupOrderMap.orderId" from-field="orderItem.orderId"/> + <set field="createOrderItemGroupOrderMap.orderItemSeqId" from-field="orderItem.orderItemSeqId"/> + <set field="createOrderItemGroupOrderMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/> + <call-service service-name="createOrderItemGroupOrder" in-map-name="createOrderItemGroupOrderMap"/> + </if-not-empty> </iterate> </simple-method> - - <simple-method method-name="checkProductGroupOrderExpired" short-description="Check ProductGroupOrder Expired"> - <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/> - <if-compare field="productGroupOrder.soldOrderQty" operator="greater-equals" value="${productGroupOrder.reqOrderQty}"> - <set field="newItemStatusId" value="ITEM_APPROVED"/> - <else> - <set field="newItemStatusId" value="ITEM_CANCELLED"/> - </else> - </if-compare> - - <entity-one entity-name="Product" value-field="product"> - <field-map field-name="productId" from-field="productGroupOrder.productId"/> - </entity-one> - <if-compare field="product.isVirtual" operator="equals" value="Y"> - <entity-and entity-name="ProductAssoc" list="variantProductAssocs" filter-by-date="true"> - <field-map field-name="productId" from-field="productGroupOrder.productId"/> - <field-map field-name="productAssocTypeId" value="PRODUCT_VARIANT"/> + + <simple-method method-name="cancleOrderItemGroupOrder" short-description="Cancle OrderItemGroupOrder"> + <if-not-empty field="parameters.orderItemSeqId"> + <entity-and entity-name="OrderItem" list="orderItems"> + <field-map field-name="orderId" from-field="parameters.orderId"/> + <field-map field-name="orderItemSeqId" from-field="parameters.orderItemSeqId" /> </entity-and> - <iterate entry="variantProductAssoc" list="variantProductAssocs"> - <set field="findOrderItemMap.productId" from-field="variantProductAssoc.productIdTo"/> - <set field="findOrderItemMap.newItemStatusId" from-field="newItemStatusId"/> - <set field="findOrderItemMap.fromDate" from-field="productGroupOrder.fromDate"/> - <set field="findOrderItemMap.thruDate" from-field="productGroupOrder.thruDate"/> - <call-service service-name="findOrderItemForProductGroupOrder" in-map-name="findOrderItemMap"/> - </iterate> <else> - <set field="findOrderItemMap.productId" from-field="productGroupOrder.productId"/> - <set field="findOrderItemMap.newItemStatusId" from-field="newItemStatusId"/> - <set field="findOrderItemMap.fromDate" from-field="productGroupOrder.fromDate"/> - <set field="findOrderItemMap.thruDate" from-field="productGroupOrder.thruDate"/> - <call-service service-name="findOrderItemForProductGroupOrder" in-map-name="findOrderItemMap"/> + <entity-and entity-name="OrderItem" list="orderItems"> + <field-map field-name="orderId" from-field="parameters.orderId"/> + </entity-and> </else> - </if-compare> - </simple-method> - - <simple-method method-name="findOrderItemForProductGroupOrder" short-description="Find OrderItem For ProductGroupOrder"> - <entity-condition entity-name="OrderItem" list="orderItems"> - <condition-list combine="and"> - <condition-expr field-name="productId" operator="equals" from-field="parameters.productId"/> - <condition-list combine="or"> - <condition-expr field-name="statusId" operator="equals" value="ITEM_CREATED"/> - <condition-expr field-name="statusId" operator="equals" value="ITEM_APPROVED"/> - </condition-list> - </condition-list> - </entity-condition> + </if-not-empty> <iterate entry="orderItem" list="orderItems"> - <entity-one value-field="orderHeader" entity-name="OrderHeader"> + <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> <field-map field-name="orderId" from-field="orderItem.orderId"/> - </entity-one> - <if> - <condition> - <and> - <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/> - <if-compare field="orderHeader.orderDate" operator="greater-equals" value="${parameters.fromDate}"/> - <if-compare field="orderHeader.orderDate" operator="less" value="${parameters.thruDate}"/> - </and> - </condition> - <then> - <set field="changeOrderItemStatusMap.orderId" from-field="orderItem.orderId"/> - <set field="changeOrderItemStatusMap.orderItemSeqId" from-field="orderItem.orderItemSeqId"/> - <set field="changeOrderItemStatusMap.statusId" from-field="parameters.newItemStatusId"/> - <call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/> - </then> - </if> + <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> + </entity-and> + <if-not-empty field="orderItemGroupOrders"> + <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/> + <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"> + <field-map field-name="groupOrderId" from-field="orderItemGroupOrder.groupOrderId"/> + </entity-one> + <if-not-empty field="productGroupOrder"> + <if-compare field="productGroupOrder.statusId" operator="equals" value="GO_CREATED"> + <if-compare field="orderItem.statusId" operator="equals" value="ITEM_CANCELLED"> + <if-not-empty field="orderItem.cancelQuantity"> + <set field="cancelQuantity" from-field="orderItem.cancelQuantity"/> + <else> + <set field="cancelQuantity" from-field="orderItem.quantity"/> + </else> + </if-not-empty> + <calculate field="productGroupOrder.soldOrderQty"> + <calcop field="productGroupOrder.soldOrderQty" operator="subtract"> + <calcop field="cancelQuantity" operator="get"/> + </calcop> + </calculate> + </if-compare> + <store-value value-field="productGroupOrder"/> + <remove-value value-field="orderItemGroupOrder"/> + </if-compare> + </if-not-empty> + </if-not-empty> </iterate> </simple-method> + + <simple-method method-name="checkProductGroupOrderExpired" short-description="Check ProductGroupOrder Expired"> + <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/> + <if-not-empty field="productGroupOrder"> + <if-compare field="productGroupOrder.soldOrderQty" operator="greater-equals" value="${productGroupOrder.reqOrderQty}"> + <set field="newItemStatusId" value="ITEM_APPROVED"/> + <set field="groupOrderStatusId" value="GO_SUCCESS"/> + <else> + <set field="newItemStatusId" value="ITEM_CANCELLED"/> + <set field="groupOrderStatusId" value="GO_CANCELLED"/> + </else> + </if-compare> + + <set field="updateProductGroupOrderMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/> + <set field="updateProductGroupOrderMap.statusId" from-field="groupOrderStatusId"/> + <call-service service-name="updateProductGroupOrder" in-map-name="updateProductGroupOrderMap"/> + + <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> + <field-map field-name="groupOrderId" from-field="productGroupOrder.groupOrderId"/> + </entity-and> + <iterate entry="orderItemGroupOrder" list="orderItemGroupOrders"> + <set field="changeOrderItemStatusMap.orderId" from-field="orderItemGroupOrder.orderId"/> + <set field="changeOrderItemStatusMap.orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/> + <set field="changeOrderItemStatusMap.statusId" from-field="newItemStatusId"/> + <call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/> + </iterate> + </if-not-empty> + </simple-method> + + <simple-method method-name="setProductReviewStatus" short-description="change the product review Status"> + <set value="setProductReviewStatus" field="callingMethodName"/> + <set value="UPDATE" field="checkAction"/> + <call-simple-method method-name="checkProductRelatedPermission"/> + <check-errors/> + + <entity-one value-field="productReview" entity-name="ProductReview"/> + <if-not-empty field="productReview"> + <if-compare-field field="productReview.statusId" to-field="parameters.statusId" operator="not-equals"> + <entity-one entity-name="StatusValidChange" value-field="statusChange"> + <field-map field-name="statusId" from-field="productReview.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> + </entity-one> + <if-empty field="statusChange"> + <set field="msg" value="Status is not a valid change: from ${productReview.statusId} to ${parameters.statusId}"/> + <log level="error" message="${msg}"/> + <add-error> + <fail-property resource="ProductErrorUiLabels" property="ProductReviewErrorCouldNotChangeOrderStatusFromTo"/> + </add-error> + </if-empty> + </if-compare-field> + </if-not-empty> + <check-errors/> + + <set field="productReview.statusId" from-field="parameters.statusId"/> + <store-value value-field="productReview"/> + <field-to-result field="productReview.productReviewId" result-name="productReviewId"/> + </simple-method> </simple-methods> Modified: ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml Tue Aug 7 06:25:59 2012 @@ -43,6 +43,7 @@ under the License. <set field="createProductGroupOrderMap.productId" value="GZ-1000"/> <set field="createProductGroupOrderMap.fromDate" from-field="nowTimestamp"/> <set field="createProductGroupOrderMap.thruDate" from-field="thruDate"/> + <set field="createProductGroupOrderMap.statusId" value="GO_CREATED"/> <set field="createProductGroupOrderMap.reqOrderQty" value="1" type="BigDecimal"/> <set field="createProductGroupOrderMap.soldOrderQty" value="0" type="BigDecimal"/> <call-service service-name="createProductGroupOrder" in-map-name="createProductGroupOrderMap"> @@ -125,23 +126,20 @@ under the License. </assert> <!-- Step 4 --> <set field="checkProductGroupOrderExpiredMap.userLogin" from-field="systemUserLogin"/> - <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/> + <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="groupOrderId"/> <call-service service-name="checkProductGroupOrderExpired" in-map-name="checkProductGroupOrderExpiredMap"/> <!-- Step 5 --> - <entity-condition entity-name="OrderHeader" list="orderHeaders"> - <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> - <order-by field-name="-orderDate"/> - </entity-condition> - <first-from-list entry="orderHeader" list="orderHeaders"/> - <entity-and entity-name="OrderItem" list="orderItems"> - <field-map field-name="orderId" from-field="orderHeader.orderId"/> - <field-map field-name="productId" value="GZ-1000"/> + <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> + <field-map field-name="groupOrderId" from-field="groupOrderId"/> </entity-and> - <first-from-list entry="orderItem" list="orderItems"/> + <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/> + <entity-one entity-name="OrderItem" value-field="orderItem"> + <field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/> + <field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/> + </entity-one> <assert> <if-compare field="orderItem.statusId" operator="equals" value="ITEM_APPROVED"/> </assert> - <check-errors/> </simple-method> @@ -164,9 +162,10 @@ under the License. <field-map field-name="userLoginId" value="system"/> </entity-one> <set field="createProductGroupOrderMap.userLogin" from-field="systemUserLogin"/> - <set field="createProductGroupOrderMap.productId" value="GZ-1000"/> + <set field="createProductGroupOrderMap.productId" value="GZ-1001"/> <set field="createProductGroupOrderMap.fromDate" from-field="nowTimestamp"/> <set field="createProductGroupOrderMap.thruDate" from-field="thruDate"/> + <set field="createProductGroupOrderMap.statusId" value="GO_CREATED"/> <set field="createProductGroupOrderMap.reqOrderQty" value="2" type="BigDecimal"/> <set field="createProductGroupOrderMap.soldOrderQty" value="0" type="BigDecimal"/> <call-service service-name="createProductGroupOrder" in-map-name="createProductGroupOrderMap"> @@ -203,7 +202,7 @@ under the License. </call-class-method> <log level="info" message="===== >>> Event : setOrderCurrencyAgreementShipDates, Response : ${result}"/> <call-bsh><![CDATA[ - request.setParameter("add_product_id", "GZ-1000"); + request.setParameter("add_product_id", "GZ-1001"); ]]></call-bsh> <call-class-method method-name="addToCart" class-name="org.ofbiz.order.shoppingcart.ShoppingCartEvents" ret-field="result"> <field field="request" type="javax.servlet.http.HttpServletRequest"/> @@ -249,23 +248,20 @@ under the License. </assert> <!-- Step 4 --> <set field="checkProductGroupOrderExpiredMap.userLogin" from-field="systemUserLogin"/> - <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/> + <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="groupOrderId"/> <call-service service-name="checkProductGroupOrderExpired" in-map-name="checkProductGroupOrderExpiredMap"/> <!-- Step 5 --> - <entity-condition entity-name="OrderHeader" list="orderHeaders"> - <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> - <order-by field-name="-orderDate"/> - </entity-condition> - <first-from-list entry="orderHeader" list="orderHeaders"/> - <entity-and entity-name="OrderItem" list="orderItems"> - <field-map field-name="orderId" from-field="orderHeader.orderId"/> - <field-map field-name="productId" value="GZ-1000"/> + <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> + <field-map field-name="groupOrderId" from-field="groupOrderId"/> </entity-and> - <first-from-list entry="orderItem" list="orderItems"/> + <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/> + <entity-one entity-name="OrderItem" value-field="orderItem"> + <field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/> + <field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/> + </entity-one> <assert> <if-compare field="orderItem.statusId" operator="equals" value="ITEM_CANCELLED"/> </assert> - <check-errors/> </simple-method> </simple-methods> Modified: ofbiz/branches/jackrabbit20120501/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/servicedef/services.xml?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/servicedef/services.xml Tue Aug 7 06:25:59 2012 @@ -204,6 +204,16 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> + <service name="setProductReviewStatus" engine="simple" + location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="setProductReviewStatus" auth="true"> + <description>Updates a product review record</description> + <required-permissions join-type="OR"> + <check-permission permission="CATALOG_UPDATE"/> + <check-permission permission="CATALOG_ADMIN"/> + </required-permissions> + <attribute name="productReviewId" type="String" mode="INOUT" optional="false"/> + <attribute name="statusId" type="String" mode="IN" optional="false"/> + </service> <service name="findProductById" engine="java" auth="true" export="true" location="org.ofbiz.product.product.ProductServices" invoke="findProductById"> @@ -1675,21 +1685,15 @@ under the License. <service name="createProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple" location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="createProductGroupOrder" auth="true"> <description>Create ProductGroupOrder</description> - <attribute name="productId" mode="IN" type="String" optional="false"/> - <attribute name="soldOrderQty" mode="IN" type="BigDecimal" optional="false"/> - <attribute name="reqOrderQty" mode="IN" type="BigDecimal" optional="false"/> - <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/> - <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/> - <attribute name="groupOrderId" mode="OUT" type="String" optional="true"/> + <auto-attributes include="pk" mode="OUT" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple" location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="updateProductGroupOrder" auth="true"> <description>Update ProductGroupOrder</description> - <attribute name="groupOrderId" mode="IN" type="String" optional="false"/> - <attribute name="reqOrderQty" mode="IN" type="BigDecimal" optional="false"/> - <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/> - <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple" @@ -1711,19 +1715,17 @@ under the License. <attribute name="orderId" mode="IN" type="String" optional="false"/> </service> + <service name="cancleOrderItemGroupOrder" engine="simple" + location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="cancleOrderItemGroupOrder" auth="true"> + <description>Cancle OrderItemGroupOrder</description> + <attribute name="orderId" mode="IN" type="String" optional="false"/> + <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> + </service> + <service name="checkProductGroupOrderExpired" engine="simple" location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="checkProductGroupOrderExpired" auth="true"> <description>Check ProductGroupOrder Expired</description> <attribute name="groupOrderId" mode="IN" type="String" optional="false"/> </service> - <service name="findOrderItemForProductGroupOrder" engine="simple" - location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="findOrderItemForProductGroupOrder" auth="true"> - <description>Find OrderItem For ProductGroupOrder</description> - <attribute name="productId" mode="IN" type="String" optional="false"/> - <attribute name="newItemStatusId" mode="IN" type="String" optional="false"/> - <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/> - <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/> - </service> - </services> Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Tue Aug 7 06:25:59 2012 @@ -434,8 +434,9 @@ public class CategoryWorker { * Its best use is to generate the trail every so often and store somewhere * (a lucene/solr tree, entities, cache or so). * - * @param productCategoryId id of category the trail should be generated for - * @returns List organized trail from root point to categoryId. + * @param dctx The DispatchContext that this service is operating in + * @param context Map containing the input parameters + * @return Map organized trail from root point to categoryId. * */ public static Map getCategoryTrail(DispatchContext dctx, Map context) { String productCategoryId = (String) context.get("productCategoryId"); Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java Tue Aug 7 06:25:59 2012 @@ -41,8 +41,8 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelUtil; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceContainer; /** * Product Config Item Content Worker: gets product content to display @@ -98,7 +98,7 @@ public class ProductConfigItemContentWra public LocalDispatcher getDispatcher() { if (dispatcher == null) { - dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator()); + dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator()); } return dispatcher; } Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Tue Aug 7 06:25:59 2012 @@ -39,8 +39,8 @@ import org.ofbiz.entity.DelegatorFactory import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceContainer; /** @@ -219,7 +219,7 @@ public class ProductConfigWrapper implem public LocalDispatcher getDispatcher() { if (dispatcher == null) { - dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator()); + dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator()); } return dispatcher; } Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/product/ProductEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/product/ProductEvents.java Tue Aug 7 06:25:59 2012 @@ -57,6 +57,7 @@ import org.ofbiz.product.store.ProductSt import org.ofbiz.security.Security; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.webapp.website.WebSiteWorker; /** * Product Information Related Events @@ -1018,6 +1019,10 @@ public class ProductEvents { } Map<String, Object> paramMap = UtilHttp.getParameterMap(request); + String websiteId = (String) paramMap.get("websiteId"); + if (UtilValidate.isEmpty(websiteId)) { + websiteId = WebSiteWorker.getWebSiteId(request); + } paramMap.put("locale", UtilHttp.getLocale(request)); paramMap.put("userLogin", session.getAttribute("userLogin")); @@ -1030,6 +1035,7 @@ public class ProductEvents { context.put("sendCc", productStoreEmail.get("ccAddress")); context.put("sendBcc", productStoreEmail.get("bccAddress")); context.put("subject", productStoreEmail.getString("subject")); + context.put("webSiteId", websiteId); try { dispatcher.runAsync("sendMailFromScreen", context); Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Tue Aug 7 06:25:59 2012 @@ -41,9 +41,9 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.product.product.ProductWorker; -import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceContainer; import org.ofbiz.service.ServiceUtil; @SuppressWarnings("serial") @@ -496,7 +496,7 @@ public class PackingSession implements j public LocalDispatcher getDispatcher() { if (_dispatcher == null) { - _dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator()); + _dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator()); } return _dispatcher; } Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Tue Aug 7 06:25:59 2012 @@ -37,8 +37,8 @@ import org.ofbiz.entity.DelegatorFactory import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceContainer; import org.ofbiz.service.ServiceUtil; @SuppressWarnings("serial") @@ -71,7 +71,7 @@ public class VerifyPickSession implement public LocalDispatcher getDispatcher() { if (_dispatcher == null) { - _dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator()); + _dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator()); } return _dispatcher; } Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=1370126&r1=1370125&r2=1370126&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Tue Aug 7 06:25:59 2012 @@ -38,8 +38,8 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.DelegatorFactory; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; -import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.LocalDispatcher; +import org.ofbiz.service.ServiceContainer; import org.ofbiz.service.ServiceUtil; @SuppressWarnings("serial") @@ -97,7 +97,7 @@ public class WeightPackageSession implem public LocalDispatcher getDispatcher() { if (_dispatcher == null) { - _dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator()); + _dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator()); } return _dispatcher; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |