Compare commits
2 Commits
37ac0b14cf
...
8179ad60e1
| Author | SHA1 | Date | |
|---|---|---|---|
| 8179ad60e1 | |||
| e7f1ab638f |
@ -5,19 +5,20 @@ namespace App\Console\Commands\Intuit;
|
|||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Intuit\Jobs\AccountingInvoiceUpdate;
|
use Intuit\Jobs\AccountingInvoiceUpdate;
|
||||||
use Intuit\Models\Invoice as AccInvoice;
|
use Intuit\Models\Invoice as AccInvoice;
|
||||||
|
use Intuit\Traits\ProviderTokenTrait;
|
||||||
|
|
||||||
use App\Models\{Invoice,ProviderOauth,User};
|
use App\Models\Invoice;
|
||||||
|
|
||||||
class InvoiceAdd extends Command
|
class InvoiceAdd extends Command
|
||||||
{
|
{
|
||||||
private const provider = 'intuit';
|
use ProviderTokenTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name and signature of the console command.
|
* The name and signature of the console command.
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
protected $signature = 'accounting:invoice:add'
|
protected $signature = 'intuit:invoice:add'
|
||||||
.' {id : Invoice ID}'
|
.' {id : Invoice ID}'
|
||||||
.' {user? : User Email}';
|
.' {user? : User Email}';
|
||||||
|
|
||||||
@ -36,44 +37,46 @@ class InvoiceAdd extends Command
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$uo = User::where('email',$this->argument('user') ?: config('osb.admin'))->singleOrFail();
|
$to = $this->providerToken($this->argument('user'));
|
||||||
|
|
||||||
$so = ProviderOauth::where('name',self::provider)->singleOrFail();
|
$io = Invoice::findOrFail($this->argument('id'));
|
||||||
if (! ($to=$so->token($uo)))
|
|
||||||
abort(500,sprintf('Unknown Tokens for [%s]',$uo->email));
|
|
||||||
|
|
||||||
$o = Invoice::findOrFail($this->argument('id'));
|
|
||||||
|
|
||||||
// Check the customer exists
|
// Check the customer exists
|
||||||
if ($o->account->providers->where('pivot.provider_oauth_id',$so->id)->count() !== 1)
|
if ($io->account->providers->where('pivot.provider_oauth_id',$to->provider->id)->count() !== 1)
|
||||||
throw new \Exception(sprintf('Account [%d] for Invoice [%d] not defined',$o->account_id,$o->id));
|
throw new \Exception(sprintf('Account [%d] for Invoice [%d] not defined',$io->account_id,$io->id));
|
||||||
|
|
||||||
$ao = $o->account->providers->where('pivot.provider_oauth_id',$so->id)->pop();
|
$ao = $io->account->providers->where('pivot.provider_oauth_id',$to->provider->id)->pop();
|
||||||
|
|
||||||
// Some validation
|
// Some validation
|
||||||
if (! $ao->pivot->ref) {
|
if (! $ao->pivot->ref) {
|
||||||
$this->error(sprintf('Accounting not defined for account [%d]',$o->account_id));
|
$this->error(sprintf('Accounting not defined for account [%d]',$io->account_id));
|
||||||
exit(1);
|
|
||||||
|
return self::FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
$acc = new AccInvoice;
|
$acc = new AccInvoice;
|
||||||
$acc->CustomerRef = (object)['value'=>$ao->pivot->ref];
|
$acc->CustomerRef = (object)['value'=>$ao->pivot->ref];
|
||||||
$acc->DocNumber = $o->lid;
|
$acc->DocNumber = $io->lid;
|
||||||
$acc->TxnDate = $o->created_at->format('Y-m-d');
|
$acc->TxnDate = $io->created_at->format('Y-m-d');
|
||||||
$acc->DueDate = $o->due_at->format('Y-m-d');
|
$acc->DueDate = $io->due_at->format('Y-m-d');
|
||||||
|
|
||||||
$lines = collect();
|
$lines = collect();
|
||||||
$c = 0;
|
$c = 0;
|
||||||
|
$subtotal = 0;
|
||||||
|
|
||||||
// @todo Group these by ItemRef and the Same Unit Price and Description, so that we can then use quantity to represent the number of them.
|
// @todo Group these by ItemRef and the Same Unit Price and Description, so that we can then use quantity to represent the number of them.
|
||||||
foreach ($o->items->groupBy(function($item) use ($so) {
|
foreach ($io->items->groupBy(
|
||||||
return sprintf('%s.%s.%s.%s',$item->item_type_name,$item->price_base,$item->product->provider_ref($so),$item->taxes->pluck('description')->join('|'));
|
fn($item)=>
|
||||||
}) as $os)
|
sprintf('%s.%s.%s.%s',
|
||||||
|
$item->item_type_name,
|
||||||
|
$item->price_base,
|
||||||
|
$item->product->provider_ref($to->provider),
|
||||||
|
$item->taxes->pluck('description')->join('|'))) as $os)
|
||||||
{
|
{
|
||||||
$key = $os->first();
|
$key = $os->first();
|
||||||
|
|
||||||
// Some validation
|
// Some validation
|
||||||
if (! ($ref=$key->product->provider_ref($so))) {
|
if (! ($ref=$key->product->provider_ref($to->provider))) {
|
||||||
$this->error(sprintf('Accounting not defined in product [%d]',$key->product_id));
|
$this->error(sprintf('Accounting not defined in product [%d]',$key->product_id));
|
||||||
|
|
||||||
return self::FAILURE;
|
return self::FAILURE;
|
||||||
@ -95,15 +98,35 @@ class InvoiceAdd extends Command
|
|||||||
'UnitPrice' => $key->price_base,
|
'UnitPrice' => $key->price_base,
|
||||||
'ItemRef' => ['value'=>$ref],
|
'ItemRef' => ['value'=>$ref],
|
||||||
// @todo It is assumed there is only 1 tax category
|
// @todo It is assumed there is only 1 tax category
|
||||||
'TaxCodeRef' => ['value'=>$key->taxes->first()->tax->provider_ref($so)],
|
'TaxCodeRef' => ['value'=>$tcf=$key->taxes->first()->tax->provider_ref($to->provider)],
|
||||||
];
|
];
|
||||||
$line->Amount = $os->sum('quantity')*$key->price_base;
|
$line->Amount = round($os->sum('quantity')*$key->price_base,2);
|
||||||
|
|
||||||
|
$subtotal += $line->Amount;
|
||||||
|
|
||||||
$lines->push($line);
|
$lines->push($line);
|
||||||
}
|
}
|
||||||
|
|
||||||
$acc->Line = $lines;
|
$acc->Line = $lines;
|
||||||
|
|
||||||
|
// If our subtotal doesnt match, we need to add a tax line
|
||||||
|
if ($io->subtotal !== $subtotal) {
|
||||||
|
$acc->TxnTaxDetail = (object)[
|
||||||
|
'TotalTax' => $x=$io->total-$subtotal,
|
||||||
|
'TaxLine' => [
|
||||||
|
(object) [
|
||||||
|
'Amount' => $x,
|
||||||
|
'DetailType' => 'TaxLineDetail',
|
||||||
|
'TaxLineDetail' => (object)[
|
||||||
|
// @todo It is assumed there is only 1 tax category
|
||||||
|
'TaxRateRef' => (object)['value'=>$to->API()->getTaxCodeQuery($tcf)->getTaxRateRef()->first()],
|
||||||
|
'NetAmountTaxable' => $io->subtotal,
|
||||||
|
]
|
||||||
|
]
|
||||||
|
]
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
return AccountingInvoiceUpdate::dispatchSync($to,$acc);
|
return AccountingInvoiceUpdate::dispatchSync($to,$acc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -7,126 +7,134 @@ use Monolog\Processor\PsrLogMessageProcessor;
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Default Log Channel
|
| Default Log Channel
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This option defines the default log channel that is utilized to write
|
| This option defines the default log channel that is utilized to write
|
||||||
| messages to your logs. The value provided here should match one of
|
| messages to your logs. The value provided here should match one of
|
||||||
| the channels present in the list of "channels" configured below.
|
| the channels present in the list of "channels" configured below.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('LOG_CHANNEL', 'stack'),
|
'default' => env('LOG_CHANNEL', 'stack'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Deprecations Log Channel
|
| Deprecations Log Channel
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This option controls the log channel that should be used to log warnings
|
| This option controls the log channel that should be used to log warnings
|
||||||
| regarding deprecated PHP and library features. This allows you to get
|
| regarding deprecated PHP and library features. This allows you to get
|
||||||
| your application ready for upcoming major versions of dependencies.
|
| your application ready for upcoming major versions of dependencies.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'deprecations' => [
|
'deprecations' => [
|
||||||
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
|
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
|
||||||
'trace' => env('LOG_DEPRECATIONS_TRACE', false),
|
'trace' => env('LOG_DEPRECATIONS_TRACE', false),
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Log Channels
|
| Log Channels
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here you may configure the log channels for your application. Laravel
|
| Here you may configure the log channels for your application. Laravel
|
||||||
| utilizes the Monolog PHP logging library, which includes a variety
|
| utilizes the Monolog PHP logging library, which includes a variety
|
||||||
| of powerful log handlers and formatters that you're free to use.
|
| of powerful log handlers and formatters that you're free to use.
|
||||||
|
|
|
|
||||||
| Available drivers: "single", "daily", "slack", "syslog",
|
| Available drivers: "single", "daily", "slack", "syslog",
|
||||||
| "errorlog", "monolog", "custom", "stack"
|
| "errorlog", "monolog", "custom", "stack"
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'channels' => [
|
'channels' => [
|
||||||
|
|
||||||
'stack' => [
|
'stack' => [
|
||||||
'driver' => 'stack',
|
'driver' => 'stack',
|
||||||
'channels' => explode(',', env('LOG_STACK', 'single')),
|
'channels' => explode(',', env('LOG_STACK', 'daily')),
|
||||||
'ignore_exceptions' => false,
|
'ignore_exceptions' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
'single' => [
|
'single' => [
|
||||||
'driver' => 'single',
|
'driver' => 'single',
|
||||||
'path' => storage_path('logs/laravel.log'),
|
'path' => storage_path('logs/laravel.log'),
|
||||||
'level' => env('LOG_LEVEL', 'debug'),
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
'replace_placeholders' => true,
|
'replace_placeholders' => true,
|
||||||
],
|
],
|
||||||
|
|
||||||
'daily' => [
|
'daily' => [
|
||||||
'driver' => 'daily',
|
'driver' => 'daily',
|
||||||
'path' => storage_path('logs/laravel.log'),
|
'path' => storage_path('logs/laravel.log'),
|
||||||
'level' => env('LOG_LEVEL', 'debug'),
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
'days' => env('LOG_DAILY_DAYS', 14),
|
'days' => env('LOG_DAILY_DAYS', 14),
|
||||||
'replace_placeholders' => true,
|
'replace_placeholders' => true,
|
||||||
],
|
],
|
||||||
|
|
||||||
'slack' => [
|
'webhook' => [
|
||||||
'driver' => 'slack',
|
'driver' => 'daily',
|
||||||
'url' => env('LOG_SLACK_WEBHOOK_URL'),
|
'path' => storage_path('logs/webhook.log'),
|
||||||
'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
|
'days' => env('LOG_DAILY_DAYS', 14),
|
||||||
'level' => env('LOG_LEVEL', 'critical'),
|
'replace_placeholders' => true,
|
||||||
'replace_placeholders' => true,
|
],
|
||||||
],
|
|
||||||
|
|
||||||
'papertrail' => [
|
'slack' => [
|
||||||
'driver' => 'monolog',
|
'driver' => 'slack',
|
||||||
'level' => env('LOG_LEVEL', 'debug'),
|
'url' => env('LOG_SLACK_WEBHOOK_URL'),
|
||||||
'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
|
'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
|
||||||
'handler_with' => [
|
'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
|
||||||
'host' => env('PAPERTRAIL_URL'),
|
'level' => env('LOG_LEVEL', 'critical'),
|
||||||
'port' => env('PAPERTRAIL_PORT'),
|
'replace_placeholders' => true,
|
||||||
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
|
],
|
||||||
],
|
|
||||||
'processors' => [PsrLogMessageProcessor::class],
|
|
||||||
],
|
|
||||||
|
|
||||||
'stderr' => [
|
'papertrail' => [
|
||||||
'driver' => 'monolog',
|
'driver' => 'monolog',
|
||||||
'level' => env('LOG_LEVEL', 'debug'),
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
'handler' => StreamHandler::class,
|
'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
|
||||||
'formatter' => env('LOG_STDERR_FORMATTER'),
|
'handler_with' => [
|
||||||
'with' => [
|
'host' => env('PAPERTRAIL_URL'),
|
||||||
'stream' => 'php://stderr',
|
'port' => env('PAPERTRAIL_PORT'),
|
||||||
],
|
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
|
||||||
'processors' => [PsrLogMessageProcessor::class],
|
],
|
||||||
],
|
'processors' => [PsrLogMessageProcessor::class],
|
||||||
|
],
|
||||||
|
|
||||||
'syslog' => [
|
'stderr' => [
|
||||||
'driver' => 'syslog',
|
'driver' => 'monolog',
|
||||||
'level' => env('LOG_LEVEL', 'debug'),
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
|
'handler' => StreamHandler::class,
|
||||||
'replace_placeholders' => true,
|
'formatter' => env('LOG_STDERR_FORMATTER'),
|
||||||
],
|
'with' => [
|
||||||
|
'stream' => 'php://stderr',
|
||||||
|
],
|
||||||
|
'processors' => [PsrLogMessageProcessor::class],
|
||||||
|
],
|
||||||
|
|
||||||
'errorlog' => [
|
'syslog' => [
|
||||||
'driver' => 'errorlog',
|
'driver' => 'syslog',
|
||||||
'level' => env('LOG_LEVEL', 'debug'),
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
'replace_placeholders' => true,
|
'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
|
||||||
],
|
'replace_placeholders' => true,
|
||||||
|
],
|
||||||
|
|
||||||
'null' => [
|
'errorlog' => [
|
||||||
'driver' => 'monolog',
|
'driver' => 'errorlog',
|
||||||
'handler' => NullHandler::class,
|
'level' => env('LOG_LEVEL', 'debug'),
|
||||||
],
|
'replace_placeholders' => true,
|
||||||
|
],
|
||||||
|
|
||||||
'emergency' => [
|
'null' => [
|
||||||
'path' => storage_path('logs/laravel.log'),
|
'driver' => 'monolog',
|
||||||
],
|
'handler' => NullHandler::class,
|
||||||
|
],
|
||||||
|
|
||||||
],
|
'emergency' => [
|
||||||
|
'path' => storage_path('logs/laravel.log'),
|
||||||
|
],
|
||||||
|
|
||||||
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
Loading…
Reference in New Issue
Block a user