From 1a653be8fab6bfdf90cf0aedc54dc44552be5167 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Wed, 8 Feb 2023 10:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E5=8F=B0=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=92=8C=E9=85=8D=E9=80=81=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Resources/PluginResource.php          |  2 +-
 beike/Services/ShippingMethodService.php               |  4 +++-
 .../Shop/Http/Resources/Checkout/PaymentMethodItem.php |  9 +++++----
 plugins/FlatShipping/Bootstrap.php                     |  8 +++++---
 plugins/FlatShipping/config.json                       | 10 ++++++++--
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/beike/Admin/Http/Resources/PluginResource.php b/beike/Admin/Http/Resources/PluginResource.php
index 4f56e153..0172fa94 100644
--- a/beike/Admin/Http/Resources/PluginResource.php
+++ b/beike/Admin/Http/Resources/PluginResource.php
@@ -18,7 +18,7 @@ class PluginResource extends JsonResource
     {
         $currentLocale = locale();
 
-        $name = is_array($this->name) ? ($this->name[$currentLocale] ?? '') : (string) $this->name;
+        $name        = is_array($this->name) ? ($this->name[$currentLocale] ?? '') : (string) $this->name;
         $description = is_array($this->description) ? ($this->description[$currentLocale] ?? '') : (string) $this->description;
 
         $data = [
diff --git a/beike/Services/ShippingMethodService.php b/beike/Services/ShippingMethodService.php
index 4d891e08..52776df9 100644
--- a/beike/Services/ShippingMethodService.php
+++ b/beike/Services/ShippingMethodService.php
@@ -11,6 +11,7 @@
 
 namespace Beike\Services;
 
+use Beike\Admin\Http\Resources\PluginResource;
 use Beike\Repositories\PluginRepo;
 use Beike\Shop\Services\CheckoutService;
 use Illuminate\Support\Str;
@@ -40,9 +41,10 @@ class ShippingMethodService
             }
             $quotes = (new $className)->getQuotes($checkout, $plugin);
             if ($quotes) {
+                $pluginResource    = (new PluginResource($plugin))->jsonSerialize();
                 $shippingMethods[] = [
                     'code'   => $pluginCode,
-                    'name'   => $plugin->name,
+                    'name'   => $pluginResource['name'],
                     'quotes' => $quotes,
                 ];
             }
diff --git a/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php b/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php
index 39e8acd8..c375b0d5 100644
--- a/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php
+++ b/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php
@@ -2,6 +2,7 @@
 
 namespace Beike\Shop\Http\Resources\Checkout;
 
+use Beike\Admin\Http\Resources\PluginResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -16,14 +17,14 @@ class PaymentMethodItem extends JsonResource
      */
     public function toArray($request): array
     {
-        $pluginSetting = $this->plugin;
+        $pluginResource = (new PluginResource($this->plugin))->jsonSerialize();
 
         return [
             'type'        => $this->type,
             'code'        => $this->code,
-            'name'        => $pluginSetting->name,
-            'description' => $pluginSetting->description,
-            'icon'        => plugin_resize($this->code, $pluginSetting->icon),
+            'name'        => $pluginResource['name'],
+            'description' => $pluginResource['description'],
+            'icon'        => $pluginResource['icon'],
         ];
     }
 }
diff --git a/plugins/FlatShipping/Bootstrap.php b/plugins/FlatShipping/Bootstrap.php
index ca6e6388..ca8934a7 100644
--- a/plugins/FlatShipping/Bootstrap.php
+++ b/plugins/FlatShipping/Bootstrap.php
@@ -11,6 +11,7 @@
 
 namespace Plugin\FlatShipping;
 
+use Beike\Admin\Http\Resources\PluginResource;
 use Beike\Plugin\Plugin;
 use Beike\Shop\Services\CheckoutService;
 
@@ -27,12 +28,13 @@ class Bootstrap
     public function getQuotes(CheckoutService $checkout, Plugin $plugin): array
     {
         $code = $plugin->code;
+        $pluginResource = (new PluginResource($plugin))->jsonSerialize();
         $quotes[] = [
             'type' => 'shipping',
             'code' => "{$code}.0",
-            'name' => $plugin->getName(),
-            'description' => $plugin->getDescription(),
-            'icon' => plugin_resize($code, $plugin->icon),
+            'name' => $pluginResource['name'],
+            'description' => $pluginResource['description'],
+            'icon' => $pluginResource['icon'],
             'cost' => $this->getShippingFee($checkout),
         ];
         return $quotes;
diff --git a/plugins/FlatShipping/config.json b/plugins/FlatShipping/config.json
index 2357675a..3cd9300c 100644
--- a/plugins/FlatShipping/config.json
+++ b/plugins/FlatShipping/config.json
@@ -1,7 +1,13 @@
 {
     "code": "flat_shipping",
-    "name": "固定运费",
-    "description": "按订单总额收取固定运费",
+    "name": {
+        "zh_cn": "固定运费",
+        "en": "Flat Rate Shipping"
+    },
+    "description": {
+        "zh_cn": "按订单总额收取固定运费",
+        "en": "Fixed shipping fee by order total"
+    },
     "type": "shipping",
     "version": "v1.0.0",
     "icon": "/image/logo.png",