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

Merge pull request #804 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-04-05 10:33:43 +05:30 committed by GitHub
parent a173b515a7 4c2a0a08fc
commit d102b107fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/Webkul/Admin/src/Config/system.php
View File

@ -41,5 +41,27 @@ return [
'channel_based' => true
]
]
], [
'key' => 'customer.settings.newsletter',
'name' => 'admin::app.admin.system.newsletter',
'sort' => 2,
'fields' => [
[
'name' => 'subscription',
'title' => 'admin::app.admin.system.newsletter-subscription',
'type' => 'boolean'
]
],
], [
'key' => 'customer.settings.email',
'name' => 'admin::app.admin.system.email',
'sort' => 2,
'fields' => [
[
'name' => 'verification',
'title' => 'admin::app.admin.system.email-verification',
'type' => 'boolean'
]
],
]
];

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

@ -851,7 +851,11 @@ return [
'cash-on-delivery' => 'Cash On Delivery',
'money-transfer' => 'Money Transfer',
'paypal-standard' => 'Paypal Standard',
'business-account' => 'Business Account'
'business-account' => 'Business Account',
'newsletter' => 'NewsLetter Subscription',
'newsletter-subscription' => 'Allow NewsLetter Subscription',
'email' => 'Email Verification',
'email-verification' => 'Allow Email Verification'
]
]
];

2
packages/Webkul/Product/src/Repositories/ProductRepository.php
View File

@ -493,7 +493,7 @@ class ProductRepository extends Repository
if ($attribute->type != 'price') {
$query2 = $query2->where(function($query3) use($column, $queryParams) {
foreach ($queryParams as $filterValue) {
$query3 = $query3->whereRaw("find_in_set($filterValue, $column)");
$query3 = $query3->orwhereRaw("find_in_set($filterValue, $column)");
}
});
} else {