From 3fd03351c39d37d245ea813663fa2f0722193d6e Mon Sep 17 00:00:00 2001 From: raymart Date: Tue, 20 Feb 2024 11:21:23 +0800 Subject: [PATCH 1/5] Wishlist Multiple Delete and Wishlist Select All Delete --- wishlist.php | 149 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 120 insertions(+), 29 deletions(-) diff --git a/wishlist.php b/wishlist.php index 06c3d7b..bb1818d 100644 --- a/wishlist.php +++ b/wishlist.php @@ -1,9 +1,13 @@ + + "") { $_SESSION["isLoggedIn"] = true; @@ -15,24 +19,29 @@ if ($_SESSION["userId"] <> "") { + + oBanana B2B - Elevate Your Business + + + @@ -41,10 +50,12 @@ if ($_SESSION["userId"] <> "") { + + - + + - + - +
- + + +
@@ -451,11 +529,13 @@ if ($_SESSION["userId"] <> "") {
+
+
payment image @@ -468,6 +548,7 @@ if ($_SESSION["userId"] <> "") {
+
@@ -478,6 +559,7 @@ if ($_SESSION["userId"] <> "") {
+
@@ -594,6 +676,7 @@ if ($_SESSION["userId"] <> "") {
+
@@ -661,6 +744,7 @@ if ($_SESSION["userId"] <> "") {
+ @@ -668,6 +752,7 @@ if ($_SESSION["userId"] <> "") { + @@ -678,10 +763,12 @@ if ($_SESSION["userId"] <> "") { + + '; @@ -692,4 +779,8 @@ if ($_SESSION["userId"] <> "") { - \ No newline at end of file + + + + + From 13fed959b19922ca44ee4e20ca1f33b52d362e6d Mon Sep 17 00:00:00 2001 From: raymart Date: Tue, 20 Feb 2024 11:24:13 +0800 Subject: [PATCH 2/5] Wishlist Multiple Delete --- wishlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wishlist.php b/wishlist.php index bb1818d..5aca70d 100644 --- a/wishlist.php +++ b/wishlist.php @@ -178,7 +178,7 @@ if ($_SESSION["userId"] <> "") { ?>
- + ">
From 2f7eb29f435185b54cc20f958dcfd48ff9796744 Mon Sep 17 00:00:00 2001 From: RryAn05 Date: Tue, 20 Feb 2024 13:01:25 +0800 Subject: [PATCH 3/5] Cart Floating Side-Bar UI & Contact Seller --- admin/config.php | 2 +- assets/js/{tester3.js => tester5.js} | 12 ++++---- catalog-single-vendor.php | 2 +- contact-seller-action.php | 42 ++++++++++++++++++++++++++++ contact-us-action.php | 23 +++++++++++---- functions.php | 5 ++-- header.php | 15 ++++++---- product-left-sidebar.php | 36 ++++++++++++++++-------- same_day_delivery.php | 2 +- 9 files changed, 105 insertions(+), 34 deletions(-) rename assets/js/{tester3.js => tester5.js} (96%) create mode 100644 contact-seller-action.php diff --git a/admin/config.php b/admin/config.php index ad558da..33d99e6 100644 --- a/admin/config.php +++ b/admin/config.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/assets/js/tester3.js b/assets/js/tester5.js similarity index 96% rename from assets/js/tester3.js rename to assets/js/tester5.js index 033da4c..1fb1fdb 100644 --- a/assets/js/tester3.js +++ b/assets/js/tester5.js @@ -611,12 +611,14 @@ function popupAddToCart(product, productVendor, token, email, password, customer Unit Price: ${response.items[0].price} Subtotal: ${totalAmount} -
-
-
- -
+
+ +
+
-
+ +
+
+
- x +
`; getLatestOrders() diff --git a/catalog-single-vendor.php b/catalog-single-vendor.php index 4c1332d..6923744 100644 --- a/catalog-single-vendor.php +++ b/catalog-single-vendor.php @@ -1092,7 +1092,7 @@ if ($_SESSION["userId"] <> "") { '; + echo ''; } else { echo ''; } diff --git a/contact-seller-action.php b/contact-seller-action.php new file mode 100644 index 0000000..4f6d12a --- /dev/null +++ b/contact-seller-action.php @@ -0,0 +1,42 @@ + + 0) { +// $result = customerExists($_SESSION["email"]); +if ($response) { $_SESSION["SuccessfullySent"] = "Message Sent Successfully"; header("location: contact-us.php"); } -# 02-15-2024 Stacy added message sent \ No newline at end of file + +#02-19-2024 Stacy added email to be sent to customer +$response2 = sendEmail_customer( + $fName, + $lName, + $email, +); +$array = json_decode($response2,true); +var_dump($array); +header("location: contact-us.php"); + +if ($response2) { +// $_SESSION["SuccessfullySent"] = "Message Sent Successfully"; +header("location: contact-us.php"); +} \ No newline at end of file diff --git a/functions.php b/functions.php index 48f1680..ef0387f 100644 --- a/functions.php +++ b/functions.php @@ -542,7 +542,6 @@ function sendEmail_obanana($fName, $lName, $email, $phone, $message) } - function sendEmail_customer($fName, $lName, $email) { // if($_SESSION["is_test"]==true && $_SESSION["test_email_rcpt"]!=""){ @@ -628,7 +627,7 @@ function contact_Seller($cstm_email, $prd_name, $prd_qnty, $message) "Name" => "Subscriber" ] ], - "Subject" => "Obanana Contact Us Form", + "Subject" => "Obanana Contact Seller Form", "TextPart" => "Greetings from Obanana!", "HTMLPart" => $msgto_seller ] @@ -688,7 +687,7 @@ function contact_Inquirer($cstm_email) "Name" => "Subscriber" ] ], - "Subject" => "Obanana Contact Us Form", + "Subject" => "Obanana Contact Seller Form", "TextPart" => "Greetings from Obanana!", "HTMLPart" => $msgto_inquirer ] diff --git a/header.php b/header.php index 9093372..afc8a2a 100644 --- a/header.php +++ b/header.php @@ -386,13 +386,16 @@
Subtotal:
-
-
-
- -
+
+ +
+
-
+ +
+
+ + +
- - x +
$variation) {
- " id="qty-input" min="" /> + " id="qty-input" min="" />
@@ -525,16 +525,26 @@ foreach ($variation_details as $index => $variation) {
DETAILED REQUIREMENTS
-
- - + + + + + '/> + " id="qty-input" min="" /> + + '/> + + +
+ +
+
-
+
@@ -794,12 +804,14 @@ foreach ($variation_details as $index => $variation) { Unit Price: ${response.items[0].price} Subtotal: ${totalAmount} -
-
-
- -
+
+ +
+
-
+ +
+
+
- x +
`; getLatestOrders() diff --git a/same_day_delivery.php b/same_day_delivery.php index fefb77f..4475d5f 100644 --- a/same_day_delivery.php +++ b/same_day_delivery.php @@ -901,7 +901,7 @@ if ($_SESSION["userId"] <> "") { '; + echo ''; } else { echo ''; } From a02f0667ffb755a54246f05a7539798e9e658a12 Mon Sep 17 00:00:00 2001 From: RryAn05 Date: Tue, 20 Feb 2024 15:01:07 +0800 Subject: [PATCH 4/5] Cart --- admin/config.php | 2 +- assets/js/tester5.js | 2 +- contact-seller-action.php | 10 +++++----- contact-us-action.php | 2 +- contact-us.php | 2 +- header.php | 4 ++-- index.php | 2 +- product-left-sidebar.php | 21 ++++++++++++++++++--- 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/admin/config.php b/admin/config.php index 33d99e6..d7fea8a 100644 --- a/admin/config.php +++ b/admin/config.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/assets/js/tester5.js b/assets/js/tester5.js index 1fb1fdb..c6de1b5 100644 --- a/assets/js/tester5.js +++ b/assets/js/tester5.js @@ -612,7 +612,7 @@ function popupAddToCart(product, productVendor, token, email, password, customer Subtotal: ${totalAmount} -
+
-
+
diff --git a/contact-seller-action.php b/contact-seller-action.php index 4f6d12a..7b478db 100644 --- a/contact-seller-action.php +++ b/contact-seller-action.php @@ -20,12 +20,12 @@ include "functions.php"; var_dump($array); // header("location: product-left-sidebar.php?id=$id"); -# 02-15-2024 Stacy added message sent +# 02-20-2024 Stacy added message sent // $result = customerExists($_SESSION["email"]); -// if ($response) { -// $_SESSION["SuccessfullySent"] = "Message Sent Successfully"; -// header("location: contact-us.php"); -// } +if ($response) { + $_SESSION["SuccessfullySent"] = "Message Sent Successfully"; + header("location: product-left-sidebar.php?id=$id"); +} #02-19-2024 Stacy added email to be sent to customer diff --git a/contact-us-action.php b/contact-us-action.php index 31c4e50..616fad6 100644 --- a/contact-us-action.php +++ b/contact-us-action.php @@ -22,7 +22,7 @@ include "functions.php"; # 02-15-2024 Stacy added message sent // $result = customerExists($_SESSION["email"]); if ($response) { - $_SESSION["SuccessfullySent"] = "Message Sent Successfully"; + $_SESSION["SuccessfullySent"] = "Message Sent Successfully"; header("location: contact-us.php"); } diff --git a/contact-us.php b/contact-us.php index 68ad0ce..1a729e2 100644 --- a/contact-us.php +++ b/contact-us.php @@ -170,7 +170,7 @@ echo " "; } ?> diff --git a/header.php b/header.php index afc8a2a..198b535 100644 --- a/header.php +++ b/header.php @@ -387,13 +387,13 @@ Subtotal:
-
+
-
+
- +
diff --git a/index.php b/index.php index eb6266e..69ff38f 100644 --- a/index.php +++ b/index.php @@ -2060,7 +2060,7 @@ if ($_SESSION["userId"] <> "") { '; + echo ''; } else { echo ''; } diff --git a/product-left-sidebar.php b/product-left-sidebar.php index 8683873..37db111 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -249,6 +249,21 @@ if (isset($_GET['id'])) {
+ + '; + echo $_SESSION["SuccessfullySent"]; + echo '
'; + unset($_SESSION["SuccessfullySent"]); + echo " "; + } + ?> +
@@ -494,7 +509,7 @@ foreach ($variation_details as $index => $variation) { To:
- +
@@ -549,7 +564,6 @@ foreach ($variation_details as $index => $variation) {
-
@@ -805,7 +819,7 @@ foreach ($variation_details as $index => $variation) { Subtotal: ${totalAmount} -
+
-
+
@@ -1483,6 +1497,7 @@ foreach ($variation_details as $index => $variation) {
+ From daae43768c2221e2da75e23262046e76fdb997ea Mon Sep 17 00:00:00 2001 From: RryAn05 Date: Tue, 20 Feb 2024 15:21:33 +0800 Subject: [PATCH 5/5] Cart Floating Side-Bar UI, Contact Seller & Updated Contact Us --- assets/js/tester5.js | 2 +- header.php | 2 +- product-left-sidebar.php | 2 +- shop-list-left-sidebar2.php | 2 +- wishlist.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/tester5.js b/assets/js/tester5.js index c6de1b5..396fff9 100644 --- a/assets/js/tester5.js +++ b/assets/js/tester5.js @@ -616,7 +616,7 @@ function popupAddToCart(product, productVendor, token, email, password, customer
-
+
- + diff --git a/header.php b/header.php index 198b535..4767466 100644 --- a/header.php +++ b/header.php @@ -393,7 +393,7 @@
+
- + diff --git a/product-left-sidebar.php b/product-left-sidebar.php index 37db111..a325fa5 100644 --- a/product-left-sidebar.php +++ b/product-left-sidebar.php @@ -823,7 +823,7 @@ foreach ($variation_details as $index => $variation) {
-
+
- + diff --git a/shop-list-left-sidebar2.php b/shop-list-left-sidebar2.php index 32e5be8..be80324 100644 --- a/shop-list-left-sidebar2.php +++ b/shop-list-left-sidebar2.php @@ -846,7 +846,7 @@ if ($_SESSION["userId"] <> "") { '; + echo ''; } else { echo ''; } diff --git a/wishlist.php b/wishlist.php index 5aca70d..b3005f0 100644 --- a/wishlist.php +++ b/wishlist.php @@ -768,10 +768,10 @@ if ($_SESSION["userId"] <> "") { - + '; + echo ''; } else { echo ''; }