diff --git a/adminPages/AddEmployee.php b/adminPages/AddEmployee.php index 2cd060c..92a7a36 100644 --- a/adminPages/AddEmployee.php +++ b/adminPages/AddEmployee.php @@ -28,7 +28,7 @@ if (isset($_GET['LastName'])){
diff --git a/adminPages/OrdersToFill.php b/adminPages/AllOrders.php similarity index 80% rename from adminPages/OrdersToFill.php rename to adminPages/AllOrders.php index 1906eb9..f21641d 100644 --- a/adminPages/OrdersToFill.php +++ b/adminPages/AllOrders.php @@ -13,10 +13,10 @@ require("../commonFunctions.php");
-

Active orders

+

All orders

query($sql)){} diff --git a/adminPages/Employees.php b/adminPages/Employees.php new file mode 100644 index 0000000..a83510b --- /dev/null +++ b/adminPages/Employees.php @@ -0,0 +1,35 @@ + + + + + + + + +
+ +
+
+ query($sql); + $trArgs = array("onclick=\"window.document.location='ViewEmployee.php?EmployeeID=%EmployeeID%'\"", + array('%EmployeeID%' => 'EmployeeID') + ); + makeTable($result, $trArgs); + ?> +
+ + + + + diff --git a/adminPages/Report_Customers.php b/adminPages/Report_Customers.php deleted file mode 100644 index 89eabdb..0000000 --- a/adminPages/Report_Customers.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - -
- //To do -
- - - - - diff --git a/adminPages/Report_Employees.php b/adminPages/Report_Employees.php deleted file mode 100644 index 89eabdb..0000000 --- a/adminPages/Report_Employees.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - -
- //To do -
- - - - - diff --git a/adminPages/Reports.php b/adminPages/Reports.php index d0c8014..9e0e9f8 100644 --- a/adminPages/Reports.php +++ b/adminPages/Reports.php @@ -16,15 +16,10 @@ require("../commonFunctions.php");
-
- -
-
- -
+
diff --git a/adminPages/ViewEmployee.php b/adminPages/ViewEmployee.php new file mode 100644 index 0000000..c97fe08 --- /dev/null +++ b/adminPages/ViewEmployee.php @@ -0,0 +1,43 @@ + + + + + + + + +
+ query($sql); + makeTable($result); + ?> + +
+ + query($sql); + $row = $result->fetch_assoc(); + if ($row['Photo'] !== null){ + loadPicture($row['Photo'], 40); + } + ?> +
+

Notes:

+

+
+ + + + + diff --git a/adminPages/ViewOrder.php b/adminPages/ViewOrder.php index b235404..1b41d92 100644 --- a/adminPages/ViewOrder.php +++ b/adminPages/ViewOrder.php @@ -11,7 +11,7 @@ $orderID = $_GET['orderID'];
array("Home", ""), "OrdersToFill.php" => array("Active Orders", ""), + "AllOrders.php" => array("All Orders", ""), "EditProducts.php" => array("Search/Edit Products", ""), "EditCategories.php" => array("Edit Categories", ""), "ReviewCustomerDemographics.php" => array("View Customers", ""), @@ -41,11 +42,11 @@ function writeMenuAdm($activePage){ //Menu items given in form (Page, (display name, class args)) $menuItems = array( "Dashboard.php" => array("Home", ""), - "OrdersToFill.php" => array("Active Orders", ""), + "AllOrders.php" => array("All Orders", ""), "EditProducts.php" => array("Search/Edit Products", ""), "EditCategories.php" => array("Edit Categories", ""), "ReviewCustomerDemographics.php" => array("View Customers", ""), - "AddEmployee.php" => array("Add Employee", ""), + "Employees.php" => array("View Employees", ""), "Reports.php" => array("Reports", ""), "logout.php" => array("Log Out", "class='fRight'") ); diff --git a/customerPages/cCreateOrder.php b/customerPages/cCreateOrder.php index 8f67c0d..1580f8a 100644 --- a/customerPages/cCreateOrder.php +++ b/customerPages/cCreateOrder.php @@ -41,15 +41,16 @@ if ($row) {
+

Please add at least one item first!

@@ -251,4 +252,4 @@ if ($row) { -query($sql)) {} + +$row = $result->fetch_assoc(); +if ($row) { + $FirstName = $row['FirstName']; + +} + +//echo "Welcome " . $_SESSION["userName"] . "!"; +?> + + + + + + + +
+

All orders

+
+ query($sql)){} + + + $trArgs = array("onclick=\"window.document.location='ViewOrder.php?orderID=%OrderID%'\"", + array('%OrderID%' => 'OrderID') + ); + makeTable($result, $trArgs); + ?> +
+ + diff --git a/employeePages/OrdersToFill.php b/employeePages/OrdersToFill.php index c4a6b4d..7521542 100644 --- a/employeePages/OrdersToFill.php +++ b/employeePages/OrdersToFill.php @@ -27,7 +27,8 @@ if ($row) {

Active orders

query($sql)){} diff --git a/employeePages/ViewOrder.php b/employeePages/ViewOrder.php index 52bb1e5..104379c 100644 --- a/employeePages/ViewOrder.php +++ b/employeePages/ViewOrder.php @@ -3,7 +3,44 @@ require("../dbCon.php"); require("../commonFunctions.php"); $orderID = $_GET['orderID']; -//echo "Welcome " . $_SESSION["userName"] . "!"; + +if (isset($_GET['Freight'])){ + $sql = "UPDATE ((((orders o LEFT JOIN employees e ON o.EmployeeID = e.EmployeeID) + LEFT JOIN shipments sh ON o.OrderID = sh.OrderID) + LEFT JOIN shipaddresses s ON sh.ShipmentsID = s.ShipAddrID) + LEFT JOIN payment p ON o.orderID = p.orderID) + LEFT JOIN paymenttype pt ON pt.paymenttypeid = p.paymenttypeid + + SET + o.EmployeeID = " . $_SESSION['EmployeeID'] . ", + s.Freight = " . $_GET['Freight'] . ", + s.ShippedDate = NOW() + WHERE o.OrderID = " . $orderID; + $con->query($sql); +} + +$where = " WHERE o.OrderID=" . $orderID . " "; +$sql = "SELECT + o.OrderID as _OrderID, + CONCAT(e.FirstName, ' ', e.LastName) as Employee, + DATE_FORMAT(OrderDate, '%m-%d-%Y') as `Order Date`, DATE_FORMAT(s.RequiredDate, '%m-%d-%Y') as `Required Date`, DATE_FORMAT(ShippedDate, '%m-%d-%Y') as `Shipped Date`, + Freight, ShipName as `Ship To`, + CONCAT(ShipAddress, ', ', ShipCity, '
', ShipRegion, ' ', ShipPostalCode, ', ', ShipCountry) as `Ship Address`, + CONCAT('$', FORMAT(Total,2)) as Total, pt.Name as `Paid Via` + FROM + ((((orders o LEFT JOIN employees e ON o.EmployeeID = e.EmployeeID) + LEFT JOIN shipments sh ON o.OrderID = sh.OrderID) + LEFT JOIN shipaddresses s ON sh.ShipmentsID = s.ShipAddrID) + LEFT JOIN payment p ON o.orderID = p.orderID) + LEFT JOIN paymenttype pt ON pt.paymenttypeid = p.paymenttypeid + " . $where . " ORDER BY OrderDate DESC"; + +$result = $con->query($sql); + +$row = mysqli_fetch_array($result); +$employee = $row['Employee']; +$shippedDate = $row['Shipped Date']; + ?> @@ -13,7 +50,24 @@ $orderID = $_GET['orderID']; + +
+
+

Fill Order

+
+ + + + + + +
+
+