Merge branch 'develop' of https://github.com/untrobotics/website into develop

Author: sebastian-king

merch/product.php

@@ -63,6 +63,11 @@
 	$back_file = $selected_variant->get_file_by_type(PrintfulVariantFilesTypes::BACK);
 
 	head("Buy {$product->get_name()}", true);
+	$category_name = strtolower(preg_replace('@^.*\(([^()]+)\)$@i', '$1', $product->get_name()));
+	if($category_name !== 'gear' && $category_name[-1]!=='s'){
+	$category_name .= 's';
+	}
+
 } else {
 	head("Invalid Product", true);
 }
@@ -98,8 +103,8 @@ function get_variant_variant($variant_name) {
 		width: 100%;
 	}
 	.merch-section h6 {
-	    border-bottom: 1px solid #a7a7a7;
-	    margin-bottom: 5px;
+		border-bottom: 1px solid #a7a7a7;
+		margin-bottom: 5px;
 	}
 	.product-price {
 		color: red;
@@ -125,9 +130,9 @@ function get_variant_variant($variant_name) {
 	}
 	.variant-btn-container {
 		display: block;
-	    height: 50px;
-	    width: 100px;
-	    position: relative;
+		height: 50px;
+		width: 100px;
+		position: relative;
 	}
 	.variant-btn {
 		border: 1px solid #d8d8d8;
@@ -159,9 +164,9 @@ function get_variant_variant($variant_name) {
 			<ul class="list-breadcrumb">
 			  <li><a href="/">Home</a></li>
 			  <li><a href="/merch">Merch</a></li>
-                <?php if ($product_can_be_handled) { ?>
-			  <li><a href="/merch/<?php echo strtolower($catalog_product->get_type_name()).'s'; ?>"><?php echo $catalog_product->get_type_name(); ?>s</a></li>
-                <?php } ?>
+	<?php if ($product_can_be_handled) { ?>
+			  <li><a href="/merch/<?php echo $category_name; ?>"><?php echo $category_name; ?></a></li>
+	<?php } ?>
 			  <li>Product</li>
 			</ul>
 		  </div>
@@ -320,7 +325,7 @@ class="btn variant-btn"
 									//echo $button['btn'];
 									$button = $payment_button->get_button();
 									if ($button->error === false) {
-									    echo "button success";
+										echo "button success";
 										echo $payment_button->get_button()->button;
 									} else {
 										// TODO: Alert

sql/migrations/urw-64.sql

@@ -7,7 +7,4 @@ MODIFY name char(128) NOT NULL;
 ALTER TABLE ftpusers
 MODIFY passwd char(128) NOT NULL;
 
-
-
-
-
+CREATE TABLE ftpinvites (id int primary key auto_increment, email varchar(255), registration_token varchar(16));