louie_branch #81

Merged
MarkHipe merged 5 commits from louie_branch into main 2024-05-08 17:54:17 +08:00
1 changed files with 109 additions and 117 deletions
Showing only changes of commit 4fe563d212 - Show all commits

View File

@ -29,17 +29,17 @@ if($_SESSION["user_type"]!="admin"){
}
$vendor = getVendorbyId($_SESSION["vendorId"]);
$array = json_decode($vendor,true);
$vendorData = json_decode($vendor,true);
$selectedBankAccount = null;
foreach ($array['bank_acount_details'] as $bankAccount) {
foreach ($vendorData['bank_acount_details'] as $bankAccount) {
if ($bankAccount['bank_payout']) {
$selectedBankAccount = $bankAccount;
break;
}
}
if ($selectedBankAccount === null && !empty($array['bank_acount_details'])) {
$selectedBankAccount = $array['bank_acount_details'][0];
if ($selectedBankAccount === null && !empty($vendorData['bank_acount_details'])) {
$selectedBankAccount = $vendorData['bank_acount_details'][0];
}
$selectedBankAccountJSON = json_encode($selectedBankAccount);
@ -114,22 +114,6 @@ date_default_timezone_set('Asia/Manila');
<!-- FAVICON -->
<link href="assets/img/favicon.png" rel="shortcut icon" />
<!-- <script>
function renewToken() {
var xhr = new XMLHttpRequest();
xhr.open("GET", "token-renew.php", true);
xhr.send();
}
setInterval(function() {
var currentTime = <?php // echo time(); ?>;
var renewalTime = <?php // echo $renewal_time; ?>;
var expirationTime = <?php // echo $expiration_time; ?>;
if (currentTime >= renewalTime || currentTime >= expirationTime) {
renewToken();
}
}, 60000);
</script> -->
<script>
var token_parts = "<?php echo $_SESSION["token"]; ?>".split(".");
@ -201,7 +185,8 @@ function renewToken() {
<div class="content">
<div class="breadcrumb-wrapper breadcrumb-contacts">
<div>
<h1><?php echo $array["first_name"]; ?></h1>
<?php $vendorFullName = "{$vendorData['first_name']} {$vendorData['last_name']}"; ?>
<h1><?php echo $vendorFullName ?></h1>
<p class="breadcrumbs"><span><a href="index.php">Home</a></span><span><i class="mdi mdi-chevron-right"></i></span><span><a href="vendor-card.php">Vendors</a></span>
<span><i class="mdi mdi-chevron-right"></i></span>Profile
</p>
@ -218,8 +203,8 @@ function renewToken() {
<div class="text-center widget-profile px-0 border-0">
<div class="card-img mx-auto rounded-circle">
<img loading="lazy" src="<?php
if($array["vendor_image"]!=""){
echo $array["vendor_image"];
if($vendorData["vendor_image"]!=""){
echo $vendorData["vendor_image"];
} else {
echo "assets/img/vendor/u1.jpg";
}
@ -227,13 +212,13 @@ function renewToken() {
?>" alt="user image" class="img-fluid rounded-circle" alt="Avatar Image" style="width: 100px; height: 100px; object-fit: cover; border-radius: 50%;">
</div>
<div class="card-body">
<h4 class="py-2 text-dark"><?php echo $array["first_name"]; ?></h4>
<p><?php echo $array["user_email"]; ?></p>
<a class="btn btn-primary my-3" href="#">Follow</a>
<h4 class="py-2 text-dark"><?php echo $vendorFullName ?></h4>
<p><?php echo $vendorData["user_email"]; ?></p>
<!-- <a class="btn btn-primary my-3" href="#">Follow</a> -->
</div>
</div>
<div class="d-flex justify-content-between ">
<!-- <div class="d-flex justify-content-between ">
<div class="text-center pb-4">
<h6 class="text-dark pb-2">1703</h6>
<p>Friends</p>
@ -248,49 +233,58 @@ function renewToken() {
<h6 class="text-dark pb-2">1150</h6>
<p>Following</p>
</div>
</div>
</div> -->
</div>
<hr class="w-100">
<div class="contact-info pt-4">
<h5 class="text-dark">Contact Information</h5>
<?php
//echo date('Y-m-d H:i:s', $issued_at_time) . "<br>";
//echo date('Y-m-d H:i:s', $expiration_time) . "<br>";
//echo date('Y-m-d H:i:s', $renewal_time) . "<br>";
//echo date('Y-m-d H:i:s', time()) . "<br>";
?>
<?php echo $_SESSION["token"] ?><br>
<?php $real_time = date('Y-m-d H:i:s', $expiration_time); echo $real_time?>
<?php // echo $_SESSION["email"] ?> <br>
<?php // echo "Updated token: " . $token; ?>
<?php // echo $_SESSION["password"] ?>
<!-- <php echo $_SESSION["token"] ?><br>
<php $real_time = date('Y-m-d H:i:s', $expiration_time); echo $real_time?>
<php // echo $_SESSION["email"] ?> <br>
<php // echo "Updated token: " . $token; ?>
<php // echo $_SESSION["password"] ?> -->
<p class="text-dark font-weight-medium pt-24px mb-2">Email address</p>
<p><?php echo $array["user_email"]; ?></p>
<p><?php echo $vendorData["user_email"]; ?></p>
<p class="text-dark font-weight-medium pt-24px mb-2">Phone Number</p>
<p>+00 1234 5678 91</p>
<p class="text-dark font-weight-medium pt-24px mb-2">Birthday</p>
<p>Dec 10, 1991</p>
<p class="text-dark font-weight-medium pt-24px mb-2">Social Profile</p>
<p class="social-button">
<a href="#" class="mb-1 btn btn-outline btn-twitter rounded-circle">
<i class="mdi mdi-twitter"></i>
</a>
<p>
<?php
if (!empty($vendorData["phone"])) {
echo $vendorData["phone"];
} else {
echo "NONE";
}
?>
</p>
<p class="text-dark font-weight-medium pt-24px mb-2">Vendor Since</p>
<p>
<?php
if (!empty($vendorData["createdAt"])) {
$createdAt = new DateTime($vendorData["createdAt"]);
echo $createdAt->format('F j, Y');
} else {
echo "Unknown";
}
?>
</p>
<!-- <p class="text-dark font-weight-medium pt-24px mb-2">Social Profile</p>
<p class="social-button">
<a href="#" class="mb-1 btn btn-outline btn-twitter rounded-circle">
<i class="mdi mdi-twitter"></i>
</a>
<a href="#" class="mb-1 btn btn-outline btn-linkedin rounded-circle">
<i class="mdi mdi-linkedin"></i>
</a>
<a href="#" class="mb-1 btn btn-outline btn-linkedin rounded-circle">
<i class="mdi mdi-linkedin"></i>
</a>
<a href="#" class="mb-1 btn btn-outline btn-facebook rounded-circle">
<i class="mdi mdi-facebook"></i>
</a>
<a href="#" class="mb-1 btn btn-outline btn-facebook rounded-circle">
<i class="mdi mdi-facebook"></i>
</a>
<a href="#" class="mb-1 btn btn-outline btn-skype rounded-circle">
<i class="mdi mdi-skype"></i>
</a>
</p>
<a href="#" class="mb-1 btn btn-outline btn-skype rounded-circle">
<i class="mdi mdi-skype"></i>
</a>
</p> -->
</div>
</div>
</div>
@ -327,8 +321,7 @@ function renewToken() {
<div class="row">
<div class="col-12">
<!-- Recent Order Table -->
<div class="card card-default card-table-border-none ec-tbl"
id="recent-orders">
<div class="card card-default card-table-border-none ec-tbl"id="recent-orders">
<div class="card-header justify-content-between">
<h2>Payments</h2>
@ -353,60 +346,59 @@ function renewToken() {
</thead>
<tbody>
<?php
$totalOrders = count($vendorOrders);
for ($i = 0; $i < $totalOrders; $i++) {
$order = $vendorOrders[$i];
$orderArray = json_encode($order, true);
$orderItems = json_decode($orderArray, true);
if (strtoupper($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']);
?>
<tr>
<td><input type="checkbox" <?php echo $isPayoutCompleted ? 'disabled' : ''; ?>></td>
<td><?php echo $orderItems['payment_method']; ?></td>
<td><?php echo $orderItems['total_amount']; ?></td>
<td>
<span class="badge badge-success"><?php echo $orderItems['payment']['status']; ?></span>
</td>
<td>
<span class="badge badge-warning"><?php echo $isPayoutCompleted ? 'Yes' : 'No'; ?></span>
</td>
<td>
<a class="text-dark" href=""><?php echo $item['product']['name']; ?></a>
</td>
<td><?php echo $displayDate; ?></td>
<td hidden><?php echo $orderItems['_id']; ?></td>
<td class="text-right">
<div class="dropdown show d-inline-block widget-dropdown">
<a class="dropdown-toggle icon-burger-mini" href="" role="button" id="dropdown-recent-order1" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-display="static"></a>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-recent-order1">
<li class="dropdown-item">
<a href="#">Details</a>
</li>
</ul>
</div>
</td>
</tr>
<?php
}
}
}
?>
</tbody>
<?php
$totalOrders = count($vendorOrders);
for ($i = 0; $i < $totalOrders; $i++) {
$order = $vendorOrders[$i];
$orderArray = json_encode($order, true);
$orderItems = json_decode($orderArray, true);
if (strtoupper($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']);
?>
<tr>
<td><input type="checkbox" <?php echo $isPayoutCompleted ? 'disabled' : ''; ?>></td>
<td><?php echo $orderItems['payment_method']; ?></td>
<td><?php echo $orderItems['total_amount']; ?></td>
<td>
<span class="badge badge-success"><?php echo $orderItems['payment']['status']; ?></span>
</td>
<td>
<span class="badge badge-warning"><?php echo $isPayoutCompleted ? 'Yes' : 'No'; ?></span>
</td>
<td>
<a class="text-dark" href=""><?php echo $item['product']['name']; ?></a>
</td>
<td><?php echo $displayDate; ?></td>
<td hidden><?php echo $orderItems['_id']; ?></td>
<td class="text-right">
<div class="dropdown show d-inline-block widget-dropdown">
<a class="dropdown-toggle icon-burger-mini" href="" role="button" id="dropdown-recent-order1" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-display="static"></a>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-recent-order1">
<li class="dropdown-item">
<a href="#">Details</a>
</li>
</ul>
</div>
</td>
</tr>
<?php
}
}
}
?>
</tbody>
</table>
</div>
</div>
</div>
<div class="d-flex justify-content-end mt-5">
<button type="button" class="btn btn-primary mb-2 btn-pill" onclick="createPayout()">Create Payout from Selected</button>
</div>
<div class="d-flex justify-content-end mt-5">
<button type="button" class="btn btn-primary mb-2 btn-pill" onclick="createPayout()">Create Payout from Selected</button>
</div>
</div>
<script>
<script>
function createPayout() {
var rows = document.querySelectorAll("#recent-orders tbody tr");
var selectedBank = JSON.parse('<?php echo $selectedBankAccountJSON; ?>');
@ -416,8 +408,8 @@ function renewToken() {
var feesDeductionAdjustment = <?php echo $_SESSION["transfer_fee"] ?>;
var feesPercentage = (feesDeductionAdjustment * 100) + '%';
const token = '<?php echo $_SESSION["token"] ?>';
const vendorId = '<?php echo ($array['_id']); ?>';
const vendorName = '<?php echo ($array['user_login']); ?>';
const vendorId = '<?php echo ($vendorData['_id']); ?>';
const vendorName = '<?php echo ($vendorData['user_login']); ?>';
rows.forEach(function(row) {
var checkbox = row.querySelector("input[type=checkbox]");
if (checkbox && checkbox.checked) {
@ -456,10 +448,10 @@ function renewToken() {
selectedBank
],
transaction_logs: selectedOrders,
vendor_details: [
{ vendor_id: vendorId,
vendor_name: vendorName}
],
vendor_details: [{
vendor_id: vendorId,
vendor_name: vendorName
}],
status: "PENDING",
created_by: "Sample User",
};
@ -588,7 +580,7 @@ function renewToken() {
</div>
</td>
</tr>
<?php } ?>
<?php } ?>
</tbody>
</table>
</div>