Regenerate invoice when changing promo

This commit is contained in:
Ramon Gutierrez 2018-02-05 03:45:28 +08:00
parent a318d5ffcb
commit 46ebd223a2
2 changed files with 28 additions and 22 deletions

View file

@ -656,7 +656,8 @@ class JobOrderController extends BaseController
protected function invoiceBatteries($em, InvoiceCriteria $criteria, $items) protected function invoiceBatteries($em, InvoiceCriteria $criteria, $items)
{ {
// return error if there's a problem, false otherwise // return error if there's a problem, false otherwise
if (!empty($items))
{
foreach ($items as $item) foreach ($items as $item)
{ {
// check if this is a valid battery // check if this is a valid battery
@ -680,6 +681,7 @@ class JobOrderController extends BaseController
if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in'])) if (!empty($item['trade_in']) && TradeInType::validate($item['trade_in']))
$criteria->addTradeIn($item['trade_in'] == 'motolite', $qty); $criteria->addTradeIn($item['trade_in'] == 'motolite', $qty);
} }
}
return null; return null;
} }
@ -701,7 +703,6 @@ class JobOrderController extends BaseController
if (!$error) if (!$error)
$error = $this->invoiceBatteries($em, $criteria, $items); $error = $this->invoiceBatteries($em, $criteria, $items);
if ($error) if ($error)
{ {
// something happened // something happened

View file

@ -921,6 +921,11 @@ $(function() {
generateInvoice(); generateInvoice();
}); });
// update invoice when promo is changed
$("#invoice-promo").change(function() {
generateInvoice();
});
function generateInvoice() { function generateInvoice() {
var promo = $("#invoice-promo").val(); var promo = $("#invoice-promo").val();
var table = $("#invoice-table tbody"); var table = $("#invoice-table tbody");