Obanana.Corporation
/
obanana_b2b_test
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Obanana.Corporation:fa7b1a7a54b327080ccab8f8438ccaae9d1a7914
Branches Tags
Obanana.Corporation:main
Obanana.Corporation:louie_branch
Obanana.Corporation:mark_4
Obanana.Corporation:gelo_branch
Obanana.Corporation:stacy_branch
Obanana.Corporation:raymart_branch
Obanana.Corporation:jun-branch
Obanana.Corporation:mark_3
Obanana.Corporation:mark
Obanana.Corporation:mark_2
Obanana.Corporation:working_vendor_upload_branch
...
compare: Obanana.Corporation:682848438d68c380aae75d14cfd425346ab0c3fd
Branches Tags
Obanana.Corporation:main
Obanana.Corporation:louie_branch
Obanana.Corporation:mark_4
Obanana.Corporation:gelo_branch
Obanana.Corporation:stacy_branch
Obanana.Corporation:raymart_branch
Obanana.Corporation:jun-branch
Obanana.Corporation:mark_3
Obanana.Corporation:mark
Obanana.Corporation:mark_2
Obanana.Corporation:working_vendor_upload_branch

3 Commits
fa7b1a7a54 ... 682848438d

Author SHA1 Message Date
MarkHipe 682848438d Merge pull request 'raymart_branch' (#25) from raymart_branch into main 
Reviewed-on: #25
 2024-02-26 08:38:50 +08:00
raymart ac74d7c61a Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into raymart_branch 2024-02-26 08:34:46 +08:00
raymart be6b818f76 Vendor list card hide the level and add href 2024-02-26 08:34:06 +08:00
4 changed files with 88 additions and 46 deletions
Show Stats Expand all files Collapse all files

64
catalog-single-vendor.php
View File

@ -217,14 +217,15 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-page-description ec-page-description-info">
<div class="ec-page-block">
<div class="ec-catalog-vendor">
<?php
<a href="vendor-profile.html">
<?php
if (isset($vendor["vendor_image"])) {
?><img src="<?php echo $vendor["vendor_image"] ?>" alt="vendor img"><?php
} else {
?><img src="assets/images/vendor/5.jpg" alt="vendor img"><?php
}
?>
?><img src="<?php echo $vendor["vendor_image"] ?>" alt="vendor img"><?php
} else {
?><img src="assets/images/vendor/5.jpg" alt="vendor img"><?php
}
?>
</a>
</div>
<div class="ec-catalog-vendor-info row">
@ -234,20 +235,25 @@ if ($_SESSION["userId"] <> "") {
</a>
<p>( Retail Business )</p>
</div>
<div class="col-lg-3 col-md-6 ec-catalog-ratings pad-15">
<!-- raymart remove level feb 22 2024 -->
<!-- <div class="col-lg-3 col-md-6 ec-catalog-ratings pad-15">
<h6>Level</h6>
<p>Level : 9 out of 10</p>
</div>
</div> -->
<div class="col-lg-3 col-md-6 ec-catalog-pro-count pad-15">
<a href="vendor-profile.html">
<h6>Seller Products</h6>
<?php
$products = productListVendor($_GET["id"]);
?>
</a>
<p><?php echo count($products) ?> Products</p>
</div>
<div class="col-lg-3 col-md-6 ec-catalog-since pad-15">
<a href="vendor-profile.html">
<h6>Seller since</h6>
<p><?php echo $vendor["date_registered"] ?></p>
</a>
</div>
</div>
</div>
@ -311,17 +317,18 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-product-inner">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="shop-left-sidebar-col-4.php" class="image">
<?php
<!-- raymart added for link for product feb 22 2024 -->
<a class="image" href="product-left-sidebar.php?id=<?php echo $product["_id"] ?>"<?php echo $product["product_image"] ?>>
<?php
if (isset($product["product_image"]) && $product["product_image"] <> "") {
?>
<img class="main-image" src="<?php echo $product["product_image"] ?>" alt="Product" />
<img class="hover-image" src="<?php echo $product["product_image"] ?>" alt="Product" />
<!-- <img class="hover-image" src="<?php echo $product["product_image"] ?>" alt="Product" /> -->
<?php
} else {
?>
<img class="main-image" src="assets/images/product-image/6_1.jpg" alt="Product" />
<img class="hover-image" src="assets/images/product-image/6_2.jpg" alt="Product" />
<!-- <img class="hover-image" src="assets/images/product-image/6_2.jpg" alt="Product" /> -->
<?php
}
?>
@ -342,15 +349,17 @@ if ($_SESSION["userId"] <> "") {
</div>
<div class="ec-pro-content">
<h5 class="ec-pro-title"><a href="product-left-sidebar.php?id=<?php echo $product["_id"] ?>"><?php echo $product["product_name"] ?></a></h5>
<div class="ec-pro-rating">
<!-- raymart remove ratings feb 22 2024 -->
<!-- <div class="ec-pro-rating">
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star"></i>
</div>
</div> -->
<div class="ec-pro-list-desc">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum is simply dutmmy text ever since the 1500s, when an unknown printer took a galley.</div>
<span class="ec-price">
<!-- raymart added $ to pesos function feb 22 2024 -->
<?php if (isset($product["sale_price"]) && $product["sale_price"] > 0) : ?>
<span class="old-price">&#8369;<?php echo number_format($product["regular_price"], 2, ".", ",") ?></span>
<span class="new-price">&#8369;<?php echo number_format($product["sale_price"], 2, ".", ",") ?></span>
@ -362,9 +371,22 @@ if ($_SESSION["userId"] <> "") {
<?php else : ?>
<span class="inquire-text">Inquire</span>
<?php endif; ?>
<!-- <?php if (isset($product["sale_price"]) && $product["sale_price"] > 0) : ?>
<span class="old-price">&#8369;<?php echo number_format($product["regular_price"], 2, ".", ",") ?></span>
<span class="new-price">&#8369;<?php echo number_format($product["sale_price"], 2, ".", ",") ?></span>
<?php elseif (isset($product["regular_price"]) && $product["regular_price"] != "") : ?>
<span class="new-price">&#8369;<?php echo number_format($product["regular_price"], 2, ".", ",") ?></span>
<?php elseif ($product["regular_price"] == "" || $product["regular_price"] == null) : ?>
<span class="inquire-text">Inquire</span>
<?php else : ?>
<span class="inquire-text">Inquire</span>
<?php endif; ?> -->
</span>
<div class="ec-pro-option">
<div class="ec-pro-color">
<!-- raymart remove color and size function feb 22 2024 -->
<!-- <div class="ec-pro-color">
<span class="ec-pro-opt-label">Color</span>
<ul class="ec-opt-swatch ec-change-img">
<?php
@ -381,8 +403,8 @@ if ($_SESSION["userId"] <> "") {
}
?>
</ul>
</div>
<div class="ec-pro-size">
</div> -->
<!-- <div class="ec-pro-size">
<span class="ec-pro-opt-label">Size</span>
<ul class="ec-opt-size">
<li class="active"><a href="#" class="ec-opt-sz" data-old="$25.00" data-new="$20.00" data-tooltip="Small">S</a></li>
@ -390,7 +412,7 @@ if ($_SESSION["userId"] <> "") {
<li><a href="#" class="ec-opt-sz" data-old="$30.00" data-new="$25.00" data-tooltip="Large">X</a></li>
<li><a href="#" class="ec-opt-sz" data-old="$35.00" data-new="$30.00" data-tooltip="Extra Large">XL</a></li>
</ul>
</div>
</div> -->
</div>
</div>
</div>
@ -864,7 +886,7 @@ if ($_SESSION["userId"] <> "") {
<!-- Footer navigation panel for responsive display end -->
<!-- Recent Purchase Popup -->
<div class="recent-purchase">
<!-- <div class="recent-purchase">
<img src="assets/images/product-image/1.jpg" alt="payment image">
<div class="detail">
<p>Someone in new just bought</p>
@ -872,7 +894,7 @@ if ($_SESSION["userId"] <> "") {
<p>10 Minutes ago</p>
</div>
<a href="javascript:void(0)" class="icon-btn recent-close">×</a>
</div>
</div> -->
<!-- Recent Purchase Popup end -->
<!-- Cart Floating Button -->

43
index.php
View File

@ -568,6 +568,7 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-product-inner">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="product-left-sidebar.php?id=<?php echo $forAll[$pid]["_id"]; ?>">
<!-- raymart added function for images feb 21 2024-->
<?php
if (isset($forAll[$pid]['images'])) {
@ -584,6 +585,7 @@ if ($_SESSION["userId"] <> "") {
<?php
}
?>
</a>
<!-- <a href="product-left-sidebar.php?id=<?php echo $forAll[$pid]["_id"]; ?>" class="image">
<img class="main-image" src="<?php echo $forAll[$pid]["product_image"] ?>" alt="Product" />
<img class="hover-image" src="<?php echo $forAll[$pid]["product_image"] ?>" alt="Product" />
@ -669,22 +671,24 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-product-inner">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="product-left-sidebar.php?id=<?php echo $electronics[$pid]["_id"]; ?>">
<!-- raymart added function for images feb 21 2024-->
<?php
if (isset($electronics[$pid]['images'])) {
$image_urls = explode(',', $electronics[$pid]['images']);
if (!empty($image_urls)) {
$first_image_url = trim($image_urls[0]);
?>
<img class="main-image" src="<?php echo $first_image_url; ?>" alt="edit" />
<?php
if (isset($electronics[$pid]['images'])) {
$image_urls = explode(',', $electronics[$pid]['images']);
if (!empty($image_urls)) {
$first_image_url = trim($image_urls[0]);
?>
<img class="main-image" src="<?php echo $first_image_url; ?>" alt="edit" />
<?php
}
} else {
?>
<img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
<?php
}
} else {
?>
<img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
<?php
}
?>
</a>
<!-- <a href="product-left-sidebar.php?id=<?php echo $electronics[$pid]["_id"]; ?>" class="image">
<img class="main-image" src="<?php echo $electronics[$pid]["product_image"] ?>" alt="Product" />
<img class="hover-image" src="<?php echo $electronics[$pid]["product_image"] ?>" alt="Product" />
@ -772,6 +776,7 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-product-inner">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="product-left-sidebar.php?id=<?php echo $smartHome[$pid]["_id"]; ?>">
<!-- raymart added function for images feb 21 2024-->
<?php
if (isset($smartHome[$pid]['images'])) {
@ -788,6 +793,7 @@ if ($_SESSION["userId"] <> "") {
<?php
}
?>
</a>
<!-- <a href="product-left-sidebar.php?id=<?php echo $smartHome[$pid]["_id"]; ?>" class="image">
<img class="main-image" src="<?php echo $smartHome[$pid]["product_image"] ?>" alt="Product" />
<img class="hover-image" src="<?php echo $smartHome[$pid]["product_image"] ?>" alt="Product" />
@ -873,6 +879,7 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-product-inner">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="product-left-sidebar.php?id=<?php echo $forVehicle[$pid]["_id"]; ?>">
<!-- raymart added function for images feb 21 2024-->
<?php
if (isset($forVehicle[$pid]['images'])) {
@ -889,6 +896,7 @@ if ($_SESSION["userId"] <> "") {
<?php
}
?>
</a>
<!-- <a href="product-left-sidebar.php?id=<?php echo $forVehicle[$pid]["_id"]; ?>" class="image">
<img class="main-image" src="<?php echo $forVehicle[$pid]["product_image"] ?>" alt="Product" />
<img class="hover-image" src="<?php echo $forVehicle[$pid]["product_image"] ?>" alt="Product" />
@ -1324,16 +1332,17 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-vendor-info">
<a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>" class="name"><?php echo $vendor['user_login'] ?></a>
<p class="prod-count"><?php echo count($vendorProducts) ?> Products</p>
<div class="ec-pro-rating">
<!-- raymart remove ratings and sales feb 22 2024 -->
<!-- <div class="ec-pro-rating">
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star"></i>
</div>
<div class="ec-sale">
</div> -->
<!-- <div class="ec-sale">
<p title="Weekly sales">Sales 954</p>
</div>
</div> -->
</div>
</div>
<div class="ec-vendor-prod">
@ -1476,6 +1485,7 @@ if ($_SESSION["userId"] <> "") {
<div class="ec-product-inner">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="product-left-sidebar.php?id=<?php echo $newArrival[$pid]["_id"]; ?>">
<!-- raymart added function for images feb 21 2024-->
<?php
if (isset($newArrival[$pid]['images'])) {
@ -1492,6 +1502,7 @@ if ($_SESSION["userId"] <> "") {
<?php
}
?>
</a>
<!-- <a href="product-left-sidebar.php?id=<?php echo $newArrival[$pid]["_id"]; ?>" class="image">
<img class="main-image" src="<?php echo $newArrival[$pid]["product_image"] ?>" alt="Product" />
<img class="hover-image" src="<?php echo $newArrival[$pid]["product_image"] ?>" alt="Product" />

17
vendor-list.php
View File

@ -179,6 +179,7 @@ $products = productList();
<div class="ec-multi-vendor-detail">
<div class="ec-page-description ec-page-description-info description-info-list">
<div class="ec-catalog-vendor">
<a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>"></a>
<?php
if(!isset($vendor['vendor_image'])){
?><img src="assets/images/vendor/1.jpg" alt="vendor img"><?php
@ -198,15 +199,19 @@ $products = productList();
<p>( Retail Business )</p>
</div>
</div>
<div class="col-lg-3 col-md-6 detail-card-space">
<!-- <div class="col-lg-3 col-md-6 detail-card-space">
<div class="ec-catalog-ratings catalog-detail-card">
<h6>Level</h6>
<a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>">
<h6>Level</h6>
</a>
<p>( Level : 9 out of 10 )</p>
</div>
</div>
</div> -->
<div class="col-lg-3 col-md-6 detail-card-space">
<div class="ec-catalog-pro-count catalog-detail-card">
<h6>Seller Products</h6>
<a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>">
<h6>Seller Products</h6>
</a>
<?php
$vendorId = $vendor['_id'];
$product = array_filter($products, function ($var) use ($vendorId) {
@ -217,7 +222,9 @@ $products = productList();
</div>
<div class="col-lg-3 col-md-6 detail-card-space">
<div class="ec-catalog-since catalog-detail-card">
<h6>Seller since</h6>
<a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>">
<h6>Seller since</h6>
</a>
<p><?php echo $vendor['date_registered']; ?></p>
</div>
</div>

10
wishlist.php
View File

@ -182,7 +182,8 @@ if ($_SESSION["userId"] <> "") {
<input type="checkbox" class="product-checkbox" style="width: 20px; height: 20px; "value="<?php echo $product["_id"]; ?>">
<div class="ec-pro-image-outer">
<div class="ec-pro-image">
<a href="shop-left-sidebar-col-4.php" class="image">
<a href="product-left-sidebar.php?id=<?php echo $product["_id"]; ?>" class="image">
<!-- <a href="shop-left-sidebar-col-4.php" class="image"> -->
<img class="main-image" src="<?php echo $product["product_image"]; ?>" alt="Product" />
<!-- <img class="hover-image" src="<?php echo $product["product_image"]; ?>" alt="Product" /> -->
</a>
@ -403,7 +404,8 @@ if ($_SESSION["userId"] <> "") {
</div>
<section>
<!-- Start Offer section -->
<section class="labels section-space-p">
<!-- raymart remove start offer section from style feb 22 2024-->
<!-- <section class="labels section-space-p">
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
@ -537,7 +539,7 @@ if ($_SESSION["userId"] <> "") {
<!-- Recent Purchase Popup -->
<div class="recent-purchase">
<!-- <div class="recent-purchase">
<img src="assets/images/product-image/1.jpg" alt="payment image">
<div class="detail">
<p>Someone in new just bought</p>
@ -545,7 +547,7 @@ if ($_SESSION["userId"] <> "") {
<p>10 Minutes ago</p>
</div>
<a href="javascript:void(0)" class="icon-btn recent-close">×</a>
</div>
</div> -->
<!-- Recent Purchase Popup end -->