Browse Source

Template variables for JavaScript

Vova Tkach 5 years ago
parent
commit
a09e6a5136

+ 7 - 9
assets/template/header_html_file.go

@@ -40,13 +40,13 @@ var VarHeaderHtmlFile = []byte(`<!doctype html>
 			var ShopOrderLabelDelivery = 'Delivery';
 			var ShopOrderLabelComment = 'Comment';
 
-			var ShopOrderRequiredLastName = true;
-			var ShopOrderRequiredFirstName = true;
-			var ShopOrderRequiredSecondName = false;
-			var ShopOrderRequiredMobilePhone = false;
-			var ShopOrderRequiredEmailAddress = true;
-			var ShopOrderRequiredDelivery = false;
-			var ShopOrderRequiredComment = false;
+			var ShopOrderRequiredLastName = {{$.Data.ShopOrderRequiredLastName}};
+			var ShopOrderRequiredFirstName = {{$.Data.ShopOrderRequiredFirstName}};
+			var ShopOrderRequiredSecondName = {{$.Data.ShopOrderRequiredSecondName}};
+			var ShopOrderRequiredMobilePhone = {{$.Data.ShopOrderRequiredMobilePhone}};
+			var ShopOrderRequiredEmailAddress = {{$.Data.ShopOrderRequiredEmailAddress}};
+			var ShopOrderRequiredDelivery = {{$.Data.ShopOrderRequiredDelivery}};
+			var ShopOrderRequiredComment = {{$.Data.ShopOrderRequiredComment}};
 
 			var ShopOrderError = 'Error!';
 			var ShopOrderErrorBasketEmpty = 'Your basket is empty';
@@ -58,8 +58,6 @@ var VarHeaderHtmlFile = []byte(`<!doctype html>
 			var ShopOrderEmptyDelivery = 'Please enter delivery comment';
 			var ShopOrderEmptyComment = 'Please enter order comment';
 			var ShopOrderSuccess = '<b>Thank you for your order! We will call you shortly!</b>';
-			// var ShopOrderErrorMobilePhone = 'Mobile phone number is invalid';
-			// var ShopOrderErrorEmailAddress = 'Email address is invalid';
 		</script>
 	</head>
 	<body id="body" class="fixed-top-bar">

+ 28 - 0
engine/fetdata/fetdata.go

@@ -212,3 +212,31 @@ func (this *FERData) ShopBasketProductsCount() int {
 func (this *FERData) ImagePlaceholderHref() string {
 	return utils.GetImagePlaceholderSrc()
 }
+
+func (this *FERData) ShopOrderRequiredLastName() bool {
+	return (*this.wrap.Config).Shop.Orders.RequiredFields.LastName != 0
+}
+
+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) ShopOrderRequiredMobilePhone() bool {
+	return (*this.wrap.Config).Shop.Orders.RequiredFields.MobilePhone != 0
+}
+
+func (this *FERData) ShopOrderRequiredEmailAddress() bool {
+	return (*this.wrap.Config).Shop.Orders.RequiredFields.EmailAddress != 0
+}
+
+func (this *FERData) ShopOrderRequiredDelivery() bool {
+	return (*this.wrap.Config).Shop.Orders.RequiredFields.Delivery != 0
+}
+
+func (this *FERData) ShopOrderRequiredComment() bool {
+	return (*this.wrap.Config).Shop.Orders.RequiredFields.Comment != 0
+}

+ 7 - 9
hosts/localhost/template/header.html

@@ -38,13 +38,13 @@
 			var ShopOrderLabelDelivery = 'Delivery';
 			var ShopOrderLabelComment = 'Comment';
 
-			var ShopOrderRequiredLastName = true;
-			var ShopOrderRequiredFirstName = true;
-			var ShopOrderRequiredSecondName = false;
-			var ShopOrderRequiredMobilePhone = false;
-			var ShopOrderRequiredEmailAddress = true;
-			var ShopOrderRequiredDelivery = false;
-			var ShopOrderRequiredComment = false;
+			var ShopOrderRequiredLastName = {{$.Data.ShopOrderRequiredLastName}};
+			var ShopOrderRequiredFirstName = {{$.Data.ShopOrderRequiredFirstName}};
+			var ShopOrderRequiredSecondName = {{$.Data.ShopOrderRequiredSecondName}};
+			var ShopOrderRequiredMobilePhone = {{$.Data.ShopOrderRequiredMobilePhone}};
+			var ShopOrderRequiredEmailAddress = {{$.Data.ShopOrderRequiredEmailAddress}};
+			var ShopOrderRequiredDelivery = {{$.Data.ShopOrderRequiredDelivery}};
+			var ShopOrderRequiredComment = {{$.Data.ShopOrderRequiredComment}};
 
 			var ShopOrderError = 'Error!';
 			var ShopOrderErrorBasketEmpty = 'Your basket is empty';
@@ -56,8 +56,6 @@
 			var ShopOrderEmptyDelivery = 'Please enter delivery comment';
 			var ShopOrderEmptyComment = 'Please enter order comment';
 			var ShopOrderSuccess = '<b>Thank you for your order! We will call you shortly!</b>';
-			// var ShopOrderErrorMobilePhone = 'Mobile phone number is invalid';
-			// var ShopOrderErrorEmailAddress = 'Email address is invalid';
 		</script>
 	</head>
 	<body id="body" class="fixed-top-bar">