svn commit: r731797 [1/2] - in /ofbiz/trunk: applications/ecommerce/script/
Locked
svn commit: r731797 [1/2] - in /ofbiz/trunk: applications/ecommerce/script/
 
|
Author: hansbak
Date: Mon Jan 5 16:58:33 2009 New Revision: 731797 URL: http://svn.apache.org/viewvc?rev=731797&view=rev Log: change xml minilanguage from 'obj-field-name=' to 'obj-field=' Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Jan 5 16:58:33 2009 @@ -53,11 +53,11 @@ <!-- if username and/or password should be lowercased, do that now --> <if-compare field="username_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/> + <call-object-method obj-field="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/> </if-compare> <if-compare field="password_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/> - <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/> + <call-object-method obj-field="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/> + <call-object-method obj-field="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/> </if-compare> <!-- Create the UserLogin Record --> @@ -452,11 +452,11 @@ <session-to-field field-name="userLogin" session-name="userLogin"/> <log level="info" message="userLogin in Env ${userLogin} in parameters.userLogin ${parameters.userLogin}"/> <if-empty field="userLogin"> - <call-object-method obj-field-name="session" method-name="removeAttribute"> + <call-object-method obj-field="session" method-name="removeAttribute"> <string value="autoUserLogin"/> </call-object-method> <check-errors/> - <call-object-method obj-field-name="session" method-name="removeAttribute"> + <call-object-method obj-field="session" method-name="removeAttribute"> <string value="autoName"/> </call-object-method> <check-errors/> @@ -478,7 +478,7 @@ <set field="userLogin.partyId" from-field="partyId"/> <field-to-session field-name="userLogin" session-name="userLogin" /> <if-not-empty field="cart"> - <call-object-method obj-field-name="cart" method-name="setOrderPartyId"> + <call-object-method obj-field="cart" method-name="setOrderPartyId"> <field field="partyId"/> </call-object-method> <call-bsh><![CDATA[ @@ -489,7 +489,7 @@ Debug.logError(e, module); } ]]></call-bsh> - <!-- call-object-method obj-field-name="cart" method-name="setUserLogin"> + <!-- call-object-method obj-field="cart" method-name="setUserLogin"> <field field="userLogin" type="org.ofbiz.entity.GenericValue"/> <field field="dispatcher" map-name="request" type="org.ofbiz.service.LocalDispatcher"/> </call-object-method --> @@ -782,11 +782,11 @@ </if-not-empty> <session-to-field field-name="cart" session-name="shoppingCart"/> <if-not-empty field="cart"> - <call-object-method obj-field-name="cart" method-name="addContactMech"> + <call-object-method obj-field="cart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> <field field="addressContext.contactMechId"/> </call-object-method> - <call-object-method obj-field-name="cart" method-name="setShippingContactMechId"> + <call-object-method obj-field="cart" method-name="setShippingContactMechId"> <field field="addressContext.contactMechId"/> </call-object-method> </if-not-empty> @@ -803,46 +803,46 @@ <session-to-field field-name="cart" session-name="shoppingCart"/> <if-not-empty field="cart"> <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> - <call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId"> + <call-object-method obj-field="cart" method-name="setShipmentMethodTypeId"> <field field="shipmentMethodTypeId"/> </call-object-method> <set field="carrierPartyId" from-field="parameters.carrierPartyId" /> - <call-object-method obj-field-name="cart" method-name="setCarrierPartyId"> + <call-object-method obj-field="cart" method-name="setCarrierPartyId"> <field field="carrierPartyId"/> </call-object-method> <set field="maySplit" from-field="parameters.may_split" type="Boolean"/> <if-not-empty field="maySplit"> - <call-object-method obj-field-name="cart" method-name="setMaySplit"> + <call-object-method obj-field="cart" method-name="setMaySplit"> <field field="maySplit" type="Boolean"/> </call-object-method> </if-not-empty> <set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/> <if-not-empty field="shippingInstruction"> - <call-object-method obj-field-name="cart" method-name="setShippingInstructions"> + <call-object-method obj-field="cart" method-name="setShippingInstructions"> <field field="shippingInstruction" type="String"/> </call-object-method> </if-not-empty> <set field="correspondingPoId" from-field="parameters.correspondingPoId"/> <if-not-empty field="correspondingPoId"> - <call-object-method obj-field-name="cart" method-name="setPoNumber"> + <call-object-method obj-field="cart" method-name="setPoNumber"> <field field="correspondingPoId" type="String"/> </call-object-method> </if-not-empty> <set field="isGift" from-field="parameters.is_gift" type="Boolean"/> <if-not-empty field="isGift"> - <call-object-method obj-field-name="cart" method-name="setIsGift"> + <call-object-method obj-field="cart" method-name="setIsGift"> <field field="isGift" type="Boolean"/> </call-object-method> </if-not-empty> <set field="giftMessage" from-field="parameters.gift_message" type="String"/> <if-not-empty field="giftMessage"> - <call-object-method obj-field-name="cart" method-name="setGiftMessage"> + <call-object-method obj-field="cart" method-name="setGiftMessage"> <field field="giftMessage" type="String"/> </call-object-method> </if-not-empty> @@ -929,19 +929,19 @@ <field-to-request field="parameters.emailContactMechId" request-name="emailContactMechId"/> <!-- Set partyId, in shoppingCart --> - <call-object-method obj-field-name="shoppingCart" method-name="setUserLogin"> + <call-object-method obj-field="shoppingCart" method-name="setUserLogin"> <field field="userLogin" type="org.ofbiz.entity.GenericValue"/> <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/> </call-object-method> - <call-object-method obj-field-name="shoppingCart" method-name="addContactMech"> + <call-object-method obj-field="shoppingCart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> <field field="parameters.shipToContactMechId"/> </call-object-method> - <call-object-method obj-field-name="shoppingCart" method-name="setShippingContactMechId"> + <call-object-method obj-field="shoppingCart" method-name="setShippingContactMechId"> <field field="parameters.shipToContactMechId"/> </call-object-method> <log level="info" message="updated shopping cart shipToContactMechId ${parameters.shipToContactMechId}"/> - <call-object-method obj-field-name="shoppingCart" method-name="setOrderPartyId"> + <call-object-method obj-field="shoppingCart" method-name="setOrderPartyId"> <field field="partyId"/> </call-object-method> </simple-method> @@ -1043,17 +1043,17 @@ ]]> </call-bsh> <set field="shippingEstWpr" from-field="parameters.shippingEstWpr"/> - <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingMethods" ret-field="carrierShipmentMethodList"/> - <call-object-method obj-field-name="shoppingCart" method-name="getShipmentMethodTypeId" ret-field="shipmentMethodTypeId"/> - <call-object-method obj-field-name="shoppingCart" method-name="getCarrierPartyId" ret-field="carrierPartyId"/> - <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field="currency"/> + <call-object-method obj-field="shippingEstWpr" method-name="getShippingMethods" ret-field="carrierShipmentMethodList"/> + <call-object-method obj-field="shoppingCart" method-name="getShipmentMethodTypeId" ret-field="shipmentMethodTypeId"/> + <call-object-method obj-field="shoppingCart" method-name="getCarrierPartyId" ret-field="carrierPartyId"/> + <call-object-method obj-field="shoppingCart" method-name="getCurrency" ret-field="currency"/> <if-not-empty field="shipmentMethodTypeId"> <if-not-empty field="carrierPartyId"> <set field="chosenShippingMethod" value="${shipmentMethodTypeId}@${carrierPartyId}"/> </if-not-empty> </if-not-empty> <iterate list="carrierShipmentMethodList" entry="carrierShipmentMethod"> - <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingEstimate" ret-field="shippingEst"> + <call-object-method obj-field="shippingEstWpr" method-name="getShippingEstimate" ret-field="shippingEst"> <field field="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/> </call-object-method> <if-empty field="shippingEst"> @@ -1114,16 +1114,16 @@ <if-empty field="shoppingCart"> <session-to-field field-name="shoppingCart"/> </if-empty> - <call-object-method obj-field-name="shoppingCart" method-name="setShipmentMethodTypeId"> + <call-object-method obj-field="shoppingCart" method-name="setShipmentMethodTypeId"> <field field="shipmentMethodTypeId"/> </call-object-method> - <call-object-method obj-field-name="shoppingCart" method-name="setCarrierPartyId"> + <call-object-method obj-field="shoppingCart" method-name="setCarrierPartyId"> <field field="carrierPartyId"/> </call-object-method> - <call-object-method obj-field-name="shoppingCart" method-name="setProductStoreShipMethId"> + <call-object-method obj-field="shoppingCart" method-name="setProductStoreShipMethId"> <field field="productStoreShipMethId"/> </call-object-method> - <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field="isoCode"/> + <call-object-method obj-field="shoppingCart" method-name="getCurrency" ret-field="isoCode"/> <set field="dispatcher" from-field="parameters.dispatcher" type="Object"/> <set field="delegator" from-field="parameters.delegator" type="Object"/> <set field="locale" from-field="parameters.locale" type="Object"/> @@ -1172,16 +1172,16 @@ </if-empty> <if-not-empty field="shoppingCart"> <if-empty field="partyId"> - <call-object-method obj-field-name="shoppingCart" method-name="getPartyId" ret-field="partyId"/> + <call-object-method obj-field="shoppingCart" method-name="getPartyId" ret-field="partyId"/> </if-empty> <if-empty field="userLogin"> - <call-object-method obj-field-name="shoppingCart" method-name="getUserLogin" ret-field="userLogin"/> + <call-object-method obj-field="shoppingCart" method-name="getUserLogin" ret-field="userLogin"/> <if-not-empty field="userLogin"> <set-current-user-login value-name="userLogin"/> </if-not-empty> </if-empty> <if-empty field="shipToContactMechId"> - <call-object-method obj-field-name="shoppingCart" method-name="getShippingContactMechId" ret-field="shipToContactMechId"/> + <call-object-method obj-field="shoppingCart" method-name="getShippingContactMechId" ret-field="shipToContactMechId"/> </if-empty> </if-not-empty> <if-not-empty field="partyId"> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Mon Jan 5 16:58:33 2009 @@ -40,11 +40,11 @@ <!-- if username and/or password should be lowercased, do that now --> <if-compare field="username_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="username" obj-map-name="parameters" method-name="toLowerCase" ret-field="username" ret-map-name="parameters"/> + <call-object-method obj-field="username" obj-map-name="parameters" method-name="toLowerCase" ret-field="username" ret-map-name="parameters"/> </if-compare> <if-compare field="password_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="password" obj-map-name="parameters" method-name="toLowerCase" ret-field="password" ret-map-name="parameters"/> - <call-object-method obj-field-name="confirmPassword" obj-map-name="parameters" method-name="toLowerCase" ret-field="confirmPassword" ret-map-name="parameters"/> + <call-object-method obj-field="password" obj-map-name="parameters" method-name="toLowerCase" ret-field="password" ret-map-name="parameters"/> + <call-object-method obj-field="confirmPassword" obj-map-name="parameters" method-name="toLowerCase" ret-field="confirmPassword" ret-map-name="parameters"/> </if-compare> <!-- Create the UserLogin Record --> @@ -499,11 +499,11 @@ <session-to-field field-name="cart" session-name="shoppingCart"/> <session-to-field field-name="userLogin" session-name="userLogin"/> <if-empty field="userLogin"> - <call-object-method obj-field-name="session" method-name="removeAttribute"> + <call-object-method obj-field="session" method-name="removeAttribute"> <string value="autoUserLogin"/> </call-object-method> <check-errors/> - <call-object-method obj-field-name="session" method-name="removeAttribute"> + <call-object-method obj-field="session" method-name="removeAttribute"> <string value="autoName"/> </call-object-method> <check-errors/> @@ -525,7 +525,7 @@ <set field="userLogin.partyId" from-field="partyId"/> <field-to-session field-name="userLogin" session-name="userLogin" /> <if-not-empty field="cart"> - <call-object-method obj-field-name="cart" method-name="setOrderPartyId"> + <call-object-method obj-field="cart" method-name="setOrderPartyId"> <field field="partyId"/> </call-object-method> <call-bsh><![CDATA[ @@ -543,11 +543,11 @@ <check-errors/> <if-not-empty field="cart"> - <call-object-method obj-field-name="cart" method-name="addContactMech"> + <call-object-method obj-field="cart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> <field field="parameters.shippingContactMechId"/> </call-object-method> - <call-object-method obj-field-name="cart" method-name="setShippingContactMechId"> + <call-object-method obj-field="cart" method-name="setShippingContactMechId"> <field field="parameters.shippingContactMechId"/> </call-object-method> </if-not-empty> @@ -557,7 +557,7 @@ <field-to-session field-name="parameters.billingContactMechId" session-name="billingContactMechId"></field-to-session> <else> <if-not-empty field="cart"> - <call-object-method obj-field-name="cart" method-name="getShippingContactMechId" ret-field="shippingContactMechId"/> + <call-object-method obj-field="cart" method-name="getShippingContactMechId" ret-field="shippingContactMechId"/> </if-not-empty> <field-to-session field-name="shippingContactMechId" session-name="billingContactMechId"></field-to-session> </else> @@ -577,42 +577,42 @@ <session-to-field field-name="cart" session-name="shoppingCart"/> <if-not-empty field="cart"> <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> - <call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId"> + <call-object-method obj-field="cart" method-name="setShipmentMethodTypeId"> <field field="shipmentMethodTypeId"/> </call-object-method> <set field="carrierPartyId" from-field="parameters.carrierPartyId" /> - <call-object-method obj-field-name="cart" method-name="setCarrierPartyId"> + <call-object-method obj-field="cart" method-name="setCarrierPartyId"> <field field="carrierPartyId"/> </call-object-method> <set field="maySplit" from-field="parameters.may_split" type="Boolean" default-value="false"/> - <call-object-method obj-field-name="cart" method-name="setMaySplit"> + <call-object-method obj-field="cart" method-name="setMaySplit"> <field field="maySplit" type="Boolean"/> </call-object-method> <set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/> <if-not-empty field="shippingInstruction"> - <call-object-method obj-field-name="cart" method-name="setShippingInstructions"> + <call-object-method obj-field="cart" method-name="setShippingInstructions"> <field field="shippingInstruction" type="String"/> </call-object-method> </if-not-empty> <set field="correspondingPoId" from-field="parameters.correspondingPoId" type="String"/> <if-not-empty field="correspondingPoId"> - <call-object-method obj-field-name="cart" method-name="setPoNumber"> + <call-object-method obj-field="cart" method-name="setPoNumber"> <field field="correspondingPoId" type="String"/> </call-object-method> </if-not-empty> <set field="isGift" from-field="parameters.is_gift" type="Boolean" default-value="false" /> - <call-object-method obj-field-name="cart" method-name="setIsGift"> + <call-object-method obj-field="cart" method-name="setIsGift"> <field field="isGift" type="Boolean"/> </call-object-method> <set field="giftMessage" from-field="parameters.gift_message" type="String"/> <if-not-empty field="giftMessage"> - <call-object-method obj-field-name="cart" method-name="setGiftMessage"> + <call-object-method obj-field="cart" method-name="setGiftMessage"> <field field="giftMessage" type="String"/> </call-object-method> </if-not-empty> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Mon Jan 5 16:58:33 2009 @@ -604,22 +604,22 @@ <call-service service-name="loadCartFromOrder" in-map-name="loadCartFromOrderInMap"> <result-to-field result-name="shoppingCart" field="cart"/> </call-service> - <call-object-method obj-field-name="cart" method-name="items" ret-field="items"/> + <call-object-method obj-field="cart" method-name="items" ret-field="items"/> <iterate list="items" entry="item"> - <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="orderItemSeqId"/> + <call-object-method obj-field="item" method-name="getOrderItemSeqId" ret-field="orderItemSeqId"/> <if-empty field="orderItemSeqId"> <!-- this is a new (promo) item --> <!-- a new order item is created --> <make-value value-field="newOrderItem" entity-name="OrderItem"/> <set field="newOrderItem.orderId" from-field="parameters.orderId"/> - <call-object-method obj-field-name="item" method-name="getItemType" ret-field="newOrderItem.orderItemTypeId"/> - <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field="newOrderItem.selectedAmount"/> - <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field="newOrderItem.unitPrice"/> - <call-object-method obj-field-name="item" method-name="getListPrice" ret-field="newOrderItem.unitListPrice"/> - <call-object-method obj-field-name="item" method-name="getName" ret-field="newOrderItem.itemDescription"/> - <call-object-method obj-field-name="item" method-name="getStatusId" ret-field="newOrderItem.statusId"/> - <call-object-method obj-field-name="item" method-name="getProductId" ret-field="newOrderItem.productId"/> - <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="newOrderItem.quantity"/> + <call-object-method obj-field="item" method-name="getItemType" ret-field="newOrderItem.orderItemTypeId"/> + <call-object-method obj-field="item" method-name="getSelectedAmount" ret-field="newOrderItem.selectedAmount"/> + <call-object-method obj-field="item" method-name="getBasePrice" ret-field="newOrderItem.unitPrice"/> + <call-object-method obj-field="item" method-name="getListPrice" ret-field="newOrderItem.unitListPrice"/> + <call-object-method obj-field="item" method-name="getName" ret-field="newOrderItem.itemDescription"/> + <call-object-method obj-field="item" method-name="getStatusId" ret-field="newOrderItem.statusId"/> + <call-object-method obj-field="item" method-name="getProductId" ret-field="newOrderItem.productId"/> + <call-object-method obj-field="item" method-name="getQuantity" ret-field="newOrderItem.quantity"/> <set field="newOrderItem.isModifiedPrice" value="N"/> <set field="newOrderItem.isPromo" value="Y"/> <if-empty field="newOrderItem.statusId"> @@ -628,12 +628,12 @@ <make-next-seq-id value-field="newOrderItem" seq-field-name="orderItemSeqId"/> <create-value value-field="newOrderItem"/> <!-- and the orderItemSeqId is assigned to the shopping cart item--> - <call-object-method obj-field-name="item" method-name="setOrderItemSeqId"> + <call-object-method obj-field="item" method-name="setOrderItemSeqId"> <field field="newOrderItem.orderItemSeqId" type="String"/> </call-object-method> </if-empty> </iterate> - <call-object-method obj-field-name="cart" method-name="makeAllAdjustments" ret-field="adjustments"/> + <call-object-method obj-field="cart" method-name="makeAllAdjustments" ret-field="adjustments"/> <!-- Accumulate the new promotion total from the recalculated promotion adjustments --> <set field="newOrderAdjustmentTotal" value="0" type="BigDecimal"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Mon Jan 5 16:58:33 2009 @@ -320,7 +320,7 @@ <field field="locale" type="java.util.Locale"/> <field field="userLogin" type="org.ofbiz.entity.GenericValue"/> </call-class-method> - <call-object-method method-name="getTotalPrice" obj-field-name="configWrapper" ret-field="totalPrice"></call-object-method> + <call-object-method method-name="getTotalPrice" obj-field="configWrapper" ret-field="totalPrice"></call-object-method> <set field="newEntity.quoteUnitPrice" from-field="totalPrice"/> </then> <else> @@ -599,25 +599,25 @@ <result-to-field result-name="shoppingCart" field="cart"/> </call-service> - <call-object-method obj-field-name="cart" method-name="items" ret-field="items"/> + <call-object-method obj-field="cart" method-name="items" ret-field="items"/> <iterate list="items" entry="item"> - <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="orderItemSeqId"/> + <call-object-method obj-field="item" method-name="getOrderItemSeqId" ret-field="orderItemSeqId"/> <if-empty field="orderItemSeqId"> <!-- this is a new (promo) item --> <!-- a new quote item is created --> <clear-field field="createQuoteItemInMap"/> <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="parameters"/> - <call-object-method obj-field-name="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/> - <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/> + <call-object-method obj-field="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/> + <call-object-method obj-field="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/> <set value="Y" field="createQuoteItemInMap.isPromo"/> <call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap"> <result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/> </call-service> <!-- and the quoteItemSeqId is assigned to the shopping cart item (as orderItemSeqId) --> - <call-object-method obj-field-name="item" method-name="setOrderItemSeqId"> + <call-object-method obj-field="item" method-name="setOrderItemSeqId"> <field field="quoteItemSeqId" type="String"/> </call-object-method> - <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="newOrderItemSeqId"/> + <call-object-method obj-field="item" method-name="getOrderItemSeqId" ret-field="newOrderItemSeqId"/> </if-empty> </iterate> <!-- set the quoteUnitPrice from the item basePrice --> @@ -631,19 +631,19 @@ </or> </condition> <then> - <call-object-method obj-field-name="cart" method-name="findCartItem" ret-field="item"> + <call-object-method obj-field="cart" method-name="findCartItem" ret-field="item"> <field field="quoteItem.quoteItemSeqId" type="String"/> </call-object-method> <clear-field field="updateQuoteItemInMap"/> <set from-field="quoteItem.quoteId" field="updateQuoteItemInMap.quoteId"/> <set from-field="quoteItem.quoteItemSeqId" field="updateQuoteItemInMap.quoteItemSeqId"/> - <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field="updateQuoteItemInMap.quoteUnitPrice"/> + <call-object-method obj-field="item" method-name="getBasePrice" ret-field="updateQuoteItemInMap.quoteUnitPrice"/> <call-service service-name="updateQuoteItem" in-map-name="updateQuoteItemInMap"/> </then> </if> </iterate> - <call-object-method obj-field-name="cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/> + <call-object-method obj-field="cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/> <iterate list="adjustments" entry="adjustment"> <set from-field="parameters.quoteId" field="adjustment.quoteId"/> @@ -691,7 +691,7 @@ </simple-method> <simple-method method-name="createQuoteFromCart" short-description="Create a Quote from a Cart"> - <call-object-method obj-field-name="parameters.cart" method-name="getPartyId" ret-field="createQuoteInMap.partyId"/> + <call-object-method obj-field="parameters.cart" method-name="getPartyId" ret-field="createQuoteInMap.partyId"/> <if> <condition> <and> @@ -706,9 +706,9 @@ </if> <check-errors/> - <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field="createQuoteInMap.currencyUomId"/> - <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field="createQuoteInMap.productStoreId"/> - <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field="createQuoteInMap.salesChannelEnumId"/> + <call-object-method obj-field="parameters.cart" method-name="getCurrency" ret-field="createQuoteInMap.currencyUomId"/> + <call-object-method obj-field="parameters.cart" method-name="getProductStoreId" ret-field="createQuoteInMap.productStoreId"/> + <call-object-method obj-field="parameters.cart" method-name="getChannelType" ret-field="createQuoteInMap.salesChannelEnumId"/> <set value="PRODUCT_QUOTE" field="createQuoteInMap.quoteTypeId"/> <set value="QUO_CREATED" field="createQuoteInMap.statusId"/> <call-service service-name="createQuote" in-map-name="createQuoteInMap"> @@ -717,17 +717,17 @@ <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <!-- create, for every cart item, a quote item --> - <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field="items"/> + <call-object-method obj-field="parameters.cart" method-name="items" ret-field="items"/> <iterate list="items" entry="item"> <!-- a new quote item is created --> <clear-field field="createQuoteItemInMap"/> - <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field="isPromo"/> + <call-object-method obj-field="item" method-name="getIsPromo" ret-field="isPromo"/> <if-compare field="isPromo" value="true" operator="equals" type="Boolean"> <set value="Y" field="createQuoteItemInMap.isPromo"/> </if-compare> - <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field="configWrapper"/> + <call-object-method obj-field="item" method-name="getConfigWrapper" ret-field="configWrapper"/> <if-not-empty field="configWrapper"> - <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field="configId"/> + <call-object-method obj-field="configWrapper" method-name="getConfigId" ret-field="configId"/> <set from-field="configId" field="createQuoteItemInMap.configId"/> </if-not-empty> <if> @@ -739,20 +739,20 @@ </condition> <then> <set from-field="quote.quoteId" field="createQuoteItemInMap.quoteId"/> - <call-object-method obj-field-name="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/> - <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/> - <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field="createQuoteItemInMap.selectedAmount"/> - <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field="createQuoteItemInMap.quoteUnitPrice"/> - <call-object-method obj-field-name="item" method-name="getItemComment" ret-field="createQuoteItemInMap.comments"/> - <call-object-method obj-field-name="item" method-name="getReservStart" ret-field="createQuoteItemInMap.reservStart"/> - <call-object-method obj-field-name="item" method-name="getReservLength" ret-field="createQuoteItemInMap.reservLength"/> - <call-object-method obj-field-name="item" method-name="getReservPersons" ret-field="createQuoteItemInMap.reservPersons"/> + <call-object-method obj-field="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/> + <call-object-method obj-field="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/> + <call-object-method obj-field="item" method-name="getSelectedAmount" ret-field="createQuoteItemInMap.selectedAmount"/> + <call-object-method obj-field="item" method-name="getBasePrice" ret-field="createQuoteItemInMap.quoteUnitPrice"/> + <call-object-method obj-field="item" method-name="getItemComment" ret-field="createQuoteItemInMap.comments"/> + <call-object-method obj-field="item" method-name="getReservStart" ret-field="createQuoteItemInMap.reservStart"/> + <call-object-method obj-field="item" method-name="getReservLength" ret-field="createQuoteItemInMap.reservLength"/> + <call-object-method obj-field="item" method-name="getReservPersons" ret-field="createQuoteItemInMap.reservPersons"/> <call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap"> <result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/> </call-service> <!-- and the quoteItemSeqId is assigned to the shopping cart item (as orderItemSeqId) --> - <call-object-method obj-field-name="item" method-name="setOrderItemSeqId"> + <call-object-method obj-field="item" method-name="setOrderItemSeqId"> <field field="quoteItemSeqId" type="String"/> </call-object-method> </then> @@ -764,7 +764,7 @@ <if-compare field="parameters.applyStorePromotions" value="N" operator="not-equals" type="String"/> </condition> <then> - <call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/> + <call-object-method obj-field="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/> <iterate list="adjustments" entry="adjustment"> <set from-field="quote.quoteId" field="adjustment.quoteId"/> <sequenced-id sequence-name="QuoteAdjustment" field="adjustment.quoteAdjustmentId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Mon Jan 5 16:58:33 2009 @@ -291,13 +291,13 @@ </simple-method> <simple-method method-name="createCustRequestFromCart" short-description="Create a CustRequest from a ShoppingCart"> - <call-object-method obj-field-name="parameters.cart" method-name="getPartyId" ret-field="createCustRequestInMap.fromPartyId"/> + <call-object-method obj-field="parameters.cart" method-name="getPartyId" ret-field="createCustRequestInMap.fromPartyId"/> <set value="RF_QUOTE" field="createCustRequestInMap.custRequestTypeId"/> <set value="CRQ_SUBMITTED" field="createCustRequestInMap.statusId"/> <set field="createCustRequestInMap.custRequestName" from-field="parameters.custRequestName"/> - <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field="createCustRequestInMap.maximumAmountUomId"/> - <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field="createCustRequestInMap.productStoreId"/> - <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field="createCustRequestInMap.salesChannelEnumId"/> + <call-object-method obj-field="parameters.cart" method-name="getCurrency" ret-field="createCustRequestInMap.maximumAmountUomId"/> + <call-object-method obj-field="parameters.cart" method-name="getProductStoreId" ret-field="createCustRequestInMap.productStoreId"/> + <call-object-method obj-field="parameters.cart" method-name="getChannelType" ret-field="createCustRequestInMap.salesChannelEnumId"/> <call-service service-name="createCustRequest" in-map-name="createCustRequestInMap"> <result-to-field result-name="custRequestId" field="custRequestId"/> </call-service> @@ -305,25 +305,25 @@ <entity-one entity-name="CustRequest" value-field="custRequest" auto-field-map="true"/> <!-- create, for every cart item, a request item --> - <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field="items"/> + <call-object-method obj-field="parameters.cart" method-name="items" ret-field="items"/> <iterate list="items" entry="item"> <!-- a new request item is created --> <clear-field field="createCustRequestItemInMap"/> - <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field="configWrapper"/> + <call-object-method obj-field="item" method-name="getConfigWrapper" ret-field="configWrapper"/> <if-not-empty field="configWrapper"> - <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field="configId"/> + <call-object-method obj-field="configWrapper" method-name="getConfigId" ret-field="configId"/> <set from-field="configId" field="createCustRequestItemInMap.configId"/> </if-not-empty> - <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field="isPromo"/> + <call-object-method obj-field="item" method-name="getIsPromo" ret-field="isPromo"/> <if-compare field="isPromo" value="false" operator="equals" type="Boolean"> <set from-field="custRequest.custRequestId" field="createCustRequestItemInMap.custRequestId"/> - <call-object-method obj-field-name="item" method-name="getProductId" ret-field="createCustRequestItemInMap.productId"/> - <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="createCustRequestItemInMap.quantity"/> - <!--<call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field="createCustRequestItemInMap.selectedAmount"/>--> - <!--<call-object-method obj-field-name="item" method-name="getItemComment" ret-field="createCustRequestItemInMap.comments"/>--> - <call-object-method obj-field-name="item" method-name="getReservStart" ret-field="createCustRequestItemInMap.reservStart"/> - <call-object-method obj-field-name="item" method-name="getReservLength" ret-field="createCustRequestItemInMap.reservLength"/> - <call-object-method obj-field-name="item" method-name="getReservPersons" ret-field="createCustRequestItemInMap.reservPersons"/> + <call-object-method obj-field="item" method-name="getProductId" ret-field="createCustRequestItemInMap.productId"/> + <call-object-method obj-field="item" method-name="getQuantity" ret-field="createCustRequestItemInMap.quantity"/> + <!--<call-object-method obj-field="item" method-name="getSelectedAmount" ret-field="createCustRequestItemInMap.selectedAmount"/>--> + <!--<call-object-method obj-field="item" method-name="getItemComment" ret-field="createCustRequestItemInMap.comments"/>--> + <call-object-method obj-field="item" method-name="getReservStart" ret-field="createCustRequestItemInMap.reservStart"/> + <call-object-method obj-field="item" method-name="getReservLength" ret-field="createCustRequestItemInMap.reservLength"/> + <call-object-method obj-field="item" method-name="getReservPersons" ret-field="createCustRequestItemInMap.reservPersons"/> <call-service service-name="createCustRequestItem" in-map-name="createCustRequestItemInMap"> <result-to-field result-name="custRequestItemSeqId" field="custRequestItemSeqId"/> </call-service> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Mon Jan 5 16:58:33 2009 @@ -40,11 +40,11 @@ <!-- if username and/or password should be lowercased, do that now --> <if-compare field="username_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/> + <call-object-method obj-field="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/> </if-compare> <if-compare field="password_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/> - <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/> + <call-object-method obj-field="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/> + <call-object-method obj-field="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/> </if-compare> <!-- Create the UserLogin Record --> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Mon Jan 5 16:58:33 2009 @@ -736,8 +736,8 @@ <!-- address match map --> <simple-method method-name="createAddressMatchMap" short-description="create a AddressMatchMap"> - <call-object-method obj-field-name="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapValue" ret-map-name="parameters"/> - <call-object-method obj-field-name="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapKey" ret-map-name="parameters"/> + <call-object-method obj-field="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapValue" ret-map-name="parameters"/> + <call-object-method obj-field="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapKey" ret-map-name="parameters"/> <make-value entity-name="AddressMatchMap" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Mon Jan 5 16:58:33 2009 @@ -71,11 +71,11 @@ <!-- if username and/or password should be lowercased, do that now --> <if-compare field="username_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/> + <call-object-method obj-field="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/> </if-compare> <if-compare field="password_lowercase" operator="equals" value="true"> - <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/> - <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/> + <call-object-method obj-field="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/> + <call-object-method obj-field="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/> </if-compare> <!-- Create the UserLogin Record --> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Mon Jan 5 16:58:33 2009 @@ -151,7 +151,7 @@ <if-not-empty field="relCategories"> <if-not-empty field="categories"> <iterate list="relCategories" entry="relCategory"> - <call-object-method obj-field-name="categories" method-name="contains" ret-field="addInCategories" > + <call-object-method obj-field="categories" method-name="contains" ret-field="addInCategories" > <field field="relCategory" type="java.lang.Object"/> </call-object-method> <if-compare value="false" field="addInCategories" operator="equals" type="Boolean"> @@ -471,13 +471,13 @@ <simple-method method-name="checkImageUrl" short-description="Check for image url exists or not" login-required="false"> <set field="imageUrl" from-field="parameters.imageUrl"/> - <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field="httpFlag" > + <call-object-method obj-field="imageUrl" method-name="startsWith" ret-field="httpFlag" > <string value="http"></string> </call-object-method> - <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field="httpsFlag" > + <call-object-method obj-field="imageUrl" method-name="startsWith" ret-field="httpsFlag" > <string value="https"></string> </call-object-method> - <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field="ftpFlag" > + <call-object-method obj-field="imageUrl" method-name="startsWith" ret-field="ftpFlag" > <string value="ftp"></string> </call-object-method> <if> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Mon Jan 5 16:58:33 2009 @@ -833,7 +833,7 @@ </if-compare> </iterate-map> <if-not-empty field="noLongerOnBackOrderIdMap"> - <call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/> + <call-object-method obj-field="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/> <field-to-result field="noLongerOnBackOrderIdSet"/> </if-not-empty> </simple-method> @@ -944,7 +944,7 @@ </if-compare> </iterate-map> <if-not-empty field="noLongerOnBackOrderIdMap"> - <call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/> + <call-object-method obj-field="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/> <field-to-result field="noLongerOnBackOrderIdSet"/> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Mon Jan 5 16:58:33 2009 @@ -303,7 +303,7 @@ </if-empty> <!-- make sure the keyword is lower cased --> - <call-object-method obj-field-name="newEntity.keyword" method-name="toLowerCase" ret-field="newEntity.keyword"/> + <call-object-method obj-field="newEntity.keyword" method-name="toLowerCase" ret-field="newEntity.keyword"/> <create-value value-field="newEntity"/> </simple-method> Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml (original) +++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml Mon Jan 5 16:58:33 2009 @@ -114,7 +114,7 @@ </create-object> <!-- get uri --> <property-to-field resource="googleCheckout" property="xmlTemplateUri" field-name="screenUri"/> - <call-object-method method-name="render" obj-field-name="xscreens"> + <call-object-method method-name="render" obj-field="xscreens"> <field field-name="screenUri" type="String"/> </call-object-method> <set field="content" value="${bsh:XMLWriter.toString()}"/> @@ -128,10 +128,10 @@ <create-object class-name="java.io.BufferedWriter" field-name="writer"> <field field-name="sWriter" type="java.io.Writer"/> </create-object> - <call-object-method method-name="write" obj-field-name="writer"> + <call-object-method method-name="write" obj-field="writer"> <field field-name="content" type="String"/> </call-object-method> - <call-object-method method-name="close" obj-field-name="writer"/> + <call-object-method method-name="close" obj-field="writer"/> </simple-method> <!-- Step 4 --> <simple-method method-name="getResponse" short-description=""> @@ -164,7 +164,7 @@ document = org.ofbiz.base.util.UtilXml.readXmlDocument(response, false); return org.ofbiz.base.util.UtilMisc.toMap("document", document); ]]></call-bsh> - <call-object-method method-name="getDocumentElement" obj-field-name="document" ret-field-name="rootElement"/> + <call-object-method method-name="getDocumentElement" obj-field="document" ret-field-name="rootElement"/> <!-- May want to get the serial number to store eventually; would be an attribute of this rootElement, Skipping for now --> <call-simple-method method-name="getRedirectFromRootElement"/> @@ -205,48 +205,48 @@ <set field="true" value="true" type="Boolean"/> <set field="false" value="false" type="Boolean"/> - <call-object-method method-name="setDoInput" obj-field-name="conn"> + <call-object-method method-name="setDoInput" obj-field="conn"> <field field-name="true" type="boolean"/> </call-object-method> - <call-object-method method-name="setDoOutput" obj-field-name="conn"> + <call-object-method method-name="setDoOutput" obj-field="conn"> <field field-name="true" type="boolean"/> </call-object-method> - <call-object-method method-name="setUseCaches" obj-field-name="conn"> + <call-object-method method-name="setUseCaches" obj-field="conn"> <field field-name="false" type="boolean"/> </call-object-method> - <call-object-method method-name="setFollowRedirects" obj-field-name="conn"> + <call-object-method method-name="setFollowRedirects" obj-field="conn"> <field field-name="true" type="boolean"/> </call-object-method> - <call-object-method method-name="setInstanceFollowRedirects" obj-field-name="conn"> + <call-object-method method-name="setInstanceFollowRedirects" obj-field="conn"> <field field-name="true" type="boolean"/> </call-object-method> - <call-object-method method-name="setRequestMethod" obj-field-name="conn"> + <call-object-method method-name="setRequestMethod" obj-field="conn"> <string value="POST"/> </call-object-method> <call-simple-method method-name="getHttpAuth"/> - <call-object-method method-name="setRequestProperty" obj-field-name="conn"> + <call-object-method method-name="setRequestProperty" obj-field="conn"> <string value="Authorization"/> <field field-name="HttpAuth"/> </call-object-method> <call-simple-method method-name="getHttpHost"/> - <call-object-method method-name="setRequestProperty" obj-field-name="conn"> + <call-object-method method-name="setRequestProperty" obj-field="conn"> <string value="Host"/> <field field-name="HttpHost"/> </call-object-method> - <call-object-method method-name="setRequestProperty" obj-field-name="conn"> + <call-object-method method-name="setRequestProperty" obj-field="conn"> <string value="content-type"/> <string value="application/xml"/> </call-object-method> - <call-object-method method-name="setRequestProperty" obj-field-name="conn"> + <call-object-method method-name="setRequestProperty" obj-field="conn"> <string value="accept"/> <string value="application/xml"/> </call-object-method> Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original) +++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Mon Jan 5 16:58:33 2009 @@ -66,16 +66,16 @@ </simple-method> <simple-method method-name="setupItems" short-description=""> <!-- Get Items from Cart --> - <call-object-method method-name="items" obj-field-name="cart" ret-field="cartItems"/> + <call-object-method method-name="items" obj-field="cart" ret-field="cartItems"/> <iterate entry="item" list="cartItems"> <!-- itemName --> - <call-object-method method-name="getProductId" obj-field-name="item" ret-field="itemName" ret-map-name="thisItem"/> + <call-object-method method-name="getProductId" obj-field="item" ret-field="itemName" ret-map-name="thisItem"/> <!-- itemDesc --> - <call-object-method method-name="getName" obj-field-name="item" ret-field="description" ret-map-name="thisItem"/> + <call-object-method method-name="getName" obj-field="item" ret-field="description" ret-map-name="thisItem"/> <!-- unitPrice --> - <call-object-method method-name="getBasePrice" obj-field-name="item" ret-field="unitPrice" ret-map-name="thisItem"/> + <call-object-method method-name="getBasePrice" obj-field="item" ret-field="unitPrice" ret-map-name="thisItem"/> <!-- quantity --> - <call-object-method method-name="getQuantity" obj-field-name="item" ret-field="quantity" ret-map-name="thisItem"/> + <call-object-method method-name="getQuantity" obj-field="item" ret-field="quantity" ret-map-name="thisItem"/> <!-- merchantItemId --> <call-simple-method method-name="getMerchantItemId"/> <!-- merchant private item data --> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml?rev=731797&r1=731796&r2=731797&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Mon Jan 5 16:58:33 2009 @@ -26,11 +26,11 @@ <field field="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> + <call-object-method obj-field="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> <if-compare field="mgrLoggedIn" operator="equals" value="true" type="String"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> + <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> + <call-object-method obj-field="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> <if-compare field="isOpen" operator="equals" value="false"> <set field="startingDrawerAmount" from-field="parameters.startingDrawerAmount" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> @@ -46,10 +46,10 @@ </call-class-method> <if-compare field="isDouble" operator="equals" value="true"> <make-value value-field="terminalState" entity-name="PosTerminalState"/> - <call-object-method obj-field-name="webPosSession" method-name="getId" ret-field="terminalState.posTerminalId"/> + <call-object-method obj-field="webPosSession" method-name="getId" ret-field="terminalState.posTerminalId"/> <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field="terminalState.openedDate"/> - <call-object-method obj-field-name="webPosSession" method-name="getUserLoginId" ret-field="terminalState.openedByUserLoginId"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.startingTxId"/> + <call-object-method obj-field="webPosSession" method-name="getUserLoginId" ret-field="terminalState.openedByUserLoginId"/> + <call-object-method obj-field="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.startingTxId"/> <set from-field="parameters.startingDrawerAmount" field="terminalState.startingDrawerAmount"/> <create-value value-field="terminalState"/> <check-errors/> @@ -85,11 +85,11 @@ <field field="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> + <call-object-method obj-field="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> <if-compare field="mgrLoggedIn" operator="equals" value="true"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> + <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTerminalState" ret-field="terminalState"/> + <call-object-method obj-field="webPosTransaction" method-name="getTerminalState" ret-field="terminalState"/> <if-not-empty field="terminalState"> <set field="amount" from-field="parameters.endingDrawerCashAmount" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> @@ -155,13 +155,13 @@ <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalOtherAmountNotValid"/></add-error> <check-errors/> </if-compare> - <call-object-method obj-field-name="webPosSession" method-name="getUserLoginId" ret-field="terminalState.closedByUserLoginId"/> + <call-object-method obj-field="webPosSession" method-name="getUserLoginId" ret-field="terminalState.closedByUserLoginId"/> <set from-field="parameters.endingDrawerCashAmount" field="terminalState.actualEndingCash"/> <set from-field="parameters.endingDrawerCheckAmount" field="terminalState.actualEndingCheck"/> <set from-field="parameters.endingDrawerCcAmount" field="terminalState.actualEndingCc"/> <set from-field="parameters.endingDrawerGcAmount" field="terminalState.actualEndingGc"/> <set from-field="parameters.endingDrawerOtherAmount" field="terminalState.actualEndingOther"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.endingTxId"/> + <call-object-method obj-field="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.endingTxId"/> <store-value value-field="terminalState"/> <check-errors/> <log level="info" message="Close PosTerminalState ${terminalState.endingTxId}"/> @@ -192,14 +192,14 @@ <field field="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> + <call-object-method obj-field="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> <if-compare field="mgrLoggedIn" operator="equals" value="true"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> + <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTerminalState" ret-field="terminalState"/> + <call-object-method obj-field="webPosTransaction" method-name="getTerminalState" ret-field="terminalState"/> <if-not-empty field="terminalState"> <set field="fieldName" value="openedDate" type="String"/> - <call-object-method obj-field-name="terminalState" method-name="getTimestamp" ret-field="openDate"> + <call-object-method obj-field="terminalState" method-name="getTimestamp" ret-field="openDate"> <field field="fieldName" type="String"/> </call-object-method> <entity-one entity-name="OrderHeader" value-field="orderHeader"> @@ -207,19 +207,19 @@ </entity-one> <if-not-empty field="orderHeader"> <set field="fieldName" value="orderDate" type="String"/> - <call-object-method obj-field-name="orderHeader" method-name="getTimestamp" ret-field="orderDate"> + <call-object-method obj-field="orderHeader" method-name="getTimestamp" ret-field="orderDate"> <field field="fieldName" type="String"/> </call-object-method> - <call-object-method obj-field-name="orderDate" method-name="after" ret-field="isAfter"> + <call-object-method obj-field="orderDate" method-name="after" ret-field="isAfter"> <field field="openDate" type="Timestamp"/> </call-object-method> <if-compare field="isAfter" operator="equals" value="true"> - <call-object-method obj-field-name="webPosSession" method-name="getDispatcher" ret-field="dispatcher"/> + <call-object-method obj-field="webPosSession" method-name="getDispatcher" ret-field="dispatcher"/> <set field="returnOrder.orderId" from-field="parameters.orderId"/> <set field="returnOrder.returnHeaderTypeId" value="CUSTOMER_RETURN"/> - <call-object-method obj-field-name="webPosSession" method-name="getUserLogin" ret-field="returnOrder.userLogin"/> + <call-object-method obj-field="webPosSession" method-name="getUserLogin" ret-field="returnOrder.userLogin"/> <set field="serviceName" value="quickReturnOrder"/> - <call-object-method obj-field-name="dispatcher" method-name="runSync" ret-field="returnResp"> + <call-object-method obj-field="dispatcher" method-name="runSync" ret-field="returnResp"> <field field="serviceName" type="String"/> <field field="returnOrder" type="java.util.Map"/> </call-object-method> @@ -261,9 +261,9 @@ <field field="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> + <call-object-method obj-field="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> <if-compare field="mgrLoggedIn" operator="equals" value="true" type="String"> - <call-object-method obj-field-name="webPosSession" method-name="logout"/> + <call-object-method obj-field="webPosSession" method-name="logout"/> <check-errors/> <else> <add-error><fail-property resource="WebPosUiLabels" property="WebPosNotManagerLoggedIn"/></add-error> @@ -285,11 +285,11 @@ <field field="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> + <call-object-method obj-field="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/> <if-compare field="mgrLoggedIn" operator="equals" value="true"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> + <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> + <call-object-method obj-field="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> <check-errors/> <if-compare field="isOpen" operator="equals" value="true"> <set field="amount" from-field="parameters.amountInOut" type="String"/> @@ -306,13 +306,13 @@ </call-class-method> <if-compare field="isDouble" operator="equals" value="true"> <make-value value-field="internTx" entity-name="PosTerminalInternTx"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/> + <call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/> <set field="internTx.paidAmount" from-field="parameters.amountInOut"/> <set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/> <set field="internTx.reasonEnumId" from-field="parameters.reasonInOut"/> <create-value value-field="internTx"/> <set from-field="parameters.type" field="paidInOut"/> - <call-object-method obj-field-name="webPosTransaction" method-name="paidInOut"> + <call-object-method obj-field="webPosTransaction" method-name="paidInOut"> <field field="paidInOut" type="String"/> </call-object-method> <else> @@ -346,7 +346,7 @@ <field field="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> + <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="amount" from-field="parameters.price" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> @@ -363,12 +363,12 @@ <if-compare field="isDouble" operator="equals" value="true"> <set from-field="parameters.sku" field="sku" type="String"/> <set from-field="parameters.price" field="price" type="Double"/> - <call-object-method obj-field-name="webPosTransaction" method-name="modifyPrice"> + <call-object-method obj-field="webPosTransaction" method-name="modifyPrice"> <field field="sku" type="String"/> <field field="price" type="double"/> </call-object-method> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="calcTax"/> + <call-object-method obj-field="webPosTransaction" method-name="calcTax"/> <check-errors/> <else> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerModifyPriceNotValidPrice"/></add-error> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |