Merge branch 'main' into jun-branch

This commit is contained in:
Jun Barroga 2024-02-21 18:18:41 +08:00
commit 0f55521b19
6 changed files with 21 additions and 15 deletions

View File

@ -3,4 +3,11 @@ $_SESSION["is_test"]=true;
$_SESSION["test_email_rcpt"]="stacyjoycemapano@gmail.com";
$_SESSION["sales_email"]="stacyjoycemapano@gmail.com";
$_SESSION["data_endpoint"]="api.obanana.shop";
if ($_SESSION["is_test"]){
$_SESSION["obpay"]="web.obpay.online/test";
$_SESSION["obpay_gate"]="gate.obpay.online/api";
} else {
$_SESSION["obpay"]="web.obpay.online";
$_SESSION["obpay_gate"]="gate.obpay.online/api/v1";
}
?>

View File

@ -848,7 +848,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
} else if (pay2RadioButton.checked) {
try {
const base64Credentialss = btoa(`${username}:${password}`);
const response = await fetch('https://gate.obpay.online/api/payment/links', {
const response = await fetch('https://<?php echo $_SESSION["obpay_gate"]; ?>/payment/links', {
method: "POST",
body: JSON.stringify({
amount: totalAmount * 100,

View File

@ -856,7 +856,7 @@ if (isset($customer_data[0]["address"]) && is_array($customer_data[0]["address"]
try {
const base64Credentialss = btoa(`${username}:${password}`);
const response = await fetch('https://gate.obpay.online/api/v1/payment/links', {
const response = await fetch('https://<?php echo $_SESSION["obpay_gate"]; ?>/payment/links', {
method: "POST",
body: JSON.stringify({
amount: totalAmount * 100,

View File

@ -862,7 +862,7 @@
<li><a href="privacy-policy.html">Privacy Policy</a></li>
</ul> -->
</li>
<li class="dropdown"><span class="main-label-note-new" data-toggle="tooltip" title="NEW"></span><a href="same_day_delivery.php">Same-Day-Delivery</a>
<li class="dropdown"><span class="main-label-note-new" data-toggle="tooltip" title="NEW"></span><a href="same_day_delivery.php">Next-Day-Delivery</a>
<!-- <ul class="sub-menu">
<li class="dropdown position-static"><a href="javascript:void(0)">Mail
Confirmation

View File

@ -464,9 +464,9 @@ if ($_SESSION["userId"] <> "") {
<div class="row">
<div class="col-xl-6 col-lg-7 col-md-7 col-sm-7 align-self-center">
<div class="ec-slide-content slider-animation">
<h1 class="ec-slide-title">Obanana Series 2 PowerBank Collection</h1>
<h2 class="ec-slide-stitle">More that just a backup - a lifeline for your devices</h2>
<p>A perfect blend of style and substance - stay in control of your day!</p>
<h1 class="ec-slide-title">FREE SHIPPING!</h1>
<h2 class="ec-slide-stitle">Obanana Series 2 PowerBank Collection</h2>
<p>More that just a backup - a lifeline for your devices. A perfect blend of style and substance - stay in control of your day!</p>
<a href="https://obanana.com/product-left-sidebar.php?id=6576c58dd1dba10ba2392765" class="btn btn-lg btn-secondary">Order Now</a>
</div>
</div>

View File

@ -115,10 +115,10 @@ if ($_SESSION["userId"] <> "") {
<div class="row">
<div class="col-xl-6 col-lg-7 col-md-7 col-sm-7 align-self-center">
<div class="ec-slide-content slider-animation">
<h1 class="ec-slide-title">Obanana Series 2 PowerBank Collection</h1>
<h2 class="ec-slide-stitle">More that just a backup - a lifeline for your devices</h2>
<p>A perfect blend of style and substance - stay in control of your day!</p>
<a href="https://obanana.com/product-left-sidebar.php?id=6576c58dd1dba10ba2392765" class="btn btn-lg btn-secondary">Order Now</a>
<h1 class="ec-slide-title">Next Day Delivery!</h1>
<h2 class="ec-slide-stitle">Get your purchased items within 24 hours!</h2>
<p>Your satisfaction is our priority, and we're here to make your shopping experience convenient and enjoyable!</p>
<!-- <a href="https://obanana.com/product-left-sidebar.php?id=6576c58dd1dba10ba2392765" class="btn btn-lg btn-secondary">Order Now</a> -->
</div>
</div>
</div>
@ -142,16 +142,15 @@ if ($_SESSION["userId"] <> "") {
<div class="row">
<div class="col-lg-6 col-md-12">
<div class="ec-cat-bnr">
<a href="shop-left-sidebar-col-4.php"><span></span></a>
<a href="shop-left-sidebar-col-4.php"><span><img src="https://api.obanana.com/images/storage/web_images/1708412192539-NEXT%20DAY%20delivery.png" alt=""></span></a>
</div>
</div>
<div class="col-lg-6 col-md-12">
<div class="ec-page-description">
<h6>The Best deal on top brands</h6>
<p class="m-0">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. It has survived not only five centuries, but also the
leap into electronic typesetting, remaining essentially unchanged.
<p class="m-0">
We strive to provide exceptional service to our valued customers!
When you make purchases from this list, we're delighted to ensure that they are promptly delivered to you on the very next day. Your satisfaction is our priority, and we're here to make your shopping experience convenient and enjoyable!
<p>
</div>
</div>