From cffda7e9e55f0c278b66228b72dbe7544f5cd069 Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 22 May 2024 15:46:15 +0800 Subject: [PATCH 1/8] edited vendor payouts breadcrumbs --- vendor-payouts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 228fd3a..e078b15 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -137,13 +137,13 @@ $vendorPayoutData = json_decode($response, true);
-

Vendor Settings

+

Vendor Payouts

  • Home
    • -
  • Settings
    • +
  • Payouts
From 4620fde33db1abea125ccd7f0251ab33e7454218 Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 22 May 2024 15:46:35 +0800 Subject: [PATCH 2/8] fixed vendor name and customer name on index --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 4df2f85..6a8c53b 100644 --- a/header.php +++ b/header.php @@ -1802,7 +1802,7 @@ if ($_SESSION["userId"] <> "") {
- + From f616306a45512b51b2670137648762b28359805e Mon Sep 17 00:00:00 2001 From: jouls Date: Wed, 22 May 2024 18:46:36 +0800 Subject: [PATCH 3/8] added pagination admin vendor payments and payouts table --- admin/vendor-product-search.php | 278 ++++++------ admin/vendor-profile.php | 777 +++++++++++++++++--------------- 2 files changed, 564 insertions(+), 491 deletions(-) diff --git a/admin/vendor-product-search.php b/admin/vendor-product-search.php index 07b2977..51a96ae 100644 --- a/admin/vendor-product-search.php +++ b/admin/vendor-product-search.php @@ -93,7 +93,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; - +
@@ -648,22 +648,22 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; - - -
-
-
Vendor Search Results
-
- -
-
-
-
-
+ + +
+
+
Vendor Search Results
+
+ +
+
+
+
+
"> <?php echo $vendor['user_login']; ?> @@ -671,117 +671,124 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; +
+
+
+ "> + + +
+
+
+
+
Seller Products
+ +

-
-
- "> - - -
-
-
-
-
Seller Products
+
+
+
+
Seller since
+

-

-
-
-
-
-
Seller since
-

-
+

-
-
-
- -
-
-
- - - - -
-
-
- $productListVendor) { - // echo "$product .":" . $productListVendor"; - // $vendorOfProduct = getVendorbyId($product['vendor_api_id']); - $products = productListVendor($vendorId); - $totalProducts = count($products); - - - for ($i = 0; $i <= $totalProducts - 1; $i++) { - $product = $products[$i]; - ?> -
-
-
-
-
- - edit - - edit - -
-
-
-

-

₱

-
-
-
-
-
-
- -
+ $count++; + } + ?>
- - - - + - - - - + @@ -860,6 +866,6 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; - + \ No newline at end of file diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php index b112fa0..f4706ec 100644 --- a/admin/vendor-profile.php +++ b/admin/vendor-profile.php @@ -1,45 +1,44 @@ "") { - $_SESSION["isLoggedIn"] = true; - + $_SESSION["isLoggedIn"] = true; } else { - $_SESSION["isLoggedIn"] = false; - header("location: login.php"); + $_SESSION["isLoggedIn"] = false; + header("location: login.php"); } -if($_SESSION["user_type"]!="admin"){ - header("location: login.php?alert=Only admins allowed here!"); +if ($_SESSION["user_type"] != "admin") { + header("location: login.php?alert=Only admins allowed here!"); } $vendor = getVendorbyId($_SESSION["vendorId"]); -$vendorData = json_decode($vendor,true); +$vendorData = json_decode($vendor, true); $selectedBankAccount = null; foreach ($vendorData['bank_acount_details'] as $bankAccount) { - if ($bankAccount['bank_payout']) { - $selectedBankAccount = $bankAccount; - break; - } + if ($bankAccount['bank_payout']) { + $selectedBankAccount = $bankAccount; + break; + } } if ($selectedBankAccount === null && !empty($vendorData['bank_acount_details'])) { - $selectedBankAccount = $vendorData['bank_acount_details'][0]; + $selectedBankAccount = $vendorData['bank_acount_details'][0]; } $selectedBankAccountJSON = json_encode($selectedBankAccount); @@ -47,22 +46,22 @@ $selectedBankAccountJSON = json_encode($selectedBankAccount); $shopOrders = getOrderbyVendorId($_SESSION["vendorId"]); $vendorOrderss = json_decode($shopOrders); if (is_array($vendorOrderss)) { - $vendorOrders = json_decode($shopOrders); + $vendorOrders = json_decode($shopOrders); } elseif (is_object($vendorOrderss) && property_exists($vendorOrderss, 'message')) { - $vendorOrders = []; + $vendorOrders = []; } else { - echo "Unknown type or no 'message' property found."; + echo "Unknown type or no 'message' property found."; } $allPayouts = getAllPayout($_SESSION["token"]); -$vendorPayouts = json_decode($allPayouts,true); +$vendorPayouts = json_decode($allPayouts, true); $filteredPayouts = []; foreach ($vendorPayouts as $payout) { - if ($payout['vendor_details'][0]['vendor_id'] == $_SESSION["vendorId"]) { - $filteredPayouts[] = $payout; - } + if ($payout['vendor_details'][0]['vendor_id'] == $_SESSION["vendorId"]) { + $filteredPayouts[] = $payout; + } } // if (isset($_SESSION["token"])) { @@ -114,55 +113,82 @@ date_default_timezone_set('Asia/Manila'); - + setInterval(function() { + var currentTime = Date.now() / 1000; + var renewalTime = renewal_time; + var expirationTime = expiration_time; + console.log("Current Time: " + new Date(currentTime * 1000).toLocaleString()); + console.log("Renewal Time: " + new Date(renewalTime * 1000).toLocaleString()); + console.log("Expiration Time: " + new Date(expirationTime * 1000).toLocaleString()); + if (currentTime >= renewalTime || currentTime >= expirationTime) { + console.log("Renewing token..."); + renewToken(); + } + }, 60000); + @@ -202,13 +228,14 @@ function renewToken() {
- " alt="user image" class="img-fluid rounded-circle" alt="Avatar Image" style="width: 100px; height: 100px; object-fit: cover; border-radius: 50%;">
@@ -245,28 +272,28 @@ function renewToken() { -->

Email address

-

+

Phone Number

-

- -

+

+ +

Vendor Since

-

- format('F j, Y'); - } else { - echo "Unknown"; - } - ?> -

+

+ format('F j, Y'); + } else { + echo "Unknown"; + } + ?> +

-
+

Payments

@@ -331,7 +349,7 @@ function renewToken() {
- +
@@ -345,19 +363,22 @@ function renewToken() { - + + ?> @@ -384,7 +405,7 @@ function renewToken() { -
>
+ + +
- + fetch('https:///api/v1/payouts/', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + "Authorization": "Bearer " + token, + }, + body: JSON.stringify(postData) + }) + .then(response => { + if (response.ok) { + return response.json(); + } else { + throw new Error('Failed to create payout'); + } + }) + .then(data => { + console.log('Payout created successfully'); + selectedOrders.forEach(order => { + var orderId = order.orderId; + fetch(`https:///api/v1/orders/${orderId}`, { + method: 'PATCH', + headers: { + 'Content-Type': 'application/json', + "Authorization": "Bearer " + token, + }, + body: JSON.stringify({ + payout_status: { + payout_id: data._id, + status: "Processing" + } + }) + }) + .then(response => { + // if (!response.ok) { + // console.error(`Failed to update payout status for order ${orderId}`); + // } + if (!response.ok) { + console.error(`Failed to update payout status for order ${orderId}`); + } else { + location.reload(); + } + }) + .catch(error => { + console.error(`Error updating payout status for order ${orderId}:`, error); + }); + }); + }) + .catch(error => { + console.error('Error:', error); + }); + } +
-
+
-
+

Payouts

@@ -541,57 +613,99 @@ function renewToken() { - - + - - - - - - - - - - -
- - -
- - - + $reversedPayouts = array_reverse($filteredPayouts); + for ($i = 0; $i < $totalPayoutOrders; $i++) { + $order_payouts = $reversedPayouts[$i]; + $displayPayoutDate = date('m-d-Y, g:i A', strtotime($order_payouts['createdAt'])); + ?> + + + + + + + + + + +
+ + +
+ + +
+
+
-
+
@@ -796,8 +910,7 @@ function renewToken() {
-
+

Recent Orders

@@ -831,22 +944,13 @@ function renewToken() { Oct 20, 2018 $230 - Completed + Completed -
- +
+ -
    +
    • View
      • @@ -869,22 +973,13 @@ function renewToken() { Nov 15, 2018 $550 - Delayed + Delayed -
      - +
      + -
        +
        • View
          • @@ -911,18 +1006,10 @@ function renewToken() { Hold -
          - +
          + -
            +
            • View
              • @@ -945,22 +1032,13 @@ function renewToken() { Dec 13, 2018 $200 - Completed + Completed -
              - +
              + -
                +
                • View
                  • @@ -983,21 +1061,12 @@ function renewToken() { Dec 23, 2018 $150 - Cancelled + Cancelled -
                  - -
                    +
                    + +
                    • View
                      • @@ -1019,30 +1088,29 @@ function renewToken() { -
                    +
          -
          +
          - - - - - - - - - - - - - - -
          Bank Name
          Account Number
          Account Name
          - + + + + + + + + + + + + + + +
          Bank Name
          Account Number
          Account Name
          +
          -
          Seller Products
          @@ -353,12 +352,16 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate

          Products

          -
          Seller since
          - -

          - - +

          + +

          diff --git a/shop-list-left-sidebar.php b/shop-list-left-sidebar.php index 8160167..9f3bb62 100644 --- a/shop-list-left-sidebar.php +++ b/shop-list-left-sidebar.php @@ -408,14 +408,23 @@ xhrVendors.onreadystatechange = function() { if(vendorsResponse.results.length>0){ vendorsResponse.results.slice(0,6).forEach(function(vendor) { + let vendorDateRegistered = ""; let vendorId = vendor._id; let productCount = vendorProductCounts[vendorId] || 0; - let vendorDateRegistered = new Date(vendor.date_registered); + if (vendor.date_registered) { + vendorDateRegistered = new Date(vendor.date_registered); + } else { + vendorDateRegistered = "Not yet registered"; + } // Format the date as "Month DD, YYYY" let options = { month: 'long', day: '2-digit', year: 'numeric' }; - let formattedDate = vendorDateRegistered.toLocaleDateString('en-US', options); - + let formattedDate = ""; + if (vendorDateRegistered !== "Not yet registered") { + formattedDate = vendorDateRegistered.toLocaleDateString('en-US', options); + } else { + formattedDate = "Not yet registered"; + } // Create a product card element let card = document.createElement("div"); card.classList.add("col-md-12"); From 25e991dc37785a713b625d24539ae55096ddbe1f Mon Sep 17 00:00:00 2001 From: jouls Date: Tue, 28 May 2024 14:34:12 +0800 Subject: [PATCH 6/8] renamed displayed property on vendor profile under admin page --- admin/index.php | 3 +++ admin/vendor-profile.php | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/index.php b/admin/index.php index 2eee72d..43f9ce7 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1056,6 +1056,9 @@ $allSignups = array_merge($all_customers, $all_vendors);

          Recent Orders

          +

          -

          Vendor Since

          +

          Account Created on

          Payments

          -
          +
          From 58ac2155cb40434d890749ca60962eeee7911f2f Mon Sep 17 00:00:00 2001 From: jouls Date: Tue, 28 May 2024 15:53:17 +0800 Subject: [PATCH 7/8] Added required prop on product name, slug, width, height, length, and weight. --- vendor-uploads-add-product-action.php | 26 ++++++------- vendor-uploads-edit-product-action.php | 52 +++++++++++++------------- vendor-uploads.php | 10 ++--- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/vendor-uploads-add-product-action.php b/vendor-uploads-add-product-action.php index 2233ef1..65076fc 100644 --- a/vendor-uploads-add-product-action.php +++ b/vendor-uploads-add-product-action.php @@ -31,19 +31,19 @@ $token = $_SESSION["token"]; $response = addProduct( - $vendorId, - $productName, - $stock, - $price, - $salePrice, - $weight, - $length, - $width, - $height, - $specifications, - $productType, - $parentId, - $token); + $vendorId, + $productName, + $stock, + $price, + $salePrice, + $weight, + $length, + $width, + $height, + $specifications, + $productType, + $parentId, + $token); $array = json_decode($response,true); $_SESSION['newProductId'] = $array['_id']; header("location: vendor-uploads.php"); diff --git a/vendor-uploads-edit-product-action.php b/vendor-uploads-edit-product-action.php index 6b58249..fa8fd0f 100644 --- a/vendor-uploads-edit-product-action.php +++ b/vendor-uploads-edit-product-action.php @@ -54,32 +54,32 @@ for ($i = 0; $i < count($quantities); $i++) { $response = editProduct( - $productId, - $vendorId, - $productName, - $stock, - $ndd, - $sdd, - $freeSf, - $price, - $salePrice, - $weight, - $length, - $width, - $height, - $description, - $specifications, - $productType, - $productCategory, - $productSf, - $productStatus, - $parentId, - $minimumOrder, - $color, - $material, - $size, - $priceMatrix, - $token); + $productId, + $vendorId, + $productName, + $stock, + $ndd, + $sdd, + $freeSf, + $price, + $salePrice, + $weight, + $length, + $width, + $height, + $description, + $specifications, + $productType, + $productCategory, + $productSf, + $productStatus, + $parentId, + $minimumOrder, + $color, + $material, + $size, + $priceMatrix, + $token); $array = json_decode($response,true); $_SESSION['newProdictId'] = $array['_id']; header("location: vendor-all-product-list.php"); diff --git a/vendor-uploads.php b/vendor-uploads.php index fedd5ca..6015754 100644 --- a/vendor-uploads.php +++ b/vendor-uploads.php @@ -345,32 +345,32 @@ if ($_SESSION["isCustomer"] == true) {
          - +
          - +
          - +
          - +
          - +
          From 4a8603ee4835834f6a9c9762d687becb5892db43 Mon Sep 17 00:00:00 2001 From: jouls Date: Tue, 28 May 2024 18:23:48 +0800 Subject: [PATCH 8/8] fixed address section of vendor-settings and user-profile --- user-profile.php | 92 +++++++++++++++++++++++++++++++++++++++++---- vendor-settings.php | 32 ++++++++++++++-- 2 files changed, 112 insertions(+), 12 deletions(-) diff --git a/user-profile.php b/user-profile.php index c525917..2564fc0 100644 --- a/user-profile.php +++ b/user-profile.php @@ -205,7 +205,7 @@ if ($_SESSION["isVendor"] == true) {
          Contact number
            -
            • +
          @@ -216,6 +216,9 @@ if ($_SESSION["isVendor"] == true) {
          +
          + Shipping Address: +
          Name: @@ -236,8 +239,60 @@ if ($_SESSION["isVendor"] == true) {
          + +
          + Billing Address: +
          +
          + Name: + + + +
          +
          + Contact #: +
          +
          + Address: + + + + + + + +
          +
          +
          @@ -264,16 +319,16 @@ if ($_SESSION["isVendor"] == true) {
          - - > + > +
          - - > + > + @@ -313,7 +368,7 @@ if ($_SESSION["isVendor"] == true) {
          - +
          @@ -1085,6 +1140,27 @@ if ($_SESSION["isVendor"] == true) { if (!updateResponse.ok) { throw new Error(`Failed to update address: ${updateResponse.status}`); } + + const selectedBillingElement = document.getElementById('selectedBillingFName'); + const selectedBillingLNameElement = document.getElementById('selectedBillingLName'); + const selectedBillingContactElement = document.getElementById('selectedBillingContact'); + const sBillingBuildingElement = document.getElementById('sBillingBuilding'); + const sBillingStreetElement = document.getElementById('sBillingStreet'); + const sBillingBarangayElement = document.getElementById('sBillingBarangay'); + const sBillingCityElement = document.getElementById('sBillingCity'); + const sBillingProvinceElement = document.getElementById('sBillingProvince'); + const sBillingCountryElement = document.getElementById('sBillingCountry'); + if (selectedBillingElement) { + selectedBillingElement.textContent = customerData.address[addressIndex].first_name; + selectedBillingLNameElement.textContent = customerData.address[addressIndex].last_name; + selectedBillingContactElement.textContent = 'Contact #: ' + customerData.address[addressIndex].phone; + sBillingBuildingElement.textContent = customerData.address[addressIndex].address_1; + sBillingStreetElement.textContent = customerData.address[addressIndex].address_2; + sBillingBarangayElement.textContent = customerData.address[addressIndex].barangay; + sBillingCityElement.textContent = customerData.address[addressIndex].city; + sBillingProvinceElement.textContent = customerData.address[addressIndex].province; + sBillingCountryElement.textContent = customerData.address[addressIndex].country; + } console.log(`Address updated successfully for customer ${customerId}`); } catch (error) { console.error('Error updating address:', error.message); @@ -1162,8 +1238,8 @@ if ($_SESSION["isVendor"] == true) { sCountryElement.textContent = customerData.address[addressIndex].country; } console.log(`Address updated successfully for customer ${customerId}`); - location.reload(); - header("location: user-profile.php"); + // location.reload(); + // header("location: user-profile.php"); } catch (error) { console.error('Error updating address:', error.message); } diff --git a/vendor-settings.php b/vendor-settings.php index 912331c..308b6d0 100644 --- a/vendor-settings.php +++ b/vendor-settings.php @@ -265,10 +265,6 @@ if ($_SESSION["isCustomer"] == true) { - - -
          -
          Billing Address: @@ -295,6 +291,34 @@ if ($_SESSION["isCustomer"] == true) {
          +