Skip to content

Commit 47851df

Browse files
committed
resolve conflict in the migrations folder,by forcing to publish the migration before migrating it.
1 parent 08a4cd3 commit 47851df

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ composer require devinweb/laravel-hyperpay
1919

2020
## Database migration
2121

22-
`Laravel-hyperpay` provides a migration to handle its own transaction, don't forget to run the migration after installation
22+
`Laravel-hyperpay` provides a migration to handle its own transaction, don't forget to publish the migration after installation
2323

2424
```bash
25-
php artisan migrate
25+
php artisan vendor:publish --tag="hyperpay-migrations"
2626
```
2727

28-
If you want to make an update or change the path of the migration, you can publish it using `vendor:publish`
28+
Then migrate
2929

3030
```bash
31-
php artisan vendor:publish --tag="hyperpay-migrations"
31+
php artisan migrate
3232
```
3333

3434
This migration has a model named `Transaction`, if your app use [multi-tenancy](https://tenancy.dev/docs/hyn/5.5/installation), you can create a new transaction model based on the `hyperpay transaction` model.

src/LaravelHyperpayServiceProvider.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public function boot()
1717
$this->registerRoutes();
1818
$this->registerResources();
1919
$this->registerPublishing();
20-
$this->registerMigrations();
2120
}
2221

2322
/**
@@ -70,17 +69,6 @@ protected function registerPublishing()
7069
}
7170
}
7271

73-
/**
74-
* Register the package migrations.
75-
*
76-
* @return void
77-
*/
78-
protected function registerMigrations()
79-
{
80-
if ($this->app->runningInConsole()) {
81-
$this->loadMigrationsFrom(__DIR__.'/../database/migrations');
82-
}
83-
}
8472

8573
/**
8674
* Register the application services.

0 commit comments

Comments
 (0)