diff --git a/admin/assets/js/dashboard-chart.js b/admin/assets/js/dashboard-chart.js index 8a66047..793d5f5 100644 --- a/admin/assets/js/dashboard-chart.js +++ b/admin/assets/js/dashboard-chart.js @@ -11,7 +11,7 @@ $(document).ready(function() { const completedOrdersCount = countCompletedOrders(responseData); const toPayOrdersCount = countToPayOrders(responseData); const toShipOrdersCount = countToShipOrders(responseData); - const returnedOrdersCount = countReturnedpOrders(responseData); + const returnedOrdersCount = countReturnedOrders(responseData); initializeChart(completedOrdersCount, toPayOrdersCount, toShipOrdersCount, returnedOrdersCount); }) .catch(function (error) { @@ -24,50 +24,65 @@ $(document).ready(function() { } - function countCompletedOrders(data) { - let completedOrdersCount = 0; - data.forEach(function(order) { + function getCurrentMonthData(data) { + const now = new Date(); + const currentMonth = now.getMonth(); + const currentYear = now.getFullYear(); + + return data.filter(order => { + const orderDate = new Date(order.order_date); + return orderDate.getMonth() === currentMonth && orderDate.getFullYear() === currentYear; + }); + } + + function countCompletedOrders(data) { + const filteredData = getCurrentMonthData(data); + let completedOrdersCount = 0; + filteredData.forEach(function(order) { if (order.status === 'COMPLETED') { - completedOrdersCount++; + completedOrdersCount++; } - }); - console.log(completedOrdersCount) - return completedOrdersCount; - } - - - function countToPayOrders(data) { - let toPayOrdersCount = 0; - data.forEach(function(order) { + }); + console.log(completedOrdersCount); + return completedOrdersCount; + } + + function countToPayOrders(data) { + const filteredData = getCurrentMonthData(data); + let toPayOrdersCount = 0; + filteredData.forEach(function(order) { if (order.status === 'TO PAY') { - toPayOrdersCount++; + toPayOrdersCount++; } - }); - console.log(toPayOrdersCount) - return toPayOrdersCount; - } - - - function countToShipOrders(data) { - let toShipOrdersCount = 0; - data.forEach(function(order) { + }); + console.log(toPayOrdersCount); + return toPayOrdersCount; + } + + function countToShipOrders(data) { + const filteredData = getCurrentMonthData(data); + let toShipOrdersCount = 0; + filteredData.forEach(function(order) { if (order.status === 'TO SHIP') { - toShipOrdersCount++; + toShipOrdersCount++; } - }); - console.log(toShipOrdersCount) - return toShipOrdersCount; - } - function countReturnedpOrders(data) { - let returnedOrdersCount = 0; - data.forEach(function(order) { + }); + console.log(toShipOrdersCount); + return toShipOrdersCount; + } + + function countReturnedOrders(data) { + const filteredData = getCurrentMonthData(data); + let returnedOrdersCount = 0; + filteredData.forEach(function(order) { if (order.status === 'RETURNED') { - returnedOrdersCount++; + returnedOrdersCount++; } - }); - console.log(returnedOrdersCount) - return returnedOrdersCount; - } + }); + console.log(returnedOrdersCount); + return returnedOrdersCount; + } + function initializeChart(completedOrdersCount , toPayOrdersCount, toShipOrdersCount, returnedOrdersCount) { var doughnut = document.getElementById("doughnut-chart"); @@ -115,43 +130,248 @@ $(document).ready(function() { } } + + + var acquisition = document.getElementById("salesChart"); + if (acquisition !== null) { + function updateDailyLabels() { + var labelsDaily = []; + for (let i = 6; i >= 0; i--) { + var date = new Date(); + date.setDate(date.getDate() - i); + labelsDaily.push(formatDate(date)); + } + return labelsDaily; + } + + function formatDate(date) { + const options = { day: 'numeric', month: 'short' }; // E.g., 26 Apr + return date.toLocaleDateString('en-US', options); + } + + // Updating labelsDaily dynamically + var labelsDaily = updateDailyLabels(); + var labelsMonthly = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; + var labelsYearly = ["2021", "2022", "2023", "2024", "2025"]; + var acqData = [ + { //daily data + first: [91, 180, 44, 75, 150, 66, 70], //COD + second: [300, 44, 177, 76, 23, 189, 12], //ObPay + third: [44, 167, 102, 123, 183, 88, 134] //Paymongo + }, + { //monthly data + first: [144, 44, 110, 5, 123, 89, 12], //COD + second: [22, 123, 45, 130, 112, 54, 181], //ObPay + third: [55, 44, 144, 75, 155, 166, 70] //Paymongo + }, + { //yearly data + first: [134, 80, 123, 65, 171, 33, 22], //COD + second: [44, 144, 77, 76, 123, 89, 112], //ObPay + third: [156, 23, 165, 88, 112, 54, 181] //Paymongo + } + ]; + + var configAcq = { + // The type of chart we want to create + type: "line", + + // The data for our dataset + data: { + // labels: [ + // "4 Jan", + // "5 Jan", + // "6 Jan", + // "7 Jan", + // "8 Jan", + // "9 Jan", + // "10 Jan" + // ], + datasets: [ + { + label: "Cash on Delivery", + backgroundColor: "rgba(52, 116, 212, .2)", + borderColor: "rgba(52, 116, 212, .7)", + data: acqData[0].first, + lineTension: 0.3, + pointBackgroundColor: "rgba(52, 116, 212,0)", + pointHoverBackgroundColor: "rgba(52, 116, 212,1)", + pointHoverRadius: 3, + pointHitRadius: 30, + pointBorderWidth: 2, + pointStyle: "rectRounded" + }, + { + label: "ObananaPay", + backgroundColor: "rgba(255, 192, 203, .3)", + borderColor: "rgba(255, 192, 203, .7)", + data: acqData[0].second, + lineTension: 0.3, + pointBackgroundColor: "rgba(255, 192, 203, 0)", + pointHoverBackgroundColor: "rgba(255, 192, 203, 1)", + pointHoverRadius: 3, + pointHitRadius: 30, + pointBorderWidth: 2, + pointStyle: "rectRounded" + }, + { + label: "Paymongo", + backgroundColor: "rgb(178, 251, 212, .3)", + borderColor: "rgba(178, 251, 212, .7)", + data: acqData[0].third, + lineTension: 0.3, + pointBackgroundColor: "rgba(178, 251, 212, 0)", + pointHoverBackgroundColor: "rgba(178, 251, 212, 1)", + pointHoverRadius: 3, + pointHitRadius: 30, + pointBorderWidth: 2, + pointStyle: "rectRounded" + } + ] + }, + + // Configuration options go here + options: { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false + }, + scales: { + xAxes: [ + { + gridLines: { + display: false + } + } + ], + yAxes: [ + { + gridLines: { + display: true, + color: "#eee", + zeroLineColor: "#eee" + }, + ticks: { + beginAtZero: true, + stepSize: 100, + max: 1000 + } + } + ] + }, + tooltips: { + mode: "index", + titleFontColor: "#888", + bodyFontColor: "#555", + titleFontSize: 12, + bodyFontSize: 15, + backgroundColor: "rgba(256,256,256,0.95)", + displayColors: true, + xPadding: 20, + yPadding: 10, + borderColor: "rgba(220, 220, 220, 0.9)", + borderWidth: 2, + caretSize: 10, + caretPadding: 15 + } + } + }; + + var ctx = document.getElementById("salesChart").getContext("2d"); + var lineAcq = new Chart(ctx, configAcq); + document.getElementById("acqLegend").innerHTML = lineAcq.generateLegend(); + + var items = document.querySelectorAll( + "#user-acquisition .nav-tabs .nav-item" + ); + items.forEach(function (item, index) { + item.addEventListener("click", function() { + // Determine which tab was clicked + var selectedTab = this.textContent.trim(); + + // Choose data and labels based on the selected tab + switch (selectedTab) { + case "Daily": + configAcq.data.labels = labelsDaily; + configAcq.data.datasets[0].data = acqData[0].first; + configAcq.data.datasets[1].data = acqData[0].second; + configAcq.data.datasets[2].data = acqData[0].third; + break; + case "Monthly": + configAcq.data.labels = labelsMonthly; + configAcq.data.datasets[0].data = acqData[1].first; + configAcq.data.datasets[1].data = acqData[1].second; + configAcq.data.datasets[2].data = acqData[1].third; + break; + case "Yearly": + configAcq.data.labels = labelsYearly; + configAcq.data.datasets[0].data = acqData[2].first; + configAcq.data.datasets[1].data = acqData[2].second; + configAcq.data.datasets[2].data = acqData[2].third; + break; + } + + lineAcq.update(); + }); +}); + items[0].click(); + } + function convertToCSV(data) { - const columnTitles = ['ORDER ID', 'STATUS', 'BUYER NAME', 'TOTAL AMOUNT', 'ORDER DATE', - 'ORDER TIME', 'PRODUCT NAME','PRICE', 'QUANTITY', - 'VENDOR ID', 'VENDOR NAME',]; - const header = columnTitles.join(',') + '\n'; - const body = data.map(order => { - const orderDate = new Date(order.order_date).toLocaleDateString('en-US'); - const orderTime = new Date(order.order_date).toLocaleTimeString('en-US'); - const productName = order.items.length > 0 ? `"${order.items[0].product.name}"` : ''; - return [ - order._id, - order.status, - order.customer[0]?.name, - order.total_amount, - orderDate, - orderTime, - productName, - order.items[0]?.price, - order.items[0]?.quantity, - order.items[0]?.vendor_id, - order.items[0]?.vendor_name - ].join(','); - }).join('\n'); - return header + body; - } - function downloadCSV(filename) { - const csv = convertToCSV(responseData); - const blob = new Blob([csv], { type: 'text/csv' }); - const url = window.URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; - a.download = filename; - document.body.appendChild(a); - a.click(); - document.body.removeChild(a); - window.URL.revokeObjectURL(url); - } + const now = new Date(); + const currentMonth = now.getMonth(); // Months are 0-indexed (0 for January, 11 for December) + const currentYear = now.getFullYear(); + + const filteredData = data.filter(order => { + const orderDate = new Date(order.order_date); + return orderDate.getMonth() === currentMonth && orderDate.getFullYear() === currentYear; + }); + + const columnTitles = [ + 'ORDER ID', 'STATUS', 'BUYER NAME', 'TOTAL AMOUNT', 'METHOD', 'ORDER DATE', + 'ORDER TIME', 'PRODUCT NAME', 'PRICE', 'QUANTITY', 'VENDOR ID', 'VENDOR NAME' + ]; + const header = columnTitles.join(',') + '\n'; + const body = filteredData.map(order => { + const orderDate = new Date(order.order_date).toLocaleDateString('en-US'); + const orderTime = new Date(order.order_date).toLocaleTimeString('en-US'); + const productName = order.items.length > 0 ? `"${order.items[0].product.name}"` : ''; + return [ + order._id, + order.status, + order.customer[0]?.name, + order.total_amount, + order.payment_method, + orderDate, + orderTime, + productName, + order.items[0]?.price, + order.items[0]?.quantity, + order.items[0]?.vendor_id, + order.items[0]?.vendor_name + ].join(','); + }).join('\n'); + return header + body; + } + + function downloadCSV() { + const now = new Date(); + const months = ["January", "February", "March", "April", "May", "June", + "July", "August", "September", "October", "November", "December"]; + const currentMonthName = months[now.getMonth()]; + const filename = `${currentMonthName}_orders_overview.csv`; + + const csv = convertToCSV(responseData); // Ensure responseData is up to date + const blob = new Blob([csv], { type: 'text/csv' }); + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = filename; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); + window.URL.revokeObjectURL(url); + } $('#download-btn').on('click', function(event) { event.preventDefault(); diff --git a/admin/index.php b/admin/index.php index 1da4c50..4811983 100644 --- a/admin/index.php +++ b/admin/index.php @@ -14,8 +14,15 @@ if($_SESSION["user_type"]!="admin"){ header("location: login.php?alert=Only admins allowed here!"); } -$all_orders = getAllOrder(); date_default_timezone_set('Asia/Manila'); +$currentDate = date('m-d-Y'); + +$all_orders = getAllOrder(); +$all_customers = getAllCustomers(); +$all_vendors = getAllVendors(); + +$allSignups = array_merge($all_customers, $all_vendors); + ?> @@ -107,7 +114,7 @@ date_default_timezone_set('Asia/Manila');
  • - + My Profile
    • @@ -707,8 +714,19 @@ date_default_timezone_set('Asia/Manila');
    -

    1,503

    -

    Daily Signups

    + +

    + +

    Today's Signups

    @@ -716,9 +734,17 @@ date_default_timezone_set('Asia/Manila');
    -

    79,503

    -

    Daily Visitors

    - + +

    + +

    Total Users

    +
    @@ -726,18 +752,19 @@ date_default_timezone_set('Asia/Manila');
    $val) { + foreach (array_reverse($all_orders) as $x => $val) { $paymentStatus = strtolower($val['payment']['status']); - + $returnStatus = strtolower($val['return_order']['status']); + $orderStatus = strtolower($val['status']); $formattedOrderDate = date('m-d-Y', strtotime($val['order_date'])); if ($formattedOrderDate == $currentDate) { $orderCount++; - if($paymentStatus == "paid"){ - $dailyRevenue += $val['total_amount']; + if($paymentStatus == "paid" && (!$returnStatus || $orderStatus != "returned" )){ + $dailyRevenue += $val['total_amount']; } // Increment order count for each order on the current date } } @@ -745,7 +772,7 @@ date_default_timezone_set('Asia/Manila'); $finalDailyRevenue = number_format($dailyRevenue, 2, '.', ','); ?>

    -

    Today's Order

    +

    Today's Orders

    @@ -766,7 +793,6 @@ date_default_timezone_set('Asia/Manila');
    -

    Sales Report

    @@ -774,7 +800,7 @@ date_default_timezone_set('Asia/Manila'); role="tablist">
  • Today's + aria-selected="true">Daily
  • - +
    @@ -807,7 +833,7 @@ date_default_timezone_set('Asia/Manila');
    • Download overall report + class="mdi mdi-download mr-2"> Download Current Month's Overall Report
    @@ -1023,26 +1049,31 @@ date_default_timezone_set('Asia/Manila'); style="width:100%"> - Order ID + Payment Method Customer Name Vendor Name Total Amount Order Date Status - + Return Status $val) { $paymentStatus = strtolower($val['payment']['status']); $formattedOrderDate = date('m-d-Y', strtotime($val['order_date'])); - $orderId = $val['_id']; + $paymentMethod = $val['payment_method']; $customerName = $val['customer'][0]['name']; $vendorName = $val['items'][0]['vendor_name']; $totalAmount = $val['total_amount']; $orderStatus = strtoupper($val['status']); + $returnStatus = strtoupper($val['return_order']['status']); + + $statusClass = ''; if ($orderStatus === 'UNPAID' || $orderStatus === 'RETURNED') { @@ -1059,23 +1090,34 @@ date_default_timezone_set('Asia/Manila'); } if ($formattedOrderDate == $currentDate) { + $ordersDisplayed = true; + $displayDate = date('m-d-Y, g:i A', strtotime($val['order_date'])); ?> - + - + ₱ + = 8) { - break; - } + $iterationCount++; + if ($iterationCount >= 8) { + break; } + } + } + + if (!$ordersDisplayed) { + ?> + + No Recent Orders Yet. + + @@ -1086,12 +1128,16 @@ date_default_timezone_set('Asia/Manila');
    -
    +
    +

    New Customers

    -
    +
    From to
    +
    + $val) { + $formattedSignupDate = date('m-d-Y', strtotime($val['createdAt'])); + $imageUrl = $val['customer_image']; + $fullName = $val['first_name'] . ' ' . $val['last_name']; + $email = $val['user_email']; + if ($formattedSignupDate >= $weekAgoDate && $formattedSignupDate <= $currentDate) { + $customersDisplayed = true; + + ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + = 8) { + break; + } + } + } + if (!$customersDisplayed) { + ?> + + + +
    - customer image + customer image
    - -
    Selena - Wagner
    -     - @selena.oi +
    +
    		2 Orders$150
    -
    -
    - customer image -
    -
    - -
    Walter - Reuter
    -     - @walter.me -
    -
    -     		5 Orders$200
    -
    -
    - customer image -
    -
    - -
    Larissa - Gebhardt
    -     - @larissa.gb -
    -
    -     		1 Order$50
    -
    -
    - customer image -
    -
    - -
    Albrecht - Straub
    -     - @albrech.as -
    -
    -     		2 Orders$100
    -
    -
    - customer image -
    -
    - -
    Leopold - Ebert
    -     - @leopold.et -
    -
    -     		1 Order$60
    -
    -
    - customer image -
    -
    - -
    Larissa - Gebhardt
    -     - @larissa.gb -
    -
    -     		1 Order$50
    No new customers in the past week
    -
    - -
    -
    -

    Top Products

    -
    - +
    + +
    +
    + +

    New Vendors

    +
    From to
    +
    -
    -
    -
    - customer image -
    -
    - -
    Baby cotton shoes
    -     -

    58Sales

    -

    Statement belting with double-turnlock hardware - adds “swagger” to a simple.

    -

    - $520 - $580 -

    -
    -
    -
    -
    - customer image -
    -
    - -
    Hoodies for men
    -     -

    20Sales

    -

    Statement belting with double-turnlock hardware - adds “swagger” to a simple.

    -

    - $250 - $300 -

    -
    -
    -
    -
    - customer image -
    -
    - -
    Long slive t-shirt
    -     -

    10Sales

    -

    Statement belting with double-turnlock hardware - adds “swagger” to a simple.

    -

    - $480 - $654 -

    -
    -
    +
    + + + $val) { + $formattedSignupDate = date('m-d-Y', strtotime($val['createdAt'])); + $imageUrl = $val['vendor_image']; + $shopName = $val['user_login']; + $fullName = $val['first_name'] . ' ' . $val['last_name']; + $email = $val['user_email']; + if ($formattedSignupDate >= $weekAgoDate && $formattedSignupDate <= $currentDate) { + $vendorsDisplayed = true; + ?> + + + + + = 8) { + break; + } + } + } + + if (!$vendorsDisplayed) { + ?> + + + + + +
    +
    +
    + customer image +
    +
    +
    + || + +
    +
    +
    No new vendors in the past week
    @@ -1333,7 +1298,7 @@ date_default_timezone_set('Asia/Manila');

    Copyright © Ekka Admin Dashboard. All Rights Reserved. -

    +

    diff --git a/admin/order-history.php b/admin/order-history.php index 1fcec6e..d786135 100644 --- a/admin/order-history.php +++ b/admin/order-history.php @@ -14,7 +14,7 @@ if ($_SESSION["user_type"] != "admin") { header("location: login.php?alert=Only admins allowed here!"); } $orders = getAllOrder(); -$allorders = json_encode($orders, true); +// $allorders = json_encode($orders, true); ?> @@ -24,9 +24,9 @@ $allorders = json_encode($orders, true); - + - Ekka - Admin Dashboard HTML Template. + oBanana B2B - Admin Dashboard @@ -82,7 +82,8 @@ $allorders = json_encode($orders, true); - + + @@ -102,6 +103,7 @@ $allorders = json_encode($orders, true); ?> + diff --git a/functions.php b/functions.php index d8bd171..9ff8b31 100644 --- a/functions.php +++ b/functions.php @@ -2010,3 +2010,48 @@ function updatePayout($token, $payoutId) return $response; } +function getAllCustomers () +{ + $curl = curl_init(); + curl_setopt_array($curl, array( + CURLOPT_URL => "https://" . $_SESSION["data_endpoint"] . "/api/v1/customers", + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 0, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_HTTPHEADER => array( + 'X-Api-Key: {{apiKey}}' + ), + )); + $response = curl_exec($curl); + curl_close($curl); + $json = json_decode($response, true); + + return $json; +} + +function getAllVendors () +{ + $curl = curl_init(); + curl_setopt_array($curl, array( + CURLOPT_URL => "https://" . $_SESSION["data_endpoint"] . "/api/v1/vendors", + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 0, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_HTTPHEADER => array( + 'X-Api-Key: {{apiKey}}' + ), + )); + $response = curl_exec($curl); + curl_close($curl); + $json = json_decode($response, true); + + return $json; +} \ No newline at end of file diff --git a/register.php b/register.php index e09d9cb..3acd4e0 100644 --- a/register.php +++ b/register.php @@ -112,9 +112,6 @@ $_SESSION["isVendor"] = false;

    I accept this Terms & Conditions and Privacy Policy

    - diff --git a/vendor-all-product-list.php b/vendor-all-product-list.php index 889b1d4..147174b 100644 --- a/vendor-all-product-list.php +++ b/vendor-all-product-list.php @@ -19,6 +19,11 @@ if ($_SESSION["userId"] <> "") { $_SESSION["isLoggedIn"] = false; header("location: login.php"); } + +if ($_SESSION["isCustomer"] == true) { + header("location: user-profile.php"); +} + $products = productList(); ?>
    DateUpdated DateOrder Date Customer Vendor Product