Skip to content

Commit

Permalink
Identation code Geo-ZOne
Browse files Browse the repository at this point in the history
  • Loading branch information
condor2 committed Feb 12, 2024
1 parent cf2c431 commit 182b9b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion upload/admin/controller/localisation/geo_zone.php
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ protected function getForm(): void {
$geo_zone_ids = [];

foreach ($data['zone_to_geo_zones'] as $zone_to_geo_zone) {
if (!in_array($zone_to_geo_zone['geo_zone_id'],$geo_zone_ids)) {
if (!in_array($zone_to_geo_zone['geo_zone_id'], $geo_zone_ids)) {
$geo_zone_ids[] = $zone_to_geo_zone['geo_zone_id'];
}
}
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/model/localisation/geo_zone.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ public function getZonesByGeoZones($geo_zone_ids) {
}

$sql = "SELECT DISTINCT zgz.country_id, z.zone_id, c.`name` AS country, z.`name` AS zone ";
$sql .= "FROM `".DB_PREFIX."zone_to_geo_zone` AS zgz ";
$sql .= "LEFT JOIN `".DB_PREFIX."country` c ON c.country_id=zgz.country_id ";
$sql .= "LEFT JOIN `".DB_PREFIX."zone` z ON z.country_id=c.country_id ";
$sql .= "FROM `" . DB_PREFIX . "zone_to_geo_zone` AS zgz ";
$sql .= "LEFT JOIN `" . DB_PREFIX . "country` c ON c.country_id=zgz.country_id ";
$sql .= "LEFT JOIN `" . DB_PREFIX . "zone` z ON z.country_id=c.country_id ";
$sql .= "WHERE zgz.geo_zone_id IN (" . implode(',', $geo_zone_ids) . ") ";
$sql .= "ORDER BY country_id ASC, zone ASC;";

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/localisation/geo_zone_form.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<tfoot>
<tr>
<td colspan="2"></td>
<td class="text-left"><button type="button" id="button-geo-zone" data-toggle="tooltip" title="<?php echo $button_geo_zone_add; ?>" class="btn btn-primary"><i class="fa fa-plus-circle"></i></button></td>
<td class="text-left"><button type="button" id="button-geo-zone" data-toggle="tooltip" title="<?php echo $button_geo_zone_add; ?>" class="btn btn-primary"><i class="fa fa-plus-circle"></i></button></td>
</tr>
</tfoot>
</table>
Expand Down

0 comments on commit 182b9b1

Please sign in to comment.