OFBiz › OFBiz - Commits

svn commit: r890116 - in /ofbiz/branches/release09.04: ./ specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r890116 - in /ofbiz/branches/release09.04: ./ specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java

Author: jleroux
Date: Sun Dec 13 20:34:40 2009
New Revision: 890116

URL: http://svn.apache.org/viewvc?rev=890116&view=rev
Log:
"Applied fix from trunk for revision: 890107"
------------------------------------------------------------------------
r890107 | jleroux | 2009-12-13 20:49:58 +0100 (dim. 13 d‚c. 2009) | 1 ligne

Cleaner: try catch finally block around EntityLisIterator was missing
------------------------------------------------------------------------

Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 13 20:34:40 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107

Modified: ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=890116&r1=890115&r2=890116&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Sun Dec 13 20:34:40 2009
@@ -43,6 +43,8 @@
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.transaction.GenericTransactionException;
+import org.ofbiz.entity.transaction.TransactionUtil;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.guiapp.xui.XuiSession;
import org.ofbiz.pos.PosTransaction;
@@ -463,52 +465,75 @@
BigDecimal othTotal = ZERO;
BigDecimal total = ZERO;

- GenericDelegator delegator = pos.getSession().getDelegator();
- List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("originFacilityId", EntityOperator.EQUALS, trans.getFacilityId()),
- EntityCondition.makeCondition("terminalId", EntityOperator.EQUALS, trans.getTerminalId()));
- EntityListIterator eli = null;
-
+ boolean beganTransaction = false;
try {
- eli = delegator.find("OrderHeaderAndPaymentPref", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, null, null, null);
- } catch (GenericEntityException e) {
- Debug.logError(e, module);
- }
-
- Timestamp dayStart = state.getTimestamp("openedDate");
- Timestamp dayEnd = state.getTimestamp("closedDate");
- if (dayEnd == null) {
- dayEnd = UtilDateTime.nowTimestamp();
- }
-
- if (eli != null) {
- GenericValue ohpp;
- while (((ohpp = (GenericValue) eli.next()) != null)) {
- Timestamp orderDate = ohpp.getTimestamp("orderDate");
- if (orderDate.after(dayStart) && orderDate.before(dayEnd)) {
- String pmt = ohpp.getString("paymentMethodTypeId");
- BigDecimal amt = ohpp.getBigDecimal("maxAmount");
-
- if ("CASH".equals(pmt)) {
- cashTotal = cashTotal.add(amt);
- } else if ("PERSONAL_CHECK".equals(pmt)) {
- checkTotal = checkTotal.add(amt);
- } else if ("GIFT_CARD".equals(pmt)) {
- gcTotal = gcTotal.add(amt);
- } else if ("CREDIT_CARD".equals(pmt)) {
- ccTotal = ccTotal.add(amt);
- } else {
- othTotal = othTotal.add(amt);
+ beganTransaction = TransactionUtil.begin();
+
+ Delegator delegator = pos.getSession().getDelegator();
+ List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("originFacilityId", EntityOperator.EQUALS, trans.getFacilityId()),
+ EntityCondition.makeCondition("terminalId", EntityOperator.EQUALS, trans.getTerminalId()));
+ EntityListIterator eli = null;
+
+ try {
+ eli = delegator.find("OrderHeaderAndPaymentPref", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, null, null, null);
+ } catch (GenericEntityException e) {
+ Debug.logError(e, module);
+ }
+
+ Timestamp dayStart = state.getTimestamp("openedDate");
+ Timestamp dayEnd = state.getTimestamp("closedDate");
+ if (dayEnd == null) {
+ dayEnd = UtilDateTime.nowTimestamp();
+ }
+
+ if (eli != null) {
+ GenericValue ohpp;
+ while (((ohpp = (GenericValue) eli.next()) != null)) {
+ Timestamp orderDate = ohpp.getTimestamp("orderDate");
+ if (orderDate.after(dayStart) && orderDate.before(dayEnd)) {
+ String pmt = ohpp.getString("paymentMethodTypeId");
+ BigDecimal amt = ohpp.getBigDecimal("maxAmount");
+
+ if ("CASH".equals(pmt)) {
+ cashTotal = cashTotal.add(amt);
+ } else if ("PERSONAL_CHECK".equals(pmt)) {
+ checkTotal = checkTotal.add(amt);
+ } else if ("GIFT_CARD".equals(pmt)) {
+ gcTotal = gcTotal.add(amt);
+ } else if ("CREDIT_CARD".equals(pmt)) {
+ ccTotal = ccTotal.add(amt);
+ } else {
+ othTotal = othTotal.add(amt);
+ }
+ total = total.add(amt);
}
- total = total.add(amt);
+ }
+
+ try {
+ eli.close();
+ } catch (GenericEntityException e) {
+ Debug.logWarning(e, "Trouble closing ELI", module);
+ pos.showDialog("dialog/error/exception", e.getMessage());
}
}
-
+ } catch (GenericTransactionException e) {
+ Debug.logError(e, module);
try {
- eli.close();
- } catch (GenericEntityException e) {
- Debug.logWarning(e, "Trouble closing ELI", module);
+ TransactionUtil.rollback(beganTransaction, e.getMessage(), e);
+ } catch (GenericTransactionException e2) {
+ Debug.logError(e2, "Unable to rollback transaction", module);
+ pos.showDialog("dialog/error/exception", e2.getMessage());
+ }
+ pos.showDialog("dialog/error/exception", e.getMessage());
+ } finally {
+ try {
+ TransactionUtil.commit(beganTransaction);
+ } catch (GenericTransactionException e) {
+ Debug.logError(e, "Unable to commit transaction", module);
+ pos.showDialog("dialog/error/exception", e.getMessage());
}
}
+

Map<String, String> reportMap = new HashMap<String, String>();
String reportTemplate = "totals.txt";