diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index da88332e2..d6e3099fb 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -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' + ] + ], ] ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 9a4d90167..e05407590 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -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' ] ] ]; diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index f0d6a84f3..b4d7fa6d7 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -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 {