Merge pull request #613 from rahulshukla-webkul/development
Development
This commit is contained in:
JItendra Singh
GitHub
commit
5a769f22ec
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/admin.js": "/js/admin.js?id=da5ebef9c25a064e7ed6",
|
||||
"/css/admin.css": "/css/admin.css?id=ab82d043cc294fcca903"
|
||||
}
|
||||
"/js/admin.js": "/js/admin.js?id=7683c8f127f6ad2ac3ce",
|
||||
"/css/admin.css": "/css/admin.css?id=4b792d17cf1107f94a6b"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,10 @@ class CategoryDataGrid extends DataGrid
|
|||
$queryBuilder = DB::table('categories as cat')
|
||||
->select('cat.id as category_id', 'ct.name', 'cat.position', 'cat.status', 'ct.locale',
|
||||
DB::raw('COUNT(DISTINCT pc.product_id) as count'))
|
||||
->leftJoin('category_translations as ct', 'cat.id', '=', 'ct.category_id')
|
||||
->leftJoin('category_translations as ct', function($leftJoin) {
|
||||
$leftJoin->on('cat.id', '=', 'ct.category_id')
|
||||
->where('ct.locale', app()->getLocale());
|
||||
})
|
||||
->leftJoin('product_categories as pc', 'cat.id', '=', 'pc.category_id')
|
||||
->groupBy('cat.id');
|
||||
|
||||
|
|
|
|||
|
|
@ -611,6 +611,10 @@ body {
|
|||
|
||||
.page-action {
|
||||
float: left;
|
||||
|
||||
a {
|
||||
margin-left: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.control-group {
|
||||
|
|
@ -633,6 +637,7 @@ body {
|
|||
|
||||
.content-wrapper {
|
||||
padding: 25px 305px 25px 25px;
|
||||
margin-left: 0px;
|
||||
}
|
||||
|
||||
.aside-nav .active i {
|
||||
|
|
@ -683,33 +688,29 @@ body {
|
|||
}
|
||||
|
||||
// ui
|
||||
.grid-container .filter-wrapper {
|
||||
.grid-container {
|
||||
.filter-row-one .search-filter {
|
||||
border: 2px solid #C7C7C7;
|
||||
border-radius: 2px;
|
||||
|
||||
.control {
|
||||
border: none;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.ic-wrapper {
|
||||
.icon-wrapper {
|
||||
border: none;
|
||||
padding-top: 2px;
|
||||
padding-right: 5px;
|
||||
border-right: 2px solid #C7C7C7;
|
||||
border-radius: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.filter-row-two .filter-one {
|
||||
margin-right: 0px;
|
||||
|
||||
.filter-name {
|
||||
margin-right: 0px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.filter-value {
|
||||
padding-right: 5px;
|
||||
padding-left: 0px;
|
||||
.filter-row-two .filter-tag {
|
||||
.wrapper, .icon.cross-icon {
|
||||
margin-right: 10px;
|
||||
margin-left: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -725,6 +726,15 @@ body {
|
|||
|
||||
.table table {
|
||||
text-align: right;
|
||||
|
||||
.massaction-remove {
|
||||
margin-right: 5px !important;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.btn.btn-primary {
|
||||
margin-right: 10px !important;
|
||||
}
|
||||
}
|
||||
|
||||
.dropdown-list.bottom-right {
|
||||
|
|
|
|||
|
|
@ -779,7 +779,9 @@ return [
|
|||
'file' => 'File',
|
||||
'upload-error' => 'The file must be a file of type: xls, xlsx, csv.',
|
||||
'duplicate-error' => 'Identifier must be unique, duplicate identifier :identifier at row :position.',
|
||||
'enough-row-error' => 'file has not enough rows'
|
||||
'enough-row-error' => 'file has not enough rows',
|
||||
'allowed-type' => 'Allowed Type :',
|
||||
'file-type' => 'csv, xls, xlsx.'
|
||||
],
|
||||
|
||||
'response' => [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<thead>
|
||||
<tr>
|
||||
@foreach ($columns as $column)
|
||||
<th>{{ $column['label'] }}</th>
|
||||
<th>{{ $column['index'] }}</th>
|
||||
@endforeach
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
</head>
|
||||
|
||||
<body @if (app()->getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;">
|
||||
<body @if (app()->getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;" class="rtl">
|
||||
{!! view_render_event('bagisto.admin.layout.body.before') !!}
|
||||
|
||||
<div id="app">
|
||||
|
|
|
|||
|
|
@ -53,6 +53,8 @@
|
|||
<div class="control-group" :class="[errors.has('file') ? 'has-error' : '']">
|
||||
<label for="file" class="required">{{ __('admin::app.export.file') }}</label>
|
||||
<input v-validate="'required'" type="file" class="control" id="file" name="file" data-vv-as=""{{ __('admin::app.export.file') }}"" value="{{ old('file') }}"/ style="padding-top: 5px">
|
||||
<span>{{ __('admin::app.export.allowed-type') }}</span>
|
||||
<span><b>{{ __('admin::app.export.file-type') }}</b></span>
|
||||
<span class="control-error" v-if="errors.has('file')">@{{ errors.first('file') }}</span>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ class View extends AbstractProduct
|
|||
'code' => $attribute->code,
|
||||
'label' => $attribute->name,
|
||||
'value' => $value,
|
||||
'admin_name' => $attribute->admin_name,
|
||||
];
|
||||
}
|
||||
} else if ($attribute->is_visible_on_front && $product->{$attribute->code}) {
|
||||
|
|
@ -41,7 +42,10 @@ class View extends AbstractProduct
|
|||
$attributeOption = $attributeOptionReposotory->find($value);
|
||||
|
||||
if ($attributeOption) {
|
||||
$value = $attributeOption->translate(app()->getLocale())->label;
|
||||
$value = $attributeOption->translate(app()->getLocale());
|
||||
if ($value) {
|
||||
$value = $value->label;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -53,18 +57,22 @@ class View extends AbstractProduct
|
|||
$attributeOption = $attributeOptionReposotory->find($value);
|
||||
|
||||
if ($attributeOption) {
|
||||
$value = $attributeOption->translate(app()->getLocale())->label;
|
||||
$result[] = $value;
|
||||
$value = $attributeOption->translate(app()->getLocale());
|
||||
if ($value) {
|
||||
$value = $value->label;
|
||||
$result[] = $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$value = implode(",", $result);
|
||||
$value = implode(", ", $result);
|
||||
}
|
||||
|
||||
$data[] = [
|
||||
'code' => $attribute->code,
|
||||
'label' => $attribute->name,
|
||||
'value' => $value,
|
||||
'admin_name' => $attribute->admin_name,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/shop.js": "/js/shop.js?id=391400bc9a994e60b97f",
|
||||
"/css/shop.css": "/css/shop.css?id=d3700e4d8b82bb01dbc2"
|
||||
}
|
||||
"/js/shop.js": "/js/shop.js?id=e019a3a0b0cbcc981fd8",
|
||||
"/css/shop.css": "/css/shop.css?id=64b5c572f6d74a59fbfa"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3476,40 +3476,60 @@ section.review {
|
|||
|
||||
ul.search-container li.search-group {
|
||||
.search-field {
|
||||
border-left: none;
|
||||
border-right: 2px solid $border-color;
|
||||
border: 2px solid $border-color;
|
||||
padding-right: 12px;
|
||||
padding-left: 0px;
|
||||
border-radius: 2px;
|
||||
border-top-left-radius: 0px;
|
||||
border-bottom-left-radius: 0px;
|
||||
}
|
||||
|
||||
.search-icon-wrapper {
|
||||
border: 2px solid $border-color;
|
||||
border-right: none;
|
||||
border-radius: 2px;
|
||||
border-top-right-radius: 0px;
|
||||
border-bottom-right-radius: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div.right-content {
|
||||
.currency-switcher .dropdown-list {
|
||||
left: 0px;
|
||||
right: auto;
|
||||
}
|
||||
.right-content-menu {
|
||||
> li {
|
||||
border-right: 2px solid #c7c7c7;
|
||||
padding: 0 15px 0 15px;
|
||||
|
||||
ul.cart-dropdown-container {
|
||||
float: left;
|
||||
margin-left: 0px;
|
||||
|
||||
li.cart-dropdown {
|
||||
.cart-icon {
|
||||
margin-right: 0px;
|
||||
margin-left: 8px;
|
||||
&:last-child {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
&:first-child {
|
||||
border-right: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.cart-dropdown-container {
|
||||
.dropdown-list {
|
||||
left: 0px !important;
|
||||
right: auto !important;
|
||||
left: 0px;
|
||||
right: unset !important;
|
||||
}
|
||||
|
||||
.dropdown-container .dropdown-content .item img {
|
||||
margin-right: 0px;
|
||||
.count {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
.account, .currency {
|
||||
right: unset;
|
||||
left: 0px;
|
||||
}
|
||||
|
||||
.guest {
|
||||
div {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3553,6 +3573,30 @@ section.review {
|
|||
|
||||
@media only screen and (max-width: 720px) {
|
||||
.header{
|
||||
.header-top div.right-content {
|
||||
.menu-box {
|
||||
margin-left: 0px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.right-content-menu {
|
||||
.account {
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
right: auto;
|
||||
}
|
||||
|
||||
> li {
|
||||
padding: 0;
|
||||
border: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.search-box {
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.header-bottom {
|
||||
.nav > li {
|
||||
float: none;
|
||||
|
|
@ -3600,6 +3644,10 @@ section.review {
|
|||
div.product-image-group {
|
||||
margin-right: 0px;
|
||||
margin-left: 30px;
|
||||
|
||||
.add-to-buttons {
|
||||
float: left !important;
|
||||
}
|
||||
}
|
||||
|
||||
div .thumb-list {
|
||||
|
|
@ -3607,9 +3655,32 @@ section.review {
|
|||
margin-right: 0px;
|
||||
}
|
||||
|
||||
.details .product-ratings .total-reviews {
|
||||
margin-left: 0px;
|
||||
margin-right: 15px;
|
||||
.details {
|
||||
.accordian .accordian-header {
|
||||
padding: 20px 0px 20px 15px;
|
||||
|
||||
.icon {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.expand-icon {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.full-specifications {
|
||||
td {
|
||||
&:first-child {
|
||||
padding-right: 0px;
|
||||
padding-left: 40px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.product-ratings .total-reviews {
|
||||
margin-left: 0px;
|
||||
margin-right: 15px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3723,6 +3794,11 @@ section.review {
|
|||
margin-left: 30px;
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
.control-group label {
|
||||
margin-left: 15px;
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 770px) {
|
||||
|
|
@ -3730,6 +3806,10 @@ section.review {
|
|||
.left-side {
|
||||
width: 100%;
|
||||
float: none;
|
||||
|
||||
.misc-controls div button {
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.right-side {
|
||||
|
|
@ -3818,13 +3898,17 @@ section.review {
|
|||
margin-right: 40px;
|
||||
}
|
||||
|
||||
.account-side-menu li {
|
||||
margin-right: 5%;
|
||||
.menu-block .menubar li {
|
||||
margin-left: 0%;
|
||||
margin-right: 5%;
|
||||
|
||||
a {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.icon {
|
||||
right: unset;
|
||||
left: 12px;
|
||||
right: auto;
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
}
|
||||
|
|
@ -3858,6 +3942,32 @@ section.review {
|
|||
display: flex;
|
||||
}
|
||||
}
|
||||
|
||||
@media all and (max-width: 770px) {
|
||||
.account-content {
|
||||
.account-layout {
|
||||
margin-right: 0px;
|
||||
|
||||
.account-head .account-action {
|
||||
margin-left: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar .menu-block {
|
||||
.menu-block-title {
|
||||
.right {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
.menubar {
|
||||
> li {
|
||||
margin-right: 0%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//customer page end here
|
||||
|
||||
// footer start
|
||||
|
|
@ -3881,9 +3991,8 @@ section.review {
|
|||
// css for loader
|
||||
.cp-spinner {
|
||||
position: absolute;
|
||||
left: auto;
|
||||
right: 26%;
|
||||
margin-top: calc(20% - 80px);
|
||||
right: calc(50% - 24px);
|
||||
margin-top: calc(40% - 24px);
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 720px) {
|
||||
|
|
|
|||
|
|
@ -15,8 +15,12 @@
|
|||
@foreach ($customAttributeValues as $attribute)
|
||||
|
||||
<tr>
|
||||
<td>{{ $attribute['label'] }}</td>
|
||||
<td>{{ $attribute['value'] }}</td>
|
||||
@if ($attribute['label'])
|
||||
<td>{{ $attribute['label'] }}</td>
|
||||
@else
|
||||
<td>{{ $attribute['admin_name'] }}</td>
|
||||
@endif
|
||||
<td>{{ $attribute['value'] }}</>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=2a928588409cb82a9e36",
|
||||
"/js/ui.js": "/js/ui.js?id=5651254246f8f1dab65e",
|
||||
"/css/ui.css": "/css/ui.css?id=1b4c4dfa67b7cfac4822"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue