From 35c965d1f053fec7708b8a6a57f1c8f92acad79f Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 6 Feb 2023 16:44:36 +0000 Subject: [PATCH] Fixed the tests --- .github/workflows/ci.yml | 2 +- README.md | 29 ------------------- .../views/layouts/partials/header.blade.php | 2 +- .../views/layouts/partials/sidebar.blade.php | 2 +- src/Models/EmailService.php | 14 ++++----- src/Services/Helper.php | 4 +-- 6 files changed, 11 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f2d776..2f060b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: "kirschbaumdevelopment/laravel-test-runner:7.3", "kirschbaumdevelopment/laravel-test-runner:7.4", "kirschbaumdevelopment/laravel-test-runner:8.0", - "kirschbaumdevelopment/laravel-test-runner:9.0", + "kirschbaumdevelopment/laravel-test-runner:8.1", ] diff --git a/README.md b/README.md index e8cc75d..5b71c23 100644 --- a/README.md +++ b/README.md @@ -1,30 +1 @@ -

- - Modern open-source self-hosted email marketing. - -- [Website](https://sendportal.io) -- [Documentation](https://sendportal.io/docs) - -## Introduction - -The core functionality of SendPortal is contained within the [SendPortal Core](https://github.com/mettle/sendportal-core) package. If you would like to add SendPortal to an existing application, you only require this package. - -## Features -SendPortal includes subscriber and list management, email campaigns, message tracking, reports and multiple workspaces/domains in a modern, flexible and scalable application. - -SendPortal integrates with [Amazon SES](https://aws.amazon.com/ses), [Postmark](https://postmarkapp.com), [Sendgrid](https://sendgrid.com), [Mailgun](https://www.mailgun.com/) and [Mailjet](https://www.mailjet.com). - -The [SendPortal](https://github.com/mettle/sendportal) application acts as a wrapper around SendPortal Core. This will allow you to run your own copy of SendPortal as a stand-alone application, including user authentication and multiple workspaces. - -## Installation - -As of Version 2, SendPortal can be installed as a stand-alone application (i.e. including everything you need to run SendPortal), or as a package inside an existing Laravel application. - -If you would like to install SendPortal as a stand-alone application, please follow the [installation guide](https://sendportal.io/docs/v2/getting-started/installation). - -If you would like to add SendPortal to an existing application, please follow the [package installation guide](https://sendportal.io/docs/v2/getting-started/package-installation). - -## Upgrading - -If you already have a copy of SendPortal v1 installed, please follow the [upgrade guide](https://sendportal.io/docs/v2/getting-started/upgrade-guide). diff --git a/resources/views/layouts/partials/header.blade.php b/resources/views/layouts/partials/header.blade.php index 8c79398..c65f6d9 100644 --- a/resources/views/layouts/partials/header.blade.php +++ b/resources/views/layouts/partials/header.blade.php @@ -8,7 +8,7 @@

@yield('heading')

- {!! \Cornatul\Marketing\Base\Facades\Sendportal::headerHtmlContent() !!} + {!! \Cornatul\Marketing\Base\Facades\MarketingPortal::headerHtmlContent() !!} diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index 42a2e15..e2f18ef 100644 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -31,7 +31,7 @@ - {!! \Cornatul\Marketing\Base\Facades\Sendportal::sidebarHtmlContent() !!} + {!! \Cornatul\Marketing\Base\Facades\MarketingPortal::sidebarHtmlContent() !!} diff --git a/src/Models/EmailService.php b/src/Models/EmailService.php index 966c0e6..6972b58 100644 --- a/src/Models/EmailService.php +++ b/src/Models/EmailService.php @@ -71,13 +71,13 @@ public function campaigns(): HasMany return $this->hasMany(Campaign::class, 'email_service_id'); } - /** - * Automations using this email service. - */ - public function automations(): HasMany - { - return $this->hasMany(Automation::class, 'email_service_id'); - } +// /** +// * Automations using this email service. +// */ +// public function automations(): HasMany +// { +// return $this->hasMany(Automation::class, 'email_service_id'); +// } public function setSettingsAttribute(array $data): void { diff --git a/src/Services/Helper.php b/src/Services/Helper.php index 7c4b407..e0404e7 100644 --- a/src/Services/Helper.php +++ b/src/Services/Helper.php @@ -29,8 +29,6 @@ public function displayDate($date, string $timezone = null) public function isPro(): bool { - //todo replace this to MarketingProvider - // return class_exists(\Cornatul\Marketing\SendportalProServiceProvider::class); - return true; + return false; } }