Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 632-resq-1-5-changes

This commit is contained in:
Korina Cordero 2021-10-28 02:23:00 +00:00
commit f7def95cdd

View file

@ -1161,7 +1161,7 @@ class APIController extends Controller implements LoggedController
// make invoice json data // make invoice json data
$invoice_data = [ $invoice_data = [
'total_price' => $invoice->getTotalPrice(), 'total_price' => $invoice->getTotalPrice(),
'vat_ex_price' => $invoice->getVATExclusivePrice(), 'vat_ex_price' => (float) $invoice->getVATExclusivePrice(),
'vat' => $invoice->getVAT(), 'vat' => $invoice->getVAT(),
'discount' => $invoice->getDiscount(), 'discount' => $invoice->getDiscount(),
'trade_in' => $invoice->getTradeIn(), 'trade_in' => $invoice->getTradeIn(),
@ -3087,7 +3087,7 @@ class APIController extends Controller implements LoggedController
// make invoice json data // make invoice json data
$invoice_data = [ $invoice_data = [
'total_price' => $invoice->getTotalPrice(), 'total_price' => $invoice->getTotalPrice(),
'vat_ex_price' => $invoice->getVATExclusivePrice(), 'vat_ex_price' => (float) $invoice->getVATExclusivePrice(),
'vat' => $invoice->getVAT(), 'vat' => $invoice->getVAT(),
'discount' => $invoice->getDiscount(), 'discount' => $invoice->getDiscount(),
'trade_in' => $invoice->getTradeIn(), 'trade_in' => $invoice->getTradeIn(),