We use cookies to ensure you get the best experience on our website
Home Explore Help
Sign In
mirror
/
golang-fave
mirror of https://github.com/vladimirok5959/golang-fave.git
2
0
Fork 0
Files Wiki
Browse Source

Second name -> Middle name

Vova Tkach 5 years ago
parent
2784d1c47a
commit
300cf0ec78
13 changed files with 42 additions and 42 deletions
Split View Show Diff Stats
  1. 3 3
      assets/template/header_html_file.go
  2. 6 6
      assets/template/scripts_js_file.go
  3. 2 2
      engine/fetdata/fetdata.go
  4. 2 2
      engine/wrapper/config/config.go
  5. 3 3
      hosts/localhost/template/header.html
  6. 6 6
      hosts/localhost/template/scripts.js
  7. 1 1
      modules/module_index_act_mysql_setup.go
  8. 3 3
      modules/module_settings.go
  9. 4 4
      modules/module_settings_act_shop.go
  10. 4 4
      modules/module_shop.go
  11. 6 6
      modules/module_shop_order.go
  12. 1 1
      support/migrate/000000015.go
  13. 1 1
      support/schema.sql

+ 3 - 3
assets/template/header_html_file.go
View File 

@@ -34,7 +34,7 @@ var VarHeaderHtmlFile = []byte(`<!doctype html>
 
 
 			var ShopOrderLabelLastName = 'Last Name';
 
 			var ShopOrderLabelFirstName = 'First Name';
 
-			var ShopOrderLabelSecondName = 'Second Name';
 
+			var ShopOrderLabelMiddleName = 'Middle Name';
 
 			var ShopOrderLabelMobilePhone = 'Mobile Phone';
 
 			var ShopOrderLabelEmailAddress = 'Email Address';
 
 			var ShopOrderLabelDelivery = 'Delivery';
 
@@ -42,7 +42,7 @@ var VarHeaderHtmlFile = []byte(`<!doctype html>
 
 
 			var ShopOrderRequiredLastName = {{$.Data.ShopOrderRequiredLastName}};
 
 			var ShopOrderRequiredFirstName = {{$.Data.ShopOrderRequiredFirstName}};
 
-			var ShopOrderRequiredSecondName = {{$.Data.ShopOrderRequiredSecondName}};
 
+			var ShopOrderRequiredMiddleName = {{$.Data.ShopOrderRequiredMiddleName}};
 
 			var ShopOrderRequiredMobilePhone = {{$.Data.ShopOrderRequiredMobilePhone}};
 
 			var ShopOrderRequiredEmailAddress = {{$.Data.ShopOrderRequiredEmailAddress}};
 
 			var ShopOrderRequiredDelivery = {{$.Data.ShopOrderRequiredDelivery}};
 
@@ -53,7 +53,7 @@ var VarHeaderHtmlFile = []byte(`<!doctype html>
 
 			var ShopOrderErrorSomethingWrong = 'We cannot process your order, something is wrong...';
 
 			var ShopOrderEmptyLastName = 'Please enter your last name';
 
 			var ShopOrderEmptyFirstName = 'Please enter your first name';
 
-			var ShopOrderEmptySecondName = 'Please enter your second name';
 
+			var ShopOrderEmptyMiddleName = 'Please enter your middle name';
 
 			var ShopOrderEmptyMobilePhone = 'Please enter your mobile phone';
 
 			var ShopOrderEmptyEmailAddress = 'Please enter your email address';
 
 			var ShopOrderEmptyDelivery = 'Please enter delivery comment';

+ 6 - 6
assets/template/scripts_js_file.go
View File 

@@ -227,14 +227,14 @@ var VarScriptsJsFile = []byte(`(function(window, $) {
 
 													<div class="form-group"> \
 
 														<div class="row"> \
 
 															<div class="col-md-4"> \
 
-																<label for="lbl_client_second_name">' + ShopOrderLabelSecondName + '</label> \
 
+																<label for="lbl_client_middle_name">' + ShopOrderLabelMiddleName + '</label> \
 
 															</div> \
 
 															<div class="col-md-8"> \
 
 																<div> \
 
-																	<input class="form-control" type="text" id="lbl_client_second_name" name="client_second_name" minlength="1" maxlength="64" autocomplete="off" onkeydown="$(this).parent().parent().find(\'.input-error-msg\').css(\'display\', \'none\');"> \
 
+																	<input class="form-control" type="text" id="lbl_client_middle_name" name="client_middle_name" minlength="1" maxlength="64" autocomplete="off" onkeydown="$(this).parent().parent().find(\'.input-error-msg\').css(\'display\', \'none\');"> \
 
 																</div> \
 
 																<div class="input-error-msg" style="display:none;"> \
 
-																	<small>' + ShopOrderEmptySecondName + '</small> \
 
+																	<small>' + ShopOrderEmptyMiddleName + '</small> \
 
 																</div> \
 
 															</div> \
 
 														</div> \
 
@@ -450,10 +450,10 @@ var VarScriptsJsFile = []byte(`(function(window, $) {
 
 						}
 
 						ValidateError = true;
 
 					}
 
-					if(ShopOrderRequiredSecondName && $.trim(OrderForm.find('input[name=client_second_name]').val()) == '') {
 
-						OrderForm.find('input[name=client_second_name]').parent().parent().find('.input-error-msg').css('display', 'inline');
 
+					if(ShopOrderRequiredMiddleName && $.trim(OrderForm.find('input[name=client_middle_name]').val()) == '') {
 
+						OrderForm.find('input[name=client_middle_name]').parent().parent().find('.input-error-msg').css('display', 'inline');
 
 						if(!ValidateError) {
 
-							setTimeout(function() { OrderForm.find('input[name=client_second_name]').first().focus(); }, 200);
 
+							setTimeout(function() { OrderForm.find('input[name=client_middle_name]').first().focus(); }, 200);
 
 						}
 
 						ValidateError = true;
 
 					}

+ 2 - 2
engine/fetdata/fetdata.go
View File 

@@ -221,8 +221,8 @@ func (this *FERData) ShopOrderRequiredFirstName() bool {
 
 	return (*this.wrap.Config).Shop.Orders.RequiredFields.FirstName != 0
 
 }
 
 
-func (this *FERData) ShopOrderRequiredSecondName() bool {
 
-	return (*this.wrap.Config).Shop.Orders.RequiredFields.SecondName != 0
 
+func (this *FERData) ShopOrderRequiredMiddleName() bool {
 
+	return (*this.wrap.Config).Shop.Orders.RequiredFields.MiddleName != 0
 
 }
 
 
 func (this *FERData) ShopOrderRequiredMobilePhone() bool {

+ 2 - 2
engine/wrapper/config/config.go
View File 

@@ -35,7 +35,7 @@ type Config struct {
 
 			RequiredFields struct {
 
 				LastName     int
 
 				FirstName    int
 
-				SecondName   int
 
+				MiddleName   int
 
 				MobilePhone  int
 
 				EmailAddress int
 
 				Delivery     int
 
@@ -99,7 +99,7 @@ func (this *Config) configDefault() {
 
 
 	this.Shop.Orders.RequiredFields.LastName = 1
 
 	this.Shop.Orders.RequiredFields.FirstName = 1
 
-	this.Shop.Orders.RequiredFields.SecondName = 0
 
+	this.Shop.Orders.RequiredFields.MiddleName = 0
 
 	this.Shop.Orders.RequiredFields.MobilePhone = 0
 
 	this.Shop.Orders.RequiredFields.EmailAddress = 1
 
 	this.Shop.Orders.RequiredFields.Delivery = 0

+ 3 - 3
hosts/localhost/template/header.html
View File 

@@ -32,7 +32,7 @@
 
 
 			var ShopOrderLabelLastName = 'Last Name';
 
 			var ShopOrderLabelFirstName = 'First Name';
 
-			var ShopOrderLabelSecondName = 'Second Name';
 
+			var ShopOrderLabelMiddleName = 'Middle Name';
 
 			var ShopOrderLabelMobilePhone = 'Mobile Phone';
 
 			var ShopOrderLabelEmailAddress = 'Email Address';
 
 			var ShopOrderLabelDelivery = 'Delivery';
 
@@ -40,7 +40,7 @@
 
 
 			var ShopOrderRequiredLastName = {{$.Data.ShopOrderRequiredLastName}};
 
 			var ShopOrderRequiredFirstName = {{$.Data.ShopOrderRequiredFirstName}};
 
-			var ShopOrderRequiredSecondName = {{$.Data.ShopOrderRequiredSecondName}};
 
+			var ShopOrderRequiredMiddleName = {{$.Data.ShopOrderRequiredMiddleName}};
 
 			var ShopOrderRequiredMobilePhone = {{$.Data.ShopOrderRequiredMobilePhone}};
 
 			var ShopOrderRequiredEmailAddress = {{$.Data.ShopOrderRequiredEmailAddress}};
 
 			var ShopOrderRequiredDelivery = {{$.Data.ShopOrderRequiredDelivery}};
 
@@ -51,7 +51,7 @@
 
 			var ShopOrderErrorSomethingWrong = 'We cannot process your order, something is wrong...';
 
 			var ShopOrderEmptyLastName = 'Please enter your last name';
 
 			var ShopOrderEmptyFirstName = 'Please enter your first name';
 
-			var ShopOrderEmptySecondName = 'Please enter your second name';
 
+			var ShopOrderEmptyMiddleName = 'Please enter your middle name';
 
 			var ShopOrderEmptyMobilePhone = 'Please enter your mobile phone';
 
 			var ShopOrderEmptyEmailAddress = 'Please enter your email address';
 
 			var ShopOrderEmptyDelivery = 'Please enter delivery comment';

+ 6 - 6
hosts/localhost/template/scripts.js
View File 

@@ -225,14 +225,14 @@
 
 													<div class="form-group"> \
 
 														<div class="row"> \
 
 															<div class="col-md-4"> \
 
-																<label for="lbl_client_second_name">' + ShopOrderLabelSecondName + '</label> \
 
+																<label for="lbl_client_middle_name">' + ShopOrderLabelMiddleName + '</label> \
 
 															</div> \
 
 															<div class="col-md-8"> \
 
 																<div> \
 
-																	<input class="form-control" type="text" id="lbl_client_second_name" name="client_second_name" minlength="1" maxlength="64" autocomplete="off" onkeydown="$(this).parent().parent().find(\'.input-error-msg\').css(\'display\', \'none\');"> \
 
+																	<input class="form-control" type="text" id="lbl_client_middle_name" name="client_middle_name" minlength="1" maxlength="64" autocomplete="off" onkeydown="$(this).parent().parent().find(\'.input-error-msg\').css(\'display\', \'none\');"> \
 
 																</div> \
 
 																<div class="input-error-msg" style="display:none;"> \
 
-																	<small>' + ShopOrderEmptySecondName + '</small> \
 
+																	<small>' + ShopOrderEmptyMiddleName + '</small> \
 
 																</div> \
 
 															</div> \
 
 														</div> \
 
@@ -448,10 +448,10 @@
 
 						}
 
 						ValidateError = true;
 
 					}
 
-					if(ShopOrderRequiredSecondName && $.trim(OrderForm.find('input[name=client_second_name]').val()) == '') {
 
-						OrderForm.find('input[name=client_second_name]').parent().parent().find('.input-error-msg').css('display', 'inline');
 
+					if(ShopOrderRequiredMiddleName && $.trim(OrderForm.find('input[name=client_middle_name]').val()) == '') {
 
+						OrderForm.find('input[name=client_middle_name]').parent().parent().find('.input-error-msg').css('display', 'inline');
 
 						if(!ValidateError) {
 
-							setTimeout(function() { OrderForm.find('input[name=client_second_name]').first().focus(); }, 200);
 
+							setTimeout(function() { OrderForm.find('input[name=client_middle_name]').first().focus(); }, 200);
 
 						}
 
 						ValidateError = true;
 
 					}

+ 1 - 1
modules/module_index_act_mysql_setup.go
View File 

@@ -285,7 +285,7 @@ func (this *Modules) RegisterAction_IndexMysqlSetup() *Action {
 
 				currency_symbol varchar(5) NOT NULL COMMENT 'Currency symbol',
 
 				client_last_name varchar(64) NOT NULL COMMENT 'Client last name',
 
 				client_first_name varchar(64) NOT NULL COMMENT 'Client first name',
 
-				client_second_name varchar(64) NOT NULL DEFAULT '' COMMENT 'Client second name',
 
+				client_middle_name varchar(64) NOT NULL DEFAULT '' COMMENT 'Client middle name',
 
 				client_phone varchar(20) NOT NULL DEFAULT '' COMMENT 'Client phone',
 
 				client_email varchar(64) NOT NULL COMMENT 'Client email',
 
 				client_delivery_comment text NOT NULL COMMENT 'Client delivery comment',

+ 3 - 3
modules/module_settings.go
View File 

@@ -555,9 +555,9 @@ func (this *Modules) RegisterModule_Settings() *Module {
 
 				},
 
 				{
 
 					Kind:    builder.DFKCheckBox,
 
-					Caption: "Second Name",
 
-					Name:    "require-second-name",
 
-					Value:   utils.IntToStr((*wrap.Config).Shop.Orders.RequiredFields.SecondName),
 
+					Caption: "Middle Name",
 
+					Name:    "require-middle-name",
 
+					Value:   utils.IntToStr((*wrap.Config).Shop.Orders.RequiredFields.MiddleName),
 
 				},
 
 				{
 
 					Kind:    builder.DFKCheckBox,

+ 4 - 4
modules/module_settings_act_shop.go
View File 

@@ -16,7 +16,7 @@ func (this *Modules) RegisterAction_SettingsShop() *Action {
 
 
 		pf_require_last_name := wrap.R.FormValue("require-last-name")
 
 		pf_require_first_name := wrap.R.FormValue("require-first-name")
 
-		pf_require_second_name := wrap.R.FormValue("require-second-name")
 
+		pf_require_middle_name := wrap.R.FormValue("require-middle-name")
 
 		pf_require_mobile_phone := wrap.R.FormValue("require-mobile-phone")
 
 		pf_require_email_address := wrap.R.FormValue("require-email-address")
 
 		pf_require_delivery := wrap.R.FormValue("require-delivery")
 
@@ -56,8 +56,8 @@ func (this *Modules) RegisterAction_SettingsShop() *Action {
 
 		if pf_require_first_name == "" {
 
 			pf_require_first_name = "0"
 
 		}
 
-		if pf_require_second_name == "" {
 
-			pf_require_second_name = "0"
 
+		if pf_require_middle_name == "" {
 
+			pf_require_middle_name = "0"
 
 		}
 
 		if pf_require_mobile_phone == "" {
 
 			pf_require_mobile_phone = "0"
 
@@ -77,7 +77,7 @@ func (this *Modules) RegisterAction_SettingsShop() *Action {
 
 
 		(*wrap.Config).Shop.Orders.RequiredFields.LastName = utils.StrToInt(pf_require_last_name)
 
 		(*wrap.Config).Shop.Orders.RequiredFields.FirstName = utils.StrToInt(pf_require_first_name)
 
-		(*wrap.Config).Shop.Orders.RequiredFields.SecondName = utils.StrToInt(pf_require_second_name)
 
+		(*wrap.Config).Shop.Orders.RequiredFields.MiddleName = utils.StrToInt(pf_require_middle_name)
 
 		(*wrap.Config).Shop.Orders.RequiredFields.MobilePhone = utils.StrToInt(pf_require_mobile_phone)
 
 		(*wrap.Config).Shop.Orders.RequiredFields.EmailAddress = utils.StrToInt(pf_require_email_address)
 
 		(*wrap.Config).Shop.Orders.RequiredFields.Delivery = utils.StrToInt(pf_require_delivery)

+ 4 - 4
modules/module_shop.go
View File 

@@ -975,7 +975,7 @@ func (this *Modules) RegisterModule_Shop() *Module {
 
 
 							last_name := html.EscapeString((*values)[8])
 
 							first_name := html.EscapeString((*values)[9])
 
-							second_name := html.EscapeString((*values)[10])
 
+							middle_name := html.EscapeString((*values)[10])
 
 
 							phone := html.EscapeString((*values)[1])
 
 							email := html.EscapeString((*values)[12])
 
@@ -989,8 +989,8 @@ func (this *Modules) RegisterModule_Shop() *Module {
 
 							if first_name != "" {
 
 								name += " " + first_name
 
 							}
 
-							if second_name != "" {
 
-								name += " " + second_name
 
+							if middle_name != "" {
 
+								name += " " + middle_name
 
 							}
 
 							name = `<a href="` + link + `">` + order_id + strings.TrimSpace(name) + `</a>`
 
 
@@ -1010,7 +1010,7 @@ func (this *Modules) RegisterModule_Shop() *Module {
 
 						DBField: "client_first_name",
 
 					},
 
 					{
 
-						DBField: "client_second_name",
 
+						DBField: "client_middle_name",
 
 					},
 
 					{
 
 						DBField:     "create_datetime",

+ 6 - 6
modules/module_shop_order.go
View File 

@@ -27,7 +27,7 @@ func (this *Modules) RegisterAction_ShopOrder() *Action {
 
 
 		pf_client_last_name := wrap.R.FormValue("client_last_name")
 
 		pf_client_first_name := wrap.R.FormValue("client_first_name")
 
-		pf_client_second_name := wrap.R.FormValue("client_second_name")
 
+		pf_client_middle_name := wrap.R.FormValue("client_middle_name")
 
 		pf_client_phone := wrap.R.FormValue("client_phone")
 
 		pf_client_email := wrap.R.FormValue("client_email")
 
 		pf_client_delivery_comment := wrap.R.FormValue("client_delivery_comment")
 
@@ -45,9 +45,9 @@ func (this *Modules) RegisterAction_ShopOrder() *Action {
 
 				return
 
 			}
 
 		}
 
-		if (*wrap.Config).Shop.Orders.RequiredFields.SecondName != 0 {
 
-			if strings.TrimSpace(pf_client_second_name) == "" {
 
-				wrap.Write(`{"error": true, "field": "client_second_name", "variable": "ShopOrderEmptySecondName"}`)
 
+		if (*wrap.Config).Shop.Orders.RequiredFields.MiddleName != 0 {
 
+			if strings.TrimSpace(pf_client_middle_name) == "" {
 
+				wrap.Write(`{"error": true, "field": "client_middle_name", "variable": "ShopOrderEmptyMiddleName"}`)
 
 				return
 
 			}
 
 		}
 
@@ -98,7 +98,7 @@ func (this *Modules) RegisterAction_ShopOrder() *Action {
 
 					currency_symbol = ?,
 
 					client_last_name = ?,
 
 					client_first_name = ?,
 
-					client_second_name = ?,
 
+					client_middle_name = ?,
 
 					client_phone = ?,
 
 					client_email = ?,
 
 					client_delivery_comment = ?,
 
@@ -114,7 +114,7 @@ func (this *Modules) RegisterAction_ShopOrder() *Action {
 
 				bdata.Currency.Symbol,
 
 				pf_client_last_name,
 
 				pf_client_first_name,
 
-				pf_client_second_name,
 
+				pf_client_middle_name,
 
 				pf_client_phone,
 
 				pf_client_email,
 
 				pf_client_delivery_comment,

+ 1 - 1
support/migrate/000000015.go
View File 

@@ -18,7 +18,7 @@ func Migrate_000000015(db *sqlw.DB, host string) error {
 
 			currency_symbol varchar(5) NOT NULL COMMENT 'Currency symbol',
 
 			client_last_name varchar(64) NOT NULL COMMENT 'Client last name',
 
 			client_first_name varchar(64) NOT NULL COMMENT 'Client first name',
 
-			client_second_name varchar(64) NOT NULL DEFAULT '' COMMENT 'Client second name',
 
+			client_middle_name varchar(64) NOT NULL DEFAULT '' COMMENT 'Client middle name',
 
 			client_phone varchar(20) NOT NULL DEFAULT '' COMMENT 'Client phone',
 
 			client_email varchar(64) NOT NULL COMMENT 'Client email',
 
 			client_delivery_comment text NOT NULL COMMENT 'Client delivery comment',

+ 1 - 1
support/schema.sql
View File 

@@ -107,7 +107,7 @@ CREATE TABLE shop_orders (
 
 	currency_symbol varchar(5) NOT NULL COMMENT 'Currency symbol',
 
 	client_last_name varchar(64) NOT NULL COMMENT 'Client last name',
 
 	client_first_name varchar(64) NOT NULL COMMENT 'Client first name',
 
-	client_second_name varchar(64) NOT NULL DEFAULT '' COMMENT 'Client second name',
 
+	client_middle_name varchar(64) NOT NULL DEFAULT '' COMMENT 'Client middle name',
 
 	client_phone varchar(20) NOT NULL DEFAULT '' COMMENT 'Client phone',
 
 	client_email varchar(64) NOT NULL COMMENT 'Client email',
 
 	client_delivery_comment text NOT NULL COMMENT 'Client delivery comment',