Skip to content

Commit

Permalink
close #101 Fixed: Apps page overlapping content and surprise offline …
Browse files Browse the repository at this point in the history 
…payment overlap issue :)
  • Loading branch information
@cuneytsenturk
cuneytsenturk committed Nov 29, 2017
1 parent afb0bb6 commit 5a1dec4
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 83 deletions.
126 changes: 64 additions & 62 deletions modules/OfflinePayment/Resources/views/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,82 +3,84 @@
@section('title', trans('offlinepayment::offlinepayment.offlinepayment'))

@section('content')
<div class="col-md-4 no-padding-left">
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('offlinepayment::offlinepayment.add_new') }}</h3>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="row">
<div class="col-md-4">
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('offlinepayment::offlinepayment.add_new') }}</h3>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->

{!! Form::open(['url' => 'apps/offlinepayment/settings', 'files' => true, 'role' => 'form']) !!}
{!! Form::open(['url' => 'apps/offlinepayment/settings', 'files' => true, 'role' => 'form']) !!}

<div class="box-body">
<div id="install-loading"></div>
<div class="box-body">
<div id="install-loading"></div>

{{ Form::textGroup('name', trans('general.name'), 'id-card-o', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textGroup('name', trans('general.name'), 'id-card-o', ['required' => 'required'], null, 'col-md-12') }}

{{ Form::textGroup('code', trans('offlinepayment::offlinepayment.code'), 'key', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textGroup('code', trans('offlinepayment::offlinepayment.code'), 'key', ['required' => 'required'], null, 'col-md-12') }}

{{ Form::radioGroup('customer', trans('offlinepayment::offlinepayment.customer'), '', ['required' => 'required'], 0, 'col-md-12') }}
{{ Form::radioGroup('customer', trans('offlinepayment::offlinepayment.customer'), '', ['required' => 'required'], 0, 'col-md-12') }}

{{ Form::textGroup('order', trans('offlinepayment::offlinepayment.order'), 'sort', [], null, 'col-md-12') }}
{{ Form::textGroup('order', trans('offlinepayment::offlinepayment.order'), 'sort', [], null, 'col-md-12') }}

{{ Form::textareaGroup('description', trans('general.description')) }}
</div>
<!-- /.box-body -->
{{ Form::textareaGroup('description', trans('general.description')) }}
</div>
<!-- /.box-body -->

<div class="box-footer">
{{ Form::saveButtons('apps/offlinepayment/settings') }}
</div>
<!-- /.box-footer -->
<div class="box-footer">
{{ Form::saveButtons('apps/offlinepayment/settings') }}
</div>
<!-- /.box-footer -->

{!! Form::close() !!}
</div>
<!-- /.box -->
</div>
<div class="col-md-8 no-padding-left">
<!-- Default box -->
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('offlinepayment::offlinepayment.payment_gateways') }}</h3>
<!-- /.box-tools -->
{!! Form::close() !!}
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="table table-responsive">
<table class="table table-striped table-hover" id="tbl-items">
<thead>
<tr>
<th class="col-md-3">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('offlinepayment::offlinepayment.code') }}</th>
<th class="col-md-2 text-center">{{ trans('offlinepayment::offlinepayment.order') }}</th>
<th class="col-md-3">{{ trans('general.actions') }}</th>
</tr>
</thead>
<tbody>
@if($items)
@foreach($items as $item)
<tr id="method-{{ $item->code }}">
<td>{{ $item->name }}</td>
<td>{{ $item->code }}</td>
<td class="text-center">{{ $item->order }}</td>
<td>
<button type="button" class="btn btn-primary btn-xs method-edit" id="edit-{{ $item->code }}" title="{{ trans('general.edit') }}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ trans('general.edit') }}</button>
<button type="button" class="btn btn-danger btn-xs method-delete" id="delete-{{ $item->code }}" title="{{ trans('general.delete') }}"><i class="fa fa-trash-o" aria-hidden="true"></i> {{ trans('general.delete') }}</button>
</td>
<!-- /.box -->
</div>
<div class="col-md-8">
<!-- Default box -->
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('offlinepayment::offlinepayment.payment_gateways') }}</h3>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="table table-responsive">
<table class="table table-striped table-hover" id="tbl-items">
<thead>
<tr>
<th class="col-md-3">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('offlinepayment::offlinepayment.code') }}</th>
<th class="col-md-2 text-center">{{ trans('offlinepayment::offlinepayment.order') }}</th>
<th class="col-md-3">{{ trans('general.actions') }}</th>
</tr>
@endforeach
@else

@endif
</tbody>
</table>
</thead>
<tbody>
@if($items)
@foreach($items as $item)
<tr id="method-{{ $item->code }}">
<td>{{ $item->name }}</td>
<td>{{ $item->code }}</td>
<td class="text-center">{{ $item->order }}</td>
<td>
<button type="button" class="btn btn-primary btn-xs method-edit" id="edit-{{ $item->code }}" title="{{ trans('general.edit') }}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ trans('general.edit') }}</button>
<button type="button" class="btn btn-danger btn-xs method-delete" id="delete-{{ $item->code }}" title="{{ trans('general.delete') }}"><i class="fa fa-trash-o" aria-hidden="true"></i> {{ trans('general.delete') }}</button>
</td>
</tr>
@endforeach
@else

@endif
</tbody>
</table>
</div>
</div>
<!-- /.box-body -->
</div>
<!-- /.box-body -->
<!-- /.box -->
</div>
<!-- /.box -->
</div>
@endsection

Expand Down
48 changes: 27 additions & 21 deletions resources/views/modules/home/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,39 @@
@section('content')
@include('partials.modules.bar')

<div class="col-md-12 no-padding-left">
<div class="content-header no-padding-left">
<h3>{{ trans('modules.top_paid') }}</h3>
<div class="row">
<div class="col-md-12">
<div class="content-header no-padding-left">
<h3>{{ trans('modules.top_paid') }}</h3>
</div>

@foreach ($paid as $module)
@include('partials.modules.item')
@endforeach
</div>

@foreach ($paid as $module)
@include('partials.modules.item')
@endforeach
</div>

<div class="col-md-12 no-padding-left">
<div class="content-header no-padding-left">
<h3>{{ trans('modules.new') }}</h3>
</div>
<div class="row">
<div class="col-md-12 no-padding-left">
<div class="content-header no-padding-left">
<h3>{{ trans('modules.new') }}</h3>
</div>

@foreach ($new as $module)
@include('partials.modules.item')
@endforeach
@foreach ($new as $module)
@include('partials.modules.item')
@endforeach
</div>
</div>

<div class="col-md-12 no-padding-left">
<div class="content-header no-padding-left">
<h3>{{ trans('modules.top_free') }}</h3>
</div>
<div class="row">
<div class="col-md-12 no-padding-left">
<div class="content-header no-padding-left">
<h3>{{ trans('modules.top_free') }}</h3>
</div>

@foreach ($free as $module)
@include('partials.modules.item')
@endforeach
@foreach ($free as $module)
@include('partials.modules.item')
@endforeach
</div>
</div>
@endsection

0 comments on commit 5a1dec4

Please sign in to comment.