svn commit: r1649482 [5/26] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1649482 [5/26] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy Mon Jan 5 08:50:30 2015 @@ -23,15 +23,15 @@ import org.ofbiz.entity.util.EntityUtil; if (productCategoryIdPar) { - category = delegator.findOne("ProductCategory", [productCategoryId : productCategoryIdPar], false); + category = from("ProductCategory").where("productCategoryId", productCategoryIdPar).queryOne(); context.category = category; } if (productFeatureTypeIdPar) { - featureType = delegator.findOne("ProductFeatureType", [productFeatureTypeId : productFeatureTypeIdPar], false); + featureType = from("ProductFeatureType").where("productFeatureTypeId", productFeatureTypeIdPar).queryOne(); context.featureType = featureType; } -allProductionRuns = delegator.findByAnd("WorkEffortAndGoods", [workEffortName : planName], ["productId"], false); +allProductionRuns = from("WorkEffortAndGoods").where("workEffortName", planName).orderBy("productId").queryList(); productionRuns = []; features = [:]; products = [:]; @@ -45,16 +45,14 @@ if (allProductionRuns) { return; } } - productionRunProduct = delegator.findOne("Product", [productId : productionRun.productId], false); + productionRunProduct = from("Product").where("productId", productionRun.productId).queryOne(); location = [:]; if (productionRunProduct) { - locations = delegator.findByAnd("ProductFacilityLocation", [facilityId : productionRun.facilityId, productId : productionRun.productId], null, false); - location = EntityUtil.getFirst(locations); + location = form("ProductFacilityLocation").where(facilityId : productionRun.facilityId, productId : productionRun.productId).queryFirst(); } if (taskNamePar) { // select the production run's task of a given name (i.e. type) if any (based on the report's parameter) - productionRunTasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRun.workEffortId , workEffortName : taskNamePar], null, false); - productionRunTask = EntityUtil.getFirst(productionRunTasks); + productionRunTask = from("WorkEffort").where("workEffortParentId", productionRun.workEffortId , "workEffortName", taskNamePar).queryFirst(); if (!productionRunTask) { // the production run doesn't include the given task, skip it return; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy Mon Jan 5 08:50:30 2015 @@ -25,21 +25,20 @@ import org.ofbiz.order.order.OrderReadHe import org.ofbiz.order.order.OrderContentWrapper; if (productCategoryIdPar) { - category = delegator.findOne("ProductCategory", [productCategoryId : productCategoryIdPar], false); + category = from("ProductCategory").where("productCategoryId", productCategoryIdPar).queryOne(); context.category = category; } if (productFeatureTypeIdPar) { - featureType = delegator.findOne("ProductFeatureType", [productFeatureTypeId : productFeatureTypeIdPar], false); + featureType = from("ProductFeatureType").where("productFeatureTypeId", productFeatureTypeIdPar).queryOne(); context.featureType = featureType; } -packageContents = delegator.findByAnd("ShipmentPackageContent", [shipmentId : shipmentId], null, false); +packageContents = from("ShipmentPackageContent").where("shipmentId", shipmentId).queryList(); packagesMap = [:]; if (packageContents) { packageContents.each { packageContent -> - orderShipments = delegator.findByAnd("OrderShipment", [shipmentId : shipmentId, shipmentItemSeqId : packageContent.shipmentItemSeqId], null, false); - orderShipment = EntityUtil.getFirst(orderShipments); - orderItem = delegator.findOne("OrderItem", [orderId : orderShipment.orderId, orderItemSeqId : orderShipment.orderItemSeqId], false); + orderShipment = from("OrderShipment").where("shipmentId", shipmentId, "shipmentItemSeqId", packageContent.shipmentItemSeqId).queryFirst(); + orderItem = from("OrderItem").where("orderId", orderShipment.orderId, "orderItemSeqId", orderShipment.orderItemSeqId).queryOne(); product = orderItem.getRelatedOne("Product", false); // verify if the product is a member of the given category (based on the report's parameter) if (productCategoryIdPar) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy Mon Jan 5 08:50:30 2015 @@ -21,16 +21,16 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.order.order.OrderReadHelper; shipmentId = parameters.shipmentId; -shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); +shipment = from("Shipment").where("shipmentId", shipmentId).queryOne(); context.shipmentIdPar = shipment.shipmentId; if (shipment) { - shipmentPackages = delegator.findByAnd("ShipmentPackage", [shipmentId : shipmentId], null, false); + shipmentPackages = from("ShipmentPackage").where("shipmentId", shipmentId).queryList(); records = []; orderReaders = [:]; shipmentPackages.each { shipmentPackage -> - shipmentPackageComponents = delegator.findByAnd("ShipmentPackageContent", [shipmentId : shipmentId, shipmentPackageSeqId : shipmentPackage.shipmentPackageSeqId], null, false); + shipmentPackageComponents = from("ShipmentPackageContent").where("shipmentId", shipmentId, "shipmentPackageSeqId", shipmentPackage.shipmentPackageSeqId).queryList();; shipmentPackageComponents.each { shipmentPackageComponent -> shipmentItem = shipmentPackageComponent.getRelatedOne("ShipmentItem", false); orderShipments = shipmentItem.getRelated("OrderShipment", null, null, false); @@ -54,7 +54,7 @@ if (shipment) { record.shipmentPackageSeqId = shipmentPackageComponent.shipmentPackageSeqId; record.orderId = orderId; record.orderItemSeqId = orderItemSeqId; - product = delegator.findOne("Product", [productId : record.productId], false); + product = from("Product").where("productId", record.productId).queryOne(); record.productName = product.internalName; record.shipDate = shipment.estimatedShipDate; // --- @@ -62,7 +62,7 @@ if (shipment) { if (orderReaders.containsKey(orderId)) { orderReadHelper = (OrderReadHelper)orderReaders.get(orderId); } else { - orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); + orderHeader = from("OrderHeader").where("orderId", orderId).queryOne(); orderReadHelper = new OrderReadHelper(orderHeader); orderReaders.put(orderId, orderReadHelper); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy Mon Jan 5 08:50:30 2015 @@ -22,16 +22,16 @@ import org.ofbiz.base.util.*; inventoryStock = [:]; shipmentId = parameters.shipmentId; -shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); +shipment = from("Shipment").where("shipmentId", shipmentId).queryOne(); context.shipmentIdPar = shipment.shipmentId; context.estimatedReadyDatePar = shipment.estimatedReadyDate; context.estimatedShipDatePar = shipment.estimatedShipDate; records = []; if (shipment) { - shipmentPlans = delegator.findByAnd("OrderShipment", [shipmentId : shipmentId], null, false); + shipmentPlans = from("OrderShipment").where("shipmentId", shipmentId).queryList(); shipmentPlans.each { shipmentPlan -> - orderLine = delegator.findOne("OrderItem", [orderId : shipmentPlan.orderId , orderItemSeqId : shipmentPlan.orderItemSeqId], false); + orderLine = from("OrderItem").where("orderId", shipmentPlan.orderId , "orderItemSeqId", shipmentPlan.orderItemSeqId).queryOne(); recordGroup = [:]; recordGroup.ORDER_ID = shipmentPlan.orderId; recordGroup.ORDER_ITEM_SEQ_ID = shipmentPlan.orderItemSeqId; @@ -40,7 +40,7 @@ if (shipment) { recordGroup.PRODUCT_ID = orderLine.productId; recordGroup.QUANTITY = shipmentPlan.quantity; - product = delegator.findOne("Product", [productId : orderLine.productId], false); + product = from("Product").where("productId", orderLine.productId).queryOne(); recordGroup.PRODUCT_NAME = product.internalName; inputPar = [productId : orderLine.productId, @@ -49,7 +49,7 @@ if (shipment) { userLogin: userLogin]; result = [:]; - result = dispatcher.runSync("getNotAssembledComponents",inputPar); + result = runService('getNotAssembledComponents',inputPar); if (result) { components = (List)result.get("notAssembledComponents"); } @@ -63,7 +63,7 @@ if (shipment) { if (facilityId) { if (!inventoryStock.containsKey(oneComponent.getProduct().productId)) { serviceInput = [productId : oneComponent.getProduct().productId , facilityId : facilityId]; - serviceOutput = dispatcher.runSync("getInventoryAvailableByFacility",serviceInput); + serviceOutput = runService('getInventoryAvailableByFacility',serviceInput); qha = serviceOutput.quantityOnHandTotal ?: 0.0; inventoryStock.put(oneComponent.getProduct().productId, qha); } @@ -75,7 +75,7 @@ if (shipment) { // Now we get the products qty already reserved by production runs serviceInput = [productId : oneComponent.getProduct().productId, userLogin : userLogin]; - serviceOutput = dispatcher.runSync("getProductionRunTotResQty", serviceInput); + serviceOutput = runSevice('getProductionRunTotResQty', serviceInput); resQty = serviceOutput.reservedQuantity; record.reservedQuantity = resQty; records.add(record); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy Mon Jan 5 08:50:30 2015 @@ -20,24 +20,24 @@ import org.ofbiz.entity.GenericValue; shipmentId = parameters.shipmentId; -shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); +shipment = from("Shipment").where("shipmentId", shipmentId).queryOne(); context.shipmentIdPar = shipment.shipmentId; context.date = new Date(); Double fixedAssetTime = new Double(0); if (shipment) { - shipmentPlans = delegator.findByAnd("OrderShipment", [shipmentId : shipmentId], null, false); + shipmentPlans = from("OrderShipment").where("shipmentId", shipmentId).queryList(); shipmentPlans.each { shipmentPlan -> - productionRuns = delegator.findByAnd("WorkOrderItemFulfillment", [orderId : shipmentPlan.orderId, orderItemSeqId : shipmentPlan.orderItemSeqId] , ["workEffortId"], false); // TODO: add shipmentId + productionRuns = from("WorkOrderItemFulfillment").where("orderId", shipmentPlan.orderId, "orderItemSeqId", shipmentPlan.orderItemSeqId).orderBy("workEffortId").queryList(); if (productionRuns) { productionRuns.each { productionRun -> productionRunProduct = [:]; - productionRunProducts = delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : productionRun.workEffortId , workEffortGoodStdTypeId : "PRUN_PROD_DELIV", statusId : "WEGS_CREATED"], null, false); + productionRunProducts = from("WorkEffortGoodStandard").where("workEffortId", productionRun.workEffortId , "workEffortGoodStdTypeId", "PRUN_PROD_DELIV", "statusId", "WEGS_CREATED").queryList(); if (productionRunProducts) { productionRunProduct = ((GenericValue)productionRunProducts.get(0)).getRelatedOne("Product", false); } - tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRun.workEffortId, workEffortTypeId : "PROD_ORDER_TASK"], null, false); + tasks = from("WorkEffort").where("workEffortParentId", productionRun.workEffortId, "workEffortTypeId", "PROD_ORDER_TASK").queryList(); tasks.each { task -> record = [:]; record.productId = productionRunProduct.productId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy Mon Jan 5 08:50:30 2015 @@ -22,7 +22,7 @@ import org.ofbiz.base.util.UtilHttp; requestParams = UtilHttp.getParameterMap(request); calendarId = requestParams.get("calendarId") ?: request.getAttribute("calendarId"); if (calendarId != null) { - techDataCalendar = delegator.findOne("TechDataCalendar", [calendarId : calendarId], false); + techDataCalendar = from("TechDataCalendar").where("calendarId", calendarId).queryOne(); context.techDataCalendar = techDataCalendar; } @@ -41,5 +41,5 @@ if (!calendarData) { } context.calendarData = calendarData; -allCalendarWeek = delegator.findList("TechDataCalendarWeek", null, null, null, null, false); +allCalendarWeek = from("TechDataCalendarWeek").queryList(); context.calendarWeeks = allCalendarWeek; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy Mon Jan 5 08:50:30 2015 @@ -33,7 +33,7 @@ calendarExceptionDays = []; calendarId = parameters.calendarId ?: request.getAttribute("calendarId"); if (calendarId) { - techDataCalendar = delegator.findOne("TechDataCalendar", [calendarId : calendarId], false); + techDataCalendar = from("TechDataCalendar").where("calendarId", calendarId).queryOne(); } if (techDataCalendar) { calendarExceptionDays = techDataCalendar.getRelated("TechDataCalendarExcDay", null, null, false); @@ -52,7 +52,7 @@ exceptionDateStartTime = parameters.exce exceptionDateStartTime = ObjectType.simpleTypeConvert(exceptionDateStartTime, "Timestamp", null, null); if (exceptionDateStartTime) { - calendarExceptionDay = delegator.findOne("TechDataCalendarExcDay", [calendarId : calendarId , exceptionDateStartTime : exceptionDateStartTime], false); + calendarExceptionDay = from("TechDataCalendarExcDay").where("calendarId", calendarId , "exceptionDateStartTime", exceptionDateStartTime) if (calendarExceptionDay) { HtmlFormWrapper updateCalendarExceptionDayWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/CalendarForms.xml", "UpdateCalendarExceptionDay", request, response); updateCalendarExceptionDayWrapper.putInContext("calendarExceptionDay", calendarExceptionDay); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Mon Jan 5 08:50:30 2015 @@ -31,7 +31,7 @@ calendarExceptionWeeks = []; calendarId = parameters.calendarId ?: request.getAttribute("calendarId");; if (calendarId) { - techDataCalendar = delegator.findOne("TechDataCalendar", [calendarId : calendarId], false); + techDataCalendar = from("TechDataCalendar").where("calendarId", calendarId).queryOne(); } if (techDataCalendar) { calendarExceptionWeeks = techDataCalendar.getRelated("TechDataCalendarExcWeek", null, null, false); @@ -56,7 +56,7 @@ exceptionDateStart = parameters.exceptio exceptionDateStart = ObjectType.simpleTypeConvert(exceptionDateStart, "java.sql.Date", null, null); if (exceptionDateStart) { - calendarExceptionWeek = delegator.findOne("TechDataCalendarExcWeek", [calendarId : calendarId , exceptionDateStart : exceptionDateStart], false); + calendarExceptionWeek = from("TechDataCalendarExcWeek").where("calendarId", calendarId , "exceptionDateStart", exceptionDateStart).queryOne(); if (calendarExceptionWeek) { HtmlFormWrapper updateCalendarExceptionWeekWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/CalendarForms.xml", "UpdateCalendarExceptionWeek", request, response); updateCalendarExceptionWeekWrapper.putInContext("calendarExceptionWeek", calendarExceptionWeek); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/LookupScreens.xml Mon Jan 5 08:50:30 2015 @@ -32,6 +32,7 @@ under the License. <set field="requestParameters.workEffortTypeId" to-scope="screen" default-value="ROUTING"/> <set field="requestParameters.fixedAssetId" to-scope="screen" default-value=""/> <set field="queryString" from-field="result.queryString"/> + <set field="searchFields" value="[workEffortId]"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/entitydef/entitymodel.xml Mon Jan 5 08:50:30 2015 @@ -532,9 +532,6 @@ under the License. <relation type="one" fk-name="TKNG_CODVST_TKCD" rel-entity-name="TrackingCode"> <key-map field-name="trackingCodeId"/> </relation> - <relation type="one" fk-name="TKNG_CODVST_VST" rel-entity-name="Visit"> - <key-map field-name="visitId"/> - </relation> <relation type="one" fk-name="TKNG_CODVST_SRCEM" rel-entity-name="Enumeration"> <key-map field-name="sourceEnumId" rel-field-name="enumId"/> </relation> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy Mon Jan 5 08:50:30 2015 @@ -19,7 +19,7 @@ // figure out the MARKETING_EMAIL of the ContactList owner, for setting in the send email link if (!contactList && contactListId) { - contactList = delegator.findOne("ContactList", [contactListId : "contactListId"], true); + contactList = from("ContactList").where("contactListId", "contactListId").cache(true).queryOne(); } if (contactList) { ownerParty = contactList.getRelatedOne("OwnerParty", false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/EmailStatusReport.groovy Mon Jan 5 08:50:30 2015 @@ -42,7 +42,6 @@ if (roleStatusId) { conditionList.add(EntityCondition.makeCondition("roleStatusId", EntityOperator.EQUALS, roleStatusId)); } conditionList.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "ADDRESSEE")); -conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); -commStatausList = delegator.findList("CommunicationEventAndRole", conditions, null, null, null, false); +commStatausList = from("CommunicationEventAndRole").where(conditionList).queryList(); context.commStatausList = commStatausList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.groovy Mon Jan 5 08:50:30 2015 @@ -40,11 +40,8 @@ if (marketingCampaignId) { orderConditionList.add(EntityCondition.makeCondition("marketingCampaignId", EntityOperator.EQUALS, marketingCampaignId)); } -visitConditions = EntityCondition.makeCondition(visitConditionList, EntityOperator.AND); -orderConditions = EntityCondition.makeCondition(orderConditionList, EntityOperator.AND); - -visits = delegator.findList("MarketingCampaignAndVisit", visitConditions, ['marketingCampaignId', 'visitId'] as Set, ['marketingCampaignId'], null, false); -orders = delegator.findList("MarketingCampaignAndOrderHeader", orderConditions, ['marketingCampaignId', 'orderId', 'grandTotal'] as Set, ['marketingCampaignId'], null, false); +visits = select("marketingCampaignId", "visitId").from("MarketingCampaignAndVisit").where(visitConditionList).orderBy("marketingCampaignId").queryList(); +orders = select("marketingCampaignId", "orderId", "grandTotal").from("MarketingCampaignAndOrderHeader").where(orderConditionList).orderBy("marketingCampaignId").queryList(); //use this helper to build a List of visits, orders, order totals, and conversion rates marketingCampaignVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "marketingCampaignId"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/PartyStatusReport.groovy Mon Jan 5 08:50:30 2015 @@ -36,6 +36,5 @@ if (contactListId) { if (statusId) { conditionList.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, statusId)); } -conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); -partyStatusLists = delegator.findList("ContactListPartyStatus", conditions, null, null, null, false); +partyStatusLists = from("ContactListPartyStatus").where(conditionList).queryList(); context.partyStatusLists = partyStatusLists; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy Mon Jan 5 08:50:30 2015 @@ -42,11 +42,8 @@ if (trackingCodeId) { orderConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, trackingCodeId)); } -visitConditions = EntityCondition.makeCondition(visitConditionList, EntityOperator.AND); -orderConditions = EntityCondition.makeCondition(orderConditionList, EntityOperator.AND); - -visits = delegator.findList("TrackingCodeAndVisit", visitConditions, ['trackingCodeId', 'visitId'] as Set, ['trackingCodeId'], null, false); -orders = delegator.findList("TrackingCodeAndOrderHeader", orderConditions, ['trackingCodeId', 'orderId', 'grandTotal'] as Set, ['trackingCodeId'], null, false); +visits = select("trackingCodeId", "visitId").from("TrackingCodeAndVisit").where(visitConditionList).orderBy("trackingCodeId").queryList(); +orders = select("trackingCodeId", "orderId", "grandTotal").from("TrackingCodeAndOrderHeader").where(orderConditionList).orderBy("trackingCodeId").queryList(); // use this helper to build a List of visits, orders, order totals, and conversion rates trackingCodeVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "trackingCodeId"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy Mon Jan 5 08:50:30 2015 @@ -23,15 +23,17 @@ import org.ofbiz.party.contact.ContactHe partyId = parameters.partyId; if (partyId) { - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); person = party.getRelatedOne("Person", false); contactDetailMap = [partyId : partyId, firstName : person.firstName, lastName : person.lastName, suffix : person.suffix]; - partyRelationship = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findList("PartyRelationship", - EntityCondition.makeCondition([partyIdTo : partyId, roleTypeIdTo : 'EMPLOYEE', roleTypeIdFrom : 'LEAD', partyRelationshipTypeId : 'EMPLOYMENT']), - null, ['-fromDate'], null, false))); + partyRelationship = from("PartyRelationship") + .where("partyIdTo", partyId, "roleTypeIdTo", "EMPLOYEE", "roleTypeIdFrom", "LEAD", "partyRelationshipTypeId", "EMPLOYMENT") + .orderBy("-fromDate") + .filterByDate() + .queryFirst(); if (partyRelationship) { contactDetailMap.title = partyRelationship.positionTitle; - partyGroup = delegator.findOne("PartyGroup", [partyId : partyRelationship.partyIdFrom], false); + partyGroup = from("PartyGroup").where("partyId", partyRelationship.partyIdFrom).queryOne(); if (partyGroup) { if (partyGroup.groupName) { contactDetailMap.groupName = partyGroup.groupName; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy Mon Jan 5 08:50:30 2015 @@ -27,7 +27,7 @@ partyIdTo = parameters.partyIdTo; if (partyIdFrom && partyIdTo) { partyList = [partyIdTo, partyIdFrom]; partyList.each { partyId -> - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); person = party.getRelatedOne("Person", false); contactDetailMap = [partyId : partyId, firstName : person.firstName, lastName : person.lastName]; @@ -42,10 +42,10 @@ if (partyIdFrom && partyIdTo) { if (address2) { contactDetailMap.address2 = address2; } - geo = delegator.findOne("Geo", [geoId : postalAddress.stateProvinceGeoId], false); + geo = sfrom("Geo").where("geoId", postalAddress.stateProvinceGeoId).queryOne(); contactDetailMap.state = geo.geoName; - geo = delegator.findOne("Geo", [geoId : postalAddress.countryGeoId], false); + geo = from("Geo").where("geoId", postalAddress.countryGeoId).queryOne(); contactDetailMap.country = geo.geoName; } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/entitydef/entitymodel.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/entitydef/entitymodel.xml Mon Jan 5 08:50:30 2015 @@ -2756,9 +2756,6 @@ under the License. <field name="wasReserved" type="indicator"></field> <prim-key field="visitId"/> <prim-key field="cartAbandonedLineSeqId"/> - <relation type="one" fk-name="CART_ABLN_VST" rel-entity-name="Visit"> - <key-map field-name="visitId"/> - </relation> <relation type="one" fk-name="CART_ABLN_PRD" rel-entity-name="Product"> <key-map field-name="productId"/> </relation> @@ -2810,9 +2807,6 @@ under the License. <relation type="one" fk-name="SHLIST_PTY" rel-entity-name="Party"> <key-map field-name="partyId"/> </relation> - <relation type="one" fk-name="SHLIST_VSTR" rel-entity-name="Visitor"> - <key-map field-name="visitorId"/> - </relation> <relation type="many" fk-name="SHLIST_PSSM" rel-entity-name="ProductStoreShipmentMeth"> <key-map field-name="productStoreId"/> <key-map field-name="shipmentMethodTypeId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Jan 5 08:50:30 2015 @@ -4459,7 +4459,7 @@ public class OrderServices { itemStatus.put("orderId", newItem.get("orderId")); itemStatus.put("orderItemSeqId", newItem.get("orderItemSeqId")); itemStatus.put("statusDatetime", UtilDateTime.nowTimestamp()); - itemStatus.set("statusUserLogin", userLogin.get("userLogin")); + itemStatus.set("statusUserLogin", userLogin.get("userLoginId")); delegator.create(itemStatus); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Mon Jan 5 08:50:30 2015 @@ -3542,7 +3542,17 @@ public class ShoppingCart implements Ite for (ShoppingCartItem item : cartLineItems) { //Debug.logInfo("Item qty: " + item.getQuantity(), module); try { - item.explodeItem(this, dispatcher); + int thisIndex = items().indexOf(item); + List<ShoppingCartItem> explodedItems = item.explodeItem(this, dispatcher); + + // Add exploded items into cart with order item sequence id and item ship group quantity + for (ShoppingCartItem explodedItem : explodedItems) { + String orderItemSeqId = UtilFormatOut.formatPaddedNumber(nextItemSeq, 5); + explodedItem.setOrderItemSeqId(orderItemSeqId); + addItemToEnd(explodedItem); + setItemShipGroupQty(explodedItem, BigDecimal.ONE, thisIndex); + nextItemSeq++; + } } catch (CartItemModifyException e) { Debug.logError(e, "Problem exploding item! Item not exploded.", module); } @@ -3563,7 +3573,17 @@ public class ShoppingCart implements Ite for (ShoppingCartItem item : shoppingCartItems) { //Debug.logInfo("Item qty: " + item.getQuantity(), module); try { - item.explodeItem(this, dispatcher); + int thisIndex = items().indexOf(item); + List<ShoppingCartItem> explodedItems = item.explodeItem(this, dispatcher); + + // Add exploded items into cart with order item sequence id and item ship group quantity + for (ShoppingCartItem explodedItem : explodedItems) { + String orderItemSeqId = UtilFormatOut.formatPaddedNumber(nextItemSeq, 5); + explodedItem.setOrderItemSeqId(orderItemSeqId); + addItemToEnd(explodedItem); + setItemShipGroupQty(explodedItem, BigDecimal.ONE, thisIndex); + nextItemSeq++; + } } catch (CartItemModifyException e) { Debug.logError(e, "Problem exploding (unitizing) item! Item not exploded.", module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Mon Jan 5 08:50:30 2015 @@ -946,6 +946,7 @@ public class ShoppingCartEvents { session.setAttribute("shoppingCart", cart); } + if (currencyUom == null) currencyUom = UtilHttp.getCurrencyUom(request); if (cart == null) { cart = new WebShoppingCart(request, locale, currencyUom); session.setAttribute("shoppingCart", cart); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Jan 5 08:50:30 2015 @@ -2511,7 +2511,7 @@ public class ShoppingCartItem implements return delegator; } - public void explodeItem(ShoppingCart cart, LocalDispatcher dispatcher) throws CartItemModifyException { + public List<ShoppingCartItem> explodeItem(ShoppingCart cart, LocalDispatcher dispatcher) throws CartItemModifyException { BigDecimal baseQuantity = this.getQuantity(); int thisIndex = cart.items().indexOf(this); List<ShoppingCartItem> newItems = new ArrayList<ShoppingCartItem>(); @@ -2523,7 +2523,6 @@ public class ShoppingCartItem implements // set the new item's quantity item.setQuantity(BigDecimal.ONE, dispatcher, cart, false); - // now copy/calc the adjustments Debug.logInfo("Clone's adj: " + item.getAdjustments(), module); if (UtilValidate.isNotEmpty(item.getAdjustments())) { @@ -2573,11 +2572,8 @@ public class ShoppingCartItem implements } } - // add the cloned item(s) to the cart - for (ShoppingCartItem sci : newItems) { - cart.addItem(thisIndex, sci); - } } + return newItems; } public static String getPurchaseOrderItemDescription(GenericValue product, GenericValue supplierProduct, Locale locale) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy Mon Jan 5 08:50:30 2015 @@ -30,14 +30,14 @@ if (productStoreId == null) { // Get Gift cards availbale in data -giftCardCategories = delegator.findList("ProductCategory", EntityCondition.makeCondition("productCategoryTypeId", EntityOperator.EQUALS, "GIFT_CARD_CATEGORY"), null, null, null, false); +giftCardCategories = from("ProductCategory").where("productCategoryTypeId", "GIFT_CARD_CATEGORY").queryList(); giftCardProductList = FastList.newInstance(); if (UtilValidate.isNotEmpty(giftCardCategories)) { giftCardCategories.each { giftCardCategory -> - giftCardCategoryMembers = delegator.findList("ProductCategoryMember", EntityCondition.makeCondition("productCategoryId", EntityOperator.EQUALS, giftCardCategory.productCategoryId), null, null, null, false); + giftCardCategoryMembers = from("ProductCategoryMember").where("productCategoryId", giftCardCategory.productCategoryId).queryList(); if (UtilValidate.isNotEmpty(giftCardCategoryMembers)) { giftCardCategoryMembers.each { giftCardCategoryMember -> - giftCardProducts = delegator.findList("ProductAndPriceView", EntityCondition.makeCondition("productId", EntityOperator.EQUALS, giftCardCategoryMember.productId), null, null, null, false); + giftCardProducts = from("ProductAndPriceView").where("productId", giftCardCategoryMember.productId).queryList(); if (UtilValidate.isNotEmpty(giftCardProducts)) { giftCardProducts.each { giftCardProduct -> giftCardProductList.add(giftCardProduct); @@ -51,6 +51,6 @@ context.giftCardProductList = giftCardPr // Get Survey Id for Gift Certificates -productStoreFinActSetting = delegator.findOne("ProductStoreFinActSetting", [productStoreId : productStoreId, finAccountTypeId : "GIFTCERT_ACCOUNT"], false); +productStoreFinActSetting = from("ProductStoreFinActSetting").where("productStoreId", productStoreId, "finAccountTypeId", "GIFTCERT_ACCOUNT").queryOne(); context.surveyId = productStoreFinActSetting.purchaseSurveyId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy Mon Jan 5 08:50:30 2015 @@ -29,12 +29,12 @@ roleData = [:]; partyData = [:]; additionalPartyRole.each { roleTypeId, partyList -> - roleData[roleTypeId] = delegator.findOne("RoleType", [roleTypeId : roleTypeId], true); + roleData[roleTypeId] = from("RoleType").where("roleTypeId", roleTypeId).queryOne(); partyList.each { partyId -> partyMap = [:]; partyMap.partyId = partyId; - party = delegator.findOne("Party", [partyId : partyId], true); + party = from("Party").where("partyId", partyId).cache(true).queryOne(); if (party.partyTypeId.equals("PERSON")) { party = party.getRelatedOne("Person", true); partyMap.type = "person"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy Mon Jan 5 08:50:30 2015 @@ -41,7 +41,7 @@ if (newPaymentMethodId) { } if (orderPartyId && !orderPartyId.equals("_NA_")) { - orderParty = delegator.findOne("Party", [partyId : orderPartyId], false); + orderParty = from("Party").where("partyId", orderPartyId).queryOne(); orderPerson = orderParty.getRelatedOne("Person", false); context.orderParty = orderParty; context.orderPerson = orderPerson; @@ -58,7 +58,7 @@ if (orderPartyId && !orderPartyId.equals if (request.getParameter("useShipAddr") && cart.getShippingContactMechId()) { shippingContactMech = cart.getShippingContactMechId(); - postalAddress = delegator.findOne("PostalAddress", [contactMechId : shippingContactMech], false); + postalAddress = from("PostalAddress").where("contactMechId", shippingContactMech).queryOne(); context.postalFields = postalAddress; } else { context.postalFields = UtilHttp.getParameterMap(request); @@ -69,7 +69,7 @@ if (cart) { checkOutPaymentId = cart.getPaymentMethodIds().get(0); context.checkOutPaymentId = checkOutPaymentId; if (!orderParty) { - paymentMethod = delegator.findOne("PaymentMethod", [paymentMethodId : checkOutPaymentId], false); + paymentMethod = from("PaymentMethod").where("paymentMethodId", checkOutPaymentId).queryOne(); if ("CREDIT_CARD".equals(paymentMethod?.paymentMethodTypeId)) { paymentMethodType = "CC"; account = paymentMethod.getRelatedOne("CreditCard", false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Mon Jan 5 08:50:30 2015 @@ -34,29 +34,29 @@ productStore = ProductStoreWorker.getPro if (productStore) { context.defaultProductStore = productStore; if (productStore.defaultSalesChannelEnumId) - context.defaultSalesChannel = delegator.findOne("Enumeration", [enumId : productStore.defaultSalesChannelEnumId], true); + context.defaultSalesChannel = from("Enumeration").where("enumId", productStore.defaultSalesChannelEnumId).cache(true).queryOne(); } // Get the Cart shoppingCart = session.getAttribute("shoppingCart"); context.shoppingCart = shoppingCart; -salesChannels = delegator.findByAnd("Enumeration", [enumTypeId : "ORDER_SALES_CHANNEL"], ["sequenceId"], true); +salesChannels = from("Enumeration").where("enumTypeId", "ORDER_SALES_CHANNEL").orderBy("sequenceId").cache(true).queryList(); context.salesChannels = salesChannels; -productStores = delegator.findList("ProductStore", null, null, ["productStoreId", "storeName"], null, true); +productStores = from("ProductStore").orderBy("productStoreId", "storeName").cache(true).queryList(); context.productStores = productStores; -suppliers = delegator.findByAnd("PartyRoleAndPartyDetail", [roleTypeId : "SUPPLIER"], ["groupName", "partyId"], false); +suppliers = from("PartyRoleAndPartyDetail").where("roleTypeId", "SUPPLIER").orderBy("groupName", "partyId").queryList(); context.suppliers = suppliers; -organizations = delegator.findByAnd("PartyAcctgPrefAndGroup", null, null, false); +organizations = from("PartyAcctgPrefAndGroup").queryList(); context.organizations = organizations; // Set Shipping From the Party partyId = null; partyId = parameters.partyId; if (partyId) { - party = delegator.findOne("Person", [partyId : partyId], false); + party = from("Person").where("partyId", partyId).queryOne(); if (party) { contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false)); if (contactMech) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy Mon Jan 5 08:50:30 2015 @@ -28,7 +28,7 @@ import org.ofbiz.order.shoppingcart.ship shoppingCart = session.getAttribute("shoppingCart"); currencyUomId = shoppingCart.getCurrency(); partyId = shoppingCart.getPartyId(); -party = delegator.findOne("Party", [partyId : partyId], true); +party = from("Party").where("partyId", partyId).cache(true).queryOne(); productStore = ProductStoreWorker.getProductStore(request); shippingEstWpr = null; @@ -40,14 +40,14 @@ if (shoppingCart) { shoppingCart.createDropShipGroups(dispatcher); } -profiledefs = delegator.findOne("PartyProfileDefault", [partyId : userLogin.partyId, productStoreId : productStoreId], false); +profiledefs = from("PartyProfileDefault").where("partyId", userLogin.partyId, "productStoreId", productStoreId).queryOne(); context.profiledefs = profiledefs; context.shoppingCart = shoppingCart; context.userLogin = userLogin; context.productStoreId = productStore.get("productStoreId"); context.productStore = productStore; -shipToParty = delegator.findOne("Party", [partyId : shoppingCart.getShipToCustomerPartyId()], true); +shipToParty = from("Party").where("partyId", shoppingCart.getShipToCustomerPartyId()).cache(true).queryOne(); context.shippingContactMechList = ContactHelper.getContactMech(shipToParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); context.emailList = ContactHelper.getContactMechByType(party, "EMAIL_ADDRESS", false); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy Mon Jan 5 08:50:30 2015 @@ -28,7 +28,7 @@ cart = session.getAttribute("shoppingCar currencyUomId = cart.getCurrency(); userLogin = session.getAttribute("userLogin"); partyId = cart.getPartyId(); -party = delegator.findOne("Party", [partyId : partyId], true); +party = from("Party").where("partyId", partyId).cache(true).queryOne(); productStoreId = ProductStoreWorker.getProductStoreId(request); checkOutPaymentId = ""; @@ -40,9 +40,7 @@ if (cart) { } } -finAccounts = delegator.findByAnd("FinAccountAndRole", [partyId : partyId, roleTypeId : "OWNER"], null, false); -finAccounts = EntityUtil.filterByDate(finAccounts, UtilDateTime.nowTimestamp(), "roleFromDate", "roleThruDate", true); -finAccounts = EntityUtil.filterByDate(finAccounts); +finAccounts = from("FinAccountAndRole").where("partyId", partyId, "roleTypeId", "OWNER").filterByDate(UtilDateTime.nowTimestamp(), "fromDate", "thruDate", "roleFromDate", "roleThruDate").queryList(); context.finAccounts = finAccounts; context.shoppingCart = cart; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy Mon Jan 5 08:50:30 2015 @@ -87,7 +87,7 @@ paymentMethodType = null; paymentMethodTypeId = null; if (paymentMethodTypeIds) { paymentMethodTypeId = paymentMethodTypeIds.get(0); - paymentMethodType = delegator.findOne("PaymentMethodType", [paymentMethodTypeId : paymentMethodTypeId], false); + paymentMethodType = from("PaymentMethodType").where("paymentMethodTypeId", paymentMethodTypeId).queryOne(); context.paymentMethodType = paymentMethodType; } @@ -107,7 +107,7 @@ if (paymentMethod) { } if (billingAddress) context.billingAddress = billingAddress; -billingAccount = cart.getBillingAccountId() ? delegator.findOne("BillingAccount", [billingAccountId : cart.getBillingAccountId()], false) : null; +billingAccount = cart.getBillingAccountId() ? from("BillingAccount").where("billingAccountId", cart.getBillingAccountId()).queryOne() : null; if (billingAccount) context.billingAccount = billingAccount; context.customerPoNumber = cart.getPoNumber(); @@ -120,7 +120,7 @@ context.isGift = cart.getIsGift(); context.shipBeforeDate = cart.getShipBeforeDate(); context.shipAfterDate = cart.getShipAfterDate(); -shipmentMethodType = delegator.findOne("ShipmentMethodType", [shipmentMethodTypeId : cart.getShipmentMethodTypeId()], false); +shipmentMethodType = from("ShipmentMethodType").where("shipmentMethodTypeId", cart.getShipmentMethodTypeId()).queryOne(); if (shipmentMethodType) context.shipMethDescription = shipmentMethodType.description; orh = new OrderReadHelper(orderAdjustments, orderItems); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy Mon Jan 5 08:50:30 2015 @@ -44,11 +44,7 @@ for (shipGroupIndex = 0; shipGroupIndex supplierPartyId = cart.getSupplierPartyId(shipGroupIndex); context[shipGroupIndex + "_supplierPartyId"] = supplierPartyId; } -exprs = FastList.newInstance(); -exprs.add(EntityCondition.makeCondition("partyIdTo", EntityOperator.EQUALS, payToPartyId)); -exprs.add(EntityCondition.makeCondition("partyIdFrom", EntityOperator.EQUALS, partyId)); -agreements = delegator.findList("Agreement", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, null, null, true); -agreements = EntityUtil.filterByDate(agreements); +agreements = from("Agreement").where("partyIdTo", payToPartyId, "partyIdFrom", partyId).filterByDate().cache(true).queryList(); context.agreements = agreements; context.shoppingCart = cart; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy Mon Jan 5 08:50:30 2015 @@ -30,7 +30,7 @@ context.cart = cart; productStore = ProductStoreWorker.getProductStore(request); if (productStore) { context.productStore = productStore; - context.carrierShipmentMethodList = delegator.findByAnd('ProductStoreShipmentMethView', [productStoreId: productStore.productStoreId], ['sequenceNumber'], true); + context.carrierShipmentMethodList = from("ProductStoreShipmentMethView").where("productStoreId", productStore.productStoreId).orderBy("sequenceNumber").cache(true).queryList(); } // nuke the event messages @@ -39,7 +39,7 @@ request.removeAttribute("_EVENT_MESSAGE_ party = null; orderPartyIdId = cart.getPartyId(); if (orderPartyIdId) { - orderPartyId = delegator.findOne("Party", [partyId : orderPartyIdId], false); + orderPartyId = from("Party").where("partyId", orderPartyIdId).queryOne(); context.orderPartyId = orderPartyId; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy Mon Jan 5 08:50:30 2015 @@ -64,13 +64,12 @@ if ('PURCHASE_ORDER'.equals(shoppingCart } -agreements = delegator.findList('Agreement', agreementCondition, null, null, null, true); -agreements = EntityUtil.filterByDate(agreements); +agreements = from("Agreement").where(agreementCondition).filterByDate().cache(true).queryList(); if (agreements) { context.agreements = agreements; } -agreementRoles = delegator.findList('AgreementRole', agreementRoleCondition, null, null, null, true); +agreementRoles = from("AgreementRole").where(agreementRoleCondition).cache(true).queryList(); if (agreementRoles) { context.agreementRoles = agreementRoles; } @@ -92,5 +91,5 @@ if (catalogCol) { } // currencies and shopping cart currency -context.currencies = delegator.findByAnd('Uom', [uomTypeId: 'CURRENCY_MEASURE'], null, true); +context.currencies = from("Uom").where("uomTypeId", "CURRENCY_MEASURE").cache(true).queryList(); context.currencyUomId = shoppingCart.getCurrency(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy Mon Jan 5 08:50:30 2015 @@ -52,4 +52,4 @@ if (request.getParameter('createNew') == } -context.termTypes = delegator.findList('TermType', null, null, null, null, false); +context.termTypes = from("TermType").queryList(); \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy Mon Jan 5 08:50:30 2015 @@ -32,7 +32,7 @@ if (!request.getParameterValues("additio additionalPartyId = request.getParameter("additionalPartyId"); context.additionalPartyId = additionalPartyId; - roles = delegator.findByAnd("PartyRole", [partyId : additionalPartyId], null, false); + roles = from("PartyRole").where("partyId", additionalPartyId).queryList(); roleData = []; roles.each { role -> roleData.add(role.getRelatedOne("RoleType", false)); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Mon Jan 5 08:50:30 2015 @@ -46,7 +46,7 @@ request.removeAttribute("_EVENT_MESSAGE_ if ("SALES_ORDER".equals(cart.getOrderType())) { if (!"_NA_".equals(orderPartyId)) { - orderParty = delegator.findOne("Party", [partyId : orderPartyId], false); + orderParty = from("Party").where("partyId", orderPartyId).queryOne(); if (orderParty) { shippingContactMechList = ContactHelper.getContactMech(orderParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); orderPerson = orderParty.getRelatedOne("Person", false); @@ -57,7 +57,7 @@ if ("SALES_ORDER".equals(cart.getOrderTy } // Ship to another party if (shipToPartyId) { - shipToParty = delegator.findOne("Party", [partyId : shipToPartyId], false); + shipToParty = from("Party").where("partyId", shipToPartyId).queryOne(); if (shipToParty) { context.shipToParty = shipToParty; shipToPartyShippingContactMechList = ContactHelper.getContactMech(shipToParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); @@ -65,16 +65,16 @@ if ("SALES_ORDER".equals(cart.getOrderTy } } // suppliers for the drop-ship select box - suppliers = delegator.findByAnd("PartyRole", [roleTypeId : "SUPPLIER"], null, false); + suppliers = from("PartyRole").where("roleTypeId", "SUPPLIER").queryList(); context.suppliers = suppliers; // facilities used to reserve the items per ship group - productStoreFacilities = delegator.findByAnd("ProductStoreFacility", [productStoreId : cart.getProductStoreId()], null, false); + productStoreFacilities = from("ProductStoreFacility").where("productStoreId", cart.getProductStoreId()).queryList(); context.productStoreFacilities = productStoreFacilities; } else { // Purchase order if (!"_NA_".equals(orderPartyId)) { - orderParty = delegator.findOne("Party", [partyId : orderPartyId], false); + orderParty = from("Party").where("partyId", orderPartyId).queryOne(); if (orderParty) { orderPerson = orderParty.getRelatedOne("Person", false); context.orderParty = orderParty; @@ -85,14 +85,14 @@ if ("SALES_ORDER".equals(cart.getOrderTy companyId = cart.getBillToCustomerPartyId(); if (companyId) { facilityMaps = FastList.newInstance(); - facilities = delegator.findByAnd("Facility", [ownerPartyId : companyId], null, true); + facilities = from("Facility").where("ownerPartyId", companyId).cache(true).queryList(); // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. if (UtilValidate.isEmpty(facilities)) { - partyRelationship = EntityUtil.getFirst(delegator.findList("PartyRelationship", EntityCondition.makeCondition(["roleTypeIdFrom": "PARENT_ORGANIZATION", "partyIdTo": companyId]), null, null, null, false)); + partyRelationship = from("PartyRelationship").where("roleTypeIdFrom": "PARENT_ORGANIZATION", "partyIdTo": companyId).queryFirst(); if (UtilValidate.isNotEmpty(partyRelationship)) { companyId = partyRelationship.partyIdFrom; - facilities = delegator.findByAnd("Facility", [ownerPartyId : companyId], null, true); + facilities = from("Facility").where("ownerPartyId", companyId).cache(true).queryList(); } } facilities.each { facility -> @@ -106,7 +106,7 @@ if ("SALES_ORDER".equals(cart.getOrderTy } // Ship to another party if (shipToPartyId) { - shipToParty = delegator.findOne("Party", [partyId : shipToPartyId], false); + shipToParty = from("Party").where("partyId", shipToPartyId).queryOne(); if (shipToParty) { context.shipToParty = shipToParty; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy Mon Jan 5 08:50:30 2015 @@ -28,7 +28,7 @@ shoppingCart = session.getAttribute("sho partyId = shoppingCart.getPartyId(); // Get the party's collection of Shopping Lists -shoppingLists = delegator.findByAnd("ShoppingList", [partyId : partyId], null, true); +shoppingLists = from("ShoppingList").where("partyId", partyId).cache(true).queryList(); if (shoppingLists) { context.shoppingLists = shoppingLists; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy Mon Jan 5 08:50:30 2015 @@ -53,7 +53,7 @@ context.currencyUomId = shoppingCart.get context.orderType = shoppingCart.getOrderType(); // get all the possible gift wrap options -allgiftWraps = delegator.findByAnd("ProductFeature", [productFeatureTypeId : "GIFT_WRAP"], ["defaultSequenceNum"], false); +allgiftWraps = from("ProductFeature").where("productFeatureTypeId", "GIFT_WRAP").orderBy("defaultSequenceNum").queryList(); context.allgiftWraps = allgiftWraps; context.contentPathPrefix = CatalogWorker.getContentPathPrefix(request); @@ -82,24 +82,24 @@ context.defaultComment = defaultComment; // get all party shopping lists if (partyId) { - shoppingLists = delegator.findByAnd("ShoppingList", [partyId : partyId], null, false); + shoppingLists = from("ShoppingList").where("partyId", partyId).queryList(); context.shoppingLists = shoppingLists; } // get product inventory summary for each shopping cart item -productStore = delegator.findOne("ProductStore", [productStoreId : productStoreId], true); +productStore = from("ProductStore").where("productStoreId", productStoreId).cache(true).queryOne(); context.productStore = productStore productStoreFacilityId = null; if (productStore) { productStoreFacilityId = productStore.inventoryFacilityId; } context.facilityId = productStoreFacilityId; -inventorySummary = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : shoppingCart.makeOrderItems(), facilityId : productStoreFacilityId]); +inventorySummary = runService('getProductInventorySummaryForItems', [orderItems : shoppingCart.makeOrderItems(), facilityId : productStoreFacilityId]); context.availableToPromiseMap = inventorySummary.availableToPromiseMap; context.quantityOnHandMap = inventorySummary.quantityOnHandMap; context.mktgPkgATPMap = inventorySummary.mktgPkgATPMap; context.mktgPkgQOHMap = inventorySummary.mktgPkgQOHMap; // get purchase order item types -purchaseOrderItemTypeList = delegator.findByAnd("OrderItemType", [parentTypeId : "PURCHASE_SPECIFIC"], null, true); +purchaseOrderItemTypeList = from("OrderItemType").where("parentTypeId", "PURCHASE_SPECIFIC").cache(true).queryList(); context.purchaseOrderItemTypeList = purchaseOrderItemTypeList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy Mon Jan 5 08:50:30 2015 @@ -22,11 +22,12 @@ import org.ofbiz.product.store.ProductSt shoppingCart = session.getAttribute("shoppingCart"); partyId = shoppingCart.getPartyId(); -party = delegator.findOne("Party", [partyId : partyId], true); +party = from("Party").where("partyId", partyId).cache(true).queryOne(); productStoreId = ProductStoreWorker.getProductStoreId(request); context.cart = shoppingCart; context.shippingContactMechList = ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); -profiledefs = delegator.findOne("PartyProfileDefault", [partyId : partyId, productStoreId : productStoreId], true); +profiledefs = from("PartyProfileDefault").where("partyId", partyId, "productStoreId", productStoreId).cache(true).queryOne(); + context.profileDefs = profiledefs; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy Mon Jan 5 08:50:30 2015 @@ -50,6 +50,5 @@ conditions = EntityCondition.makeConditi mainConditionList.add(orConditions); mainConditionList.add(conditions); -mainConditions = EntityCondition.makeCondition(mainConditionList, EntityOperator.AND); -context.productList = delegator.findList("Product", mainConditions, ["productId", "brandName", "internalName"] as Set, ["productId"], null, false); +context.productList = select("productId", "brandName", "internalName").from("Product").where(mainConditionList).orderBy("productId").queryList(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy Mon Jan 5 08:50:30 2015 @@ -48,11 +48,9 @@ supplierPartyId = null; orderId = parameters.orderId; if (orderId) { - orderItemShipGroup = EntityUtil.getFirst(delegator.findList("OrderItemShipGroup", null, null, ["orderId" , "orderId"], null, false)); - orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); - EntityCondition cond = EntityCondition.makeCondition([EntityCondition.makeCondition("orderId", orderId), - EntityCondition.makeCondition("roleTypeId", "BILL_FROM_VENDOR")], EntityOperator.AND); - supplier = EntityUtil.getFirst(delegator.findList("OrderHeaderAndRoles", cond, null, null, null, false)); + orderItemShipGroup = from("OrderItemShipGroup").orderBy("orderId").queryFirst(); + orderHeader = from("OrderHeader").where("orderId", orderId).queryOne(); + supplier = from("OrderHeaderAndRoles").where("orderId", orderId, "roleTypeId", "BILL_FROM_VENDOR").queryFirst(); context.shipGroupSeqId = orderItemShipGroup.shipGroupSeqId ; context.orderHeader = orderHeader; } @@ -75,10 +73,11 @@ conditionList.add(EntityCondition.makeCo conditionList.add(EntityCondition.makeCondition("currencyUomId", EntityOperator.EQUALS, shoppingCart.getCurrency())); conditionList.add(EntityCondition.makeConditionDate("availableFromDate", "availableThruDate")); -conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); -selectedFields = ["productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity", "orderQtyIncrements"] as Set; -supplierProducts = delegator.findList("SupplierProduct", conditions, selectedFields, ["productId"], null, false); +supplierProducts = select("productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity", "orderQtyIncrements").from("SupplierProduct") + .where(conditionList) + .orderBy("productId") + .queryList(); newProductList = []; for (supplierProduct in supplierProducts) { @@ -86,9 +85,9 @@ for (supplierProduct in supplierProducts String facilityId = parameters.facilityId; if (facilityId) { - productFacilityList = delegator.findByAnd("ProductFacility", ["productId": productId, "facilityId" : facilityId], null, true); + productFacilityList = from("ProductFacility").where("productId", productId, "facilityId", facilityId).cache(true).queryList(); } else { - productFacilityList = delegator.findByAnd("ProductFacility", ["productId": productId], null, true); + productFacilityList = from("ProductFacility").where("productId", productId).cache(true).queryList(); } if (newProductList.size() >= maxRows) { // We've got enough results to display, keep going to get the result size but skip the heavy stuff @@ -96,10 +95,7 @@ for (supplierProduct in supplierProducts } else { quantityOnOrder = 0.0; // find approved purchase orders - condition = EntityCondition.makeCondition(EntityCondition.makeCondition("orderTypeId", "PURCHASE_ORDER"), EntityOperator.AND, - EntityCondition.makeCondition("statusId", "ORDER_APPROVED")); - - orderHeaders = delegator.findList("OrderHeader", condition, null, ["orderId DESC"], null, false); + orderHeaders = from("OrderHeader").where("orderTypeId", "PURCHASE_ORDER", "statusId", "ORDER_APPROVED").orderBy("orderId DESC").queryList(); orderHeaders.each { orderHeader -> orderReadHelper = new OrderReadHelper(orderHeader); orderItems = orderReadHelper.getOrderItems(); @@ -113,9 +109,9 @@ for (supplierProduct in supplierProducts } } } - product = delegator.findOne("Product", ["productId" : productId], true); + product = from("Product").where("productId", productId).cache(true).queryOne(); productFacilityList.each { productFacility -> - result = dispatcher.runSync("getInventoryAvailableByFacility", ["productId" : productId, "facilityId" : productFacility.facilityId]); + result = runService('getInventoryAvailableByFacility', ["productId" : productId, "facilityId" : productFacility.facilityId]); qohAtp = result.quantityOnHandTotal.toPlainString() + "/" + result.availableToPromiseTotal.toPlainString(); productInfoMap = [:]; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy Mon Jan 5 08:50:30 2015 @@ -23,11 +23,11 @@ import org.ofbiz.order.shoppingcart.prod productPromoId = request.getParameter("productPromoId"); if (!productPromoId) productPromoId = parameters.productPromoId; -productPromo = delegator.findOne("ProductPromo", [productPromoId : productPromoId], false); +productPromo = from("ProductPromo").where("productPromoId", productPromoId).queryOne(); promoAutoDescription = ProductPromoWorker.makeAutoDescription(productPromo, delegator, locale); -productPromoCategoryList = delegator.findByAnd("ProductPromoCategory", [productPromoId : productPromoId], null, true); +productPromoCategoryList = from("ProductPromoCategory").where("productPromoId", productPromoId).cache(true).queryList(); productPromoCategoryIncludeList = EntityUtil.filterByAnd(productPromoCategoryList, [productPromoApplEnumId : "PPPA_INCLUDE"]); productPromoCategoryExcludeList = EntityUtil.filterByAnd(productPromoCategoryList, [productPromoApplEnumId : "PPPA_EXCLUDE"]); productPromoCategoryAlwaysList = EntityUtil.filterByAnd(productPromoCategoryList, [productPromoApplEnumId : "PPPA_ALWAYS"]); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy Mon Jan 5 08:50:30 2015 @@ -34,12 +34,12 @@ if (!searchCategoryId) { currentCatalogId = CatalogWorker.getCurrentCatalogId(request); searchCategoryId = CatalogWorker.getCatalogSearchCategoryId(request, currentCatalogId); } -searchCategory = delegator.findOne("ProductCategory", [productCategoryId : searchCategoryId], false); +searchCategory = from("ProductCategory").where("productCategoryId", searchCategoryId).queryOne(); productFeaturesByTypeMap = ParametricSearch.makeCategoryFeatureLists(searchCategoryId, delegator); productFeatureTypeIdsOrdered = new TreeSet(productFeaturesByTypeMap.keySet()) as List; if(productFeatureTypeIdsOrdered) { - context.productFeatureTypes = delegator.findList("ProductFeatureType", EntityCondition.makeCondition("productFeatureTypeId", EntityOperator.IN, productFeatureTypeIdsOrdered), null, null, null, false); + context.productFeatureTypes = from("ProductFeatureType").where(EntityCondition.makeCondition("productFeatureTypeId", EntityOperator.IN, productFeatureTypeIdsOrdered)).queryList(); } searchOperator = parameters.SEARCH_OPERATOR; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |