svn commit: r1127651 - in /ofbiz/trunk: framework/base/src/org/ofbiz/b
Locked
 
|
Author: mrisaliti
Date: Wed May 25 19:45:44 2011 New Revision: 1127651 URL: http://svn.apache.org/viewvc?rev=1127651&view=rev Log: Removed the method UtilNumber.stringToBigDecimal and the references in webpos component Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java?rev=1127651&r1=1127650&r2=1127651&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilNumber.java Wed May 25 19:45:44 2011 @@ -20,8 +20,6 @@ package org.ofbiz.base.util; import java.math.BigDecimal; -import java.text.NumberFormat; -import java.text.ParseException; import java.util.HashMap; import java.util.Locale; @@ -252,27 +250,4 @@ public class UtilNumber { return (bd.toString() + "%"); } - - /** - * Method to convert a string into BigDecimal. - * - * @param stringToConvert String to convert to BigDecimal - * @return The string converted to BigDecimal - */ - public static BigDecimal stringToBigDecimal(String stringToConvert, Locale locale) { - if (stringToConvert != null && stringToConvert != "") { - Number numb = null; - NumberFormat nf = NumberFormat.getInstance(locale); - nf.setMaximumFractionDigits(10); - try { - numb = nf.parse(stringToConvert); - return (new BigDecimal(numb.toString())); - } catch (ParseException e) { - return null; - } - } - else { - return null; - } - } } 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=1127651&r1=1127650&r2=1127651&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 Wed May 25 19:45:44 2011 @@ -31,27 +31,31 @@ under the License. <check-errors/> <call-object-method obj-field="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> <if-compare field="isOpen" operator="equals" value="false"> - <set field="startingDrawerAmountStr" from-field="parameters.startingDrawerAmount" type="String"/> - <log message="startingDrawerAmountStr: ${startingDrawerAmountStr}" level="always"/> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="startingDrawerAmount"> - <field field="startingDrawerAmountStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-not-empty field="startingDrawerAmount"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="startingDrawerAmount"> + <convert type="BigDecimal" to-field="startingDrawerAmount" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> + <if-empty field="context.startingDrawerAmount"> + <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/></add-error> + <check-errors/> + <else> <make-value value-field="terminalState" entity-name="PosTerminalState"/> <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="webPosSession" method-name="getUserLoginId" ret-field="terminalState.openedByUserLoginId"/> <call-object-method obj-field="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.startingTxId"/> - <set from-field="startingDrawerAmount" field="terminalState.startingDrawerAmount" type="BigDecimal"/> + <set from-field="context.startingDrawerAmount" field="terminalState.startingDrawerAmount" type="BigDecimal"/> <create-value value-field="terminalState"/> <check-errors/> <log level="info" message="Created PosTerminalState ${terminalState.startingTxId}"/> - <else> - <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/></add-error> - <check-errors/> </else> - </if-not-empty> + </if-empty> <else> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerTerminalAlreadyOpened"/></add-error> <check-errors/> @@ -82,67 +86,92 @@ under the License. <check-errors/> <call-object-method obj-field="webPosTransaction" method-name="getTerminalState" ret-field="terminalState"/> <if-not-empty field="terminalState"> - <set field="endingDrawerCashAmountStr" from-field="parameters.endingDrawerCashAmount" type="String"/> - <if-not-empty field="endingDrawerCashAmountStr"> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="endingDrawerCashAmount"> - <field field="endingDrawerCashAmountStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-empty field="endingDrawerCashAmount"> + <if-not-empty field="parameters.endingDrawerCashAmount"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="endingDrawerCashAmount"> + <convert type="BigDecimal" to-field="endingDrawerCashAmount" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> + <if-empty field="context.endingDrawerCashAmount"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCashAmountNotValid"/></add-error> <check-errors/> </if-empty> </if-not-empty> - <set field="endingDrawerCheckAmountStr" from-field="parameters.endingDrawerCheckAmount" type="String"/> - <if-not-empty field="endingDrawerCheckAmountStr"> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="endingDrawerCheckAmount"> - <field field="endingDrawerCheckAmountStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-empty field="endingDrawerCheckAmount"> + <if-not-empty field="parameters.endingDrawerCheckAmount"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="endingDrawerCheckAmount"> + <convert type="BigDecimal" to-field="endingDrawerCheckAmount" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCheckAmountNotValid"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> + <if-empty field="context.endingDrawerCheckAmount"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCheckAmountNotValid"/></add-error> <check-errors/> </if-empty> </if-not-empty> - <set field="endingDrawerCcAmountStr" from-field="parameters.endingDrawerCcAmount" type="String"/> - <if-not-empty field="endingDrawerCcAmountStr"> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="endingDrawerCcAmount"> - <field field="endingDrawerCcAmountStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-empty field="endingDrawerCcAmount"> + <if-not-empty field="parameters.endingDrawerCcAmount"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="endingDrawerCcAmount"> + <convert type="BigDecimal" to-field="endingDrawerCcAmount" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCcAmountNotValid"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> + <if-empty field="context.endingDrawerCcAmount"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCcAmountNotValid"/></add-error> <check-errors/> </if-empty> </if-not-empty> - <set field="endingDrawerGcAmountStr" from-field="parameters.endingDrawerGcAmount" type="String"/> - <if-not-empty field="endingDrawerGcAmountStr"> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="endingDrawerGcAmount"> - <field field="endingDrawerGcAmountStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-empty field="endingDrawerGcAmount"> + <if-not-empty field="parameters.endingDrawerGcAmount"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="endingDrawerGcAmount"> + <convert type="BigDecimal" to-field="endingDrawerGcAmount" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalGcAmounNotValidt"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> + <if-empty field="context.endingDrawerGcAmount"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalGcAmounNotValidt"/></add-error> <check-errors/> </if-empty> </if-not-empty> - <set field="endingDrawerOtherAmountStr" from-field="parameters.endingDrawerOtherAmount" type="String"/> - <if-not-empty field="endingDrawerOtherAmountStr"> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="endingDrawerOtherAmount"> - <field field="endingDrawerOtherAmountStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-empty field="endingDrawerOtherAmount"> + <if-not-empty field="parameters.endingDrawerOtherAmount"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="endingDrawerOtherAmount"> + <convert type="BigDecimal" to-field="endingDrawerOtherAmount" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalOtherAmountNotValid"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> + <if-empty field="context.endingDrawerOtherAmount"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalOtherAmountNotValid"/></add-error> <check-errors/> </if-empty> </if-not-empty> <call-object-method obj-field="webPosSession" method-name="getUserLoginId" ret-field="terminalState.closedByUserLoginId"/> - <set field="terminalState.actualEndingCash" from-field="endingDrawerCashAmount" type="BigDecimal"/> - <set field="terminalState.actualEndingCheck" from-field="endingDrawerCheckAmount" type="BigDecimal"/> - <set field="terminalState.actualEndingCc" from-field="endingDrawerCcAmount" type="BigDecimal"/> - <set field="terminalState.actualEndingGc" from-field="endingDrawerGcAmount" type="BigDecimal"/> - <set field="terminalState.actualEndingOther" from-field="endingDrawerOtherAmount" type="BigDecimal"/> + <set field="terminalState.actualEndingCash" from-field="context.endingDrawerCashAmount" type="BigDecimal"/> + <set field="terminalState.actualEndingCheck" from-field="context.endingDrawerCheckAmount" type="BigDecimal"/> + <set field="terminalState.actualEndingCc" from-field="context.endingDrawerCcAmount" type="BigDecimal"/> + <set field="terminalState.actualEndingGc" from-field="context.endingDrawerGcAmount" type="BigDecimal"/> + <set field="terminalState.actualEndingOther" from-field="context.endingDrawerOtherAmount" type="BigDecimal"/> <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field="terminalState.closedDate"/> <call-object-method obj-field="webPosTransaction" method-name="getTransactionId" ret-field="terminalState.endingTxId"/> <store-value value-field="terminalState"/> @@ -271,15 +300,19 @@ under the License. <call-object-method obj-field="webPosTransaction" method-name="isOpen" ret-field="isOpen"/> <check-errors/> <if-compare field="isOpen" operator="equals" value="true"> - <set field="amountInOutStr" from-field="parameters.amountInOut" type="String"/> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="amountInOut"> - <field field="amountInOutStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-not-empty field="amountInOut"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="amountInOut"> + <convert type="BigDecimal" to-field="amountInOut" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerPaidOutAndIndAmountNotValid"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <if-not-empty field="context.amountInOut"> <make-value value-field="internTx" entity-name="PosTerminalInternTx"/> <call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/> - <set field="internTx.paidAmount" from-field="amountInOut" type="BigDecimal"/> + <set field="internTx.paidAmount" from-field="context.amountInOut" type="BigDecimal"/> <set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/> <if-compare field="parameters.type" operator="equals" value="IN"> <set field="internTx.reasonEnumId" from-field="parameters.reasonIn"/> @@ -323,16 +356,20 @@ under the License. <if-not-empty field="webPosSession"> <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <set field="priceStr" from-field="parameters.price" type="String"/> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="price"> - <field field="priceStr" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> - <if-not-empty field="price"> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="price"> + <convert type="BigDecimal" to-field="price" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosManagerModifyPriceNotValidPrice"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <if-not-empty field="context.price"> <set field="cartLineIdx" from-field="parameters.cartLineIdx" type="Integer"/> <call-object-method obj-field="webPosTransaction" method-name="modifyPrice"> <field field="cartLineIdx" type="int"/> - <field field="price" type="BigDecimal"/> + <field field="context.price" type="BigDecimal"/> </call-object-method> <check-errors/> <call-object-method obj-field="webPosTransaction" method-name="calcTax"/> 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=1127651&r1=1127650&r2=1127651&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 Wed May 25 19:45:44 2011 @@ -27,18 +27,23 @@ under the License. <if-not-empty field="webPosSession"> <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <set field="amount" from-field="parameters.amountCash" type="String"/> - <if-empty field="amount"> - <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="amountCash"/> + <if-empty field="parameters.amountCash"> + <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="context.amountCash"/> <check-errors/> <else> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="amountCash"> - <field field="amount" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="amountCash"> + <convert type="BigDecimal" to-field="amountCash" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosPayCashNotValidAmount"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> </else> </if-empty> - <if-empty field="amountCash"> + <if-empty field="context.amountCash"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPayCashNotValidAmount"/></add-error> <check-errors/> <else> @@ -47,17 +52,17 @@ under the License. <add-error><fail-property resource="WebPosUiLabels" property="WebPosTransactionTotalDueZero"/></add-error> <check-errors/> </if-compare> - <if-compare-field field="totalDue" operator="less" to-field="amountCash" type="BigDecimal"> + <if-compare-field field="totalDue" operator="less" to-field="context.amountCash" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPayCashGreaterThanTotalDue"/></add-error> <check-errors/> </if-compare-field> - <log level="info" message="Processing [Cash] Amount : ${amountCash}"/> + <log level="info" message="Processing [Cash] Amount : ${context.amountCash}"/> <set field="paymentType" value="CASH"/> <set field="refNum" value=""/> <set field="authCode" value=""/> <call-object-method obj-field="webPosTransaction" method-name="addPayment"> <field field="paymentType" type="String"/> - <field field="amountCash" type="BigDecimal"/> + <field field="context.amountCash" type="BigDecimal"/> <field field="refNum" type="String"/> <field field="authCode" type="String"/> </call-object-method> @@ -80,24 +85,29 @@ under the License. <if-not-empty field="webPosSession"> <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <set field="amount" from-field="parameters.amountCheck" type="String"/> - <if-empty field="amount"> - <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="amountCheck"/> + <if-empty field="parameters.amountCheck"> + <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="context.amountCheck"/> <check-errors/> <else> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="amountCheck"> - <field field="amount" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="amountCheck"> + <convert type="BigDecimal" to-field="amountCheck" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosPayCheckNotValidAmount"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> </else> </if-empty> - <if-not-empty field="amountCheck"> + <if-not-empty field="context.amountCheck"> <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="totalDue"/> <if-compare field="totalDue" operator="less-equals" value="0.00" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosTransactionTotalDueZero"/></add-error> <check-errors/> </if-compare> - <if-compare-field field="totalDue" operator="less" to-field="amountCheck" type="BigDecimal"> + <if-compare-field field="totalDue" operator="less" to-field="context.amountCheck" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPayCheckGreaterThanTotalDue"/></add-error> <check-errors/> </if-compare-field> @@ -125,7 +135,7 @@ under the License. <set field="refNum" from-field="parameters.refNum"/> <call-object-method obj-field="webPosTransaction" method-name="processExternalPayment"> <field field="paymentType" type="String"/> - <field field="amountCheck" type="BigDecimal"/> + <field field="context.amountCheck" type="BigDecimal"/> <field field="refNum" type="String"/> </call-object-method> <check-errors/> @@ -163,24 +173,29 @@ under the License. <if-not-empty field="webPosSession"> <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <set field="amount" from-field="parameters.amountGiftCard" type="String"/> - <if-empty field="amount"> - <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="amountGiftCard"/> + <if-empty field="parameters.amountGiftCard"> + <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="context.amountGiftCard"/> <check-errors/> <else> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="amountGiftCard"> - <field field="amount" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="amountGiftCard"> + <convert type="BigDecimal" to-field="amountGiftCard" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosPayGiftCardNotValidAmount"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> </else> </if-empty> - <if-not-empty field="amountGiftCard"> + <if-not-empty field="context.amountGiftCard"> <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="totalDue"/> <if-compare field="totalDue" operator="less-equals" value="0.00" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosTransactionTotalDueZero"/></add-error> <check-errors/> </if-compare> - <if-compare-field field="totalDue" operator="less" to-field="amountGiftCard" type="BigDecimal"> + <if-compare-field field="totalDue" operator="less" to-field="context.amountGiftCard" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPayGiftCardGreaterThanTotalDue"/></add-error> <check-errors/> </if-compare-field> @@ -204,7 +219,7 @@ under the License. <set field="refNum" from-field="parameters.refNum"/> <call-object-method obj-field="webPosTransaction" method-name="processExternalPayment"> <field field="paymentType" type="String"/> - <field field="amountGiftCard" type="BigDecimal"/> + <field field="context.amountGiftCard" type="BigDecimal"/> <field field="refNum" type="String"/> </call-object-method> <check-errors/> @@ -242,24 +257,29 @@ under the License. <if-not-empty field="webPosSession"> <call-object-method obj-field="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/> <check-errors/> - <set field="amount" from-field="parameters.amountCreditCard" type="String"/> - <if-empty field="amount"> - <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="amountCreditCard"/> + <if-empty field="parameters.amountCreditCard"> + <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="context.amountCreditCard"/> <check-errors/> <else> - <call-class-method class-name="org.ofbiz.base.util.UtilNumber" method-name="stringToBigDecimal" ret-field="amountCreditCard"> - <field field="amount" type="String"/> - <field field="locale" type="java.util.Locale"/> - </call-class-method> + <call-map-processor in-map-name="parameters" out-map-name="context"> + <simple-map-processor name="inputValidate"> + <process field="amountCreditCard"> + <convert type="BigDecimal" to-field="amountCreditCard" replace="true" set-if-null="false"> + <fail-property resource="WebPosUiLabels" property="WebPosPayCreditCardNotValidAmount"/> + </convert> + </process> + </simple-map-processor> + </call-map-processor> + <check-errors/> </else> </if-empty> - <if-not-empty field="amountCreditCard"> + <if-not-empty field="context.amountCreditCard"> <call-object-method obj-field="webPosTransaction" method-name="getTotalDue" ret-field="totalDue"/> <if-compare field="totalDue" operator="less-equals" value="0.00" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosTransactionTotalDueZero"/></add-error> <check-errors/> </if-compare> - <if-compare-field field="totalDue" operator="less" to-field="amountCreditCard" type="BigDecimal"> + <if-compare-field field="totalDue" operator="less" to-field="context.amountCreditCard" type="BigDecimal"> <add-error><fail-property resource="WebPosUiLabels" property="WebPosPayCreditCardGreaterThanTotalDue"/></add-error> <check-errors/> </if-compare-field> @@ -297,7 +317,7 @@ under the License. <set field="refNum" from-field="parameters.refNum"/> <call-object-method obj-field="webPosTransaction" method-name="processExternalPayment"> <field field="paymentType" type="String"/> - <field field="amountCreditCard" type="BigDecimal"/> + <field field="context.amountCreditCard" type="BigDecimal"/> <field field="refNum" type="String"/> </call-object-method> <check-errors/> @@ -351,7 +371,7 @@ under the License. <check-errors/> </if-compare> </if-not-empty> - <log level="info" message="Processing Credit Card Amount : ${amount}"/> + <log level="info" message="Processing Credit Card Amount : ${context.amountCreditCard}"/> <set from-field="parameters.firstName" field="firstName"/> <set from-field="parameters.lastName" field="lastName"/> <call-object-method obj-field="webPosTransaction" method-name="makeCreditCardVo" ret-field="paymentId"> @@ -364,7 +384,7 @@ under the License. <if-not-empty field="paymentId"> <call-object-method obj-field="webPosTransaction" method-name="addPayment"> <field field="paymentId" type="String"/> - <field field="amountCreditCard" type="BigDecimal"/> + <field field="context.amountCreditCard" type="BigDecimal"/> </call-object-method> <check-errors/> <if-not-empty field="parameters.track2"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |