Updated dependencies
This commit is contained in:
parent
9ce067e6e3
commit
e204862488
|
|
@ -254,4 +254,10 @@ class PaymentTransactionEventEntry implements ShouldQueue
|
||||||
{
|
{
|
||||||
return [(new WithoutOverlapping("payment_transaction_event_entry_".$this->payment->id.'_'.$this->db))->releaseAfter(10)->expireAfter(30)];
|
return [(new WithoutOverlapping("payment_transaction_event_entry_".$this->payment->id.'_'.$this->db))->releaseAfter(10)->expireAfter(30)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function failed(\Throwable $exception = null)
|
||||||
|
{
|
||||||
|
nlog("PaymentTransactionEventEntry::failed");
|
||||||
|
nlog($exception->getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -211,6 +211,7 @@ class TaxReport
|
||||||
$payment_state = $invoice->transaction_events()->where('event_id', TransactionEvent::PAYMENT_CASH)->where('period', now()->endOfMonth()->format('Y-m-d'))->orderBy('timestamp', 'desc')->first();
|
$payment_state = $invoice->transaction_events()->where('event_id', TransactionEvent::PAYMENT_CASH)->where('period', now()->endOfMonth()->format('Y-m-d'))->orderBy('timestamp', 'desc')->first();
|
||||||
$adjustments = $invoice->transaction_events()->whereIn('event_id',[TransactionEvent::PAYMENT_REFUNDED, TransactionEvent::PAYMENT_DELETED])->where('period', now()->endOfMonth()->format('Y-m-d'))->get();
|
$adjustments = $invoice->transaction_events()->whereIn('event_id',[TransactionEvent::PAYMENT_REFUNDED, TransactionEvent::PAYMENT_DELETED])->where('period', now()->endOfMonth()->format('Y-m-d'))->get();
|
||||||
|
|
||||||
|
|
||||||
if($invoice_state && $invoice_state->event_id == TransactionEvent::INVOICE_UPDATED){
|
if($invoice_state && $invoice_state->event_id == TransactionEvent::INVOICE_UPDATED){
|
||||||
$this->data['accrual']['invoices'][] = [
|
$this->data['accrual']['invoices'][] = [
|
||||||
$invoice->number,
|
$invoice->number,
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
"razorpay/razorpay": "2.*",
|
"razorpay/razorpay": "2.*",
|
||||||
"sentry/sentry-laravel": "^4",
|
"sentry/sentry-laravel": "^4",
|
||||||
"setasign/fpdf": "^1.8",
|
"setasign/fpdf": "^1.8",
|
||||||
"setasign/fpdi": "^2.3",
|
"setasign/fpdi": "^2.6",
|
||||||
"socialiteproviders/apple": "dev-master",
|
"socialiteproviders/apple": "dev-master",
|
||||||
"socialiteproviders/microsoft": "^4.1",
|
"socialiteproviders/microsoft": "^4.1",
|
||||||
"sprain/swiss-qr-bill": "^4.3",
|
"sprain/swiss-qr-bill": "^4.3",
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -232,12 +232,74 @@ class TaxSummaryReportTest extends TestCase
|
||||||
|
|
||||||
(new InvoiceTransactionEventEntry())->run($i);
|
(new InvoiceTransactionEventEntry())->run($i);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$i2 = Invoice::factory()->create([
|
||||||
|
'client_id' => $this->client->id,
|
||||||
|
'user_id' => $this->user->id,
|
||||||
|
'company_id' => $this->company->id,
|
||||||
|
'amount' => 0,
|
||||||
|
'balance' => 0,
|
||||||
|
'status_id' => 2,
|
||||||
|
'total_taxes' => 1,
|
||||||
|
'date' => now()->format('Y-m-d'),
|
||||||
|
'terms' => 'nada',
|
||||||
|
'discount' => 0,
|
||||||
|
'tax_rate1' => 10,
|
||||||
|
'tax_rate2' => 17.5,
|
||||||
|
'tax_rate3' => 5,
|
||||||
|
'tax_name1' => 'GST',
|
||||||
|
'tax_name2' => 'VAT',
|
||||||
|
'tax_name3' => 'CA Sales Tax',
|
||||||
|
'uses_inclusive_taxes' => false,
|
||||||
|
'line_items' => $this->buildLineItems(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$i2 = $i2->calc()->getInvoice();
|
||||||
|
$i2->service()->applyPaymentAmount(10, 'yadda')->save();
|
||||||
|
|
||||||
|
$this->travelTo(now()->addDay());
|
||||||
|
|
||||||
|
$i2->service()->applyPaymentAmount(1, 'yadda - 1')->save();
|
||||||
|
|
||||||
|
$this->travelTo(now()->addDay());
|
||||||
|
|
||||||
|
$i2->service()->applyPaymentAmount(2, 'yadda - 2')->save();
|
||||||
|
|
||||||
|
$i2 = $i2->fresh();
|
||||||
|
|
||||||
|
(new InvoiceTransactionEventEntryAccrual())->run($i2, now()->subDays(30)->format('Y-m-d'), now()->addDays(30)->format('Y-m-d'));
|
||||||
|
|
||||||
|
$payment = $i2->payments()->first();
|
||||||
|
|
||||||
|
// nlog(config('queue.default'));
|
||||||
|
config(['queue.default' => 'sync']);
|
||||||
|
|
||||||
|
$this->assertNotNull($payment);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
'id' => $payment->id,
|
||||||
|
'amount' => $payment->amount,
|
||||||
|
'invoices' => [
|
||||||
|
[
|
||||||
|
'invoice_id' => $i2->id,
|
||||||
|
'amount' => $payment->amount
|
||||||
|
]
|
||||||
|
],
|
||||||
|
'date' => now()->format('Y-m-d'),
|
||||||
|
'gateway_refund' => false,
|
||||||
|
'email_receipt' => false,
|
||||||
|
'via_webhook' => true,
|
||||||
|
];
|
||||||
|
|
||||||
|
$payment->refund($data);
|
||||||
|
|
||||||
$pl = new \App\Services\Report\XLS\TaxReport($this->company, '2025-01-01', '2025-12-31');
|
$pl = new \App\Services\Report\XLS\TaxReport($this->company, '2025-01-01', '2025-12-31');
|
||||||
|
|
||||||
$response = $pl->run()->getXlsFile();
|
$response = $pl->run()->getXlsFile();
|
||||||
|
|
||||||
$this->assertIsString($response);
|
$this->assertIsString($response);
|
||||||
|
|
||||||
|
|
||||||
try{
|
try{
|
||||||
file_put_contents('/home/david/ttx.xlsx', $response);
|
file_put_contents('/home/david/ttx.xlsx', $response);
|
||||||
}
|
}
|
||||||
|
|
@ -245,6 +307,8 @@ class TaxSummaryReportTest extends TestCase
|
||||||
nlog($e->getMessage());
|
nlog($e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config(['queue.default' => 'redis']);
|
||||||
|
|
||||||
$this->account->delete();
|
$this->account->delete();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue