merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unnecessary border removed from every admin page and added view icon in order shipping, invoice list in order view page

This commit is contained in:
jitendra 2018-12-19 16:01:56 +05:30
parent c943fa3603
commit 0769eb9a41
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
View File

@ -1,27 +1,46 @@
<div class="tabs">
<ul>
@if (request()->route()->getName() != 'admin.configuration.index')
<?php $keys = explode('.', $menu->currentKey); ?>
@if (request()->route()->getName() != 'admin.configuration.index')
@foreach(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
<li class="{{ $menu->getActive($item) }}">
<a href="{{ $item['url'] }}">
{{ $item['name'] }}
</a>
</li>
@endforeach
<?php $keys = explode('.', $menu->currentKey); ?>
@else
@if (array_get($config->items, request()->route('slug') . '.children'))
@foreach (array_get($config->items, request()->route('slug') . '.children') as $key => $item)
@if ($items = array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children'))
<ul>
@foreach(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
<li class="{{ $menu->getActive($item) }}">
<a href="{{ $item['url'] }}">
{{ $item['name'] }}
</a>
</li>
@endforeach
</ul>
@endif
@else
@if ($items = array_get($config->items, request()->route('slug') . '.children'))
<ul>
@foreach ($items as $key => $item)
<li class="{{ $key == request()->route('slug2') ? 'active' : '' }}">
<a href="{{ route('admin.configuration.index', (request()->route('slug') . '/' . $key)) }}">
{{ $item['name'] }}
</a>
</li>
@endforeach
@endif
</ul>
@endif
</ul>
@endif
</div>

4
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -341,7 +341,7 @@
<td>{{ core()->formatBasePrice($invoice->base_grand_total) }}</td>
<td class="action">
<a href="{{ route('admin.sales.invoices.view', $invoice->id) }}">
<i class="icon pencil-lg-icon"></i>
<i class="icon eye-icon"></i>
</a>
</td>
</tr>
@ -385,7 +385,7 @@
<td>{{ $shipment->total_qty }}</td>
<td class="action">
<a href="{{ route('admin.sales.shipments.view', $shipment->id) }}">
<i class="icon pencil-lg-icon"></i>
<i class="icon eye-icon"></i>
</a>
</td>
</tr>