Shop product ID in name, template and CP

assets/template/cached_block_1_html_file.go

@@ -15,7 +15,7 @@ var VarCachedBlock_1HtmlFile = []byte(`{{if not (eq $.Data.Module "404")}}
 		{{if eq $.Data.Module "shop-category"}}
 			Products of category "{{$.Data.Shop.Category.Name}}" | Shop
 		{{else if eq $.Data.Module "shop-product"}}
-			{{$.Data.Shop.Product.Name}} | Shop
+			{{$.Data.Shop.Product.Name}} ({{$.Data.Shop.Product.Id}}) | Shop
 		{{else}}
 			Latest products | Shop
 		{{end}}

assets/template/cached_block_3_html_file.go

@@ -127,7 +127,7 @@ var VarCachedBlock_3HtmlFile = []byte(`<nav class="navbar navbar-expand-lg navba
 						{{end}}
 						<li class="breadcrumb-item"><a href="{{$.Data.Shop.Product.Category.Permalink}}">{{$.Data.Shop.Product.Category.Name}}</a></li>
 					{{end}}
-					<li class="breadcrumb-item active">{{$.Data.Shop.Product.Name}}</li>
+					<li class="breadcrumb-item active">{{$.Data.Shop.Product.Name}} ({{$.Data.Shop.Product.Id}})</li>
 				{{end}}
 			</ol>
 		</nav>

assets/template/shop_category_html_file.go

@@ -18,7 +18,11 @@ var VarShopCategoryHtmlFile = []byte(`{{template "header.html" .}}
 					<div class="card-body">
 						<h5 class="card-title">
 							<a href="{{.Permalink}}">
-								{{.Name}}
+								{{if ne .Group ""}}
+									{{.Group}}
+								{{else}}
+									{{.Name}}
+								{{end}}
 							</a>
 						</h5>
 						<div class="card-text">{{.Briefly}}</div>

assets/template/shop_html_file.go

@@ -18,7 +18,11 @@ var VarShopHtmlFile = []byte(`{{template "header.html" .}}
 					<div class="card-body">
 						<h5 class="card-title">
 							<a href="{{.Permalink}}">
-								{{.Name}}
+								{{if ne .Group ""}}
+									{{.Group}}
+								{{else}}
+									{{.Name}}
+								{{end}}
 							</a>
 						</h5>
 						<div class="card-text">{{.Briefly}}</div>

assets/template/shop_product_html_file.go

@@ -3,7 +3,7 @@ package template
 var VarShopProductHtmlFile = []byte(`{{template "header.html" .}}
 <div class="card mb-4">
 	<div class="card-body product-full">
-		<h2 class="card-title">{{$.Data.Shop.Product.Name}}</h2>
+		<h2 class="card-title">{{$.Data.Shop.Product.Name}} ({{$.Data.Shop.Product.Id}})</h2>
 		<ul class="nav nav-tabs" id="myTab" role="tablist">
 			<li class="nav-item">
 				<a class="nav-link active" id="all-tab" data-toggle="tab" href="#all" role="tab" aria-controls="all" aria-selected="true">All about product</a>

engine/fetdata/shop_product.go

@@ -172,7 +172,7 @@ func (this *ShopProduct) load() *ShopProduct {
 				}
 				this.vars = append(this.vars, &ShopProductVarItem{
 					Link:     "/shop/" + tmp_alias + "/",
-					Name:     tmp_name,
+					Name:     tmp_name + " (" + utils.IntToStr(tmp_id) + ")",
 					Selected: selected,
 				})
 			}

hosts/localhost/template/cached-block-1.html

@@ -13,7 +13,7 @@
 		{{if eq $.Data.Module "shop-category"}}
 			Products of category "{{$.Data.Shop.Category.Name}}" | Shop
 		{{else if eq $.Data.Module "shop-product"}}
-			{{$.Data.Shop.Product.Name}} | Shop
+			{{$.Data.Shop.Product.Name}} ({{$.Data.Shop.Product.Id}}) | Shop
 		{{else}}
 			Latest products | Shop
 		{{end}}

hosts/localhost/template/cached-block-3.html

@@ -125,7 +125,7 @@
 						{{end}}
 						<li class="breadcrumb-item"><a href="{{$.Data.Shop.Product.Category.Permalink}}">{{$.Data.Shop.Product.Category.Name}}</a></li>
 					{{end}}
-					<li class="breadcrumb-item active">{{$.Data.Shop.Product.Name}}</li>
+					<li class="breadcrumb-item active">{{$.Data.Shop.Product.Name}} ({{$.Data.Shop.Product.Id}})</li>
 				{{end}}
 			</ol>
 		</nav>

hosts/localhost/template/shop-category.html

@@ -16,7 +16,11 @@
 					<div class="card-body">
 						<h5 class="card-title">
 							<a href="{{.Permalink}}">
-								{{.Name}}
+								{{if ne .Group ""}}
+									{{.Group}}
+								{{else}}
+									{{.Name}}
+								{{end}}
 							</a>
 						</h5>
 						<div class="card-text">{{.Briefly}}</div>

hosts/localhost/template/shop-product.html

@@ -1,7 +1,7 @@
 {{template "header.html" .}}
 <div class="card mb-4">
 	<div class="card-body product-full">
-		<h2 class="card-title">{{$.Data.Shop.Product.Name}}</h2>
+		<h2 class="card-title">{{$.Data.Shop.Product.Name}} ({{$.Data.Shop.Product.Id}})</h2>
 		<ul class="nav nav-tabs" id="myTab" role="tablist">
 			<li class="nav-item">
 				<a class="nav-link active" id="all-tab" data-toggle="tab" href="#all" role="tab" aria-controls="all" aria-selected="true">All about product</a>

hosts/localhost/template/shop.html

@@ -16,7 +16,11 @@
 					<div class="card-body">
 						<h5 class="card-title">
 							<a href="{{.Permalink}}">
-								{{.Name}}
+								{{if ne .Group ""}}
+									{{.Group}}
+								{{else}}
+									{{.Name}}
+								{{end}}
 							</a>
 						</h5>
 						<div class="card-text">{{.Briefly}}</div>

modules/module_shop_act_attach_product_search.go

@@ -53,7 +53,7 @@ func (this *Modules) shop_GetProductsListForAttaching(wrap *wrapper.Wrapper, nam
 		for rows.Next() {
 			err = rows.Scan(scan...)
 			if *wrap.LogCpError(&err) == nil {
-				result += `<div><a href="javascript:fave.ShopAttachProductTo(` + utils.IntToStr(id) + `,` + html.EscapeString(string(values[0])) + `);">` + html.EscapeString(string(values[1])) + `</a></div>`
+				result += `<div><a href="javascript:fave.ShopAttachProductTo(` + utils.IntToStr(id) + `,` + html.EscapeString(string(values[0])) + `);">` + html.EscapeString(string(values[1])) + ` (` + html.EscapeString(string(values[0])) + `)</a></div>`
 			}
 		}
 	}