From 46aba43898a97e130bea5e72c0c61bea2053aa5e Mon Sep 17 00:00:00 2001 From: iamgergo Date: Thu, 20 May 2021 20:59:57 +0200 Subject: [PATCH] remove uuid concept from cart --- ...1_01_000100_create_bazar_addresses_table.php | 2 +- ...20_01_01_000300_create_bazar_items_table.php | 2 +- ...20_01_01_000700_create_bazar_carts_table.php | 2 +- ...1_01_001000_create_bazar_shippings_table.php | 2 +- src/Models/Cart.php | 17 ----------------- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/database/migrations/2020_01_01_000100_create_bazar_addresses_table.php b/database/migrations/2020_01_01_000100_create_bazar_addresses_table.php index f8cc7dfc..6e396fa5 100644 --- a/database/migrations/2020_01_01_000100_create_bazar_addresses_table.php +++ b/database/migrations/2020_01_01_000100_create_bazar_addresses_table.php @@ -15,7 +15,7 @@ public function up(): void { Schema::create('bazar_addresses', static function (Blueprint $table): void { $table->id(); - $table->uuidMorphs('addressable'); + $table->morphs('addressable'); $table->string('first_name', 60)->nullable(); $table->string('last_name', 60)->nullable(); $table->string('country', 2)->nullable(); diff --git a/database/migrations/2020_01_01_000300_create_bazar_items_table.php b/database/migrations/2020_01_01_000300_create_bazar_items_table.php index fd224c4a..138569b9 100644 --- a/database/migrations/2020_01_01_000300_create_bazar_items_table.php +++ b/database/migrations/2020_01_01_000300_create_bazar_items_table.php @@ -16,7 +16,7 @@ public function up(): void Schema::create('bazar_items', static function (Blueprint $table): void { $table->uuid('id')->primary(); $table->foreignId('product_id')->nullable()->constrained('bazar_products')->nullOnDelete(); - $table->uuidMorphs('itemable'); + $table->morphs('itemable'); $table->unsignedDecimal('price'); $table->unsignedDecimal('tax')->default(0); $table->unsignedDecimal('quantity'); diff --git a/database/migrations/2020_01_01_000700_create_bazar_carts_table.php b/database/migrations/2020_01_01_000700_create_bazar_carts_table.php index d1e14638..d29f3013 100644 --- a/database/migrations/2020_01_01_000700_create_bazar_carts_table.php +++ b/database/migrations/2020_01_01_000700_create_bazar_carts_table.php @@ -14,7 +14,7 @@ class CreateBazarCartsTable extends Migration public function up(): void { Schema::create('bazar_carts', static function (Blueprint $table): void { - $table->uuid('id')->primary(); + $table->id('id'); $table->foreignId('user_id')->nullable()->constrained()->cascadeOnDelete(); $table->foreignId('order_id')->nullable()->constrained('bazar_orders')->cascadeOnDelete(); $table->string('currency'); diff --git a/database/migrations/2020_01_01_001000_create_bazar_shippings_table.php b/database/migrations/2020_01_01_001000_create_bazar_shippings_table.php index 71429609..dfe85fe5 100644 --- a/database/migrations/2020_01_01_001000_create_bazar_shippings_table.php +++ b/database/migrations/2020_01_01_001000_create_bazar_shippings_table.php @@ -15,7 +15,7 @@ public function up(): void { Schema::create('bazar_shippings', static function (Blueprint $table): void { $table->id(); - $table->uuidMorphs('shippable'); + $table->morphs('shippable'); $table->string('driver'); $table->unsignedDecimal('cost')->default(0); $table->unsignedDecimal('tax')->default(0); diff --git a/src/Models/Cart.php b/src/Models/Cart.php index 6bade3d5..9327a6b3 100644 --- a/src/Models/Cart.php +++ b/src/Models/Cart.php @@ -4,7 +4,6 @@ use Bazar\Bazar; use Bazar\Concerns\Addressable; -use Bazar\Concerns\HasUuid; use Bazar\Concerns\InteractsWithDiscounts; use Bazar\Concerns\InteractsWithItems; use Bazar\Concerns\InteractsWithProxy; @@ -20,7 +19,6 @@ class Cart extends Model implements Contract { use Addressable; use HasFactory; - use HasUuid; use InteractsWithDiscounts; use InteractsWithItems; use InteractsWithProxy; @@ -52,26 +50,11 @@ class Cart extends Model implements Contract * @var array */ protected $fillable = [ - 'id', 'locked', 'discount', 'currency', ]; - /** - * The "type" of the primary key ID. - * - * @var string - */ - protected $keyType = 'string'; - - /** - * Indicates if the IDs are auto-incrementing. - * - * @var bool - */ - public $incrementing = false; - /** * The table associated with the model. *