midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[2093355 ] Small bugs in OpenXpertya POS 

DISPLAY DOCUMENTNO VALUE IN CHECKOUT LINE
NICE COLOR FOR UNUSED PROD KEYs
This commit is contained in:
Redhuan D. Oon 2008-12-08 12:50:39 +00:00
parent 4ed7def01a
commit d052a0be23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/org/compiere/pos/SubCheckout.java
View File

@ -32,6 +32,7 @@ import org.compiere.process.DocAction;
import org.compiere.swing.CButton; import org.compiere.swing.CButton;
import org.compiere.swing.CLabel; import org.compiere.swing.CLabel;
import org.compiere.swing.CPanel; import org.compiere.swing.CPanel;
import org.compiere.swing.CTextField;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -47,6 +48,11 @@ import org.compiere.util.Msg;
*/ */
public class SubCheckout extends PosSubPanel implements ActionListener public class SubCheckout extends PosSubPanel implements ActionListener
{ {
/**
*
*/
private static final long serialVersionUID = 1L;
/** /**
* Constructor * Constructor
* @param posPanel POS Panel * @param posPanel POS Panel
@ -70,6 +76,8 @@ public class SubCheckout extends PosSubPanel implements ActionListener
private CTextField f_creditCardVV = null; private CTextField f_creditCardVV = null;
private CButton f_creditPayment = null; private CButton f_creditPayment = null;
*/ */
private CLabel f_lDocumentNo = null;
private CTextField f_DocumentNo;
private CLabel f_lcashGiven = null; private CLabel f_lcashGiven = null;
private VNumber f_cashGiven; private VNumber f_cashGiven;
private CLabel f_lcashReturn = null; private CLabel f_lcashReturn = null;
@ -104,10 +112,15 @@ public class SubCheckout extends PosSubPanel implements ActionListener
gbc0.insets = INSETS2; gbc0.insets = INSETS2;
// gbc0.anchor = GridBagConstraints.EAST; // gbc0.anchor = GridBagConstraints.EAST;
// //
f_lDocumentNo = new CLabel(Msg.getMsg(Env.getCtx(),"DocumentNo"));
cash.add (f_lDocumentNo, gbc0);
f_DocumentNo = new CTextField("");
f_DocumentNo.setName("DocumentNo");
cash.add (f_DocumentNo, gbc0);
f_lcashGiven = new CLabel(Msg.getMsg(Env.getCtx(),"CashGiven")); f_lcashGiven = new CLabel(Msg.getMsg(Env.getCtx(),"CashGiven"));
cash.add (f_lcashGiven, gbc0); cash.add (f_lcashGiven, gbc0);
f_cashGiven = new VNumber("CashGiven", false, false, true, DisplayType.Amount, Msg.translate(Env.getCtx(), "CashGiven")); f_cashGiven = new VNumber("CashGiven", false, false, true, DisplayType.Amount, Msg.translate(Env.getCtx(), "CashGiven"));
f_cashGiven.setColumns(14, 25); f_cashGiven.setColumns(12, 25);
cash.add (f_cashGiven, gbc0); cash.add (f_cashGiven, gbc0);
f_cashGiven.setValue(Env.ZERO); f_cashGiven.setValue(Env.ZERO);
f_cashGiven.addActionListener(this); //to update the change with the money f_cashGiven.addActionListener(this); //to update the change with the money
@ -115,7 +128,7 @@ public class SubCheckout extends PosSubPanel implements ActionListener
f_lcashReturn = new CLabel(Msg.getMsg(Env.getCtx(),"CashReturn")); f_lcashReturn = new CLabel(Msg.getMsg(Env.getCtx(),"CashReturn"));
cash.add (f_lcashReturn, gbc0); cash.add (f_lcashReturn, gbc0);
f_cashReturn = new VNumber("CashReturn", false, true, false, DisplayType.Amount, "CashReturn"); f_cashReturn = new VNumber("CashReturn", false, true, false, DisplayType.Amount, "CashReturn");
f_cashReturn.setColumns(10, 25); f_cashReturn.setColumns(8, 25);
cash.add (f_cashReturn, gbc0); cash.add (f_cashReturn, gbc0);
f_cashReturn.setValue(Env.ZERO); f_cashReturn.setValue(Env.ZERO);
f_cashPayment = createButtonAction("Payment", null); f_cashPayment = createButtonAction("Payment", null);
@ -251,8 +264,8 @@ public class SubCheckout extends PosSubPanel implements ActionListener
if (isOrderFullyPay()) if (isOrderFullyPay())
{ {
displaySummary(); displaySummary();
printTicket();
processOrder(); processOrder();
printTicket();
openCashDrawer(); openCashDrawer();
} }
else else
@ -398,12 +411,15 @@ public class SubCheckout extends PosSubPanel implements ActionListener
public void displayReturn() public void displayReturn()
{ {
BigDecimal given = new BigDecimal(f_cashGiven.getValue().toString()); BigDecimal given = new BigDecimal(f_cashGiven.getValue().toString());
if (p_posPanel != null && p_posPanel.f_curLine != null) if (p_posPanel != null && p_posPanel.f_curLine != null)
{ {
MOrder order = p_posPanel.f_curLine.getOrder(); MOrder order = p_posPanel.f_curLine.getOrder();
BigDecimal total = new BigDecimal(0); BigDecimal total = new BigDecimal(0);
if (order != null && !order.getTotalLines().equals(Env.ZERO)) if (order != null)
{
f_DocumentNo.setText(order.getDocumentNo());
total = order.getGrandTotal(); total = order.getGrandTotal();
}
double cashReturn = given.doubleValue() - total.doubleValue(); double cashReturn = given.doubleValue() - total.doubleValue();
f_cashReturn.setValue(new BigDecimal(cashReturn)); f_cashReturn.setValue(new BigDecimal(cashReturn));
} }

1
client/src/org/compiere/pos/SubFunctionKeys.java
View File

@ -114,6 +114,7 @@ public class SubFunctionKeys extends PosSubPanel implements ActionListener
{ {
CButton button = new CButton(""); CButton button = new CButton("");
button.setFocusable(false); button.setFocusable(false);
button.setBackground(Color.cyan);
content.add (button); content.add (button);
} }
content.setPreferredSize(new Dimension(cols*180, rows*50)); content.setPreferredSize(new Dimension(cols*180, rows*50));