🐛 Fix channel and inventory issue on setting up shop

shopperlabs · Jul 22, 2021 · 9e9f643 · 9e9f643
1 parent d432adc
commit 9e9f643
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/resources/views/livewire/initialization.blade.php b/resources/views/livewire/initialization.blade.php
@@ -233,7 +233,15 @@
                 <div class="bg-white shadow-md sm:rounded-md p-4 dark:bg-gray-800">
                     <div class="grid gap-4 lg:grid-cols-3 lg:gap-6">
                         <div wire:ignore class="space-y-4 sm:col-span-2">
-                            <x-mapbox :markers="[[ 9.70428, 4.04827]]" :options="['zoom' => 2]" class="bg-gray-100 rounded-md h-95 overflow-hidden outline-none focus:outline-none dark:bg-gray-900" />
+                            @if(env('MAPBOX_PUBLIC_TOKEN'))
+                                <x-mapbox :markers="[[ 9.70428, 4.04827]]" :options="['zoom' => 2]" class="bg-gray-100 rounded-md h-95 overflow-hidden outline-none focus:outline-none dark:bg-gray-900" />
+                            @else
+                                <div class="bg-gray-100 rounded-md h-95 overflow-hidden outline-none focus:outline-none dark:bg-gray-900 flex items-center justify-center">
+                                    <p class="text-base leading-6 text-gray-500 font-medium dark:text-gray-400">
+                                        Mapbox has not been activated, consult the <a href="https://docs.laravelshopper.io/docs/configuration#mapbox" class="text-blue-500 hover:text-blue-400">documentation</a> to setup the map
+                                    </p>
+                                </div>
+                            @endif
                             <p class="text-sm text-gray-500 leading-5 dark:text-gray-400">
                                 Shopper uses <span class="font-medium">Mapbox</span> to make it easier to locate your store.
                                 To learn more about mapbox, consult the <a href="https://docs.mapbox.com/mapbox-gl-js/api" target="_blank" rel="noopener noreferrer" class="text-blue-600 hover:text-blue-500 mr-1 dark:text-blue-500">documentation</a>

diff --git a/src/Http/Livewire/Settings/General.php b/src/Http/Livewire/Settings/General.php
@@ -12,19 +12,22 @@ class General extends Component
 {
     use WithFileUploads;
 
-    public string $shop_name = '';
-    public string $shop_legal_name = '';
-    public string $shop_email = '';
-    public string $shop_phone_number = '';
-    public string $shop_about = '';
-    public string $shop_street_address = '';
-    public string $shop_zipcode = '';
-    public string $shop_city = '';
-    public string $shop_facebook_link = '';
-    public string $shop_instagram_link = '';
-    public string $shop_twitter_link = '';
+    public string $shop_name;
+    public ?string $shop_legal_name = null;
+    public string $shop_email;
+    public ?string $shop_phone_number = null;
+    public ?string $shop_about = null;
+    public string $shop_street_address;
+    public string $shop_zipcode;
+    public string $shop_city;
+
+    public ?string $shop_facebook_link = null;
+    public ?string $shop_instagram_link = null;
+    public ?string $shop_twitter_link = null;
+
     public $shop_country_id;
     public $shop_currency_id;
+
     public $shop_logo;
     public $logo;
     public $shop_cover;