Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.2] Hotfix - Brand url generation #862

Merged
merged 15 commits into from
Feb 15, 2023
Merged

[0.2] Hotfix - Brand url generation #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
10ac7aa
Squashed commit of the following:
alecritson Feb 10, 2023
492234b
Merge branch '0.2'
alecritson Feb 12, 2023
06eb5f7
Squashed commit of the following:
alecritson Feb 14, 2023
7b215e2
Merge branch '0.2'
alecritson Feb 15, 2023
244c0ca
add test
wychoong Feb 15, 2023
c06aabc
enhance url generator to handle non attribute_data
wychoong Feb 15, 2023
e145dc4
phpunit warning: expectWarningMessage deprecated
wychoong Feb 15, 2023
edb8995
cleanup
wychoong Feb 15, 2023
8073663
enhance url generator to handle non attribute_data
wychoong Feb 15, 2023
f540d53
phpunit warning: expectWarningMessage deprecated
wychoong Feb 15, 2023
f5b02a0
cleanup
wychoong Feb 15, 2023
3cb59c4
Revert "enhance url generator to handle non attribute_data"
wychoong Feb 15, 2023
966c4db
Merge branch 'fix/brand-url-generation' of https://github.com/wychoon…
wychoong Feb 15, 2023
c0b387d
pint
wychoong Feb 15, 2023
97e8fed
Merge branch 'lunarphp:main' into fix/brand-url-generation
wychoong Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions packages/admin/src/Http/Livewire/Components/Brands/BrandsIndex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Lunar\Hub\Http\Livewire\Components\Brands;

use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Livewire\Component;
use Lunar\Hub\Http\Livewire\Traits\Notifies;
use Lunar\Models\Brand;
Expand Down Expand Up @@ -84,14 +83,7 @@ public function createBrand()
'name' => $this->brand['name'],
]);

$brand->urls()->create([
'slug' => Str::slug($this->brand['name']),
'default' => true,
'language_id' => Language::getDefault()->id,
]);

$this->brand = null;
$this->slug = null;

$this->showCreateForm = false;

Expand Down
2 changes: 1 addition & 1 deletion packages/admin/src/Http/Livewire/Pages/Brands/BrandShow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function render()
{
return view('adminhub::livewire.pages.brands.show')
->layout('adminhub::layouts.app', [
'title' => 'Customers',
'title' => $this->brand->name,
]);
}
}
1 change: 0 additions & 1 deletion packages/core/tests/Unit/Models/BrandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
/**
* @group lunar.brands
*/

class BrandTest extends TestCase
{
use RefreshDatabase;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/tests/Unit/Models/ProductOptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function handle_if_not_unique_throw_exception()
$productOption = ProductOption::factory()->create();

$this->expectException(QueryException::class);
$this->expectWarningMessage('UNIQUE constraint failed');
$this->expectExceptionMessage('UNIQUE constraint failed');
ProductOption::factory()->create([
'handle' => $productOption->handle,
]);
Expand Down