Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 13:44:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for QB discounts

Browse Source
This commit is contained in:
David Bomba 2024-09-24 15:58:57 +10:00
parent 52adc55c9c
commit a593d2b9d9
3 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Quickbooks/Models/QbInvoice.php
View File

@ -140,6 +140,8 @@ class QbInvoice implements SyncInterface
$ninja_invoice_data = $this->invoice_transformer->qbToNinja($record);
nlog($ninja_invoice_data);
$payment_ids = $ninja_invoice_data['payment_ids'] ?? [];
$client_id = $ninja_invoice_data['client_id'] ?? null;

3
app/Services/Quickbooks/QuickbooksService.php
View File

@ -90,14 +90,11 @@ class QuickbooksService
private function checkToken(): self
{
nlog($this->company->quickbooks->accessTokenExpiresAt);
nlog(time());
if($this->company->quickbooks->accessTokenExpiresAt > time())
return $this;
if($this->company->quickbooks->accessTokenExpiresAt < time() && $this->try_refresh){
nlog('Refreshing token');
$this->sdk()->refreshToken($this->company->quickbooks->refresh_token);
$this->company = $this->company->fresh();
$this->try_refresh = false;

57
app/Services/Quickbooks/Transformers/InvoiceTransformer.php
View File

@ -47,14 +47,63 @@ class InvoiceTransformer extends BaseTransformer
'due_date' => data_get($qb_data, 'DueDate', null),
'po_number' => data_get($qb_data, 'PONumber', ""),
'partial' => data_get($qb_data, 'Deposit', 0),
'line_items' => $this->getLineItems(data_get($qb_data, 'Line', [])),
'line_items' => $this->getLineItems(data_get($qb_data, 'Line', []), data_get($qb_data, 'ApplyTaxAfterDiscount', 'true')),
'payment_ids' => $this->getPayments($qb_data),
'status_id' => Invoice::STATUS_SENT,
'tax_rate1' => $rate = data_get($qb_data,'TxnTaxDetail.TaxLine.TaxLineDetail.TaxPercent', 0),
'tax_rate1' => $rate = $this->calculateTotalTax($qb_data),
'tax_name1' => $rate > 0 ? "Sales Tax" : "",
'custom_surcharge1' => $this->checkIfDiscountAfterTax($qb_data),
] : false;
}
private function checkIfDiscountAfterTax($qb_data)
{
if($qb_data->ApplyTaxAfterDiscount == 'true'){
return 0;
}
foreach(data_get($qb_data, 'Line', []) as $line)
{
nlog("iterating");
if(data_get($line, 'DetailType.value') == 'DiscountLineDetail')
{
nlog("found discount");
if(!isset($this->company->custom_fields->surcharge1))
{
$this->company->custom_fields->surcharge1 = ctrans('texts.discount');
$this->company->save();
}
nlog(data_get($line, 'Amount', 0) * -1);
return data_get($line, 'Amount', 0) * -1;
}
}
return 0;
}
private function calculateTotalTax($qb_data)
{
$taxLines = data_get($qb_data, 'TxnTaxDetail.TaxLine', []);
if (!is_array($taxLines)) {
$taxLines = [$taxLines];
}
$totalTaxRate = 0;
foreach ($taxLines as $taxLine) {
$taxRate = data_get($taxLine, 'TaxLineDetail.TaxPercent', 0);
$totalTaxRate += $taxRate;
}
return $totalTaxRate;
}
private function getPayments(mixed $qb_data)
{
$payments = [];
@ -82,7 +131,7 @@ class InvoiceTransformer extends BaseTransformer
}
private function getLineItems(mixed $qb_items)
private function getLineItems(mixed $qb_items, string $include_discount = 'true')
{
$items = [];
@ -105,7 +154,7 @@ class InvoiceTransformer extends BaseTransformer
$items[] = (object)$item;
}
if(data_get($qb_item, 'DetailType.value') == 'DiscountLineDetail')
if(data_get($qb_item, 'DetailType.value') == 'DiscountLineDetail' && $include_discount == 'true')
{
$item = new InvoiceItem();