mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 04:07:32 -05:00 
			
		
		
		
	Merge pull request #5521 from turbo124/v5-develop
Fixes for post mark mailer
This commit is contained in:
		
						commit
						f1eafb699e
					
				@ -36,18 +36,21 @@ class MailServiceProvider extends MailProvider
 | 
				
			|||||||
        });
 | 
					        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $this->app['mail.manager']->extend('postmark', function () {
 | 
					        $this->app['mail.manager']->extend('postmark', function () {
 | 
				
			||||||
             return new HttpClient(array_merge($config, [
 | 
					            return new PostmarkTransport(
 | 
				
			||||||
                'base_uri' => empty($config['base_uri'])
 | 
					                $this->guzzle(config('postmark.guzzle', [])),
 | 
				
			||||||
                    ? 'https://api.postmarkapp.com'
 | 
					                config('postmark.secret')
 | 
				
			||||||
                    : $config['base_uri']
 | 
					            );
 | 
				
			||||||
            ]));
 | 
					 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    protected function guzzle(array $config): HttpClient
 | 
					    protected function guzzle(array $config): HttpClient
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return new HttpClient($config);
 | 
					        return new HttpClient(array_merge($config, [
 | 
				
			||||||
 | 
					                'base_uri' => empty($config['base_uri'])
 | 
				
			||||||
 | 
					                    ? 'https://api.postmarkapp.com'
 | 
				
			||||||
 | 
					                    : $config['base_uri']
 | 
				
			||||||
 | 
					            ]));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function provides()
 | 
					    public function provides()
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user