svn commit: r1758006 [2/2] - in /ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order: order/ quote/ requirement/ shoppingcart/ shoppingcart/product/ shoppingcart/shipping/ shoppinglist/ task/ thirdparty/taxware/

[ashish-18]

Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1758006&r1=1758005&r2=1758006&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListEvents.java Sat Aug 27 12:14:17 2016
@@ -153,8 +153,6 @@ public class ShoppingListEvents {
                         ctx.put("reservStart", item.getReservStart());
                         ctx.put("reservLength", item.getReservLength());
                         ctx.put("reservPersons", item.getReservPersons());
-                  //    ctx.put("accommodationMapId", item.getAccommodationMapId());
-                  //    ctx.put("accommodationSpotId", item.getAccommodationSpotId());
                         if (item.getConfigWrapper() != null) {
                             ctx.put("configId", item.getConfigWrapper().getConfigId());
                         }
@@ -264,8 +262,6 @@ public class ShoppingListEvents {
             Timestamp reservStart = shoppingListItem.getTimestamp("reservStart");
             BigDecimal reservLength = shoppingListItem.getBigDecimal("reservLength");
             BigDecimal reservPersons = shoppingListItem.getBigDecimal("reservPersons");
-      //    String accommodationMapId = shoppingListItem.getString("accommodationMapId");
-      //    String accommodationSpotId = shoppingListItem.getString("accommodationSpotId");
             String configId = shoppingListItem.getString("configId");
             try {
                 String listId = shoppingListItem.getString("shoppingListId");

Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1758006&r1=1758005&r2=1758006&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java Sat Aug 27 12:14:17 2016
@@ -470,8 +470,6 @@ public class ShoppingListServices {
                     Timestamp reservStart = shoppingListItem.getTimestamp("reservStart");
                     BigDecimal reservLength = null;
                     String configId = shoppingListItem.getString("configId");
-              //    String accommodationMapId = shoppingListItem.getString("accommodationMapId");
-              //    String accommodationSpotId = shoppingListItem.getString("accommodationSpotId");
 
                     if (shoppingListItem.get("reservLength") != null) {
                         reservLength = shoppingListItem.getBigDecimal("reservLength");
@@ -480,12 +478,6 @@ public class ShoppingListServices {
                     if (shoppingListItem.get("reservPersons") != null) {
                         reservPersons = shoppingListItem.getBigDecimal("reservPersons");
                     }
-               /*   if (shoppingListItem.get("accommodationMapId") != null) {
-                       accommodationMapId = shoppingListItem.getString("accommodationMapId");
-                    }
-                    if (shoppingListItem.get("accommodationSpotId") != null) {
-                       accommodationSpotId = shoppingListItem.getString("accommodationSpotId");
-                    }   */
                     if (UtilValidate.isNotEmpty(productId) && quantity != null) {
 
                     if (UtilValidate.isNotEmpty(configId)) {

Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java?rev=1758006&r1=1758005&r2=1758006&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskWorker.java Sat Aug 27 12:14:17 2016
@@ -38,7 +38,6 @@ public final class TaskWorker {
     public static String getCustomerName(GenericValue orderTaskList) {
         String lastName = orderTaskList.getString("customerLastName");
         String firstName = orderTaskList.getString("customerFirstName");
-        //String groupName = orderTaskList.getString("customerGroupName");
         if (lastName != null) {
         String name = lastName;
         if (firstName != null)

Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java?rev=1758006&r1=1758005&r2=1758006&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/taxware/TaxwareUTL.java Sat Aug 27 12:14:17 2016
@@ -156,23 +156,6 @@ public class TaxwareUTL {
         this.shipToAddress = v;
     }
 
-    /* deprecated : the taxCategory field does not exist anymore in OFBiz
-    public void addItem(GenericValue product, double linePrice, double itemShipping) {
-        Record record = outItem.makeRecord("outItem");
-
-        if (product.get("taxable") == null || product.getString("taxable").equalsIgnoreCase("Y")) {
-            if (product.get("taxCategory") != null)
-                record.set("COMMODITY_PRODUCT_CODE", product.get("taxCategory"));
-            else
-                record.set("COMMODITY_PRODUCT_CODE", "DEFAULT");
-            record.set("PART_NUMBER", product.get("productId"));
-            record.set("LINE_ITEM_AMOUNT", Double.valueOf(linePrice));
-            if (itemShipping > 0)
-                record.set("FREIGHT_AMOUNT", Double.valueOf(itemShipping));
-        }
-        records.add(record);
-    }*/
-
     public List getItemAdjustments() {
         return itemAdjustments;
     }