minor fixes

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
tastyigniter · Jun 3, 2022 · 721943a · 721943a
1 parent ccbba69
commit 721943a
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 49 deletions.
diff --git a/app/admin/language/en/lang.php b/app/admin/language/en/lang.php
@@ -551,8 +551,8 @@
         'label_gallery_image_thumbnail' => 'Thumbnail',
         'label_gallery_image_name' => 'Filename',
         'label_gallery_image_alt' => 'Alt Text',
-        'label_delivery_condition' => 'Delivery Condition',
-        'label_delivery_distance' => 'Distance Based Delivery Condition',
+        'label_delivery_condition' => 'Delivery Charge Condition',
+        'label_delivery_distance' => 'Distance Based Delivery Charge Condition',
 
         'error_no_zero_total' => 'The %s can not be a value zero on conditions other than \'on all orders\'.',
         'alert_delivery_area' => 'Add at least one delivery area to allow your customers find this location.',

diff --git a/app/admin/models/config/location_areas_model.php b/app/admin/models/config/location_areas_model.php
@@ -23,6 +23,54 @@
                     'data-toggle' => 'area-default',
                 ],
             ],
+            'type' => [
+                'label' => 'lang:admin::lang.locations.label_area_type',
+                'type' => 'radiotoggle',
+                'default' => 'address',
+                'options' => [
+                    'address' => 'lang:admin::lang.locations.text_custom',
+                    'polygon' => 'lang:admin::lang.locations.text_shape',
+                    'circle' => 'lang:admin::lang.locations.text_circle',
+                ],
+                'attributes' => [
+                    'data-toggle' => 'map-shape',
+                ],
+            ],
+            'boundaries[components]' => [
+                'label' => 'lang:admin::lang.locations.label_address_component',
+                'type' => 'repeater',
+                'sortable' => true,
+                'commentAbove' => 'lang:admin::lang.locations.help_delivery_components',
+                'trigger' => [
+                    'action' => 'show',
+                    'field' => 'type',
+                    'condition' => 'value[address]',
+                ],
+                'form' => [
+                    'fields' => [
+                        'priority' => [
+                            'type' => 'hidden',
+                        ],
+                        'type' => [
+                            'label' => 'lang:admin::lang.locations.label_address_component_type',
+                            'type' => 'select',
+                            'default' => 'region',
+                            'options' => [
+                                'street' => 'lang:admin::lang.locations.text_address_component_street',
+                                'sub_locality' => 'lang:admin::lang.locations.text_address_component_town',
+                                'locality' => 'lang:admin::lang.locations.text_address_component_city',
+                                'admin_level_2' => 'lang:admin::lang.locations.text_address_component_region',
+                                'admin_level_1' => 'lang:admin::lang.locations.text_address_component_state',
+                                'postal_code' => 'lang:admin::lang.locations.text_address_component_postal_code',
+                            ],
+                        ],
+                        'value' => [
+                            'label' => 'lang:admin::lang.locations.label_address_component_value',
+                            'type' => 'text',
+                        ],
+                    ],
+                ],
+            ],
             'conditions' => [
                 'label' => 'lang:admin::lang.locations.label_delivery_condition',
                 'type' => 'repeater',
@@ -87,53 +135,6 @@
                     ],
                 ],
             ],
-            'type' => [
-                'label' => 'lang:admin::lang.locations.label_area_type',
-                'type' => 'radiotoggle',
-                'default' => 'address',
-                'options' => [
-                    'address' => 'lang:admin::lang.locations.text_custom',
-                    'polygon' => 'lang:admin::lang.locations.text_shape',
-                    'circle' => 'lang:admin::lang.locations.text_circle',
-                ],
-                'attributes' => [
-                    'data-toggle' => 'map-shape',
-                ],
-            ],
-            'boundaries[components]' => [
-                'type' => 'repeater',
-                'sortable' => true,
-                'commentAbove' => 'lang:admin::lang.locations.help_delivery_components',
-                'trigger' => [
-                    'action' => 'show',
-                    'field' => 'type',
-                    'condition' => 'value[address]',
-                ],
-                'form' => [
-                    'fields' => [
-                        'priority' => [
-                            'type' => 'hidden',
-                        ],
-                        'type' => [
-                            'label' => 'lang:admin::lang.locations.label_address_component_type',
-                            'type' => 'select',
-                            'default' => 'region',
-                            'options' => [
-                                'street' => 'lang:admin::lang.locations.text_address_component_street',
-                                'sub_locality' => 'lang:admin::lang.locations.text_address_component_town',
-                                'locality' => 'lang:admin::lang.locations.text_address_component_city',
-                                'admin_level_2' => 'lang:admin::lang.locations.text_address_component_region',
-                                'admin_level_1' => 'lang:admin::lang.locations.text_address_component_state',
-                                'postal_code' => 'lang:admin::lang.locations.text_address_component_postal_code',
-                            ],
-                        ],
-                        'value' => [
-                            'label' => 'lang:admin::lang.locations.label_address_component_value',
-                            'type' => 'text',
-                        ],
-                    ],
-                ],
-            ],
             '_mapview' => [
                 'type' => 'mapview',
                 'zoom' => 14,