Fix/default weight unit

packages/core/database/migrations/2025_12_14_215636_update_weight_unit_default_on_product_variants_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Lunar\Base\Migration;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table($this->prefix.'product_variants', function (Blueprint $table) {
+            $table->string('weight_unit')->default('kg')->nullable()->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table($this->prefix.'product_variants', function (Blueprint $table) {
+            $table->string('weight_unit')->default('mm')->nullable()->change();
+        });
+    }
+};

packages/core/database/state/UpdateWeightUnitToKg.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Lunar\Database\State;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateWeightUnitToKg
+{
+    public function prepare()
+    {
+        //
+    }
+
+    public function run(): void
+    {
+        if (! $this->canRun()) {
+            return;
+        }
+
+        DB::table($this->table())
+            ->whereNull('weight_unit')
+            ->orWhere('weight_unit', 'mm')
+            ->update(['weight_unit' => 'kg']);
+    }
+
+    protected function canRun(): bool
+    {
+        return Schema::hasTable($this->table())
+            && Schema::hasColumn($this->table(), 'weight_unit');
+    }
+
+    protected function table(): string
+    {
+        $prefix = config('lunar.database.table_prefix');
+
+        return $prefix.'product_variants';
+    }
+}

packages/core/src/LunarServiceProvider.php

@@ -56,6 +56,7 @@
 use Lunar\Database\State\EnsureMediaCollectionsAreRenamed;
 use Lunar\Database\State\MigrateCartOrderRelationship;
 use Lunar\Database\State\PopulateProductOptionLabelWithName;
+use Lunar\Database\State\UpdateWeightUnitToKg;
 use Lunar\Facades\Telemetry;
 use Lunar\Listeners\CartSessionAuthListener;
 use Lunar\Managers\CartSessionManager;
@@ -302,6 +303,7 @@ protected function registerStateListeners()
             MigrateCartOrderRelationship::class,
             ConvertTaxbreakdown::class,
             ConvertBackOrderPurchasability::class,
+            UpdateWeightUnitToKg::class,
         ];
 
         foreach ($states as $state) {
@@ -392,9 +394,15 @@ protected function registerBlueprintMacros(): void
         Blueprint::macro('dimensions', function () {
             /** @var Blueprint $this */
             $columns = ['length', 'width', 'height', 'weight', 'volume'];
+            $unitDefaults = [
+                'weight' => 'kg',
+            ];
+
             foreach ($columns as $column) {
                 $this->decimal("{$column}_value", 10, 4)->default(0)->nullable()->index();
-                $this->string("{$column}_unit")->default('mm')->nullable();
+                $this->string("{$column}_unit")
+                    ->default($unitDefaults[$column] ?? 'mm')
+                    ->nullable();
             }
         });
 

packages/core/src/Models/Cart.php

@@ -261,7 +261,7 @@ public function scopeActive(Builder $query): Builder
                 ->whereDoesntHave('orders')
                 ->orWhereHas('orders', function ($sub) {
                     $sub->whereNull('placed_at');
-            });
+                });
         });
     }
 

tests/core/Unit/Models/CartTest.php

@@ -1168,29 +1168,29 @@
     setAuthUserConfig();
 
     $currency = Currency::factory()->create();
-    $channel  = Channel::factory()->create();
+    $channel = Channel::factory()->create();
 
     $userA = StubUser::factory()->create();
     $userB = StubUser::factory()->create();
 
     $otherUsersCart = Cart::factory()->create([
-        'user_id'     => $userB->id,
+        'user_id' => $userB->id,
         'currency_id' => $currency->id,
-        'channel_id'  => $channel->id,
+        'channel_id' => $channel->id,
     ]);
 
-    $expectedCart  = Cart::factory()->create([
-        'user_id'     => $userA->id,
+    $expectedCart = Cart::factory()->create([
+        'user_id' => $userA->id,
         'currency_id' => $currency->id,
-        'channel_id'  => $channel->id,
-        'merged_id'   => null,
+        'channel_id' => $channel->id,
+        'merged_id' => null,
     ]);
 
     $mergedCart = Cart::factory()->create([
-        'user_id'     => $userA->id,
+        'user_id' => $userA->id,
         'currency_id' => $currency->id,
-        'channel_id'  => $channel->id,
-        'merged_id'   => $expectedCart->id,
+        'channel_id' => $channel->id,
+        'merged_id' => $expectedCart->id,
     ]);
 
     $cartId = $userA->carts()
@@ -1208,28 +1208,28 @@
     setAuthUserConfig();
 
     $currency = Currency::factory()->create();
-    $channel  = Channel::factory()->create();
-    $user     = StubUser::factory()->create();
+    $channel = Channel::factory()->create();
+    $user = StubUser::factory()->create();
 
     $older = Cart::factory()->create([
-        'user_id'     => $user->id,
-        'merged_id'   => null,
+        'user_id' => $user->id,
+        'merged_id' => null,
         'currency_id' => $currency->id,
-        'channel_id'  => $channel->id,
+        'channel_id' => $channel->id,
     ]);
 
     $expectedCart = Cart::factory()->create([
-        'user_id'     => $user->id,
-        'merged_id'   => null,
+        'user_id' => $user->id,
+        'merged_id' => null,
         'currency_id' => $currency->id,
-        'channel_id'  => $channel->id,
+        'channel_id' => $channel->id,
     ]);
 
     $mergedCart = Cart::factory()->create([
-        'user_id'     => $user->id,
-        'merged_id'   => $expectedCart->id,
+        'user_id' => $user->id,
+        'merged_id' => $expectedCart->id,
         'currency_id' => $currency->id,
-        'channel_id'  => $channel->id,
+        'channel_id' => $channel->id,
     ]);
 
     $this->actingAs($user);
@@ -1242,4 +1242,4 @@
         ->and($foundCart->id)->not->toBe($older->id)
         ->and($foundCart->id)->not->toBe($mergedCart->id)
         ->and($foundCart->merged_id)->toBeNull();
-});
+});