drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/drkthunder02/w4rpservices

Browse Source
This commit is contained in:
drkthunder02
2019-12-08 22:58:42 -06:00
parent e9adf4fa4b 0f4cd267f2
commit d700910cfd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Contracts/ContractController.php
View File

@@ -22,7 +22,7 @@ class ContractController extends Controller
public function __construct() { public function __construct() {
$this->middleware('auth'); $this->middleware('auth');
$this->middleware('role:User'); $this->middleware('role:User');
$this->middleware('permission:contract.canbid'); //$this->middleware('permission:contract.canbid');
} }
/** /**

4
resources/views/contracts/includes/all.blade.php
View File

@@ -32,14 +32,14 @@
@if($contract['type'] == 'Public') @if($contract['type'] == 'Public')
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<th>Corporation</th> <th>Corporation / Character</th>
<th>Amount</th> <th>Amount</th>
<th></th> <th></th>
</thead> </thead>
<tbody> <tbody>
@foreach($contract['bids'] as $bid) @foreach($contract['bids'] as $bid)
<tr> <tr>
<td>{{ $bid['corporation_name'] }}</td> <td>{{ $bid['corporation_name'] }} : {{ $bid['character_name'] }}</td>
<td>{{ number_format($bid['bid_amount'], 2, '.', ',') }}</td> <td>{{ number_format($bid['bid_amount'], 2, '.', ',') }}</td>
@if(auth()->user()->character_id == $bid['character_id']) @if(auth()->user()->character_id == $bid['character_id'])
<td> <td>

4
resources/views/contracts/includes/public.blade.php
View File

@@ -41,14 +41,14 @@
@if($contract['bid_count'] > 0) @if($contract['bid_count'] > 0)
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<th>Corporation</th> <th>Corporation / Character</th>
<th>Amount</th> <th>Amount</th>
<th></th> <th></th>
</thead> </thead>
<tbody> <tbody>
@foreach($contract['bids'] as $bid) @foreach($contract['bids'] as $bid)
<tr> <tr>
<td>{{ $bid['corporation_name'] }}</td> <td>{{ $bid['corporation_name'] }} : {{ $bid['character_name'] }}</td>
<td>{{ number_format($bid['bid_amount'], 2, '.', ',') }}</td> <td>{{ number_format($bid['bid_amount'], 2, '.', ',') }}</td>
@if(auth()->user()->character_id == $bid['character_id']) @if(auth()->user()->character_id == $bid['character_id'])
<td> <td>