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

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahul shukla 2020-12-24 17:36:23 +05:30
parent d09dcbf786 3c49cd9fff
commit 4d1ca8b66e
10 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -715,6 +715,7 @@ abstract class DataGrid
'enableMassActions' => $this->enableMassAction,
'enableActions' => $this->enableAction,
'paginated' => $this->paginate,
'itemsPerPage' => $this->itemsPerPage,
'norecords' => __('ui::app.datagrid.no-records'),
'extraFilters' => $necessaryExtraFilters
]);

13
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -101,11 +101,7 @@
<select id="perPage" name="perPage" class="control" v-model="perPage"
v-on:change="paginate">
<option value="10"> 10</option>
<option value="20"> 20</option>
<option value="30"> 30</option>
<option value="40"> 40</option>
<option value="50"> 50</option>
<option v-for="index in this.perPageProduct" :key="index" :value="index"> @{{ index }} </option>
</select>
</div>
</div>
@ -306,7 +302,8 @@
booleanConditionSelect: false,
numberConditionSelect: false,
datetimeConditionSelect: false,
perPage: 10,
perPage: {{ $results['itemsPerPage'] ?: 10 }},
perPageProduct: [10, 20, 30, 40, 50],
extraFilters: @json($results['extraFilters']),
}
},
@ -321,6 +318,10 @@
}
}
}
if (this.perPageProduct.indexOf(parseInt(this.perPage)) === -1) {
this.perPageProduct.unshift(this.perPage);
}
},
methods: {

2
packages/Webkul/User/src/Database/Seeders/RolesTableSeeder.php
View File

@ -17,7 +17,7 @@ class RolesTableSeeder extends Seeder
DB::table('roles')->insert([
'id' => 1,
'name' => 'Administrator',
'description' => 'Administrator rolem',
'description' => 'Administrator role',
'permission_type' => 'all',
]);
}

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=2d8252eb879bdc417224",
"/js/velocity.js": "/js/velocity.js?id=af074ac94f7551acf57a",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=735a971d8d35f29b420a"
"/css/velocity.css": "/css/velocity.css?id=4677934b59588001cd97"
}

2
packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
View File

@ -35,7 +35,7 @@ class ShopController extends Controller
'details' => [
'name' => $product->name,
'urlKey' => $product->url_key,
'priceHTML' => $product->getTypeInstance()->getPriceHtml(),
'priceHTML' => view('shop::products.price', ['product' => $product])->render(),
'totalReviews' => $productReviewHelper->getTotalReviews($product),
'rating' => ceil($productReviewHelper->getAverageRating($product)),
'image' => $galleryImages['small_image_url'],

2
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/recently-viewed.vue
View File

@ -6,7 +6,7 @@
</div>
</div>
<div :class="`recetly-viewed-products-wrapper ${addClassWrapper}`">
<div :class="`recently-viewed-products-wrapper ${addClassWrapper}`">
<div
:key="Math.random()"
class="row small-card-container"

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -2335,7 +2335,7 @@
position: relative;
}
.recetly-viewed-products-wrapper {
.recently-viewed-products-wrapper {
padding: 2px;
.price-from {

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss vendored
View File

@ -186,7 +186,7 @@ header #search-form > *:focus {
}
/* advertisements */
.recetly-viewed-items {
.recently-viewed-items {
padding-left: 10px !important;
padding: 0px !important;
}