Minor refactor

Signed-off-by: Sam Poyigi <[email protected]>

phpstan-baseline.neon

@@ -115,6 +115,11 @@ parameters:
 			count: 1
 			path: src/Classes/Manager.php
 
+		-
+			message: "#^Call to an undefined static method Igniter\\\\User\\\\Facades\\\\AdminAuth\\:\\:isSuperUser\\(\\)\\.$#"
+			count: 1
+			path: src/Classes/Manager.php
+
 		-
 			message: "#^Call to an undefined static method Igniter\\\\User\\\\Facades\\\\AdminAuth\\:\\:user\\(\\)\\.$#"
 			count: 1
@@ -235,18 +240,13 @@ parameters:
 			count: 1
 			path: src/Extension.php
 
-		-
-			message: "#^Call to an undefined static method Igniter\\\\Local\\\\Models\\\\ReviewSettings\\:\\:get\\(\\)\\.$#"
-			count: 2
-			path: src/Extension.php
-
 		-
 			message: "#^Call to an undefined static method Igniter\\\\User\\\\Facades\\\\Auth\\:\\:customer\\(\\)\\.$#"
 			count: 2
 			path: src/Extension.php
 
 		-
-			message: "#^Call to an undefined method Igniter\\\\Flame\\\\Database\\\\Model\\:\\:find\\(\\)\\.$#"
+			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:find\\(\\)\\.$#"
 			count: 1
 			path: src/FormWidgets/MapArea.php
 
@@ -295,11 +295,6 @@ parameters:
 			count: 1
 			path: src/Http/Controllers/Locations.php
 
-		-
-			message: "#^Call to an undefined static method Igniter\\\\Flame\\\\Geolite\\\\Facades\\\\Geocoder\\:\\:getLogs\\(\\)\\.$#"
-			count: 1
-			path: src/Http/Controllers/Locations.php
-
 		-
 			message: "#^Call to an undefined static method Igniter\\\\Local\\\\Facades\\\\Location\\:\\:check\\(\\)\\.$#"
 			count: 1
@@ -375,6 +370,11 @@ parameters:
 			count: 1
 			path: src/MainMenuWidgets/LocationPicker.php
 
+		-
+			message: "#^Call to an undefined static method Igniter\\\\Flame\\\\Geolite\\\\Facades\\\\Geocoder\\:\\:getLogs\\(\\)\\.$#"
+			count: 1
+			path: src/MainMenuWidgets/LocationPicker.php
+
 		-
 			message: "#^Call to an undefined static method Igniter\\\\Local\\\\Facades\\\\Location\\:\\:current\\(\\)\\.$#"
 			count: 2
@@ -457,12 +457,12 @@ parameters:
 
 		-
 			message: "#^Access to an undefined property Igniter\\\\Local\\\\Models\\\\Location\\:\\:\\$location_lat\\.$#"
-			count: 3
+			count: 4
 			path: src/Models/Location.php
 
 		-
 			message: "#^Access to an undefined property Igniter\\\\Local\\\\Models\\\\Location\\:\\:\\$location_lng\\.$#"
-			count: 3
+			count: 4
 			path: src/Models/Location.php
 
 		-
@@ -615,6 +615,11 @@ parameters:
 			count: 1
 			path: src/Models/Review.php
 
+		-
+			message: "#^Call to an undefined static method Igniter\\\\Local\\\\Models\\\\ReviewSettings\\:\\:get\\(\\)\\.$#"
+			count: 1
+			path: src/Models/ReviewSettings.php
+
 		-
 			message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Builder\\:\\:selectDistance\\(\\)\\.$#"
 			count: 1

resources/lang/en/default.php

@@ -11,6 +11,7 @@
     'text_location_summary' => 'We can deliver to you %s',
     'text_enter_location' => 'Check if we can deliver to you',
     'text_hours' => 'Working Hours',
+    'text_more_info' => 'More info',
     'text_opening' => 'Opening',
     'text_24h' => 'All day',
     'text_delivery_coverage' => '<span class="text-danger">Sorry, but this restaurant does not deliver to your location</span>',
@@ -140,6 +141,7 @@
     'alert_location_required' => 'No location found or selected',
     'alert_order_type_required' => 'There\'s no active online ordering option for this location',
     'alert_order_is_unavailable' => 'This restaurant is unavailable to take %s orders at the selected time.',
+    'alert_delivery_area_unavailable' => 'Sorry, we do not deliver to the address you entered.',
     'alert_slot_time_required' => 'Please select a slot time.',
     'alert_slot_date_required' => 'Please select a slot date.',
     'alert_slot_type_required' => 'Please select a slot type.',

resources/models/reviewsettings.php

@@ -4,6 +4,8 @@
  * Model configuration options for settings model.
  */
 
+use Igniter\Local\Models\ReviewSettings;
+
 return [
     'form' => [
         'toolbar' => [
@@ -40,11 +42,18 @@
                     'condition' => 'checked',
                 ],
             ],
-            'ratings[ratings]' => [
+            'hints' => [
                 'label' => 'lang:igniter.local::default.reviews.label_hints',
                 'tab' => 'lang:igniter.local::default.reviews.text_tab_title_reviews',
-                'type' => 'partial',
-                'path' => 'igniter.local::_partials/reviews/ratings',
+                'type' => 'repeater',
+                'default' => ReviewSettings::$defaultHints,
+                'form' => [
+                    'fields' => [
+                        'value' => [
+                            'type' => 'text',
+                        ],
+                    ],
+                ],
                 'commentAbove' => 'lang:igniter.local::default.reviews.help_hints',
             ],
         ],

src/Classes/CoveredArea.php

@@ -74,13 +74,15 @@ protected function checkConditions($cartTotal, $value = 'total')
 
     protected function calculateDistanceCharges()
     {
-        if (!Location::userPosition()->isValid()) {
+        $distanceCharges = collect($this->model->boundaries['distance'] ?? []);
+
+        if (!Location::userPosition()->isValid() || $distanceCharges->isEmpty()) {
             return 0;
         }
 
         $distanceFromLocation = round(Location::checkDistance(), 2);
 
-        $condition = collect($this->model->boundaries['distance'] ?? [])
+        $condition = $distanceCharges
             ->sortBy('priority')
             ->map(function ($condition) {
                 return new CoveredAreaCondition([

src/Classes/Location.php

@@ -448,7 +448,7 @@ public function getDeliveryChargeConditions()
      */
     public function checkMinimumOrder($cartTotal)
     {
-        return $cartTotal >= $this->minimumOrderTotal();
+        return $this->checkMinimumOrderTotal($cartTotal);
     }
 
     public function checkDistance()

src/Classes/Manager.php

@@ -65,7 +65,7 @@ public function current(): ?LocationInterface
 
         $slug = $this->resolveLocationSlug();
         if ($slug && $model = $this->getBySlug($slug)) {
-            $this->setModel($model);
+            $this->setCurrent($model);
         } else {
             $id = $this->getSession('id');
             if ($id && $model = $this->getById($id)) {
@@ -99,6 +99,10 @@ public function currentOrAssigned(): array
             return [$this->getId()];
         }
 
+        if (AdminAuth::isSuperUser()) {
+            return [];
+        }
+
         return AdminAuth::user()?->locations?->pluck('location_id')->all() ?? [];
     }
 

src/Extension.php

@@ -19,15 +19,14 @@
 use Igniter\Local\Models\Review;
 use Igniter\Local\Models\ReviewSettings;
 use Igniter\Local\Models\Scopes\LocationScope;
-use Igniter\Main\Classes\MainController;
+use Igniter\Local\Requests\LocationRequest;
 use Igniter\Reservation\Models\Reservation;
 use Igniter\User\Facades\Auth;
 use Igniter\User\Models\User;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\View;
 
 class Extension extends \Igniter\System\Classes\BaseExtension
 {
@@ -65,10 +64,6 @@ public function register()
 
     public function boot()
     {
-        Event::listen('main.page.init', function (MainController $controller) {
-            View::share('allowReviews', ReviewSettings::allowReviews());
-        });
-
         $this->bindRememberLocationAreaEvents();
 
         $this->addReviewsRelationship();
@@ -77,19 +72,19 @@ public function boot()
 
         User::extend(function ($model) {
             $model->addDynamicMethod('getAvailableLocations', function () use ($model) {
-                if ($model->locations->isEmpty() && $model->isSuperUser()) {
+                if ($model->isSuperUser()) {
                     return $model->locations()->getModel()->query()->get();
                 }
 
                 return $model->locations;
             });
 
             $model->addDynamicMethod('isAssignedLocation', function ($location) use ($model) {
-                if ($model->locations->isEmpty()) {
-                    return $model->isSuperUser();
+                if ($model->isSuperUser()) {
+                    return true;
                 }
 
-                return $model->locations->contains($location);
+                return $model->locations?->contains($location);
             });
         });
 
@@ -308,6 +303,10 @@ protected function addReviewsRelationship(): void
     protected function bindRememberLocationAreaEvents(): void
     {
         Event::listen('location.position.updated', function ($location, $position, $oldPosition) {
+            if ($position->format() === $oldPosition->format()) {
+                return;
+            }
+
             $this->updateCustomerLastArea([
                 'query' => $position->format(),
             ]);
@@ -350,7 +349,7 @@ protected function updateCustomerLastArea($value)
         $lastArea = @json_decode($customer->last_location_area, true) ?: [];
         $lastArea = array_merge($lastArea, $value);
 
-        $customer->update([
+        $customer->updateQuietly([
             'last_location_area' => json_encode($lastArea),
         ]);
     }
@@ -364,6 +363,7 @@ protected function registerLocationsMainMenuItems()
                     ->permission('Admin.Locations')
                     ->mergeConfig([
                         'form' => 'igniter.local::/models/location',
+                        'request' => LocationRequest::class,
                     ]),
             ]);
         });

src/FormWidgets/MapArea.php

@@ -104,8 +104,8 @@ public function loadAssets()
             );
         }
 
-        $this->addJs('formwidgets/mapview.js', 'mapview-js');
-        $this->addJs('formwidgets/mapview.shape.js', 'mapview-shape-js');
+        $this->addJs('mapview.js', 'mapview-js');
+        $this->addJs('mapview.shape.js', 'mapview-shape-js');
     }
 
     public function render()

src/Http/Controllers/Locations.php

@@ -3,7 +3,6 @@
 namespace Igniter\Local\Http\Controllers;
 
 use Igniter\Admin\Facades\AdminMenu;
-use Igniter\Flame\Geolite\Facades\Geocoder;
 use Igniter\Local\Facades\Location as LocationFacade;
 
 class Locations extends \Igniter\Admin\Classes\AdminController
@@ -53,15 +52,6 @@ public function settings_onSave($context = null)
         return $this->asExtension('FormController')->edit_onSave($context, LocationFacade::getId());
     }
 
-    public function formAfterSave($model)
-    {
-        if ($model->is_auto_lat_lng) {
-            if ($logs = Geocoder::getLogs()) {
-                flash()->error(implode(PHP_EOL, $logs))->important();
-            }
-        }
-    }
-
     public function mapViewCenterCoords()
     {
         $model = $this->getFormModel();

src/MainMenuWidgets/LocationPicker.php

@@ -7,9 +7,9 @@
 use Igniter\Admin\Widgets\Form;
 use Igniter\Flame\Exception\ApplicationException;
 use Igniter\Flame\Exception\FlashException;
+use Igniter\Flame\Geolite\Facades\Geocoder;
 use Igniter\Local\Facades\Location as LocationFacade;
 use Igniter\Local\Models\Location;
-use Igniter\Local\Requests\LocationRequest;
 use Igniter\User\Facades\AdminAuth;
 use Illuminate\Support\Facades\DB;
 
@@ -100,7 +100,6 @@ public function onSaveRecord()
 
         $form = $this->makeLocationFormWidget($model);
 
-        $this->config['request'] = LocationRequest::class;
         $saveData = $this->validateFormWidget($form, $form->getSaveData());
 
         $modelsToSave = $this->prepareModelsToSave($model, $saveData);
@@ -111,6 +110,10 @@ public function onSaveRecord()
             }
         });
 
+        if ($logs = Geocoder::getLogs()) {
+            flash()->error(implode(PHP_EOL, $logs))->important()->now();
+        }
+
         flash()->success(sprintf(lang('igniter::admin.alert_success'),
             lang('igniter.local::default.picker.text_form_name').' '.($form->context == 'create' ? 'created' : 'updated')))->now();
 

src/Models/Concerns/HasDeliveryAreas.php

@@ -40,15 +40,19 @@ protected function geocodeAddressOnSave()
             return;
         }
 
-        if (!$this->isDirty([
-            'location_address_1',
-            'location_address_2',
-            'location_city',
-            'location_state',
-            'location_postcode',
-            'location_country_id',
-        ])) {
-            return;
+        if ($this->location_lat && $this->location_lng) {
+            if (!$this->isDirty([
+                'location_address_1',
+                'location_address_2',
+                'location_city',
+                'location_state',
+                'location_postcode',
+                'location_country_id',
+                'location_lat',
+                'location_lng',
+            ])) {
+                return;
+            }
         }
 
         $address = format_address($this->getAddress(), false);

src/Models/Review.php

@@ -83,7 +83,7 @@ public static function findBy($saleType, $saleId)
 
     public function getRatingOptions()
     {
-        return array_get(ReviewSettings::get('ratings'), 'ratings', []);
+        return ReviewSettings::get('hints', ReviewSettings::$defaultHints);
     }
 
     //

src/Models/ReviewSettings.php

@@ -14,6 +14,14 @@ class ReviewSettings extends Model
     // Reference to field configuration
     public string $settingsFieldsConfig = 'reviewsettings';
 
+    public static array $defaultHints = [
+        ['value' => 'Poor'],
+        ['value' => 'Average'],
+        ['value' => 'Good'],
+        ['value' => 'Very Good'],
+        ['value' => 'Excellent'],
+    ];
+
     public static function allowReviews()
     {
         return (bool)self::get('allow_reviews', true);

src/Models/Scopes/LocationScope.php

@@ -4,7 +4,6 @@
 
 use Igniter\Flame\Database\Scope;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
 
 class LocationScope extends Scope
 {
@@ -27,7 +26,7 @@ public function addSelectDistance()
             $sql .= ' cos( radians( location_lng ) - radians(?) ) + sin( radians(?) ) *';
             $sql .= ' sin( radians( location_lat ) ) ) ) AS distance';
 
-            return $builder->select(DB::raw($sql), [$latitude, $longitude, $latitude]);
+            return $builder->selectRaw($sql, [$latitude, $longitude, $latitude]);
         };
     }
 }