Set taxable for the invoice criteria. #744
This commit is contained in:
parent
37ce74f07d
commit
12ebe3538c
3 changed files with 13 additions and 0 deletions
|
|
@ -1201,6 +1201,7 @@ class RiderAppController extends APIController
|
||||||
$crit->setServiceType($stype_id);
|
$crit->setServiceType($stype_id);
|
||||||
$crit->setCustomerVehicle($cv);
|
$crit->setCustomerVehicle($cv);
|
||||||
$crit->setHasCoolant($jo->hasCoolant());
|
$crit->setHasCoolant($jo->hasCoolant());
|
||||||
|
$crit->setIsTaxable();
|
||||||
|
|
||||||
if ($promo != null)
|
if ($promo != null)
|
||||||
$crit->addPromo($promo);
|
$crit->addPromo($promo);
|
||||||
|
|
|
||||||
|
|
@ -94,6 +94,9 @@ class InvoiceController extends ApiController
|
||||||
|
|
||||||
$icrit->addEntry($batt, $trade_in, 1);
|
$icrit->addEntry($batt, $trade_in, 1);
|
||||||
|
|
||||||
|
// set if taxable
|
||||||
|
$icrit->setIsTaxable();
|
||||||
|
|
||||||
// send to invoice generator
|
// send to invoice generator
|
||||||
$invoice = $ic->generateInvoice($icrit);
|
$invoice = $ic->generateInvoice($icrit);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -658,6 +658,9 @@ class JobOrderController extends ApiController
|
||||||
$icrit->addBattery($batt);
|
$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
|
// check trade-in
|
||||||
// only allow motolite, other, none
|
// only allow motolite, other, none
|
||||||
switch ($trade_in) {
|
switch ($trade_in) {
|
||||||
|
|
@ -672,6 +675,9 @@ class JobOrderController extends ApiController
|
||||||
|
|
||||||
$icrit->addEntry($batt, $trade_in, 1);
|
$icrit->addEntry($batt, $trade_in, 1);
|
||||||
|
|
||||||
|
// set taxable
|
||||||
|
$icrit->setIsTaxable();
|
||||||
|
|
||||||
// send to invoice generator
|
// send to invoice generator
|
||||||
$invoice = $ic->generateInvoice($icrit);
|
$invoice = $ic->generateInvoice($icrit);
|
||||||
$jo->setInvoice($invoice);
|
$jo->setInvoice($invoice);
|
||||||
|
|
@ -1074,6 +1080,9 @@ class JobOrderController extends ApiController
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set taxable
|
||||||
|
$icrit->setIsTaxable();
|
||||||
|
|
||||||
$icrit->addEntry($batt, $trade_in, 1);
|
$icrit->addEntry($batt, $trade_in, 1);
|
||||||
|
|
||||||
// send to invoice generator
|
// send to invoice generator
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue