From 31f38da140b6109ab3b5f647f0e70a9cd699d098 Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 17 Apr 2024 10:45:14 +0800 Subject: [PATCH 01/16] fixed routing issue in forgot_password --- login_action.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/login_action.php b/login_action.php index adb9c4e..46ae719 100644 --- a/login_action.php +++ b/login_action.php @@ -19,7 +19,13 @@ if ($result > 0) { $_SESSION["isVendor"] = true; } - header("location: $url"); + + if ($url == "/forgot_password.php" || $url == "/forget_otp.php") + { + header("location: index.php"); + }else { + header("location: $url"); + } } else { // $_SESSION["loginError"] = "Invalid email or password. Please try again."; header("location: login.php?error=1"); From 096cc84506268b9ee5053b988ab275aeb151297b Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 17 Apr 2024 11:00:04 +0800 Subject: [PATCH 02/16] added renewToken script on vendor_payouts --- vendor-payouts.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/vendor-payouts.php b/vendor-payouts.php index fad7345..b9af224 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -84,6 +84,24 @@ $vendorPayoutData = json_decode($response, true); + + From 2ab77fe7495fd578fd295dd615f11835b7663c7c Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 17 Apr 2024 17:07:27 +0800 Subject: [PATCH 03/16] Added formatting for transaction_date and proper label for modal box --- vendor-payouts.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index b9af224..4ecb0b4 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -338,7 +338,7 @@ $vendorPayoutData = json_decode($response, true);
- +
@@ -629,12 +629,19 @@ $vendorPayoutData = json_decode($response, true); { var paymentType = log.Type; - var transDate = log?.Transaction_date; + var transDate = new Date(log?.Transaction_date).toLocaleString('en-US', { + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: 'numeric', + minute: '2-digit', + hour12: true + }); var transGrossAmount = log?.Gross_Amount; var transFee = log.Fee; var transNetAmount = log?.Net_Amount; var transDesc = log.Description; - + // Append HTML for current transaction log to the transactionLogsHtml string transactionLogsHtml += ` From 04903b33eda03a5a79e84dbd4e5c6736152ad5fb Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 17 Apr 2024 18:36:04 +0800 Subject: [PATCH 04/16] minor changes on upcoming payout amount computation --- vendor-payouts.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 4ecb0b4..52cafaf 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -185,9 +185,9 @@ $vendorPayoutData = json_decode($response, true); foreach ($upcomingPayout as $x => $val) { $paymentStatus = strtolower($val['payment']['status']); - $orderStatus = $val['status']; + $orderStatus = strtolower($val['status']); $payoutStatus = empty($val['payout_status']); - if(( $paymentStatus == "paid") && ( $orderStatus == "COMPLETED") && ($payoutStatus == true)){ + if(( $paymentStatus == "paid") && ( $orderStatus == "completed") && ($payoutStatus == true)){ $orderAmount = $val['total_amount']; $payoutSum += $orderAmount; } @@ -219,7 +219,7 @@ $vendorPayoutData = json_decode($response, true);
-
+ +
-
Receipient: Philippine National Bank (PNB) Account ending in
- + -->
Payout History
From 3d9d52dfcc3400d17a04f4b03e409e295e25d873 Mon Sep 17 00:00:00 2001 From: jouls Date: Thu, 18 Apr 2024 18:03:20 +0800 Subject: [PATCH 05/16] Added recent orders, daily orders, daily revenue --- admin/index.php | 228 ++++++++++++++++-------------------------------- 1 file changed, 77 insertions(+), 151 deletions(-) diff --git a/admin/index.php b/admin/index.php index 21284dc..5c7fab5 100644 --- a/admin/index.php +++ b/admin/index.php @@ -13,6 +13,10 @@ if ($_SESSION["userId"] <> "") { if($_SESSION["user_type"]!="admin"){ header("location: login.php?alert=Only admins allowed here!"); } + +$all_orders = getAllOrder(); + +$num_orders = count($all_orders); ?> @@ -719,8 +723,27 @@ if($_SESSION["user_type"]!="admin"){
-

15,503

-

Daily Order

+ $val) { + $paymentStatus = strtolower($val['payment']['status']); + + $formattedOrderDate = date('m-d-Y', strtotime($val['order_date'])); + if ($formattedOrderDate == $currentDate) { + $orderCount++; + if($paymentStatus == "paid"){ + $dailyRevenue += $val['total_amount']; + } // Increment order count for each order on the current date + } + } + + $finalDailyRevenue = number_format($dailyRevenue, 2, '.', ','); + ?> +

+

Today's Order

@@ -728,9 +751,9 @@ if($_SESSION["user_type"]!="admin"){
-

$98,503

-

Daily Revenue

- +

₱

+

Today's Revenue

+
@@ -741,6 +764,7 @@ if($_SESSION["user_type"]!="admin"){
+

Sales Report

@@ -995,9 +1019,6 @@ if($_SESSION["user_type"]!="admin"){

Recent Orders

-
- -
- - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + $val) { + date_default_timezone_set('Asia/Manila'); + $paymentStatus = strtolower($val['payment']['status']); + $formattedOrderDate = date('m-d-Y', strtotime($val['order_date'])); + $orderId = $val['_id']; + $customerName = $val['customer'][0]['name']; + $vendorName = $val['items'][0]['vendor_name']; + $totalAmount = $val['total_amount']; + $orderStatus = strtoupper($val['status']); + + $statusClass = ''; + if ($orderStatus === 'UNPAID') { + $statusClass = '#cb3747'; + } elseif ($orderStatus === 'TO PAY') { + $statusClass = '#4a90e2'; + } elseif ($orderStatus === 'TO SHIP') { + $statusClass = '#ffcc66'; + } + elseif ($orderStatus === 'TO RECEIVE') { + $statusClass = '#ffc319'; + } elseif ($orderStatus === 'COMPLETED') { + $statusClass = '#56ba5a'; + } + + if ($formattedOrderDate == $currentDate) { + $displayDate = date('m-d-Y, g:i A', strtotime($val['order_date'])); + ?> + + + + + + + + + +
Order IDProduct NameUnitsCustomer NameVendor NameTotal Amount Order DateOrder Cost Status
24541 - Coach Swagger - 1 UnitOct 20, 2018$230 - Completed - -
- - -
-
24541 - Toddler Shoes, Gucci Watch - 2 UnitsNov 15, 2018$550 - Delayed - -
- - -
-
24541 - Hat Black Suits - 1 UnitNov 18, 2018$325 - On Hold - -
- - -
-
24541 - Backpack Gents, Swimming Cap Slin - 5 UnitsDec 13, 2018$200 - Completed - -
- - -
-
24541 - Speed 500 Ignite - 1 UnitDec 23, 2018$150 - Cancelled - -
- - -
-
From d1bf1a639556ee866607a6c51bc151144b7822bc Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 19 Apr 2024 08:53:13 +0800 Subject: [PATCH 06/16] fixed admin-payments table amount and formatted date --- admin/vendor-profile.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php index 11acc9f..7769b04 100644 --- a/admin/vendor-profile.php +++ b/admin/vendor-profile.php @@ -83,7 +83,7 @@ if (isset($_SESSION["token"])) { // $token = loginRenew($_SESSION["email"], $_SESSION["password"], $token); // $_SESSION["token"] = $token; - +date_default_timezone_set('Asia/Manila'); ?> @@ -288,7 +288,7 @@ if (isset($_SESSION["token"])) {
- +
@@ -312,12 +312,13 @@ if (isset($_SESSION["token"])) { if ($orderItems['payment']['status'] === 'PAID') { foreach ($orderItems['items'] as $item) { + $displayDate = date('m-d-Y, g:i A', strtotime($orderItems['updatedAt'])); $isPayoutCompleted = !empty($orderItems['payout_status']); ?> - + @@ -327,7 +328,7 @@ if (isset($_SESSION["token"])) { - +
>
From c95015152d99cef829ad2502eda44fbb1051c035 Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 19 Apr 2024 11:19:48 +0800 Subject: [PATCH 07/16] Improved payouts tab --- admin/index.php | 2 +- vendor-payouts.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/index.php b/admin/index.php index 5c7fab5..6d7fb63 100644 --- a/admin/index.php +++ b/admin/index.php @@ -101,7 +101,7 @@ $num_orders = count($all_orders);
  • User Image
    - John Deo john.example@gmail.com + John Deo
  • diff --git a/vendor-payouts.php b/vendor-payouts.php index 52cafaf..3e1ea11 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -169,7 +169,7 @@ $vendorPayoutData = json_decode($response, true);
    -
    +
    Upcoming Payout
    @@ -219,6 +219,7 @@ $vendorPayoutData = json_decode($response, true);
    + -
    '; echo ''; + echo '" id="qty-input" oninput="handleInput()" />'; echo '
    +
    '; echo '
    '; echo ''; @@ -504,7 +505,7 @@ if (isset($_GET['id'])) { echo '
    -
    '; echo ''; + echo '" id="qty-input" oninput="handleInput()" />'; echo '
    +
    '; // echo '
    '; echo '
    '; @@ -626,12 +627,120 @@ if (isset($_GET['id'])) {
    -->
    +
    @@ -308,6 +312,7 @@ if ($_SESSION["userId"] <> "") {
    +
    @@ -428,19 +433,30 @@ if ($_SESSION["userId"] <> "") {
    - + + + Unit Price:
    Subtotal:
    -
    -
    -
    - -
    +
    +
    +
    - +
    + +
    + +
    - + + +
    diff --git a/product-left-sidebar.php b/product-left-sidebar.php index 2849855..996e769 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -490,25 +490,31 @@ if (isset($_GET['id'])) { $product_price = (!empty($product_details['sale_price'])) ? $product_details['sale_price'] : $product_details['regular_price'] ; if ($_SESSION["isLoggedIn"]) { if ($product_details['product_type'] === "variable") { - echo '
    -
    '; + echo '
    -
    '; echo ''; - echo '
    +
    '; - echo '
    '; + echo '" id="qty-input" />'; + echo '
    +
    '; + echo '
    '; echo ''; echo '
    '; } else { if (!empty($product_details['regular_price']) || !empty($product_details['sale_price'])) { - echo '
    -
    '; + echo '
    -
    '; echo ''; - echo '
    +
    '; - // echo '
    '; - echo '
    '; + echo '" id="qty-input" />'; + echo '
    +
    '; + echo '
    '; echo '
    '; @@ -518,7 +524,8 @@ if (isset($_GET['id'])) { } } else { echo ''; + echo '
    '; } ?> -
    -
    -
    - -
    +
    - -
    - -
    - `; + + product + +
    + ${response.items[0].product.name} + + Unit Price: ${response.items[0].price} + + Subtotal: ${totalAmount} + +
    +
    -
    + +
    +
    + + +
    + +
    + `; getLatestOrders() updateCartItemCount() cartList.appendChild(newOrder); @@ -1166,23 +1177,29 @@ if (isset($_GET['id'])) { var totalAmount = response.items[0].price * updatedQuantity; // If the cart item already exists, update its content using innerHTML cartItem.innerHTML = ` - - product - -
    - ${response.items[0].product.name} - - Unit Price: ${response.items[0].price} - - Subtotal: ${totalAmount} -
    -
    -
    - -
    +
    -
    - x -
    - `; + + product + +
    + ${response.items[0].product.name} + + Unit Price: ${response.items[0].price} + + Subtotal: ${totalAmount} + +
    +
    -
    + +
    +
    + + +
    + +
    + `; document.getElementById(`qty-input-${response.items[0]._id}`).value = updatedQuantity; } else { // If the cart item doesn't exist, create a new one From 95d2332aa2cfb7472399fd1f955507dd3a25fc77 Mon Sep 17 00:00:00 2001 From: gelonspr Date: Tue, 23 Apr 2024 09:34:12 +0800 Subject: [PATCH 16/16] fixed vendor-payments and added doughnut chart for admin dashboard --- admin/assets/js/dashboard-chart.js | 160 +++++++++++++++++++++++++++++ admin/index.php | 17 ++- vendor-payments.php | 10 +- 3 files changed, 173 insertions(+), 14 deletions(-) create mode 100644 admin/assets/js/dashboard-chart.js diff --git a/admin/assets/js/dashboard-chart.js b/admin/assets/js/dashboard-chart.js new file mode 100644 index 0000000..8a66047 --- /dev/null +++ b/admin/assets/js/dashboard-chart.js @@ -0,0 +1,160 @@ +$(document).ready(function() { + "use strict"; + + let responseData; + + function fetchDataAndInitializeChart() { + fetchData() + .then(function (response) { + responseData = response.data; + console.log(responseData); + const completedOrdersCount = countCompletedOrders(responseData); + const toPayOrdersCount = countToPayOrders(responseData); + const toShipOrdersCount = countToShipOrders(responseData); + const returnedOrdersCount = countReturnedpOrders(responseData); + initializeChart(completedOrdersCount, toPayOrdersCount, toShipOrdersCount, returnedOrdersCount); + }) + .catch(function (error) { + console.error('Error fetching data:', error); + }); + } + fetchDataAndInitializeChart(); + function fetchData() { + return axios.get('https://api.obanana.shop/api/v1/orders/'); + } + + + function countCompletedOrders(data) { + let completedOrdersCount = 0; + data.forEach(function(order) { + if (order.status === 'COMPLETED') { + completedOrdersCount++; + } + }); + console.log(completedOrdersCount) + return completedOrdersCount; + } + + + function countToPayOrders(data) { + let toPayOrdersCount = 0; + data.forEach(function(order) { + if (order.status === 'TO PAY') { + toPayOrdersCount++; + } + }); + console.log(toPayOrdersCount) + return toPayOrdersCount; + } + + + function countToShipOrders(data) { + let toShipOrdersCount = 0; + data.forEach(function(order) { + if (order.status === 'TO SHIP') { + toShipOrdersCount++; + } + }); + console.log(toShipOrdersCount) + return toShipOrdersCount; + } + function countReturnedpOrders(data) { + let returnedOrdersCount = 0; + data.forEach(function(order) { + if (order.status === 'RETURNED') { + returnedOrdersCount++; + } + }); + console.log(returnedOrdersCount) + return returnedOrdersCount; + } + + function initializeChart(completedOrdersCount , toPayOrdersCount, toShipOrdersCount, returnedOrdersCount) { + var doughnut = document.getElementById("doughnut-chart"); + if (doughnut !== null) { + var myDoughnutChart = new Chart(doughnut, { + type: "doughnut", + data: { + labels: ["Completed", "To Pay", "To Ship", "Returned"], + datasets: [ + { + label: "Order Status", + data: [completedOrdersCount, toPayOrdersCount, toShipOrdersCount, returnedOrdersCount], + backgroundColor: ["#88aaf3", "#50d7ab", "#9586cd", "#ed9090"], + borderWidth: 1 + } + ] + }, + options: { + responsive: true, + maintainAspectRatio: false, + legend: { + display: false + }, + cutoutPercentage: 75, + tooltips: { + callbacks: { + title: function(tooltipItem, data) { + return "Order : " + data["labels"][tooltipItem[0]["index"]]; + }, + label: function(tooltipItem, data) { + return data["datasets"][0]["data"][tooltipItem["index"]]; + } + }, + titleFontColor: "#888", + bodyFontColor: "#555", + titleFontSize: 12, + bodyFontSize: 14, + backgroundColor: "rgba(256,256,256,0.95)", + displayColors: true, + borderColor: "rgba(220, 220, 220, 0.9)", + borderWidth: 2 + } + } + }); + } + } + + 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); + } + + $('#download-btn').on('click', function(event) { + event.preventDefault(); + downloadCSV('orders_data.csv'); + }); +}); diff --git a/admin/index.php b/admin/index.php index 54eafe1..e44f69b 100644 --- a/admin/index.php +++ b/admin/index.php @@ -29,6 +29,7 @@ date_default_timezone_set('Asia/Manila'); oBanana B2B - Admin Dashboard + @@ -803,9 +804,9 @@ date_default_timezone_set('Asia/Manila');

    Orders Overview

    - +
    - Download overall report
    @@ -814,9 +815,9 @@ date_default_timezone_set('Asia/Manila');
  • Order Completed
  • Order Unpaid
    • + style="color: #80e1c1 ">    Order To Pay
  • Order returned
    • + style="color: #ff7b7b ">Order Returned
    @@ -824,11 +825,7 @@ date_default_timezone_set('Asia/Manila');
    • Order Pending
      • -
    • Order Canceled
      • -
    • Order Broken
      • + style="color: #8061ef">Order To Ship
    @@ -1354,6 +1351,8 @@ date_default_timezone_set('Asia/Manila'); + + diff --git a/vendor-payments.php b/vendor-payments.php index 486de53..aab47e6 100644 --- a/vendor-payments.php +++ b/vendor-payments.php @@ -488,10 +488,10 @@ if ($_SESSION["isCustomer"] == true) { console.log(response); var paymentId = response.payment.reference_number; $('#paymentIdSpan').text(paymentId); - var gross_price = response.payment.details[0]?.attributes.data.attributes.amount; + var gross_price = (response.payment.details[0]?.attributes.data.attributes.amount / 100).toFixed(2); var payment_status = response.payment.status; var fee = response.payment.details[0]?.attributes.data.attributes.fee; - var net_amount = response.payment.details[0]?.attributes.data.attributes.payments[0].attributes.net_amount; + var net_amount = (response.payment.details[0]?.attributes.data.attributes.payments[0].attributes.net_amount / 100).toFixed(2); var desc = response.items[0].product.name; var method = response.payment_method; var name = response.billing_address.billing_first_name + " " + response.billing_address.billing_last_name; @@ -522,7 +522,7 @@ if ($_SESSION["isCustomer"] == true) {
    Gross Amount
    -
    ₱ ${net_amount}
    +
    ₱ ${gross_price}
    Fees
    Net Amount
    -
    ₱ ${gross_price}
    +
    ₱ ${net_amount}
    Payment Description
    @@ -598,7 +598,7 @@ if ($_SESSION["isCustomer"] == true) {
    Net Amount
    -
    ₱ ${gross_price}
    +
    ₱ ${net_amount}
    Payment Description