svn commit: r1813612 - in /ofbiz/ofbiz-framework/trunk/a
Locked
svn commit: r1813612 - in /ofbiz/ofbiz-framework/trunk/a
 
|
Author: deepak
Date: Sat Oct 28 11:55:36 2017 New Revision: 1813612 URL: http://svn.apache.org/viewvc?rev=1813612&view=rev Log: Order : Remove unused imports from groovy files for code optimization. (OFBIZ-9509) Thanks Suraj Khurana and Pradeep Choudhary for your contribution. Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AdditionalPartyListing.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/BillSettings.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckInits.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutOptions.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutShippingAddress.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OptionSettings.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderAgreements.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderTerms.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetAdditionalParty.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetCheckOutTabBar.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShoppingList.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowCart.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowPromoText.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/StorePaymentOptions.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/ShowPromotionDetails.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Category.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ChooseCatalog.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CompareProducts.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/PrepareConfigForm.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Product.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/QuickAdd.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/SideDeepCategory.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/CompanyHeader.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FilterOrderList.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderList.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderStats.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderViewWebSecure.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ReceivePayment.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/SendConfirmationEmail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ShipGroups.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ViewImage.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ManageQuotePrices.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ViewQuoteProfit.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/reports/OpenOrderItemsReport.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/GetNextSequenceNum.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/RequestItemNotes.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/SetRequestQuote.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/QuickReturn.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnHeader.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnItems.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/setup/PaymentSetup.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/task/OrderTaskList.groovy Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AddGiftCertificates.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,6 @@ * under the License. */ import org.apache.ofbiz.base.util.UtilValidate -import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.condition.EntityOperator import org.apache.ofbiz.product.store.ProductStoreWorker cart = session.getAttribute("shoppingCart") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AdditionalPartyListing.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AdditionalPartyListing.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AdditionalPartyListing.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/AdditionalPartyListing.groovy Sat Oct 28 11:55:36 2017 @@ -18,9 +18,6 @@ */ import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents -import org.apache.ofbiz.order.shoppingcart.ShoppingCart -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* cart = ShoppingCartEvents.getCartObject(request) additionalPartyRole = cart.getAdditionalPartyRoleMap() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/BillSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/BillSettings.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/BillSettings.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/BillSettings.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,9 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.accounting.payment.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.party.contact.* +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.base.util.UtilHttp +import org.apache.ofbiz.accounting.payment.BillingAccountWorker cart = session.getAttribute("shoppingCart") orderPartyId = cart.getPartyId() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckInits.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckInits.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckInits.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckInits.groovy Sat Oct 28 11:55:36 2017 @@ -17,18 +17,11 @@ * under the License. */ -import org.apache.ofbiz.service.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.party.party.PartyWorker +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.order.shoppingcart.ShoppingCart +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.party.contact.ContactHelper -import org.apache.ofbiz.product.catalog.CatalogWorker import org.apache.ofbiz.product.store.ProductStoreWorker -import org.apache.ofbiz.order.shoppingcart.product.ProductDisplayWorker -import org.apache.ofbiz.order.shoppingcart.product.ProductPromoWorker productStore = ProductStoreWorker.getProductStore(request) if (productStore) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutOptions.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutOptions.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutOptions.groovy Sat Oct 28 11:55:36 2017 @@ -17,13 +17,9 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.accounting.payment.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.store.* -import org.apache.ofbiz.order.shoppingcart.shipping.* +import org.apache.ofbiz.party.contact.ContactHelper; +import org.apache.ofbiz.product.store.ProductStoreWorker +import org.apache.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper; shoppingCart = session.getAttribute("shoppingCart") currencyUomId = shoppingCart.getCurrency() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutPayment.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,10 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.accounting.payment.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.store.* +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.accounting.payment.BillingAccountWorker +import org.apache.ofbiz.product.store.ProductStoreWorker cart = session.getAttribute("shoppingCart") currencyUomId = cart.getCurrency() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutReview.groovy Sat Oct 28 11:55:36 2017 @@ -18,15 +18,11 @@ */ import java.lang.* -import java.math.BigDecimal -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.accounting.payment.* -import org.apache.ofbiz.order.order.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.product.store.* +import org.apache.ofbiz.accounting.payment.PaymentWorker +import org.apache.ofbiz.order.order.OrderReadHelper +import org.apache.ofbiz.party.contact.ContactHelper +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents +import org.apache.ofbiz.product.store.ProductStoreWorker import org.apache.ofbiz.party.party.PartyWorker import org.apache.ofbiz.webapp.website.WebSiteWorker Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutShippingAddress.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutShippingAddress.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/CheckoutShippingAddress.groovy Sat Oct 28 11:55:36 2017 @@ -17,15 +17,8 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.store.* -import org.apache.ofbiz.entity.util.EntityUtil -import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.condition.EntityExpr -import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.party.contact.ContactHelper +import org.apache.ofbiz.product.store.ProductStoreWorker cart = session.getAttribute("shoppingCart") party = userLogin.getRelatedOne("Party", false) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OptionSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OptionSettings.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OptionSettings.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OptionSettings.groovy Sat Oct 28 11:55:36 2017 @@ -18,11 +18,8 @@ */ import java.sql.Timestamp -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.store.* +import org.apache.ofbiz.party.contact.ContactHelper +import org.apache.ofbiz.product.store.ProductStoreWorker cart = session.getAttribute("shoppingCart") context.cart = cart Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderAgreements.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderAgreements.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderAgreements.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderAgreements.groovy Sat Oct 28 11:55:36 2017 @@ -19,8 +19,7 @@ import org.apache.ofbiz.entity.condition.EntityCondition import org.apache.ofbiz.entity.condition.EntityOperator -import org.apache.ofbiz.entity.util.EntityUtil -import org.apache.ofbiz.order.shoppingcart.* +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.product.catalog.CatalogWorker Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderTerms.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderTerms.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderTerms.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/OrderTerms.groovy Sat Oct 28 11:55:36 2017 @@ -17,10 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.order.shoppingcart.* - +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents cart = ShoppingCartEvents.getCartObject(request) context.cart = cart Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetAdditionalParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetAdditionalParty.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetAdditionalParty.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetAdditionalParty.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,7 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.shoppingcart.* +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents shoppingCart = ShoppingCartEvents.getCartObject(request) orderType = shoppingCart.getOrderType() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetCheckOutTabBar.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetCheckOutTabBar.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetCheckOutTabBar.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/SetCheckOutTabBar.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,6 @@ * under the License. */ -import java.util.ArrayList -import org.apache.ofbiz.base.util.UtilMisc import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents checkoutSteps = [] Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShipSettings.groovy Sat Oct 28 11:55:36 2017 @@ -17,14 +17,9 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.catalog.* +import org.apache.ofbiz.party.contact.ContactHelper +import org.apache.ofbiz.party.contact.ContactMechWorker import org.apache.ofbiz.base.util.UtilValidate -import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.util.EntityUtil cart = session.getAttribute("shoppingCart") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShoppingList.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShoppingList.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShoppingList.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,6 @@ * under the License. */ -import org.apache.ofbiz.service.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.shoppingcart.* shoppingCart = session.getAttribute("shoppingCart") partyId = shoppingCart.getPartyId() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowCart.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowCart.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowCart.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowCart.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,8 @@ * under the License. */ -import org.apache.ofbiz.service.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* import org.apache.ofbiz.order.order.OrderReadHelper -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.party.party.PartyWorker +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.product.catalog.CatalogWorker productId = parameters.productId Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowPromoText.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowPromoText.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowPromoText.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/ShowPromoText.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,8 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc import org.apache.ofbiz.order.shoppingcart.product.ProductPromoWorker -import org.apache.ofbiz.order.shoppingcart.* +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents shoppingCart = ShoppingCartEvents.getCartObject(request) mode = shoppingCart.getOrderType() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/StorePaymentOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/StorePaymentOptions.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/StorePaymentOptions.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/StorePaymentOptions.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.product.store.* +import org.apache.ofbiz.product.store.ProductStoreWorker productStore = ProductStoreWorker.getProductStore(request) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy Sat Oct 28 11:55:36 2017 @@ -17,11 +17,9 @@ * under the License. */ -import org.apache.ofbiz.entity.condition.EntityExpr import org.apache.ofbiz.entity.condition.EntityFunction import org.apache.ofbiz.entity.condition.EntityOperator import org.apache.ofbiz.entity.condition.EntityFieldValue -import org.apache.ofbiz.entity.condition.EntityConditionList import org.apache.ofbiz.entity.condition.EntityCondition productId = request.getParameter("productId") ?: "" Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,10 @@ * under the License. */ -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.EntityUtil -import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityFunction +import org.apache.ofbiz.entity.condition.EntityFieldValue +import org.apache.ofbiz.entity.condition.EntityOperator import org.apache.ofbiz.order.shoppingcart.ShoppingCart import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.order.order.OrderReadHelper Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/ShowPromotionDetails.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/ShowPromotionDetails.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/ShowPromotionDetails.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/cart/ShowPromotionDetails.groovy Sat Oct 28 11:55:36 2017 @@ -17,7 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.* import org.apache.ofbiz.entity.util.EntityUtil import org.apache.ofbiz.order.shoppingcart.product.ProductPromoWorker Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy Sat Oct 28 11:55:36 2017 @@ -22,10 +22,9 @@ * should not contain order component's specific code. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.feature.* -import org.apache.ofbiz.product.product.* +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.feature.ParametricSearch +import org.apache.ofbiz.product.product.ProductSearchSession import org.apache.ofbiz.entity.condition.EntityCondition import org.apache.ofbiz.entity.condition.EntityOperator Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Category.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Category.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Category.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Category.groovy Sat Oct 28 11:55:36 2017 @@ -22,10 +22,7 @@ * should not contain order component's specific code. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.category.CategoryWorker +import org.apache.ofbiz.product.catalog.CatalogWorker import org.apache.ofbiz.product.category.CategoryContentWrapper import org.apache.ofbiz.product.store.ProductStoreWorker Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy Sat Oct 28 11:55:36 2017 @@ -21,13 +21,9 @@ * NOTE: This script is also referenced by the webpos and ecommerce's screens and * should not contain order component's specific code. */ - -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.service.* -import org.apache.ofbiz.product.catalog.* +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.product.catalog.CatalogWorker import org.apache.ofbiz.product.category.CategoryContentWrapper import org.apache.ofbiz.product.store.ProductStoreWorker Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ChooseCatalog.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ChooseCatalog.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ChooseCatalog.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ChooseCatalog.groovy Sat Oct 28 11:55:36 2017 @@ -17,11 +17,8 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.product.store.ProductStoreWorker +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents catalogCol = null currentCatalogId = null Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CompareProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CompareProducts.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CompareProducts.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CompareProducts.groovy Sat Oct 28 11:55:36 2017 @@ -17,13 +17,14 @@ * under the License. */ -import org.apache.ofbiz.product.product.* -import org.apache.ofbiz.order.shoppingcart.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.store.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.product.product.ProductEvents +import org.apache.ofbiz.product.product.ProductContentWrapper; +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.store.ProductStoreWorker +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil compareList = ProductEvents.getProductCompareList(request) context.compareList = compareList Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy Sat Oct 28 11:55:36 2017 @@ -20,22 +20,14 @@ import java.lang.* import java.util.* import java.text.NumberFormat -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.service.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* +import org.apache.ofbiz.base.util.UtilMisc import org.apache.ofbiz.webapp.taglib.ContentUrlTag -import org.apache.ofbiz.webapp.stats.VisitHandler import org.apache.ofbiz.webapp.website.WebSiteWorker import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.category.* +import org.apache.ofbiz.product.catalog.CatalogWorker import org.apache.ofbiz.product.product.ProductWorker import org.apache.ofbiz.product.product.ProductContentWrapper -import org.apache.ofbiz.product.product.ProductSearch -import org.apache.ofbiz.product.product.ProductSearchSession -import org.apache.ofbiz.product.store.* +import org.apache.ofbiz.product.store.ProductStoreWorker; inlineProductId = request.getAttribute("inlineProductId") inlineCounter = request.getAttribute("inlineCounter") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy Sat Oct 28 11:55:36 2017 @@ -22,10 +22,8 @@ * should not contain order component's specific code. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.feature.* -import org.apache.ofbiz.product.product.* +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.product.ProductSearchSession module = "KeywordSearch.groovy" Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy Sat Oct 28 11:55:36 2017 @@ -22,7 +22,7 @@ * should not contain order component's specific code. */ -import org.apache.ofbiz.product.catalog.* +import org.apache.ofbiz.product.catalog.CatalogWorker currentCatalogId = CatalogWorker.getCurrentCatalogId(request) searchCategoryId = CatalogWorker.getCatalogSearchCategoryId(request, currentCatalogId) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/PrepareConfigForm.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/PrepareConfigForm.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/PrepareConfigForm.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/PrepareConfigForm.groovy Sat Oct 28 11:55:36 2017 @@ -25,7 +25,6 @@ import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.product.config.ProductConfigWorker import org.apache.ofbiz.product.store.ProductStoreWorker -import org.apache.ofbiz.base.util.* currencyUomId = ShoppingCartEvents.getCartObject(request).getCurrency() product = context.product Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Product.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Product.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Product.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/Product.groovy Sat Oct 28 11:55:36 2017 @@ -19,11 +19,12 @@ import java.lang.* import java.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.service.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.category.* +import org.apache.ofbiz.base.util.StringUtil +import org.apache.ofbiz.base.util.UtilHttp +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.category.CategoryWorker +import org.apache.ofbiz.product.category.CategoryContentWrapper import org.apache.ofbiz.product.product.ProductWorker import org.apache.ofbiz.product.product.ProductContentWrapper import org.apache.ofbiz.entity.util.EntityUtil Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy Sat Oct 28 11:55:36 2017 @@ -22,21 +22,24 @@ * should not contain order component's specific code. */ -import java.text.NumberFormat -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.service.* +import org.apache.ofbiz.base.util.UtilHttp +import org.apache.ofbiz.base.util.UtilDateTime +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.base.util.UtilFormatOut; +import org.apache.ofbiz.base.util.UtilValidate +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.entity.util.EntityTypeUtil +import org.apache.ofbiz.entity.util.EntityUtilProperties +import org.apache.ofbiz.service.ServiceUtil import org.apache.ofbiz.webapp.taglib.ContentUrlTag import org.apache.ofbiz.product.product.ProductContentWrapper -import org.apache.ofbiz.product.product.ProductSearch -import org.apache.ofbiz.product.product.ProductSearchSession import org.apache.ofbiz.product.product.ProductWorker -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.store.* -import org.apache.ofbiz.webapp.stats.VisitHandler +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.store.ProductStoreWorker +import org.apache.ofbiz.product.store.ProductStoreSurveyWrapper import org.apache.ofbiz.webapp.website.WebSiteWorker import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.order.shoppingcart.ShoppingCart Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy Sat Oct 28 11:55:36 2017 @@ -22,15 +22,14 @@ * should not contain order component's specific code. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.base.util.UtilProperties import org.apache.ofbiz.entity.util.EntityQuery -import org.apache.ofbiz.service.* import org.apache.ofbiz.product.product.ProductContentWrapper import org.apache.ofbiz.product.config.ProductConfigWorker -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.store.* -import org.apache.ofbiz.order.shoppingcart.* +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.store.ProductStoreWorker +import org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents import org.apache.ofbiz.product.product.ProductWorker import org.apache.ofbiz.webapp.website.WebSiteWorker import java.text.NumberFormat Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.* - product = from("Product").where("productId", parameters.productId).queryOne() if (product) { productVirtualVariants = from("ProductAssoc").where("productIdTo", product.productId , "productAssocTypeId", "ALTERNATIVE_PACKAGE").cache(true).queryList() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/QuickAdd.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/QuickAdd.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/QuickAdd.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/QuickAdd.groovy Sat Oct 28 11:55:36 2017 @@ -24,10 +24,7 @@ import java.lang.* import java.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.service.* -import org.apache.ofbiz.product.catalog.* +import org.apache.ofbiz.product.catalog.CatalogWorker currentCatalogId = CatalogWorker.getCurrentCatalogId(request) categoryId = parameters.category_id ?: CatalogWorker.getCatalogQuickaddCategoryPrimary(request) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/SideDeepCategory.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/SideDeepCategory.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/SideDeepCategory.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/SideDeepCategory.groovy Sat Oct 28 11:55:36 2017 @@ -22,9 +22,8 @@ * should not contain order component's specific code. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.product.catalog.* -import org.apache.ofbiz.product.category.* +import org.apache.ofbiz.product.catalog.CatalogWorker +import org.apache.ofbiz.product.category.CategoryWorker CategoryWorker.getRelatedCategories(request, "topLevelList", CatalogWorker.getCatalogTopCategoryId(request, CatalogWorker.getCurrentCatalogId(request)), true) curCategoryId = parameters.category_id ?: parameters.CATEGORY_ID ?: "" Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/CompanyHeader.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/CompanyHeader.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/CompanyHeader.groovy Sat Oct 28 11:55:36 2017 @@ -21,12 +21,8 @@ // parameters or use orderId, invoiceId, or returnId to look them up. // if none of these parameters are available then fromPartyId is used or "ORGANIZATION_PARTY" from general.properties as fallback -import java.sql.Timestamp - -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.party.contact.* +import org.apache.ofbiz.base.util.UtilHttp +import org.apache.ofbiz.entity.util.EntityUtil import org.apache.ofbiz.order.order.OrderReadHelper import org.apache.ofbiz.party.content.PartyContentWrapper import org.apache.ofbiz.entity.util.EntityUtilProperties Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FilterOrderList.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FilterOrderList.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FilterOrderList.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FilterOrderList.groovy Sat Oct 28 11:55:36 2017 @@ -18,8 +18,6 @@ */ import java.math.BigDecimal -import org.apache.ofbiz.base.util.UtilValidate -import org.apache.ofbiz.entity.GenericValue import org.apache.ofbiz.order.order.OrderReadHelper import org.apache.ofbiz.product.store.ProductStoreWorker import org.apache.ofbiz.order.order.OrderListState Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy Sat Oct 28 11:55:36 2017 @@ -19,9 +19,6 @@ import java.util.* import java.sql.Timestamp -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.util.* module = "FindOrders.groovy" Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* - orderId = request.getParameter("orderId") orderTypeId = null orderHeader = from("OrderHeader").where("orderId", orderId).queryOne() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderList.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderList.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderList.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderList.groovy Sat Oct 28 11:55:36 2017 @@ -17,10 +17,8 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.entity.condition.* +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator import org.apache.ofbiz.order.order.OrderListState partyId = request.getParameter("partyId") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderStats.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderStats.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderStats.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderStats.groovy Sat Oct 28 11:55:36 2017 @@ -18,12 +18,10 @@ */ import java.math.BigDecimal -import java.util.* -import java.sql.Timestamp -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.base.util.UtilDateTime BigDecimal calcItemTotal(List headers) { BigDecimal total = BigDecimal.ZERO Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy Sat Oct 28 11:55:36 2017 @@ -20,17 +20,19 @@ import java.math.BigDecimal import java.util.* import java.sql.Timestamp -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.base.util.collections.* -import org.apache.ofbiz.order.order.* -import org.apache.ofbiz.party.contact.* +import org.apache.ofbiz.entity.GenericValue +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.base.util.UtilMisc +import org.apache.ofbiz.base.util.UtilValidate +import org.apache.ofbiz.order.order.OrderReadHelper +import org.apache.ofbiz.party.contact.ContactMechWorker +import org.apache.ofbiz.party.contact.ContactHelper import org.apache.ofbiz.product.inventory.InventoryWorker import org.apache.ofbiz.product.catalog.CatalogWorker import org.apache.ofbiz.product.store.ProductStoreWorker -import org.apache.ofbiz.accounting.payment.* +import org.apache.ofbiz.accounting.payment.PaymentWorker orderId = parameters.orderId context.orderId = orderId Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderViewWebSecure.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderViewWebSecure.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderViewWebSecure.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderViewWebSecure.groovy Sat Oct 28 11:55:36 2017 @@ -17,10 +17,7 @@ * under the License. */ -import java.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.base.util.collections.* -import org.apache.ofbiz.order.order.* +import org.apache.ofbiz.order.order.OrderContentWrapper orderHeader = context.orderHeader Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ReceivePayment.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ReceivePayment.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ReceivePayment.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ReceivePayment.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,8 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator orderId = request.getParameter("orderId") paymentMethodTypes = from("PaymentMethodType").where(EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.NOT_EQUAL, "EXT_OFFLINE")).queryList() Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/SendConfirmationEmail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/SendConfirmationEmail.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/SendConfirmationEmail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/SendConfirmationEmail.groovy Sat Oct 28 11:55:36 2017 @@ -16,10 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.entity.Delegator -import org.apache.ofbiz.entity.GenericValue -import org.apache.ofbiz.order.order.OrderReadHelper import org.apache.ofbiz.common.email.NotificationServices orderId = request.getParameter("orderId") ?: parameters.get("orderId") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ShipGroups.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ShipGroups.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ShipGroups.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ShipGroups.groovy Sat Oct 28 11:55:36 2017 @@ -17,7 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc import org.apache.ofbiz.entity.util.EntityTypeUtil import org.apache.ofbiz.entity.util.EntityUtil Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ViewImage.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ViewImage.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ViewImage.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/ViewImage.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.order.* +import org.apache.ofbiz.order.order.OrderContentWrapper orderId = request.getParameter("orderId") orderItemSeqId = request.getParameter("orderItemSeqId") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ManageQuotePrices.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ManageQuotePrices.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ManageQuotePrices.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ManageQuotePrices.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.base.util.Debug costMult = 0.0 quoteCoefficients.each { quoteCoefficient -> Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ViewQuoteProfit.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ViewQuoteProfit.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ViewQuoteProfit.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/quote/ViewQuoteProfit.groovy Sat Oct 28 11:55:36 2017 @@ -17,11 +17,6 @@ * under the License. */ -import java.util.Date -import java.sql.Timestamp -import org.apache.ofbiz.base.util.UtilDateTime -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.entity.util.EntityUtil import org.apache.ofbiz.base.util.Debug costMult = 0.0 Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/reports/OpenOrderItemsReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/reports/OpenOrderItemsReport.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/reports/OpenOrderItemsReport.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/reports/OpenOrderItemsReport.groovy Sat Oct 28 11:55:36 2017 @@ -23,11 +23,11 @@ */ -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator +import org.apache.ofbiz.entity.GenericEntityException +import org.apache.ofbiz.base.util.Debug +import org.apache.ofbiz.base.util.ObjectType module = "OpenOrderItemsReport.groovy" productStoreId = ObjectType.simpleTypeConvert(parameters.productStoreId, "List", null, null) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/GetNextSequenceNum.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/GetNextSequenceNum.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/GetNextSequenceNum.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/GetNextSequenceNum.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc import org.apache.ofbiz.entity.util.EntityUtil -import org.apache.ofbiz.entity.GenericValue long nextSequenceNum = 10 if (!custRequestItem && custRequest) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/RequestItemNotes.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/RequestItemNotes.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/RequestItemNotes.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/RequestItemNotes.groovy Sat Oct 28 11:55:36 2017 @@ -17,9 +17,6 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* - custRequestId = parameters.custRequestId custRequestItemSeqId = parameters.custRequestItemSeqId showAll = parameters.showAll ?: "false" Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/SetRequestQuote.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/SetRequestQuote.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/SetRequestQuote.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/request/SetRequestQuote.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,6 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.entity.util.EntityUtil custRequestId = parameters.custRequestId if (custRequestId) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy Sat Oct 28 11:55:36 2017 @@ -24,10 +24,9 @@ // view entitities chained together, RequirementByPartyCount and // ProductRequirementCount (see order entitymodel_view.xml). -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.entity.condition.* +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator conditions = EntityCondition.makeCondition([ EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "SUPPLIER"), Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/requirement/SelectCreatedProposed.groovy Sat Oct 28 11:55:36 2017 @@ -17,11 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.UtilMisc -import org.apache.ofbiz.base.util.UtilValidate import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.condition.EntityConditionList -import org.apache.ofbiz.entity.condition.EntityExpr import org.apache.ofbiz.entity.condition.EntityOperator prepare = runService('prepareFind', [inputFields : parameters, entityName : "Requirement"]) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/QuickReturn.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/QuickReturn.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/QuickReturn.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/QuickReturn.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,9 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.order.order.* -import org.apache.ofbiz.party.contact.* -import org.apache.ofbiz.product.store.* +import org.apache.ofbiz.order.order.OrderReadHelper +import org.apache.ofbiz.party.contact.ContactHelper +import org.apache.ofbiz.product.store.ProductStoreWorker orderId = parameters.orderId context.orderId = orderId Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnHeader.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnHeader.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnHeader.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,9 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.condition.EntityOperator -import org.apache.ofbiz.party.contact.* +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.party.contact.ContactHelper +import org.apache.ofbiz.party.contact.ContactMechWorker if (parameters.userLogin) { userLogin = parameters.userLogin Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnItems.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnItems.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnItems.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/return/ReturnItems.groovy Sat Oct 28 11:55:36 2017 @@ -17,12 +17,7 @@ * under the License. */ -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.condition.EntityCondition -import org.apache.ofbiz.entity.util.EntityFindOptions import org.apache.ofbiz.order.order.OrderReadHelper -import java.math.BigDecimal returnId = parameters.returnId if (!returnId) return Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/setup/PaymentSetup.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/setup/PaymentSetup.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/setup/PaymentSetup.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/setup/PaymentSetup.groovy Sat Oct 28 11:55:36 2017 @@ -17,8 +17,7 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.base.util.UtilHttp paymentSetup = from("WebSitePaymentSettingView").orderBy("webSiteId", "paymentMethodTypeId").queryList() context.paymentSetups = paymentSetup Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/task/OrderTaskList.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/task/OrderTaskList.groovy?rev=1813612&r1=1813611&r2=1813612&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/task/OrderTaskList.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/task/OrderTaskList.groovy Sat Oct 28 11:55:36 2017 @@ -17,11 +17,9 @@ * under the License. */ -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.order.task.* +import org.apache.ofbiz.entity.util.EntityUtil +import org.apache.ofbiz.entity.condition.EntityCondition +import org.apache.ofbiz.entity.condition.EntityOperator context.userLogin = userLogin |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |