svn commit: r606364 - in /ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos: PosTransaction.java event/PromoEvents.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r606364 - in /ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos: PosTransaction.java event/PromoEvents.java

lektran
Author: lektran
Date: Fri Dec 21 16:49:26 2007
New Revision: 606364

URL: http://svn.apache.org/viewvc?rev=606364&view=rev
Log:
After adding a promo code, taxes weren't being recalculated

Modified:
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.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=606364&r1=606363&r2=606364&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Dec 21 16:49:26 2007
@@ -1242,6 +1242,8 @@
 
     public String addProductPromoCode(String code, PosScreen pos) {
         LocalDispatcher dispatcher = session.getDispatcher();
-        return cart.addProductPromoCode(code, dispatcher);
+        String result = cart.addProductPromoCode(code, dispatcher);
+        calcTax();
+        return result;
     }
 }

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=606364&r1=606363&r2=606364&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java Fri Dec 21 16:49:26 2007
@@ -51,6 +51,7 @@
                     pos.showDialog("dialog/error/exception", result);
                     input.clearFunction("PROMOCODE");
                 } else {
+                    input.clearFunction("PROMOCODE");
                     NavagationEvents.showPosScreen(pos);
                     pos.refresh();
                 }