svn commit: r730197 [2/2] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730197 [2/2] - in /ofbiz/trunk: applications/accounting/script
 
|
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=730197&r1=730196&r2=730197&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 Tue Dec 30 09:29:33 2008 @@ -21,23 +21,23 @@ <simple-method method-name="openTerminal" short-description="Open Terminal" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field-name="mgrLoggedIn"/> + <call-object-method obj-field-name="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-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="isOpen" ret-field-name="isOpen"/> + <call-object-method obj-field-name="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"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="startingDrawerAmount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" 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-name="terminalState.posTerminalId"/> - <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field-name="terminalState.openedDate"/> - <call-object-method obj-field-name="webPosSession" method-name="getUserLoginId" ret-field-name="terminalState.openedByUserLoginId"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTransactionId" ret-field-name="terminalState.startingTxId"/> + <call-object-method obj-field-name="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"/> <set from-field="parameters.startingDrawerAmount" field="terminalState.startingDrawerAmount"/> <create-value value-field="terminalState"/> <check-errors/> @@ -80,23 +80,23 @@ <simple-method method-name="closeTerminal" short-description="Close Terminal" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field-name="mgrLoggedIn"/> + <call-object-method obj-field-name="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-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTerminalState" ret-field-name="terminalState"/> + <call-object-method obj-field-name="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"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -108,7 +108,7 @@ <check-errors/> </if-compare> <set field="amount" from-field="parameters.endingDrawerCheckAmount" type="String"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -120,7 +120,7 @@ <check-errors/> </if-compare> <set field="amount" from-field="parameters.endingDrawerCcAmount" type="String"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -132,7 +132,7 @@ <check-errors/> </if-compare> <set field="amount" from-field="parameters.endingDrawerGcAmount" type="String"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -144,7 +144,7 @@ <check-errors/> </if-compare> <set field="amount" from-field="parameters.endingDrawerOtherAmount" type="String"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" 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-name="terminalState.closedByUserLoginId"/> + <call-object-method obj-field-name="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-name="terminalState.endingTxId"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.endingTxId"/> <store-value value-field="terminalState"/> <check-errors/> <log level="info" message="Close PosTerminalState ${terminalState.endingTxId}"/> @@ -187,19 +187,19 @@ <simple-method method-name="voidOrder" short-description="Void Order" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field-name="mgrLoggedIn"/> + <call-object-method obj-field-name="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-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="getTerminalState" ret-field-name="terminalState"/> + <call-object-method obj-field-name="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-name="openDate"> + <call-object-method obj-field-name="terminalState" method-name="getTimestamp" ret-field="openDate"> <field field-name="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-name="orderDate"> + <call-object-method obj-field-name="orderHeader" method-name="getTimestamp" ret-field="orderDate"> <field field-name="fieldName" type="String"/> </call-object-method> - <call-object-method obj-field-name="orderDate" method-name="after" ret-field-name="isAfter"> + <call-object-method obj-field-name="orderDate" method-name="after" ret-field="isAfter"> <field field-name="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-name="dispatcher"/> + <call-object-method obj-field-name="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-name="returnOrder.userLogin"/> + <call-object-method obj-field-name="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-name="returnResp"> + <call-object-method obj-field-name="dispatcher" method-name="runSync" ret-field="returnResp"> <field field-name="serviceName" type="String"/> <field field-name="returnOrder" type="java.util.Map"/> </call-object-method> @@ -256,12 +256,12 @@ <simple-method method-name="shutdown" short-description="Shutdown" login-required="true"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field-name="mgrLoggedIn"/> + <call-object-method obj-field-name="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"/> <check-errors/> @@ -280,16 +280,16 @@ <simple-method method-name="paidOutAndIn" short-description="Paid Out and In" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field-name="mgrLoggedIn"/> + <call-object-method obj-field-name="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-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="isOpen" ret-field-name="isOpen"/> + <call-object-method obj-field-name="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"/> @@ -297,7 +297,7 @@ <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -306,7 +306,7 @@ </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-name="internTx.posTerminalLogId"/> + <call-object-method obj-field-name="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"/> @@ -341,19 +341,19 @@ <simple-method method-name="modifyPrice" short-description="Modify Price" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="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"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml?rev=730197&r1=730196&r2=730197&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml Tue Dec 30 09:29:33 2008 @@ -21,19 +21,19 @@ <simple-method method-name="payCash" short-description="Pay Cash" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="amount" from-field="parameters.amount" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -47,7 +47,7 @@ </call-object-method> <check-errors/> <set from-field="parameters.amount" field="amounStr"/> - <call-object-method obj-field-name="webPosTransaction" method-name="processAmount" ret-field-name="amount"> + <call-object-method obj-field-name="webPosTransaction" method-name="processAmount" ret-field="amount"> <field field-name="amounStr" type="String"/> </call-object-method> <check-errors/> @@ -77,19 +77,19 @@ <simple-method method-name="payCheck" short-description="Pay Check" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="amount" from-field="parameters.amount" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -98,12 +98,12 @@ </call-class-method> <if-compare field="isDouble" operator="equals" value="true"> <set field="paymentType" value="PERSONAL_CHECK"/> - <call-object-method obj-field-name="webPosTransaction" method-name="checkPaymentMethodType" ret-field-name="paymentCheck"> + <call-object-method obj-field-name="webPosTransaction" method-name="checkPaymentMethodType" ret-field="paymentCheck"> <field field-name="paymentType" type="String"/> </call-object-method> <check-errors/> - <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getNoPaymentCode" ret-field-name="noPaymentCode"/> - <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getExternalPaymentCode" ret-field-name="externalPaymentCode"/> + <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getNoPaymentCode" ret-field="noPaymentCode"/> + <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getExternalPaymentCode" ret-field="externalPaymentCode"/> <!-- No Payment --> <if-compare-field field="paymentCheck" operator="equals" to-field="noPaymentCode"> <call-object-method obj-field-name="webPosTransaction" method-name="clearPayment"> @@ -154,19 +154,19 @@ <simple-method method-name="payGiftCard" short-description="Pay Gift Card" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="amount" from-field="parameters.amount" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -175,12 +175,12 @@ </call-class-method> <if-compare field="isDouble" operator="equals" value="true"> <set field="paymentType" value="GIFT_CARD"/> - <call-object-method obj-field-name="webPosTransaction" method-name="checkPaymentMethodType" ret-field-name="paymentCheck"> + <call-object-method obj-field-name="webPosTransaction" method-name="checkPaymentMethodType" ret-field="paymentCheck"> <field field-name="paymentType" type="String"/> </call-object-method> <check-errors/> - <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getNoPaymentCode" ret-field-name="noPaymentCode"/> - <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getExternalPaymentCode" ret-field-name="externalPaymentCode"/> + <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getNoPaymentCode" ret-field="noPaymentCode"/> + <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getExternalPaymentCode" ret-field="externalPaymentCode"/> <!-- No Payment --> <if-compare-field field="paymentCheck" operator="equals" to-field="noPaymentCode"> <call-object-method obj-field-name="webPosTransaction" method-name="processNoPayment"> @@ -227,19 +227,19 @@ <simple-method method-name="payCredit" short-description="Pay Credit Card" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="amount" from-field="parameters.amount" type="String"/> <set field="allowNegative" value="false" type="Boolean"/> <set field="allowPositive" value="true" type="Boolean"/> <set field="minDecimal" value="0" type="Integer"/> <set field="maxDecimal" value="3" type="Integer"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field-name="isDouble"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble"> <field field-name="amount" type="String"/> <field field-name="allowNegative" type="boolean"/> <field field-name="allowPositive" type="boolean"/> @@ -248,12 +248,12 @@ </call-class-method> <if-compare field="isDouble" operator="equals" value="true"> <set field="paymentType" value="CREDIT_CARD"/> - <call-object-method obj-field-name="webPosTransaction" method-name="checkPaymentMethodType" ret-field-name="paymentCheck"> + <call-object-method obj-field-name="webPosTransaction" method-name="checkPaymentMethodType" ret-field="paymentCheck"> <field field-name="paymentType" type="String"/> </call-object-method> <check-errors/> - <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getNoPaymentCode" ret-field-name="noPaymentCode"/> - <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getExternalPaymentCode" ret-field-name="externalPaymentCode"/> + <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getNoPaymentCode" ret-field="noPaymentCode"/> + <call-class-method class-name="org.ofbiz.webpos.transaction.WebPosTransaction" method-name="getExternalPaymentCode" ret-field="externalPaymentCode"/> <!-- No Payment --> <if-compare-field field="paymentCheck" operator="equals" to-field="noPaymentCode"> <call-object-method obj-field-name="webPosTransaction" method-name="processNoPayment"> @@ -281,7 +281,7 @@ <!-- test credit card --> <if-not-empty field="parameters.cardNum"> <set field="cardNum" from-field="parameters.cardNum"/> - <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isCreditCard" ret-field-name="isCreditCard"> + <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isCreditCard" ret-field="isCreditCard"> <field field-name="cardNum" type="String"/> </call-class-method> <if-compare field="isCreditCard" operator="equals" value="false" type="String"> @@ -292,7 +292,7 @@ <if-not-empty field="parameters.expMonth"> <set field="cardExp" from-field="parameters.expMonth"/> <string-append string="${parameters.expYear}" field-name="cardExp"/> - <call-object-method obj-field-name="cardExp" method-name="length" ret-field-name="length"/> + <call-object-method obj-field-name="cardExp" method-name="length" ret-field="length"/> <if-compare field="length" operator="not-equals" value="6"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPaymentCredictCardInvalidExpiringDate"/></add-error> <check-errors/> @@ -305,21 +305,21 @@ <!-- test security code - allow blank for illegible cards --> <if-not-empty field="parameters.securityCode"> <set field="securityCode" from-field="parameters.securityCode"/> - <call-object-method obj-field-name="securityCode" method-name="length" ret-field-name="length"/> + <call-object-method obj-field-name="securityCode" method-name="length" ret-field="length"/> <if-compare field="length" operator="greater" value="4"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPaymentCredictCardInvalidSecurityCode"/></add-error> <check-errors/> </if-compare> </if-not-empty> <set field="amountStr" from-field="parameters.amount"/> - <call-object-method obj-field-name="webPosTransaction" method-name="processAmount" ret-field-name="amount"> + <call-object-method obj-field-name="webPosTransaction" method-name="processAmount" ret-field="amount"> <field field-name="amountStr" type="String"/> </call-object-method> <check-errors/> <log level="info" message="Processing Credit Card Amount : ${amount}"/> <set from-field="parameters.firstName" field="firstName"/> <set from-field="parameters.lastName" field="lastName"/> - <call-object-method obj-field-name="webPosTransaction" method-name="makeCreditCardVo" ret-field-name="paymentId"> + <call-object-method obj-field-name="webPosTransaction" method-name="makeCreditCardVo" ret-field="paymentId"> <field field-name="cardNum" type="String"/> <field field-name="cardExp" type="String"/> <field field-name="firstName" type="String"/> @@ -386,14 +386,14 @@ <simple-method method-name="processSale" short-description="Process Sale" login-required="true"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="processSale" ret-field-name="changeDue"/> + <call-object-method obj-field-name="webPosTransaction" method-name="processSale" ret-field="changeDue"/> <check-errors/> <log level="info" message="Processe sale for a change due amount of ${changeDue}"/> <else> @@ -406,22 +406,22 @@ <simple-method method-name="setRefNum" short-description="Set Payment Reference Number" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="payment" value="0" type="Integer"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field-name="numPayments"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field="numPayments"/> <check-errors/> <while> <condition> <if-compare-field field="payment" to-field="numPayments" operator="less"/> </condition> <then> - <call-object-method obj-field-name="webPosTransaction" method-name="getPaymentMethodTypeId" ret-field-name="paymentMethodTypeId"> + <call-object-method obj-field-name="webPosTransaction" method-name="getPaymentMethodTypeId" ret-field="paymentMethodTypeId"> <field field-name="payment" type="int"/> </call-object-method> <check-errors/> @@ -501,22 +501,22 @@ <simple-method method-name="clearPayment" short-description="Clear Payment" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <set field="payment" value="0" type="Integer"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field-name="numPayments"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field="numPayments"/> <check-errors/> <while> <condition> <if-compare-field field="payment" to-field="numPayments" operator="less"/> </condition> <then> - <call-object-method obj-field-name="webPosTransaction" method-name="getPaymentMethodTypeId" ret-field-name="paymentMethodTypeId"> + <call-object-method obj-field-name="webPosTransaction" method-name="getPaymentMethodTypeId" ret-field="paymentMethodTypeId"> <field field-name="payment" type="int"/> </call-object-method> <check-errors/> @@ -529,7 +529,7 @@ </call-object-method> <check-errors/> <log level="info" message="Cleared CASH payment ${payment}"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field-name="numPayments"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field="numPayments"/> <check-errors/> <set field="payment" value="-1" type="Integer"/> </if-compare> @@ -543,7 +543,7 @@ </call-object-method> <check-errors/> <log level="info" message="Cleared CHECK payment ${payment}"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field-name="numPayments"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field="numPayments"/> <check-errors/> <set field="payment" value="-1" type="Integer"/> </if-compare> @@ -557,7 +557,7 @@ </call-object-method> <check-errors/> <log level="info" message="Cleared GIFT CARD payment ${payment}"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field-name="numPayments"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field="numPayments"/> <check-errors/> <set field="payment" value="-1" type="Integer"/> </if-compare> @@ -571,7 +571,7 @@ </call-object-method> <check-errors/> <log level="info" message="Cleared CREDIT CARD payment ${payment}"/> - <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field-name="numPayments"/> + <call-object-method obj-field-name="webPosTransaction" method-name="getNumberOfPayments" ret-field="numPayments"/> <check-errors/> <set field="payment" value="-1" type="Integer"/> </if-compare> @@ -595,12 +595,12 @@ <simple-method method-name="clearAllPayments" short-description="Clear All Payments" login-required="true"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> <call-object-method obj-field-name="webPosTransaction" method-name="clearPayments"/> <check-errors/> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.xml?rev=730197&r1=730196&r2=730197&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.xml Tue Dec 30 09:29:33 2008 @@ -21,17 +21,17 @@ <simple-method method-name="addPromoCode" short-description="Add Promotion Code" login-required="true"> <if-not-empty field="parameters.confirm"> <set field="posTerminalId" value="null"/> - <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field-name="webPosSession"> + <call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession"> <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <field field-name="posTerminalId" type="String"/> </call-class-method> <if-not-empty field="webPosSession"> - <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field-name="webPosTransaction"/> + <call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <call-object-method obj-field-name="webPosTransaction" method-name="isOpen" ret-field-name="isOpen"/> + <call-object-method obj-field-name="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> <if-compare field="isOpen" operator="equals" value="true" type="String"> <set field="promoCode" from-field="parameters.promoCode"/> - <call-object-method obj-field-name="webPosTransaction" method-name="addProductPromoCode" ret-field-name="result"> + <call-object-method obj-field-name="webPosTransaction" method-name="addProductPromoCode" ret-field="result"> <field field-name="promoCode" type="String"/> </call-object-method> <check-errors/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |