diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index 94df0f4a..a02e18e4 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -177,6 +177,7 @@ class ProductController extends Controller 'categories' => CategoryRepo::flatten(locale(), false), ], '_redirect' => $this->getRedirect(), + 'unit_list' => Product::getUnitList(), ]; $data = hook_filter('admin.product.form.data', $data); diff --git a/beike/Models/Product.php b/beike/Models/Product.php index dd594ccb..324d6eaa 100644 --- a/beike/Models/Product.php +++ b/beike/Models/Product.php @@ -27,7 +27,9 @@ class Product extends Base 'height', 'minimum_order', 'sales_method', - 'piece_to_batch' + 'piece_to_batch', + 'trade_term', + 'unit' ]; protected $casts = [ @@ -125,4 +127,15 @@ class Product extends Base return $images[0] ?? ''; } + + public static function getUnitList(){ + return [ + ['title'=>'set/sets'], + ['title'=>'bag/bags'], + ['title'=>'piece/pieces'] + + ]; + } + + } diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php index 52adb5fa..d3f410d5 100644 --- a/beike/Shop/Http/Resources/CartDetail.php +++ b/beike/Shop/Http/Resources/CartDetail.php @@ -28,7 +28,7 @@ class CartDetail extends JsonResource $description = $product->description; $productName = $description->name; - $unit = $description->unit ?? ''; + $unit = $this->unit;//$description->unit ?? ''; $subTotal = $price * $this->quantity; $image = $sku->image ?: $product->image; diff --git a/beike/Shop/Http/Resources/ProductDetail.php b/beike/Shop/Http/Resources/ProductDetail.php index e1c1970c..1c777c0a 100644 --- a/beike/Shop/Http/Resources/ProductDetail.php +++ b/beike/Shop/Http/Resources/ProductDetail.php @@ -46,7 +46,7 @@ class ProductDetail extends JsonResource return [ 'id' => $this->id, 'name' => $this->description->name ?? '', - 'unit' => $this->description->unit ?? '', + 'unit' => $this->unit,//$this->description->unit ?? '', '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 b46f343d..5c2eed54 100644 --- a/beike/Shop/Http/Resources/ProductSimple.php +++ b/beike/Shop/Http/Resources/ProductSimple.php @@ -31,7 +31,7 @@ class ProductSimple extends JsonResource } $name = $this->description->name ?? ''; - $unit = $this->description->unit ?? ''; + $unit = $this->unit;//$this->description->unit ?? ''; $images = $this->images != NULL ? $this->images : []; $data = [ 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 63c9f5bb..2f610e5b 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -54,6 +54,313 @@
+ {{--交易信息--}} +
+
{{ __('product.transaction_info') }}
+ + +
+
+ price_setting == 'sku' ? 'checked' : '' }}> + +
+
+ price_setting == 'num' ? 'checked' : '' }}> + +
+
+ + + +{{-- 阶梯价格设置表格 （最小起订量，产品价格），预览，可以增加删除价格区间--}} +
+
+
+
{{__('admin/product.minimum_order')}}
+
产品价格
+
删除
+
+
+
+
+
+
≧
+ +
/{{ __('product.piece') }}
+
/{{ __('product.batches') }}
+
+
+ _ + @{{ form.sales_method == 'piece' ? item.num : item.num * form.piece_to_batch }}{{ __('product.piece') }} +
+
+
+ +
+ + @{{ item.num }}件等于价格：@{{ (item.num * item.price).toFixed(2) }} + + +
+
+
删除
+
+
+
+ {{ __('admin/product.add_variable') }} +
+
+
+
+ 预览 +
+
+
+
+ @{{ form.sales_method == 'piece' ? item.num : item.num * form.piece_to_batch }} ~ @{{ form.sales_method == 'piece' ? (form.numPrices[index + 1].num - 1) : form.numPrices[index + 1].num * form.piece_to_batch - 1 }} +
+
≧@{{ form.sales_method == 'piece' ? item.num : item.num * form.piece_to_batch }}
+
价格@{{ item.price }}
+
+
+
+
+ + +
新增价格区间
+ + + + + + + + + @hookwrapper('admin.product.edit.switch') + + + + @endhookwrapper + + + +
+ +
+
+
+ +
+
+
+ @{{ variant.name[current_language_code] }} + {{ __('common.edit') }} + {{ __('common.delete') }} +
+
+ {{ __('admin/product.num_select') }} + {{ __('admin/product.add_variable_image') }} + {{ __('admin/product.add_variable_value') }} +
+
+ +
+
{{ __('admin/product.add_variable_value') }}
+
+ +
+ + + {{ __('admin/product.add_variable') }} +
+ +
+
+
+ +
+
+ + +
+ + {{----}} + + + {{-- --}} + + +
+ + + + + + + {{----}} + + + {{----}} + + + + + + + + {{-- --}} + + + + + {{----}} + + + +
+ @{{ variant.name[current_language_code] || 'No name' }} + {{ __('common.image') }}{{ __('admin/product.model') }}sku{{ __('admin/product.price') }}{{ __('admin/product.origin_price') }}{{ __('admin/product.cost_price') }}{{ __('admin/product.quantity') }}
+
+
+
+ +
+ + +
+
+
+ + + 		+ + {{ __('common.error_required', ['name' => 'sku']) }} + {{ __('admin/product.default_main_product') }} + + + {{ __('common.error_required', ['name' => __('admin/product.price')]) }} + + + {{ __('common.error_required', ['name' => __('admin/product.origin_price')]) }} + + +
+
+
+ +
{{ __('admin/product.add_variable') }}
+
+
+ {{--最小起订量--}} + {{-- 未开启根据数量设置价格、直接下单产品 --}} + + {{-- 未开启根据数量设置价格、非直接下单商品 --}} + + {{--开启根据数量设置价格 - 数量固定为最小起订量--}} + + + + @hookwrapper('admin.product.edit.variable') +
+ + + {{----}} + + + + + + + + + + {{----}} + +
+ @endhookwrapper +
+ {{--其他数据--}}
{{ __('common.data') }}
- {{--计量单位--}} - + {{--计量单位 语言切换弃用 改为下拉框选择--}} + + {{----}} + {{--贸易术语--}} + {{--销售方式--}}
@@ -171,7 +481,7 @@ {{--状态--}} - +
@@ -185,311 +495,7 @@ @hook('admin.product.edit.extra') -
-
{{ __('admin/product.stocks') }}
- -
-
- price_setting == 'sku' ? 'checked' : '' }}> - -
-
- price_setting == 'num' ? 'checked' : '' }}> - -
-
- - - -{{-- 阶梯价格设置表格 （最小起订量，产品价格），预览，可以增加删除价格区间--}} -
-
-
-
{{__('admin/product.minimum_order')}}
-
产品价格
-
删除
-
-
-
-
-
-
≧
- -
/{{ __('product.piece') }}
-
/{{ __('product.batches') }}
-
-
- _ - @{{ form.sales_method == 'piece' ? item.num : item.num * form.piece_to_batch }}{{ __('product.piece') }} -
-
-
- -
- - @{{ item.num }}件等于价格：@{{ (item.num * item.price).toFixed(2) }} - - -
-
-
删除
-
-
-
- {{ __('admin/product.add_variable') }} -
-
-
-
- 预览 -
-
-
-
- @{{ form.sales_method == 'piece' ? item.num : item.num * form.piece_to_batch }} ~ @{{ form.sales_method == 'piece' ? (form.numPrices[index + 1].num - 1) : form.numPrices[index + 1].num * form.piece_to_batch - 1 }} -
-
≧@{{ form.sales_method == 'piece' ? item.num : item.num * form.piece_to_batch }}
-
价格@{{ item.price }}
-
-
-
-
- - -
新增价格区间
- - - - - - - - - @hookwrapper('admin.product.edit.switch') - - - - @endhookwrapper - - - -
- -
-
-
- -
-
-
- @{{ variant.name[current_language_code] }} - {{ __('common.edit') }} - {{ __('common.delete') }} -
-
- {{ __('admin/product.num_select') }} - {{ __('admin/product.add_variable_image') }} - {{ __('admin/product.add_variable_value') }} -
-
- -
-
{{ __('admin/product.add_variable_value') }}
-
- -
- - - {{ __('admin/product.add_variable') }} -
- -
-
-
- -
-
- - -
- - {{----}} - - - {{-- --}} - - -
- - - - - - - {{----}} - - - {{----}} - - - - - - - - {{-- --}} - - - - - {{----}} - - - -
- @{{ variant.name[current_language_code] || 'No name' }} - {{ __('common.image') }}{{ __('admin/product.model') }}sku{{ __('admin/product.price') }}{{ __('admin/product.origin_price') }}{{ __('admin/product.cost_price') }}{{ __('admin/product.quantity') }}
-
-
-
- -
- - -
-
-
- - - 		- - {{ __('common.error_required', ['name' => 'sku']) }} - {{ __('admin/product.default_main_product') }} - - - {{ __('common.error_required', ['name' => __('admin/product.price')]) }} - - - {{ __('common.error_required', ['name' => __('admin/product.origin_price')]) }} - - -
-
-
- -
{{ __('admin/product.add_variable') }}
-
-
- {{--最小起订量--}} - {{-- 未开启根据数量设置价格、直接下单产品 --}} - - {{-- 未开启根据数量设置价格、非直接下单商品 --}} - - {{--开启根据数量设置价格 - 数量固定为最小起订量--}} - - - - @hookwrapper('admin.product.edit.variable') -
- - - {{----}} - - - - - - - - - - {{----}} - -
- @endhookwrapper -
{{ __('admin/product.product_details') }}
diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php index 5acf3e94..3f7187f6 100644 --- a/resources/lang/en/product.php +++ b/resources/lang/en/product.php @@ -44,4 +44,9 @@ return [ 'quantity_error_mini' => 'Purchase quantity error, the total purchase quantity of [:goods_name] must be greater than or equal to [:num]', 'quantity_error_multiple' => 'Purchase quantity error, the total purchase quantity of [:goods_name] must be a multiple of [:num]', 'product_type' => 'Product type', + 'transaction_info' => 'Transaction information', + 'trade_term' => 'Trade Term', + + + ]; diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php index 1d1c6528..d0741d03 100644 --- a/resources/lang/zh_cn/product.php +++ b/resources/lang/zh_cn/product.php @@ -32,7 +32,7 @@ return [ 'minimum_order' => '起订量', 'minimum_order_error' => '采购数量必须大于等于:num', 'unit_of_measurement' => '计量单位', - 'sales_method' => '销售方式', + 'sales_method' => '基础销售方式', 'sales_method_piece' => '按件卖', 'sales_method_batches' => '按批卖', 'one_batch_is_equal_to' => '1批等于', @@ -45,7 +45,8 @@ return [ 'quantity_error_mini' => '采购数量错误，【:goods_name】的采购总数量必须大于等于【:num】', 'quantity_error_multiple' => '采购数量错误，【:goods_name】的采购总数量必须是【:num】的倍数', 'product_type' => '产品类型', - + 'transaction_info' => '交易信息', + 'trade_term' => '贸易术语', ];