diff --git a/beike/Admin/Http/Controllers/MultiFilterController.php b/beike/Admin/Http/Controllers/MultiFilterController.php new file mode 100644 index 00000000..0c4b9025 --- /dev/null +++ b/beike/Admin/Http/Controllers/MultiFilterController.php @@ -0,0 +1,43 @@ + + * @created 2023-01-04 19:45:41 + * @modified 2023-01-04 19:45:41 + */ + +namespace Beike\Admin\Http\Controllers; + +use Beike\Admin\Repositories\AttributeRepo; +use Beike\Repositories\SettingRepo; +use Illuminate\Http\Request; + +class MultiFilterController extends Controller +{ + public function index() + { + $multiFilter = system_setting('base.multi_filter'); + if ($attributeIds = $multiFilter['attribute'] ?? []) { + $multiFilter['attribute'] = AttributeRepo::getByIds($attributeIds); + } + + $data = [ + 'multi_filter' => $multiFilter, + ]; + + return view('admin::pages.multi_filter.index', $data); + } + + public function store(Request $request) + { + $settings = $request->all(); + foreach ($settings as $key => $value) { + SettingRepo::storeValue($key, $value); + } + + return redirect(admin_route('multi_filter.index'))->with('success', trans('common.updated_success')); + } +} diff --git a/beike/Admin/Http/Controllers/SettingController.php b/beike/Admin/Http/Controllers/SettingController.php index 41cf68a9..97eb7edf 100644 --- a/beike/Admin/Http/Controllers/SettingController.php +++ b/beike/Admin/Http/Controllers/SettingController.php @@ -12,7 +12,6 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Resources\CustomerGroupDetail; -use Beike\Admin\Repositories\AttributeRepo; use Beike\Repositories\CountryRepo; use Beike\Repositories\CurrencyRepo; use Beike\Repositories\CustomerGroupRepo; @@ -35,15 +34,10 @@ class SettingController extends Controller ['value' => 'shipping', 'label' => trans('admin/setting.shipping_address')], ['value' => 'payment', 'label' => trans('admin/setting.payment_address')], ]; - $multiFilter = system_setting('base.multi_filter'); - if ($attributeIds = $multiFilter['attribute'] ?? []) { - $multiFilter['attribute'] = AttributeRepo::getByIds($attributeIds); - } $data = [ 'countries' => CountryRepo::listEnabled(), 'currencies' => CurrencyRepo::listEnabled(), - 'multi_filter' => $multiFilter, 'tax_address' => $taxAddress, 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), 'themes' => $themes, diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php index 96103f58..734752fe 100644 --- a/beike/Admin/Repositories/PermissionRepo.php +++ b/beike/Admin/Repositories/PermissionRepo.php @@ -138,7 +138,7 @@ class PermissionRepo */ private function getProductPermissions(): array { - $routes = ['products_index', 'products_create', 'products_show', 'products_update', 'products_delete', 'products_trashed', 'products_restore']; + $routes = ['products_index', 'products_create', 'products_show', 'products_update', 'products_delete', 'products_trashed', 'products_restore', 'products_filter_index', 'products_filter_update']; $items = $this->getPermissionList('product', $routes); return hook_filter('role.product_permissions', $items); diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 5abfda76..2a5b4eae 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -32,6 +32,10 @@ Route::prefix($adminName) Route::middleware('can:attributes_update')->put('attributes/{id}', [Controllers\AttributeController::class, 'update'])->name('attributes.update'); Route::middleware('can:attributes_delete')->delete('attributes/{id}', [Controllers\AttributeController::class, 'destroy'])->name('attributes.destroy'); + // 高级筛选 + Route::middleware('can:products_filter_index')->get('multi_filter', [Controllers\MultiFilterController::class, 'index'])->name('multi_filter.index'); + Route::middleware('can:products_filter_update')->post('multi_filter', [Controllers\MultiFilterController::class, 'store'])->name('multi_filter.store'); + // 属性组 Route::middleware('can:attribute_groups_index')->get('attribute_groups', [Controllers\AttributeGroupController::class, 'index'])->name('attribute_groups.index'); Route::middleware('can:attribute_groups_create')->post('attribute_groups', [Controllers\AttributeGroupController::class, 'store'])->name('attribute_groups.store'); diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php index 5c32fd9e..92fc373e 100644 --- a/beike/Admin/View/Components/Sidebar.php +++ b/beike/Admin/View/Components/Sidebar.php @@ -122,7 +122,7 @@ class Sidebar extends Component */ private function getProductSubPrefix() { - $prefix = ['products.', 'categories.', 'brands.', 'attribute_groups.', 'attributes.']; + $prefix = ['products.', 'multi_filter.', 'categories.', 'brands.', 'attribute_groups.', 'attributes.']; return hook_filter('admin.sidebar.product.prefix', $prefix); } @@ -190,11 +190,12 @@ class Sidebar extends Component public function getProductSubRoutes() { $routes = [ - ['route' => 'categories.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'products.index', 'icon' => 'fa fa-tachometer-alt'], + ['route' => 'categories.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'brands.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ['route' => 'attribute_groups.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'attributes.index', 'icon' => 'fa fa-tachometer-alt'], + ['route' => 'multi_filter.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'products.trashed', 'icon' => 'fa fa-tachometer-alt'], ]; diff --git a/package.json b/package.json index 1d81b15e..d3c6044c 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,6 @@ "axios": "^0.21", "bootstrap": "^5.2.1", "bootstrap-5.1.3": "npm:bootstrap@5.1.3", - "browser-sync": "^2.27.10", - "browser-sync-webpack-plugin": "^2.3.0", "laravel-mix": "^6.0.6", "lodash": "^4.17.19", "resolve-url-loader": "^4.0.0", diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index 532df25d..0b14b310 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -524,4 +524,19 @@ table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-hea } } } +} + +.active-line { + position: relative; + + &:after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: calc(100% + 1rem); + background-color: rgba($primary, 0.04); + border: 1px dashed rgba($primary, 0.5); + } } \ No newline at end of file diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php index 18cdc92a..9c1bc4b3 100644 --- a/resources/beike/admin/views/components/header.blade.php +++ b/resources/beike/admin/views/components/header.blade.php @@ -20,7 +20,7 @@ @hookwrapper('admin.header.vip')
  • - + VIP @@ -28,6 +28,14 @@
    • @endhookwrapper + @hookwrapper('admin.header.license') +
  • + + @lang('admin/common.copyright_buy') + +
    • + @endhookwrapper + @hookwrapper('admin.header.marketing')
  • @lang('admin/common.marketing') diff --git a/resources/beike/admin/views/pages/currencies/index.blade.php b/resources/beike/admin/views/pages/currencies/index.blade.php index 22b35c89..ca883f3e 100644 --- a/resources/beike/admin/views/pages/currencies/index.blade.php +++ b/resources/beike/admin/views/pages/currencies/index.blade.php @@ -2,6 +2,10 @@ @section('title', __('admin/common.currency')) +@section('page-title-right') + {{ __('admin/setting.rate_api_key') }} +@endsection + @section('content')
    diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php index 102f4411..ce251d50 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -15,7 +15,7 @@ ID {{ __('common.name') }} {{ __('admin/region.describe') }} - {{ __('customer_group.level') }} + {{-- {{ __('customer_group.level') }} --}} {{ __('common.created_at') }} {{ __('common.action') }} @@ -28,7 +28,7 @@
    @{{ stringLengthInte(group.description?.description || '') }}
    - @{{ group.level }} + {{-- @{{ group.level }} --}} @{{ group.created_at }} diff --git a/resources/beike/admin/views/pages/multi_filter/index.blade.php b/resources/beike/admin/views/pages/multi_filter/index.blade.php new file mode 100644 index 00000000..2925895f --- /dev/null +++ b/resources/beike/admin/views/pages/multi_filter/index.blade.php @@ -0,0 +1,114 @@ +@extends('admin::layouts.master') + +@section('title', __('admin/common.multi_filter_index')) + +@section('content') +
    +
    +
    + @csrf + @if (session('success')) + + @endif +
    {{ __('common.data') }}
    + + +
    +
    + + +
    + + +
    +
    {{ __('admin/setting.multi_filter_helper') }}
    +
    +
    +     + + + + + + + +
    +
    +@endsection + +@push('footer') + +@endpush + + + diff --git a/resources/beike/admin/views/pages/regions/index.blade.php b/resources/beike/admin/views/pages/regions/index.blade.php index 3083e459..0a6ed6b7 100644 --- a/resources/beike/admin/views/pages/regions/index.blade.php +++ b/resources/beike/admin/views/pages/regions/index.blade.php @@ -3,98 +3,108 @@ @section('title', __('admin/region.index')) @section('content') -
    -
    -
    - -
    -
    - +
    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    ID{{ __('admin/region.name') }}{{ __('admin/region.describe') }}{{ __('common.created_at') }}{{ __('common.updated_at') }}{{ __('common.action') }}
    @{{ tax.id }}@{{ tax.name }}@{{ stringLengthInte(tax.description) }}@{{ tax.created_at }}@{{ tax.updated_at }} + + +
    + +
    +
    +
    + + + + + + + + + + + + + + - - - - - - + + + - - - - - - - - + + + + -
    ID{{ __('admin/region.name') }}{{ __('admin/region.describe') }}{{ __('common.created_at') }}{{ __('common.updated_at') }}{{ __('common.action') }}{{ __('admin/region.country') }}{{ __('admin/region.zone') }}
    @{{ tax.id }}@{{ tax.name }}@{{ stringLengthInte(tax.description) }}@{{ tax.created_at }}@{{ tax.updated_at }} - - +
    + + + + + + + + + + +
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ __('admin/region.country') }}{{ __('admin/region.zone') }}
    - - - - - - - - - - - -
    - {{ __('common.add') }} -     - - {{ __('common.save') }} - {{ __('common.cancel') }} - -     -     -
    + {{ __('common.add') }} + + + + {{ __('common.save') }} + {{ __('common.cancel') }} + + + + @endsection @push('footer') - -@endpush + +@endpush \ No newline at end of file diff --git a/resources/beike/admin/views/pages/rmas/index.blade.php b/resources/beike/admin/views/pages/rmas/index.blade.php index 08bedb71..f891c3a3 100644 --- a/resources/beike/admin/views/pages/rmas/index.blade.php +++ b/resources/beike/admin/views/pages/rmas/index.blade.php @@ -5,6 +5,7 @@ @section('content')
    +
    {{ __('admin/rma.rma_list_title') }}
    @if (count($rmas))
    diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php index 11e175bc..5f0314e3 100644 --- a/resources/beike/admin/views/pages/setting.blade.php +++ b/resources/beike/admin/views/pages/setting.blade.php @@ -30,9 +30,6 @@ - @@ -119,42 +116,6 @@ @hook('admin.setting.image.after') -
    - -
    -
    - - -
    - - -
    -
    {{ __('admin/setting.multi_filter_helper') }}
    -
    -
    -     -
    -
    @hook('admin.setting.express.before') @@ -293,24 +254,31 @@ } $(function() { + const [tab, line] = [bk.getQueryString('tab'), bk.getQueryString('line')]; getZones(country_id); $('select[name="country_id"]').on('change', function () { getZones($(this).val()); }); + + if (tab) { + $(`a[href="#${tab}"]`)[0].click() + } + + if (line) { + $(`textarea[name="${line}"], select[name="${line}"], input[name="${line}"]`).parents('.row').addClass('active-line'); + + setTimeout(() => { + $('div').removeClass('active-line'); + }, 1200); + } }); @endpush diff --git a/resources/beike/admin/views/pages/tax_classes/index.blade.php b/resources/beike/admin/views/pages/tax_classes/index.blade.php index 0eee975e..f20b6138 100644 --- a/resources/beike/admin/views/pages/tax_classes/index.blade.php +++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php @@ -2,6 +2,10 @@ @section('title', __('admin/tax_rate.tax_classes_index')) +@section('page-title-right') + {{ __('admin/setting.tax_address') }} +@endsection + @section('content')
    • diff --git a/resources/beike/admin/views/pages/tax_rates/index.blade.php b/resources/beike/admin/views/pages/tax_rates/index.blade.php index 3df2d8f7..91d1be94 100644 --- a/resources/beike/admin/views/pages/tax_rates/index.blade.php +++ b/resources/beike/admin/views/pages/tax_rates/index.blade.php @@ -2,6 +2,10 @@ @section('title', __('admin/tax_rate.index')) +@section('page-title-right') + {{ __('admin/setting.tax_address') }} +@endsection + @section('content')
      • diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php index 6e18d5a0..cda94b20 100644 --- a/resources/lang/en/admin/common.php +++ b/resources/lang/en/admin/common.php @@ -49,8 +49,10 @@ return [ 'country' => 'Country', 'file_manager' => 'File Manager', 'access_frontend' => 'Frontend', + 'copyright_buy' => 'Copyright Buy', // sidebar + 'multi_filter_index' => 'Advanced Filter', 'theme_index' => 'Theme Setting', 'attribute_groups_index' => 'Attribute Group', 'attributes_index' => 'Attributes', diff --git a/resources/lang/en/admin/multi_filter.php b/resources/lang/en/admin/multi_filter.php new file mode 100644 index 00000000..1f5988b6 --- /dev/null +++ b/resources/lang/en/admin/multi_filter.php @@ -0,0 +1,14 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'price_filter' => 'Price Filter', +]; diff --git a/resources/lang/en/admin/product.php b/resources/lang/en/admin/product.php index 884f3354..f1a9280a 100644 --- a/resources/lang/en/admin/product.php +++ b/resources/lang/en/admin/product.php @@ -18,6 +18,8 @@ return [ 'products_trashed' => 'Trashed', 'products_restore' => 'Restore', 'clear_restore' => 'Empty Recycle Bin', + 'products_filter_index' => 'View Filters', + 'products_filter_update' => 'Modify Filters', 'batch_delete' => 'Batch Delete', 'batch_active' => 'Batch Active', diff --git a/resources/lang/en/admin/rma.php b/resources/lang/en/admin/rma.php index c2119c68..83540f6a 100644 --- a/resources/lang/en/admin/rma.php +++ b/resources/lang/en/admin/rma.php @@ -17,6 +17,7 @@ return [ 'rmas_update' => 'Update', 'rmas_delete' => 'Delete', + 'rma_list_title' => 'Rmas application list', 'customers_name' => 'Customers Name', 'quantity' => 'Quantity', 'service_type' => 'Service Type', diff --git a/resources/lang/en/admin/setting.php b/resources/lang/en/admin/setting.php index b0c83a12..d0a7398e 100644 --- a/resources/lang/en/admin/setting.php +++ b/resources/lang/en/admin/setting.php @@ -73,6 +73,6 @@ return [ 'rate_api_key' => 'Exchange rate API KEY', 'multi_filter' => 'Multi Filter', 'please_select' => 'Please select', - 'multi_filter_helper' => 'Please select the attributes to be displayed in the Multi Filter module.', + 'multi_filter_helper' => 'Please select the attributes that need to be displayed in the filter area of the product list at the front desk, if left blank, all will be displayed', 'filter_attribute' => 'Attribute Filter', ]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index 92f2b3a6..b3f75fa2 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -49,8 +49,10 @@ return [ 'country' => '国家管理', 'file_manager' => '文件管理器', 'access_frontend' => '访问前台', + 'copyright_buy' => '版权购买', // sidebar + 'multi_filter_index' => '高级筛选', 'theme_index' => '模板设置', 'attribute_groups_index' => '属性组', 'attributes_index' => '属性', diff --git a/resources/lang/zh_cn/admin/multi_filter.php b/resources/lang/zh_cn/admin/multi_filter.php new file mode 100644 index 00000000..f3537ec8 --- /dev/null +++ b/resources/lang/zh_cn/admin/multi_filter.php @@ -0,0 +1,14 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'price_filter' => '价格筛选', +]; diff --git a/resources/lang/zh_cn/admin/product.php b/resources/lang/zh_cn/admin/product.php index d49b34e4..5e08e793 100644 --- a/resources/lang/zh_cn/admin/product.php +++ b/resources/lang/zh_cn/admin/product.php @@ -18,6 +18,8 @@ return [ 'products_trashed' => '回收站', 'products_restore' => '恢复回收站', 'clear_restore' => '清空回收站', + 'products_filter_index' => '查看高级筛选', + 'products_filter_update' => '修改高级筛选', 'batch_delete' => '批量删除', 'batch_active' => '批量上架', diff --git a/resources/lang/zh_cn/admin/rma.php b/resources/lang/zh_cn/admin/rma.php index f060f3b9..0a003f6b 100644 --- a/resources/lang/zh_cn/admin/rma.php +++ b/resources/lang/zh_cn/admin/rma.php @@ -10,17 +10,18 @@ */ return [ - 'index' => '售后申请', + 'index' => '售后管理', 'rmas_index' => '售后服务列表', 'rmas_show' => '售后服务详情', 'rmas_update' => '更新售后服务', 'rmas_delete' => '删除售后服务', + 'rma_list_title' => '售后申请列表', 'customers_name' => '客户姓名', 'quantity' => '数量', 'service_type' => '服务类型', - 'rma_details' => '售后申请详情', + 'rma_details' => '售后管理详情', 'reasons_return' => '退货原因', 'current_state' => '当前状态', 'modify_status' => '修改状态', diff --git a/resources/lang/zh_cn/admin/setting.php b/resources/lang/zh_cn/admin/setting.php index dd90f9a6..b5c591ab 100644 --- a/resources/lang/zh_cn/admin/setting.php +++ b/resources/lang/zh_cn/admin/setting.php @@ -71,6 +71,6 @@ return [ 'rate_api_key' => '汇率 API KEY', 'multi_filter' => '高级筛选', 'please_select' => '请添加', - 'multi_filter_helper' => '请选择需要在筛选模块显示的属性', + 'multi_filter_helper' => '请选择需要在前台商品列表筛选区域显示的属性，留空则显示全部', 'filter_attribute' => '属性筛选', ]; diff --git a/resources/lang/zh_hk/admin/common.php b/resources/lang/zh_hk/admin/common.php index 838a13ce..9fe5eaf3 100644 --- a/resources/lang/zh_hk/admin/common.php +++ b/resources/lang/zh_hk/admin/common.php @@ -49,8 +49,10 @@ return [ 'country' => '國家管理', 'file_manager' => '文件管理器', 'access_frontend' => '訪問前台', + 'copyright_buy' => '版權購買', // sidebar + 'multi_filter_index' => '高級篩選', 'theme_index' => '模板設置', 'attribute_groups_index' => '屬性組', 'attributes_index' => '屬性', diff --git a/resources/lang/zh_hk/admin/multi_filter.php b/resources/lang/zh_hk/admin/multi_filter.php new file mode 100644 index 00000000..7c961e58 --- /dev/null +++ b/resources/lang/zh_hk/admin/multi_filter.php @@ -0,0 +1,14 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'price_filter' => '價格篩選', +]; diff --git a/resources/lang/zh_hk/admin/rma.php b/resources/lang/zh_hk/admin/rma.php index 720c15f7..db9d5b02 100644 --- a/resources/lang/zh_hk/admin/rma.php +++ b/resources/lang/zh_hk/admin/rma.php @@ -17,6 +17,7 @@ return [ 'rmas_update' => '更新售後服務', 'rmas_delete' => '刪除售後服務', + 'rma_list_title' => '售後申請列表', 'customers_name' => '客戶姓名', 'quantity' => '數量', 'service_type' => '服務類型', diff --git a/resources/lang/zh_hk/admin/setting.php b/resources/lang/zh_hk/admin/setting.php index bf815062..2be30856 100644 --- a/resources/lang/zh_hk/admin/setting.php +++ b/resources/lang/zh_hk/admin/setting.php @@ -72,6 +72,6 @@ return [ 'rate_api_key' => '匯率 API KEY', 'multi_filter' => '高級篩選', 'please_select' => '請添加', - 'multi_filter_helper' => '請選擇需要在篩選模塊顯示的屬性', + 'multi_filter_helper' => '請選擇需要在前台商品列表篩選區域顯示的屬性，留空則顯示全部', 'filter_attribute' => '屬性篩選', ]; diff --git a/themes/default/shared/filter_sidebar_block.blade.php b/themes/default/shared/filter_sidebar_block.blade.php index 0e1eb3b4..39463ca9 100644 --- a/themes/default/shared/filter_sidebar_block.blade.php +++ b/themes/default/shared/filter_sidebar_block.blade.php @@ -27,28 +27,30 @@ @endpush -
        -
        -

        {{ __('product.price') }}

        -
        -
        -
        -
        -
        - {{ __('common.text_form') }} - {{ currency_format($filter_data['price']['select_min'], current_currency_code()) }} -
        -
        - {{ __('common.text_to') }} - {{ currency_format($filter_data['price']['select_max'], current_currency_code()) }} -
        + @if (system_setting('base.multi_filter.price_filter', 1)) +
        +
        +

        {{ __('product.price') }}

        +
        +
        +
        +
        +
        + {{ __('common.text_form') }} + {{ currency_format($filter_data['price']['select_min'], current_currency_code()) }} +
        +
        + {{ __('common.text_to') }} + {{ currency_format($filter_data['price']['select_max'], current_currency_code()) }} +
        +
        + + + +
        - - - -
        -
        + @endif @endhookwrapper @endif