Merge branch 'master-fix' of gitlab.com:jankstudio/resq into 632-resq-1-5-changes
This commit is contained in:
commit
f7def95cdd
1 changed files with 2 additions and 2 deletions
|
|
@ -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(),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue