diff --git a/Dockerfile b/Dockerfile index 063ef00f..15d8af46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,13 +8,15 @@ RUN set -eux \ freetype \ libjpeg-turbo \ libpng \ + libzip \ && apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ freetype-dev \ libjpeg-turbo-dev \ libpng-dev \ + libzip-dev \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install -j$(nproc) bcmath gd pdo pdo_mysql \ + && docker-php-ext-install -j$(nproc) bcmath gd pdo pdo_mysql zip \ && pecl install redis-5.3.4 \ && docker-php-ext-enable redis \ && apk del --no-network .build-deps diff --git a/app/Admin/Controllers/DealerOrderController.php b/app/Admin/Controllers/DealerOrderController.php index 2b546af5..7226f669 100644 --- a/app/Admin/Controllers/DealerOrderController.php +++ b/app/Admin/Controllers/DealerOrderController.php @@ -114,9 +114,9 @@ class DealerOrderController extends AdminController }); $grid->filter(function (Grid\Filter $filter) { $filter->panel(); - $filter->equal('user.phone')->width(3); - $filter->equal('consignor.phone')->width(3); - $filter->equal('sn')->width(3); + $filter->like('user.phone')->width(3); + $filter->like('consignor.phone')->width(3); + $filter->like('sn')->width(3); $filter->between('paied_time')->dateTime()->width(5); $filter->between('created_at')->dateTime()->width(5); // $filter->equal('id'); diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index dcee79ec..4b11cc3c 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -128,8 +128,8 @@ class OrderController extends AdminController $grid->filter(function (Grid\Filter $filter) { $filter->panel(); - $filter->equal('sn')->width(3); - $filter->equal('user.phone')->width(3); + $filter->like('sn')->width(3); + $filter->like('user.phone')->width(3); $filter->where('tags', function ($query) { $query->whereHas('tags', function ($q) { $q->whereIn('tags.id', $this->input);