diff --git a/about/our-web-team.php b/about/our-web-team.php index 48af02e3..9820b2ff 100644 --- a/about/our-web-team.php +++ b/about/our-web-team.php @@ -4,7 +4,7 @@ head('Our Team', true); $members = array(); $members[] = [ - 'name'=>'Peyton Thibodeaux', + 'name'=>'Peyton Thibodeaux 2', 'title'=>'Webmaster | Team Member', 'description'=>"Peyton is a junior, studying computer science with a minor in mathematics. He's the webmaster for UNT Robotics and in charge of the website that you see in front of you. He enjoys learning and using new technologies and have a passion for creating things.", 'picture_uri'=>'/images/web-team-pics/peyton-thibodeaux.jpg', diff --git a/merch/product.php b/merch/product.php index 17bb7af2..e9494ca2 100644 --- a/merch/product.php +++ b/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) { @@ -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 diff --git a/sql/migrations/urw-64.sql b/sql/migrations/urw-64.sql index 30631c63..91239695 100644 --- a/sql/migrations/urw-64.sql +++ b/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));