From: Anneli <an...@us...> - 2005-06-13 07:27:34
|
Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24093/src/org/redpos/client/ui/plugin/function Modified Files: Pay.java Log Message: Receipt of type complaint, return, or correction does no longer cause problems when selecting a paymenttype that does not allow repay Index: Pay.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/Pay.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Pay.java 2 May 2005 14:09:55 -0000 1.8 --- Pay.java 13 Jun 2005 07:27:10 -0000 1.9 *************** *** 300,306 **** private void handlePaymentSelected() { ! if(toPay.doubleValue() != 0) { ! // remove payment selector from ui if (paymentSelection != null) { --- 300,306 ---- private void handlePaymentSelected() { ! if(toPay.doubleValue() > 0) { ! // remove payment selector from ui if (paymentSelection != null) { *************** *** 537,540 **** --- 537,557 ---- getLog().warn("addPayment: payment exception: " + e.getMessage()); + + // if showPaySelectionUi is false and there are no paymentSelection object + // this receipt is a COMPLAINT, RETURN OR CORRECTION and the user has do choose + // another type of payment + if ((!showPaySelectionUI) && (paymentSelection == null)) + { + showPaySelectionUI = true; + + // create payment selector + paymentSelection = new PaymentSelection(parent, getLanguage(), this, + getAvailablePayments()); + paymentSelection.setFocus(); + paymentSelection.setPayTotal(toPay); + + parent.layout(); + + } } catch(Exception e) |