Copied: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy (from r680051, ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?p2=ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy&p1=ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh&r1=680051&r2=680085&rev=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy Sun Jul 27 03:13:23 2008 @@ -30,9 +30,6 @@ import org.ofbiz.product.store.*; import org.ofbiz.service.calendar.*; -delegator = request.getAttribute("delegator"); -dispatcher = request.getAttribute("dispatcher"); -userLogin = session.getAttribute("userLogin"); party = userLogin.getRelatedOne("Party"); cart = ShoppingCartEvents.getCartObject(request); @@ -42,192 +39,173 @@ prodCatalogId = CatalogWorker.getCurrentCatalogId(request); webSiteId = CatalogWorker.getWebSiteId(request); -context.put("productStoreId", productStoreId); -context.put("currencyUomId", currencyUomId); +context.productStoreId = productStoreId; +context.currencyUomId = currencyUomId; // get the top level shopping lists for the logged in user -exprList = UtilMisc.toList(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, userLogin.getString("partyId")), - EntityCondition.makeCondition("listName", EntityOperator.NOT_EQUAL, "auto-save")); +exprList = [EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, userLogin.partyId), + EntityCondition.makeCondition("listName", EntityOperator.NOT_EQUAL, "auto-save")]; condition = EntityCondition.makeCondition(exprList, EntityOperator.AND); -allShoppingLists = delegator.findList("ShoppingList", condition, null, UtilMisc.toList("listName"), null, false); -shoppingLists = EntityUtil.filterByAnd(allShoppingLists, UtilMisc.toMap("parentShoppingListId", null)); -context.put("allShoppingLists", allShoppingLists); -context.put("shoppingLists", shoppingLists); +allShoppingLists = delegator.findList("ShoppingList", condition, null, ["listName"], null, false); +shoppingLists = EntityUtil.filterByAnd(allShoppingLists, [parentShoppingListId : null]); +context.allShoppingLists = allShoppingLists; +context.shoppingLists = shoppingLists; // get all shoppingListTypes -shoppingListTypes = delegator.findList("ShoppingListType", null, null, UtilMisc.toList("description"), null, true); -context.put("shoppingListTypes", shoppingListTypes); +shoppingListTypes = delegator.findList("ShoppingListType", null, null, ["description"], null, true); +context.shoppingListTypes = shoppingListTypes; // get the shoppingListId for this reqest parameterMap = UtilHttp.getParameterMap(request); -shoppingListId = parameterMap.get("shoppingListId"); -if (shoppingListId == null || shoppingListId.equals("")) - shoppingListId = request.getAttribute("shoppingListId"); +shoppingListId = parameterMap.shoppingListId ?: request.getAttribute("shoppingListId") ?: session.getAttribute("currentShoppingListId"); // no passed shopping list id default to first list -if (shoppingListId == null || shoppingListId.length() == 0) { - shoppingListId = session.getAttribute("currentShoppingListId"); - if (shoppingListId == null || shoppingListId.length() == 0) { - firstList = EntityUtil.getFirst(shoppingLists); - if (firstList != null) { - shoppingListId = firstList.getString("shoppingListId"); - } +if (!shoppingListId) { + firstList = EntityUtil.getFirst(shoppingLists); + if (firstList) { + shoppingListId = firstList.shoppingListId; } } session.setAttribute("currentShoppingListId", shoppingListId); // if we passed a shoppingListId get the shopping list info -if (shoppingListId != null) { - shoppingList = delegator.findByPrimaryKey("ShoppingList", UtilMisc.toMap("shoppingListId", shoppingListId)); - context.put("shoppingList", shoppingList); +if (shoppingListId) { + shoppingList = delegator.findByPrimaryKey("ShoppingList", [shoppingListId : shoppingListId]); + context.shoppingList = shoppingList; - if (shoppingList != null) { + if (shoppingList) { shoppingListItemTotal = 0.0; shoppingListChildTotal = 0.0; shoppingListItems = shoppingList.getRelatedCache("ShoppingListItem"); - if (shoppingListItems != null) { + if (shoppingListItems) { shoppingListItemDatas = new ArrayList(shoppingListItems.size()); - shoppingListItemIter = shoppingListItems.iterator(); - while (shoppingListItemIter.hasNext()) { - shoppingListItem = shoppingListItemIter.next(); - shoppingListItemData = new HashMap(); + shoppingListItems.each { shoppingListItem -> + shoppingListItemData = [:]; product = shoppingListItem.getRelatedOneCache("Product"); - calcPriceInMap = UtilMisc.toMap("product", product, "quantity", shoppingListItem.get("quantity"), "currencyUomId", currencyUomId, "userLogin", userLogin); - calcPriceInMap.put("webSiteId", webSiteId); - calcPriceInMap.put("prodCatalogId", prodCatalogId); - calcPriceInMap.put("productStoreId", productStoreId); + calcPriceInMap = [product : product, quantity : shoppingListItem.quantity, currencyUomId : currencyUomId, userLogin : userLogin]); + calcPriceInMap.webSiteId = webSiteId; + calcPriceInMap.prodCatalogId = prodCatalogId; + calcPriceInMap.productStoreId = productStoreId; calcPriceOutMap = dispatcher.runSync("calculateProductPrice", calcPriceInMap); - price = calcPriceOutMap.get("price"); - totalPrice = price * shoppingListItem.getDouble("quantity"); + price = calcPriceOutMap.price; + totalPrice = price * shoppingListItem.quantity; // similar code at ShoppingCartItem.java getRentalAdjustment - if ("ASSET_USAGE".equals(product.getString("productTypeId"))) { - persons = shoppingListItem.getDouble("reservPersons"); - if (UtilValidate.isNotEmpty(product.get("reservNthPPPerc"))) { - reservNthPPPerc = product.get("reservNthPPPerc").doubleValue(); - } - if (UtilValidate.isNotEmpty(product.get("reserv2ndPPPerc"))) { - reserv2ndPPPerc = product.get("reserv2ndPPPerc").doubleValue(); - } - if (persons == null) persons = 0; + if ("ASSET_USAGE".equals(product.productTypeId)) { + persons = shoppingListItem.reservPersons ?: 0; + reservNthPPPerc = product.reservNthPPPerc ?: 0; + reserv2ndPPPerc = product.reserv2ndPPPerc ?: 0; rentalValue = 0; - if (persons > 1) { + if (persons) { if (persons > 2) { persons -= 2; - if(reservNthPPPerc != null && reservNthPPPerc > 0) + if (reservNthPPPerc) { rentalValue = persons * reservNthPPPerc; - else if (reserv2ndPPPerc != null && reserv2ndPPPerc > 0) + } else if (reserv2ndPPPerc) { rentalValue = persons * reserv2ndPPPerc; + } persons = 2; } if (persons == 2) { - if (reserv2ndPPPerc != null && reserv2ndPPPerc > 0) + if (reserv2ndPPPerc) { rentalValue += reserv2ndPPPerc; - else if(reservNthPPPerc != null && reservNthPPPerc > 0) + } else if (reservNthPPPerc) { rentalValue = persons * reservNthPPPerc; + } } } rentalValue += 100; // add final 100 percent for first person - reservLength = 0; - if (shoppingListItem.get("reservLength") != null) - reservLength = shoppingListItem.getDouble("reservLength").doubleValue(); + reservLength = shoppingListItem.reservLength ?: 0; totalPrice *= (rentalValue/100 * reservLength); } shoppingListItemTotal += totalPrice; - + productVariantAssocs = null; - if ("Y".equals(product.getString("isVirtual"))) { - productVariantAssocs = product.getRelatedCache("MainProductAssoc", UtilMisc.toMap("productAssocTypeId", "PRODUCT_VARIANT"), UtilMisc.toList("sequenceNum")); + if ("Y".equals(product.isVirtual)) { + productVariantAssocs = product.getRelatedCache("MainProductAssoc", [productAssocTypeId : "PRODUCT_VARIANT"], ["sequenceNum"]); productVariantAssocs = EntityUtil.filterByDate(productVariantAssocs); } - shoppingListItemData.put("shoppingListItem", shoppingListItem); - shoppingListItemData.put("product", product); - shoppingListItemData.put("unitPrice", price); - shoppingListItemData.put("totalPrice", totalPrice); - shoppingListItemData.put("productVariantAssocs", productVariantAssocs); + shoppingListItemData.shoppingListItem = shoppingListItem; + shoppingListItemData.product = product; + shoppingListItemData.unitPrice = price; + shoppingListItemData.totalPrice = totalPrice; + shoppingListItemData.productVariantAssocs = productVariantAssocs; shoppingListItemDatas.add(shoppingListItemData); } - context.put("shoppingListItemDatas", shoppingListItemDatas); + context.shoppingListItemDatas = shoppingListItemDatas; } - + shoppingListType = shoppingList.getRelatedOne("ShoppingListType"); - context.put("shoppingListType", shoppingListType); + context.shoppingListType = shoppingListType; // get the child shopping lists of the current list for the logged in user - childShoppingLists = delegator.findByAndCache("ShoppingList", UtilMisc.toMap("partyId", userLogin.getString("partyId"), "parentShoppingListId", shoppingListId), UtilMisc.toList("listName")); + childShoppingLists = delegator.findByAndCache("ShoppingList", [partyId : userLogin.partyId, parentShoppingListId : shoppingListId], ["listName"]); // now get prices for each child shopping list... - if (childShoppingLists != null) { + if (childShoppingLists) { childShoppingListDatas = new ArrayList(childShoppingLists.size()); - childShoppingListIter = childShoppingLists.iterator(); - while (childShoppingListIter.hasNext()) { - childShoppingList = childShoppingListIter.next(); - childShoppingListData = new HashMap(); + childShoppingLists.each { childShoppingList -> + childShoppingListData = [:]; - calcListPriceInMap = UtilMisc.toMap("shoppingListId", childShoppingList.get("shoppingListId"), "prodCatalogId", prodCatalogId, "webSiteId", webSiteId, "userLogin", userLogin, "currencyUomId", currencyUomId); + calcListPriceInMap = [shoppingListId : childShoppingList.shoppingListId, prodCatalogId : prodCatalogId, webSiteId : webSiteId, userLogin : userLogin, currencyUomId : currencyUomId; childShoppingListPriceMap = dispatcher.runSync("calculateShoppingListDeepTotalPrice", calcListPriceInMap); - totalPrice = childShoppingListPriceMap.get("totalPrice"); + totalPrice = childShoppingListPriceMap.totalPrice; shoppingListChildTotal += totalPrice; - childShoppingListData.put("childShoppingList", childShoppingList); - childShoppingListData.put("totalPrice", totalPrice); + childShoppingListData.childShoppingList = childShoppingList; + childShoppingListData.totalPrice = totalPrice; childShoppingListDatas.add(childShoppingListData); } - context.put("childShoppingListDatas", childShoppingListDatas); + context.childShoppingListDatas = childShoppingListDatas; } - context.put("shoppingListTotalPrice", shoppingListItemTotal + shoppingListChildTotal); - context.put("shoppingListItemTotal", shoppingListItemTotal); - context.put("shoppingListChildTotal", shoppingListChildTotal); + context.shoppingListTotalPrice = shoppingListItemTotal + shoppingListChildTotal; + context.shoppingListItemTotal = shoppingListItemTotal; + context.shoppingListChildTotal = shoppingListChildTotal; // get the parent shopping list if there is one parentShoppingList = shoppingList.getRelatedOne("ParentShoppingList"); - context.put("parentShoppingList", parentShoppingList); + context.parentShoppingList = parentShoppingList; - if (userLogin.getString("partyId").equals(shoppingList.getString("partyId"))) { - context.put("canView", Boolean.TRUE); - } else { - context.put("canView", Boolean.FALSE); - } + context.canView = userLogin.partyId.equals(shoppingList.partyId); // auto-reorder info - if (shoppingListType != null && "SLT_AUTO_REODR".equals(shoppingListType.getString("shoppingListTypeId"))) { + if ("SLT_AUTO_REODR".equals(shoppingListType?.shoppingListTypeId)) { recurrenceVo = shoppingList.getRelatedOne("RecurrenceInfo"); - context.put("recurrenceInfo", recurrenceVo); + context.recurrenceInfo = recurrenceVo; - if (userLogin.getString("partyId").equals(shoppingList.getString("partyId"))) { - listCart = ShoppingListServices.makeShoppingListCart(dispatcher, shoppingListId, UtilHttp.getLocale(request)); + if (userLogin.partyId.equals(shoppingList.partyId)) { + listCart = ShoppingListServices.makeShoppingListCart(dispatcher, shoppingListId, locale); // get customer's shipping & payment info - context.put("chosenShippingMethod", shoppingList.getString("shipmentMethodTypeId") + "@" + shoppingList.getString("carrierPartyId")); - context.put("shippingContactMechList", ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false)); - context.put("paymentMethodList", EntityUtil.filterByDate(party.getRelated("PaymentMethod", null, UtilMisc.toList("paymentMethodTypeId")), true)); + context.chosenShippingMethod = shoppingList.shipmentMethodTypeId + "@" + shoppingList.carrierPartyId; + context.shippingContactMechList = ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); + context.paymentMethodList = EntityUtil.filterByDate(party.getRelated("PaymentMethod", null, ["paymentMethodTypeId"])); - shipAddress = delegator.findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shoppingList.get("contactMechId"))); + shipAddress = delegator.findByPrimaryKey("PostalAddress", ["contactMechId", shoppingList.contactMechId]); Debug.log("SL - address : " + shipAddress); - if (shipAddress != null) { - listCart = ShoppingListServices.makeShoppingListCart(dispatcher, shoppingListId, UtilHttp.getLocale(request)); - if (listCart != null) { + if (shipAddress) { + listCart = ShoppingListServices.makeShoppingListCart(dispatcher, shoppingListId, locale); + if (listCart) { shippingEstWpr = new ShippingEstimateWrapper(dispatcher, listCart, 0); carrierShipMeths = shippingEstWpr.getShippingMethods(); - context.put("listCart", listCart); - context.put("shippingEstWpr", shippingEstWpr); - context.put("carrierShipMethods", carrierShipMeths); + context.listCart = listCart; + context.shippingEstWpr = shippingEstWpr; + context.carrierShipMethods = carrierShipMeths; } } - if (recurrenceVo != null) { - RecurrenceInfo recInfo = new RecurrenceInfo(recurrenceVo); - context.put("recInfo", recInfo); - lastSlOrderDate = shoppingList.get("lastOrderedDate"); - context.put("lastSlOrderDate", lastSlOrderDate); - if (lastSlOrderDate == null) { - lastSlOrderDate = recurrenceVo.get("startDateTime"); + if (recurrenceVo) { + recInfo = new RecurrenceInfo(recurrenceVo); + context.recInfo = recInfo; + lastSlOrderDate = shoppingList.lastOrderedDate; + context.lastSlOrderDate = lastSlOrderDate; + if (!lastSlOrderDate) { + lastSlOrderDate = recurrenceVo.startDateTime; } - context.put("lastSlOrderTime", lastSlOrderDate.getTime()); + context.lastSlOrderTime = lastSlOrderDate.getTime(); } } } } } -
Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Sun Jul 27 03:13:23 2008 @@ -217,7 +217,7 @@ <set field="headerItem" value="main"/> <set field="randomSurveyGroup" value="testSurveyGroup"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/Main.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/> </actions> <widgets> @@ -236,7 +236,7 @@ <actions> <set field="titleProperty" value="PageTitleLogin"/> <set field="headerItem" value="login"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/Login.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -254,7 +254,7 @@ <actions> <set field="titleProperty" value="PageTitleLogin"/> <set field="headerItem" value="login"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/Login.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml Sun Jul 27 03:13:23 2008 @@ -72,7 +72,7 @@ <set field="titleProperty" value="PageTitleContentPage"/> <set field="headerItem" value="main"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/Main.groovy"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/content/ContentPrep.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml Sun Jul 27 03:13:23 2008 @@ -81,8 +81,8 @@ <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction orderstatus.bsh to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/OrderNoticeEmail.ftl"/></html></platform-specific> @@ -101,7 +101,7 @@ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderCompleteNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/OrderNoticeEmail.ftl"/></html></platform-specific> @@ -113,8 +113,8 @@ <actions> <set field="title" value="${uiLabelMap.PageTitleOrderBackorderNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction orderstatus.bsh to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/OrderNoticeEmail.ftl"/></html></platform-specific> @@ -126,8 +126,8 @@ <actions> <set field="title" value="${uiLabelMap.PageTitleOrderChangeNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction orderstatus.bsh to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/OrderNoticeEmail.ftl"/></html></platform-specific> @@ -140,7 +140,7 @@ <actions> <set field="title" value="${uiLabelMap.PageTitleOrderPaymentRetryNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/emailpayretry.ftl"/></html></platform-specific> @@ -154,7 +154,7 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleShipmentCompleteNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipmentstatus.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/ShipmentNotificationEmail.ftl"/></html></platform-specific> Modified: ofbiz/trunk/applications/ecommerce/widget/EmailReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailReturnScreens.xml?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/EmailReturnScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/EmailReturnScreens.xml Sun Jul 27 03:13:23 2008 @@ -26,7 +26,7 @@ <actions> <!-- <set field="title" value="Order Confirmation Notice"/> --> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> - <!-- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> --> + <!-- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> --> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/templates/email/returnaccept.ftl"/></html></platform-specific> Modified: ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Sun Jul 27 03:13:23 2008 @@ -117,7 +117,7 @@ <set field="parameters.formNameValue" value="shipsetupform" global="true"/> <set field="titleProperty" value="PageTitleShippingInformation"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy"/> </actions> <widgets> <decorator-screen name="anonymousCheckoutDecorator"> @@ -137,7 +137,7 @@ <set field="parameters.formNameValue" value="optsetupform" global="true"/> <set field="titleProperty" value="PageTitleShippingOptions"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/optionsettings.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OptionSettings.groovy"/> </actions> <widgets> <decorator-screen name="anonymousCheckoutDecorator"> @@ -157,7 +157,7 @@ <set field="parameters.formNameValue" value="paymentoptions" global="true"/> <set field="titleProperty" value="PageTitleBillingInformation"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/paymentoptions.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentOptions.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/> </actions> <widgets> @@ -178,7 +178,7 @@ <set field="parameters.formNameValue" value="billsetupform"/> <set field="titleProperty" value="PageTitleBillingInformation"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/paymentinformation.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/> </actions> <widgets> @@ -310,7 +310,7 @@ <section> <actions> <set field="titleProperty" value="PageTitleSplitItemsForShipping"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/splitship.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -343,7 +343,7 @@ <section> <actions> <set field="titleProperty" value="PageTitleOrderSummary"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -362,7 +362,7 @@ <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleOrderHistory"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderhistory.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -382,7 +382,7 @@ <set field="maySelectItems" value="Y"/> <set field="titleProperty" value="PageTitleOrderStatus"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -401,7 +401,7 @@ <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleRequestReturn"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -427,7 +427,7 @@ <screen name="quickAnonCheckoutLinks"> <section> <actions> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCheckoutLinks.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl"/></html></platform-specific> @@ -440,7 +440,7 @@ <actions> <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/> <set field="requireDojo" value="true"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCheckoutLinks.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCheckoutLinks.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -466,7 +466,7 @@ <set field="titleProperty" value="PageTitleShippingInformation"/> <set field="layoutSettings.javaScripts[+0]" value="/ecommerce/images/quickAnonCustSettings.js" global="true"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonCustSettings.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy"/> </actions> <widgets> <decorator-screen name="quickAnonCheckoutDecorator"> @@ -491,7 +491,7 @@ <!--set field="parameters.formNameValue" value="quickAnonOptSetupForm" global="true"/--> <set field="titleProperty" value="PageTitleShippingOptions"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonOptionSettings.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl"/></html></platform-specific> @@ -503,7 +503,7 @@ <section> <actions> <set field="titleProperty" value="PageTitleBillingInformation"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/> </actions> <widgets> @@ -540,7 +540,7 @@ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> @@ -560,7 +560,7 @@ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> @@ -580,7 +580,7 @@ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific> @@ -600,7 +600,7 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/quickAnonPaymentInformation.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonPaymentInformation.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderitems.ftl"/></html></platform-specific> Modified: ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/ShoppingListScreens.xml Sun Jul 27 03:13:23 2008 @@ -29,7 +29,7 @@ <set field="titleProperty" value="PageTitleShoppingList"/> <set field="headerItem" value="Shopping List"/> - <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sun Jul 27 03:13:23 2008 @@ -1924,7 +1924,7 @@ } /** calculates for a reservation the percentage/100 extra for more than 1 person. */ - // similar code at editShoppingList.bsh + // similar code at EditShoppingList.groovy public double getRentalAdjustment() { if (!"RENTAL_ORDER_ITEM".equals(this.itemType)) { // not a rental item? Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy?rev=680085&r1=680084&r2=680085&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy Sun Jul 27 03:13:23 2008 @@ -35,7 +35,7 @@ context.productCategoryId = productCategoryId; /* NOTE DEJ20070220: this is a weird way to do this and caused unacceptable side effects as described in the related - * comment in the main.bsh file + * comment in the Main.groovy file * * NOTE JLR 20070221 this should be done using the same method than in add to cart. I will do it like that and remove all this after. *
