diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index 7aa5650d..3ac82b9a 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -1201,6 +1201,7 @@ class RiderAppController extends APIController
         $crit->setServiceType($stype_id);
         $crit->setCustomerVehicle($cv);
         $crit->setHasCoolant($jo->hasCoolant());
+        $crit->setIsTaxable();
 
         if ($promo != null)
             $crit->addPromo($promo);
diff --git a/src/Controller/CustomerAppAPI/InvoiceController.php b/src/Controller/CustomerAppAPI/InvoiceController.php
index 1c8ab6c6..ef0cf6b2 100644
--- a/src/Controller/CustomerAppAPI/InvoiceController.php
+++ b/src/Controller/CustomerAppAPI/InvoiceController.php
@@ -94,6 +94,9 @@ class InvoiceController extends ApiController
 
         $icrit->addEntry($batt, $trade_in, 1);
 
+        // set if taxable
+        $icrit->setIsTaxable();
+
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
 
diff --git a/src/Controller/CustomerAppAPI/JobOrderController.php b/src/Controller/CustomerAppAPI/JobOrderController.php
index 4ddb40ee..cd548a42 100644
--- a/src/Controller/CustomerAppAPI/JobOrderController.php
+++ b/src/Controller/CustomerAppAPI/JobOrderController.php
@@ -658,6 +658,9 @@ class JobOrderController extends ApiController
         $icrit->addBattery($batt);
         */
 
+        // NOTE: trade in is currently not supported. Would it be better
+        // if we remove trade-in as a required parameter? Or just leave it be 
+        // and simply not process it?
         // check trade-in
         // only allow motolite, other, none
         switch ($trade_in) {
@@ -672,6 +675,9 @@ class JobOrderController extends ApiController
 
         $icrit->addEntry($batt, $trade_in, 1);
 
+        // set taxable
+        $icrit->setIsTaxable();
+
         // send to invoice generator
         $invoice = $ic->generateInvoice($icrit);
         $jo->setInvoice($invoice);
@@ -1074,6 +1080,9 @@ class JobOrderController extends ApiController
                 break;
         }
 
+        // set taxable
+        $icrit->setIsTaxable();
+
         $icrit->addEntry($batt, $trade_in, 1);
 
         // send to invoice generator