[Redpos-cvs] RedPOS/src/org/redpos/client/ui/plugin/function FindSaveReceipt.java,1.1,1.2

[Anneli <an...@us...>]

Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19693/src/org/redpos/client/ui/plugin/function

Modified Files:
	FindSaveReceipt.java 
Log Message:
When choosing back on the question about save receipt
the ongoing receipt gets focus.

Index: FindSaveReceipt.java
===================================================================
RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/FindSaveReceipt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FindSaveReceipt.java	11 Jan 2005 17:11:39 -0000	1.1
--- FindSaveReceipt.java	17 Jan 2005 10:35:28 -0000	1.2
***************
*** 86,107 ****
                 public void selectionMade(int selection)
                 {
!                   saveReceipt();
!                   // send notification
!                   fireNotification(
!                         PluginFunctionConstants.NOTIFICATION_FUNCTION_FINISHED,
!                         null);
!                   // enable other UI components
!                   UIDisabler.getInstance().fireEnable();
!                   try
!                   {
!                      if (posEngineUtility.getLoginPerReceipt())
!                      {
!                         fireNotification(PluginFunctionConstants.NOTIFICATION_LOGIN_PER_RECEIPT, null);
!                      }
!                   }
!                   catch(JMException e)
                    {
!                      log.error(e.getMessage(), e);
!                   }
                 }
                 
--- 86,139 ----
                 public void selectionMade(int selection)
                 {
!                   switch(selection)
                    {
!                      case ConfirmActionUI.YES_OPTION:
!                         saveReceipt();
!                      	// send notification
!                      	fireNotification(
!                      	      PluginFunctionConstants.NOTIFICATION_FUNCTION_FINISHED,
!                      	      null);
!                      	// enable other UI components
!                      	UIDisabler.getInstance().fireEnable();
!                      	try
!                      	{
!                      	   if (posEngineUtility.getLoginPerReceipt())
!                      	   {
!                      	      fireNotification(PluginFunctionConstants.NOTIFICATION_LOGIN_PER_RECEIPT, null);
!                      	   }
!                      	}
!                      	catch(JMException e)
!                      	{
!                      	   log.error(e.getMessage(), e);
!                      	}
!                      	break;
!                      	
!                      case ConfirmActionUI.NO_OPTION:
!                         UIDisabler.getInstance().fireEnable();
!                      	// send notification
!                      	fireNotification(
!                      	      PluginFunctionConstants.NOTIFICATION_FUNCTION_FINISHED, null);
!        
!                      	break;
! 
!                      default:
!                         // send notification
!                         fireNotification(
!                               PluginFunctionConstants.NOTIFICATION_FUNCTION_FINISHED,
!                               null);
!                      	  try
!                      	  {
!                      	     if (posEngineUtility.getLoginPerReceipt())
!                      	     {
!                      	        fireNotification(PluginFunctionConstants.NOTIFICATION_LOGIN_PER_RECEIPT, null);
!                      	     }
!                      	  }
!                      	  catch(JMException e)
!                      	  {
!                      	     log.error(e.getMessage(), e);
!                      	  }
!                         break;
!                   }   
!                   
                 }
                 
***************
*** 272,279 ****
   		                amount.subtract(receiptRowData.getAmount());
   		          }
!  		          else
   		          {
!  		        */     amount.add(receiptRowData.getAmount());
! 	             // }
   		        }
   		        
--- 304,320 ----
   		                amount.subtract(receiptRowData.getAmount());
   		          }
!  		     	*/
!  		          if (receiptRowData.getStatus() != ReceiptConstants.STATUS_RECEIPTROW_CANCELLED)
   		          {
!  		           	Amount rowSum = new Amount(0.0);
!  		          	if (receiptRowData.getQuantity() != 1)
!  		          	{
!  		          	   rowSum = (Amount)receiptRowData.getAmount().clone();
!  		          	   rowSum.multiply(receiptRowData.getQuantity());
!  		          	   amount.add(rowSum);
!  		          	}
!  		          	else
!  		          	   amount.add(receiptRowData.getAmount());
! 	              }
   		        }