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

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

This commit is contained in:
mohd asif 2020-08-24 15:40:10 +05:30
parent d215838b8c 8417df849b
commit 557f9ec7c8
8 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

12
packages/Webkul/Admin/publishable/assets/js/admin.js.LICENSE.txt
View File

@ -1,22 +1,22 @@
/*!
* Sizzle CSS Selector Engine v2.3.4
* Sizzle CSS Selector Engine v2.3.5
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2019-04-08
* Date: 2020-03-14
*/
/*!
* Vue.js v2.6.11
* (c) 2014-2019 Evan You
* Vue.js v2.6.12
* (c) 2014-2020 Evan You
* Released under the MIT License.
*/
/*!
* jQuery JavaScript Library v3.4.1
* jQuery JavaScript Library v3.5.1
* https://jquery.com/
*
* Includes Sizzle.js
@ -26,7 +26,7 @@
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2019-05-01T21:04Z
* Date: 2020-05-04T22:49Z
*/
/**

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=a14c779523092ac32b88",
"/css/admin.css": "/css/admin.css?id=56c882a611bdf3c058cb"
"/js/admin.js": "/js/admin.js?id=b022291aa1cad7dfcc84",
"/css/admin.css": "/css/admin.css?id=8f4fcca5914f5370ddda"
}

16
packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
View File

@ -13,7 +13,11 @@ class NewsLetterDataGrid extends DataGrid
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('subscribers_list')->addSelect('id', 'is_subscribed', 'email');
$queryBuilder = DB::table('subscribers_list')->select('subscribers_list.id', 'subscribers_list.is_subscribed as status', 'subscribers_list.email');
$this->addFilter('status', 'subscribers_list.is_subscribed');
$this->setQueryBuilder($queryBuilder);
}
@ -30,14 +34,14 @@ class NewsLetterDataGrid extends DataGrid
]);
$this->addColumn([
'index' => 'is_subscribed',
'index' => 'status',
'label' => trans('admin::app.datagrid.subscribed'),
'type' => 'string',
'searchable' => false,
'type' => 'boolean',
'searchable' => true,
'sortable' => true,
'filterable' => true,
'wrapper' => function($value) {
if ($value->is_subscribed == 1) {
'wrapper' => function ($value) {
if ($value->status === 1) {
return trans('admin::app.datagrid.true');
} else {
return trans('admin::app.datagrid.false');

28
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -14,3 +14,31 @@
@import "partials/rtl";
@import "partials/ui/components";
.ellipsis {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.do-not-cross-arrow {
width: 85%;
}
.linked-product-filter-tag {
text-transform: capitalize;
margin-top: 10px;
margin-right: 0px;
justify-content: flex-start;
height: 100%;
}
.linked-product-wrapper {
margin-left: 0px !important;
margin-right: 10px !important;
height: 100% !important;
}
.do-not-cross-linked-product-arrow {
width: 95%;
}

10
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php
View File

@ -50,10 +50,12 @@
<input type="hidden" name="related_products[]" v-for='(product, index) in addedProducts.related_products' v-if="(key == 'related_products') && addedProducts.related_products.length" :value="product.id"/>
<span class="filter-tag" style="text-transform: capitalize; margin-top: 10px; margin-right: 0px; justify-content: flex-start" v-if="addedProducts[key].length">
<span class="wrapper" style="margin-left: 0px; margin-right: 10px;" v-for='(product, index) in addedProducts[key]'>
@{{ product.name }}
<span class="icon cross-icon" @click="removeProduct(product, key)"></span>
<span class="filter-tag linked-product-filter-tag" v-if="addedProducts[key].length">
<span class="wrapper linked-product-wrapper " v-for='(product, index) in addedProducts[key]'>
<span class="do-not-cross-linked-product-arrow">
@{{ product.name }}
</span>
<span class="icon cross-icon" @click="removeProduct(product, key)"></span>
</span>
</span>
</div>

12
packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
View File

@ -213,8 +213,8 @@
<img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
</div>
<div class="description">
<div class="name">
<div class="description do-not-cross-arrow">
<div class="name ellipsis">
@if (isset($item->name))
{{ $item->name }}
@endif
@ -265,8 +265,8 @@
<span class="icon profile-pic-icon"></span>
</div>
<div class="description">
<div class="name">
<div class="description do-not-cross-arrow">
<div class="name ellipsis">
{{ $item->customer_full_name }}
</div>
@ -323,8 +323,8 @@
<img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
</div>
<div class="description">
<div class="name">
<div class="description do-not-cross-arrow">
<div class="name ellipsis">
@if (isset($item->product->name))
{{ $item->product->name }}
@endif