Browse Source

Front-end shop basket progress

Vova Tkach 5 years ago
parent
commit
b8de127afe

+ 12 - 8
assets/template/scripts_js_file.go

@@ -368,15 +368,19 @@ var VarScriptsJsFile = []byte(`(function(window, $) {
 				return false;
 			},
 			ShopBasketMakeOrder: function(object) {
-				var OrderFormBlock = $('#sys-modal-shop-basket .modal-body .order-form');
-				if(OrderFormBlock.css('display') == 'none') {
-					OrderFormBlock.css('display', 'block');
-					setTimeout(function() { OrderFormBlock.find('input.form-control').first().focus(); }, 500);
-					return;
+				if(ShopBasketObjectIsNotBlocked(object)) {
+					var OrderFormBlock = $('#sys-modal-shop-basket .modal-body .order-form');
+					if(OrderFormBlock.css('display') == 'none') {
+						OrderFormBlock.css('display', 'block');
+						setTimeout(function() { OrderFormBlock.find('input.form-control').first().focus(); }, 500);
+						return;
+					}
+					// Validate
+					// Send form
+					ShopBasketBlockObject(object);
+					console.log('Order action');
+					// ShopBasketUnBlockObject(object);
 				}
-				// Validate
-				// Send form
-				console.log('Order action');
 			},
 		};
 	}(window, $);

+ 8 - 2
assets/template/styles_css_file.go

@@ -346,8 +346,14 @@ footer {
 	display: inline-block;
 }
 
-#sys-modal-shop-basket .data .total span.caption {
-	margin-right: 1rem;
+#sys-modal-shop-basket .data .total span.value {
+	margin-left: 1rem;
+}
+
+#sys-modal-shop-basket .order-form .form-group label {
+	font-weight: 700;
+	margin-top: .45rem;
+	margin-bottom: .45rem;
 }
 
 @media (max-width: 768px) {

+ 12 - 8
hosts/localhost/template/scripts.js

@@ -366,15 +366,19 @@
 				return false;
 			},
 			ShopBasketMakeOrder: function(object) {
-				var OrderFormBlock = $('#sys-modal-shop-basket .modal-body .order-form');
-				if(OrderFormBlock.css('display') == 'none') {
-					OrderFormBlock.css('display', 'block');
-					setTimeout(function() { OrderFormBlock.find('input.form-control').first().focus(); }, 500);
-					return;
+				if(ShopBasketObjectIsNotBlocked(object)) {
+					var OrderFormBlock = $('#sys-modal-shop-basket .modal-body .order-form');
+					if(OrderFormBlock.css('display') == 'none') {
+						OrderFormBlock.css('display', 'block');
+						setTimeout(function() { OrderFormBlock.find('input.form-control').first().focus(); }, 500);
+						return;
+					}
+					// Validate
+					// Send form
+					ShopBasketBlockObject(object);
+					console.log('Order action');
+					// ShopBasketUnBlockObject(object);
 				}
-				// Validate
-				// Send form
-				console.log('Order action');
 			},
 		};
 	}(window, $);

+ 8 - 2
hosts/localhost/template/styles.css

@@ -344,8 +344,14 @@ footer {
 	display: inline-block;
 }
 
-#sys-modal-shop-basket .data .total span.caption {
-	margin-right: 1rem;
+#sys-modal-shop-basket .data .total span.value {
+	margin-left: 1rem;
+}
+
+#sys-modal-shop-basket .order-form .form-group label {
+	font-weight: 700;
+	margin-top: .45rem;
+	margin-bottom: .45rem;
 }
 
 @media (max-width: 768px) {