svn commit: r674810 - in /ofbiz/trunk/specialpurpose/po
Locked
svn commit: r674810 - in /ofbiz/trunk/specialpurpose/po
 
|
Author: jleroux
Date: Tue Jul 8 06:10:07 2008 New Revision: 674810 URL: http://svn.apache.org/viewvc?rev=674810&view=rev Log: To prevent any further misunderstanding, I have renamed the files pos.properties to PosUiLabels.properties. This was used in those java files. Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.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/Output.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.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/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/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=674810&r1=674809&r2=674810&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Tue Jul 8 06:10:07 2008 @@ -776,14 +776,14 @@ cart.setOrderPartyId(partyId); // validate payment methods - output.print(UtilProperties.getMessage("pos","Validating",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","Validating",defaultLocale)); Map valRes = ch.validatePaymentMethods(); if (valRes != null && ServiceUtil.isError(valRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(valRes)); } // store the "order" - output.print(UtilProperties.getMessage("pos","Saving",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","Saving",defaultLocale)); Map orderRes = ch.createOrder(session.getUserLogin()); //Debug.log("Create Order Resp : " + orderRes, module); @@ -794,7 +794,7 @@ } // process the payment(s) - output.print(UtilProperties.getMessage("pos","Processing",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","Processing",defaultLocale)); Map payRes = null; try { payRes = ch.processPayment(ProductStoreWorker.getProductStore(productStoreId, session.getDelegator()), session.getUserLogin(), true); @@ -811,7 +811,7 @@ double change = (grandTotal - paymentAmt); // notify the change due - output.print(UtilProperties.getMessage("pos","CHANGE",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue() * -1)); + output.print(UtilProperties.getMessage("PosUiLabels","CHANGE",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue() * -1)); // threaded drawer/receipt printing final PosTransaction currentTrans = this; @@ -921,7 +921,7 @@ // append the promo info XModel promo = Journal.appendNode(model, "tr", "itemadjustment", ""); Journal.appendNode(promo, "td", "sku", ""); - Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage("pos","(ItemDiscount)",defaultLocale)); + Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage("PosUiLabels","(ItemDiscount)",defaultLocale)); Journal.appendNode(promo, "td", "qty", ""); Journal.appendNode(promo, "td", "price", UtilFormatOut.formatPrice(adjustment)); } @@ -960,7 +960,7 @@ XModel adjustmentLine = Journal.appendNode(model, "tr", "adjustment", ""); Journal.appendNode(adjustmentLine, "td", "sku", ""); Journal.appendNode(adjustmentLine, "td", "desc", - UtilProperties.getMessage("pos", "(SalesDiscount)",defaultLocale)); + UtilProperties.getMessage("PosUiLabels", "(SalesDiscount)",defaultLocale)); if (UtilValidate.isNotEmpty(amount)) { Journal.appendNode(adjustmentLine, "td", "qty", ""); Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount)); @@ -977,14 +977,14 @@ XModel taxLine = Journal.appendNode(model, "tr", "tax", ""); Journal.appendNode(taxLine, "td", "sku", ""); - Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage("pos","Sales_Tax",defaultLocale)); + Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage("PosUiLabels","Sales_Tax",defaultLocale)); 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("pos","Grand_Total",defaultLocale)); + Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage("PosUiLabels","Grand_Total",defaultLocale)); Journal.appendNode(totalLine, "td", "qty", ""); Journal.appendNode(totalLine, "td", "price", UtilFormatOut.formatPrice(total)); Journal.appendNode(totalLine, "td", "index", "-1"); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -176,7 +176,7 @@ // create the header XModel headerNode = appendNode(jmodel, "th", "header", ""); for (int i = 0 ; i < field.length; i++) { - appendNode(headerNode, "td", field[i],UtilProperties.getMessage("pos",name[i],defaultLocale)); + appendNode(headerNode, "td", field[i],UtilProperties.getMessage("PosUiLabels",name[i],defaultLocale)); } return jmodel; 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -49,7 +49,7 @@ 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("pos","DateFormat",Locale.getDefault())); + public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage("PosUiLabels","DateFormat",Locale.getDefault())); protected Component[] operatorField = null; protected XStyle titleStyle = null; protected XPanel operPanel = null; @@ -131,15 +131,15 @@ protected String getFieldTitle(String fieldName) { if (OPER_TOTAL[0].equals(fieldName)) { - return UtilProperties.getMessage("pos","TOTAL",defaultLocale); + return UtilProperties.getMessage("PosUiLabels","TOTAL",defaultLocale); } else if (OPER_DATE[0].equals(fieldName)) { - return UtilProperties.getMessage("pos","DATE",defaultLocale); + return UtilProperties.getMessage("PosUiLabels","DATE",defaultLocale); } else if (OPER_EMPL[0].equals(fieldName)) { - return UtilProperties.getMessage("pos","EMPL",defaultLocale); + return UtilProperties.getMessage("PosUiLabels","EMPL",defaultLocale); } else if (OPER_TXID[0].equals(fieldName)) { - return UtilProperties.getMessage("pos","TXID",defaultLocale); + return UtilProperties.getMessage("PosUiLabels","TXID",defaultLocale); } else if (OPER_DRWR[0].equals(fieldName)) { - return UtilProperties.getMessage("pos","DRWR",defaultLocale); + return UtilProperties.getMessage("PosUiLabels","DRWR",defaultLocale); } return ""; } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java?rev=674810&r1=674809&r2=674810&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java Tue Jul 8 06:10:07 2008 @@ -45,12 +45,12 @@ public void setLock(boolean lock) { if (lock) { - this.print(UtilProperties.getMessage("pos","ULOGIN",defaultLocale)); + this.print(UtilProperties.getMessage("PosUiLabels","ULOGIN",defaultLocale)); } else { if (PosTransaction.getCurrentTx(session).isOpen()) { - this.print(UtilProperties.getMessage("pos","ISOPEN",defaultLocale)); + this.print(UtilProperties.getMessage("PosUiLabels","ISOPEN",defaultLocale)); } else { - this.print(UtilProperties.getMessage("pos","ISCLOSED",defaultLocale)); + this.print(UtilProperties.getMessage("PosUiLabels","ISCLOSED",defaultLocale)); } } } 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -70,7 +70,7 @@ } if (sku == null) { - pos.getOutput().print(UtilProperties.getMessage("pos","Invalid_Selection",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","Invalid_Selection",Locale.getDefault())); pos.getJournal().refresh(pos); pos.getInput().clear(); } @@ -144,7 +144,7 @@ } else { input.clear(); input.setFunction("OPEN"); - pos.getOutput().print(UtilProperties.getMessage("pos","OPDRAM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","OPDRAM",Locale.getDefault())); return; } } else { @@ -190,19 +190,19 @@ } switch (closeInfo.length) { case 0: - output.print(UtilProperties.getMessage("pos","ENTCAS",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTCAS",Locale.getDefault())); break; case 1: - output.print(UtilProperties.getMessage("pos","ENTCHK",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTCHK",Locale.getDefault())); break; case 2: - output.print(UtilProperties.getMessage("pos","ENTCRC",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTCRC",Locale.getDefault())); break; case 3: - output.print(UtilProperties.getMessage("pos","ENTGFC",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTGFC",Locale.getDefault())); break; case 4: - output.print(UtilProperties.getMessage("pos","ENTOTH",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTOTH",Locale.getDefault())); break; case 5: GenericValue state = trans.getTerminalState(); @@ -231,7 +231,7 @@ } // print the totals report - output.print(UtilProperties.getMessage("pos","WaitingFinalSales",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","WaitingFinalSales",Locale.getDefault())); //pos.showDialog("dialog/error/terminalclosed"); JLR 14/11/06 : Pb with that don't know why, useless => commented out printTotals(pos, state, true); @@ -266,7 +266,7 @@ trans.popDrawer(); input.clear(); input.setFunction("CLOSE"); - output.print(UtilProperties.getMessage("pos","ENTCAS",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTCAS",Locale.getDefault())); } } @@ -342,7 +342,7 @@ } } else { input.setFunction("VOID"); - output.print(UtilProperties.getMessage("pos","VOID",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","VOID",Locale.getDefault())); } } @@ -387,7 +387,7 @@ if (!mgrLoggedIn) { pos.showDialog("dialog/error/mgrnotloggedin"); } else { - pos.getOutput().print(UtilProperties.getMessage("pos","Shutting_down",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","Shutting_down",Locale.getDefault())); PosTransaction.getCurrentTx(pos.getSession()).closeTx(); System.exit(0); } @@ -525,18 +525,18 @@ String reportTemplate = "totals.txt"; // miscellaneous - reportMap.put("term", UtilFormatOut.padString(UtilProperties.getMessage("pos","term",Locale.getDefault()), 20, false, ' ')); - reportMap.put("draw", UtilFormatOut.padString(UtilProperties.getMessage("pos","draw",Locale.getDefault()), 20, false, ' ')); - reportMap.put("clerk", UtilFormatOut.padString(UtilProperties.getMessage("pos","clerk",Locale.getDefault()), 20, false, ' ')); - reportMap.put("total_report", UtilFormatOut.padString(UtilProperties.getMessage("pos","total_report",Locale.getDefault()), 20, false, ' ')); + reportMap.put("term", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","term",Locale.getDefault()), 20, false, ' ')); + reportMap.put("draw", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","draw",Locale.getDefault()), 20, false, ' ')); + reportMap.put("clerk", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","clerk",Locale.getDefault()), 20, false, ' ')); + reportMap.put("total_report", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","total_report",Locale.getDefault()), 20, false, ' ')); // titles - reportMap.put("cashTitle", UtilFormatOut.padString(UtilProperties.getMessage("pos","CASH",Locale.getDefault()), 20, false, ' ')); - reportMap.put("checkTitle", UtilFormatOut.padString(UtilProperties.getMessage("pos","CHECK",Locale.getDefault()), 20, false, ' ')); - reportMap.put("giftCardTitle", UtilFormatOut.padString(UtilProperties.getMessage("pos","GIFT_CARD",Locale.getDefault()), 20, false, ' ')); - reportMap.put("creditCardTitle", UtilFormatOut.padString(UtilProperties.getMessage("pos","CREDIT_CARD",Locale.getDefault()), 20, false, ' ')); - reportMap.put("otherTitle", UtilFormatOut.padString(UtilProperties.getMessage("pos","OTHER",Locale.getDefault()), 20, false, ' ')); - reportMap.put("grossSalesTitle", UtilFormatOut.padString(UtilProperties.getMessage("pos","GROSS_SALES",Locale.getDefault()), 20, false, ' ')); + reportMap.put("cashTitle", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","CASH",Locale.getDefault()), 20, false, ' ')); + reportMap.put("checkTitle", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","CHECK",Locale.getDefault()), 20, false, ' ')); + reportMap.put("giftCardTitle", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","GIFT_CARD",Locale.getDefault()), 20, false, ' ')); + reportMap.put("creditCardTitle", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","CREDIT_CARD",Locale.getDefault()), 20, false, ' ')); + reportMap.put("otherTitle", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","OTHER",Locale.getDefault()), 20, false, ' ')); + reportMap.put("grossSalesTitle", UtilFormatOut.padString(UtilProperties.getMessage("PosUiLabels","GROSS_SALES",Locale.getDefault()), 20, false, ' ')); reportMap.put("+/-", UtilFormatOut.padString("+/-", 20, false, ' ')); reportMap.put("spacer", UtilFormatOut.padString("", 20, false, ' ')); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -65,7 +65,7 @@ } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) { if (ckInfo == null) { input.setFunction("CHECK"); - pos.getOutput().print(UtilProperties.getMessage("pos","REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","REFNUM",Locale.getDefault())); return; } else { processExternalPayment(pos, "PERSONAL_CHECK", ckInfo[1]); @@ -90,7 +90,7 @@ } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) { if (gcInfo == null) { input.setFunction("GIFTCARD"); - pos.getOutput().print(UtilProperties.getMessage("pos","REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","REFNUM",Locale.getDefault())); clearInputPaymentFunctions(pos); return; } else { @@ -122,7 +122,7 @@ } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) { if (crtInfo == null) { input.setFunction("CREDIT"); - pos.getOutput().print(UtilProperties.getMessage("pos","REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","REFNUM",Locale.getDefault())); return; } else { processExternalPayment(pos, "CREDIT_CARD", crtInfo[1]); @@ -136,7 +136,7 @@ input.clearLastFunction(); input.setFunction("TOTAL"); input.setFunction("CREDIT"); - pos.getOutput().print(UtilProperties.getMessage("pos","CREDNO",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","CREDNO",Locale.getDefault())); } else { Debug.log("Credit Func Info : " + crtInfo[1], module); if (msrInfo == null && (creditExpirationInfo == null)) { @@ -145,7 +145,7 @@ input.clearLastFunction(); input.setFunction("CREDIT"); input.setFunction("CREDITEXP"); - pos.getOutput().print(UtilProperties.getMessage("pos","CREDEX",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","CREDEX",Locale.getDefault())); } else { Debug.log("Invalid card number - " + input.value(), module); clearInputPaymentFunctions(pos); @@ -159,7 +159,7 @@ input.clearLastFunction(); input.setFunction("CREDITEXP"); input.setFunction("SECURITYCODE"); - pos.getOutput().print(UtilProperties.getMessage("pos","SECURITYCODE",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","SECURITYCODE",Locale.getDefault())); } else { Debug.log("Invalid expiration date", module); clearInputPaymentFunctions(pos); @@ -174,7 +174,7 @@ input.clearLastFunction(); input.setFunction("SECURITYCODE"); input.setFunction("POSTALCODE"); - pos.getOutput().print(UtilProperties.getMessage("pos","POSTALCODE",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","POSTALCODE",Locale.getDefault())); } else { clearInputPaymentFunctions(pos); input.clearInput(); @@ -242,12 +242,12 @@ pos.refresh(); break; case 1: // card number only found - pos.getOutput().print(UtilProperties.getMessage("pos","CREDEX",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","CREDEX",Locale.getDefault())); break; default: Debug.log("Hit the default switch case [" + allInfo + "] refreshing.", module); input.clearFunction("MSRINFO"); - pos.getOutput().print(UtilProperties.getMessage("pos","CREDNO",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","CREDNO",Locale.getDefault())); break; } } @@ -275,7 +275,7 @@ Input input = pos.getInput(); String refNum = input.value(); if (refNum == null) { - pos.getOutput().print(UtilProperties.getMessage("pos","REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","REFNUM",Locale.getDefault())); return; } input.clearInput(); @@ -328,7 +328,7 @@ if (UtilValidate.isNotEmpty(idx) && UtilValidate.isEmpty(sku)) { String refNum = pos.getInput().value(); if (UtilValidate.isEmpty(refNum)) { - pos.getOutput().print(UtilProperties.getMessage("pos","REFNUM",Locale.getDefault())); + pos.getOutput().print(UtilProperties.getMessage("PosUiLabels","REFNUM",Locale.getDefault())); pos.getInput().setFunction("REFNUM"); } else { int index = -1; @@ -350,7 +350,7 @@ public static synchronized void processSale(PosScreen pos) { pos.setWaitCursor(); PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); - PosScreen.currentScreen.getOutput().print(UtilProperties.getMessage("pos","Processing",Locale.getDefault())); + PosScreen.currentScreen.getOutput().print(UtilProperties.getMessage("PosUiLabels","Processing",Locale.getDefault())); if (trans.isEmpty()) { PosScreen newPos = pos.showPage("pospanel"); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -42,7 +42,7 @@ if (lastFunc == null || !"PROMOCODE".equals(lastFunc[0])) { Output output = pos.getOutput(); input.setFunction("PROMOCODE"); - output.print(UtilProperties.getMessage("pos","ENTPROMOCODE",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ENTPROMOCODE",Locale.getDefault())); } else if ("PROMOCODE".equals(lastFunc[0])) { String promoCode = input.value(); if (UtilValidate.isNotEmpty(promoCode)) { 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -86,11 +86,11 @@ String text = input.value(); if (func != null && func[0].equals(loginFunc)) { if (UtilValidate.isEmpty(func[1]) && UtilValidate.isEmpty(text)) { - output.print(UtilProperties.getMessage("pos","ULOGIN",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","ULOGIN",Locale.getDefault())); input.setFunction(loginFunc); input.setPasswordInput( false); } else if (UtilValidate.isEmpty(func[1])) { - output.print(UtilProperties.getMessage("pos","UPASSW",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","UPASSW",Locale.getDefault())); input.setFunction(loginFunc); input.setPasswordInput( true); } else { @@ -105,7 +105,7 @@ } catch (XuiSession.UserLoginFailure e) { input.clear(); input.setFunction(loginFunc); - output.print(e.getMessage() + " " + UtilProperties.getMessage("pos","ULOGIN",Locale.getDefault())); + output.print(e.getMessage() + " " + UtilProperties.getMessage("PosUiLabels","ULOGIN",Locale.getDefault())); } if (passed) { input.clear(); @@ -124,7 +124,7 @@ if (mgrUl != null) { boolean isMgr = session.hasRole(mgrUl, "MANAGER"); if (!isMgr) { - output.print(UtilProperties.getMessage("pos","UserNotmanager",Locale.getDefault())); + output.print(UtilProperties.getMessage("PosUiLabels","UserNotmanager",Locale.getDefault())); input.clear(); } else { ManagerEvents.mgrLoggedIn = true; 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -82,7 +82,7 @@ // cache must be set to false because there's no method to remove actionhandlers m_dialog = (XDialog) pageMgr.loadPage( m_pos.getScreenLocation() + "/dialog/ConfigureItem", false); - m_dialog.setCaption(UtilProperties.getMessage("pos", "ConfigureItem", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage("PosUiLabels", "ConfigureItem", Locale.getDefault())); m_optionListPane = (XScrollPane) m_dialog.findComponent("optionListPane"); m_configList = (XList) m_dialog.findComponent("configList"); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -65,7 +65,7 @@ public void openDlg() { m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/loadsale"); - m_dialog.setCaption(UtilProperties.getMessage("pos", "LoadASale", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage("PosUiLabels", "LoadASale", Locale.getDefault())); m_salesList = (XList) m_dialog.findComponent("salesList"); XEventHelper.addMouseHandler(this, m_salesList, "saleDoubleClick"); @@ -91,7 +91,7 @@ m_salesList.setVisibleRowCount(-1); m_salesList.ensureIndexIsVisible(m_salesList.getItemCount()); m_salesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - m_salesList.setToolTipText(UtilProperties.getMessage("pos", "LoadSaleListDblClickTip", Locale.getDefault())); + m_salesList.setToolTipText(UtilProperties.getMessage("PosUiLabels", "LoadSaleListDblClickTip", Locale.getDefault())); m_dialog.pack(); m_salesList.requestFocusInWindow(); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -89,12 +89,12 @@ Enumeration reasonsKeys = null; if (m_type.equals("IN")) { - m_dialog.setCaption(UtilProperties.getMessage("pos", "PaidInTitle", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage("PosUiLabels", "PaidInTitle", Locale.getDefault())); reasons = ResourceBundle.getBundle(m_pos.getScreenLocation() + "/dialog/PaidIn", Locale.getDefault()); reasonsKeys = reasons.getKeys(); } else { // OUT - m_dialog.setCaption(UtilProperties.getMessage("pos", "PaidOutTitle", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage("PosUiLabels", "PaidOutTitle", Locale.getDefault())); reasons = ResourceBundle.getBundle(m_pos.getScreenLocation() + "/dialog/PaidOut", Locale.getDefault()); reasonsKeys = reasons.getKeys(); } @@ -105,7 +105,7 @@ m_comboModel.addElement(val); } m_reasonsCombo.setModel(m_comboModel); - m_reasonsCombo.setToolTipText(UtilProperties.getMessage("pos", "CreateOrChooseReasonInOut", Locale.getDefault())); + m_reasonsCombo.setToolTipText(UtilProperties.getMessage("PosUiLabels", "CreateOrChooseReasonInOut", Locale.getDefault())); m_dialog.pack(); m_reasonsCombo.requestFocusInWindow(); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -214,25 +214,25 @@ operator.refresh(); if (updateOutput) { if (input.isFunctionSet("PAID")) { - output.print(UtilProperties.getMessage("pos","CHANGE",defaultLocale) + output.print(UtilProperties.getMessage("PosUiLabels","CHANGE",defaultLocale) + UtilFormatOut.formatPrice(trans.getTotalDue() * -1)); } else if (input.isFunctionSet("TOTAL")) { if (trans.getTotalDue() > 0) { - output.print(UtilProperties.getMessage("pos","TOTALD",defaultLocale) + " " + UtilFormatOut.formatPrice(trans.getTotalDue())); + output.print(UtilProperties.getMessage("PosUiLabels","TOTALD",defaultLocale) + " " + UtilFormatOut.formatPrice(trans.getTotalDue())); } else { - output.print(UtilProperties.getMessage("pos","PAYFIN",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","PAYFIN",defaultLocale)); } } else { if (PosTransaction.getCurrentTx(session).isOpen()) { - output.print(UtilProperties.getMessage("pos","ISOPEN",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","ISOPEN",defaultLocale)); } else { - output.print(UtilProperties.getMessage("pos","ISCLOSED",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","ISCLOSED",defaultLocale)); } } } //journal.focus(); } else { - output.print(UtilProperties.getMessage("pos","ULOGIN",defaultLocale)); + output.print(UtilProperties.getMessage("PosUiLabels","ULOGIN",defaultLocale)); //input.focus(); } 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -51,7 +51,7 @@ // New button for Save and Print funtion protected XButton m_saveAndPrint = null; protected static PosTransaction m_trans = null; - public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage("pos","DateTimeFormat",Locale.getDefault())); + public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage("PosUiLabels","DateTimeFormat",Locale.getDefault())); private static boolean ShowKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y"); //TODO : make getter and setter for members (ie m_*) if needed (extern calls). For that in Eclipse use Source/Generate Getters and setters @@ -66,7 +66,7 @@ m_saleName = (XEdit) m_dialog.findComponent("saleName"); //m_dialog.setM_focused(m_saleName); m_saleName.setText(m_pos.session.getUserId() + " " + sdf.format(new Date())); - m_dialog.setCaption(UtilProperties.getMessage("pos", "SaveASale", Locale.getDefault())); + m_dialog.setCaption(UtilProperties.getMessage("PosUiLabels", "SaveASale", Locale.getDefault())); m_cancel = (XButton) m_dialog.findComponent("BtnCancel"); m_save = (XButton) m_dialog.findComponent("BtnSave"); 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=674810&r1=674809&r2=674810&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 Tue Jul 8 06:10:07 2008 @@ -63,7 +63,7 @@ public String openDlg() { XDialog dlg = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/SelectProduct"); m_dialog = dlg; - dlg.setCaption(UtilProperties.getMessage("pos", "SelectAProduct", Locale.getDefault())); + dlg.setCaption(UtilProperties.getMessage("PosUiLabels", "SelectAProduct", Locale.getDefault())); //dlg.setModal(true); m_productsList = (XList) dlg.findComponent("productsList"); XEventHelper.addMouseHandler(this, m_productsList, "DoubleClick"); @@ -85,7 +85,7 @@ m_productsList.setVisibleRowCount(-1); m_productsList.ensureIndexIsVisible(m_productsList.getItemCount()); m_productsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - m_productsList.setToolTipText(UtilProperties.getMessage("pos", "SelectProductListDblClickTip", Locale.getDefault())); + m_productsList.setToolTipText(UtilProperties.getMessage("PosUiLabels", "SelectProductListDblClickTip", Locale.getDefault())); dlg.pack(); dlg.showDialog(this); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |