diff --git a/chromebook-checkout-meteor/client/admin.js b/chromebook-checkout-meteor/client/admin.js index 77f1f6e..940e0b7 100644 --- a/chromebook-checkout-meteor/client/admin.js +++ b/chromebook-checkout-meteor/client/admin.js @@ -37,8 +37,8 @@ Template.admin.events({ } if(currSerials.length !== 0) { alert("That serial number already exists!"); - $("input[name='aserial']")[0].value = ""; - $("input[name='aserial']").focus(); + $("input[name='aserial']")[0].value = ""; + $("input[name='aserial']").focus(); throw new Error("That serial number already exists!"); } @@ -63,6 +63,14 @@ Template.admin.events({ event.preventDefault(); var cart_number = $("input[name='acnumber']")[0].value; + var currCName = carts.find({ number: cart_number }).fetch() + + if(currCName.length !== 0) { + alert("That cart already exists!"); + $("input[name='acnumber']")[0].value = ""; + $("input[name='acnumber']").focus(); + throw new Error("That cart already exists!"); + } if (!((cart_number === ""))) diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css index c2a8fd5..0d59b32 100644 --- a/chromebook-checkout-meteor/client/tabs.css +++ b/chromebook-checkout-meteor/client/tabs.css @@ -8,20 +8,27 @@ font-weight: 600; font-size: 13px; float: left; - padding: 13px 23.18%; - margin: 0; + padding: 13px 23.24%; + border-bottom: 5px solid #ddd; list-style: none; cursor: pointer; margin-bottom:3%; + transition: background-color 0.4s; + transition: border-bottom 0.4s } .tab-item.active { - border-radius: top 5px; - border: 1px solid #ddd; - border-bottom: none; + border-bottom: 5px solid #E14C2B; margin-bottom: -1px !important; - padding: 13px 23.15% 14px 23.15% !important; + box-shadow: inset 1px 1px 1px #ddd; + background-color: #fff; +} +.tab-item:hover { + background-color: rgba(212, 212, 212, .7); + border-bottom: 5px solid rgba(225, 76, 43, .5); +} +.tab-item.active:hover { + border-bottom: 5px solid #E14C2B; background-color: #fff; - color: #333; } .tabs-content-container { padding: 4.2% 15px 15px 15px;