Merge remote-tracking branch 'origin/feat-customer-purchases-chart' i…

…nto feat-customer-purchases-chart

# Conflicts:
#	Changelog.md

.github/workflows/tests.yml

@@ -11,8 +11,8 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        php: ['8.2', '8.3']
-        laravel: ['10.0', '10.48', '11.0', '11.14']
+        php: ['8.2', '8.3', '8.4']
+        laravel: ['10.0', '10.48', '11.0', '11.33']
     name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }}
     steps:
       - name: Checkout

Changelog.md

@@ -2,11 +2,15 @@
 
 ## Unreleased
 ##### 2024-XX-YY
+- Added Customer purchases chart to the Customer show page
+
+## 4.4.0
+##### 2024-11-23
 
 - Added CRUD for Countries and Provinces
-- Added the `globe` icon
+- Added the `globe` and `flag` icons
 - Added support for setting `empty.html` on the table widget
-- Added Customer purchases chart to the Customer show page
+- Added PHP 8.4 support
 
 ## 4.3.0
 ##### 2024-10-29

composer.json

@@ -20,7 +20,7 @@
         "ext-json": "*",
         "konekt/concord": "^1.15",
         "konekt/customer": "^3.0",
-        "konekt/address": "^3.0",
+        "konekt/address": "^3.4",
         "konekt/user": "^3.0",
         "konekt/acl": "^2.0",
         "konekt/menu": "^1.9",

docs/installation.md

@@ -44,7 +44,7 @@ Now you should see this:
 +----+---------------------+------+----------+------------------+-----------------+
 | #  | Name                | Kind | Version  | Id               | Namespace       |
 +----+---------------------+------+----------+------------------+-----------------+
-| 1. | Konekt AppShell Box | Box  | 4.3.0    | konekt.app_shell | Konekt\AppShell |
+| 1. | Konekt AppShell Box | Box  | 4.4.0    | konekt.app_shell | Konekt\AppShell |
 +----+---------------------+------+----------+------------------+-----------------+
 ```
 

docs/widgets-table.md

@@ -8,6 +8,7 @@
 [
     'empty' => [
         'text' => __('This is a text that gets shown if the dataset for the table is empty')
+        'html' => '<a href="#">This is a string that gets rendered as-is without escaping</a>'
     ]
 ]
 ```

src/Contracts/Requests/CreateProvince.php

@@ -8,4 +8,7 @@
 
 interface CreateProvince extends BaseRequest
 {
+    public function wantsToSeed(): bool;
+
+    public function getSeederId(): ?string;
 }

src/Http/Controllers/CountryController.php

@@ -9,6 +9,7 @@
 use Konekt\Address\Contracts\Country;
 use Konekt\Address\Models\CountryProxy;
 use Konekt\Address\Seeds\Countries;
+use Konekt\Address\Seeds\ProvinceSeeders;
 use Konekt\AppShell\Contracts\Requests\CreateCountry;
 use Konekt\AppShell\Contracts\Requests\UpdateCountry;
 
@@ -59,7 +60,17 @@ public function store(CreateCountry $request): RedirectResponse
 
     public function show(Country $country): View
     {
-        return view('appshell::country.show', ['country' => $country]);
+        $availableProvinceSeeders = [];
+        if ($country->provinces->isEmpty()) {
+            foreach (ProvinceSeeders::availableSeedersOfCountry($country->id) as $id => $class) {
+                $availableProvinceSeeders[$id] = $class::getName();
+            }
+        }
+
+        return view('appshell::country.show', [
+            'country' => $country,
+            'availableProvinceSeeders' => $availableProvinceSeeders,
+        ]);
     }
 
     public function edit(Country $country): View

src/Http/Controllers/ProvinceController.php

@@ -8,8 +8,10 @@
 use Illuminate\Http\RedirectResponse;
 use Konekt\Address\Contracts\Country;
 use Konekt\Address\Contracts\Province;
+use Konekt\Address\Contracts\ProvinceSeeder;
 use Konekt\Address\Models\ProvinceProxy;
 use Konekt\Address\Models\ProvinceTypeProxy;
+use Konekt\Address\Seeds\ProvinceSeeders;
 use Konekt\AppShell\Contracts\Requests\CreateProvince;
 use Konekt\AppShell\Contracts\Requests\UpdateProvince;
 
@@ -30,17 +32,31 @@ public function create(Country $country): View
     public function store(Country $country, CreateProvince $request): RedirectResponse
     {
         try {
-            $province = ProvinceProxy::create(
-                array_merge(
-                    $request->validated(),
-                    ['country_id' => $country->id]
-                )
-            );
-
-            flash()->success(__(':name has been added to :country', [
-                'name' => $province->name,
-                'country' => $country->name
-            ]));
+            if ($request->wantsToSeed()) {
+                if ($country->provinces->isNotEmpty()) {
+                    flash()->error(__('Can not generate the data, because the list of provinces is not empty'));
+
+                    return redirect()->back()->withInput();
+                }
+
+                /** @var ProvinceSeeder $seeder */
+                $seeder = ProvinceSeeders::make($request->getSeederId());
+                $seeder->run();
+
+                flash()->success(__(':name have been successfully created', ['name' => $seeder::getName()]));
+            } else {
+                $province = ProvinceProxy::create(
+                    array_merge(
+                        $request->validated(),
+                        ['country_id' => $country->id]
+                    )
+                );
+
+                flash()->success(__(':name has been added to :country', [
+                    'name' => $province->name,
+                    'country' => $country->name
+                ]));
+            }
         } catch (\Exception $e) {
             flash()->error(__('Error: :msg', ['msg' => $e->getMessage()]));
 

src/Http/Requests/CreateProvince.php

@@ -7,6 +7,7 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Konekt\Address\Models\ProvinceTypeProxy;
+use Konekt\Address\Seeds\ProvinceSeeders;
 use Konekt\AppShell\Contracts\Requests\CreateProvince as CreateProvinceContract;
 
 class CreateProvince extends FormRequest implements CreateProvinceContract
@@ -16,17 +17,17 @@ public function rules(): array
         $country = $this->route('country');
 
         return [
-            'name' => 'required|string|max:255',
+            'name' => 'required_without:seed|string|max:255',
             'code' => [
-                'required',
+                'required_without:seed',
                 'string',
                 'max:16',
                 'uppercase',
                 Rule::unique('provinces')->where(function ($query) use ($country) {
                     return $query->where('country_id', $country->id);
                 }),
             ],
-            'type' => ['required', 'string', 'max:255', Rule::in(ProvinceTypeProxy::values())],
+            'type' => ['required_without:seed', 'string', 'max:255', Rule::in(ProvinceTypeProxy::values())],
             'parent_id' => [
                 'sometimes',
                 'nullable',
@@ -35,9 +36,20 @@ public function rules(): array
                     return $query->where('country_id', $country->id);
                 }),
             ],
+            'seed' => ['sometimes', 'string', Rule::in(ProvinceSeeders::ids())]
         ];
     }
 
+    public function wantsToSeed(): bool
+    {
+        return $this->has('seed');
+    }
+
+    public function getSeederId(): ?string
+    {
+        return $this->input('seed');
+    }
+
     public function attributes(): array
     {
         return [

src/Icons/AppShellIcons.php

@@ -72,4 +72,5 @@ final class AppShellIcons
     public const FILE = 'file';
     public const COMMENT = 'comment';
     public const GLOBE = 'globe';
+    public const FLAG = 'flag';
 }

src/Icons/FontAwesome6IconTheme.php

@@ -82,6 +82,7 @@ class FontAwesome6IconTheme implements IconTheme
         AppShellIcons::FILE => 'file',
         AppShellIcons::COMMENT => 'comment',
         AppShellIcons::GLOBE => 'earth-africa',
+        AppShellIcons::FLAG => 'flag',
     ];
 
     public static function getName(): string

src/Icons/FontAwesome6ProIconTheme.php

@@ -88,6 +88,7 @@ class FontAwesome6ProIconTheme implements IconTheme
         AppShellIcons::FILE => 'file',
         AppShellIcons::COMMENT => 'comment-lines',
         AppShellIcons::GLOBE => 'earth-africa',
+        AppShellIcons::FLAG => 'flag-swallowtail',
     ];
 
     public function __construct()

src/Icons/FontAwesomeIconTheme.php

@@ -82,6 +82,7 @@ class FontAwesomeIconTheme implements IconTheme
         AppShellIcons::FILE => 'file',
         AppShellIcons::COMMENT => 'comment-dots',
         AppShellIcons::GLOBE => 'globe-africa',
+        AppShellIcons::FLAG => 'flag',
     ];
 
     public static function getName(): string

src/Icons/LineIconsTheme.php

@@ -81,6 +81,7 @@ class LineIconsTheme implements IconTheme
         AppShellIcons::FILE => 'empty-file',
         AppShellIcons::COMMENT => 'comments-alt-2',
         AppShellIcons::GLOBE => 'world',
+        AppShellIcons::FLAG => 'flag-alt',
     ];
 
     public static function getName(): string

src/Icons/LucideIconTheme.php

@@ -81,6 +81,7 @@ class LucideIconTheme implements IconTheme
         AppShellIcons::FILE => 'file',
         AppShellIcons::COMMENT => 'message-square-text',
         AppShellIcons::GLOBE => 'globe',
+        AppShellIcons::FLAG => 'flag',
     ];
 
     public static function getName(): string

src/Icons/TablerIconTheme.php

@@ -81,6 +81,7 @@ class TablerIconTheme implements IconTheme
         AppShellIcons::FILE => 'file',
         AppShellIcons::COMMENT => 'message',
         AppShellIcons::GLOBE => 'world',
+        AppShellIcons::FLAG => 'flag-3',
     ];
 
     public static function getName(): string

src/Icons/ZmdiIconTheme.php

@@ -81,6 +81,7 @@ class ZmdiIconTheme implements IconTheme
         AppShellIcons::FILE => 'file',
         AppShellIcons::COMMENT => 'comment',
         AppShellIcons::GLOBE => 'globe',
+        AppShellIcons::FLAG => 'flag',
     ];
 
     public static function getName(): string

src/resources/manifest.php

@@ -4,5 +4,5 @@
 
 return [
     'name' => 'AppShell',
-    'version' => '4.3.0'
+    'version' => '4.4.0'
 ];

src/resources/views/country/index.blade.php

@@ -7,8 +7,7 @@
 @push('page-actions')
     @if($countries->isEmpty())
         {!! Form::open(['route' => ['appshell.country.store', ['seed' => 1]], 'class' => 'd-inline']) !!}
-        <x-appshell::button variant="outline-secondary" size="sm" route="appshell.country.create" icon="download"
-                            onclick="submitSeedCountriesRequest()">
+        <x-appshell::button variant="outline-secondary" size="sm" route="appshell.country.create" icon="download">
             {{ __('Generate all countries') }}
         </x-appshell::button>
         {!! Form::close() !!}
@@ -25,12 +24,3 @@
     </x-appshell::card>
 
 @stop
-
-@push('scripts')
-    <script>
-        function submitSeedCountriesRequest() {
-
-
-        }
-    </script>
-@endpush

src/resources/views/country/show.blade.php

@@ -12,7 +12,10 @@
 
     <x-appshell::card>
         <x-slot:title>{{ __('Provinces') }}</x-slot:title>
-        @include('appshell::province._index', ['provinces' => $country->provinces])
+        @include('appshell::province._index', [
+            'provinces' => $country->provinces,
+            'availableProvinceSeeders' => $availableProvinceSeeders,
+        ])
     </x-appshell::card>
 
 @stop

src/resources/views/province/_index.blade.php

@@ -1,19 +1,20 @@
 @foreach($provinces as $province)
-    @can('edit provinces')
-        <a href="{{ route('appshell.province.show', [$country, $province]) }}">
-            <button class="btn btn-sm btn-secondary" type="button" title="{{ $province->type->label() }}">
-                {{ $province->name }}
-            </button>
-        </a>
-    @else
-        <button class="btn btn-sm dropdown-toggle btn-secondary" type="button" title="{{ $province->type->label() }}">
-            {{ $province->name }}
-        </button>
-    @endcan
+    <x-appshell::button variant="secondary" size="sm" :title="$province->type->label()" class="mb-2"
+        :href="auth()->user()->can('view provinces') ? route('appshell.province.show', [$country, $province]) : '#'"
+    >
+        {{ $province->name }}
+    </x-appshell::button>
 @endforeach
 
 @can('create provinces')
-    <a href="{{ route('appshell.province.create', $country) }}" class="btn btn-sm btn-success" title="{{ __('Add province') }}">
-        {!! icon('+') !!}
-    </a>
+    @foreach($availableProvinceSeeders as $id => $name)
+        {!! Form::open(['route' => ['appshell.province.store', [$country, 'seed' => $id]], 'class' => 'd-inline']) !!}
+            <x-appshell::button variant="outline-secondary" size="sm" route="appshell.country.create" icon="download" class="mb-2">
+                {{ __('Generate :seeder_name', ['seeder_name' => $name]) }}
+            </x-appshell::button>
+        {!! Form::close() !!}
+    @endforeach
+
+    <x-appshell::button :href="route('appshell.province.create', $country)" :title="__('Add province')"
+            variant="success" size="sm" icon="+" class="mb-2"></x-appshell::button>
 @endcan