diff --git a/resources/views/contracts/includes/contractsdisplay.blade.php b/resources/views/contracts/includes/private.blade.php similarity index 75% rename from resources/views/contracts/includes/contractsdisplay.blade.php rename to resources/views/contracts/includes/private.blade.php index 7c01b8b30..880a331e7 100644 --- a/resources/views/contracts/includes/contractsdisplay.blade.php +++ b/resources/views/contracts/includes/private.blade.php @@ -11,10 +11,7 @@ Type: Private
- {!! Form::open(['action' => 'ContractController@displayBid', 'method' => 'POST']) !!} - {{ Form::hidden('contract_id', $contract['contract_id']) }} - {{ Form::submit('Bid', ['class' => 'btn btn-primary']) }} - {!! Form::close() !!} + Bid on Contract
diff --git a/resources/views/contracts/includes/public.blade.php b/resources/views/contracts/includes/public.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/resources/views/contracts/privatecontracts.blade.php b/resources/views/contracts/privatecontracts.blade.php index 38ed00358..1e48db000 100644 --- a/resources/views/contracts/privatecontracts.blade.php +++ b/resources/views/contracts/privatecontracts.blade.php @@ -7,7 +7,7 @@
@if(count($contracts)) - @include('contracts.includes.contractsdisplay') + @include('contracts.includes.private') @else @include('contracts.includes.nocontracts') @endif diff --git a/resources/views/contracts/publiccontracts.blade.php b/resources/views/contracts/publiccontracts.blade.php index 84d9ce333..ba4ca59e2 100644 --- a/resources/views/contracts/publiccontracts.blade.php +++ b/resources/views/contracts/publiccontracts.blade.php @@ -6,48 +6,47 @@
-{{ dd($data) }} @if(count($data['contracts'])) @foreach($data['contracts'] as $contract)
-
-
-
-
-
-
- {{ $contract['title'] }} -
-
- Type: Public -
- +
+
+
+
+
+
+ {{ $contract['title'] }} +
+
+ Type: Public +
+
-
+
+
+
+ End Date: {{ $contract['end_date'] }} +
+
- End Date: {{ $contract['end_date'] }} + {{ $contract['body'] }}
- -
- {{ $contract['body'] }} -
-
-
- - @if(count($data['bids'])) - @include('contracts.includes.biddisplay') - @else - No Bids have been entered. - @endif - -
+ +
+ + @if(count($data['bids'])) + @include('contracts.includes.biddisplay') + @else + No Bids have been entered. + @endif +
+

@else @include('contracts.includes.nocontracts')