svn commit: r429165 - in /incubator/ofbiz/trunk: applications/pos/config/ applications/pos/screens/defau
Locked
svn commit: r429165 - in /incubator/ofbiz/trunk: applications/pos/config/ applications/pos/screens/defau
 
|
Author: jleroux
Date: Sun Aug 6 10:56:24 2006 New Revision: 429165 URL: http://svn.apache.org/viewvc?rev=429165&view=rev Log: This complete (save part and more) and finish the OFBIZ-734 issue. I will add some comments in code later. Added: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java - copied, changed from r428407, incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/Sales.java incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/SaveSale.java (with props) Removed: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/Sales.java Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties incubator/ofbiz/trunk/applications/pos/config/XuiLabels_it.properties incubator/ofbiz/trunk/applications/pos/config/XuiLabels_zh.properties incubator/ofbiz/trunk/applications/pos/config/pos.properties incubator/ofbiz/trunk/applications/pos/config/pos_fr.properties incubator/ofbiz/trunk/applications/pos/config/pos_it.properties incubator/ofbiz/trunk/applications/pos/config/pos_zh.properties incubator/ofbiz/trunk/applications/pos/config/xpos.properties incubator/ofbiz/trunk/applications/pos/screens/default/dialog/loadsale.xml incubator/ofbiz/trunk/applications/pos/screens/default/dialog/savesale.xml incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java incubator/ofbiz/trunk/applications/pos/styles/posstyles.xml incubator/ofbiz/trunk/applications/pos/styles/posstyles_zh.xml incubator/ofbiz/trunk/framework/guiapp/src/org/ofbiz/guiapp/xui/XuiSession.java Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/XuiLabels.properties Sun Aug 6 10:56:24 2006 @@ -30,6 +30,7 @@ CREDIT=CREDIT Cancel=Cancel DEL=DEL +Delete=Delete ENT=ENT EXCEPTION=EXCEPTION EXIT=EXIT @@ -58,11 +59,14 @@ REPRINT=REPRINT RESET_XUI=RESET XUI Replace=Replace +ReplaceAndDelete=<html><center>Replace and<br>delete SALE_DISC=SALE DISC SALE_VOIDED=SALE VOIDED SET_REF\#=SET REF# SIGN_OUT=SIGN OUT SKU=SKU +Save=Save +SaveAndClear=<html><center>Save and<br>clear the sale TERMINAL_IS_CLOSED=TERMINAL IS CLOSED TEST_ALERT=TEST ALERT TEST_ALERT_BOX=TEST ALERT BOX - TESTING THE DIALOG IMPLEMENTATION Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/XuiLabels_fr.properties Sun Aug 6 10:56:24 2006 @@ -31,6 +31,7 @@ CREDIT=Cr\u00E9dit Cancel=Annuler DEL=Suppr. +Delete=Supprimer ENT=Valider EXCEPTION=Exception rencontr\u00E9e EXIT=Quitter @@ -59,11 +60,14 @@ REPRINT=R\u00E9afficher RESET_XUI=R\u00E9initialiser Replace=Remplacer +ReplaceAndDelete=<html><center>Remplacer et<br>supprimer SALE_DISC=Remise sur la vente SALE_VOIDED=Vente annul\u00E9e SET_REF\#=n\u00B0 ? SIGN_OUT=Sortir SKU=Code +Save=Sauver +SaveAndClear=<html><center>Sauver et<br>r\u00E9intialiser la vente TERMINAL_IS_CLOSED=Le terminal est ferm\u00E9 TEST_ALERT=Alerte (test) TEST_ALERT_BOX=Test de l'impl\u00E9mentation des alertes Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/XuiLabels_it.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/XuiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/XuiLabels_it.properties Sun Aug 6 10:56:24 2006 @@ -14,65 +14,65 @@ # License for the specific language governing permissions and limitations # under the License. ##################################################################### - -SKU = CODICE PRODOTTO -MAIN = PRINCIPALE -MGR = MGR -PROMO = PROMO -LANG = LINGUA -PAY = PAGARE -TEST_ALERT = TEST AVVISO -TEST_MSR = TEST MSR -CASH = CONTANTE -CHECK = ASSEGNO -CREDIT = CREDITO -GIFT_CERT = CERTIFICATO OMAGGIO -CLEAR_ONE = AZZERA UNO -CLEAR_ALL = AZZERA TUTTO -SET_REF# = IMPOSTA RIF# -FINISH = TERMINA -CHANGE_PRICE = CAMBIA PREZZO -REPRINT = RISTAMPA -OPEN = APRE -CLOSE = CHIUDE -VOID_SALE = VENDITA VUOTA -CLEAR_CACHE = PULISCI CACHE -RESET_XUI = AZZERA XUI -OPEN_DRAWER = APRI CASSETTO -TOTALS = TOTALE -EXIT = ESCI -CLR = PULISCI -ENT = INSERISCI -SIGN_OUT = SIGN OUT -LOCK = BLOCCA -QTY = QNT -MOD = MOD -ITEM_DISC = SCONTO PRODOTTO -VOID_ITEM = PRODOTTO VUOTO -VOID_SALE = VENDITA VUOTA -SALE_DISC = SCONTO VENDITA -TRANS_SAVE = SALVA TRANSAZIONE -TRANS_RET = RITORNA TRANSAZIONE -CLR_DISC = PULISCI SCONTO -DEL = CANCELLA - -promo_page = Questo sar\u00e0 nella pagina promozione! - -product_not_found = PRODOTTO NON TROVATO -order_not_found = ORDINE NON TROVATO -problems_reading_card = PROBLEMI LEGGENDO LETTORE CARTE -CASH_DRAWER_COMMUNICATION_ERROR= ERRORE DI COMUNICAZIONE CON REGISTRATORE DI CASSA -CASH_DRAWER_IS_OPEN = REGISTRATORE DI CASSA E' APERTO -EXCEPTION = ECCEZIONE -RECEIPT_PRINTER_COMMUNICATION_ERROR = ERRORE COMUNICAZIONE STAMPA RICEVUTA -INVALID_CARD_NUMBER = NUMERO CARTA INVALIDA -MANAGER_NOT_LOGGED_IN = MANAGER NON AUTENTICATO -NO_ITEMS_SOLD = NESSUN PRODOTTO VENDUTO -NOT_ENOUGH_FUNDS = CLIENTE NON FORNISCE ABBASTANZA FONDI PER COMPLETARE QUESTA VENDITA -FUNCTION_NOT_YET_SUPPORTED = FUNZIONE NON ANCORA SUPPORTATA -PRINTER_NOT_READY = STAMPANTE NON PRONTA -ITEM_MODIFICATION_ERROR = ERRORE MODIFICA PRODOTTO -SALE_VOIDED = VENDITA VUOTA -TERMINAL_IS_CLOSED = TERMINALE E' CHIUSO -TEST_ALERT_BOX = TEST BOX AVVISO - TESTANDO IL DIALOGO IMPLEMENTAZIONE -UNKNOWN_CARD_TYPE = TIPO CARTA SCONOSCIUTA \ No newline at end of file +CASH=CONTANTE +CASH_DRAWER_COMMUNICATION_ERROR=ERRORE DI COMUNICAZIONE CON REGISTRATORE DI CASSA +CASH_DRAWER_IS_OPEN=REGISTRATORE DI CASSA E' APERTO +CHANGE_PRICE=CAMBIA PREZZO +CHECK=ASSEGNO +CLEAR_ALL=AZZERA TUTTO +CLEAR_CACHE=PULISCI CACHE +CLEAR_ONE=AZZERA UNO +CLOSE=CHIUDE +CLR=PULISCI +CLR_DISC=PULISCI SCONTO +CREDIT=CREDITO +DEL=CANCELLA +Delete= +ENT=INSERISCI +EXCEPTION=ECCEZIONE +EXIT=ESCI +FINISH=TERMINA +FUNCTION_NOT_YET_SUPPORTED=FUNZIONE NON ANCORA SUPPORTATA +GIFT_CERT=CERTIFICATO OMAGGIO +INVALID_CARD_NUMBER=NUMERO CARTA INVALIDA +ITEM_DISC=SCONTO PRODOTTO +ITEM_MODIFICATION_ERROR=ERRORE MODIFICA PRODOTTO +LANG=LINGUA +LOCK=BLOCCA +MAIN=PRINCIPALE +MANAGER_NOT_LOGGED_IN=MANAGER NON AUTENTICATO +MGR=MGR +MOD=MOD +NOT_ENOUGH_FUNDS=CLIENTE NON FORNISCE ABBASTANZA FONDI PER COMPLETARE QUESTA VENDITA +NO_ITEMS_SOLD=NESSUN PRODOTTO VENDUTO +OPEN=APRE +OPEN_DRAWER=APRI CASSETTO +PAY=PAGARE +PRINTER_NOT_READY=STAMPANTE NON PRONTA +PROMO=PROMO +QTY=QNT +RECEIPT_PRINTER_COMMUNICATION_ERROR=ERRORE COMUNICAZIONE STAMPA RICEVUTA +REPRINT=RISTAMPA +RESET_XUI=AZZERA XUI +ReplaceAndDelete= +SALE_DISC=SCONTO VENDITA +SALE_VOIDED=VENDITA VUOTA +SET_REF\#=IMPOSTA RIF# +SIGN_OUT=SIGN OUT +SKU=CODICE PRODOTTO +Save= +SaveAndClear= +TERMINAL_IS_CLOSED=TERMINALE E' CHIUSO +TEST_ALERT=TEST AVVISO +TEST_ALERT_BOX=TEST BOX AVVISO - TESTANDO IL DIALOGO IMPLEMENTAZIONE +TEST_MSR=TEST MSR +TOTALS=TOTALE +TRANS_RET=RITORNA TRANSAZIONE +TRANS_SAVE=SALVA TRANSAZIONE +UNKNOWN_CARD_TYPE=TIPO CARTA SCONOSCIUTA +VOID_ITEM=PRODOTTO VUOTO +VOID_SALE=VENDITA VUOTA +order_not_found=ORDINE NON TROVATO +problems_reading_card=PROBLEMI LEGGENDO LETTORE CARTE +product_not_found=PRODOTTO NON TROVATO +promo_page=Questo sar\u00E0 nella pagina promozione! Modified: incubator/ofbiz/trunk/applications/pos/config/XuiLabels_zh.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/XuiLabels_zh.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/XuiLabels_zh.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/XuiLabels_zh.properties Sun Aug 6 10:56:24 2006 @@ -16,64 +16,64 @@ # License for the specific language governing permissions and limitations # under the License. ##################################################################### - -SKU = SKU -MAIN = \u4e3b\u9875 -MGR = MGR -PROMO = \u4fc3\u9500 -LANG = \u8bed\u8a00 -PAY = \u652f\u4ed8 -TEST_ALERT = \u6d4b\u8bd5\u62a5\u8b66 -TEST_MSR = \u6d4b\u8bd5\u78c1\u6761 -CASH = \u73b0\u91d1 -CHECK = \u652f\u7968 -CREDIT = \u4fe1\u7528\u5361 -GIFT_CERT = \u793c\u5238 -CLEAR_ONE = \u6e05\u9664\u4e00 -CLEAR_ALL = \u6e05\u9664\u6240\u6709 -SET_REF# = SET REF# -FINISH = \u5b8c\u6210 -CHANGE_PRICE = \u8c03\u6574\u4ef7\u683c -REPRINT = \u91cd\u5370 -OPEN = \u5f00 -CLOSE = \u5173 -VOID_SALE = \u7a7a\u9500\u552e -CLEAR_CACHE = \u6e05\u7f13\u5b58 -RESET_XUI = \u5237\u65b0\u754c\u9762 -OPEN_DRAWER = \u6253\u5f00\u94b1\u7bb1 -TOTALS = \u5408\u8ba1 -EXIT = \u9000\u51fa -CLR = \u6e05\u9664 -ENT = \u786e\u8ba4 -SIGN_OUT = \u7b7e\u9000 -LOCK = \u9501 -QTY = \u4ef6\u6570 -MOD = MOD -ITEM_DISC = \u5355\u9879\u6298\u6263 -VOID_ITEM = \u7a7a\u884c -VOID_SALE = \u7a7a\u9500\u552e -SALE_DISC = \u9500\u552e\u6298\u6263 -TRANS_SAVE = \u4ea4\u6613\u4fdd\u5b58 -TRANS_RET = TRANS RET -CLR_DISC = \u6e05\u9664\u6298\u6263 - -promo_page = \u8fd9\u662f\u4fc3\u9500\u9875! - -product_not_found = \u8d27\u54c1\u4e0d\u5b58\u5728 -order_not_found = \u8ba2\u5355\u4e0d\u5b58\u5728 -problems_reading_card = \u5237\u5361\u95ee\u9898 -CASH_DRAWER_COMMUNICATION_ERROR= \u94b1\u7bb1\u901a\u8baf\u9519 -CASH_DRAWER_IS_OPEN = \u94b1\u7bb1\u5f00\u7740 -EXCEPTION = \u9519\u8bef -RECEIPT_PRINTER_COMMUNICATION_ERROR = \u6253\u5370\u51fa\u9519 -INVALID_CARD_NUMBER = \u65e0\u6548\u5361\u53f7 -MANAGER_NOT_LOGGED_IN = \u7ba1\u7406\u5458\u672a\u767b\u5f55 -NO_ITEMS_SOLD = \u6ca1\u6709\u9500\u552e\u9879 -NOT_ENOUGH_FUNDS = \u5ba2\u6237\u4ea4\u6b3e\u4e0d\u8db3 -FUNCTION_NOT_YET_SUPPORTED = \u8be5\u529f\u80fd\u8fd8\u672a\u652f\u6301 -PRINTER_NOT_READY = \u6253\u5370\u673a\u672a\u5c31\u7eea -ITEM_MODIFICATION_ERROR = \u884c\u4fee\u6539\u51fa\u9519 -SALE_VOIDED = \u9500\u552e\u4f5c\u5e9f -TERMINAL_IS_CLOSED = \u7ec8\u7aef\u5df2\u5173\u95ed -TEST_ALERT_BOX = \u6d4b\u8bd5\u62a5\u8b66\u76d2 - \u6d4b\u8bd5\u5bf9\u8bb2\u5668 -UNKNOWN_CARD_TYPE = \u672a\u77e5\u5361\u7c7b\u578b \ No newline at end of file +CASH=\u73B0\u91D1 +CASH_DRAWER_COMMUNICATION_ERROR=\u94B1\u7BB1\u901A\u8BAF\u9519 +CASH_DRAWER_IS_OPEN=\u94B1\u7BB1\u5F00\u7740 +CHANGE_PRICE=\u8C03\u6574\u4EF7\u683C +CHECK=\u652F\u7968 +CLEAR_ALL=\u6E05\u9664\u6240\u6709 +CLEAR_CACHE=\u6E05\u7F13\u5B58 +CLEAR_ONE=\u6E05\u9664\u4E00 +CLOSE=\u5173 +CLR=\u6E05\u9664 +CLR_DISC=\u6E05\u9664\u6298\u6263 +CREDIT=\u4FE1\u7528\u5361 +Delete= +ENT=\u786E\u8BA4 +EXCEPTION=\u9519\u8BEF +EXIT=\u9000\u51FA +FINISH=\u5B8C\u6210 +FUNCTION_NOT_YET_SUPPORTED=\u8BE5\u529F\u80FD\u8FD8\u672A\u652F\u6301 +GIFT_CERT=\u793C\u5238 +INVALID_CARD_NUMBER=\u65E0\u6548\u5361\u53F7 +ITEM_DISC=\u5355\u9879\u6298\u6263 +ITEM_MODIFICATION_ERROR=\u884C\u4FEE\u6539\u51FA\u9519 +LANG=\u8BED\u8A00 +LOCK=\u9501 +MAIN=\u4E3B\u9875 +MANAGER_NOT_LOGGED_IN=\u7BA1\u7406\u5458\u672A\u767B\u5F55 +MGR=MGR +MOD=MOD +NOT_ENOUGH_FUNDS=\u5BA2\u6237\u4EA4\u6B3E\u4E0D\u8DB3 +NO_ITEMS_SOLD=\u6CA1\u6709\u9500\u552E\u9879 +OPEN=\u5F00 +OPEN_DRAWER=\u6253\u5F00\u94B1\u7BB1 +PAY=\u652F\u4ED8 +PRINTER_NOT_READY=\u6253\u5370\u673A\u672A\u5C31\u7EEA +PROMO=\u4FC3\u9500 +QTY=\u4EF6\u6570 +RECEIPT_PRINTER_COMMUNICATION_ERROR=\u6253\u5370\u51FA\u9519 +REPRINT=\u91CD\u5370 +RESET_XUI=\u5237\u65B0\u754C\u9762 +ReplaceAndDelete= +SALE_DISC=\u9500\u552E\u6298\u6263 +SALE_VOIDED=\u9500\u552E\u4F5C\u5E9F +SET_REF\#=SET REF# +SIGN_OUT=\u7B7E\u9000 +SKU=SKU +Save= +SaveAndClear= +TERMINAL_IS_CLOSED=\u7EC8\u7AEF\u5DF2\u5173\u95ED +TEST_ALERT=\u6D4B\u8BD5\u62A5\u8B66 +TEST_ALERT_BOX=\u6D4B\u8BD5\u62A5\u8B66\u76D2 - \u6D4B\u8BD5\u5BF9\u8BB2\u5668 +TEST_MSR=\u6D4B\u8BD5\u78C1\u6761 +TOTALS=\u5408\u8BA1 +TRANS_RET=TRANS RET +TRANS_SAVE=\u4EA4\u6613\u4FDD\u5B58 +UNKNOWN_CARD_TYPE=\u672A\u77E5\u5361\u7C7B\u578B +VOID_ITEM=\u7A7A\u884C +VOID_SALE=\u7A7A\u9500\u552E +order_not_found=\u8BA2\u5355\u4E0D\u5B58\u5728 +problems_reading_card=\u5237\u5361\u95EE\u9898 +product_not_found=\u8D27\u54C1\u4E0D\u5B58\u5728 +promo_page=\u8FD9\u662F\u4FC3\u9500\u9875! Modified: incubator/ofbiz/trunk/applications/pos/config/pos.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/pos.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/pos.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/pos.properties Sun Aug 6 10:56:24 2006 @@ -15,71 +15,56 @@ # License for the specific language governing permissions and limitations # under the License. ##################################################################### - -SKU = SKU -ITEM = ITEM -QTY = QTY -AMT = AMT - -TOTAL = TOTAL -DATE = DATE -EMPL = EMPL -TXID = TXID -DRWR = DRAWER - -DateFormat = EEE MMM dd - -ULOGIN = Enter User ID: -UPASSW = Enter Password: - -OPDRAM = Starting Drawer Amount: -ENTCAS = Enter Cash Amount: -ENTCHK = Enter Check Amount: -ENTCRC = Enter Credit Card Amount: -ENTGFC = Enter Gift Card Amount: -ENTOTH = Enter Other Payment Amount: - - -PAYFIN = Press Finish To Complete Sale -TOTALD = Total Due: -CHANGE = Change Due: - -CREDNO = Enter Card Number: -CREDEX = Enter Expiration Date (MMYY): -CREDCF = Enter Last 4 Digits: -CREDZP = Enter Billing ZipCode: -REFNUM = Enter Reference Number: -AUTHCD = Enter Auth Code: - -ISCLOSED = Register Is Closed -ISOPEN = Register Is Open - -VOID = Enter Order Number To Void: - -UserNotmanager = User is not a valid manager! - -Invalid_Selection = Invalid Selection! -WaitingFinalSales = Waiting for final sales data transmission... - -Processing = Processing sale - -Sales_Tax = Sales Tax -Grand_Total = Grand Total - -Validating = Validating... -Saving = Saving sale... -Processing = Processing payments... -Shutting_down = Shutting down... - -CASH = CASH -CHECK = CHECK -GIFT_CARD = GIFT CARD -CREDIT_CARD = CREDIT CARD -OTHER = OTHER -GROSS_SALES = GROSS SALES -term = Term: -draw = Dr: -clerk = Clerk: -total_report = TOTALS REPORT - -LoadASale = Load a sale \ No newline at end of file +AMT=AMT +AUTHCD=Enter Auth Code: +CASH=CASH +CHANGE=Change Due: +CHECK=CHECK +CREDCF=Enter Last 4 Digits: +CREDEX=Enter Expiration Date (MMYY): +CREDIT_CARD=CREDIT CARD +CREDNO=Enter Card Number: +CREDZP=Enter Billing ZipCode: +DATE=DATE +DRWR=DRAWER +DateFormat=EEE MMM dd +DateTimeFormat='the' yyyy MMMMM dd 'at' hh:mm:ss aaa +EMPL=EMPL +ENTCAS=Enter Cash Amount: +ENTCHK=Enter Check Amount: +ENTCRC=Enter Credit Card Amount: +ENTGFC=Enter Gift Card Amount: +ENTOTH=Enter Other Payment Amount: +GIFT_CARD=GIFT CARD +GROSS_SALES=GROSS SALES +Grand_Total=Grand Total +ISCLOSED=Register Is Closed +ISOPEN=Register Is Open +ITEM=ITEM +Invalid_Selection=Invalid Selection! +LoadASale=Load a sale +LoadSaleListDblClickTip=You may use a double click to replace the current sale and delete this one +OPDRAM=Starting Drawer Amount: +OTHER=OTHER +PAYFIN=Press Finish To Complete Sale +Processing=Processing payments... +QTY=QTY +REFNUM=Enter Reference Number: +SKU=SKU +Sales_Tax=Sales Tax +SaveASale=Save the current sale +Saving=Saving sale... +Shutting_down=Shutting down... +TOTAL=TOTAL +TOTALD=Total Due: +TXID=TXID +ULOGIN=Enter User ID: +UPASSW=Enter Password: +UserNotmanager=User is not a valid manager! +VOID=Enter Order Number To Void: +Validating=Validating... +WaitingFinalSales=Waiting for final sales data transmission... +clerk=Clerk: +draw=Dr: +term=Term: +total_report=TOTALS REPORT Modified: incubator/ofbiz/trunk/applications/pos/config/pos_fr.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/pos_fr.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/pos_fr.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/pos_fr.properties Sun Aug 6 10:56:24 2006 @@ -15,71 +15,56 @@ # License for the specific language governing permissions and limitations # under the License. ##################################################################### - -SKU = Code -ITEM = Désignation -QTY = Nb -AMT = Prix - -TOTAL = Total -DATE = Date -EMPL = Vendeur -TXID = N°vente -DRWR = Tiroir - -DateFormat = EE dd MMM - -ULOGIN = Entrez votre identifiant : -UPASSW = Entrez votre mot de passe : - -OPDRAM = Contenu initial du tiroir : -ENTCAS = Entrez le montant en espèce : -ENTCHK = Entrez le montant en chèque : -ENTCRC = Entrez le montant en carte de crédit : -ENTGFC = Entrez le montant en bon d'achat : -ENTOTH = Entrez le mt en autre moyen de paiement : - - -PAYFIN = Appuyez sur [Fin] pour terminer la vente ! -TOTALD = Total dû : -CHANGE = A rendre : - -CREDNO = Entrez le n° de la carte : -CREDEX = Entrez la date d'expiration (MMYY): -CREDCF = Entrez les 4 derniers chiffres : -CREDZP = Entrez le code postal de facturation : -REFNUM = Entrez la référence (nombre) : -AUTHCD = Entrez le code secret : - -ISCLOSED = Le registre est fermé. -ISOPEN = Le registre est ouvert. - -VOID = Entrez le n° d'ordre à annuler : - -UserNotmanager = Cet utilisateur n'est pas un gérant ! - -Invalid_Selection = Sélection non valide ! -WaitingFinalSales = En attente de transmission de données ... - -Processing = Traitement de la vente - -Sales_Tax = TVA -Grand_Total = Total - -Validating = Validation... -Saving = Enregistrement de la vente... -Processing = Traitement du paiement... -Shutting_down = Arrêt en cours... - -CASH = Espèces -CHECK = Chèque(s) -GIFT_CARD = Bon(s) d'achat -CREDIT_CARD = Carte(s) de crédit -OTHER = Autres -GROSS_SALES = Total -term = Terminal : -draw = Tiroir : -clerk = Vendeur : -total_report = TOTAUX - -LoadASale = Charger une vente \ No newline at end of file +AMT=Prix +AUTHCD=Entrez le code secret : +CASH=Esp\u00E8ces +CHANGE=A rendre : +CHECK=Ch\u00E8que(s) +CREDCF=Entrez les 4 derniers chiffres : +CREDEX=Entrez la date d'expiration (MMYY): +CREDIT_CARD=Carte(s) de cr\u00E9dit +CREDNO=Entrez le n\u00B0 de la carte : +CREDZP=Entrez le code postal de facturation : +DATE=Date +DRWR=Tiroir +DateFormat=EE dd MMM +DateTimeFormat='le' dd MMMMM yyyy '\u00E0' HH:mm:ss +EMPL=Vendeur +ENTCAS=Entrez le montant en esp\u00E8ce : +ENTCHK=Entrez le montant en ch\u00E8que : +ENTCRC=Entrez le montant en carte de cr\u00E9dit : +ENTGFC=Entrez le montant en bon d'achat : +ENTOTH=Entrez le mt en autre moyen de paiement : +GIFT_CARD=Bon(s) d'achat +GROSS_SALES=Total +Grand_Total=Total +ISCLOSED=Le registre est ferm\u00E9. +ISOPEN=Le registre est ouvert. +ITEM=D\u00E9signation +Invalid_Selection=S\u00E9lection non valide ! +LoadASale=Charger une vente +LoadSaleListDblClickTip=Vous pouvez utiliser le double clic pour remplacer la vente en cours et supprimer celle ci +OPDRAM=Contenu initial du tiroir : +OTHER=Autres +PAYFIN=Appuyez sur [Fin] pour terminer la vente ! +Processing=Traitement du paiement... +QTY=Nb +REFNUM=Entrez la r\u00E9f\u00E9rence (nombre) : +SKU=Code +Sales_Tax=TVA +SaveASale=Sauver la vente en cours +Saving=Enregistrement de la vente... +Shutting_down=Arr\u00EAt en cours... +TOTAL=Total +TOTALD=Total d\u00FB : +TXID=N\u00B0vente +ULOGIN=Entrez votre identifiant : +UPASSW=Entrez votre mot de passe : +UserNotmanager=Cet utilisateur n'est pas un g\u00E9rant ! +VOID=Entrez le n\u00B0 d'ordre \u00E0 annuler : +Validating=Validation... +WaitingFinalSales=En attente de transmission de donn\u00E9es ... +clerk=Vendeur : +draw=Tiroir : +term=Terminal : +total_report=TOTAUX Modified: incubator/ofbiz/trunk/applications/pos/config/pos_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/pos_it.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/pos_it.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/pos_it.properties Sun Aug 6 10:56:24 2006 @@ -14,69 +14,55 @@ # License for the specific language governing permissions and limitations # under the License. ##################################################################### - -SKU = CODICE PRODOTTO -ITEM = PRODOTTO -QTY = QNT -AMT = IMP - -TOTAL = TOTALE -DATE = DATA -EMPL = IMPIEGATO -TXID = IDTAX -DRWR = CASSIERE - -DateFormat = EEE MMM dd - -ULOGIN = Inserire Id Utente: -UPASSW = Inserire Password: - -OPDRAM = Importo Iniziale Cassiere: -ENTCAS = Inserire Importo Contante: -ENTCHK = Inserire Importo Assegno: -ENTCRC = Inserire Importo Carta di Credito: -ENTGFC = Inserire Importo Carta Omaggio: -ENTOTH = Inserire Importo Altri Pagamenti: - - -PAYFIN = Premere Fine Per Completare la Vendita -TOTALD = Totale Dovuto: -CHANGE = Cambio Dovuto: - -CREDNO = Inserire Numero Carta: -CREDEX = Inserire Data Scadenza (MMYY): -CREDCF = Inserire Ultimi 4 Numeri: -CREDZP = Inserire C.A.P. Fatturazione: -REFNUM = Inserire Numero Riferimento: -AUTHCD = Inserire Codice Autorizzazione: - -ISCLOSED = Registratore di Cassa \u00e8 Chiuso -ISOPEN = Registratore di Cassa \u00e8 Aperto - -VOID = Inserire Numero Ordine Da Svuotare: - -UserNotmanager = Utente non \u00e8 un manager valido! - -Invalid_Selection = Selezione Non Valida! -WaitingFinalSales = In Attesa di trasmissione dei dati vendite finali... - -Processing = Esecuzione vendita - -Sales_Tax = Tasse di Vendita -Grand_Total = Totale Generale - -Validating = Validazione... -Saving = Salvataggio vendita... -Processing = Esecuzione pagamenti... -Shutting_down = Chiusura... - -CASH = CONTANTE -CHECK = ASSEGNO -GIFT_CARD = CARTA OMAGGIO -CREDIT_CARD = CARTA CREDITO -OTHER = ALTRO -GROSS_SALES = LORDO VENDITA -term = Termine: -draw = Cass.: -clerk = Impieg.: -total_report = TOTALI STAMPA \ No newline at end of file +AMT=IMP +AUTHCD=Inserire Codice Autorizzazione: +CASH=CONTANTE +CHANGE=Cambio Dovuto: +CHECK=ASSEGNO +CREDCF=Inserire Ultimi 4 Numeri: +CREDEX=Inserire Data Scadenza (MMYY): +CREDIT_CARD=CARTA CREDITO +CREDNO=Inserire Numero Carta: +CREDZP=Inserire C.A.P. Fatturazione: +DATE=DATA +DRWR=CASSIERE +DateFormat=EEE MMM dd +DateTimeFormat= +EMPL=IMPIEGATO +ENTCAS=Inserire Importo Contante: +ENTCHK=Inserire Importo Assegno: +ENTCRC=Inserire Importo Carta di Credito: +ENTGFC=Inserire Importo Carta Omaggio: +ENTOTH=Inserire Importo Altri Pagamenti: +GIFT_CARD=CARTA OMAGGIO +GROSS_SALES=LORDO VENDITA +Grand_Total=Totale Generale +ISCLOSED=Registratore di Cassa \u00E8 Chiuso +ISOPEN=Registratore di Cassa \u00E8 Aperto +ITEM=PRODOTTO +Invalid_Selection=Selezione Non Valida! +LoadSaleListDblClickTip= +OPDRAM=Importo Iniziale Cassiere: +OTHER=ALTRO +PAYFIN=Premere Fine Per Completare la Vendita +Processing=Esecuzione pagamenti... +QTY=QNT +REFNUM=Inserire Numero Riferimento: +SKU=CODICE PRODOTTO +Sales_Tax=Tasse di Vendita +SaveASale= +Saving=Salvataggio vendita... +Shutting_down=Chiusura... +TOTAL=TOTALE +TOTALD=Totale Dovuto: +TXID=IDTAX +ULOGIN=Inserire Id Utente: +UPASSW=Inserire Password: +UserNotmanager=Utente non \u00E8 un manager valido! +VOID=Inserire Numero Ordine Da Svuotare: +Validating=Validazione... +WaitingFinalSales=In Attesa di trasmissione dei dati vendite finali... +clerk=Impieg.: +draw=Cass.: +term=Termine: +total_report=TOTALI STAMPA Modified: incubator/ofbiz/trunk/applications/pos/config/pos_zh.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/pos_zh.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/pos_zh.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/pos_zh.properties Sun Aug 6 10:56:24 2006 @@ -15,68 +15,55 @@ # License for the specific language governing permissions and limitations # under the License. ##################################################################### -SKU = SKU -ITEM = \u9879 -QTY = \u4ef6\u6570 -AMT = \u91d1\u989d - -TOTAL = \u5408\u8ba1 -DATE = \u65e5\u671f -EMPL = \u6536\u94f6\u5458 -TXID = \u4ea4\u6613\u53f7 -DRWR = \u949e\u7bb1 - -DateFormat = EEE MMM dd - -ULOGIN = \u8f93\u5165\u7528\u6237 ID: -UPASSW = \u8f93\u5165\u53e3\u4ee4: - -OPDRAM = \u5f00\u59cb\u949e\u7bb1\u91d1\u989d: -ENTCAS = \u8f93\u5165\u73b0\u91d1\u989d: -ENTCHK = \u8f93\u5165\u652f\u7968\u989d: -ENTCRC = \u8f93\u5165\u4fe1\u7528\u5361\u989d: -ENTGFC = \u8f93\u5165\u793c\u54c1\u5361\u989d: -ENTOTH = \u8f93\u5165\u5176\u4ed6\u4ed8\u6b3e\u989d: - - -PAYFIN = \u6309\u5b8c\u6210\u952e\u7ed3\u675f\u9500\u552e -TOTALD = \u5408\u8ba1\u989d: -CHANGE = \u627e\u96f6: - -CREDNO = \u8f93\u5165\u5361\u53f7: -CREDEX = \u8f93\u5165\u5230\u671f\u65e5 (MMYY): -CREDCF = \u8f93\u5165\u6700\u540e4\u4f4d\u5361\u53f7: -CREDZP = \u8f93\u5165\u8d26\u5355\u90ae\u653f\u7f16\u7801: -REFNUM = \u8f93\u5165\u6d41\u6c34\u53f7: -AUTHCD = \u8f93\u5165\u6388\u6743\u7801: - -ISCLOSED = \u63d0\u793a\u724c\u5df2\u5173\u95ed -ISOPEN = \u63d0\u793a\u724c\u5df2\u6253\u5f00 - -VOID = \u8f93\u5165\u8981\u4f5c\u5e9f\u7684\u8ba2\u5355\u53f7: - -UserNotmanager = \u7528\u6237\u975e\u5408\u6cd5\u7ba1\u7406\u5458! - -Invalid_Selection = \u975e\u6cd5\u9009\u9879! -WaitingFinalSales = \u7b49\u5f85\u6700\u7ec8\u9500\u552e\u6570\u636e\u4f20\u8f93... - -Processing = \u9500\u552e\u5904\u7406\u4e2d - -Sales_Tax = \u9500\u552e\u7a0e -Grand_Total = \u603b\u8ba1 - -Validating = \u786e\u8ba4... -Saving = \u4fdd\u5b58\u9500\u552e... -Processing = \u5904\u7406\u652f\u4ed8... -Shutting_down = \u5173\u95ed... - -CASH = \u73b0\u91d1 -CHECK = \u652f\u7968 -GIFT_CARD = \u793c\u54c1\u5361 -CREDIT_CARD = \u4fe1\u7528\u5361 -OTHER = \u5176\u4ed6 -GROSS_SALES = \u6bdb\u9500\u552e\u989d -term = \u7ec8\u7aef: -draw = \u949e\u7bb1: -clerk = \u6536\u94f6\u5458: -total_report = \u5408\u8ba1\u62a5\u8868 \ No newline at end of file +AMT=\u91D1\u989D +AUTHCD=\u8F93\u5165\u6388\u6743\u7801: +CASH=\u73B0\u91D1 +CHANGE=\u627E\u96F6: +CHECK=\u652F\u7968 +CREDCF=\u8F93\u5165\u6700\u540E4\u4F4D\u5361\u53F7: +CREDEX=\u8F93\u5165\u5230\u671F\u65E5 (MMYY): +CREDIT_CARD=\u4FE1\u7528\u5361 +CREDNO=\u8F93\u5165\u5361\u53F7: +CREDZP=\u8F93\u5165\u8D26\u5355\u90AE\u653F\u7F16\u7801: +DATE=\u65E5\u671F +DRWR=\u949E\u7BB1 +DateFormat=EEE MMM dd +DateTimeFormat= +EMPL=\u6536\u94F6\u5458 +ENTCAS=\u8F93\u5165\u73B0\u91D1\u989D: +ENTCHK=\u8F93\u5165\u652F\u7968\u989D: +ENTCRC=\u8F93\u5165\u4FE1\u7528\u5361\u989D: +ENTGFC=\u8F93\u5165\u793C\u54C1\u5361\u989D: +ENTOTH=\u8F93\u5165\u5176\u4ED6\u4ED8\u6B3E\u989D: +GIFT_CARD=\u793C\u54C1\u5361 +GROSS_SALES=\u6BDB\u9500\u552E\u989D +Grand_Total=\u603B\u8BA1 +ISCLOSED=\u63D0\u793A\u724C\u5DF2\u5173\u95ED +ISOPEN=\u63D0\u793A\u724C\u5DF2\u6253\u5F00 +ITEM=\u9879 +Invalid_Selection=\u975E\u6CD5\u9009\u9879! +LoadSaleListDblClickTip= +OPDRAM=\u5F00\u59CB\u949E\u7BB1\u91D1\u989D: +OTHER=\u5176\u4ED6 +PAYFIN=\u6309\u5B8C\u6210\u952E\u7ED3\u675F\u9500\u552E +Processing=\u5904\u7406\u652F\u4ED8... +QTY=\u4EF6\u6570 +REFNUM=\u8F93\u5165\u6D41\u6C34\u53F7: +SKU=SKU +Sales_Tax=\u9500\u552E\u7A0E +SaveASale= +Saving=\u4FDD\u5B58\u9500\u552E... +Shutting_down=\u5173\u95ED... +TOTAL=\u5408\u8BA1 +TOTALD=\u5408\u8BA1\u989D: +TXID=\u4EA4\u6613\u53F7 +ULOGIN=\u8F93\u5165\u7528\u6237 ID: +UPASSW=\u8F93\u5165\u53E3\u4EE4: +UserNotmanager=\u7528\u6237\u975E\u5408\u6CD5\u7BA1\u7406\u5458! +VOID=\u8F93\u5165\u8981\u4F5C\u5E9F\u7684\u8BA2\u5355\u53F7: +Validating=\u786E\u8BA4... +WaitingFinalSales=\u7B49\u5F85\u6700\u7EC8\u9500\u552E\u6570\u636E\u4F20\u8F93... +clerk=\u6536\u94F6\u5458: +draw=\u949E\u7BB1: +term=\u7EC8\u7AEF: +total_report=\u5408\u8BA1\u62A5\u8868 Modified: incubator/ofbiz/trunk/applications/pos/config/xpos.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/config/xpos.properties?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/config/xpos.properties (original) +++ incubator/ofbiz/trunk/applications/pos/config/xpos.properties Sun Aug 6 10:56:24 2006 @@ -13,10 +13,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -#Thu Aug 03 11:29:58 CEST 2006 +#Sun Aug 06 19:49:57 CEST 2006 CenterWin=true ClientHeight=768 -Language=XuiLabels +Language=XuiLabels_fr ClientWidth=1024 StartClass=default/pospanel Title=OFBiz POS Modified: incubator/ofbiz/trunk/applications/pos/screens/default/dialog/loadsale.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/screens/default/dialog/loadsale.xml?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/screens/default/dialog/loadsale.xml (original) +++ incubator/ofbiz/trunk/applications/pos/screens/default/dialog/loadsale.xml Sun Aug 6 10:56:24 2006 @@ -24,6 +24,8 @@ <Button name="BtnCancel" x="230" y="10" w="90" h="22" content="Cancel"/> <Button name="BtnAdd" x="230" y="50" w="90" h="22" content="Add"/> <Button name="BtnReplace" x="230" y="80" w="90" h="22" content="Replace"/> + <Button name="BtnDelete" x="230" y="110" w="90" h="22" content="Delete"/> + <Button name="BtnReplaceAndDelete" x="230" y="140" w="90" h="44" content="ReplaceAndDelete"/> </Panel> </Components> </XPage> Modified: incubator/ofbiz/trunk/applications/pos/screens/default/dialog/savesale.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/screens/default/dialog/savesale.xml?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/screens/default/dialog/savesale.xml (original) +++ incubator/ofbiz/trunk/applications/pos/screens/default/dialog/savesale.xml Sun Aug 6 10:56:24 2006 @@ -17,13 +17,11 @@ --> <XPage class="net.xoetrope.swing.XDialog"> <Components> - <Panel name="salesPanel" x="0" y="0" w="340" h="420"> - <ScrollPane name="scroolList" x="10" y="10" w="200" h="400"> - <List name="salesList" x="0" y="0" w="200" h="400" /> - </ScrollPane> + <Panel name="salePanel" x="0" y="0" w="340" h="160"> + <Edit name="saleName" x="10" y="10" w="200" h="22" /> <Button name="BtnCancel" x="230" y="10" w="90" h="22" content="Cancel"/> - <Button name="BtnAdd" x="230" y="50" w="90" h="22" content="Add"/> - <Button name="BtnReplace" x="230" y="80" w="90" h="22" content="Replace"/> + <Button name="BtnSave" x="230" y="50" w="90" h="22" content="Save"/> + <Button name="BtnSaveAndClear" x="230" y="80" w="90" h="66" content="SaveAndClear"/> </Panel> </Components> </XPage> Modified: incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml (original) +++ incubator/ofbiz/trunk/applications/pos/screens/default/menu/posmain.xml Sun Aug 6 10:56:24 2006 @@ -25,35 +25,35 @@ <Button name="menuPay" x="510" y="0" w="100" h="60" style="posButton" content="PAY" alignment="Center"/> <!-- col 2 --> - <Button name="SKU.GZ-1001" x="0" y="62" w="100" h="60" style="skuButton" content="GIZMO 1" alignment="Center"/> - <Button name="SKU.GZ-5005" x="102" y="62" w="100" h="60" style="skuButton" content="GIZMO 2" alignment="Center"/> - <Button name="SKU.GZ-2644" x="204" y="62" w="100" h="60" style="skuButton2" content="GIZMO 3" alignment="Center"/> - <Button name="SKU.GZ-2002" x="306" y="62" w="100" h="60" style="skuButton" content="GIZMO 4" alignment="Center"/> - <Button name="SKU.GZ-7000" x="408" y="62" w="100" h="60" style="skuButton" content="GIZMO 5" alignment="Center"/> - <Button name="SKU.WG-5569" x="510" y="62" w="100" h="60" style="skuButton2" content="WIDGET 1" alignment="Center"/> + <Button name="SKU.GZ-1001" x="0" y="62" w="100" h="60" style="skuButtonGizmo" content="GIZMO 1" alignment="Center"/> + <Button name="SKU.GZ-5005" x="102" y="62" w="100" h="60" style="skuButtonGizmoPurple" content="GIZMO 2" alignment="Center"/> + <Button name="SKU.GZ-2644" x="204" y="62" w="100" h="60" style="skuButtonGizmo" content="GIZMO 3" alignment="Center"/> + <Button name="SKU.GZ-2002" x="306" y="62" w="100" h="60" style="skuButtonGizmo" content="GIZMO 4" alignment="Center"/> + <Button name="SKU.GZ-7000" x="408" y="62" w="100" h="60" style="skuButtonGizmo" content="GIZMO 5" alignment="Center"/> + <Button name="SKU.WG-5569" x="510" y="62" w="100" h="60" style="skuButtonWidget" content="WIDGET 1" alignment="Center"/> <!-- col 3 --> - <Button name="SKU.GC-001-C10" x="0" y="124" w="100" h="60" style="skuButton" content="GCC10" alignment="Center"/> - <Button name="SKU.GC-001-C100" x="102" y="124" w="100" h="60" style="skuButton" content="GCC100" alignment="Center"/> - <Button name="SKU.GC-001-C25" x="204" y="124" w="100" h="60" style="skuButton" content="GCC25" alignment="Center"/> - <Button name="SKU.GC-001-C50" x="306" y="124" w="100" h="60" style="skuButton" content="GCC50" alignment="Center"/> - <Button name="SKU.GC-001-CO" x="408" y="124" w="100" h="60" style="skuButton" content="GCCO" alignment="Center"/> - <Button name="SKU.GZ-1000" x="510" y="124" w="100" h="60" style="skuButton" content="GZ1000" alignment="Center"/> + <Button name="SKU.GC-001-C10" x="0" y="124" w="100" h="60" style="skuButtonGiftCard" content="GCC10" alignment="Center"/> + <Button name="SKU.GC-001-C100" x="102" y="124" w="100" h="60" style="skuButtonGiftCard" content="GCC100" alignment="Center"/> + <Button name="SKU.GC-001-C25" x="204" y="124" w="100" h="60" style="skuButtonGiftCard" content="GCC25" alignment="Center"/> + <Button name="SKU.GC-001-C50" x="306" y="124" w="100" h="60" style="skuButtonGiftCard" content="GCC50" alignment="Center"/> + <Button name="SKU.GC-001-CO" x="408" y="124" w="100" h="60" style="skuButtonGiftCard" content="GCCO" alignment="Center"/> + <Button name="SKU.GZ-1000" x="510" y="124" w="100" h="60" style="skuButtonGiftCard" content="GZ1000" alignment="Center"/> <!-- col 4 --> - <Button name="SKU.GC-001-H10" x="0" y="186" w="100" h="60" style="skuButton" content="GCH10" alignment="Center"/> - <Button name="SKU.GC-001-H100" x="102" y="186" w="100" h="60" style="skuButton" content="GCH100" alignment="Center"/> - <Button name="SKU.GC-001-H25" x="204" y="186" w="100" h="60" style="skuButton" content="GCH125" alignment="Center"/> - <Button name="SKU.GC-001-H50" x="306" y="186" w="100" h="60" style="skuButton" content="GCH50" alignment="Center"/> - <Button name="SKU.GC-001-HO" x="408" y="186" w="100" h="60" style="skuButton" content="GCHO" alignment="Center"/> - <Button name="SKU.GZ-DIG" x="510" y="186" w="100" h="60" style="skuButton" content="GZDIG" alignment="Center"/> + <Button name="SKU.GC-001-H10" x="0" y="186" w="100" h="60" style="skuButtonGiftCard" content="GCH10" alignment="Center"/> + <Button name="SKU.GC-001-H100" x="102" y="186" w="100" h="60" style="skuButtonGiftCard" content="GCH100" alignment="Center"/> + <Button name="SKU.GC-001-H25" x="204" y="186" w="100" h="60" style="skuButtonGiftCard" content="GCH125" alignment="Center"/> + <Button name="SKU.GC-001-H50" x="306" y="186" w="100" h="60" style="skuButtonGiftCard" content="GCH50" alignment="Center"/> + <Button name="SKU.GC-001-HO" x="408" y="186" w="100" h="60" style="skuButtonGiftCard" content="GCHO" alignment="Center"/> + <Button name="SKU.GZ-DIG" x="510" y="186" w="100" h="60" style="skuButtonGizmo" content="GZDIG" alignment="Center"/> <!-- col 5 --> - <Button name="SKU.GZ-1004" x="0" y="248" w="100" h="60" style="skuButton" content="GZ1004" alignment="Center"/> - <Button name="SKU.GZ-1005" x="102" y="248" w="100" h="60" style="skuButton" content="GZ1005" alignment="Center"/> - <Button name="SKU.GZ-8544" x="204" y="248" w="100" h="60" style="skuButton" content="GZ8544" alignment="Center"/> - <Button name="SKU.GZ-9290" x="306" y="248" w="100" h="60" style="skuButton" content="GZ9290" alignment="Center"/> - <Button name="SKU.GZ-5005" x="408" y="248" w="100" h="60" style="skuButton" content="GZ5005" alignment="Center"/> + <Button name="SKU.GZ-1004" x="0" y="248" w="100" h="60" style="skuButtonGizmo" content="GZ1004" alignment="Center"/> + <Button name="SKU.GZ-1005" x="102" y="248" w="100" h="60" style="skuButtonGizmo" content="GZ1005" alignment="Center"/> + <Button name="SKU.GZ-8544" x="204" y="248" w="100" h="60" style="skuButtonGizmo" content="GZ8544" alignment="Center"/> + <Button name="SKU.GZ-9290" x="306" y="248" w="100" h="60" style="skuButtonGizmo" content="GZ9290" alignment="Center"/> + <Button name="" x="408" y="248" w="100" h="60" style="posButton" content="" alignment="Center"/> <Button name="" x="510" y="248" w="100" h="60" style="posButton" content="" alignment="Center"/> <!-- col 6 --> Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/PosTransaction.java Sun Aug 6 10:56:24 2006 @@ -51,8 +51,9 @@ import org.ofbiz.pos.component.Journal; import org.ofbiz.pos.component.Output; import org.ofbiz.pos.device.DeviceLoader; +import org.ofbiz.pos.screen.LoadSale; import org.ofbiz.pos.screen.PosScreen; -import org.ofbiz.pos.screen.Sales; +import org.ofbiz.pos.screen.SaveSale; import org.ofbiz.product.store.ProductStoreWorker; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -879,86 +880,146 @@ } public void loadSale(PosScreen pos) { - //ShoppingCart.CartPaymentInfo inf = cart.getPaymentInfo(paymentIndex); + List shoppingLists = createShoppingLists(); + if (!shoppingLists.isEmpty()) { + Hashtable salesMap = createSalesMap(shoppingLists); + if (!salesMap.isEmpty()) { + LoadSale loadSale = new LoadSale(salesMap, this, pos); + loadSale.openDlg(); + } + else { + pos.showDialog("dialog/error/nosales"); + } + } else { + pos.showDialog("dialog/error/nosales"); + } + } + + public List createShoppingLists() { + List shoppingLists = null; + GenericDelegator delegator = this.session.getDelegator(); + try { + shoppingLists = delegator.findAll("ShoppingList"); + } catch (GenericEntityException e) { + Debug.logError(e, module); + ServiceUtil.returnError("Error running initLowLevelCode: " + e.getMessage()); + } + + if (shoppingLists == null) { + Debug.log(UtilProperties.getMessage("EcommerceUiLabels","EcommerceNoShoppingListsCreate",locale), module); + } + return shoppingLists; + } - /*if (UtilValidate.isEmpty(shoppingListId)) { - // create a new shopping list - if (partyId == null) { - partyId = userLogin.getString("partyId"); + public Hashtable createSalesMap(List shoppingLists) { + Hashtable salesMap = new Hashtable(); + Iterator i = shoppingLists.iterator(); + while (i.hasNext()){ + GenericValue shoppingList = (GenericValue) i.next(); + List items = null; + try { + items = shoppingList.getRelated("ShoppingListItem", UtilMisc.toList("shoppingListItemSeqId")); + } catch (GenericEntityException e) { + Debug.logError(e, module); } + if (UtilValidate.isNotEmpty(items)) { + String listName = shoppingList.getString("listName"); + String shoppingListId = shoppingList.getString("shoppingListId"); + salesMap.put(shoppingListId, listName); + } + } + return salesMap; + } + + public boolean addListToCart(String shoppingListId, PosScreen pos, boolean append) { + GenericDelegator delegator = session.getDelegator(); + LocalDispatcher dispatcher = session.getDispatcher(); + String includeChild = null; // Perhaps will be used later ... + String prodCatalogId = null; - Map serviceCtx = UtilMisc.toMap("userLogin", userLogin, "partyId", partyId, - "productStoreId", productStoreId, "listName", "List Created From Order #" + orderId); + try { + ShoppingListEvents.addListToCart(delegator, dispatcher, cart, prodCatalogId, shoppingListId, (includeChild != null), true, append); + } catch (IllegalArgumentException e) { + Debug.logError(e, module); + pos.showDialog("dialog/error/exception", e.getMessage()); + return false; + } + return true; + } + + public boolean clearList(String shoppingListId, PosScreen pos) { + GenericDelegator delegator = session.getDelegator(); + try { + ShoppingListEvents.clearListInfo(delegator, shoppingListId); + } catch (GenericEntityException e) { + Debug.logError(e, module); + pos.showDialog("dialog/error/exception", e.getMessage()); + return false; + } + return true; + } + - if (UtilValidate.isNotEmpty(shoppingListTypeId)) { - serviceCtx.put("shoppingListTypeId", shoppingListTypeId); - } + public void saveSale(PosScreen pos) { + SaveSale SaveSale = new SaveSale(this, pos); + SaveSale.openDlg(); + } + public void saveSale(String shoppingListName, PosScreen pos) { + if (cart.size() == 0 ) { + pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); + return; + } + GenericDelegator delegator = this.session.getDelegator(); + LocalDispatcher dispatcher = session.getDispatcher(); + GenericValue userLogin = session.getUserLogin(); + Locale locale = defaultLocale; + String shoppingListId = null; + + if (!UtilValidate.isEmpty(shoppingListName)) { + // create a new shopping list with partyId = user connected (POS clerk, etc.) and not buyer (_NA_ in POS) + Map serviceCtx = UtilMisc.toMap("userLogin", session.getUserLogin(), "partyId", session.getUserPartyId(), + "productStoreId", productStoreId, "listName", shoppingListName); + serviceCtx.put("shoppingListTypeId", "SLT_SPEC_PURP"); Map newListResult = null; try { newListResult = dispatcher.runSync("createShoppingList", serviceCtx); } catch (GenericServiceException e) { - Debug.logError(e, "Problems creating new ShoppingList", module); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderUnableToCreateNewShoppingList",locale)); + Debug.logError(e, "Problem while creating new ShoppingList", module); + pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); + return; } // check for errors if (ServiceUtil.isError(newListResult)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(newListResult)); + String error = ServiceUtil.getErrorMessage(newListResult); + Debug.logError(error, module); + pos.showDialog("dialog/error/exception", error); + return; } - + // get the new list id if (newListResult != null) { - shoppingListId = (String) newListResult.get("shoppingListId"); + shoppingListId = (String) newListResult.get("shoppingListId"); + } else { + Debug.logError("Problem while creating new ShoppingList", module); + pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); + return; } - }*/ - - List shoppingList = null; - GenericDelegator delegator = this.session.getDelegator(); - try { - shoppingList = delegator.findAll("ShoppingList"); - } catch (GenericEntityException e) { - Debug.logError(e, module); - ServiceUtil.returnError("Error running initLowLevelCode: " + e.getMessage()); } - - if (shoppingList == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels","EcommerceNoShoppingListsCreate",locale), module); - } - - if (0 == shoppingList.size()) { - pos.showDialog("dialog/error/nosales"); - pos.refresh(); - return; - } - Hashtable salesMap = new Hashtable(); - Iterator i = shoppingList.iterator(); - while (i.hasNext()){ - GenericValue v = (GenericValue) i.next(); - salesMap.put(v.getString("shoppingListId"), v.getString("listName")); - } - - Sales salesDlg = new Sales(salesMap, this, pos); - salesDlg.openDlg(); - } - - public boolean addListToCart(String shoppingListId, PosScreen pos, boolean append) { - GenericDelegator delegator = session.getDelegator(); - LocalDispatcher dispatcher = session.getDispatcher(); - String includeChild = null; // Perhaps will be used later ... - String prodCatalogId = null; + String selectedCartItems[] = new String[cart.size()]; + for(int i = 0; i < cart.size(); i++) { + Integer integer = new Integer(i); + selectedCartItems[i] = integer.toString(); + } - try { - //(GenericDelegator delegator, LocalDispatcher dispatcher, ShoppingCart cart, String prodCatalogId, String shoppingListId, boolean includeChild, boolean setAsListItem, boolean append) throws java.lang.IllegalArgumentException { - ShoppingListEvents.addListToCart(delegator, dispatcher, cart, prodCatalogId, shoppingListId, (includeChild != null), true, append); - } catch (IllegalArgumentException e) { - Debug.logError(e, module); - pos.showDialog("dialog/error/exception", e.getMessage()); - pos.refresh(); - return false; - } - return true; - } + try { + ShoppingListEvents.addBulkFromCart(delegator, dispatcher, cart, userLogin, shoppingListId, selectedCartItems, true, true); + } catch (IllegalArgumentException e) { + Debug.logError(e, "Problem while creating new ShoppingList", module); + pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); + } + } } Modified: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java?rev=429165&r1=429164&r2=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java (original) +++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/event/MenuEvents.java Sun Aug 6 10:56:24 2006 @@ -356,7 +356,7 @@ public static void saveSale(PosScreen pos) { PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); - pos.refresh(); + trans.saveSale(pos); } public static void loadSale(PosScreen pos) { Copied: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java (from r428407, incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/Sales.java) URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java?p2=incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java&p1=incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/Sales.java&r1=428407&r2=429165&rev=429165&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/Sales.java (original) +++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/LoadSale.java Sun Aug 6 10:56:24 2006 @@ -19,15 +19,14 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; -import java.util.Set; +import javax.swing.DefaultListModel; import javax.swing.ListSelectionModel; import net.xoetrope.swing.XButton; import net.xoetrope.swing.XDialog; import net.xoetrope.swing.XList; import net.xoetrope.xui.XPage; -import net.xoetrope.xui.XProjectManager; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; @@ -40,82 +39,167 @@ * @since 3.2 */ -public class Sales extends XPage { +public class LoadSale extends XPage { /** - * To load a sale from a shopping list. 2 modes : add to or replace the current sale. + * 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 = Sales.class.getName(); - protected static PosScreen m_page = null; + public static final String module = LoadSale.class.getName(); + protected static PosScreen m_pos = null; protected XDialog m_dialog = null; - protected Hashtable m_saleMap = null; + static protected Hashtable m_saleMap = new Hashtable(); protected XList m_salesList = null; + protected XButton m_cancel = null; protected XButton m_add = null; protected XButton m_replace = null; - protected XButton m_cancel = null; + protected XButton m_delete = null; + protected XButton m_replaceAndDelete = null; + protected DefaultListModel m_listModel = null; protected static PosTransaction m_trans = null; //TODO : make getter and setter for members (ie m_*) if needed (extern calls) - public Sales(Hashtable saleMap, PosTransaction trans, PosScreen page) { - m_saleMap = saleMap; + public LoadSale(Hashtable saleMap, PosTransaction trans, PosScreen page) { + m_saleMap.putAll(saleMap); m_trans = trans; - m_page = page; + m_pos = page; } public void openDlg() { - XDialog dlg = (XDialog) pageMgr.loadPage(m_page.getScreenLocation() + "/dialog/loadsale"); + XDialog dlg = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/loadsale"); m_dialog = dlg; dlg.setCaption(UtilProperties.getMessage("pos", "LoadASale", Locale.getDefault())); + //dlg.setModal(true); m_salesList = (XList) dlg.findComponent("salesList"); - + addMouseHandler(m_salesList, "SaleDoubleClick"); + + m_cancel = (XButton) dlg.findComponent("BtnCancel"); m_add = (XButton) dlg.findComponent("BtnAdd"); m_replace = (XButton) dlg.findComponent("BtnReplace"); - m_cancel = (XButton) dlg.findComponent("BtnCancel"); - addMouseHandler(m_add, "add"); - addMouseHandler(m_replace, "replace"); - addMouseHandler(m_cancel, "cancel"); + m_delete = (XButton) dlg.findComponent("BtnDelete"); + m_replaceAndDelete = (XButton) dlg.findComponent("BtnReplaceAndDelete"); + addMouseHandler(m_cancel, "cancel"); + addMouseHandler(m_add, "addSale"); + addMouseHandler(m_replace, "replaceSale"); + addMouseHandler(m_delete, "deleteShoppingList"); + addMouseHandler(m_replaceAndDelete, "replaceSaleAndDeleteShoppingList"); - m_salesList.setListData(m_saleMap.values().toArray()); + m_listModel = new DefaultListModel(); + for (Iterator i = m_saleMap.entrySet().iterator(); i.hasNext();) { + Object o = i.next(); + Map.Entry entry = (Map.Entry)o; + String val = entry.getValue().toString(); + m_listModel.addElement(val); + } + m_salesList.setModel(m_listModel); 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())); dlg.pack(); dlg.showDialog(this); } + + public synchronized void SaleDoubleClick() { + if (wasMouseDoubleClicked()) { + String sale = selectedSale(); + if (null != sale) { + replaceSaleAndDeleteShoppingList_(); + } + } + } + + public synchronized void cancel() { + if (wasMouseClicked()) { + closeDlg(); + } + } - public synchronized void cancel() - { + public synchronized void addSale() { if (wasMouseClicked()) { - this.m_dialog.closeDlg(); + addSale_(); } } - public synchronized void add() { + private synchronized void addSale_() { + String sale = selectedSale(); + if (null != sale) { + addListToCart(sale, true); + } + } + + + public synchronized void replaceSale() { if (wasMouseClicked()) { - String sale = selectedSale(); - if (null != sale) { - addListToCart(sale, true); - } + replaceSale_(); + } + } + + private synchronized void replaceSale_() { + String sale = selectedSale(); + if (null != sale) { + addListToCart(sale, false); + } + } + + public synchronized void deleteShoppingList() { + if (wasMouseClicked()) { + deleteShoppingList_(); } } + + private synchronized void deleteShoppingList_() { + String sale= (String) m_salesList.getSelectedValue(); + if (null != sale) { + String shoppingListId = selectedSale(); + final ClassLoader cl = this.getClassLoader(m_pos); + Thread.currentThread().setContextClassLoader(cl); + if (m_trans.clearList(shoppingListId, m_pos)) { + int index = m_salesList.getSelectedIndex(); + m_saleMap.remove(shoppingListId); + m_listModel = new DefaultListModel(); + for (Iterator i = m_saleMap.entrySet().iterator(); i.hasNext();) { + Object o = i.next(); + Map.Entry entry = (Map.Entry)o; + String val = entry.getValue().toString(); + m_listModel.addElement(val); + } + m_salesList.setModel(m_listModel); + int size = m_listModel.getSize(); + if (size == 0) { //Nobody's left, nothing to do here + closeDlg(); + } else { //Select an index. + if (index == size) { + //removed item in last position + index--; + } + } + m_salesList.setSelectedIndex(index); + m_salesList.ensureIndexIsVisible(index); + m_salesList.repaint(); + repaint(); + } + } + } - public synchronized void replace() { + + public synchronized void replaceSaleAndDeleteShoppingList() { if (wasMouseClicked()) { - String sale = selectedSale(); - if (null != sale) { - addListToCart(sale, false); - } + replaceSaleAndDeleteShoppingList_(); } } + + public synchronized void replaceSaleAndDeleteShoppingList_() { + replaceSale_(); + deleteShoppingList_(); + } private String selectedSale() { String saleSelected = null; if (null != m_salesList.getSelectedValue()) { String sale = (String) m_salesList.getSelectedValue(); - Set sales = m_saleMap.entrySet(); - Iterator i = sales.iterator(); + Iterator i = m_saleMap.entrySet().iterator(); while(i.hasNext()) { Object o = i.next(); Map.Entry entry = (Map.Entry)o; @@ -129,16 +213,17 @@ } private void addListToCart(String sale, boolean addToCart) { - final ClassLoader cl = this.getClassLoader(m_page); + final ClassLoader cl = this.getClassLoader(m_pos); Thread.currentThread().setContextClassLoader(cl); - if (!m_trans.addListToCart(sale, m_page, addToCart)) { + if (!m_trans.addListToCart(sale, m_pos, addToCart)) { Debug.logError("Error while loading cart from shopping list : " + sale, module); } else { m_trans.calcTax(); - m_page.refresh(); - this.m_dialog.closeDlg(); - } + m_pos.refresh(); + + } + closeDlg(); } private ClassLoader getClassLoader(PosScreen pos) { @@ -159,4 +244,7 @@ } return cl; } -} \ No newline at end of file + + private void closeDlg() { + m_dialog.closeDlg(); + }} \ No newline at end of file Added: incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/SaveSale.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=429165&view=auto ============================================================================== --- incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/SaveSale.java (added) +++ incubator/ofbiz/trunk/applications/pos/src/org/ofbiz/pos/screen/SaveSale.java Sun Aug 6 10:56:24 2006 @@ -0,0 +1,132 @@ +/* + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ +package org.ofbiz.pos.screen; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + +import net.xoetrope.swing.XButton; +import net.xoetrope.swing.XDialog; +import net.xoetrope.swing.XEdit; +import net.xoetrope.xui.XPage; + +import org.ofbiz.b |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |