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

Merge pull request #500 from jitendra-webkul/jitendra 

Jitendra
This commit is contained in:
JItendra Singh 2019-01-30 19:11:55 +05:30 committed by GitHub
parent bb4a7f6eb3 1241eff9a7
commit c284631ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -262,6 +262,7 @@ return [
'product-name' => 'Product Name',
'qty' => 'Qty',
'item-status' => 'Item Status',
'item-ordered' => 'Ordered (:qty_ordered)',
'item-invoice' => 'Invoiced (:qty_invoiced)',
'item-shipped' => 'shipped (:qty_shipped)',
'item-canceled' => 'Canceled (:qty_canceled)',

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

@ -232,7 +232,6 @@
<th>{{ __('admin::app.sales.orders.SKU') }}</th>
<th>{{ __('admin::app.sales.orders.product-name') }}</th>
<th>{{ __('admin::app.sales.orders.price') }}</th>
<th>{{ __('admin::app.sales.orders.qty') }}</th>
<th>{{ __('admin::app.sales.orders.item-status') }}</th>
<th>{{ __('admin::app.sales.orders.subtotal') }}</th>
<th>{{ __('admin::app.sales.orders.tax-percent') }}</th>
@ -256,8 +255,11 @@
@endif
</td>
<td>{{ core()->formatBasePrice($item->base_price) }}</td>
<td>{{ $item->qty_ordered }}</td>
<td>
<span class="qty-row">
{{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }}
</span>
<span class="qty-row">
{{ $item->qty_invoiced ? __('admin::app.sales.orders.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
</span>

48
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -30,6 +30,8 @@
<div class="right-content">
<ul class="right-content-menu">
{!! view_render_event('bagisto.shop.layout.header.currency-item.before') !!}
@if (core()->getCurrentChannel()->currencies->count() > 1)
<li class="list">
<span class="dropdown-toggle">
@ -47,6 +49,10 @@
</li>
@endif
{!! view_render_event('bagisto.shop.layout.header.currency-item.after') !!}
{!! view_render_event('bagisto.shop.layout.header.account-item.before') !!}
<li class="list">
<span class="dropdown-toggle">
<i class="icon account-icon"></i>
@ -57,14 +63,23 @@
<ul class="dropdown-list account guest">
<li>
<div>
<label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">{{ __('shop::app.header.title') }}</label>
<label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">
{{ __('shop::app.header.title') }}
</label>
</div>
<div style="margin-top: 5px;">
<span style="font-size: 12px;">{{ __('shop::app.header.dropdown-text') }}</span>
</div>
<div style="margin-top: 15px;">
<a class="btn btn-primary btn-sm" href="{{ route('customer.session.index') }}" style="color: #ffffff">{{ __('shop::app.header.sign-in') }}</a>
<a class="btn btn-primary btn-sm" href="{{ route('customer.register.index') }}" style="float: right; color: #ffffff">{{ __('shop::app.header.sign-up') }}</a>
<a class="btn btn-primary btn-sm" href="{{ route('customer.session.index') }}" style="color: #ffffff">
{{ __('shop::app.header.sign-in') }}
</a>
<a class="btn btn-primary btn-sm" href="{{ route('customer.register.index') }}" style="float: right; color: #ffffff">
{{ __('shop::app.header.sign-up') }}
</a>
</div>
</li>
</ul>
@ -74,22 +89,37 @@
<ul class="dropdown-list account customer">
<li>
<div>
<label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">{{ auth()->guard('customer')->user()->first_name }}</label>
<label style="color: #9e9e9e; font-weight: 700; text-transform: uppercase; font-size: 15px;">
{{ auth()->guard('customer')->user()->first_name }}
</label>
</div>
<ul>
<li><a href="{{ route('customer.profile.index') }}">{{ __('shop::app.header.profile') }}</a></li>
<li>
<a href="{{ route('customer.profile.index') }}">{{ __('shop::app.header.profile') }}</a>
</li>
<li><a href="{{ route('customer.wishlist.index') }}">{{ __('shop::app.header.wishlist') }}</a></li>
<li>
<a href="{{ route('customer.wishlist.index') }}">{{ __('shop::app.header.wishlist') }}</a>
</li>
<li><a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.header.cart') }}</a></li>
<li>
<a href="{{ route('shop.checkout.cart.index') }}">{{ __('shop::app.header.cart') }}</a>
</li>
<li><a href="{{ route('customer.session.destroy') }}">{{ __('shop::app.header.logout') }}</a></li>
<li>
<a href="{{ route('customer.session.destroy') }}">{{ __('shop::app.header.logout') }}</a>
</li>
</ul>
</li>
</ul>
@endauth
</li>
{!! view_render_event('bagisto.shop.layout.header.account-item.after') !!}
{!! view_render_event('bagisto.shop.layout.header.cart-item.before') !!}
<li class="cart-dropdown-container list">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@ -98,6 +128,8 @@
@include('shop::checkout.cart.mini-cart')
</ul>
</li>
{!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
</ul>
</div>
</div>