Remove symbols from ID in product name

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}} ({{$.Data.Shop.Product.Id}}) | 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}} ({{$.Data.Shop.Product.Id}})</li>
+					<li class="breadcrumb-item active">{{$.Data.Shop.Product.Name}} {{$.Data.Shop.Product.Id}}</li>
 				{{end}}
 			</ol>
 		</nav>

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}} ({{$.Data.Shop.Product.Id}})</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 + " (" + utils.IntToStr(tmp_id) + ")",
+					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}} ({{$.Data.Shop.Product.Id}}) | 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}} ({{$.Data.Shop.Product.Id}})</li>
+					<li class="breadcrumb-item active">{{$.Data.Shop.Product.Name}} {{$.Data.Shop.Product.Id}}</li>
 				{{end}}
 			</ol>
 		</nav>

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}} ({{$.Data.Shop.Product.Id}})</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>

modules/module_shop.go

@@ -274,7 +274,7 @@ func (this *Modules) shop_GetSubProducts(wrap *wrapper.Wrapper, id int) string {
 		for rows.Next() {
 			err = rows.Scan(scan...)
 			if *wrap.LogCpError(&err) == nil {
-				result += `<div><a href="/cp/` + wrap.CurrModule + `/modify/` + html.EscapeString(string(values[0])) + `/">` + html.EscapeString(string(values[1])) + ` (` + html.EscapeString(string(values[0])) + `)</a> <a class="ico delete" title="Delete" href="javascript:fave.ActionDataTableDelete(this,'shop-detach','` + html.EscapeString(string(values[0])) + `','Are you sure want to detach product?');"><svg viewBox="0 0 16 16" width="16" height="16" class="sicon" version="1.1"><path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"></path></svg></a></div>`
+				result += `<div><a href="/cp/` + wrap.CurrModule + `/modify/` + html.EscapeString(string(values[0])) + `/">` + html.EscapeString(string(values[1])) + ` ` + html.EscapeString(string(values[0])) + `</a> <a class="ico delete" title="Delete" href="javascript:fave.ActionDataTableDelete(this,'shop-detach','` + html.EscapeString(string(values[0])) + `','Are you sure want to detach product?');"><svg viewBox="0 0 16 16" width="16" height="16" class="sicon" version="1.1"><path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"></path></svg></a></div>`
 			}
 		}
 	}
@@ -304,7 +304,7 @@ func (this *Modules) shop_GetParentProduct(wrap *wrapper.Wrapper, id int) string
 		for rows.Next() {
 			err = rows.Scan(scan...)
 			if *wrap.LogCpError(&err) == nil {
-				result += `<div><a href="/cp/` + wrap.CurrModule + `/modify/` + html.EscapeString(string(values[0])) + `/">` + html.EscapeString(string(values[1])) + ` (` + html.EscapeString(string(values[0])) + `)</a></div>`
+				result += `<div><a href="/cp/` + wrap.CurrModule + `/modify/` + html.EscapeString(string(values[0])) + `/">` + html.EscapeString(string(values[1])) + ` ` + html.EscapeString(string(values[0])) + `</a></div>`
 			}
 		}
 	}
@@ -565,7 +565,7 @@ func (this *Modules) RegisterModule_Shop() *Module {
 						DBField:     "name",
 						NameInTable: "Product / URL",
 						CallBack: func(values *[]string) string {
-							name := `<a href="/cp/` + wrap.CurrModule + `/modify/` + (*values)[0] + `/">` + html.EscapeString((*values)[1]) + ` (` + html.EscapeString((*values)[0]) + `)</a>`
+							name := `<a href="/cp/` + wrap.CurrModule + `/modify/` + (*values)[0] + `/">` + html.EscapeString((*values)[1]) + ` ` + html.EscapeString((*values)[0]) + `</a>`
 							alias := html.EscapeString((*values)[2])
 							parent := ``
 							if (*values)[7] != "" {

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])) + ` (` + html.EscapeString(string(values[0])) + `)</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>`
 			}
 		}
 	}

xml.go

@@ -252,7 +252,7 @@ func xml_gen_offers(db *sqlw.DB, conf *config.Config) string {
 				result += xml_gen_offer_pictures(db, conf, utils.StrToInt(string(values[0])), utils.StrToInt(string(values[9])))
 				result += `<vendor>` + html.EscapeString(string(values[5])) + `</vendor>`
 				result += `<stock_quantity>` + html.EscapeString(string(values[6])) + `</stock_quantity>`
-				result += `<name>` + html.EscapeString(string(values[3])) + ` (` + html.EscapeString(string(values[0])) + `)</name>`
+				result += `<name>` + html.EscapeString(string(values[3])) + ` ` + html.EscapeString(string(values[0])) + `</name>`
 				result += `<description><![CDATA[` + string(values[8]) + `]]></description>`
 				result += xml_gen_offer_attributes(db, conf, utils.StrToInt(string(values[0])))
 				result += `</offer>`