diff --git a/beike/Admin/Http/Resources/ProductResource.php b/beike/Admin/Http/Resources/ProductResource.php index dc5f7b70..96414eac 100644 --- a/beike/Admin/Http/Resources/ProductResource.php +++ b/beike/Admin/Http/Resources/ProductResource.php @@ -16,7 +16,7 @@ class ProductResource extends JsonResource */ public function toArray($request): array { - $masterSku = $this->master_sku; + $masterSku = $this->masterSku; $data = [ 'id' => $this->id, diff --git a/beike/Models/Product.php b/beike/Models/Product.php index 93b7f17a..e1fc3502 100644 --- a/beike/Models/Product.php +++ b/beike/Models/Product.php @@ -51,7 +51,7 @@ class Product extends Base return $this->hasMany(ProductAttribute::class); } - public function master_sku() + public function masterSku() { return $this->hasOne(ProductSku::class)->where('is_default', 1); } diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php index c9937467..23e82371 100644 --- a/beike/Repositories/ProductRepo.php +++ b/beike/Repositories/ProductRepo.php @@ -32,7 +32,7 @@ class ProductRepo if (is_int($product)) { $product = Product::query()->findOrFail($product); } - $product->load('description', 'skus', 'master_sku', 'brand', 'relations'); + $product->load('description', 'skus', 'masterSku', 'brand', 'relations'); return $product; } @@ -61,7 +61,7 @@ class ProductRepo if (! $productIds) { return ProductSimple::collection(new Collection()); } - $builder = self::getBuilder(['product_ids' => $productIds])->whereHas('master_sku'); + $builder = self::getBuilder(['product_ids' => $productIds])->whereHas('masterSku'); $products = $builder->with('inCurrentWishlist')->get(); return ProductSimple::collection($products); @@ -75,7 +75,7 @@ class ProductRepo */ public static function getBuilder(array $data = []): Builder { - $builder = Product::query()->with('description', 'skus', 'master_sku', 'attributes'); + $builder = Product::query()->with('description', 'skus', 'masterSku', 'attributes'); $builder->leftJoin('product_descriptions as pd', function ($build) { $build->whereColumn('pd.product_id', 'products.id') diff --git a/beike/Shop/Http/Controllers/BrandController.php b/beike/Shop/Http/Controllers/BrandController.php index 808be12e..bd0b5f99 100644 --- a/beike/Shop/Http/Controllers/BrandController.php +++ b/beike/Shop/Http/Controllers/BrandController.php @@ -23,7 +23,7 @@ class BrandController extends Controller $brand = BrandRepo::find($id); $products = $brand->products() ->with([ - 'master_sku', + 'masterSku', 'description', 'inCurrentWishlist', ]) diff --git a/beike/Shop/Http/Resources/Account/WishlistDetail.php b/beike/Shop/Http/Resources/Account/WishlistDetail.php index c4335432..da6469f1 100644 --- a/beike/Shop/Http/Resources/Account/WishlistDetail.php +++ b/beike/Shop/Http/Resources/Account/WishlistDetail.php @@ -21,7 +21,7 @@ class WishlistDetail extends JsonResource public function toArray($request): array { $product = $this->product; - $masterSku = $product->master_sku; + $masterSku = $product->masterSku; $image = $this->product->image ?: $masterSku->image; $productName = $product->description->name ?? ''; diff --git a/beike/Shop/Http/Resources/ProductSimple.php b/beike/Shop/Http/Resources/ProductSimple.php index 6c41d190..c7442946 100644 --- a/beike/Shop/Http/Resources/ProductSimple.php +++ b/beike/Shop/Http/Resources/ProductSimple.php @@ -25,7 +25,7 @@ class ProductSimple extends JsonResource */ public function toArray($request): array { - $masterSku = $this->master_sku; + $masterSku = $this->masterSku; if (empty($masterSku)) { throw new \Exception("invalid master sku for product {$this->id}"); } diff --git a/plugins/LatestProducts/Controllers/MenusController.php b/plugins/LatestProducts/Controllers/MenusController.php index 35150288..16212ce0 100644 --- a/plugins/LatestProducts/Controllers/MenusController.php +++ b/plugins/LatestProducts/Controllers/MenusController.php @@ -29,7 +29,7 @@ class MenusController extends Controller public function latestProducts() { $products = ProductRepo::getBuilder(['active' => 1]) - ->whereHas('master_sku') + ->whereHas('masterSku') ->with('inCurrentWishlist') ->paginate(perPage());