From e5a0bc8a0e4013e320b4c456c5df5a63d60c0c87 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 20 Feb 2020 10:56:59 +0530 Subject: [PATCH] Issue #2500 and chaneelog updated --- CHANGELOG for v1.x.x.md | 4 ++++ .../2019_05_13_024325_create_cart_rule_customers_table.php | 2 +- .../2019_05_13_024326_create_cart_rule_coupons_table.php | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index eed7a7f61..3739dc054 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -56,6 +56,8 @@ * #2459 [fixed] - shipping address field warning for guest customer not translated. +* #2463 [fixed] - Tax rate is not update on same product. + * #2469 [fixed] - Displaying wrong amount for bundle product in cart. * #2479 [fixed] - showing total review in recent view product list. @@ -70,6 +72,8 @@ * #2494 [fixed] - Product total inventory for all locale is showing wrong. +* #2500 [fixed] - Database reset fails. + ## **v1.0.0-BETA1(5th of February 2020)** - *Release* * [feature] Updated to laravel version 6. diff --git a/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php index a16452c6f..b9e2abba6 100644 --- a/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php +++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php @@ -32,6 +32,6 @@ class CreateCartruleCustomersTable extends Migration */ public function down() { - Schema::dropIfExists('cartrule_customers'); + Schema::dropIfExists('cart_rule_customers'); } } diff --git a/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php index 89741800e..9741c1654 100644 --- a/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php +++ b/packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php @@ -22,7 +22,7 @@ class CreateCartruleCouponsTable extends Migration $table->integer('type')->unsigned()->default(0); $table->boolean('is_primary')->default(0); $table->date('expired_at')->nullable(); - + $table->integer('cart_rule_id')->unsigned(); $table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade'); $table->timestamps(); @@ -36,6 +36,6 @@ class CreateCartruleCouponsTable extends Migration */ public function down() { - Schema::dropIfExists('cartrule_coupons'); + Schema::dropIfExists('cart_rule_coupons'); } }