diff --git a/source/packages/com_mokosuitestorelocator/api/src/Controller/LocationsController.php b/source/packages/com_mokosuitestorelocator/api/src/Controller/LocationsController.php
new file mode 100644
index 0000000..9ab379e
--- /dev/null
+++ b/source/packages/com_mokosuitestorelocator/api/src/Controller/LocationsController.php
@@ -0,0 +1,37 @@
+
+
+
+ sql/updates/mysql
+
+
+
language
src
tmpl
+
+
+ src
+
+
+
forms
@@ -57,6 +69,7 @@
+
diff --git a/source/packages/com_mokosuitestorelocator/site/src/Model/LocationsModel.php b/source/packages/com_mokosuitestorelocator/site/src/Model/LocationsModel.php
index 6d44b90..7e78ab5 100644
--- a/source/packages/com_mokosuitestorelocator/site/src/Model/LocationsModel.php
+++ b/source/packages/com_mokosuitestorelocator/site/src/Model/LocationsModel.php
@@ -99,6 +99,9 @@ class LocationsModel extends ListModel
$this->setState('filter.radius_unit', in_array($radiusUnit, ['miles', 'km']) ? $radiusUnit : 'miles');
+ $catid = $app->input->getInt('catid', 0);
+ $this->setState('filter.catid', $catid);
+
parent::populateState($ordering, $direction);
}
@@ -154,6 +157,17 @@ class LocationsModel extends ListModel
->bind(':state', $state);
}
+ // Category filter
+ $catid = (int) $this->getState('filter.catid');
+
+ if ($catid > 0)
+ {
+ $query->join('INNER', $db->quoteName('#__mokosuitestorelocator_location_categories', 'lc')
+ . ' ON ' . $db->quoteName('lc.location_id') . ' = ' . $db->quoteName('a.id'))
+ ->where($db->quoteName('lc.category_id') . ' = :catid')
+ ->bind(':catid', $catid, ParameterType::INTEGER);
+ }
+
// Proximity / Haversine distance filter
$lat = $this->getState('filter.lat');
$lng = $this->getState('filter.lng');
@@ -179,10 +193,17 @@ class LocationsModel extends ListModel
}
else
{
- // Default ordering
- $orderCol = $this->state->get('list.ordering', 'a.ordering');
- $orderDir = $this->state->get('list.direction', 'ASC');
- $query->order($db->escape($orderCol) . ' ' . $db->escape($orderDir));
+ // Default ordering — validate against filter_fields allowlist
+ $orderCol = $this->state->get('list.ordering', 'a.ordering');
+ $orderDir = $this->state->get('list.direction', 'ASC');
+
+ if (!\in_array($orderCol, $this->filter_fields, true))
+ {
+ $orderCol = 'a.ordering';
+ }
+
+ $orderDir = strtoupper($orderDir) === 'DESC' ? 'DESC' : 'ASC';
+ $query->order($db->quoteName($orderCol) . ' ' . $orderDir);
}
return $query;
diff --git a/source/packages/mod_mokosuitestorelocator_map/src/Dispatcher/Dispatcher.php b/source/packages/mod_mokosuitestorelocator_map/src/Dispatcher/Dispatcher.php
index 4b3c131..3d7eb3c 100644
--- a/source/packages/mod_mokosuitestorelocator_map/src/Dispatcher/Dispatcher.php
+++ b/source/packages/mod_mokosuitestorelocator_map/src/Dispatcher/Dispatcher.php
@@ -41,20 +41,29 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
$query = $db->getQuery(true);
$query->select([
- $db->quoteName('id'),
- $db->quoteName('title'),
- $db->quoteName('address'),
- $db->quoteName('city'),
- $db->quoteName('state'),
- $db->quoteName('postcode'),
- $db->quoteName('phone'),
- $db->quoteName('latitude'),
- $db->quoteName('longitude'),
+ $db->quoteName('a.id'),
+ $db->quoteName('a.title'),
+ $db->quoteName('a.address'),
+ $db->quoteName('a.city'),
+ $db->quoteName('a.state'),
+ $db->quoteName('a.postcode'),
+ $db->quoteName('a.phone'),
+ $db->quoteName('a.latitude'),
+ $db->quoteName('a.longitude'),
])
- ->from($db->quoteName('#__mokosuitestorelocator_locations'))
- ->where($db->quoteName('published') . ' = 1')
- ->where($db->quoteName('latitude') . ' IS NOT NULL')
- ->where($db->quoteName('longitude') . ' IS NOT NULL');
+ ->from($db->quoteName('#__mokosuitestorelocator_locations', 'a'))
+ ->where($db->quoteName('a.published') . ' = 1')
+ ->where($db->quoteName('a.latitude') . ' IS NOT NULL')
+ ->where($db->quoteName('a.longitude') . ' IS NOT NULL');
+
+ // Join to get primary category marker icon
+ $query->select([$db->quoteName('c.marker_icon'), $db->quoteName('c.color', 'cat_color')])
+ ->join('LEFT', $db->quoteName('#__mokosuitestorelocator_location_categories', 'lc')
+ . ' ON ' . $db->quoteName('lc.location_id') . ' = ' . $db->quoteName('a.id'))
+ ->join('LEFT', $db->quoteName('#__mokosuitestorelocator_categories', 'c')
+ . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName('lc.category_id')
+ . ' AND ' . $db->quoteName('c.published') . ' = 1')
+ ->group($db->quoteName('a.id'));
$db->setQuery($query);
$locations = $db->loadObjectList() ?: [];
@@ -63,7 +72,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
foreach ($locations as $loc)
{
- $markers[] = [
+ $marker = [
'id' => (int) $loc->id,
'title' => $loc->title,
'address' => trim($loc->address . ', ' . $loc->city . ', ' . $loc->state . ' ' . $loc->postcode, ', '),
@@ -71,6 +80,18 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
'lat' => (float) $loc->latitude,
'lng' => (float) $loc->longitude,
];
+
+ if (!empty($loc->marker_icon))
+ {
+ $marker['marker_icon'] = $loc->marker_icon;
+ }
+
+ if (!empty($loc->cat_color))
+ {
+ $marker['cat_color'] = $loc->cat_color;
+ }
+
+ $markers[] = $marker;
}
$data['locations'] = $markers;
diff --git a/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php b/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php
index 2fed686..16964dd 100644
--- a/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php
+++ b/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php
@@ -15,6 +15,11 @@ $params = $displayData['params'];
$locations = $displayData['locations'] ?? [];
$moduleId = $displayData['module']->id;
$mapHeight = $params->get('map_height', '400px');
+
+if (!preg_match('/^\d+(px|em|rem|vh|%)$/', $mapHeight))
+{
+ $mapHeight = '400px';
+}
$mapZoom = (int) $params->get('map_zoom', 10);
$provider = $params->get('map_provider', 'leaflet');
$apiKey = $params->get('api_key', '');
@@ -69,7 +74,16 @@ document.addEventListener('DOMContentLoaded', function() {
}
locations.forEach(function(loc) {
- var marker = L.marker([loc.lat, loc.lng]).addTo(map);
+ var markerOptions = {};
+ if (loc.marker_icon) {
+ markerOptions.icon = L.icon({
+ iconUrl: loc.marker_icon,
+ iconSize: [32, 32],
+ iconAnchor: [16, 32],
+ popupAnchor: [0, -32]
+ });
+ }
+ var marker = L.marker([loc.lat, loc.lng], markerOptions).addTo(map);
var popup = '
' + esc(loc.title) + '';
if (loc.address) popup += '
' + esc(loc.address);
if (loc.phone) popup += '
' + esc(loc.phone) + '';
diff --git a/source/packages/plg_webservices_mokosuitestorelocator/language/en-GB/plg_webservices_mokosuitestorelocator.ini b/source/packages/plg_webservices_mokosuitestorelocator/language/en-GB/plg_webservices_mokosuitestorelocator.ini
new file mode 100644
index 0000000..a79710d
--- /dev/null
+++ b/source/packages/plg_webservices_mokosuitestorelocator/language/en-GB/plg_webservices_mokosuitestorelocator.ini
@@ -0,0 +1,2 @@
+PLG_WEBSERVICES_MOKOSUITESTORELOCATOR="MokoSuiteStoreLocator - Web Services"
+PLG_WEBSERVICES_MOKOSUITESTORELOCATOR_DESC="Provides REST API endpoints for the MokoSuiteStoreLocator component."
diff --git a/source/packages/plg_webservices_mokosuitestorelocator/plg_webservices_mokosuitestorelocator.xml b/source/packages/plg_webservices_mokosuitestorelocator/plg_webservices_mokosuitestorelocator.xml
new file mode 100644
index 0000000..4316def
--- /dev/null
+++ b/source/packages/plg_webservices_mokosuitestorelocator/plg_webservices_mokosuitestorelocator.xml
@@ -0,0 +1,24 @@
+
+
+
+ plg_webservices_mokosuitestorelocator
+ 01.00.01
+ 2026-06-24
+ Moko Consulting
+ hello@mokoconsulting.tech
+ https://mokoconsulting.tech
+ Copyright (C) 2026 Moko Consulting. All rights reserved.
+ GNU General Public License version 3 or later; see LICENSE
+ PLG_WEBSERVICES_MOKOSUITESTORELOCATOR_DESC
+
+ Moko\Plugin\WebServices\MokoSuiteStoreLocator
+
+
+ services
+ src
+ language
+
+
diff --git a/source/packages/plg_webservices_mokosuitestorelocator/services/provider.php b/source/packages/plg_webservices_mokosuitestorelocator/services/provider.php
new file mode 100644
index 0000000..85cca5e
--- /dev/null
+++ b/source/packages/plg_webservices_mokosuitestorelocator/services/provider.php
@@ -0,0 +1,37 @@
+set(
+ PluginInterface::class,
+ function (Container $container) {
+ $dispatcher = $container->get(DispatcherInterface::class);
+ $plugin = new MokoSuiteStoreLocator(
+ $dispatcher,
+ (array) PluginHelper::getPlugin('webservices', 'mokosuitestorelocator')
+ );
+ $plugin->setApplication(Factory::getApplication());
+
+ return $plugin;
+ }
+ );
+ }
+};
diff --git a/source/packages/plg_webservices_mokosuitestorelocator/src/Extension/MokoSuiteStoreLocator.php b/source/packages/plg_webservices_mokosuitestorelocator/src/Extension/MokoSuiteStoreLocator.php
new file mode 100644
index 0000000..710c9f0
--- /dev/null
+++ b/source/packages/plg_webservices_mokosuitestorelocator/src/Extension/MokoSuiteStoreLocator.php
@@ -0,0 +1,57 @@
+ 'onBeforeApiRoute',
+ ];
+ }
+
+ /**
+ * Register API routes.
+ *
+ * @param \Joomla\CMS\Event\ApiRouterEvent $event The event.
+ *
+ * @return void
+ *
+ * @since 1.2.0
+ */
+ public function onBeforeApiRoute($event): void
+ {
+ $router = $event->getArgument('router') ?? $event->getRouter();
+
+ $router->createCRUDRoutes(
+ 'v1/mokosuitestorelocator/locations',
+ 'locations',
+ ['component' => 'com_mokosuitestorelocator']
+ );
+ }
+}
diff --git a/source/pkg_mokosuitestorelocator.xml b/source/pkg_mokosuitestorelocator.xml
index 9eac2e4..27929cf 100644
--- a/source/pkg_mokosuitestorelocator.xml
+++ b/source/pkg_mokosuitestorelocator.xml
@@ -32,6 +32,7 @@
com_mokosuitestorelocator.zip
mod_mokosuitestorelocator_map.zip
mod_mokosuitestorelocator_search.zip
+
plg_webservices_mokosuitestorelocator.zip