diff --git a/src/Controller/CustomerAppAPI/JobOrderController.php b/src/Controller/CustomerAppAPI/JobOrderController.php
index fa5a9a85..bd8b8296 100644
--- a/src/Controller/CustomerAppAPI/JobOrderController.php
+++ b/src/Controller/CustomerAppAPI/JobOrderController.php
@@ -690,7 +690,8 @@ class JobOrderController extends ApiController
         if (!empty($trade_in_type) && !empty($trade_in_batt)) {
             $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
             if (!empty($ti_batt_obj)) {
-                $icrit->addEntry($ti_batt_obj, $trade_in_type, 1);
+                $battery_size = $ti_batt_obj->getSize();
+                $icrit->addTradeInEntry($battery_size, $trade_in_type, 1);
             }
         }
 
@@ -1124,7 +1125,8 @@ class JobOrderController extends ApiController
         if (!empty($trade_in_type) && !empty($trade_in_batt)) {
             $ti_batt_obj = $this->em->getRepository(Battery::class)->find($trade_in_batt);
             if (!empty($ti_batt_obj)) {
-                $icrit->addEntry($ti_batt_obj, $trade_in_type, 1);
+                $battery_size = $ti_batt_obj->getSize();
+                $icrit->addTradeInEntry($battery_size, $trade_in_type, 1);
             }
         }
 
diff --git a/src/InvoiceRule/BatteryReplacementWarranty.php b/src/InvoiceRule/BatteryReplacementWarranty.php
index 46ba5e8a..9bdaaaa9 100644
--- a/src/InvoiceRule/BatteryReplacementWarranty.php
+++ b/src/InvoiceRule/BatteryReplacementWarranty.php
@@ -116,14 +116,12 @@ class BatteryReplacementWarranty implements InvoiceRuleInterface
                 $qty = $item['quantity'];
                 if ($qty < 1)
                     continue;
-
-                // if this is a trade in, add trade in
-                if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
-                    $trade_in = $item['trade_in'];
-                else
+ 
+                if (empty($item['trade_in']))
+                {
                     $trade_in = null;
-
-                $criteria->addEntry($battery, $trade_in, $qty);
+                    $criteria->addEntry($battery, $trade_in, $qty);
+                }
             }
         }
 
diff --git a/src/InvoiceRule/BatterySales.php b/src/InvoiceRule/BatterySales.php
index 5dba1398..262d39eb 100644
--- a/src/InvoiceRule/BatterySales.php
+++ b/src/InvoiceRule/BatterySales.php
@@ -116,13 +116,6 @@ class BatterySales implements InvoiceRuleInterface
                 if ($qty < 1)
                     continue;
 
-                // if this is a trade in, add trade in
-                /*
-                if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
-                    $trade_in = $item['trade_in'];
-                else
-                    $trade_in = null; */
-
                 if (empty($item['trade_in']))
                 {
                     $trade_in = null;