Fixes for intuit:invoice:add, TaxSync and InvoiceSync
This commit is contained in:
46
app/Console/Commands/Intuit/InvoiceSync.php
Normal file
46
app/Console/Commands/Intuit/InvoiceSync.php
Normal file
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands\Intuit;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
use App\Models\{ProviderOauth,User};
|
||||
use App\Jobs\AccountingInvoiceSync as Job;
|
||||
|
||||
class InvoiceSync extends Command
|
||||
{
|
||||
private const provider = 'intuit';
|
||||
|
||||
/**
|
||||
* The name and signature of the console command.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $signature = 'intuit:invoice:sync'
|
||||
.' {user? : User Email}';
|
||||
|
||||
/**
|
||||
* The console command description.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $description = 'Synchronise invoices with accounting system';
|
||||
|
||||
/**
|
||||
* Execute the console command.
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
$uo = User::where('email',$this->argument('user') ?: config('osb.admin'))->singleOrFail();
|
||||
|
||||
$so = ProviderOauth::where('name',self::provider)->singleOrFail();
|
||||
if (! ($to=$so->token($uo)))
|
||||
abort(500,sprintf('Unknown Tokens for [%s]',$uo->email));
|
||||
|
||||
Job::dispatchSync($to);
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
@@ -19,7 +19,7 @@ class TaxSync extends Command
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $signature = 'accounting:tax:sync'
|
||||
protected $signature = 'intuit:tax:sync'
|
||||
.' {user? : User Email}';
|
||||
|
||||
/**
|
||||
|
79
app/Jobs/AccountingInvoiceSync.php
Normal file
79
app/Jobs/AccountingInvoiceSync.php
Normal file
@@ -0,0 +1,79 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
use App\Models\{Invoice,ProviderToken};
|
||||
|
||||
/**
|
||||
* Synchronise invoices ref numbers with our database
|
||||
*/
|
||||
class AccountingInvoiceSync implements ShouldQueue
|
||||
{
|
||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||
|
||||
private const LOGKEY = 'JIS';
|
||||
|
||||
private ProviderToken $to;
|
||||
|
||||
/**
|
||||
* Create a new job instance.
|
||||
*
|
||||
* @param ProviderToken $to
|
||||
*/
|
||||
public function __construct(ProviderToken $to)
|
||||
{
|
||||
$this->to = $to;
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the job.
|
||||
*
|
||||
* @return void
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
$api = $this->to->API();
|
||||
$ref = Invoice::select('id')->get();
|
||||
|
||||
foreach ($api->getInvoices() as $acc) {
|
||||
$o = NULL;
|
||||
|
||||
// See if we are already linked
|
||||
if (($x=$this->to->provider->accounts->where('pivot.ref',$acc->id))->count() === 1) {
|
||||
$o = $x->pop();
|
||||
|
||||
// If not, see if our reference matches
|
||||
} elseif (($x=$ref->filter(fn($item)=>$item->lid == $acc->DocNumber))->count() === 1) {
|
||||
$o = $x->pop();
|
||||
|
||||
} else {
|
||||
// Log not found
|
||||
Log::alert(sprintf('%s:Invoice not found [%s:%s]',self::LOGKEY,$acc->id,$acc->DocNumber));
|
||||
continue;
|
||||
}
|
||||
|
||||
$o->providers()->syncWithoutDetaching([
|
||||
$this->to->provider->id => [
|
||||
'ref' => $acc->id,
|
||||
'synctoken' => $acc->synctoken,
|
||||
'created_at' => Carbon::create($acc->created_at),
|
||||
'updated_at' => Carbon::create($acc->updated_at),
|
||||
'site_id' => $this->to->site_id,
|
||||
],
|
||||
]);
|
||||
|
||||
|
||||
Log::alert(sprintf('%s:Invoice updated [%s:%s]',self::LOGKEY,$o->id,$acc->DocNumber));
|
||||
}
|
||||
}
|
||||
}
|
@@ -61,7 +61,7 @@ class AccountingTaxSync implements ShouldQueue
|
||||
*/
|
||||
|
||||
// Look based on Name
|
||||
} elseif (($x=$ref->filter(function($item) use ($acc) { return $item->description === $acc->name; }))->count() === 1) {
|
||||
} elseif (($x=$ref->filter(fn($item)=>$item->description === $acc->name))->count() === 1) {
|
||||
$o = $x->pop();
|
||||
|
||||
} else {
|
||||
@@ -74,9 +74,9 @@ class AccountingTaxSync implements ShouldQueue
|
||||
$this->to->provider->id => [
|
||||
'ref' => $acc->id,
|
||||
'synctoken' => $acc->synctoken,
|
||||
'created_at'=>Carbon::create($acc->created_at),
|
||||
'updated_at'=>Carbon::create($acc->updated_at),
|
||||
'site_id'=>$this->to->site_id,
|
||||
'created_at' => Carbon::create($acc->created_at),
|
||||
'updated_at' => Carbon::create($acc->updated_at),
|
||||
'site_id' => $this->to->site_id,
|
||||
],
|
||||
]);
|
||||
|
||||
|
Reference in New Issue
Block a user