Author: jacopoc
Date: Sat Oct 21 09:08:48 2006 New Revision: 466419 URL: http://svn.apache.org/viewvc?view=rev&rev=466419 Log: converted deprecated minilang operations to the set operation. Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?view=diff&rev=466419&r1=466418&r2=466419 ============================================================================== --- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Sat Oct 21 09:08:48 2006 @@ -148,7 +148,7 @@ <!-- create the email address --> <if-not-empty field-name="parameters.emailAddress"> <set from-field="partyId" field="emailMap.partyId"/> - <string-to-field field-name="contactMechPurposeTypeId" map-name="emailMap" string="PRIMARY_EMAIL"/> + <set field="emailMap.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> <!-- call the create email service --> <call-service service-name="createPartyEmailAddress" in-map-name="emailMap"/> </if-not-empty> @@ -166,7 +166,7 @@ <!-- create home phone --> <if-not-empty field-name="homeContactNumber" map-name="parameters"> <set from-field="partyId" field="homePhoneMap.partyId"/> - <string-to-field field-name="contactMechPurposeTypeId" map-name="homePhoneMap" string="PHONE_HOME"/> + <set field="homePhoneMap.contactMechPurposeTypeId" value="PHONE_HOME"/> <!-- call create telecom service --> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneMap"/> </if-not-empty> @@ -183,7 +183,7 @@ <!-- create work phone --> <if-not-empty field-name="workContactNumber" map-name="parameters"> <set from-field="partyId" field="workPhoneMap.partyId"/> - <string-to-field field-name="contactMechPurposeTypeId" map-name="workPhoneMap" string="PHONE_WORK"/> + <set field="workPhoneMap.contactMechPurposeTypeId" value="PHONE_WORK"/> <!-- call create telecom service --> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneMap"/> </if-not-empty> @@ -206,12 +206,12 @@ <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> <result-to-request result-name="contactMechId"/> </call-service> - <field-to-field field-name="partyId" map-name="tempMap" to-map-name="addressPurposeContext"/> + <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> <!-- create the shipping location --> - <string-to-field string="SHIPPING_LOCATION" field-name="contactMechPurposeTypeId" map-name="addressPurposeContext"/> + <set value="SHIPPING_LOCATION" field="addressPurposeContext.contactMechPurposeTypeId"/> <call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/> <!-- also consider this address the general correspondence address --> - <string-to-field string="GENERAL_LOCATION" field-name="contactMechPurposeTypeId" map-name="addressPurposeContext"/> + <set value="GENERAL_LOCATION" field="addressPurposeContext.contactMechPurposeTypeId"/> <call-service service-name="createPartyContactMechPurpose" in-map-name="addressPurposeContext"/> </if-compare> </else> Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?view=diff&rev=466419&r1=466418&r2=466419 ============================================================================== --- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original) +++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Sat Oct 21 09:08:48 2006 @@ -20,15 +20,15 @@ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd"> <simple-method method-name="createOrderDeliverySchedule" short-description="Creates a new Purchase Order Schedule"> <!-- Verify the user is allowed to set the fields --> - <string-to-field string="createOrderDeliverySchedule" field-name="callingMethodName"/> - <string-to-field string="CREATE" field-name="checkAction"/> + <set value="createOrderDeliverySchedule" field="callingMethodName"/> + <set value="CREATE" field="checkAction"/> <call-simple-method method-name="checkSupplierRelatedPermission"/> <check-errors/> <make-value entity-name="OrderDeliverySchedule" value-name="schedule"/> <set-pk-fields map-name="parameters" value-name="schedule"/> <if-empty field-name="orderItemSeqId" map-name="schedule"> - <string-to-field string="_NA_" field-name="orderItemSeqId" map-name="schedule"/> + <set value="_NA_" field="schedule.orderItemSeqId"/> </if-empty> <!-- only set statusId if hasScheduleAdminRelatedPermission --> @@ -36,7 +36,7 @@ <if-has-permission permission="ORDERMGR" action="_${checkAction}"> <else> <!-- no permission, set to initial --> - <string-to-field string="ODS_SUBMITTED" field-name="statusId" map-name="schedule"/> + <set value="ODS_SUBMITTED" field="schedule.statusId"/> </else> </if-has-permission> @@ -44,8 +44,8 @@ </simple-method> <simple-method method-name="updateOrderDeliverySchedule" short-description="Updates an existing Purchase Order Schedule"> <!-- Verify the user is allowed to edit the fields --> - <string-to-field string="updateOrderDeliverySchedule" field-name="callingMethodName"/> - <string-to-field string="UPDATE" field-name="checkAction"/> + <set value="updateOrderDeliverySchedule" field="callingMethodName"/> + <set value="UPDATE" field="checkAction"/> <call-simple-method method-name="checkSupplierRelatedPermission"/> <check-errors/> @@ -55,12 +55,12 @@ <find-by-primary-key entity-name="OrderDeliverySchedule" map-name="lookupPkMap" value-name="schedule"/> <!-- only set statusId if hasScheduleAdminRelatedPermission --> - <field-to-env field-name="statusId" map-name="schedule" env-name="saveStatusId"/> + <set from-field="schedule.statusId" field="saveStatusId"/> <set-nonpk-fields value-name="schedule" map-name="parameters"/> <if-has-permission permission="ORDERMGR" action="_${checkAction}"> <else> <!-- no permission, restore saved status --> - <env-to-field env-name="saveStatusId" field-name="statusId" map-name="schedule"/> + <set from-field="saveStatusId" field="schedule.statusId"/> </else> </if-has-permission> @@ -68,13 +68,13 @@ <store-value value-name="schedule"/> </simple-method> <simple-method method-name="sendOrderDeliveryScheduleNotification" short-description="Send Order Delivery Schedule Notification"> - <string-to-field string="sendOrderDeliveryScheduleNotification" field-name="callingMethodName"/> - <string-to-field string="UPDATE" field-name="checkAction"/> + <set value="sendOrderDeliveryScheduleNotification" field="callingMethodName"/> + <set value="UPDATE" field="checkAction"/> <call-simple-method method-name="checkSupplierRelatedPermission"/> <check-errors/> <if-empty field-name="parameters.orderItemSeqId"> - <string-to-field string="_NA_" field-name="parameters.orderItemSeqId"/> + <set value="_NA_" field="parameters.orderItemSeqId"/> </if-empty> <make-value entity-name="OrderDeliverySchedule" value-name="orderDeliverySchedule"/> @@ -82,23 +82,23 @@ <find-by-primary-key map-name="orderDeliverySchedule" value-name="orderDeliverySchedule"/> <!-- find email address for currently logged in user, set as sendFrom --> - <field-to-field field-name="partyId" map-name="userLogin" to-map-name="curUserPcmFindMap"/> - <string-to-field string="EMAIL_ADDRESS" field-name="contactMechTypeId" map-name="curUserPcmFindMap"/> + <set from-field="userLogin.partyId" field="curUserPcmFindMap.partyId"/> + <set value="EMAIL_ADDRESS" field="curUserPcmFindMap.contactMechTypeId"/> <find-by-and entity-name="PartyAndContactMech" map-name="curUserPcmFindMap" list-name="curUserPartyAndContactMechs"/> <first-from-list entry-name="curUserPartyAndContactMech" list-name="curUserPartyAndContactMechs"/> <string-append field-name="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/> <!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo --> - <string-to-field string="SHIPMENT_CLERK" field-name="roleTypeId" map-name="shipmentClerkFindMap"/> + <set value="SHIPMENT_CLERK" field="shipmentClerkFindMap.roleTypeId"/> <find-by-and entity-name="PartyRole" map-name="shipmentClerkFindMap" list-name="shipmentClerkRoles"/> <iterate entry-name="shipmentClerkRole" list-name="shipmentClerkRoles"> - <env-to-env env-name="shipmentClerkRole.partyId" to-env-name="sendToPartyIdMap.${shipmentClerkRole.partyId}"/> + <set from-field="shipmentClerkRole.partyId" field="sendToPartyIdMap.${shipmentClerkRole.partyId}"/> </iterate> <!-- go through all send to parties and get email addresses --> <iterate-map key-name="sendToPartyId" value-name="sendToPartyIdValue" map-name="sendToPartyIdMap"> - <env-to-field env-name="sendToPartyId" field-name="partyId" map-name="sendToPartyPcmFindMap"/> - <string-to-field string="EMAIL_ADDRESS" field-name="contactMechTypeId" map-name="sendToPartyPcmFindMap"/> + <set from-field="sendToPartyId" field="sendToPartyPcmFindMap.partyId"/> + <set value="EMAIL_ADDRESS" field="sendToPartyPcmFindMap.contactMechTypeId"/> <find-by-and entity-name="PartyAndContactMech" map-name="sendToPartyPcmFindMap" list-name="sendToPartyPartyAndContactMechs"/> <iterate entry-name="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs"> <string-append field-name="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/> @@ -106,13 +106,13 @@ </iterate-map> <!-- set subject, contentType, templateName, templateData --> - <string-to-field string="Delivery Information Updated for Order #${orderDeliverySchedule.orderId}" field-name="subject" map-name="sendEmailMap"/> + <set value="Delivery Information Updated for Order #${orderDeliverySchedule.orderId}" field="subject.sendEmailMap"/> <if-compare field-name="orderDeliverySchedule.orderItemSeqId" operator="not-equals" value="_NA_"> <string-append string=" Item #${orderDeliverySchedule.orderItemSeqId}" field-name="subject" map-name="sendEmailMap"/> </if-compare> - <string-to-field string="text/html" field-name="contentType" map-name="sendEmailMap"/> - <string-to-field string="default/OrderDeliveryUpdatedNotice.ftl" field-name="templateName" map-name="sendEmailMap"/> - <env-to-env env-name="orderDeliverySchedule" to-env-name="sendEmailMap.templateData.orderDeliverySchedule"/> + <set value="text/html" field="sendEmailMap.contentType"/> + <set value="default/OrderDeliveryUpdatedNotice.ftl" field="sendEmailMap.templateName"/> + <set from-field="orderDeliverySchedule" field="sendEmailMap.templateData.orderDeliverySchedule"/> <!-- call sendGenericNotificationEmail service, if enough information was found --> <log level="info" message="Sending generic notification email (if all info is in place): ${sendEmailMap}"/> @@ -133,8 +133,8 @@ </simple-method> <simple-method method-name="checkSupplierRelatedOrderPermissionService" short-description="Check Supplier Related Permission Service"> - <field-to-env field-name="checkAction" map-name="parameters" env-name="checkAction"/> - <field-to-env field-name="callingMethodName" map-name="parameters" env-name="callingMethodName"/> + <set from-field="parameters.checkAction" field="checkAction"/> + <set from-field="parameters.callingMethodName" field="callingMethodName"/> <call-simple-method method-name="checkSupplierRelatedPermission"/> <field-to-result field-name="hasSupplierRelatedPermission"/> </simple-method> @@ -142,34 +142,34 @@ <!-- Should be called in-line to use its out parameter indicating whether the user has permission or not. --> <simple-method method-name="checkSupplierRelatedPermission" short-description="Check Supplier Related Permission"> <if-empty field-name="callingMethodName"> - <string-to-field string="this operation" field-name="callingMethodName"/> + <set value="this operation" field="callingMethodName"/> </if-empty> <if-empty field-name="checkAction"> - <string-to-field string="UPDATE" field-name="checkAction"/> + <set value="UPDATE" field="checkAction"/> </if-empty> - <string-to-field field-name="hasSupplierRelatedPermission" string="false"/> + <set field="hasSupplierRelatedPermission" value="false"/> <if> <condition> <if-has-permission permission="ORDERMGR" action="_${checkAction}"/> </condition> <then> - <string-to-field field-name="hasSupplierRelatedPermission" string="true"/> + <set field="hasSupplierRelatedPermission" value="true"/> </then> <else> - <field-to-field field-name="orderId" map-name="parameters" to-map-name="lookupOrderRoleMap"/> - <field-to-field field-name="partyId" map-name="userLogin" to-map-name="lookupOrderRoleMap"/> - <string-to-field string="SUPPLIER_AGENT" field-name="roleTypeId" map-name="lookupOrderRoleMap"/> + <set from-field="parameters.orderId" field="lookupOrderRoleMap.orderId"/> + <set from-field="userLogin.partyId" field="lookupOrderRoleMap.partyId"/> + <set value="SUPPLIER_AGENT" field="lookupOrderRoleMap.roleTypeId"/> <find-by-primary-key entity-name="OrderRole" map-name="lookupOrderRoleMap" value-name="permOrderRole"/> <if> <condition> <if-empty field-name="permOrderRole"/> </condition> <then> - <string-to-field field-name="hasSupplierRelatedPermission" string="false"/> + <set field="hasSupplierRelatedPermission" value="false"/> <string-to-list list-name="error_list" string="ERROR: You do not have permission to ${checkAction} Delivery Schedule Information; you must be associated with this order as a Supplier Agent or have the ORDERMGR_${checkAction} permission."/> </then> <else> - <string-to-field field-name="hasSupplierRelatedPermission" string="true"/> + <set field="hasSupplierRelatedPermission" value="true"/> </else> </if> </else> Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?view=diff&rev=466419&r1=466418&r2=466419 ============================================================================== --- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Sat Oct 21 09:08:48 2006 @@ -605,20 +605,20 @@ <!-- create the return items --> <iterate entry-name="orderItem" list-name="orderItems"> - <field-to-field field-name="returnId" to-map-name="newItemCtx"/> - <field-to-field field-name="returnReasonId" map-name="parameters" to-map-name="newItemCtx"/> - <field-to-field field-name="returnTypeId" map-name="parameters" to-map-name="newItemCtx"/> + <set from-field="returnId" field="newItemCtx.returnId"/> + <set from-field="parameters.returnReasonId" field="newItemCtx.returnReasonId"/> + <set from-field="parameters.returnTypeId" field="newItemCtx.returnTypeId"/> <if-not-empty field-name="orderItem.productId"> - <env-to-field env-name="orderItem.productId" field-name="productId" map-name="newItemCtx"/> + <set from-field="orderItem.productId" field="newItemCtx.productId"/> </if-not-empty> - <env-to-field env-name="orderItem.orderId" field-name="orderId" map-name="newItemCtx"/> - <env-to-field env-name="orderItem.orderItemSeqId" field-name="orderItemSeqId" map-name="newItemCtx"/> - <env-to-field env-name="orderItem.itemDescription" field-name="description" map-name="newItemCtx"/> + <set from-field="orderItem.orderId" field="newItemCtx.orderId"/> + <set from-field="orderItem.orderItemSeqId" field="newItemCtx.orderItemSeqId"/> + <set from-field="orderItem.itemDescription" field="newItemCtx.description"/> <!-- get the returnable price and quantity --> - <field-to-field field-name="orderItem" to-map-name="itemCheckMap"/> + <set from-field="orderItem" field="itemCheckMap.orderItem"/> <call-service service-name="getReturnableQuantity" in-map-name="itemCheckMap"> <result-to-field result-name="returnableQuantity" field-name="returnQuantity" map-name="newItemCtx"/> <result-to-field result-name="returnablePrice" field-name="returnPrice" map-name="newItemCtx"/> @@ -697,10 +697,10 @@ <!-- create a manual balance adjustment based on the difference between order total and return total --> <if-compare field-name="availableReturnTotal" operator="not-equals" value="0.00" type="Double"> - <string-to-field string="Balance Adjustment" field-name="description" map-name="balanceItemCtx"/> - <string-to-field string="RET_MAN_ADJ" field-name="returnAdjustmentTypeId" map-name="balanceItemCtx"/> + <set value="Balance Adjustment" field="balanceItemCtx.description"/> + <set value="RET_MAN_ADJ" field="balanceItemCtx.returnAdjustmentTypeId"/> - <field-to-field field-name="returnId" to-map-name="balanceItemCtx"/> + <set from-field="returnId" field="balanceItemCtx.returnId"/> <set field="balanceItemCtx.returnItemSeqId" value="_NA_"/> <set from-field="availableReturnTotal" field="balanceItemCtx.amount" /> <log level="warning" message="Creating a balance adjustment of [${availableReturnTotal}] for return [${returnId}]"/> @@ -710,13 +710,13 @@ </if-compare> <!-- update the header status --> - <string-to-field string="RETURN_ACCEPTED" field-name="statusId" map-name="updateHeaderCtx"/> - <field-to-field field-name="returnId" to-map-name="updateHeaderCtx"/> + <set value="RETURN_ACCEPTED" field="updateHeaderCtx.statusId"/> + <set from-field="returnId" field="updateHeaderCtx.returnId"/> <call-service service-name="updateReturnHeader" in-map-name="updateHeaderCtx" include-user-login="true"/> <!-- auto-receive this return if we passed in the flag --> <if-compare field-name="receiveReturn" map-name="parameters" operator="equals" value="true" type="Boolean"> - <field-to-field field-name="returnId" to-map-name="receiveCtx"/> + <set from-field="returnId" field="receiveCtx.returnId"/> <call-service service-name="quickReceiveReturn" in-map-name="receiveCtx"/> <else> <!-- update the header status --> Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?view=diff&rev=466419&r1=466418&r2=466419 ============================================================================== --- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Sat Oct 21 09:08:48 2006 @@ -225,14 +225,14 @@ </calculate> <!-- If this new issuance will cause the quantityOnHandTotal to go below the minimumStock, create a new requirement --> <if-compare-field field-name="newQuantityOnHand" to-field-name="productFacility.minimumStock" operator="less" type="Double"> - <field-to-field field-name="inventoryItem.productId" to-map-name="inputMap" to-field-name="productId"/> + <set from-field="inventoryItem.productId" field="inputMap.productId"/> <if-not-empty field-name="productFacility.reorderQuantity"> - <field-to-field field-name="productFacility.reorderQuantity" to-map-name="inputMap" to-field-name="quantity"/> + <set from-field="productFacility.reorderQuantity" field="inputMap.quantity"/> <else> - <field-to-field field-name="parameters.quantity" to-map-name="inputMap" to-field-name="quantity"/> + <set from-field="parameters.quantity" field="inputMap.quantity"/> </else> </if-not-empty> - <string-to-field string="PRODUCT_REQUIREMENT" map-name="inputMap" field-name="requirementTypeId"/> + <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/> <call-service service-name="createRequirement" in-map-name="inputMap"> <result-to-field field-name="parameters.requirementId" result-name="requirementId"/> </call-service> @@ -271,14 +271,14 @@ </calculate> <!-- If before this reservation the availableToPromiseTotal was over minimumStock, create a new requirement --> <if-compare-field field-name="oldAvailableToPromise" to-field-name="productFacility.minimumStock" operator="greater-equals" type="Double"> - <field-to-field field-name="inventoryItem.productId" to-map-name="inputMap" to-field-name="productId"/> + <set from-field="inventoryItem.productId" field="inputMap.productId"/> <if-not-empty field-name="productFacility.reorderQuantity"> - <field-to-field field-name="productFacility.reorderQuantity" to-map-name="inputMap" to-field-name="quantity"/> + <set from-field="productFacility.reorderQuantity" field="inputMap.quantity"/> <else> - <field-to-field field-name="parameters.quantity" to-map-name="inputMap" to-field-name="quantity"/> + <set from-field="parameters.quantity" field="inputMap.quantity"/> </else> </if-not-empty> - <string-to-field string="PRODUCT_REQUIREMENT" map-name="inputMap" field-name="requirementTypeId"/> + <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/> <call-service service-name="createRequirement" in-map-name="inputMap"> <result-to-field field-name="parameters.requirementId" result-name="requirementId"/> </call-service> Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?view=diff&rev=466419&r1=466418&r2=466419 ============================================================================== --- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Sat Oct 21 09:08:48 2006 @@ -22,13 +22,13 @@ <make-value value-name="newEntity" entity-name="Requirement"/> <sequenced-id-to-env sequence-name="Requirement" env-name="requirementId"/> <to-string field-name="requirementId"/> - <env-to-field env-name="requirementId" map-name="newEntity"/> + <set from-field="requirementId" field="newEntity.requirementId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field-name="statusId" map-name="parameters"> - <string-to-field string="REQ_CREATED" field-name="statusId" map-name="newEntity"/> + <set value="REQ_CREATED" field="newEntity.statusId"/> </if-empty> <now-timestamp-to-env env-name="nowTimestamp"/> - <env-to-field env-name="nowTimestamp" field-name="createdDate" map-name="newEntity"/> + <set from-field="nowTimestamp" field="newEntity.createdDate"/> <create-value value-name="newEntity"/> <field-to-result field-name="requirementId" result-name="requirementId"/> </simple-method> |
Free forum by Nabble | Edit this page |