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

Compare commits

base: Obanana.Corporation:1e876e09acfe63a449ef36e86c6365ccce23ea8d
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:82b5b94cbdbf8203c9d360bc665d9c8bca830d57
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

No commits in common. "1e876e09acfe63a449ef36e86c6365ccce23ea8d" and "82b5b94cbdbf8203c9d360bc665d9c8bca830d57" have entirely different histories.
1e876e09ac ... 82b5b94cbd

5 changed files with 71 additions and 106 deletions
Show Stats Expand all files Collapse all files

6
checkouttest.php
View File

@ -605,8 +605,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
<span class="ec-price">
<span class="new-price">Subtotal: <?php echo $checkout['shipping_fee'] + $checkout['total_amount']; ?></span>
</span>
<!-- 02-22-2024 Stacy hide variation -->
<!-- <div class="ec-pro-option">
<div class="ec-pro-option">
<div class="ec-pro-color">
<span class="ec-pro-opt-label">Color</span>
<ul class="ec-opt-swatch ec-change-img">
@ -630,8 +629,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
</li>
</ul>
</div>
</div> -->
<!-- 02-22-2024 Stacy hide variation -->
</div>
</div>
</div>
<?php } ?>

8
header.php
View File

@ -977,15 +977,15 @@
<li><a href="javascript:void(0)" data-scroll="collection" class="nav-scroll">Top
Collection</a></li>
<li><a href="javascript:void(0)" data-scroll="categories" class="nav-scroll">Categories</a></li>
<!-- <li><a href="javascript:void(0)" data-scroll="offers" class="nav-scroll">Offers</a></li> -->
<li><a href="javascript:void(0)" data-scroll="offers" class="nav-scroll">Offers</a></li>
<li><a href="javascript:void(0)" data-scroll="vendors" class="nav-scroll">Top
Vendors</a></li>
<li><a href="javascript:void(0)" data-scroll="services" class="nav-scroll">Services</a></li>
<li><a href="javascript:void(0)" data-scroll="arrivals" class="nav-scroll">New
Arrivals</a></li>
<!-- <li><a href="javascript:void(0)" data-scroll="reviews" class="nav-scroll">Client
Review</a></li> -->
<!-- <li><a href="javascript:void(0)" data-scroll="insta" class="nav-scroll">Instagram Feed</a></li> -->
<li><a href="javascript:void(0)" data-scroll="reviews" class="nav-scroll">Client
Review</a></li>
<li><a href="javascript:void(0)" data-scroll="insta" class="nav-scroll">Instagram Feed</a></li>
</ul>
</li>
</ul>

143
product-left-sidebar.php
View File

@ -320,9 +320,7 @@ if (isset($_GET['id'])) {
$productImage = $i;
}
?>
<!-- <img class="img-responsive" src="<?php #echo $productImage; ?>" alt="" style="width: 100%; height: 100%; object-fit: cover; object-position: center center;"> -->
<!-- 02-26-2024 Stacy updated img width & height -->
<img class="img-responsive" src="<?php echo $productImage; ?>" alt="" style="max/width: 90px; height: 120px; object-fit: cover; object-position: center center;">
<img class="img-responsive" src="<?php echo $productImage; ?>" alt="" style="width: 100%; height: 100%; object-fit: cover; object-position: center center;">
</div>
<?php
}
@ -338,8 +336,7 @@ if (isset($_GET['id'])) {
<h5 class="ec-single-title" id="productTitle"><?php echo $product_details['product_name']; ?></h5>
<!-- <h5 class="ec-single-title" id="productTitlemodal"><?php echo $product_details['product_name']; ?></h5> -->
<!-- 02-22-2024 Stacy hide -->
<!-- <div class="ec-single-rating-wrap">
<div class="ec-single-rating-wrap">
<div class="ec-single-rating">
<i class="ecicon eci-star fill"></i>
<i class="ecicon eci-star fill"></i>
@ -349,11 +346,10 @@ if (isset($_GET['id'])) {
</div>
<span class="ec-read-review"><a href="#ec-spt-nav-review">Be the first to
review this product</a></span>
</div> -->
</div>
<div class="ec-single-desc" id="shortDescription"><?php echo $product_details['product_description']; ?></div>
<!-- 02-22-2024 Stacy hide -->
<!-- <div class="ec-single-sales">
<div class="ec-single-sales">
<div class="ec-single-sales-inner">
<div class="ec-single-sales-title">sales accelerators</div>
<div class="ec-single-sales-visitor">real time <span>24</span> visitor
@ -368,8 +364,7 @@ if (isset($_GET['id'])) {
<div class="ec-single-count-desc">Time is Running Out!</div>
</div>
</div>
</div> -->
</div>
<div class="ec-single-price-stoke">
<div class="ec-single-price">
<span class="ec-single-ps-title">As low as</span>
@ -402,32 +397,32 @@ if (isset($_GET['id'])) {
<div class="ec-pro-variation-content">
<ul class="eccart-pro-items">
<?php
$main_product_image = isset($product_details["product_image"]) ? $product_details["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
?>
<a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($product_details), ENT_QUOTES, 'UTF-8'); ?>)">
<li style="width: 100px; height: 100px">
<img src="<?php echo $main_product_image; ?>" alt="product">
<?php foreach ($product_details['variables'] as $variable) { ?>
<p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
<?php } ?>
</li>
</a>
$main_product_image = isset($product_details["product_image"]) ? $product_details["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
?>
<a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($product_details), ENT_QUOTES, 'UTF-8'); ?>)">
<li style="width: 100px; height: 100px">
<img src="<?php echo $main_product_image; ?>" alt="product">
<?php foreach ($product_details['variables'] as $variable) { ?>
<p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
<?php } ?>
</li>
</a>
<?php
foreach ($variation_details as $index => $variation) {
$variationImage = isset($variation["product_image"]) ? $variation["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
?>
<a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($variation), ENT_QUOTES, 'UTF-8'); ?>)">
<li style="width: 100px; height: 100px">
<img src="<?php echo $variationImage; ?>" alt="product">
<?php foreach ($variation['variables'] as $variable) { ?>
<p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
<?php } ?>
</li>
</a>
<?php
}
?>
<?php
foreach ($variation_details as $index => $variation) {
$variationImage = isset($variation["product_image"]) ? $variation["product_image"] : 'https://upload.wikimedia.org/wikipedia/commons/6/65/No-Image-Placeholder.svg';
?>
<a href="javascript:void(0);" onclick="selectVariation(<?php echo htmlspecialchars(json_encode($variation), ENT_QUOTES, 'UTF-8'); ?>)">
<li style="width: 100px; height: 100px">
<img src="<?php echo $variationImage; ?>" alt="product">
<?php foreach ($variation['variables'] as $variable) { ?>
<p><?php echo $variable['name'] . ': ' . $variable['value']; ?></p>
<?php } ?>
</li>
</a>
<?php
}
?>
</ul>
</div>
@ -467,57 +462,35 @@ if (isset($_GET['id'])) {
<?php
}
?>
<!-- 20240212 Jun Jihad Include Parent Product in the Variation Selection -->
<!-- 20240212 Jun Jihad Include Parent Product in the Variation Selection -->
<!-- 02-22-2024 Stacy modified this block of code -->
<div class="ec-single-qty">
<div class="qty-plus-minuses" style="display:flex; overflow:visible;">
<!-- <div class="qty-btn" style="color:#ffaa00; font-size:35px; padding-right:5px; cursor: pointer;" onclick="decrement()">-</div>
<input class="qty-inputs" style="width:100px; height:40px" type="number" name="ec_qtybtn" value="<?php #echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; ?>" id="qty-input" />
<div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div> -->
<div class="ec-single-cart" style="display:flex; flex-direction:row; width:80%; overflow:visible; text-align:center; align-items:center; ">
<div class="qty-plus-minuses">
<div class="qty-btn" onclick="decrement()">-</div>
<input class="qty-inputs" type="number" name="ec_qtybtn" value="<?php echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1"; ?>" id="qty-input" />
<div class="qty-btn" onclick="increment()">+</div>
</div>
<div class="ec-single-cart">
<!-- 02-13-24 Jun Jihad Contact Seller will appear to Variable products with no price -->
<?php
if ($_SESSION["isLoggedIn"]) {
if ($product_details['product_type'] === "variable") {
echo '<div class="qty-btn" style="color:#ffaa00; font-size:35px; padding-right:5px; cursor: pointer;" onclick="decrement()">-</div>';
echo '<input class="qty-inputs" style="width:110px; height:40px" type="number" name="ec_qtybtn" value="';
echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1";
echo '" id="qty-input" />';
echo '<div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div>';
echo '<div style="display:flex; margin-left:45px;"><button type="button" class="btn btn-primary" id="contactSellerButton" style="background:#ffaa00; width:190px;" data-bs-toggle="modal" data-bs-target="#priceModal"><i class="fi-rr-envelope" style="font-size:20px; margin-bottom:-3px; margin-right:10px;"></i>Contact Seller</button>';
echo '<div class="ec-single-wishlist">
<a class="ec-btn-group wishlist" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart" style="color:#B80F0A; font-size:20px;"></i></a>
</div></div>';
} else {
if (!empty($product_details['regular_price']) || !empty($product_details['sale_price'])) {
echo '<div class="qty-btn" style="color:#ffaa00; font-size:35px; padding-right:5px; cursor: pointer;" onclick="decrement()">-</div>';
echo '<input class="qty-inputs" style="width:100px; height:40px" type="number" name="ec_qtybtn" value="';
echo (!empty($product_details['minimum_order'])) ? $product_details['minimum_order'] : "1";
echo '" id="qty-input" />';
echo '<div class="qty-btn" style="color:#ffaa00; font-size:25px; padding-left:5px; cursor: pointer;" onclick="increment()">+</div>';
echo '<div id="addToCartMessage"></div>';
echo '<button class="btn btn-primary" id="addToCartButton" style="background:#ffaa00; margin-left:55px;"><i class="fi-rr-shopping-bag" style="font-size:20px; margin-bottom:-3px; margin-right:10px;"></i>Add To Cart</button>';
echo '<div class="ec-single-wishlist">
<a class="ec-btn-group wishlist" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart" style="color:#B80F0A; font-size:20px;"></i></a>
</div>';
} else {
echo '<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#priceModal">Contact seller</button>';
}
}
} else {
echo '<div class="login-button" style=""><p style="color:red; text-wrap:nowrap;">Please log in to your account.</p>';
echo '<a href="login.php" style="margin-left:-2px;"><button type="button" class="btn btn-primary" style="margin-left:-2px; margin-top:-20px; background:#ffaa00; border-radius:10px; letter-spacing:1px;" data-bs-toggle="modal">LOGIN</button></a></div>';
}
?>
<!-- <div class="ec-single-wishlist" style="border: 1px solid yellow;">
<a class="ec-btn-group wishlist" style="padding-left:40px;" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart"></i></a>
</div> -->
<!-- 02-22-2024 Stacy modified this block of code -->
if ($_SESSION["isLoggedIn"]) {
if ($product_details['product_type'] === "variable") {
echo '<button class="btn btn-primary" id="addToCartButton" style="display:none">Add To Cart</button>';
echo '<button type="button" class="btn btn-primary" id="contactSellerButton" data-bs-toggle="modal" data-bs-target="#priceModal">Contact seller</button>';
} else {
if (!empty($product_details['regular_price']) || !empty($product_details['sale_price'])) {
echo '<div id="addToCartMessage"></div>';
echo '<button class="btn btn-primary" id="addToCartButton">Add To Cart</button>';
} else {
echo '<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#priceModal">Contact seller</button>';
}
}
} else {
echo '<p>Please log in to add to cart.</p>';
}
?>
<!-- 02-13-24 Jun Jihad Contact Seller will appear to Variable products with no price -->
@ -536,9 +509,10 @@ if (isset($_GET['id'])) {
// echo '<p>Please log in to add to cart.</p>';
// }
?> -->
</div>
</div>
<div class="modal fade" id="priceModal" tabindex="-1" role="dialog" aria-labelledby="priceModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
@ -610,10 +584,9 @@ if (isset($_GET['id'])) {
</div>
</div>
<!-- <div class="ec-single-wishlist">
<div class="ec-single-wishlist">
<a class="ec-btn-group wishlist" title="Wishlist" onclick="wishlist()"><i class="fi fi-rr-heart"></i></a>
</div> -->
</div>
<!-- <div class="ec-single-quickview">
<a href="#" class="ec-btn-group quickview" data-link-action="quickview" title="Quick view" data-bs-toggle="modal" data-bs-target="#ec_quickview_modal"><i class="fi-rr-eye"></i></a>
</div> -->

12
vendor-dashboard.php
View File

@ -122,7 +122,7 @@ if (is_array($vendorOrderss)) {
<!-- Sidebar Category Block -->
<div class="ec-sidebar-block">
<div class="ec-vendor-block">
<div class="ec-vendor-block-bg" style="background-color:orange; background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;"></div>
<div class="ec-vendor-block-bg" style="background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;"></div>
<div class="ec-vendor-block-detail">
<img class="v-img" src=<?php echo $vendorData['vendor_image'] ?> alt="vendor image">
<h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
@ -160,8 +160,7 @@ if (is_array($vendorOrderss)) {
<h3> <?php echo count($vendorOrders); ?></h3>
</div>
</div>
<!-- 02-26-2024 Stacy commented out -->
<!-- <div class="col-lg-3 col-md-6">
<div class="col-lg-3 col-md-6">
<div class="ec-vendor-dashboard-sort-card color-green">
<h5>Earnings</h5>
<h3>$56<span>/ Day</span></h3>
@ -172,7 +171,7 @@ if (is_array($vendorOrderss)) {
<h5>Sales</h5>
<h3>550<span>/ Mo</span></h3>
</div>
</div> -->
</div>
</div>
<div class="ec-vendor-dashboard-card space-bottom-30">
<div class="ec-vendor-card-header">
@ -427,8 +426,7 @@ if (is_array($vendorOrderss)) {
</div>
</div>
</div>
<!-- 02-26-2024 Stacy commented out -->
<!-- <div class="ec-vendor-dashboard-card">
<div class="ec-vendor-dashboard-card">
<div class="ec-vendor-card-header">
<h5>Growth statastics</h5>
<div class="ec-header-btn">
@ -438,7 +436,7 @@ if (is_array($vendorOrderss)) {
<div class="ec-vendor-card-body">
<canvas id="growthChart"></canvas>
</div>
</div> -->
</div>
</div>
</div>
</div>

8
vendor-settings.php
View File

@ -144,16 +144,12 @@ if ($_SESSION["userId"] <> "") {
<div class="col-md-12">
<div class="ec-vendor-block-profile">
<div class="ec-vendor-block-img space-bottom-30 ">
<div class="ec-vendor-block-bg profBg" style="background-color:orange; background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;" id="myElement">
<div class="ec-vendor-block-bg profBg" style="background-image: url(<?php echo $vendorData['vendor_banner'] ?>) !important;" id="myElement">
<a href="#" class="btn btn-lg btn-primary" data-link-action="editmodal" title="Edit Detail" data-bs-toggle="modal" data-bs-target="#edit_modal">Edit Detail</a>
</div>
<div class="ec-vendor-block-detail">
<!-- 02-26-2024 Stacy added placeholder-->
<?php
$vendor_image = isset($vendorData[0]['vendor_image']) ? $vendorData[0]['vendor_image'] : 'https://yourteachingmentor.com/wp-content/uploads/2020/12/istockphoto-1223671392-612x612-1.jpg';
?>
<img class="v-img" src=<?php echo $vendor_image ?> alt="vendor image">
<img class="v-img" src=<?php echo $vendorData['vendor_image'] ?> alt="vendor image">
<h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
</div>
</div>