Merge branch '0.7' into chore/merge_07_to_08

lunarphp · Dec 22, 2023 · f678cc9 · f678cc9
2 parents 55b4529 + 7f41cf6
commit f678cc9
Show file tree

Hide file tree

Showing 53 changed files with 473 additions and 555 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -2,7 +2,7 @@
 name: "\U0001F41B Bug report"
 about: Report something that's broken.
 title: ''
-labels: bug
+labels: bug,unconfirmed
 assignees: ''
 
 ---

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This repository serves as a monorepo for the main packages that make up Lunar.
 ## Community
 
 - [Join our discord server](https://discord.gg/v6qVWaf) and chat to the developers and people using Lunar.
-- [We have a roadmap](https://github.com/orgs/lunarphp/projects/1) where we will be detailing which features are next.
+- [We have a roadmap](https://github.com/orgs/lunarphp/projects/8) where we will be detailing which features are next.
 
 ## Packages in this monorepo
 

diff --git a/packages/admin/src/AdminHubServiceProvider.php b/packages/admin/src/AdminHubServiceProvider.php
@@ -219,8 +219,12 @@ public function boot()
         $this->registerPublishables();
         $this->registerStateListeners();
 
-        Route::bind('product', function ($id) {
-            return Product::withTrashed()->findOrFail($id);
+        Route::bind('product', function (mixed $value, \Illuminate\Routing\Route $route) {
+            if (in_array(\Lunar\Hub\Http\Middleware\Authenticate::class, $route->middleware())) {
+                return Product::withTrashed()->findOrFail($value);
+            }
+
+            return $value;
         });
 
         // Commands

diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php b/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php
@@ -51,7 +51,7 @@ abstract class AbstractDiscount extends Component
      * @var array
      */
     public Collection $selectedProducts;
-    
+
     /**
      * The product variants to restrict the coupon for.
      *
@@ -122,32 +122,29 @@ public function mount()
         $this->selectedProducts = $this->discount->purchasables()
             ->whereIn('type', ['limitation', 'exclusion'])
             ->wherePurchasableType(Product::class)
+            ->whereHas('purchasable')
             ->get()
             ->map(function ($limitation) {
                 return array_merge($this->mapProductToArray($limitation->purchasable), ['type' => $limitation->type]);
             });
-            
+
         $this->selectedProductVariants = $this->discount->purchasables()
             ->whereIn('type', ['limitation', 'exclusion'])
             ->wherePurchasableType(ProductVariant::class)
+            ->whereHas('purchasable')
             ->get()
             ->map(function ($limitation) {
                 return array_merge($this->mapProductVariantToArray($limitation->purchasable), ['type' => $limitation->type]);
             });
-
-        $this->selectedProductVariants = $this->discount->purchasableLimitations()
-            ->wherePurchasableType(ProductVariant::class)
-            ->get()
-            ->map(function ($limitation) {
-                return $this->mapProductVariantToArray($limitation->purchasable);
-            });
 
         $this->selectedConditions = $this->discount->purchasableConditions()
             ->wherePurchasableType(Product::class)
+            ->whereHas('purchasable')
             ->pluck('purchasable_id')->values()->toArray();
 
         $this->selectedRewards = $this->discount->purchasableRewards()
             ->wherePurchasableType(Product::class)
+            ->whereHas('purchasable')
             ->pluck('purchasable_id')->values()->toArray();
 
         $this->syncAvailability();
@@ -258,7 +255,7 @@ public function selectProducts(array $ids)
             ? $this->selectedProducts->merge($selectedProducts)
             : $selectedProducts;
     }
-    
+
     /**
      * Select product variants given an array of IDs
      *
@@ -345,7 +342,7 @@ public function removeProduct($index)
     {
         $this->selectedProducts->forget($index);
     }
-    
+
     /**
      * Remove the product variant by it's index.
      *
@@ -414,7 +411,7 @@ public function save()
             $this->discount->collections()->sync(
                 $this->selectedCollections->mapWithKeys(fn ($collection) => [$collection['id'] => ['type' => $collection['type']]])
             );
-            
+
             $this->discount->purchasables()
                 ->whereIn('type', ['exclusion', 'limitation'])
                 ->where('purchasable_type', Product::class)
@@ -434,7 +431,7 @@ public function save()
                     ])
                     ->save();
             }
-                        
+
             $this->discount->purchasables()
                 ->whereIn('type', ['exclusion', 'limitation'])
                 ->where('purchasable_type', ProductVariant::class)
@@ -454,20 +451,6 @@ public function save()
                     ])
                     ->save();
             }
-
-            $this->discount->purchasableLimitations()
-                ->where('purchasable_type', ProductVariant::class)
-                ->whereNotIn('purchasable_id', $this->selectedProductVariants->pluck('id'))
-                ->delete();
-
-            foreach ($this->selectedProductVariants as $variant) {
-                $this->discount->purchasableLimitations()->firstOrCreate([
-                    'discount_id' => $this->discount->id,
-                    'type' => 'limitation',
-                    'purchasable_type' => ProductVariant::class,
-                    'purchasable_id' => $variant['id'],
-                ]);
-            }
         });
 
         $this->emit('discount.saved', $this->discount->id);
@@ -579,7 +562,7 @@ private function mapProductToArray($product)
             'thumbnail' => optional($product->thumbnail)->getUrl('small'),
         ];
     }
-    
+
     /**
      * Return the data we need from a product variant
      *

diff --git a/packages/admin/tests/Feature/Http/Livewire/Pages/Products/ProductShowTest.php b/packages/admin/tests/Feature/Http/Livewire/Pages/Products/ProductShowTest.php
@@ -99,6 +99,40 @@ public function can_view_page_with_correct_permission()
             ->assertSeeLivewire('hub.components.products.show');
     }
 
+    /** @test */
+    public function cant_view_soft_deleted_products()
+    {
+        $this->setupRolesPermissions();
+
+        $staff = Staff::factory()->create([
+            'admin' => false,
+        ]);
+
+        $staff->givePermissionTo('catalogue:manage-products');
+
+        $this->actingAs($staff, 'staff');
+
+        $product = Product::factory()->create([
+            'deleted_at' => now(),
+        ]);
+
+        $variant = ProductVariant::factory()->create([
+            'product_id' => $product->id,
+        ]);
+
+        foreach (Currency::get() as $currency) {
+            Price::factory()->create([
+                'priceable_type' => ProductVariant::class,
+                'priceable_id' => $variant->id,
+                'currency_id' => $currency->id,
+                'tier' => 1,
+            ]);
+        }
+
+        $this->get(route('hub.products.show', $product->id))
+            ->assertSeeLivewire('hub.components.products.show');
+    }
+
     /** @test */
     public function product_with_one_variant_has_variant_components_visible()
     {

diff --git a/...es/admin/tests/Unit/Http/Livewire/Components/Settings/Product/ProductOptionCreateTest.php b/...es/admin/tests/Unit/Http/Livewire/Components/Settings/Product/ProductOptionCreateTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Lunar\Hub\Tests\Unit\Http\Livewire\Components\Settings\Product;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+use Lunar\Hub\Http\Livewire\Components\Settings\Product\Options\OptionsIndex;
+use Lunar\Hub\Models\Staff;
+use Lunar\Hub\Tests\TestCase;
+use Lunar\Models\Language;
+use Lunar\Models\ProductOption;
+
+class ProductOptionCreateTest extends TestCase
+{
+  use RefreshDatabase;
+
+  public function setUp(): void
+  {
+    parent::setUp();
+
+    Language::factory()->create([
+      'default' => true,
+      'code' => 'en',
+    ]);
+  }
+
+  /**
+   * @test
+   * */
+  public function can_populate_product_option_data()
+  {
+    $staff = Staff::factory()->create([
+      'admin' => true,
+    ]);
+
+    LiveWire::actingAs($staff, 'staff')
+      ->test(OptionsIndex::class)
+      ->set('newProductOption.name.' . Language::getDefault()->code, 'Size')
+      ->call('createOption');
+
+    $this->assertDatabaseHas((new ProductOption())->getTable(), [
+      'name' => json_encode([Language::getDefault()->code => 'Size']),
+    ]);
+  }
+}
diff --git a/...min/tests/Unit/Http/Livewire/Components/Settings/Product/ProductOptionValueCreateTest.php b/...min/tests/Unit/Http/Livewire/Components/Settings/Product/ProductOptionValueCreateTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Lunar\Hub\Tests\Unit\Http\Livewire\Components\Settings\Product;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+use Lunar\Hub\Http\Livewire\Components\Settings\Product\Options\OptionEdit;
+use Lunar\Hub\Models\Staff;
+use Lunar\Hub\Tests\TestCase;
+use Lunar\Models\Language;
+use Lunar\Models\ProductOption;
+use Lunar\Models\ProductOptionValue;
+
+class ProductOptionValueCreateTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Language::factory()->create([
+            'default' => true,
+            'code' => 'en',
+        ]);
+    }
+
+    /**
+     * @test
+     * */
+    public function can_populate_product_option_data()
+    {
+        ProductOption::factory(1)->create()->each(function ($option) {
+            $staff = Staff::factory()->create([
+                'admin' => true,
+            ]);
+
+            LiveWire::actingAs($staff, 'staff')
+                ->test(OptionEdit::class, ['productOption' => $option])
+                ->set('newProductOptionValue.name.' . Language::getDefault()->code, 'Size')
+                ->call('createOptionValue');
+
+            $this->assertDatabaseHas((new ProductOptionValue())->getTable(), [
+                'product_option_id' => $option->id,
+                'name' => json_encode([Language::getDefault()->code => 'Size'])
+            ]);
+        });
+    }
+}
diff --git a/packages/core/database/state/ConvertTaxbreakdown.php b/packages/core/database/state/ConvertTaxbreakdown.php
@@ -14,49 +14,20 @@ public function prepare()
 
     public function run()
     {
-        $prefix = config('lunar.database.table_prefix');
-        $updateTime = now();
-
-        if ($this->canRunOnOrders()) {
-            DB::table("{$prefix}orders")
-                ->whereJsonContainsKey("${prefix}orders.tax_breakdown->[0]->total")
-                ->orderBy('id')
-                ->chunk(500, function ($rows) use ($prefix, $updateTime) {
-                    foreach ($rows as $row) {
-                        $originalBreakdown = json_decode($row->tax_breakdown, true);
-
-                        DB::table("{$prefix}orders")->where('id', '=', $row->id)->update([
-                            'tax_breakdown' => collect($originalBreakdown)->map(function ($breakdown) use ($row) {
-                                return [
-                                    'description' => $breakdown['description'],
-                                    'identifier' => $breakdown['identifier'] ?? $breakdown['description'],
-                                    'percentage' => $breakdown['percentage'],
-                                    'value' => $breakdown['total'],
-                                    'currency_code' => $row->currency_code,
-                                ];
-                            })->toJson(),
-                            'updated_at' => $updateTime,
-                        ]);
-                    }
-                });
-        }
-
-        if ($this->canRunOnOrderLines()) {
-            DB::table("{$prefix}order_lines")
-                ->whereJsonContainsKey("${prefix}order_lines.tax_breakdown->[0]->total")
-                ->orderBy("${prefix}order_lines.id")
-                ->select(
-                    "${prefix}order_lines.id",
-                    "${prefix}order_lines.tax_breakdown",
-                    "${prefix}orders.currency_code",
-                )
-                ->join("${prefix}orders", "${prefix}order_lines.order_id", '=', "${prefix}orders.id")
-                ->chunk(500, function ($rows) use ($prefix, $updateTime) {
-                    DB::transaction(function () use ($prefix, $updateTime, $rows) {
+        DB::usingConnection(config('lunar.database.connection') ?: DB::getDefaultConnection(), function () {
+
+            $prefix = config('lunar.database.table_prefix');
+            $updateTime = now();
+
+            if ($this->canRunOnOrders()) {
+                DB::table("{$prefix}orders")
+                    ->whereJsonContainsKey("{$prefix}orders.tax_breakdown->[0]->total")
+                    ->orderBy('id')
+                    ->chunk(500, function ($rows) use ($prefix, $updateTime) {
                         foreach ($rows as $row) {
                             $originalBreakdown = json_decode($row->tax_breakdown, true);
 
-                            DB::table("{$prefix}order_lines")->where('id', '=', $row->id)->update([
+                            DB::table("{$prefix}orders")->where('id', '=', $row->id)->update([
                                 'tax_breakdown' => collect($originalBreakdown)->map(function ($breakdown) use ($row) {
                                     return [
                                         'description' => $breakdown['description'],
@@ -70,8 +41,41 @@ public function run()
                             ]);
                         }
                     });
-                });
-        }
+            }
+
+            if ($this->canRunOnOrderLines()) {
+                DB::table("{$prefix}order_lines")
+                    ->whereJsonContainsKey("{$prefix}order_lines.tax_breakdown->[0]->total")
+                    ->orderBy("{$prefix}order_lines.id")
+                    ->select(
+                        "{$prefix}order_lines.id",
+                        "{$prefix}order_lines.tax_breakdown",
+                        "{$prefix}orders.currency_code",
+                    )
+                    ->join("{$prefix}orders", "{$prefix}order_lines.order_id", '=', "{$prefix}orders.id")
+                    ->chunk(500, function ($rows) use ($prefix, $updateTime) {
+                        DB::transaction(function () use ($prefix, $updateTime, $rows) {
+                            foreach ($rows as $row) {
+                                $originalBreakdown = json_decode($row->tax_breakdown, true);
+
+                                DB::table("{$prefix}order_lines")->where('id', '=', $row->id)->update([
+                                    'tax_breakdown' => collect($originalBreakdown)->map(function ($breakdown) use ($row) {
+                                        return [
+                                            'description' => $breakdown['description'],
+                                            'identifier' => $breakdown['identifier'] ?? $breakdown['description'],
+                                            'percentage' => $breakdown['percentage'],
+                                            'value' => $breakdown['total'],
+                                            'currency_code' => $row->currency_code,
+                                        ];
+                                    })->toJson(),
+                                    'updated_at' => $updateTime,
+                                ]);
+                            }
+                        });
+                    });
+            }
+
+        });
     }
 
     protected function canRunOnOrders()