diff --git a/admin/index.php b/admin/index.php index 21284dc..54eafe1 100644 --- a/admin/index.php +++ b/admin/index.php @@ -13,6 +13,11 @@ if ($_SESSION["userId"] <> "") { if($_SESSION["user_type"]!="admin"){ header("location: login.php?alert=Only admins allowed here!"); } + +$all_orders = getAllOrder(); +date_default_timezone_set('Asia/Manila'); + + ?> @@ -97,7 +102,7 @@ if($_SESSION["user_type"]!="admin"){
  • User Image
    - John Deo john.example@gmail.com + John Deo
  • @@ -719,8 +724,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 +752,9 @@ if($_SESSION["user_type"]!="admin"){
    -

    $98,503

    -

    Daily Revenue

    - +

    ₱

    +

    Today's Revenue

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

    Sales Report

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

    Recent Orders

    -
    - -
    - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + $val) { + $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' || $orderStatus === 'RETURNED') { + $statusClass = '#cb3747'; + } elseif ($orderStatus === 'TO PAY') { + $statusClass = '#50d7ab'; + } elseif ($orderStatus === 'TO SHIP') { + $statusClass = '#9586cd'; + } + elseif ($orderStatus === 'TO RECEIVE') { + $statusClass = '#ffc319'; + } elseif ($orderStatus === 'COMPLETED') { + $statusClass = '#88aaf3'; + } + + if ($formattedOrderDate == $currentDate) { + $displayDate = date('m-d-Y, g:i A', strtotime($val['order_date'])); + ?> + + + + + + + + + + = 8) { + break; + } + } + } + ?>
    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 - -
    - - -
    -
    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"])) { - + @@ -650,7 +677,7 @@ $vendorPayoutData = json_decode($response, true);
    Fees, Deductions, Adjustments
    -
    - ${totalFees}
    +
    - ${totalFees} (${feeBreakdown})
    Net Amount
    >
    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"); diff --git a/vendor-payouts.php b/vendor-payouts.php index fad7345..3e1ea11 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -84,6 +84,24 @@ $vendorPayoutData = json_decode($response, true); + + @@ -151,7 +169,7 @@ $vendorPayoutData = json_decode($response, true);
    -
    +
    Upcoming Payout
    @@ -167,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; } @@ -201,7 +219,8 @@ $vendorPayoutData = json_decode($response, true);
    -
    + + +
    -
    - Receipient: Philippine National Bank (PNB) Account ending in + Receipient: Philippine National Bank (PNB) Account ending in
    -
    + -->
    Payout History
    @@ -320,7 +339,7 @@ $vendorPayoutData = json_decode($response, true);
    - +
    @@ -598,6 +617,7 @@ $vendorPayoutData = json_decode($response, true); console.log(response); var grossAmount = response.gross_amount; var totalFees = response.fees_deduction_adjustment; + var feeBreakdown = response.breakdown[0].transfer_fee; var netAmount = response.net_amount; var payoutStatus = response.status; payoutStatus = payoutStatus.charAt(0).toUpperCase() + payoutStatus.slice(1).toLowerCase(); @@ -611,12 +631,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 += `