From cec1fad4bce7d0aa1c205ae8327f5feb9256d1e1 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Sun, 12 Nov 2023 21:34:46 +0800
Subject: [PATCH] Update

---
 .../Controllers/OfflineOrderController.php    |  3 +-
 .../OfflineProductCategoryController.php      |  3 ++
 app/Models/OfflineProductCategory.php         |  2 +-
 ...or_to_offline_product_categories_table.php | 32 +++++++++++++++++++
 .../lang/zh_CN/offline-product-category.php   |  1 +
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2023_11_12_212000_add_color_to_offline_product_categories_table.php

diff --git a/app/Admin/Controllers/OfflineOrderController.php b/app/Admin/Controllers/OfflineOrderController.php
index 49448f74..e25b5a4c 100644
--- a/app/Admin/Controllers/OfflineOrderController.php
+++ b/app/Admin/Controllers/OfflineOrderController.php
@@ -72,13 +72,14 @@ class OfflineOrderController extends AdminController
         });
         $grid->column('items')->display(function ($items) {
             return $items->map(function ($item) {
+                $color = $item->productCategory?->color ?? '#586cb1';
                 $category = $item->productCategory?->name;
 
                 if ($discount = $item->getDiscount()) {
                     $category .= " {$discount}折";
                 }
 
-                return '<span class="label bg-primary d-inline-block mb-25 mr-25">'.$category.'</span>';
+                return "<span class=\"label text-md d-inline-block text- mb-25 mr-25 p-50\" style=\"background-color:{$color}\">{$category}</span>";
             })->join('');
         });
         $grid->column('products_total_amount')->display(fn($v) => bcdiv($v, 100, 2))->prepend('￥');
diff --git a/app/Admin/Controllers/OfflineProductCategoryController.php b/app/Admin/Controllers/OfflineProductCategoryController.php
index b665640a..d629ec55 100644
--- a/app/Admin/Controllers/OfflineProductCategoryController.php
+++ b/app/Admin/Controllers/OfflineProductCategoryController.php
@@ -42,6 +42,7 @@ class OfflineProductCategoryController extends AdminController
                 ->else(function (Column $column) {
                     $column->bool();
                 });
+            $grid->column('color')->display(fn ($v) => $v ? "<span class=\"label\" style=\"background-color:{$v}\">{$v}</span>" : '');
             $grid->column('sort')->sortable();
             $grid->column('created_at');
 
@@ -72,6 +73,8 @@ class OfflineProductCategoryController extends AdminController
                 ->setLabelClass(['asterisk'])
                 ->attribute('required', true);
 
+            $form->color('color');
+
             $form->switch('enabled')
                 ->default(true);
 
diff --git a/app/Models/OfflineProductCategory.php b/app/Models/OfflineProductCategory.php
index 21287dcf..ce8244da 100644
--- a/app/Models/OfflineProductCategory.php
+++ b/app/Models/OfflineProductCategory.php
@@ -21,7 +21,7 @@ class OfflineProductCategory extends Model
     ];
 
     protected $fillable = [
-        'name', 'enabled', 'sort',
+        'name', 'enabled', 'color', 'sort',
     ];
 
     public function scopeEnabled(Builder $builder)
diff --git a/database/migrations/2023_11_12_212000_add_color_to_offline_product_categories_table.php b/database/migrations/2023_11_12_212000_add_color_to_offline_product_categories_table.php
new file mode 100644
index 00000000..52fff5cf
--- /dev/null
+++ b/database/migrations/2023_11_12_212000_add_color_to_offline_product_categories_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColorToOfflineProductCategoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('offline_product_categories', function (Blueprint $table) {
+            $table->string('color')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('offline_product_categories', function (Blueprint $table) {
+            $table->dropColumn(['color']);
+        });
+    }
+}
diff --git a/resources/lang/zh_CN/offline-product-category.php b/resources/lang/zh_CN/offline-product-category.php
index 59383ef7..14e92b59 100644
--- a/resources/lang/zh_CN/offline-product-category.php
+++ b/resources/lang/zh_CN/offline-product-category.php
@@ -8,6 +8,7 @@ return [
     'fields' => [
         'name' => '名称',
         'enabled' => '启用',
+        'color' => '颜色',
         'sort' => '排序',
     ],
     'options' => [