diff --git a/beike/Models/Order.php b/beike/Models/Order.php index 770a6a2b..075c4dc2 100644 --- a/beike/Models/Order.php +++ b/beike/Models/Order.php @@ -25,6 +25,8 @@ class Order extends Base 'payment_address_1', 'payment_address_2', ]; + protected $appends = ['total_format']; + public function orderProducts(): HasMany { return $this->hasMany(OrderProduct::class); @@ -39,4 +41,9 @@ class Order extends Base { return $this->hasMany(OrderHistory::class); } + + public function getTotalFormatAttribute() + { + return currency_format($this->total); + } } diff --git a/beike/Models/OrderProduct.php b/beike/Models/OrderProduct.php index 05bd5e78..56ed25d2 100644 --- a/beike/Models/OrderProduct.php +++ b/beike/Models/OrderProduct.php @@ -24,4 +24,11 @@ class OrderProduct extends Base return $this->belongsTo(Order::class); } + protected $appends = ['price_format']; + + public function getPriceFormatAttribute() + { + return currency_format($this->price); + } + } diff --git a/beike/Models/OrderTotal.php b/beike/Models/OrderTotal.php index 23d93f74..e65f03fb 100644 --- a/beike/Models/OrderTotal.php +++ b/beike/Models/OrderTotal.php @@ -16,4 +16,11 @@ class OrderTotal extends Base protected $fillable = [ 'order_id', 'code', 'value', 'title', 'reference' ]; + + protected $appends = ['value_format']; + + public function getValueFormatAttribute() + { + return currency_format($this->value); + } } diff --git a/beike/Repositories/OrderProductRepo.php b/beike/Repositories/OrderProductRepo.php index c8c52ffc..ec3d921f 100644 --- a/beike/Repositories/OrderProductRepo.php +++ b/beike/Repositories/OrderProductRepo.php @@ -13,7 +13,6 @@ namespace Beike\Repositories; use Beike\Models\Order; use Beike\Models\OrderProduct; -use Beike\Models\Rma; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php index 18b45bf2..0a10adfc 100644 --- a/resources/beike/admin/views/pages/orders/form.blade.php +++ b/resources/beike/admin/views/pages/orders/form.blade.php @@ -20,7 +20,7 @@