客户管理回收站

beike/Admin/Http/Controllers/CustomerController.php

@@ -32,6 +32,7 @@ class CustomerController extends Controller
             'customers' => $customers,
             'customers_format' => CustomerResource::collection($customers)->jsonSerialize(),
             'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(),
+            'type' => 'customer',
         ];
 
         if ($request->expectsJson()) {
@@ -49,13 +50,14 @@ class CustomerController extends Controller
             'customers' => $customers,
             'customers_format' => CustomerResource::collection($customers)->jsonSerialize(),
             'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(),
+            'type' => 'trashed',
         ];
 
         if ($request->expectsJson()) {
             return json_success(trans('success'), $data);
         }
 
-        return view('admin::pages.customers.trashed', $data);
+        return view('admin::pages.customers.index', $data);
     }
 
     public function store(CustomerRequest $request)

beike/Admin/View/Components/Sidebar.php

@@ -140,6 +140,7 @@ class Sidebar extends Component
         $routes = [
             ['route' => 'customers.index', 'icon' => 'fa fa-tachometer-alt'],
             ['route' => 'customer_groups.index', 'icon' => 'fa fa-tachometer-alt'],
+            ['route' => 'customers.trashed', 'icon' => 'fa fa-tachometer-alt'],
         ];
         return hook_filter('sidebar.customer_routes', $routes);
     }

resources/beike/admin/views/pages/customers/index.blade.php

@@ -41,7 +41,11 @@
       </div>
 
       <div class="d-flex justify-content-between mb-4">
-        <button type="button" class="btn btn-primary" @click="checkedCustomersCreate">{{ __('admin/customer.customers_create') }}</button>
+        @if ($type != 'trashed')
+          <button type="button" class="btn btn-primary" @click="checkedCustomersCreate">{{ __('admin/customer.customers_create') }}</button>
+        @else
+          <button type="button" class="btn btn-primary" @click="checkedCustomerSclearRestore">{{ __('admin/product.clear_restore') }}</button>
+        @endif
       </div>
       <div class="table-push">
         <table class="table">
@@ -75,8 +79,14 @@
               </td>
               <td>@{{ customer.created_at }}</td>
               <td>
-                <a class="btn btn-outline-secondary btn-sm" :href="customer.edit">{{ __('common.edit') }}</a>
-                <button class="btn btn-outline-danger btn-sm ml-1" type="button" @click="deleteCustomer(customer.delete, index)">{{ __('common.delete') }}</button>
+                @if ($type != 'trashed')
+                  <a class="btn btn-outline-secondary btn-sm" :href="customer.edit">{{ __('common.edit') }}</a>
+                  <button class="btn btn-outline-danger btn-sm ml-1" type="button" @click="deleteCustomer(customer.delete, index)">{{ __('common.delete') }}</button>
+                @else
+                  <a href="javascript:void(0)" class="btn btn-outline-secondary btn-sm"
+                    @click.prevent="restore(customer.id, index)">{{ __('common.restore') }}</a>
+                  <button class="btn btn-outline-danger btn-sm ml-1" type="button" @click="deleteTrashedCustomer(customer.id, index)">{{ __('common.delete') }}</button>
+                @endif
               </td>
             </tr>
           </tbody>
@@ -199,6 +209,40 @@
           this.dialogCustomers.show = true
         },
 
+        deleteTrashedCustomer(id) {
+          this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
+            type: 'warning'
+          }).then(() => {
+            $http.delete('customers/' + id + '/force').then((res) => {
+              this.$message.success(res.message);
+              window.location.reload();
+            })
+          }).catch(()=>{})
+        },
+
+        // 清空回收站
+        checkedCustomerSclearRestore() {
+          this.$confirm('{{ __('admin/product.confirm_delete_restore') }}', '{{ __('common.text_hint') }}', {
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
+            type: 'warning'
+          }).then(() => {
+            $http.post('{{ admin_route('customers.force_delete_all') }}').then((res) => {
+              this.$message.success(res.message);
+              window.location.reload();
+            })
+          }).catch(()=>{})
+        },
+
+        restore(id, index) {
+          $http.delete('customers/' + id + '/restore').then((res) => {
+            this.$message.success(res.message);
+            window.location.reload();
+          })
+        },
+
         addCustomersFormSubmit(form) {
           const self = this;
 

resources/beike/admin/views/pages/customers/trashed.blade.php

@@ -1,250 +0,0 @@
-@extends('admin::layouts.master')
-
-@section('title', __('admin/common.customer'))
-
-@section('content')
-  <div id="customer-app" class="card" v-cloak>
-    <div class="card-body">
-      <div class="bg-light p-4 mb-3">
-        <el-form :inline="true" :model="filter" class="demo-form-inline" label-width="100px">
-          <div>
-            <el-form-item label="{{ __('customer.name') }}">
-              <el-input @keyup.enter.native="search" v-model="filter.name" size="small" placeholder="{{ __('customer.name') }}"></el-input>
-            </el-form-item>
-            <el-form-item label="{{ __('customer.email') }}">
-              <el-input @keyup.enter.native="search" v-model="filter.email" size="small" placeholder="{{ __('customer.email') }}"></el-input>
-            </el-form-item>
-            <el-form-item label="{{ __('customer.customer_group') }}">
-              <el-select size="small" v-model="filter.customer_group_id" placeholder="{{ __('common.please_choose') }}">
-                <el-option v-for="item in source.customer_group" :key="item.id" :label="item.name"
-                  :value="item.id + ''">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="{{ __('common.status') }}">
-              <el-select size="small" v-model="filter.status" placeholder="{{ __('common.please_choose') }}">
-                <el-option label="{{ __('common.all') }}" value=""></el-option>
-                <el-option label="{{ __('common.enabled') }}" value="1"></el-option>
-                <el-option label="{{ __('common.disabled') }}" value="0"></el-option>
-              </el-select>
-            </el-form-item>
-          </div>
-        </el-form>
-
-        <div class="row">
-          <label class="wp-100"></label>
-          <div class="col-auto">
-            <button type="button" @click="search" class="btn btn-outline-primary btn-sm">{{ __('common.filter') }}</button>
-            <button type="button" @click="resetSearch" class="btn btn-outline-secondary btn-sm ms-1">{{ __('common.reset') }}</button>
-          </div>
-        </div>
-      </div>
-
-      <div class="d-flex justify-content-between mb-4">
-        <button type="button" class="btn btn-primary" @click="checkedCustomersCreate">{{ __('admin/customer.customers_create') }}</button>
-      </div>
-      <div class="table-push">
-        <table class="table">
-          <thead>
-            <tr>
-              <th>{{ __('common.id') }}</th>
-              <th>{{ __('customer.email') }}</th>
-              <th>{{ __('customer.name') }}</th>
-              <th>{{ __('customer.from') }}</th>
-              <th>{{ __('customer.customer_group') }}</th>
-              <th>{{ __('common.status') }}</th>
-                <th>{{ __('common.created_at') }}</th>
-                <th>{{ __('common.action') }}</th>
-            </tr>
-          </thead>
-          <tbody v-if="customers.data.length">
-            <tr v-for="customer, index in customers.data" :key="index">
-              <td>@{{ customer.id }}</td>
-              <td>@{{ customer.email }}</td>
-              <td>
-                <div class="d-flex align-items-center">
-                  {{-- <img src="@{{ customer.avatar }}" class="img-fluid rounded-circle me-2" style="width: 40px;"> --}}
-                  <div>@{{ customer.name }}</div>
-                </div>
-              </td>
-              <td>@{{ customer.from }}</td>
-              <td>@{{ customer.customer_group_name }}</td>
-              <td>
-                <span v-if="customer.status" class="text-success">{{ __('common.enable') }}</span>
-                <span v-else class="text-secondary">{{ __('common.disable') }}</span>
-              </td>
-              <td>@{{ customer.created_at }}</td>
-              <td>
-                <a class="btn btn-outline-secondary btn-sm" :href="customer.edit">{{ __('common.edit') }}</a>
-                <button class="btn btn-outline-danger btn-sm ml-1" type="button" @click="deleteCustomer(customer.delete, index)">{{ __('common.delete') }}</button>
-              </td>
-            </tr>
-          </tbody>
-          <tbody v-else><tr><td colspan="9" class="border-0"><x-admin-no-data /></td></tr></tbody>
-        </table>
-      </div>
-
-      <el-pagination v-if="customers.data.length" layout="prev, pager, next" background :page-size="customers.per_page" :current-page.sync="page"
-        :total="customers.total"></el-pagination>
-    </div>
-
-    <el-dialog title="{{ __('admin/customer.customers_create') }}" :visible.sync="dialogCustomers.show" width="670px"
-      @close="closeCustomersDialog('form')" :close-on-click-modal="false">
-      <el-form ref="form" :rules="rules" :model="dialogCustomers.form" label-width="120px">
-        <el-form-item label="{{ __('admin/customer.user_name') }}" prop="name">
-          <el-input v-model="dialogCustomers.form.name" placeholder="{{ __('admin/customer.user_name') }}"></el-input>
-        </el-form-item>
-        <el-form-item label="{{ __('customer.email') }}" prop="email">
-          <el-input v-model="dialogCustomers.form.email" placeholder="{{ __('customer.email') }}"></el-input>
-        </el-form-item>
-        <el-form-item label="{{ __('shop/login.password') }}" prop="password">
-          <el-input v-model="dialogCustomers.form.password" placeholder="{{ __('shop/login.password') }}"></el-input>
-        </el-form-item>
-        <el-form-item label="{{ __('customer.customer_group') }}">
-          <el-select v-model="dialogCustomers.form.customer_group_id" placeholder="">
-            <el-option v-for="item in source.customer_group" :key="item.id" :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="{{ __('common.status') }}" prop="status">
-          <el-switch v-model="dialogCustomers.form.status" :active-value="1" :inactive-value="0"></el-switch>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="addCustomersFormSubmit('form')">{{ __('common.save') }}</el-button>
-          <el-button @click="closeCustomersDialog('form')">{{ __('common.cancel') }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-  </div>
-@endsection
-
-@push('footer')
-  <script>
-    new Vue({
-      el: '#customer-app',
-
-      data: {
-        page: 1,
-        customers: @json($customers ?? []),
-
-        source: {
-          customer_group: @json($customer_groups ?? []),
-        },
-
-        dialogCustomers: {
-          show: false,
-          form: {
-            id: null,
-            name: '',
-            email: '',
-            password: '',
-            customer_group_id: @json($customer_groups[0]['id'] ?? ''),
-            status: 1,
-          },
-        },
-
-        rules: {
-          name: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/customer.user_name')] ) }}', trigger: 'blur'}, ],
-          email: [
-            {required: true, message: '{{ __('common.error_required', ['name' => __('common.email')] ) }}', trigger: 'blur'},
-            {type: 'email', message: '{{ __('admin/customer.error_email') }}' ,trigger: 'blur'},
-          ],
-          password: [{required: true,message: '{{ __('common.error_required', ['name' => __('shop/login.password')] ) }}',trigger: 'blur'}, ],
-        },
-
-        url: @json(admin_route('customers.index')),
-
-        filter: {
-          email: bk.getQueryString('email'),
-          name: bk.getQueryString('name'),
-          customer_group_id: bk.getQueryString('customer_group_id'),
-          status: bk.getQueryString('status'),
-        },
-      },
-
-      mounted () {
-      },
-
-      watch: {
-        page: function() {
-          this.loadData();
-        },
-      },
-
-      computed: {
-        query() {
-          let query = '';
-          const filter = Object.keys(this.filter)
-            .filter(key => this.filter[key])
-            .map(key => key + '=' + this.filter[key])
-            .join('&');
-
-          if (filter) {
-            query += '?' + filter;
-          }
-
-          return query;
-        }
-      },
-
-      methods: {
-        loadData() {
-          $http.get(`customers?page=${this.page}`).then((res) => {
-            this.customers = res.data.customers;
-          })
-        },
-
-        checkedCustomersCreate() {
-          this.dialogCustomers.show = true
-        },
-
-        addCustomersFormSubmit(form) {
-          const self = this;
-
-          this.$refs[form].validate((valid) => {
-            if (!valid) {
-              this.$message.error('{{ __('common.error_form') }}');
-              return;
-            }
-
-            $http.post('customers', this.dialogCustomers.form).then((res) => {
-              this.$message.success(res.message);
-              this.loadData();// this.customers.data.push(res.data);
-              this.dialogCustomers.show = false
-            })
-          });
-        },
-
-        deleteCustomer(url, index) {
-          const self = this;
-          this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
-            confirmButtonText: '{{ __('common.confirm') }}',
-            cancelButtonText: '{{ __('common.cancel') }}',
-            type: 'warning'
-          }).then(() => {
-            $http.delete(url).then((res) => {
-              self.$message.success(res.message);
-              window.location.reload();
-              // self.customers.splice(index, 1)
-            })
-          }).catch(()=>{})
-        },
-
-        closeCustomersDialog(form) {
-          this.$refs[form].resetFields();
-          this.dialogCustomers.show = false
-        },
-
-        search() {
-          location = this.url + this.query
-        },
-
-        resetSearch() {
-          Object.keys(this.filter).forEach(key => this.filter[key] = '')
-          location = this.url + this.query
-        },
-      }
-    })
-  </script>
-@endpush

resources/lang/de/admin/common.php

@@ -62,6 +62,7 @@ return [
      'categories_index' => 'Produktkategorie',
      'products_index' => 'Produktverwaltung',
      'products_trashed' => 'Papierkorb',
+     'customers_trashed' => 'Papierkorb',
      'brands_index' => 'Produktmarke',
      'orders_index' => 'Bestellliste',
      'rmas_index' => 'Kundendienstverwaltung',

resources/lang/en/admin/common.php

@@ -64,6 +64,7 @@ return [
     'categories_index' => 'Categories',
     'products_index' => 'Products',
     'products_trashed' => 'Trashed',
+    'customers_trashed' => 'Trashed',
     'brands_index' => 'Brands',
     'orders_index' => 'Orders',
     'rmas_index' => 'RMA',

resources/lang/es/admin/common.php

@@ -62,6 +62,7 @@ return [
     'categories_index' => 'Categorías',
     'products_index' => 'gestión de mercancías',
     'products_trashed' => 'papelera de reciclaje',
+    'customers_trashed' => 'papelera de reciclaje',
     'brands_index' => 'producto de marca',
     'orders_index' => 'Lista de orden',
     'rmas_index' => 'Gestión postventa',

resources/lang/fr/admin/common.php

@@ -62,6 +62,7 @@ return [
      'categories_index' => 'catégorie de produit',
      'products_index' => 'gestion des produits',
      'products_trashed' => 'corbeille',
+     'customers_trashed' => 'corbeille',
      'brands_index' => 'marque du produit',
      'orders_index' => 'liste de commandes',
      'rmas_index' => 'gestion après-vente',

resources/lang/it/admin/common.php

@@ -62,6 +62,7 @@ return [
     'categories_index' => 'Categorie',
     'products_index' => 'gestione delle merci',
     'products_trashed' => 'cestino',
+    'customers_trashed' => 'cestino',
     'brands_index' => 'marchio del prodotto',
     'orders_index' => 'Lista degli ordini',
     'rmas_index' => 'Gestione post vendita',

resources/lang/ja/admin/common.php

@@ -62,6 +62,7 @@ return [
     'categories_index' => '製品カテゴリ',
     'products_index' => '製品管理',
     'products_trashed' => 'ごみ箱',
+    'customers_trashed' => 'ごみ箱',
     'brands_index' => '製品ブランド',
     'orders_index' => '注文リスト',
     'rmas_index' => 'アフター管理',

resources/lang/ru/admin/common.php

@@ -62,6 +62,7 @@ return [
     'categories_index' => 'категория товара',
     'products_index' => 'товарный менеджмент',
     'products_trashed' => 'корзина',
+    'customers_trashed' => 'корзина',
     'brands_index' => 'бренд продукта',
     'orders_index' => 'Список заказа',
     'rmas_index' => 'Послепродажное управление',

resources/lang/zh_cn/admin/common.php

@@ -64,6 +64,7 @@ return [
     'categories_index' => '商品分类',
     'products_index' => '商品管理',
     'products_trashed' => '回收站',
+    'customers_trashed' => '回收站',
     'brands_index' => '商品品牌',
     'orders_index' => '订单列表',
     'rmas_index' => '售后管理',

resources/lang/zh_hk/admin/common.php

@@ -62,6 +62,7 @@ return [
     'categories_index' => '商品分類',
     'products_index' => '商品管理',
     'products_trashed' => '回收站',
+    'customers_trashed' => '回收站',
     'brands_index' => '商品品牌',
     'orders_index' => '訂單列表',
     'rmas_index' => '售後管理',