From 61788b77f1641a4a96e4f1d2ed6f1e188cc1b684 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 10 Feb 2021 08:58:53 +1100
Subject: [PATCH] Add PostMark

---
 composer.json       |  6 ++--
 composer.lock       | 78 ++++++++++++++++++++++-----------------------
 config/services.php |  7 ++--
 3 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/composer.json b/composer.json
index 6ca6f1b0cedc..82fb2f764bb7 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,8 @@
         "stripe/stripe-php": "^7.50",
         "turbo124/beacon": "^1",
         "turbo124/laravel-gmail": "^5.0",
-        "webpatser/laravel-countries": "dev-master#75992ad"
+        "webpatser/laravel-countries": "dev-master#75992ad",
+        "wildbit/postmark-php": "^4.0"
     },
     "require-dev": {
         "php": "^7.4",
@@ -79,8 +80,7 @@
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.0",
-        "vimeo/psalm": "^4.0",
-        "wildbit/postmark-php": "^4.0"
+        "vimeo/psalm": "^4.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index 99adca936662..ef67f580749a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "49484c0e046a5663433fef2353ee6ee8",
+    "content-hash": "559255a3f2573bb2598a3f97f926c088",
     "packages": [
         {
             "name": "asgrim/ofxparser",
@@ -9735,6 +9735,44 @@
                 "source": "https://github.com/webpatser/laravel-countries"
             },
             "time": "2019-07-12T14:06:05+00:00"
+        },
+        {
+            "name": "wildbit/postmark-php",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wildbit/postmark-php.git",
+                "reference": "136e3d0884411ca23d0bac02470cfa1d14be676c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wildbit/postmark-php/zipball/136e3d0884411ca23d0bac02470cfa1d14be676c",
+                "reference": "136e3d0884411ca23d0bac02470cfa1d14be676c",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0|^7.0",
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Postmark\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "The officially supported client for Postmark (http://postmarkapp.com)",
+            "support": {
+                "issues": "https://github.com/wildbit/postmark-php/issues",
+                "source": "https://github.com/wildbit/postmark-php/tree/4.0.0"
+            },
+            "time": "2020-09-10T16:36:51+00:00"
         }
     ],
     "packages-dev": [
@@ -13629,44 +13667,6 @@
             },
             "time": "2015-12-17T08:42:14+00:00"
         },
-        {
-            "name": "wildbit/postmark-php",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/wildbit/postmark-php.git",
-                "reference": "136e3d0884411ca23d0bac02470cfa1d14be676c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/wildbit/postmark-php/zipball/136e3d0884411ca23d0bac02470cfa1d14be676c",
-                "reference": "136e3d0884411ca23d0bac02470cfa1d14be676c",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0|^7.0",
-                "php": ">=7.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Postmark\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "The officially supported client for Postmark (http://postmarkapp.com)",
-            "support": {
-                "issues": "https://github.com/wildbit/postmark-php/issues",
-                "source": "https://github.com/wildbit/postmark-php/tree/4.0.0"
-            },
-            "time": "2020-09-10T16:36:51+00:00"
-        },
         {
             "name": "zircote/swagger-php",
             "version": "3.1.0",
diff --git a/config/services.php b/config/services.php
index 517918628814..ba7b192c3dcc 100644
--- a/config/services.php
+++ b/config/services.php
@@ -36,10 +36,9 @@ return [
     'gmail' => [
         'token' => '',
     ],
-    'postmark' => env('POSTMARK_API_TOKEN', ''),
-    'postmark_ticket' => env('POSTMARK_API_TICKET_TOKEN'),
-    'postmark_ticket_2' => env('POSTMARK_API_TICKET_TOKEN_2'),
-
+    'postmark' => [
+        'token' => env('POSTMARK_API_TOKEN', ''),
+    ],
     'stripe' => [
         'model'  => App\Models\User::class,
         'key'    => env('STRIPE_KEY'),