Merge pull request 'added address label on vendor and buyer profile settings, initialized map on admin, fixed missing header on vendor-payments' (#85) from gelo_branch into main

Reviewed-on: #85

admin/assets/js/map.js

@@ -0,0 +1,14 @@
+var southWest = L.latLng(4.64, 116.95),
+    northEast = L.latLng(20.53, 127.25),
+    bounds = L.latLngBounds(southWest, northEast);
+
+// Initialize the map and set the bounds
+var map = L.map('map', {
+    maxBounds: bounds,
+    maxBoundsViscosity: 1.0 // Keeps the user within the bounds
+}).setView([13.41, 122.56], 6); // Centered on the Philippines with a zoom level of 6
+
+// Add a tile layer
+L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+}).addTo(map);

admin/index.php

@@ -49,6 +49,14 @@ $allSignups = array_merge($all_customers, $all_vendors);
 	<link href="assets/plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
 	<link href="assets/plugins/simplebar/simplebar.css" rel="stylesheet" />
 
+	<!-- LEAFLET JS -->
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+     integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+     crossorigin=""/>
+	<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
+	integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
+	crossorigin=""></script>
+
 	<!-- Ekka CSS -->
 	<link id="ekka-css" href="assets/css/ekka.css" rel="stylesheet" />
 
@@ -911,13 +919,13 @@ $allSignups = array_merge($all_customers, $all_vendors);
 							<!-- World Chart -->
 							<div class="card card-default" id="analytics-country">
 								<div class="card-header justify-content-between">
-									<h2>Purchased by Country</h2>
+									<h2>Purchased by City</h2>
 									<div class="date-range-report ">
 										<span></span>
 									</div>
 								</div>
 								<div class="card-body vector-map-world-2">
-									<div id="regions_purchase" style="height: 100%; width: 100%;"></div>
+									<div id="map" style="height: 100%; width: 100%;"></div>
 								</div>
 								<div class="border-top mt-3">
 									<div class="row no-gutters">
@@ -1344,6 +1352,7 @@ $allSignups = array_merge($all_customers, $all_vendors);
 
 	<!-- gelo added dynamic charts -->
 	<script src="assets/js/dashboard-chart.js"></script>
+	<script src="assets/js/map.js"></script>
 	<!-- Google map chart -->
 	<script src="assets/plugins/charts/google-map-loader.js"></script>
 	<script src="assets/plugins/charts/google-map.js"></script>

footer.php

@@ -25,7 +25,7 @@
                             <div class="ec-footer-links">
                                 <ul class="align-items-center">
                                     <li class="ec-footer-link">16F PMI Tower,Makati, Makati, Philippines</li>
-                                    <li class="ec-footer-link"><span>Call Us:</span><a href="Mobile:+63 917 722 6002">+63 (2) 8807-6379</a></li>
+                                    <li class="ec-footer-link"><span>Call Us:</span><a href="Mobile:+63 (2) 8807-6379">+63 (2) 8807-6379</a></li>
                                     <li class="ec-footer-link"><span>Email:</span><a href="mailto:sales@obanana.com">sales@obanana.com</a></li>
                                 </ul>
                             </div>
@@ -79,7 +79,7 @@
                                 <?php
                                         } else {
                                 ?>
-                                    <li class="ec-footer-link"><a href="user-profile.php">Order History</a></li>
+                                    <li class="ec-footer-link"><a href="user-history.php">Order History</a></li>
                                 <?php
                                         }
                                 ?>

user-profile.php

@@ -336,7 +336,7 @@ if ($_SESSION["isVendor"] == true) {
                                 <input type="text" class="form-control" id="addressContact" value="+63 " oninput="preventErasePrefix(this)">
                             </div>
                             <div class="form-group">
-                                <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2"> Building,Number </label>
+                                <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2"> House/Unit/Floor #, Bldg Name, Block or Lot # </label>
                                 <input type="text" class="form-control" id="addressBuilding">
                             </div>
                             <div class="form-group">

vendor-payments.php

@@ -124,12 +124,15 @@ if ($_SESSION["isCustomer"] == true) {
 
     <!-- Header start  -->
     <?php include "header.php" ?>
-    <!-- Header End  -->
+    <!-- Header End  -->.
 
     <!-- ekka Cart Start -->
 
     <!-- ekka Cart End -->
 
+    <!-- Category Sidebar start -->
+    <?php include "category-slider.php" ?>
+
     <!-- Ec breadcrumb start -->
     <div class="sticky-header-next-sec  ec-breadcrumb section-space-mb">
         <div class="container">

vendor-settings.php

@@ -494,7 +494,7 @@ if ($_SESSION["isCustomer"] == true) {
                             </div>
                             <div class="form-group">
 
-                                <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2">Building,Number</label>
+                                <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2">House/Unit/Floor #, Bldg Name, Block or Lot #</label>
                                 <input type="text" class="form-control" id="addressBuilding2" value="<?php echo $address['address_1']; ?>">
 
                                 <!-- <label for="addressBuilding" class="text-dark font-weight-medium pt-3 mb-2"> Building,Number </label>