From cf98e875ee95453020fea676a7c40fbe320a6337 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Thu, 23 Jul 2020 22:25:32 -0500 Subject: [PATCH] modified add allowed login. --- .../EndSupplyChainContractCommand.php | 4 +-- .../SupplyChain/EndSupplyChainContractJob.php | 32 +++++++++++++++++-- .../admin/dashboards/allowed_logins.blade.php | 2 +- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php b/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php index 4f9a2e852..4c83c5734 100644 --- a/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php +++ b/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.php @@ -11,14 +11,14 @@ class EndSupplyChainContractCommand extends Command * * @var string */ - protected $signature = 'command:name'; + protected $signature = 'services:supplychain'; /** * The console command description. * * @var string */ - protected $description = 'Command description'; + protected $description = 'Checks and ends any supply chain contracts needs to be closed.'; /** * Create a new command instance. diff --git a/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php b/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php index 01559ba69..1451cb8f0 100644 --- a/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php +++ b/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php @@ -7,11 +7,37 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; +use Carbon\Carbon; +use Log; + +//Library +use App\Library\Lookups\LookupHelper; + +//Models +use App\Models\Contracts\SupplyChainBid; +use App\Models\Contracts\SupplyChainContract; + +//Jobs +use App\Jobs\ProcessSendEveMailJob; class EndSupplyChainContractJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + /** + * Timeout in seconds + * + * @var int + */ + public $timeout = 1200; + + /** + * Retries + * + * @var int + */ + public $retries = 3; + /** * Create a new job instance. * @@ -19,7 +45,8 @@ class EndSupplyChainContractJob implements ShouldQueue */ public function __construct() { - // + //Set the queue connection up + $this->connection = 'redis'; } /** @@ -29,6 +56,7 @@ class EndSupplyChainContractJob implements ShouldQueue */ public function handle() { - // + //Declare variables + } } diff --git a/resources/views/admin/dashboards/allowed_logins.blade.php b/resources/views/admin/dashboards/allowed_logins.blade.php index 2c85578ae..c12ed657b 100644 --- a/resources/views/admin/dashboards/allowed_logins.blade.php +++ b/resources/views/admin/dashboards/allowed_logins.blade.php @@ -15,7 +15,7 @@
{{ Form::label('allowedEntityType', 'Allowed Entity Type') }} - {{ Form::select('allowedEtntityType', ['Corporation' => 'Corporation', 'Alliance' => 'Alliance'], null, ['class' => 'form-control']) }} + {{ Form::select('allowedEntityType', ['Corporation' => 'Corporation', 'Alliance' => 'Alliance'], null, ['class' => 'form-control']) }}
{{ Form::label('allowedEntityName', 'Allowed Entity Name') }}