add uuid to order

conedevelopment · Oct 28, 2023 · a837454 · a837454
1 parent 9dec62b
commit a837454
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/database/migrations/2020_01_01_000500_create_bazar_orders_table.php b/database/migrations/2020_01_01_000500_create_bazar_orders_table.php
@@ -13,6 +13,7 @@ public function up(): void
     {
         Schema::create('bazar_orders', static function (Blueprint $table): void {
             $table->id();
+            $table->uuid();
             $table->foreignId('user_id')->nullable()->constrained()->nullOnDelete();
             $table->string('status');
             $table->string('currency');

diff --git a/src/Models/Order.php b/src/Models/Order.php
@@ -12,6 +12,7 @@
 use Cone\Root\Traits\InteractsWithProxy;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -24,6 +25,7 @@ class Order extends Model implements Contract
 {
     use Addressable;
     use HasFactory;
+    use HasUuids;
     use InteractsWithDiscounts;
     use InteractsWithItems;
     use InteractsWithProxy;
@@ -121,6 +123,7 @@ public static function statuses(): array
             static::CANCELLED => __('Cancelled'),
             static::FAILED => __('Failed'),
             static::REFUNDED => __('Refunded'),
+            static::PARTIALLY_REFUNDED => __('Partially Refunded'),
         ];
     }
 
@@ -176,6 +179,14 @@ protected function statusName(): Attribute
         );
     }
 
+    /**
+     * Get the columns that should receive a unique identifier.
+     */
+    public function uniqueIds(): array
+    {
+        return ['uuid'];
+    }
+
     /**
      * Create a payment transaction for the order.
      */

diff --git a/src/Traits/InteractsWithItems.php b/src/Traits/InteractsWithItems.php
@@ -3,6 +3,7 @@
 namespace Cone\Bazar\Traits;
 
 use Cone\Bazar\Bazar;
+use Cone\Bazar\Interfaces\Inventoryable;
 use Cone\Bazar\Interfaces\LineItem;
 use Cone\Bazar\Models\Item;
 use Cone\Bazar\Models\Shipping;
@@ -78,7 +79,9 @@ protected function lineItems(): Attribute
     {
         return new Attribute(
             get: function (): Collection {
-                return $this->items->merge([$this->shipping]);
+                return $this->items->when($this->needsShipping(), function (Collection $items): Collection {
+                    return $items->merge([$this->shipping]);
+                });
             }
         );
     }
@@ -160,7 +163,10 @@ protected function formattedTax(): Attribute
      */
     public function needsShipping(): bool
     {
-        return true;
+        return $this->items->some(static function (Item $item): bool {
+            return $item->buyable instanceof Inventoryable
+                && $item->buyable->isVirtual();
+        });
     }
 
     /**