You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2009/03/27 18:02:39 UTC
svn commit: r759264 - in /ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos:
./ component/ container/ device/ device/impl/ event/ jpos/service/ screen/
Author: doogie
Date: Fri Mar 27 17:02:38 2009
New Revision: 759264
URL: http://svn.apache.org/viewvc?rev=759264&view=rev
Log:
Fix lines that *only* have whitespace.
Modified:
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Mar 27 17:02:38 2009
@@ -242,7 +242,7 @@
itemInfo.put("quantity", UtilFormatOut.formatQuantity(item.getQuantity()));
itemInfo.put("subtotal", UtilFormatOut.formatPrice(item.getItemSubTotal()));
itemInfo.put("isTaxable", item.taxApplies() ? "T" : " ");
-
+
itemInfo.put("discount", "");
itemInfo.put("adjustments", "");
if (item.getOtherAdjustments().compareTo(BigDecimal.ZERO) != 0) {
@@ -250,7 +250,7 @@
UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale), Receipt.pridLength[0] + 1, true, ' '));
itemInfo.put("adjustments", UtilFormatOut.formatPrice(item.getOtherAdjustments()));
}
-
+
if (isAggregatedItem(item.getProductId())) {
ProductConfigWrapper pcw = null;
pcw = item.getConfigWrapper();
@@ -375,7 +375,7 @@
payInfo.put("payInfo", infoString);
payInfo.putAll(cc);
payInfo.put("cardNumber", cardStr); // masked cardNumber
-
+
} else if ("GIFT_CARD".equals(paymentMethodTypeId)) {
GenericValue gc = null;
try {
@@ -458,7 +458,7 @@
}
return pcw;
}
-
+
public void addItem(String productId, BigDecimal quantity) throws CartItemModifyException, ItemNotFoundException {
trace("add item", productId + "/" + quantity);
try {
@@ -527,7 +527,7 @@
}
return;
}
-
+
public void modifyQty(String productId, BigDecimal quantity) throws CartItemModifyException {
trace("modify item quantity", productId + "/" + quantity);
ShoppingCartItem item = cart.findCartItem(productId, null, null, null, BigDecimal.ZERO);
@@ -602,7 +602,7 @@
public BigDecimal GetTotalDiscount() {
return cart.getOrderOtherAdjustmentTotal();
}
-
+
public void voidItem(String productId) throws CartItemModifyException {
trace("void item", productId);
ShoppingCartItem item = cart.findCartItem(productId, null, null, null, BigDecimal.ZERO);
@@ -659,7 +659,7 @@
}
currentTx = null;
}
-
+
public void calcTax() {
try {
ch.calcAndAddTax(this.getStoreOrgAddress());
@@ -809,7 +809,7 @@
output.print(UtilProperties.getMessage(PosTransaction.resource,"PosSaving",defaultLocale));
Map orderRes = ch.createOrder(session.getUserLogin());
//Debug.log("Create Order Resp : " + orderRes, module);
-
+
if (orderRes != null && ServiceUtil.isError(orderRes)) {
throw new GeneralException(ServiceUtil.getErrorMessage(orderRes));
} else if (orderRes != null) {
@@ -820,14 +820,14 @@
UtilMisc.toMap("reasonEnumId", "EnumIdHere"), // TODO: where does this come from?
"itemCommentMap",
UtilMisc.toMap("changeComments", "change Comments here")); //TODO
-
+
Map svcCtx = FastMap.newInstance();
svcCtx.put("userLogin", session.getUserLogin());
svcCtx.put("orderId", orderId);
svcCtx.put("shoppingCart", cart);
svcCtx.put("locale", this.locale);
svcCtx.put("changeMap", changeMap);
-
+
Map svcRes = null;
try {
LocalDispatcher dispatcher = session.getDispatcher();
@@ -898,7 +898,7 @@
if (facility == null) {
return null;
}
-
+
GenericDelegator delegator = session.getDelegator();
GenericValue facilityContactMech = ContactMechWorker.getFacilityContactMechByPurpose(delegator, facilityId, UtilMisc.toList("SHIP_ORIG_LOCATION", "PRIMARY_LOCATION"));
if (facilityContactMech != null) {
@@ -956,7 +956,7 @@
}
}
}
-
+
if (adjustment.compareTo(BigDecimal.ZERO) != 0) {
// append the promo info
XModel promo = Journal.appendNode(model, "tr", "itemadjustment", "");
@@ -984,7 +984,7 @@
itemsAdjustmentsAmount = itemsAdjustmentsAmount.add(adjustment);
}
}
-
+
if (UtilValidate.isNotEmpty(adjustments)) {
Iterator iter = adjustments.iterator();
while (iter.hasNext()) {
@@ -1021,7 +1021,7 @@
Journal.appendNode(taxLine, "td", "qty", "");
Journal.appendNode(taxLine, "td", "price", UtilFormatOut.formatPrice(taxAmount));
Journal.appendNode(taxLine, "td", "index", "-1");
-
+
XModel totalLine = Journal.appendNode(model, "tr", "total", "");
Journal.appendNode(totalLine, "td", "sku", "");
Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosGrandTotal",defaultLocale));
@@ -1186,7 +1186,7 @@
pos.showDialog("dialog/error/nosales");
}
}
-
+
public void loadOrder(PosScreen pos) {
List<GenericValue> orders = findOrders();
if (!orders.isEmpty()) {
@@ -1196,7 +1196,7 @@
pos.showDialog("dialog/error/nosales");
}
}
-
+
private List<GenericValue> findOrders() {
LocalDispatcher dispatcher = session.getDispatcher();
@@ -1216,7 +1216,7 @@
} catch (GenericServiceException e) {
Debug.logError(e, module);
}
-
+
if (svcRes == null) {
Debug.log(UtilProperties.getMessage("EcommerceUiLabels","EcommerceNoShoppingListsCreate",locale), module);
} else if (ServiceUtil.isError(svcRes)) {
@@ -1372,12 +1372,12 @@
return true;
}
-
+
public void saveSale(PosScreen pos) {
SaveSale SaveSale = new SaveSale(this, pos);
SaveSale.openDlg();
}
-
+
public void saveOrder(String shoppingListName, PosScreen pos) {
if (cart.size() == 0 ) {
pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale));
@@ -1397,7 +1397,7 @@
//cart.setInternalCode("Internal Code");
//ch.setCheckOutOptions(null, null, null, null, null, "shipping instructions", null, null, null, "InternalId", null, null, null);
Map orderRes = ch.createOrder(session.getUserLogin());
-
+
if (orderRes != null && ServiceUtil.isError(orderRes)) {
Debug.logError(ServiceUtil.getErrorMessage(orderRes), module);
//throw new GeneralException(ServiceUtil.getErrorMessage(orderRes));
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java Fri Mar 27 17:02:38 2009
@@ -39,7 +39,7 @@
"MSRINFO", "OPEN", "PAID", "PAID_IN", "PAID_OUT", "PROMOCODE", "QTY",
"REFNUM", "SHIFT", "TOTAL", "UNLOCK", "VOID", "TRACK2", "SECURITYCODE",
"CREDITEXP", "POSTALCODE"};
-
+
protected Stack functionStack = new Stack();
protected Component[] pageComs = null;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java Fri Mar 27 17:02:38 2009
@@ -22,10 +22,10 @@
import org.ofbiz.pos.screen.PosScreen;
public class InputWithPassword extends Input {
-
+
protected javax.swing.JTextField savedInput;
protected XPassword password = null;
-
+
public InputWithPassword( PosScreen page) {
super( page);
this.savedInput = super.input;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Fri Mar 27 17:02:38 2009
@@ -42,7 +42,7 @@
public static final String module = Journal.class.getName();
protected XProject currentProject = (XProject)XProjectManager.getCurrentProject();
-
+
private static String[] field = { "sku", "desc", "qty", "price" };
private static String[] name = { "PosSku", "PosItem", "PosQty", "PosAmt" };
private static int[] width = { 100, 170, 50, 90};
@@ -55,7 +55,7 @@
public Journal(PosScreen page) {
jpanel = (XScrollPane) page.findComponent("journal_panel");
jpanel.setVisible(false);
-
+
this.jtable = (XTable) page.findComponent("jtable");
// set the table as selectable
@@ -64,14 +64,14 @@
jtable.setDragEnabled(false);
jtable.setColumnSelectionAllowed(false);
jtable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
+
// set the styles
jtable.setBorderStyle("journalBorder");
jtable.setHeaderStyle("journalHeader");
jtable.setStyle("journalData");
jtable.setSelectedStyle("journalSelected");
-
+
// some settings needed for XUI 3.2rc2b update
jtable.setRowHeight(30); // Better to catch the line on a touch screen (minimal height I think)
XStyle style = currentProject.getStyleManager().getStyle("journalBorder");
@@ -155,7 +155,7 @@
// make sure we are at the last item in the journal
jtable.setSelectedRow(0);
-
+
try {
jtable.update();
} catch (ArrayIndexOutOfBoundsException e) {
@@ -168,7 +168,7 @@
XModel jmodel = (XModel)currentProject.getModel().get("table/items");
// clear the list
jmodel.clear();
-
+
if (field.length == 0) {
return null;
}
@@ -197,7 +197,7 @@
}
return newNode;
}
-
+
private String getModelText(XModel model)
{
StringWriter sw = new StringWriter();
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java Fri Mar 27 17:02:38 2009
@@ -48,14 +48,14 @@
public static final String[] OPER_EMPL = { "oper_empl", "EMPL" };
public static final String[] OPER_TXID = { "oper_txid", "TXID" };
public static final String[] OPER_DRWR = { "oper_drwr", "DRAWER" };
-
+
public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateFormat",Locale.getDefault()));
protected Component[] operatorField = null;
protected XStyle titleStyle = null;
protected XPanel operPanel = null;
-
+
private Locale defaultLocale = Locale.getDefault();
-
+
public Operator(PosScreen page) {
this.titleStyle = XProjectManager.getCurrentProject().getStyleManager().getStyle(style);
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java Fri Mar 27 17:02:38 2009
@@ -28,7 +28,7 @@
import net.xoetrope.swing.XButton;
import net.xoetrope.xui.helper.SwingWorker;
import net.xoetrope.xui.events.XEventHelper;
-
+
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilValidate;
@@ -149,7 +149,7 @@
}
}
}
-
+
return cl;
}
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java Fri Mar 27 17:02:38 2009
@@ -54,7 +54,7 @@
Debug.logInfo("******************************************************", module);
throw new ContainerException(e);
}
-
+
return true;
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java Fri Mar 27 17:02:38 2009
@@ -194,7 +194,7 @@
if (receipt != null) {
receipt.enable(enable);
}
-
+
// cash drawers and journal printer are
// never able to be disabled so we can
// notify when the drawer is open and
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java Fri Mar 27 17:02:38 2009
@@ -79,6 +79,6 @@
MenuEvents.triggerEnter(PosScreen.currentScreen, null);
MenuEvents.triggerClear(PosScreen.currentScreen);
}
-
+
protected abstract void initialize() throws JposException;
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java Fri Mar 27 17:02:38 2009
@@ -54,7 +54,7 @@
public void resetComError() {
this.comError = 0;
}
-
+
public void openDrawer() {
if (this.comError > 2) {
// only attempt this 3 times
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Fri Mar 27 17:02:38 2009
@@ -393,7 +393,7 @@
} else {
this.println(toPrint);
}
-
+
if (trans.isAggregatedItem(((String)expandMap.get("productId")).trim())) {
List<Map> maps = trans.getItemConfigInfo(i);
for (Map map: maps) {
@@ -439,7 +439,7 @@
expandMap.put("nameOnCard", UtilFormatOut.padString((String) expandMap.get("nameOnCard"), infoLength[type], false, ' '));
expandMap.put("payInfo", UtilFormatOut.padString((String) expandMap.get("payInfo"), infoLength[type], false, ' '));
expandMap.put("amount", UtilFormatOut.padString((String) expandMap.get("amount"), priceLength[type], false, ' '));
-
+
String toPrint = FlexibleStringExpander.expandString(template, expandMap);
if (toPrint.indexOf("\n") > -1) {
String[] lines = toPrint.split("\\n");
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java Fri Mar 27 17:02:38 2009
@@ -62,7 +62,7 @@
Debug.logWarning("Scanner driver does not support decoding data; the raw result is used instead", module);
scanData = scanner.getScanData();
}
-
+
scanner.clearInput();
} catch (jpos.JposException e) {
Debug.logError(e, module);
@@ -79,7 +79,7 @@
if (!"main/pospanel".equals(PosScreen.currentScreen.getName())) {
PosScreen.currentScreen.showPage("pospanel");
}
-
+
// we can add some type checking here if needed (i.e. type of barcode; type of SKU, etc)
if (dataType == ScannerConst.SCAN_SDT_UNKNOWN) {
Debug.logWarning("Scanner type checking problems - check scanner driver", module);
@@ -100,10 +100,10 @@
// stuff the data to the Input component
PosScreen.currentScreen.getInput().clearInput();
PosScreen.currentScreen.getInput().appendString(toInput.substring(0, posCR));
-
+
// At least one product recognized
MenuEvents.addItem(PosScreen.currentScreen, null);
-
+
if (!MULTI_BARCODES_ALLOWED) {
break;
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Fri Mar 27 17:02:38 2009
@@ -59,7 +59,7 @@
public class ManagerEvents {
-
+
public static final String module = ManagerEvents.class.getName();
public static boolean mgrLoggedIn = false;
static DecimalFormat priceDecimalFormat = new DecimalFormat("#,##0.00");
@@ -170,7 +170,7 @@
String[] func = input.getFunction("CLOSE");
String lastValue = input.value();
if (UtilValidate.isNotEmpty(lastValue)) {
-
+
try {
BigDecimal amt = new BigDecimal(lastValue);
amt = amt.movePointLeft(2);
@@ -402,19 +402,19 @@
public static synchronized void paidIn(PosScreen pos) {
paidOutAndIn(pos, "IN");
}
-
+
public static synchronized void paidOutAndIn(PosScreen pos, String type) {
if (!mgrLoggedIn) {
pos.showDialog("dialog/error/mgrnotloggedin");
return;
}
-
+
PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession());
if (!trans.isOpen()) {
pos.showDialog("dialog/error/terminalclosed");
return;
}
-
+
PaidInOut PaidInOut = new PaidInOut(trans, pos, type);
Map mapInOut = PaidInOut.openDlg();
if (null != mapInOut.get("amount")) {
@@ -445,7 +445,7 @@
NavagationEvents.showPosScreen(pos);
}
}
-
+
private static synchronized void printTotals(PosScreen pos, GenericValue state, boolean runBalance) {
PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession());
if (!trans.isOpen()) {
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java Fri Mar 27 17:02:38 2009
@@ -48,7 +48,7 @@
public static final int scale = UtilNumber.getBigDecimalScale("order.decimals");
public static final int rounding = UtilNumber.getBigDecimalRoundingMode("order.rounding");
public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding);
-
+
// extended number events
public static synchronized void triggerClear(PosScreen pos) {
// clear the pieces
@@ -209,7 +209,7 @@
Debug.logError(e, module);
pos.showDialog("dialog/error/producterror");
}
-
+
// add the item to the cart; report any errors to the user
if (productId != null) {
try {
@@ -431,7 +431,7 @@
String index = journal.getSelectedIdx();
String productId = journal.getSelectedSku();
//trans.configureItem(index, pos);
-
+
boolean aggregatedItem = false;
ProductConfigWrapper pcw = null;
try {
@@ -449,12 +449,12 @@
Debug.logError(e, module);
pos.showDialog("dialog/error/producterror");
}
-
+
trans.calcTax();
pos.refresh();
-
+
return;
}
-
+
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Fri Mar 27 17:02:38 2009
@@ -32,7 +32,7 @@
public class PaymentEvents {
-
+
public static final String module = PaymentEvents.class.getName();
public static synchronized void payCash(PosScreen pos) {
@@ -115,7 +115,7 @@
String[] securityCodeInfo = input.getFunction("SECURITYCODE");
String[] postalCodeInfo = input.getFunction("POSTALCODE");
String[] creditExpirationInfo = input.getFunction("CREDITEXP");
-
+
// check for no/external payment processing
int paymentCheck = trans.checkPaymentMethodType("CREDIT_CARD");
if (paymentCheck == PosTransaction.NO_PAYMENT) {
@@ -255,7 +255,7 @@
}
}
}
-
+
private static synchronized void processNoPayment(PosScreen pos, String paymentMethodTypeId) {
PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession());
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java Fri Mar 27 17:02:38 2009
@@ -29,7 +29,7 @@
public class PromoEvents {
-
+
public static final String module = PromoEvents.class.getName();
public static synchronized void addPromoCode(PosScreen pos) {
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Fri Mar 27 17:02:38 2009
@@ -32,7 +32,7 @@
public class SecurityEvents {
-
+
public static final String module = SecurityEvents.class.getName();
public static synchronized void login(PosScreen pos) {
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java Fri Mar 27 17:02:38 2009
@@ -36,7 +36,7 @@
Journal journal = pos.getJournal();
Debug.log("Selected IDX - " + journal.getSelectedIdx(), module);
}
-
+
public static synchronized void testMsr(PosScreen pos) {
try {
org.ofbiz.pos.jpos.service.MsrTestService.sendTest();
@@ -45,9 +45,9 @@
pos.showDialog("dialog/error/exception", e.getMessage());
}
}
-
+
public static synchronized void testNumericKeypad(PosScreen pos) {
-
+
try {
NumericKeypad numericKeypad = new NumericKeypad(pos);
numericKeypad.setMinus(true);
@@ -56,9 +56,9 @@
} catch (Exception e) {
Debug.logError(e, module);
}
-
+
pos.refresh();
return;
}
-
+
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Fri Mar 27 17:02:38 2009
@@ -32,7 +32,7 @@
public int getDeviceServiceVersion() throws JposException {
return 1002000;
}
-
+
public int getCapCharacterSet() throws JposException {
return 0;
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Fri Mar 27 17:02:38 2009
@@ -51,7 +51,7 @@
/**
* To create or configure a configurable item
*/
-
+
public static final String module = ConfigureItem.class.getName();
protected PosScreen m_pos = null;
protected ConfigureItem m_configureItem = null;
@@ -78,7 +78,7 @@
m_pos = page;
m_configureItem = this;
}
-
+
public ProductConfigWrapper openDlg() {
// cache must be set to false because there's no method to remove actionhandlers
m_dialog = (XDialog) pageMgr.loadPage(
@@ -103,13 +103,13 @@
return m_pcw;
}
-
+
public synchronized void ok() {
if (wasMouseClicked()) {
closeDlg();
}
}
-
+
public synchronized void reset() {
if (wasMouseClicked()) {
m_pcw.setDefaultConfig();
@@ -137,12 +137,12 @@
m_dialog.repaint();
return;
}
-
-
+
+
private void closeDlg() {
m_dialog.closeDlg();
}
-
+
private void resetButtons() {
Object[] questions = questionHashMap.values().toArray();
for(Object question : questions) {
@@ -150,14 +150,14 @@
}
return;
}
-
+
private void showItem() {
DefaultListModel listModel = null;
listModel = new DefaultListModel();
-
+
GenericValue gv = m_pcw.getProduct();
listModel.addElement(gv.get("description"));
-
+
List questions = m_pcw.getQuestions();
if (questions==null) ; // no questions, we shouldn't be here
else{
@@ -182,7 +182,7 @@
QuestionFactory qf = new QuestionFactory();
questionHashMap = new Hashtable();
-
+
List questions = m_pcw.getQuestions();
if (questions==null) ; // no questions, we shouldn't be here
else{
@@ -201,7 +201,7 @@
}
return;
}
-
+
private void getButtons() {
ArrayList buttonList = new ArrayList();
for(String[] buttonSingleArray : buttonArray ) {
@@ -213,16 +213,16 @@
}
m_buttonList = buttonList;
}
-
+
private void debugQuestions() {
//Debug.logInfo("debugQuestions",module);
GenericValue gv = m_pcw.getProduct();
//Debug.logInfo("Product: " +gv.get("description"), module);
-
+
List questions = m_pcw.getQuestions();
if (questions==null) return; // no questions, return
-
+
Iterator iter = questions.iterator();
while (iter.hasNext()) {
ConfigItem question = (ConfigItem)iter.next();
@@ -232,10 +232,10 @@
", IsSelected: "+question.isSelected()+
", IsSingleChoice: "+question.isSingleChoice()+
", IsStandard: "+question.isStandard(), module);*/
-
+
List options = question.getOptions();
Iterator itero = options.iterator();
-
+
while (itero.hasNext()) {
ConfigOption configoption = (ConfigOption)itero.next();
/*Debug.logInfo("Found option " + configoption.getDescription(), module);
@@ -266,9 +266,9 @@
What is isStandard? Maybe I can key off IsStandard for using buttons, others get a list.
*/
-
+
protected class QuestionFactory{
-
+
public Question get(ConfigItem question) {
List options = question.getOptions();
@@ -293,16 +293,16 @@
public void buttonClicked();
public void reset();
}
-
+
protected interface ListQuestion{
public void setupListPane(XScrollPane m_optionListPane);
}
-
+
protected class SingleButtonQuestion implements Question{
private XButton button = null;
private ConfigItem question = null;
private int showOption = 0;
-
+
public SingleButtonQuestion(ConfigItem question) {
this.question = question;
return;
@@ -335,7 +335,7 @@
button.setText(selectedoption.getDescription());
return;
}
-
+
public void reset() {
showOption = 0;
List options = question.getOptions();
@@ -353,7 +353,7 @@
private XButton button = null;
private XScrollPane scrollpane = null;
private ConfigItem question = null;
-
+
public ListButtonQuestion(ConfigItem question) {
this.question = question;
return;
@@ -370,12 +370,12 @@
scrollpane = m_optionListPane;
return;
}
-
+
public void buttonClicked() {
Iterator options = question.getOptions().iterator();
-
+
DefaultListModel listModel = new DefaultListModel();
-
+
while (options.hasNext()) {
ConfigOption configoption = (ConfigOption)options.next();
listModel.addElement(configoption.getDescription());
@@ -383,7 +383,7 @@
//Debug.logInfo("IsAvailable: "+configoption.isAvailable()+
// ", IsSelected: "+configoption.isSelected(), module);
}
-
+
//Create the list and put it in a scroll pane.
JList list = new JList(listModel);
list.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -394,19 +394,19 @@
scrollpane.add(list);
return;
}
-
+
public void reset() {
return;
}
}
-
+
protected class LBQSelectionHandler implements ListSelectionListener {
private ConfigItem question = null;
-
+
public void setQuestion(ConfigItem question) {
this.question = question;
}
-
+
public void valueChanged(ListSelectionEvent event) {
try {
JList jlist = (JList)event.getSource();
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java Fri Mar 27 17:02:38 2009
@@ -44,7 +44,7 @@
/**
* To load a sale from a shopping list. 2 modes : add to or replace the current sale. Also a button to delete a sale (aka shopping list)
*/
-
+
public static final String module = LoadSale.class.getName();
protected static PosScreen m_pos = null;
protected XDialog m_dialog = null;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Fri Mar 27 17:02:38 2009
@@ -49,7 +49,7 @@
/**
* To allow creating or choising a reason for a PAID IN or OUT
*/
-
+
public static final String module = PaidInOut.class.getName();
protected static PosScreen m_pos = null;
protected XDialog m_dialog = null;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Fri Mar 27 17:02:38 2009
@@ -345,5 +345,5 @@
}
);
}
-
+
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Fri Mar 27 17:02:38 2009
@@ -49,7 +49,7 @@
public class PosScreen extends XPage implements Runnable, DialogCallback, FocusListener {
-
+
public static final String module = PosScreen.class.getName();
public static final Frame appFrame = XProjectManager.getCurrentProject().getAppFrame();
public static final Window appWin = XProjectManager.getCurrentProject().getAppWindow();
@@ -75,7 +75,7 @@
protected boolean inDialog = false;
private Locale defaultLocale = Locale.getDefault();
-
+
public PosScreen() {
super();
this.classLoader = Thread.currentThread().getContextClassLoader();
@@ -99,9 +99,9 @@
if (!firstInit) {
firstInit = true;
-
+
// pre-load a few screens
-
+
currentProject.getPageManager().loadPage(this.getScreenLocation() + "/paypanel");
currentProject.getPageManager().loadPage(this.getScreenLocation() + "/mgrpanel");
currentProject.getPageManager().loadPage(this.getScreenLocation() + "/promopanel");
@@ -392,7 +392,7 @@
}
return this.scrLocation;
}
-
+
public void setWaitCursor() {
setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
}
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Fri Mar 27 17:02:38 2009
@@ -41,7 +41,7 @@
/**
* To save a sale. 2 modes : save and keep the current sale or save and clear the current sale.
*/
-
+
public static final String module = SaveSale.class.getName();
protected static PosScreen m_pos = null;
protected XDialog m_dialog = null;
Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java?rev=759264&r1=759263&r2=759264&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java Fri Mar 27 17:02:38 2009
@@ -41,7 +41,7 @@
/**
* To choose a product in a list of products whith the same bar code
*/
-
+
public static final String module = SelectProduct.class.getName();
protected static PosScreen m_pos = null;
protected XDialog m_dialog = null;
@@ -71,7 +71,7 @@
m_cancel = (XButton) dlg.findComponent("BtnCancel");
m_select = (XButton) dlg.findComponent("BtnSelect");
-
+
XEventHelper.addMouseHandler(this, m_cancel, "cancel");
XEventHelper.addMouseHandler(this, m_select, "selectProduct");