Merge branch 'rebrand'

wintercms · Apr 19, 2021 · 56695a2 · 56695a2
2 parents 142b186 + 06bbc1d
commit 56695a2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/Plugin.php b/Plugin.php
@@ -16,7 +16,7 @@ public function pluginDetails()
             'description' => 'winter.notify::lang.plugin.description',
             'author'      => 'Winter CMS',
             'icon'        => 'icon-bullhorn',
-            'replaces'    => 'RainLab.Notify'
+            'replaces'    => ['RainLab.Notify' => '<= 1.0.3'],
         ];
     }
 

diff --git a/updates/v1.0.1/create_notification_rules_table.php b/updates/v1.0.1/create_notification_rules_table.php
@@ -7,7 +7,7 @@ class CreateNotificationRulesTable extends Migration
 {
     public function up()
     {
-        Schema::create('winter_notify_notification_rules', function ($table) {
+        Schema::create('rainlab_notify_notification_rules', function ($table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->string('name')->nullable();
@@ -24,6 +24,6 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists('winter_notify_notification_rules');
+        Schema::dropIfExists('rainlab_notify_notification_rules');
     }
 }
diff --git a/updates/v1.0.1/create_notifications_table.php b/updates/v1.0.1/create_notifications_table.php
@@ -8,7 +8,7 @@ class CreateNotificationsTable extends Migration
 {
     public function up()
     {
-        Schema::create('winter_notify_notifications', function(Blueprint $table) {
+        Schema::create('rainlab_notify_notifications', function(Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string('event_type');
             $table->morphs('notifiable');
@@ -23,6 +23,6 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists('winter_notify_notifications');
+        Schema::dropIfExists('rainlab_notify_notifications');
     }
 }
diff --git a/updates/v1.0.1/create_rule_actions_table.php b/updates/v1.0.1/create_rule_actions_table.php
@@ -8,7 +8,7 @@ class CreateRuleActionsTable extends Migration
 {
     public function up()
     {
-        Schema::create('winter_notify_rule_actions', function(Blueprint $table) {
+        Schema::create('rainlab_notify_rule_actions', function(Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->string('class_name')->nullable();
@@ -20,6 +20,6 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists('winter_notify_rule_actions');
+        Schema::dropIfExists('rainlab_notify_rule_actions');
     }
 }
diff --git a/updates/v1.0.1/create_rule_conditions_table.php b/updates/v1.0.1/create_rule_conditions_table.php
@@ -8,7 +8,7 @@ class CreateConditionsRulesTable extends Migration
 {
     public function up()
     {
-        Schema::create('winter_notify_rule_conditions', function(Blueprint $table) {
+        Schema::create('rainlab_notify_rule_conditions', function(Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->string('class_name')->nullable();
@@ -24,6 +24,6 @@ public function up()
 
     public function down()
     {
-        Schema::dropIfExists('winter_notify_rule_conditions');
+        Schema::dropIfExists('rainlab_notify_rule_conditions');
     }
 }
diff --git a/updates/v1.1.0/rename_tables.php → updates/v2.0.0/rename_tables.php b/updates/v1.1.0/rename_tables.php → updates/v2.0.0/rename_tables.php
@@ -17,7 +17,7 @@ public function up()
         foreach (self::TABLES as $table) {
             $from = 'rainlab_notify_' . $table;
             $to   = 'winter_notify_' . $table;
-            if (Schema::hasTable($from)) {
+            if (Schema::hasTable($from) && !Schema::hasTable($to)) {
                 Schema::rename($from, $to);
             }
         }
@@ -28,7 +28,7 @@ public function down()
         foreach (self::TABLES as $table) {
             $from = 'winter_notify_' . $table;
             $to   = 'rainlab_notify_' . $table;
-            if (Schema::hasTable($from)) {
+            if (Schema::hasTable($from) && !Schema::hasTable($to)) {
                 Schema::rename($from, $to);
             }
         }

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -6,6 +6,6 @@
     - v1.0.1/create_rule_actions_table.php
 "1.0.2": Fixes crashing bug.
 "1.0.3": Added Turkish & Russian translations, various bug fixes.
-"1.1.0":
+"2.0.0":
     - Rebrand to Winter.Notify
-    - v1.1.0/rename_tables.php
+    - v2.0.0/rename_tables.php