mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Send Generic entity email. (#3560)
* Enable identifying a user who submits a report to sentry for tracking purposes * Minor fix for setup page * Fixes for Tests * Fixes for tests * Generic Entity Emailer * Fixes for emailing a generic entity
This commit is contained in:
David Bomba
GitHub
parent
6df62faa82
commit
8b0fe63eb5
1
.env.ci
1
.env.ci
@ -18,3 +18,4 @@ DB_PASSWORD=ninja
|
||||
DB_HOST=127.0.0.1
|
||||
NINJA_ENVIRONMENT=development
|
||||
COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
|
||||
TRAVIS=true
|
||||
1
.github/workflows/phpunit.yml
vendored
1
.github/workflows/phpunit.yml
vendored
@ -22,6 +22,7 @@ jobs:
|
||||
SESSION_DRIVER: file
|
||||
NINJA_ENVIRONMENT: development
|
||||
MULTI_DB_ENABLED: false
|
||||
TRAVIS: true
|
||||
|
||||
services:
|
||||
mariadb:
|
||||
|
||||
@ -235,7 +235,7 @@ class Designer
|
||||
private function companyDetails(Company $company)
|
||||
{
|
||||
$data = [
|
||||
'$company.company_name' => '<span>$company.company_name</span>',
|
||||
'$company.name' => '<span>$company.name</span>',
|
||||
'$company.id_number' => '<span>$company.id_number</span>',
|
||||
'$company.vat_number' => '<span>$company.vat_number</span>',
|
||||
'$company.website' => '<span>$company.website</span>',
|
||||
|
||||
@ -23,6 +23,8 @@ use Symfony\Component\Debug\Exception\FatalThrowableError;
|
||||
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
use Illuminate\Database\Eloquent\RelationNotFoundException;
|
||||
use Sentry\State\Scope;
|
||||
use function Sentry\configureScope;
|
||||
|
||||
class Handler extends ExceptionHandler
|
||||
{
|
||||
@ -53,8 +55,23 @@ class Handler extends ExceptionHandler
|
||||
*/
|
||||
public function report(Exception $exception)
|
||||
{
|
||||
|
||||
if (app()->bound('sentry') && $this->shouldReport($exception)) {
|
||||
|
||||
app('sentry')->configureScope(function (Scope $scope): void {
|
||||
|
||||
if (auth()->user() && auth()->user()->account->report_errors) {
|
||||
$scope->setUser([
|
||||
'id' => auth()->user()->account->key,
|
||||
'email' => auth()->user()->email,
|
||||
'name' => "Anonymous User",
|
||||
]);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
app('sentry')->captureException($exception);
|
||||
|
||||
}
|
||||
|
||||
parent::report($exception);
|
||||
|
||||
@ -34,7 +34,6 @@ class InvoiceItemFactory
|
||||
$item->tax_rate3 = 0;
|
||||
$item->sort_id = 0;
|
||||
$item->line_total = 0;
|
||||
$item->date = Carbon::now();
|
||||
$item->custom_value1 = null;
|
||||
$item->custom_value2 = null;
|
||||
$item->custom_value3 = null;
|
||||
|
||||
@ -11,7 +11,10 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Helpers\Email\InvoiceEmail;
|
||||
use App\Http\Requests\Email\SendEmailRequest;
|
||||
use App\Jobs\Invoice\EmailInvoice;
|
||||
use App\Notifications\SendGenericNotification;
|
||||
use App\Utils\Traits\MakesHash;
|
||||
|
||||
class EmailController extends BaseController
|
||||
@ -94,6 +97,24 @@ class EmailController extends BaseController
|
||||
*/
|
||||
public function send(SendEmailRequest $request)
|
||||
{
|
||||
$entity = $request->input('entity');
|
||||
$entity_obj = $entity::find($request->input('entity_id'));
|
||||
$subject = $request->input('subject');
|
||||
$body = $request->input('body');
|
||||
$entity_string = strtolower(class_basename($entity_obj));
|
||||
|
||||
$entity_obj->invitations->each(function ($invitation) use($subject, $body, $entity_string, $entity_obj) {
|
||||
|
||||
if ($invitation->contact->send_email && $invitation->contact->email) {
|
||||
|
||||
$when = now()->addSeconds(1);
|
||||
|
||||
$invitation->contact->notify((new SendGenericNotification($invitation, $entity_string, $subject, $body))->delay($when));
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
$data = [];
|
||||
|
||||
return response()->json($data, 200);
|
||||
|
||||
@ -130,8 +130,9 @@ class SetupController extends Controller
|
||||
|
||||
$randomStatus = rand(0, 1);
|
||||
|
||||
if ($randomStatus) {
|
||||
if ($randomStatus)
|
||||
return response([], 200);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
info(['action' => 'SetupController::checkMail()', 'message' => $e->getMessage(),]);
|
||||
|
||||
|
||||
@ -12,9 +12,11 @@
|
||||
namespace App\Http\Requests\Email;
|
||||
|
||||
use App\Http\Requests\Request;
|
||||
use App\Utils\Traits\MakesHash;
|
||||
|
||||
class SendEmailRequest extends Request
|
||||
{
|
||||
use MakesHash;
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
@ -48,9 +50,15 @@ class SendEmailRequest extends Request
|
||||
|
||||
$settings = auth()->user()->company()->settings;
|
||||
|
||||
if(!property_exists($settings, $template))
|
||||
if(empty($input['template']))
|
||||
$input['template'] = '';
|
||||
|
||||
if(!property_exists($settings, $input['template']))
|
||||
unset($input['template']);
|
||||
|
||||
$input['entity_id'] = $this->decodePrimaryKey($input['entity_id']);
|
||||
$input['entity'] = "App\Models\\". ucfirst($input['entity']);
|
||||
|
||||
$this->replace($input);
|
||||
}
|
||||
|
||||
@ -66,16 +74,14 @@ class SendEmailRequest extends Request
|
||||
$input = $this->all();
|
||||
|
||||
/*Make sure we have all the require ingredients to send a template*/
|
||||
if(array_key_exists('entity', $input) && array_key_exists('entity_id', $input) && is_string($input['entity']) && is_string($input['entity_id'])) {
|
||||
if(array_key_exists('entity', $input) && array_key_exists('entity_id', $input) && is_string($input['entity']) && $input['entity_id']) {
|
||||
|
||||
$company = auth()->user()->company();
|
||||
|
||||
$entity = ucfirst($input['entity']);
|
||||
|
||||
$class = "App\Models\\$entity";
|
||||
$entity = $input['entity'];
|
||||
|
||||
/* Harvest the entity*/
|
||||
$entity_obj = $class::whereId($this->decodePrimaryKey($input['entity_id']))->company()->first();
|
||||
$entity_obj = $entity::whereId($input['entity_id'])->company()->first();
|
||||
|
||||
/* Check object, check user and company id is same as users, and check user can edit the object */
|
||||
if($entity_obj && ($company->id == $entity_obj->company_id) && auth()->user()->can('edit', $entity_obj))
|
||||
|
||||
@ -35,6 +35,10 @@ class CreateAccount
|
||||
}
|
||||
$sp794f3f = Account::create($this->request);
|
||||
$sp794f3f->referral_code = Str::random(32);
|
||||
|
||||
if(!$sp794f3f->key)
|
||||
$sp794f3f->key = Str::random(32);
|
||||
|
||||
$sp794f3f->save();
|
||||
|
||||
$sp035a66 = CreateCompany::dispatchNow($this->request, $sp794f3f);
|
||||
|
||||
@ -149,6 +149,10 @@ class ClientContact extends Authenticatable implements HasLocalePreference
|
||||
//return $lang->locale;
|
||||
}
|
||||
|
||||
public function routeNotificationForMail($notification)
|
||||
{
|
||||
return $this->email;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the model for a bound value.
|
||||
|
||||
@ -41,6 +41,7 @@ class Credit extends BaseModel
|
||||
'po_number',
|
||||
'date',
|
||||
'due_date',
|
||||
'partial_due_date',
|
||||
'terms',
|
||||
'public_notes',
|
||||
'private_notes',
|
||||
@ -54,7 +55,6 @@ class Credit extends BaseModel
|
||||
'is_amount_discount',
|
||||
'footer',
|
||||
'partial',
|
||||
'partial_due_date',
|
||||
'custom_value1',
|
||||
'custom_value2',
|
||||
'custom_value3',
|
||||
@ -78,6 +78,30 @@ class Credit extends BaseModel
|
||||
const STATUS_PARTIAL = 3;
|
||||
const STATUS_APPLIED = 4;
|
||||
|
||||
public function getDateAttribute($value) {
|
||||
if (!$value) {
|
||||
//$value format 'Y:m:d H:i:s' to 'Y-m-d H:i'
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
//$value format 'Y:m:d H:i:s' to 'Y-m-d H:i'
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getPartialDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
//$value format 'Y:m:d H:i:s' to 'Y-m-d H:i'
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function assigned_user()
|
||||
{
|
||||
return $this->belongsTo(User::class, 'assigned_user_id', 'id');
|
||||
|
||||
@ -33,6 +33,34 @@ class CreditInvitation extends BaseModel
|
||||
// 'company',
|
||||
];
|
||||
|
||||
public function getSignatureDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getSentDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getViewedDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getOpenedDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function entityType()
|
||||
{
|
||||
return Credit::class;
|
||||
|
||||
@ -128,6 +128,27 @@ class Invoice extends BaseModel
|
||||
const STATUS_UNPAID = -2;
|
||||
const STATUS_REVERSED = -3;
|
||||
|
||||
public function getDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getPartialDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function company()
|
||||
{
|
||||
return $this->belongsTo(Company::class);
|
||||
|
||||
@ -33,6 +33,35 @@ class InvoiceInvitation extends BaseModel
|
||||
// 'company',
|
||||
];
|
||||
|
||||
|
||||
public function getSignatureDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getSentDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getViewedDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getOpenedDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function entityType()
|
||||
{
|
||||
return Invoice::class ;
|
||||
|
||||
@ -70,6 +70,9 @@ class Quote extends BaseModel
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'date' => 'date:Y-m-d',
|
||||
'due_date' => 'date:Y-m-d',
|
||||
'partial_due_date' => 'date:Y-m-d',
|
||||
'line_items' => 'object',
|
||||
'updated_at' => 'timestamp',
|
||||
'created_at' => 'timestamp',
|
||||
@ -81,6 +84,27 @@ class Quote extends BaseModel
|
||||
const STATUS_APPROVED = 3;
|
||||
const STATUS_EXPIRED = -1;
|
||||
|
||||
public function getDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getPartialDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function company()
|
||||
{
|
||||
return $this->belongsTo(Company::class);
|
||||
|
||||
@ -15,6 +15,7 @@ use App\Models\Quote;
|
||||
use App\Utils\Traits\Inviteable;
|
||||
use App\Utils\Traits\MakesDates;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
class QuoteInvitation extends BaseModel
|
||||
{
|
||||
@ -26,6 +27,34 @@ class QuoteInvitation extends BaseModel
|
||||
'client_contact_id',
|
||||
];
|
||||
|
||||
public function getSignatureDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getSentDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getViewedDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getOpenedDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function entityType()
|
||||
{
|
||||
return Quote::class;
|
||||
|
||||
@ -111,6 +111,27 @@ class RecurringInvoice extends BaseModel
|
||||
'status'
|
||||
];
|
||||
|
||||
public function getDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getPartialDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function company()
|
||||
{
|
||||
return $this->belongsTo(Company::class);
|
||||
|
||||
@ -15,6 +15,7 @@ use App\Models\Filterable;
|
||||
use App\Utils\Traits\MakesHash;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
/**
|
||||
* Class for Recurring Invoices.
|
||||
@ -81,6 +82,7 @@ class RecurringQuote extends BaseModel
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'line_items' => 'object',
|
||||
'settings' => 'object',
|
||||
'updated_at' => 'timestamp',
|
||||
'created_at' => 'timestamp',
|
||||
@ -92,6 +94,27 @@ class RecurringQuote extends BaseModel
|
||||
// 'company',
|
||||
];
|
||||
|
||||
public function getDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function getPartialDueDateAttribute($value) {
|
||||
if (!$value) {
|
||||
return (new Carbon($value))->format('Y-m-d');
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
public function company()
|
||||
{
|
||||
return $this->belongsTo(Company::class);
|
||||
|
||||
@ -87,6 +87,14 @@ class InvoiceViewedNotification extends Notification implements ShouldQueue
|
||||
'logo' => $this->company->present()->logo(),
|
||||
];
|
||||
|
||||
// if($this->settings->email_style == 'custom'){
|
||||
|
||||
// $subject =
|
||||
|
||||
// return (new MailMessage)
|
||||
// ->subject($subject)
|
||||
// ->view('email.template.custom', ['body' => ]);
|
||||
// }
|
||||
|
||||
return (new MailMessage)
|
||||
->subject($subject)
|
||||
|
||||
135
app/Notifications/SendGenericNotification.php
Normal file
135
app/Notifications/SendGenericNotification.php
Normal file
@ -0,0 +1,135 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Utils\Number;
|
||||
use App\Utils\Traits\MakesInvoiceHtml;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Notifications\Messages\SlackMessage;
|
||||
use Illuminate\Notifications\Notification;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
class SendGenericNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
use Queueable;
|
||||
use MakesInvoiceHtml;
|
||||
use Dispatchable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
protected $invitation;
|
||||
|
||||
protected $entity;
|
||||
|
||||
protected $contact;
|
||||
|
||||
protected $entity_string;
|
||||
|
||||
protected $settings;
|
||||
|
||||
public $is_system;
|
||||
|
||||
protected $body;
|
||||
|
||||
protected $subject;
|
||||
|
||||
public function __construct($invitation, $entity_string, $subject, $body)
|
||||
{
|
||||
$this->entity = $invitation->{$entity_string};
|
||||
$this->contact = $invitation->contact;
|
||||
$this->settings = $this->entity->client->getMergedSettings();
|
||||
$this->subject = $subject;
|
||||
$this->body = $body;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function via($notifiable)
|
||||
{\Log::error("via");
|
||||
return ['slack','mail'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the mail representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @return \Illuminate\Notifications\Messages\MailMessage
|
||||
*/
|
||||
public function toMail($notifiable)
|
||||
{
|
||||
\Log::error("to mail");
|
||||
$subject = $this->generateEmailEntityHtml($this->entity, $this->subject, $this->contact);
|
||||
$body = $this->generateEmailEntityHtml($this->entity, $this->body, $this->contact);
|
||||
|
||||
$design_style = $this->settings->email_style;
|
||||
|
||||
if($design_style == 'custom') {
|
||||
$email_style_custom = $this->settings->email_style_custom;
|
||||
$body = str_replace("$body", $body, $email_style_custom);
|
||||
}
|
||||
|
||||
$data = [
|
||||
'body' => $body,
|
||||
'design' => $design_style,
|
||||
'footer' => '',
|
||||
'title' => '',
|
||||
'settings' => '',
|
||||
'company' => '',
|
||||
'logo' => $this->entity->company->present()->logo(),
|
||||
'signature' => '',
|
||||
|
||||
];
|
||||
|
||||
return (new MailMessage)
|
||||
->subject($subject)
|
||||
->markdown('email.admin.generic_email', $data);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
//
|
||||
];
|
||||
}
|
||||
|
||||
public function toSlack($notifiable)
|
||||
{
|
||||
\Log::error("slack");
|
||||
return '';
|
||||
// $logo = $this->company->present()->logo();
|
||||
// $amount = Number::formatMoney($this->invoice->amount, $this->invoice->client);
|
||||
|
||||
// return (new SlackMessage)
|
||||
// ->success()
|
||||
// ->from(ctrans('texts.notification_bot'))
|
||||
// ->image($logo)
|
||||
// ->content(ctrans(
|
||||
// 'texts.notification_invoice_viewed',
|
||||
// [
|
||||
// 'amount' => $amount,
|
||||
// 'client' => $this->contact->present()->name(),
|
||||
// 'invoice' => $this->invoice->number
|
||||
// ]
|
||||
// ));
|
||||
}
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Laravel\Horizon\Horizon;
|
||||
use Laravel\Horizon\HorizonApplicationServiceProvider;
|
||||
|
||||
class HorizonServiceProvider extends HorizonApplicationServiceProvider
|
||||
{
|
||||
/**
|
||||
* Bootstrap any application services.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function boot()
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
// Horizon::routeSmsNotificationsTo('15556667777');
|
||||
// Horizon::routeMailNotificationsTo('example@example.com');
|
||||
// Horizon::routeSlackNotificationsTo('slack-webhook-url', '#channel');
|
||||
|
||||
// Horizon::night();
|
||||
}
|
||||
|
||||
/**
|
||||
* Register the Horizon gate.
|
||||
*
|
||||
* This gate determines who can access Horizon in non-local environments.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function gate()
|
||||
{
|
||||
Gate::define('viewHorizon', function ($user) {
|
||||
return in_array($user->email, [
|
||||
//
|
||||
]);
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -62,6 +62,21 @@ trait MakesInvoiceHtml
|
||||
return $html;
|
||||
}
|
||||
|
||||
public function generateEmailEntityHtml($entity, $content, $contact = null) :string
|
||||
{
|
||||
$entity->load('client');
|
||||
|
||||
$client = $entity->client;
|
||||
|
||||
App::setLocale($client->preferredLocale());
|
||||
|
||||
$labels = $entity->makeLabels();
|
||||
$values = $entity->makeValues($contact);
|
||||
|
||||
return $this->parseLabelsAndValues($labels, $values, $content);
|
||||
|
||||
}
|
||||
|
||||
private function parseLabelsAndValues($labels, $values, $section) :string
|
||||
{
|
||||
$section = str_replace(array_keys($labels), array_values($labels), $section);
|
||||
|
||||
@ -271,7 +271,6 @@ trait MakesInvoiceValues
|
||||
$data['$contact.email'] = ['value' => $contact->email, 'label' => ctrans('texts.email')];
|
||||
$data['$contact.phone'] = ['value' => $contact->phone, 'label' => ctrans('texts.phone')];
|
||||
|
||||
$data['$contact_name'] =
|
||||
$data['$contact.name'] = ['value' => isset($contact) ? $contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
|
||||
$data['$contact.custom1'] = ['value' => isset($contact) ? $contact->custom_value1 : ' ', 'label' => $this->makeCustomField('contact1')];
|
||||
$data['$contact.custom2'] = ['value' => isset($contact) ? $contact->custom_value2 : ' ', 'label' => $this->makeCustomField('contact1')];
|
||||
@ -281,7 +280,6 @@ trait MakesInvoiceValues
|
||||
$data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
|
||||
$data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
|
||||
$data['$company.name'] = ['value' => $this->company->present()->name() ?: ' ', 'label' => ctrans('texts.company_name')];
|
||||
$data['$company.company_name'] = &$data['$company.name'];
|
||||
$data['$company.address1'] = ['value' => $settings->address1 ?: ' ', 'label' => ctrans('texts.address1')];
|
||||
$data['$company.address2'] = ['value' => $settings->address2 ?: ' ', 'label' => ctrans('texts.address2')];
|
||||
$data['$company.city'] = ['value' => $settings->city ?: ' ', 'label' => ctrans('texts.city')];
|
||||
@ -311,6 +309,7 @@ trait MakesInvoiceValues
|
||||
$data['$product.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
|
||||
$data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
|
||||
$data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$product.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$product.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$product.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
|
||||
@ -321,6 +320,7 @@ trait MakesInvoiceValues
|
||||
$data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
|
||||
$data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
|
||||
$data['$task.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
|
||||
$data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
$data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
<?php
|
||||
|
||||
use Faker\Generator as Faker;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
$factory->define(App\Models\Account::class, function (Faker $faker) {
|
||||
return [
|
||||
'default_company_id' => 1
|
||||
'default_company_id' => 1,
|
||||
'key' => Str::random(32),
|
||||
];
|
||||
});
|
||||
|
||||
@ -104,6 +104,7 @@ class CreateUsersTable extends Migration
|
||||
$table->date('plan_paid')->nullable();
|
||||
$table->date('plan_expires')->nullable();
|
||||
$table->string('user_agent')->nullable();
|
||||
$table->string('key')->nullable();
|
||||
|
||||
$table->unsignedInteger('payment_id')->nullable()->index();
|
||||
$table->unsignedInteger('default_company_id');
|
||||
@ -517,9 +518,9 @@ class CreateUsersTable extends Migration
|
||||
|
||||
$t->string('po_number')->nullable();
|
||||
$t->date('date')->nullable();
|
||||
$t->date('last_sent_date')->nullable();
|
||||
$t->datetime('last_sent_date')->nullable();
|
||||
|
||||
$t->datetime('due_date')->nullable();
|
||||
$t->date('due_date')->nullable();
|
||||
|
||||
$t->boolean('is_deleted')->default(false);
|
||||
$t->mediumText('line_items')->nullable();
|
||||
|
||||
@ -3147,7 +3147,7 @@ return [
|
||||
'email_link_not_working' => 'If button above isn\'t working for you, please click on the link',
|
||||
'credit_terms' => 'Credit Terms',
|
||||
'display_log' => 'Display Log',
|
||||
'send_fail_logs_to_our_server' => 'Send error logs to our servers for analysis',
|
||||
'send_fail_logs_to_our_server' => 'Report errors in realtime',
|
||||
'setup' => 'Setup',
|
||||
|
||||
'quick_overview_statistics' => 'Quick overview & statistics',
|
||||
@ -3179,8 +3179,8 @@ return [
|
||||
'remove_payment_method' => 'Remove payment method',
|
||||
'warning_action_cannot_be_reversed' => 'Warning! This action can\'t be reversed!',
|
||||
'confirmation' => 'Confirmation',
|
||||
'list_of_quotes' => 'List of quotes',
|
||||
'list_of_quotes' => 'Quotes',
|
||||
'waiting_for_approval' => 'Waiting for approval',
|
||||
'quote_still_not_approved' => 'This quote is still not approved',
|
||||
'list_of_credits' => 'List of credits',
|
||||
'list_of_credits' => 'Credits',
|
||||
];
|
||||
|
||||
22
resources/views/email/admin/generic_email.blade.php
Normal file
22
resources/views/email/admin/generic_email.blade.php
Normal file
@ -0,0 +1,22 @@
|
||||
@component('email.template.master', ['design' => 'light'])
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header', ['p' => $title, 'logo' => $logo])
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
@slot('greeting')
|
||||
@lang($body)
|
||||
@endslot
|
||||
|
||||
@slot('signature')
|
||||
{{ $signature }}
|
||||
@endslot
|
||||
|
||||
@slot('footer')
|
||||
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
|
||||
For any info, please visit InvoiceNinja.
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
@endcomponent
|
||||
@ -4,7 +4,6 @@
|
||||
{{ ctrans('texts.database_connection') }}
|
||||
</h3>
|
||||
<p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
|
||||
To store data, we need database. Here's how you can create one.
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
@ -34,6 +34,10 @@ class AccountTest extends TestCase
|
||||
$this->faker = \Faker\Factory::create();
|
||||
|
||||
Model::reguard();
|
||||
|
||||
if (config('ninja.testvars.travis') !== false) {
|
||||
$this->markTestSkipped('Skip test for CI Testing');
|
||||
}
|
||||
}
|
||||
|
||||
// public function testAccountCreation()
|
||||
@ -71,6 +75,7 @@ class AccountTest extends TestCase
|
||||
|
||||
public function testApiAccountCreation()
|
||||
{
|
||||
|
||||
$data = [
|
||||
'first_name' => $this->faker->firstName,
|
||||
'last_name' => $this->faker->lastName,
|
||||
@ -88,4 +93,5 @@ class AccountTest extends TestCase
|
||||
|
||||
$response->assertStatus(200);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\DataMapper\DefaultSettings;
|
||||
use App\Models\Account;
|
||||
use App\Models\Client;
|
||||
use App\Models\ClientContact;
|
||||
use App\Models\Company;
|
||||
use App\Models\User;
|
||||
use App\Utils\Traits\MakesHash;
|
||||
use Faker\Factory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Foundation\Testing\WithFaker;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Middleware\ThrottleRequests;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Session;
|
||||
use Tests\MockAccountData;
|
||||
use Tests\TestCase;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @covers App\Http\Controllers\TemplateController
|
||||
*/
|
||||
class TemplateApiTest extends TestCase
|
||||
{
|
||||
use MakesHash;
|
||||
use DatabaseTransactions;
|
||||
use MockAccountData;
|
||||
|
||||
public function setUp() :void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->withoutMiddleware(
|
||||
ThrottleRequests::class
|
||||
);
|
||||
|
||||
$this->makeTestData();
|
||||
|
||||
Session::start();
|
||||
|
||||
$this->faker = \Faker\Factory::create();
|
||||
|
||||
Model::reguard();
|
||||
|
||||
$this->withoutMiddleware(
|
||||
ThrottleRequests::class
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
public function testShowTemplate()
|
||||
{
|
||||
$data = [
|
||||
'body' => $this->faker->firstName,
|
||||
'subject' => $this->faker->firstName,
|
||||
];
|
||||
|
||||
|
||||
$response = $this->withHeaders([
|
||||
'X-API-SECRET' => config('ninja.api_secret'),
|
||||
'X-API-TOKEN' => $this->token
|
||||
])->post('/api/v1/templates', $data);
|
||||
|
||||
|
||||
$response->assertStatus(200);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user