diff --git a/admin/config.php b/admin/config.php index ae055ef..2c49fab 100644 --- a/admin/config.php +++ b/admin/config.php @@ -1,8 +1,8 @@ + + + \ No newline at end of file diff --git a/admin/index.php b/admin/index.php index df56492..814484e 100644 --- a/admin/index.php +++ b/admin/index.php @@ -48,13 +48,11 @@ if($_SESSION["user_type"]!="admin"){ - -
- - - - + + + +
@@ -65,13 +63,21 @@ if($_SESSION["user_type"]!="admin"){
-
+
+
+ + +
+
+
    diff --git a/admin/left-main-sidebar.php b/admin/left-main-sidebar.php index 9f13f0b..ecffa77 100644 --- a/admin/left-main-sidebar.php +++ b/admin/left-main-sidebar.php @@ -103,7 +103,7 @@
  • - + Products diff --git a/admin/product-edit.php b/admin/product-edit.php index 4ec941c..81cfeb2 100644 --- a/admin/product-edit.php +++ b/admin/product-edit.php @@ -1130,10 +1130,10 @@ $vendorId = $_SESSION["vendorId"]; promises.push(promise); } - + // 03-14-2024 Jun Jihad modified this block of code to properly upload images with comma in the filename Promise.all(promises) .then(filenames => { - const updatedImages = existingImages.concat(filenames.map(filename => `https:///images/storage/product_uploads/${filename}`)); + const updatedImages = existingImages.concat(filenames.map(filename => `https:///images/storage/product_uploads/${encodeURIComponent(filename)}`)); if (!Array.isArray(updatedImages)) { console.error('Updated images is not an array:', updatedImages); @@ -1154,6 +1154,7 @@ $vendorId = $_SESSION["vendorId"]; body: JSON.stringify(payload) }); }) + // 03-14-2024 Jun Jihad modified this block of code to properly upload images with comma in the filename .then(response => { if (response.ok) { console.log('Images uploaded successfully'); diff --git a/admin/user-card.php b/admin/user-card.php index 228c3a3..4826885 100644 --- a/admin/user-card.php +++ b/admin/user-card.php @@ -83,560 +83,8 @@ $users = getUsers();
    - - + +
    diff --git a/admin/vendor-card.php b/admin/vendor-card.php index d8ab00d..79fea72 100644 --- a/admin/vendor-card.php +++ b/admin/vendor-card.php @@ -4,7 +4,7 @@ include "../functions.php"; $_SESSION["url"] = $_SERVER['REQUEST_URI']; if ($_SESSION["userId"] <> "") { $_SESSION["isLoggedIn"] = true; - $customer_data = getCustomerbyLoginId($_SESSION["userId"]); + //$customer_data = getCustomerbyLoginId($_SESSION["userId"]); } else { $_SESSION["isLoggedIn"] = false; header("location: login.php"); @@ -14,8 +14,6 @@ if ($_SESSION["user_type"] != "admin") { header("location: login.php?alert=Only admins allowed here!"); } $products = productList(); - -$vendorSearchResult = $_SESSION["vendorSearchResult"]; ?> @@ -66,8 +64,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; - - + @@ -92,22 +89,17 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; - -
    -
    -
    - - -
    -
    +
    + + +
      -
      @@ -673,49 +665,10 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; $start = ($currentpage - 1) * $vendorsPerPage; $end = $start + $vendorsPerPage - 1; - - - $vendorsCopy = $vendors; - // var_dump($vendorsCopy - // ); - - - // 03-07-2024 added searh filter - if (!empty($_GET['search']) ) { - $filteredProducts=[]; - foreach ($vendorsCopy as $result) { - $vendorName = strtolower($result['user_login']); - if ( - // $result['user_login'] == $_GET['search'] - strpos($vendorName,$_GET['search'])!==false - ) { - $filteredProducts[] = $result; - // var_dump("herees"); - - // var_dump($_GET['search']); - } else{ - // var_dump("none"); - - } - } - - $vendors = $filteredProducts; - $totalVendors = count($filteredProducts); - $vendorsPerPage = 20; - } - else{ - // $vendors=$vendorsCopy; - } - - if ($totalVendors == 0) { - echo '

      No vendor found.

      '; - } - // $vendors = vendorList(); for ($x = $start; $x <= $end && $x < $totalVendors; $x++) { $vendor = $vendors[$x]; ?> -
      @@ -731,7 +684,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; if (isset($vendor['vendor_image']) && !empty($vendor['vendor_image'])) { echo 'Avatar Image '; } else { - echo 'Placeholder Image'; + echo 'Placeholder Image'; } ?>
      @@ -806,7 +759,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
      '; + echo 'edit '; } else { echo 'edit'; } @@ -822,21 +775,22 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"]; label.innerHTML = ' Upload file'; } } + // 03-14-2024 Jun Jihad modified this block of code to show preview of the image to be uploaded + function previewImage(vendorId) { + var fileInput = document.getElementById('fileInput' + vendorId); + var file = fileInput.files[0]; + console.log('clicked hereee'); + const reader = new FileReader(); - // 02-29-2024 Stacy for image preview - function previewImage(vendorId){ - var fileInput = document.getElementById('fileInput' + vendorId); - var file = fileInput.files[0]; - console.log('clicked hereee') - const reader = new FileReader(); - - reader.onload = function (e) { + reader.onload = function (e) { const dataUri = e.target.result; - document.getElementById('imgPrev').src=dataUri - }; + document.getElementById('imgPrev' + vendorId).src = dataUri; // Fixed concatenation here + }; + + reader.readAsDataURL(file); + } + // 03-14-2024 Jun Jihad modified this block of code to show preview of the image to be uploaded - reader.readAsDataURL(file); - }
      @@ -941,8 +895,7 @@ $vendorSearchResult = $_SESSION["vendorSearchResult"];
      -
      - +
      • + + + + + + + + oBanana B2B - Admin Dashboard + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + +
      + + + + + + + +
      +
      +
      Vendor Search Results
      +
      + +
      +
      +
      +
      +
      + "> + + <?php echo $vendor['user_login']; ?> + + + + +
      +
      +
      + "> + + +
      +
      +
      +
      +
      Seller Products
      + +

      +
      +
      +
      +
      +
      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 + +
      +
      +
      +

      +

      ₱

      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/vendor-profile.php b/admin/vendor-profile.php index 2553644..f923609 100644 --- a/admin/vendor-profile.php +++ b/admin/vendor-profile.php @@ -68,636 +68,7 @@ $array = json_decode($vendor,true);
      - +
      @@ -789,7 +160,17 @@ $array = json_decode($vendor,true);
      -
      +
      +
      +
      + +
      +
      +

      Payments

      + +
      + +
      +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      MethodAmountStatusPayoutDescriptionDate
      ObananaPay₱230 + Paid + No + Coach Swagger + Oct 20, 2018 +
      + + +
      +
      ObananaPay₱550 + Paid + No + Toddler Shoes, Gucci Watch + Nov 15, 2018 +
      + + +
      +
      ObananaPay₱325 + Paid + No + Hat Black Suits + Nov 18, 2018 +
      + + +
      +
      PayMongo₱200 + Paid + No + T100 Power Bank + Nov 20, 2018 +
      + + +
      +
      ObananaPay₱150 + Paid + Yes + Vodka Milk Tea + Dec 11, 2018 +
      + + +
      +
      +
      +
      +
      +
      + +
      +
      + +
      +
      + +
      +
      +
      +
      + +
      +
      +

      Payouts

      + +
      + +
      +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      AmountBankAccountNameDateStatus
      ₱1,230EastWest**** **** 1234Jon-Jon ManaayOct 20, 2018 + Deposited + +
      + + +
      +
      ₱2,340EastWest**** **** 1234Jon-Jon ManaayOct 27, 2018 + Processing + +
      + + +
      +
      +
      +
      +
      +
      +
      +
      + +
      diff --git a/cart1.php b/cart1.php index fc5e185..03b744e 100644 --- a/cart1.php +++ b/cart1.php @@ -356,7 +356,7 @@
    • Cart
    • Checkout
    • Compare
      • -
    • FAQ
      • +
    • FAQ
    • Login
    • Register
    • Track Order
      • @@ -645,7 +645,7 @@
    • Cart
    • Checkout
    • Compare
      • -
    • FAQ
      • +
    • FAQ
    • Login
    • Register
    • Track Order
      • @@ -1365,7 +1365,7 @@
      diff --git a/catalog-single-vendor-action.php b/catalog-single-vendor-action.php new file mode 100644 index 0000000..d9812af --- /dev/null +++ b/catalog-single-vendor-action.php @@ -0,0 +1,30 @@ + "") { } else { $_SESSION["isLoggedIn"] = false; } +$products = productListVendor($_GET["id"]); + +$filteredProducts = []; + +if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['category'])) { + $filteredProducts = []; + $minPrice = isset($_GET['minPrice']) && $_GET['minPrice'] !== '' ? floatval($_GET['minPrice']) : null; + $maxPrice = isset($_GET['maxPrice']) && $_GET['maxPrice'] !== '' ? floatval($_GET['maxPrice']) : null; + + // echo "Min Price: " . ($minPrice !== null ? $minPrice : "null") . "
      "; + // echo "Max Price: " . ($maxPrice !== null ? $maxPrice : "null") . "
      "; + + $selectedCategories = isset($_GET['category']) ? $_GET['category'] : []; + + if (!empty($selectedCategories) && (($minPrice == null) && ($maxPrice == null))) { + // var_dump("filtering categories without price"); + foreach ($selectedCategories as $selectedCategory) { + $category = strtolower(trim($selectedCategory)); + foreach ($products as $result) { + $product = $result; + + $productCategory = strtolower(trim($product['product_category'])); + + if ( + $productCategory == $category + ) { + $filteredProducts[] = $result; + } + } + } + } elseif (!empty($selectedCategories) && (!empty($minPrice) || !empty($maxPrice))) { + // var_dump("filtering categories and price"); + if ($minPrice === null) { + $minPrice = 0; + } + if ($maxPrice === null) { + $maxPrice = PHP_FLOAT_MAX; + } + foreach ($selectedCategories as $selectedCategory) { + $category = strtolower(trim($selectedCategory)); + foreach ($products as $result) { + $product = $result; + $productPrice = isset($product['sale_price']) ? $product['sale_price'] : $product['regular_price']; + $productCategory = strtolower(trim($product['product_category'])); + if ( + $productCategory = $category && (($productPrice >= $minPrice) && + ($productPrice <= $maxPrice)) + ) { + $filteredProducts[] = $result; + } + } + } + } + else { + foreach ($products as $result) { + // var_dump("filtering"); + $product = $result; + $productPrice = isset($product['sale_price']) ? $product['sale_price'] : $product['regular_price']; + // var_dump( $minPrice); + // var_dump( $productPrice); + // var_dump( $productPrice >= $minPrice); + + + + if ($minPrice === null) { + $minPrice = 0; + } + + if ($maxPrice === null) { + $maxPrice = PHP_FLOAT_MAX; + } + if (($minPrice === null || $productPrice >= $minPrice) && + ($maxPrice === null || $productPrice <= $maxPrice) + ) { + $filteredProducts[] = $result; + // var_dump("filtering heree"); + + } + } + } +} else { + $filteredProducts = $products; +} ?> @@ -268,7 +351,6 @@ if ($_SESSION["userId"] <> "") {
      Seller Products

      Products

      @@ -334,7 +416,7 @@ if ($_SESSION["userId"] <> "") {
      "") { } } else { ?> - edit + edit @@ -489,64 +571,83 @@ if ($_SESSION["userId"] <> "") {
      -
      -

      Category

      -
      -
      - + + +
      -
      x diff --git a/faq.php b/faq.php new file mode 100644 index 0000000..f0f64e5 --- /dev/null +++ b/faq.php @@ -0,0 +1,688 @@ + + + + + + + + + oBanana B2B - Elevate Your Business + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      +
      +
      +
      +
      +
      +
      +
      + + + + +
      +
      +
      +
      +
      + My Cart + +
      + +
      +
      +
      + + + + + + + + + + + + + + + +
      Sub-Total :$300.00
      VAT (20%) :$60.00
      Total :$360.00
      +
      +
      + View Cart + Checkout +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      +
      +

      About Us

      +
      +
      + +
        +
      • Home
        • +
      • About Us
        • +
      + +
      +
      +
      +
      +
      +
      + + + +
      +
      +
      +
      +
      +

      FAQ

      +

      FAQ

      +

      Frequently Asked Questions

      +
      +
      +
      +
      + +
      +
      +

      What is Obanana Corporation's B2B eCommerce platform?

      +

      Obanana Corporation's B2B eCommerce platform is an online marketplace designed to connect businesses worldwide, facilitating trade between buyers and sellers.

      +

      What kind of products can be found on the Obanana Corporation platform?

      +

      Our platform offers a diverse range of products across various industries, including but not limited to electronics, clothing, machinery, raw materials, and more, catering to the needs of businesses across different sectors.

      +

      How does the platform ensure the quality of products listed?

      +

      To ensure quality standards, we implement rigorous verification processes for both sellers and products. We encourage buyers to provide feedback and ratings based on their experience, fostering transparency and trust within our marketplace.

      +

      What are the payment options available on the Obanana Corporation platform?

      +

      We offer a variety of secure payment options to accommodate the needs of our users, including bank transfers, credit/debit cards, and third-party payment gateways, ensuring smooth and secure transactions.

      +

      Can buyers and sellers communicate directly on the platform?

      +

      Yes, our platform facilitates direct communication between buyers and sellers through messaging features and inquiry forms, allowing for seamless negotiation and collaboration.

      +

      How does shipping and logistics work on the Obanana Corporation platform?

      +

      We provide comprehensive shipping and logistics solutions, including freight forwarding services and shipping partners, to ensure efficient and timely delivery of goods to buyers worldwide.

      +

      Are there any minimum order requirements for purchasing on the platform?

      +

      Minimum order requirements may vary depending on the seller and product category. Buyers can find detailed information regarding minimum order quantities on product listings.

      +

      Does Obanana Corporation offer any trade assurance or buyer protection services?

      +

      Yes, we provide trade assurance services to protect buyers' interests, offering refunds or replacements for orders that do not meet agreed-upon quality standards or fail to arrive within specified delivery times.

      +

      How does Obanana Corporation handle disputes between buyers and sellers?

      +

      In the event of disputes, our dedicated support team mediates and facilitates resolution through our dispute resolution process, ensuring fair outcomes for all parties involved.

      +

      How can businesses join the Obanana Corporation platform as sellers?

      +

      Businesses interested in becoming sellers on our platform can apply for membership through our website, where they will undergo a verification process to ensure compliance with our standards and policies.

      +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      +
      +
      +

      Testimonial

      +

      Client Review

      +

      What say client about us

      +
      +
      +
      +
      +
      +
        +
      • + +
        +
        testimonial
        +
        +
        Lorem Ipsum is simply dummy text of the printing and + typesetting industry. Lorem Ipsum has been the industry's standard dummy text + ever since the 1500s, when an unknown printer took a galley of type and + scrambled it to make a type specimen
        +
        John Doe
        +
        General Manager
        +
        + + + + + +
        +
        +
        + +
        • +
      • + +
        +
        testimonial
        +
        +
        Lorem Ipsum is simply dummy text of the printing and + typesetting industry. Lorem Ipsum has been the industry's standard dummy text + ever since the 1500s, when an unknown printer took a galley of type and + scrambled it to make a type specimen
        +
        John Doe
        +
        General Manager
        +
        + + + + + +
        +
        +
        + +
        • +
      • + +
        +
        testimonial
        +
        +
        Lorem Ipsum is simply dummy text of the printing and + typesetting industry. Lorem Ipsum has been the industry's standard dummy text + ever since the 1500s, when an unknown printer took a galley of type and + scrambled it to make a type specimen
        +
        John Doe
        +
        General Manager
        +
        + + + + + +
        +
        +
        + +
        • +
      +
      +
      +
      +
      + + + +
      +

      Services

      +
      +
      +
      +
      +
      + +
      +
      +

      Free Shipping

      +

      Free shipping on all US order or order above $200

      +
      +
      +
      +
      +
      +
      + +
      +
      +

      24X7 Support

      +

      Contact us 24 hours a day, 7 days a week

      +
      +
      +
      +
      +
      +
      + +
      +
      +

      30 Days Return

      +

      Simply return it within 30 days for an exchange

      +
      +
      +
      +
      +
      +
      + +
      +
      +

      Payment Secure

      +

      Contact us 24 hours a day, 7 days a week

      +
      +
      +
      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      +
      +
      +
      + +
      +
      + 3 +
      +
      + +
      +
      + 4 +
      +
      + +
      + +
      +
      +
      + + + +
      + payment image +
      +

      Someone in new just bought

      +
      stylish baby shoes
      +

      10 Minutes ago

      +
      + × +
      + + + +
      + +
      +
      + 3 +       +
      + + + +
      + +
      + +
      + Need Help? +

      Chat with us on WhatsApp

      +
      + +
      + +
      +
      + + +
      +
      +
      + whatsapp icon +
      +
      +
      + +
      + + + +
      +
      +
      +

      Features

      +
      + + icon + +
      +
      +

      Color Scheme

      +
        +
        • +
        • +
        • +
        • +
        • +
      +
      +
      +

      Backgrounds

      + +
      +
      +

      Full Screen mode

      +
      +
      +
      Mode
      +
      On
      +
      Off
      +
      +
      +
      +
      +

      Dark mode

      +
      +
      +
      Mode
      +
      On
      +
      Off
      +
      +
      +
      +
      +

      RTL mode

      +
      +
      +
      Rtl
      +
      On
      +
      Off
      +
      +
      +
      + +
      +

      Clear local storage

      + Clear Cache & Default +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/footer.php b/footer.php index 896f018..faae74b 100644 --- a/footer.php +++ b/footer.php @@ -33,7 +33,7 @@
      • About us
        • -
      • FAQ
        • +
      • FAQ
        • diff --git a/functions.php b/functions.php index 23f6d72..3880700 100644 --- a/functions.php +++ b/functions.php @@ -1552,6 +1552,7 @@ function editProduct( $color, $material, $size, + $priceMatrix, $token ) { $curl = curl_init(); @@ -1576,6 +1577,9 @@ function editProduct( 'same-day-delivery' => $sdd , 'free-shipping' => $freeSf ), + 'price_matrix' => array( + $priceMatrix + ), 'parent_id' => $parentId, 'minimum_order' => $minimumOrder, // 'variants' => array( diff --git a/header.php b/header.php index 1b285b4..b15eb13 100644 --- a/header.php +++ b/header.php @@ -870,7 +870,7 @@
      • Cart
      • Checkout
      • Compare
        • -
      • FAQ
        • +
      • FAQ
      • Login
      • Register
      • Track Order
        • @@ -1174,7 +1174,7 @@
      • Cart
      • Checkout
      • Compare
        • -
      • FAQ
        • +
      • FAQ
      • Login
      • Register
      • Track Order
        • diff --git a/product-left-sidebar.php b/product-left-sidebar.php index 7316195..512d2a2 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -505,7 +505,7 @@ if (isset($_GET['id'])) { echo '" id="qty-input" />'; echo '
        +
        '; // echo '
        '; - echo '
        '; + echo '
        '; echo '
        '; diff --git a/user-history.php b/user-history.php index e2ac230..7f6f97f 100644 --- a/user-history.php +++ b/user-history.php @@ -38,6 +38,9 @@ if ($_SESSION["userId"] <> "") { + + + @@ -45,15 +48,58 @@ if ($_SESSION["userId"] <> "") { + + + +
        diff --git a/user-profile.php b/user-profile.php index 71eca38..e3ae4f4 100644 --- a/user-profile.php +++ b/user-profile.php @@ -114,7 +114,7 @@ if ($_SESSION["userId"] <> "") { - +
        @@ -168,7 +168,7 @@ if ($_SESSION["userId"] <> "") {
        -
        +
        Edit Detail
        diff --git a/user-refund-history.php b/user-refund-history.php index 95a6416..8bfcbcc 100644 --- a/user-refund-history.php +++ b/user-refund-history.php @@ -49,7 +49,7 @@ if ($_SESSION["userId"] <> "") {