diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index a02e18e4..b7c12ccf 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -163,21 +163,21 @@ class ProductController extends Controller $product = hook_filter('admin.product.form.product', $product); $taxClasses = TaxClassRepo::getList(); array_unshift($taxClasses, ['title' => trans('admin/builder.text_no'), 'id' => 0]); - $data = [ - 'product' => $product, - 'descriptions' => $descriptions ?? [], - 'category_ids' => $categoryIds ?? [], - 'product_attributes' => ProductAttributeResource::collection($product->attributes), - 'relations' => ProductResource::collection($product->relations)->resource, - 'languages' => LanguageRepo::all(), - 'tax_classes' => $taxClasses, - 'weight_classes' => Weight::getWeightUnits(), - 'source' => [ - 'categories' => CategoryRepo::flatten(locale(), false), + 'product' => $product, + 'descriptions' => $descriptions ?? [], + 'category_ids' => $categoryIds ?? [], + 'product_attributes' => ProductAttributeResource::collection($product->attributes), + 'relations' => ProductResource::collection($product->relations)->resource, + 'languages' => LanguageRepo::all(), + 'tax_classes' => $taxClasses, + 'weight_classes' => Weight::getWeightUnits(), + 'source' => [ + 'categories' => CategoryRepo::flatten(locale(),FALSE), ], '_redirect' => $this->getRedirect(), - 'unit_list' => Product::getUnitList(), + 'unit_list' => Product::getUnitList(), + 'trade_term' => Product::getTradeTermList(), ]; $data = hook_filter('admin.product.form.data', $data); diff --git a/beike/Models/Product.php b/beike/Models/Product.php index 324d6eaa..02a33d88 100644 --- a/beike/Models/Product.php +++ b/beike/Models/Product.php @@ -137,5 +137,20 @@ class Product extends Base ]; } + public static function getTradeTermList(){ + return [ + ['title'=>'EXW'], + ['title'=>'FCA'], + ['title'=>'FAS'], + ['title'=>'FOB'], + ['title'=>'CFR'], + ['title'=>'CIF'], + ['title'=>'CPT'], + ['title'=>'CIP'], + ['title'=>'DAT'], + ['title'=>'DAP'], + ['title'=>'DDP'], + ]; + } } diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php index d3f410d5..d7f00513 100644 --- a/beike/Shop/Http/Resources/CartDetail.php +++ b/beike/Shop/Http/Resources/CartDetail.php @@ -41,6 +41,7 @@ class CartDetail extends JsonResource 'name_format' => sub_string($productName), 'unit' => $unit, 'unit_format' => $unit, + 'trade_term' => $this->trade_term, 'image' => $image, 'image_url' => image_resize($image), 'quantity' => $this->quantity, diff --git a/beike/Shop/Http/Resources/ProductDetail.php b/beike/Shop/Http/Resources/ProductDetail.php index 1c777c0a..92b567c8 100644 --- a/beike/Shop/Http/Resources/ProductDetail.php +++ b/beike/Shop/Http/Resources/ProductDetail.php @@ -47,6 +47,7 @@ class ProductDetail extends JsonResource 'id' => $this->id, 'name' => $this->description->name ?? '', 'unit' => $this->unit,//$this->description->unit ?? '', + 'trade_term' => $this->trade_term, 'description' => $this->description->content ?? '', 'meta_title' => $this->description->meta_title ?? '', 'meta_keywords' => $this->description->meta_keywords ?? '', diff --git a/beike/Shop/Http/Resources/ProductSimple.php b/beike/Shop/Http/Resources/ProductSimple.php index 5c2eed54..556f7956 100644 --- a/beike/Shop/Http/Resources/ProductSimple.php +++ b/beike/Shop/Http/Resources/ProductSimple.php @@ -41,6 +41,7 @@ class ProductSimple extends JsonResource 'name_format' => $name, 'unit' => $unit, 'unit_format' => $unit, + 'trade_term' => $this->trade_term, 'url' => $this->url, 'price' => $masterSku->price, 'origin_price' => $masterSku->origin_price, diff --git a/public/image/trade_term.png b/public/image/trade_term.png new file mode 100644 index 00000000..66e30935 Binary files /dev/null and b/public/image/trade_term.png differ diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index 2f610e5b..da45276d 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -25,7 +25,42 @@ @endforeach @endif - +