Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Minor updates

Browse Source
This commit is contained in:
David Bomba 2024-09-29 14:12:54 +10:00
parent 320022155e
commit 498fb51faa
4 changed files with 105 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Payment/UpdatePaymentRequest.php
View File

@ -100,7 +100,7 @@ class UpdatePaymentRequest extends Request
public function messages()
{
return [
'distinct' => 'Attemping duplicate payment on the same invoice Invoice',
'distinct' => 'Attemping duplicate payment on the same Invoice',
];
}
}

4
app/Jobs/Util/ReminderJob.php
View File

@ -71,7 +71,7 @@ class ReminderJob implements ShouldQueue
->whereHas('company', function ($query) {
$query->where('is_disabled', 0);
})
->with('invitations')->chunk(200, function ($invoices) {
->with('invitations')->chunk(800, function ($invoices) {
foreach ($invoices as $invoice) {
$this->sendReminderForInvoice($invoice);
}
@ -99,7 +99,7 @@ class ReminderJob implements ShouldQueue
->whereHas('company', function ($query) {
$query->where('is_disabled', 0);
})
->with('invitations')->chunk(200, function ($invoices) {
->with('invitations')->chunk(800, function ($invoices) {
foreach ($invoices as $invoice) {
$this->sendReminderForInvoice($invoice);

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

@ -172,6 +172,11 @@ class QuickbooksService
{
return $this->sdk->FindById($entity, $id);
}
public function query(string $query)
{
return $this->sdk->Query($query);
}
/**
* Flag to determine if a sync is allowed in either direction

111
tests/Feature/Import/Quickbooks/QuickbooksTest.php
View File

@ -137,11 +137,17 @@ class QuickbooksTest extends TestCase
$client = Client::factory()->create([
'company_id' => $this->company->id,
'user_id' => $this->company->owner()->id,
'address1' => $this->faker->address(),
'city' => $this->faker->city(),
'state' => $this->faker->state(),
'postal_code' => $this->faker->postcode(),
'address1' => "10369 Ashton Avenue",
'address2' => '',
'city' => "Beverley Hills",
'state' => "California",
'postal_code' => "90210",
'country_id' => 840,
'shipping_address1' => "10369 Ashton Avenue",
'address2' => '',
'shipping_city' => "Beverley Hills",
'shipping_state' => "California",
'shipping_postal_code' => "90210",
'shipping_country_id' => 840,
]);
@ -215,9 +221,16 @@ class QuickbooksTest extends TestCase
//create ninja invoice
$qb_invoice = $this->createQbInvoice($customer);
$this->assertNotNull($qb_invoice);
nlog($qb_invoice);
$this->assertNotNull($qb_invoice);
// sleep(5);
// $updatedInvoice = $this->qb->sdk->FindById('invoice', $qb_invoice->Id->value);
nlog($updatedInvoice);
}
public function testCreateCustomerInQb()
@ -264,6 +277,8 @@ class QuickbooksTest extends TestCase
$item_product->quantity = 1;
$item_product->cost = $non_inventory_product->price;
$item_product->line_total = $non_inventory_product->price;
$item_product->tax_name1 = 'CA Sales Tax';
$item_product->tax_rate1 = 8;
$item_product->type_id = '1';
$item_service = new InvoiceItem();
@ -305,6 +320,12 @@ class QuickbooksTest extends TestCase
// $this->assertEquals(30, $i->balance);
$line_items = [];
// $taxDetail = [
// "TotalTax" => 0,
// "TaxLine" => []
// ];
$line_num = 1;
foreach($i->line_items as $line_item)
@ -329,10 +350,68 @@ class QuickbooksTest extends TestCase
],
],
'Description' => $line_item->notes,
'Amount' => $line_item->line_total,
];
// if($line_item->tax_rate1 > 0)
// {
// $tax_line_detail = [
// "Amount" => $line_item->tax_amount,
// "DetailType" => "TaxLineDetail",
// "TaxLineDetail" => [
// "TaxRateRef" => [
// "value" => $line_item->tax_rate1,
// "name" => $line_item->tax_name1,
// ],
// "PercentBased" => true,
// "TaxPercent" => $line_item->tax_rate1,
// "NetAmountTaxable" => $line_item->line_total,
// ]
// ];
// $taxDetail['TaxLine'][] = $tax_line_detail;
// $taxDetail['TotalTax'] += $line_item->tax_amount;
// }
// if ($line_item->tax_rate2 > 0) {
// $tax_line_detail = [
// "Amount" => $line_item->tax_amount,
// "DetailType" => "TaxLineDetail",
// "TaxLineDetail" => [
// "TaxRateRef" => [
// "value" => $line_item->tax_rate2,
// "name" => $line_items->tax_name2,
// ],
// "PercentBased" => true,
// "TaxPercent" => $line_item->tax_rate2,
// "NetAmountTaxable" => $line_item->line_total,
// ]
// ];
// $taxDetail['TaxLine'][] = $tax_line_detail;
// $taxDetail['TotalTax'] += $line_item->tax_amount;
// }
// if ($line_item->tax_rate3 > 0) {
// $tax_line_detail = [
// "Amount" => $line_item->tax_amount,
// "DetailType" => "TaxLineDetail",
// "TaxLineDetail" => [
// "TaxRateRef" => [
// "value" => $line_item->tax_name3
// ],
// "PercentBased" => true,
// "TaxPercent" => $line_item->tax_rate3,
// "NetAmountTaxable" => $line_item->line_total,
// ]
// ];
// $taxDetail['TaxLine'][] = $tax_line_detail;
// $taxDetail['TotalTax'] += $line_item->tax_amount;
// }
$line_num++;
}
@ -349,15 +428,19 @@ class QuickbooksTest extends TestCase
"DueDate" => $i->due_date,
"TotalAmt" => $i->amount,
"DocNumber" => $i->number,
"ApplyTaxAfterDiscount" => true,
"PrintStatus" => "NeedToPrint",
"EmailStatus" => "NotSet",
"GlobalTaxCalculation" => "TaxExcluded",
// "ApplyTaxAfterDiscount" => false,
"GlobalTaxCalculation" => "TaxExcluded", // This tells QuickBooks to calculate taxes
"TxnTaxDetail" => [
"UseAutomatedSalesTax" => true,
"TxnTaxCodeRef" => [
"value" => "SALES_TAX_STUB" // Use the appropriate tax code for your QuickBooks account
// "TxnTaxDetail" => $taxDetail,
// "TxnTaxDetail" => [
// "UseAutomatedSalesTax" => true,
// "TxnTaxCodeRef" => [
// "value" => "SALES_TAX_STUB" // Use the appropriate tax code for your QuickBooks account
// "DefaultTaxRateRef" => [
],
]
// ],
// ]
// "Note" => $this->invoice->public_notes,
];