Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:34:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4988 from turbo124/v5-stable

Browse Source 
Fixes for releases.
This commit is contained in:
David Bomba 2021-02-25 12:24:18 +11:00 committed by GitHub
commit c9231c85aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 278 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -50,7 +50,7 @@ jobs:
sudo rm -rf node_modules sudo rm -rf node_modules
- name: Build project # This would actually build your project, using zip for an example artifact - name: Build project # This would actually build your project, using zip for an example artifact
run: | run: |
zip -r ./invoiceninja.zip ./ zip -r ./invoiceninja.zip .* -x "../*"
- name: Get tag name - name: Get tag name
id: get_tag_name id: get_tag_name

2
VERSION.txt
View File

@ -1 +1 @@
5.1.9 5.1.10

3
app/Console/Commands/CreateSingleAccount.php
View File

@ -17,6 +17,7 @@ use App\Events\Invoice\InvoiceWasCreated;
use App\Factory\InvoiceFactory; use App\Factory\InvoiceFactory;
use App\Factory\InvoiceItemFactory; use App\Factory\InvoiceItemFactory;
use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSum;
use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Models\Account; use App\Models\Account;
use App\Models\Client; use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
@ -148,6 +149,8 @@ class CreateSingleAccount extends Command
$this->createClient($company, $user); $this->createClient($company, $user);
} }
CreateCompanyTaskStatuses::dispatchNow($company, $user);
for ($x = 0; $x < $this->count; $x++) { for ($x = 0; $x < $this->count; $x++) {
$client = $company->clients->random(); $client = $company->clients->random();

62
app/Http/Controllers/PostMarkController.php
View File

@ -11,6 +11,13 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Jobs\Util\SystemLogger;
use App\Libraries\MultiDB;
use App\Models\CreditInvitation;
use App\Models\InvoiceInvitation;
use App\Models\QuoteInvitation;
use App\Models\RecurringInvoiceInvitation;
use App\Models\SystemLog;
use Illuminate\Http\Request; use Illuminate\Http\Request;
/** /**
@ -18,6 +25,7 @@ use Illuminate\Http\Request;
*/ */
class PostMarkController extends BaseController class PostMarkController extends BaseController
{ {
private $invitation;
public function __construct() public function __construct()
{ {
@ -64,14 +72,40 @@ class PostMarkController extends BaseController
if($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('postmark.secret')) if($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('postmark.secret'))
{ {
nlog($request->all());
MultiDB::findAndSetDbByCompanyKey($request->input('Tag'));
$this->invitation = $this->discoverInvitation($request->input('MessageID'));
if($this->invitation){
$this->invitation->email_error = $request->input('Details');
$this->invitation->save();
}
else
return response()->json(['message' => 'Message not found']);
switch ($request->input('RecordType'))
{
case 'Delivery':
return $this->processDelivery($request);
case 'Bounce':
return $this->processBounce($request);
case 'SpamComplaint':
return $this->processSpamComplaint($request);
default:
# code...
break;
}
return response()->json(['message' => 'Success'], 200);
} }
return response()->json(['message' => 'Unauthorized'], 403);
} }
// { // {
// "RecordType": "Delivery", // "RecordType": "Delivery",
// "ServerID": 23, // "ServerID": 23,
@ -88,7 +122,7 @@ class PostMarkController extends BaseController
// } // }
private function processDelivery($request) private function processDelivery($request)
{ {
SystemLogger::dispatch($request->all(), SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_DELIVERY, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client);
} }
// { // {
@ -119,7 +153,7 @@ class PostMarkController extends BaseController
private function processBounce($request) private function processBounce($request)
{ {
SystemLogger::dispatch($request->all(), SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_BOUNCED, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client);
} }
// { // {
@ -149,8 +183,22 @@ class PostMarkController extends BaseController
// } // }
private function processSpamComplaint($request) private function processSpamComplaint($request)
{ {
SystemLogger::dispatch($request->all(), SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_SPAM_COMPLAINT, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client);
} }
private function discoverInvitation($message_id)
{
$invitation = false;
if($invitation = InvoiceInvitation::whereRaw('BINARY `message_id`= ?', [$message_id])->first())
return $invitation;
elseif($invitation = QuoteInvitation::whereRaw('BINARY `message_id`= ?', [$message_id])->first())
return $invitation;
elseif($invitation = RecurringInvoiceInvitation::whereRaw('BINARY `message_id`= ?', [$message_id])->first())
return $invitation;
elseif($invitation = CreditInvitation::whereRaw('BINARY `message_id`= ?', [$message_id])->first())
return $invitation;
else
return $invitation;
}
} }

8
app/Http/Controllers/SetupController.php
View File

@ -32,6 +32,7 @@ use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\File;
/** /**
* Class SetupController. * Class SetupController.
@ -44,9 +45,12 @@ class SetupController extends Controller
{ {
$check = SystemHealth::check(false); $check = SystemHealth::check(false);
if ($check['system_health'] == true && $check['simple_db_check'] && Schema::hasTable('accounts') && $account = Account::all()->first()) { if ($check['system_health'] == true && $check['simple_db_check'] && Schema::hasTable('accounts') && $account = Account::all()->first())
return redirect('/'); return redirect('/');
}
// not sure if we really need this.
// if(File::exists(base_path('.env')))
// abort(400, '.env file already exists, delete file to start Setup again.');
return view('setup.index', ['check' => $check]); return view('setup.index', ['check' => $check]);
} }

5
app/Http/Controllers/TaskController.php
View File

@ -274,8 +274,13 @@ class TaskController extends BaseController
return $request->disallowUpdate(); return $request->disallowUpdate();
} }
$old_task = json_decode(json_encode($task));
$task = $this->task_repo->save($request->all(), $task); $task = $this->task_repo->save($request->all(), $task);
if($task->status_order != $old_task->status_order)
$this->task_repo->sortStatuses($old_task, $task);
event(new TaskWasUpdated($task, $task->company, Ninja::eventVars())); event(new TaskWasUpdated($task, $task->company, Ninja::eventVars()));
return $this->itemResponse($task->fresh()); return $this->itemResponse($task->fresh());

2
app/Http/Controllers/TwoFactorController.php
View File

@ -31,7 +31,7 @@ class TwoFactorController extends BaseController
$secret = $google2fa->generateSecretKey(); $secret = $google2fa->generateSecretKey();
$qr_code = $google2fa->getQRCodeGoogleUrl( $qr_code = $google2fa->getQRCodeGoogleUrl(
config('ninja.app_name') config('ninja.app_name'),
$user->email, $user->email,
$secret $secret
); );

40
app/Http/Middleware/PasswordProtection.php
View File

@ -11,6 +11,8 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Libraries\MultiDB;
use App\Libraries\OAuth\Providers\Google;
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
@ -34,16 +36,52 @@ class PasswordProtection
'errors' => new stdClass, 'errors' => new stdClass,
]; ];
if ($request->header('X-API-PASSWORD')) { if($request->header('X-API-OAUTH-PASSWORD')){
//user is attempting to reauth with OAuth - check the token value
//todo expand this to include all OAuth providers
$user = false;
$google = new Google();
$user = $google->getTokenResponse(request()->header('X-API-OAUTH-PASSWORD'));
if (is_array($user)) {
$query = [
'oauth_user_id' => $google->harvestSubField($user),
'oauth_provider_id'=> 'google',
];
/* Cannot allow duplicates! */
if ($existing_user = MultiDB::hasUser($query)) {
return $next($request);
}
}
$error = [
'message' => 'Access denied',
'errors' => new stdClass,
];
return response()->json($error, 412);
}elseif ($request->header('X-API-PASSWORD')) {
//user is attempting to reauth with regular password
//
if (! Hash::check($request->header('X-API-PASSWORD'), auth()->user()->password)) { if (! Hash::check($request->header('X-API-PASSWORD'), auth()->user()->password)) {
return response()->json($error, 403); return response()->json($error, 403);
} }
} elseif (Cache::get(auth()->user()->email.'_logged_in')) { } elseif (Cache::get(auth()->user()->email.'_logged_in')) {
Cache::pull(auth()->user()->email.'_logged_in'); Cache::pull(auth()->user()->email.'_logged_in');
Cache::add(auth()->user()->email.'_logged_in', Str::random(64), now()->addMinutes(30)); Cache::add(auth()->user()->email.'_logged_in', Str::random(64), now()->addMinutes(30));
return $next($request); return $next($request);
} else { } else {
$error = [ $error = [
'message' => 'Access denied', 'message' => 'Access denied',
'errors' => new stdClass, 'errors' => new stdClass,

12
app/Jobs/Account/CreateAccount.php
View File

@ -23,6 +23,7 @@ use App\Jobs\Mail\NinjaMailerObject;
use App\Jobs\User\CreateUser; use App\Jobs\User\CreateUser;
use App\Jobs\Util\VersionCheck; use App\Jobs\Util\VersionCheck;
use App\Mail\Admin\AccountCreatedObject; use App\Mail\Admin\AccountCreatedObject;
use App\Mail\Admin\VerifyUserObject;
use App\Models\Account; use App\Models\Account;
use App\Notifications\Ninja\NewAccountCreated; use App\Notifications\Ninja\NewAccountCreated;
use App\Utils\Ninja; use App\Utils\Ninja;
@ -95,12 +96,21 @@ class CreateAccount
//todo implement SLACK notifications //todo implement SLACK notifications
//$sp035a66->notification(new NewAccountCreated($spaa9f78, $sp035a66))->ninja(); //$sp035a66->notification(new NewAccountCreated($spaa9f78, $sp035a66))->ninja();
// $nmo = new NinjaMailerObject;
// $nmo->mailable = new NinjaMailer((new AccountCreatedObject($spaa9f78, $sp035a66))->build());
// $nmo->company = $sp035a66;
// $nmo->to_user = $spaa9f78;
// $nmo->settings = $sp035a66->settings;
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new NinjaMailer((new AccountCreatedObject($spaa9f78, $sp035a66))->build()); $nmo->mailable = new NinjaMailer((new VerifyUserObject($spaa9f78, $sp035a66))->build());
$nmo->company = $sp035a66; $nmo->company = $sp035a66;
$nmo->to_user = $spaa9f78; $nmo->to_user = $spaa9f78;
$nmo->settings = $sp035a66->settings; $nmo->settings = $sp035a66->settings;
NinjaMailerJob::dispatch($nmo);
NinjaMailerJob::dispatchNow($nmo); NinjaMailerJob::dispatchNow($nmo);
VersionCheck::dispatchNow(); VersionCheck::dispatchNow();

11
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -72,6 +72,17 @@ class NinjaMailerJob implements ShouldQueue
/* Set the email driver */ /* Set the email driver */
$this->setMailDriver(); $this->setMailDriver();
if (strlen($this->nmo->settings->reply_to_email) > 1) {
$reply_to_name = strlen($this->nmo->settings->reply_to_name) > 1 ? $this->nmo->settings->reply_to_name : $this->nmo->company->present()->name();
$this->nmo->mailable->replyTo($this->nmo->settings->reply_to_email, $reply_to_name);
}
if (strlen($this->nmo->settings->bcc_email) > 1)
$this->nmo->mailable->bcc($this->nmo->settings->bcc_email, $this->nmo->settings->bcc_email);
//send email //send email
try { try {
nlog("trying to send"); nlog("trying to send");

3
app/Mail/TemplateEmail.php
View File

@ -54,9 +54,6 @@ class TemplateEmail extends Mailable
$this->from(config('mail.from.address'), $this->company->present()->name()); $this->from(config('mail.from.address'), $this->company->present()->name());
if (strlen($settings->reply_to_email) > 1)
$this->replyTo($settings->reply_to_email, $settings->reply_to_email);
if (strlen($settings->bcc_email) > 1) if (strlen($settings->bcc_email) > 1)
$this->bcc($settings->bcc_email, $settings->bcc_email); $this->bcc($settings->bcc_email, $settings->bcc_email);

13
app/Models/Project.php
View File

@ -71,11 +71,10 @@ class Project extends BaseModel
{ {
return $this->belongsTo(User::class)->withTrashed(); return $this->belongsTo(User::class)->withTrashed();
} }
// /**
// * @return \Illuminate\Database\Eloquent\Relations\HasMany public function tasks()
// */ {
// public function tasks() return $this->hasMany(Task::class);
// { }
// return $this->hasMany('App\Models\Task');
// }
} }

3
app/Models/SystemLog.php
View File

@ -47,6 +47,9 @@ class SystemLog extends Model
const EVENT_MAIL_SEND = 30; const EVENT_MAIL_SEND = 30;
const EVENT_MAIL_RETRY_QUEUE = 31; //we use this to queue emails that are spooled and not sent due to the email queue quota being exceeded. const EVENT_MAIL_RETRY_QUEUE = 31; //we use this to queue emails that are spooled and not sent due to the email queue quota being exceeded.
const EVENT_MAIL_BOUNCED = 32;
const EVENT_MAIL_SPAM_COMPLAINT = 33;
const EVENT_MAIL_DELIVERY = 34;
const EVENT_WEBHOOK_RESPONSE = 40; const EVENT_WEBHOOK_RESPONSE = 40;
const EVENT_PDF_RESPONSE = 50; const EVENT_PDF_RESPONSE = 50;

32
app/Repositories/TaskRepository.php
View File

@ -33,6 +33,7 @@ class TaskRepository extends BaseRepository
*/ */
public function save(array $data, Task $task) : ?Task public function save(array $data, Task $task) : ?Task
{ {
$task->fill($data); $task->fill($data);
$task->save(); $task->save();
@ -99,5 +100,36 @@ class TaskRepository extends BaseRepository
$task, $task,
TaskFactory::create(auth()->user()->company()->id, auth()->user()->id) TaskFactory::create(auth()->user()->company()->id, auth()->user()->id)
); );
}
/**
* Sorts the task status order IF the old status has changed between requests
*
* @param stdCLass $old_task The old task object
* @param Task $new_task The new Task model
* @return void
*/
public function sortStatuses($old_task, $new_task)
{
if(!$new_task->project()->exists())
return;
$index = $new_task->status_order;
$tasks = $new_task->project->tasks->reject(function ($task)use($new_task){
return $task->id == $new_task->id;
});
$sorted_tasks = $tasks->filter(function($task, $key)use($index){
return $key < $index;
})->push($new_task)->merge($tasks->filter(function($task, $key)use($index){
return $key >= $index;
}))->each(function ($item,$key){
$item->status_order = $key;
$item->save();
});
} }
} }

1
app/Transformers/AccountTransformer.php
View File

@ -77,6 +77,7 @@ class AccountTransformer extends EntityTransformer
'debug_enabled' => (bool) config('ninja.debug_enabled'), 'debug_enabled' => (bool) config('ninja.debug_enabled'),
'is_docker' => (bool) config('ninja.is_docker'), 'is_docker' => (bool) config('ninja.is_docker'),
'is_scheduler_running' => (bool) $account->is_scheduler_running, 'is_scheduler_running' => (bool) $account->is_scheduler_running,
'default_company_id' => (string) $this->encodePrimaryKey($account->default_company_id),
]; ];
} }

50
app/Utils/Traits/MakesInvoiceHtml.php
View File

@ -25,56 +25,6 @@ use Throwable;
*/ */
trait MakesInvoiceHtml trait MakesInvoiceHtml
{ {
/**
* Generate the HTML invoice parsing variables
* and generating the final invoice HTML.
*
* @param $labels
* @param $values
* @param $section
* @return string The invoice string in HTML format
* @deprecated replaced by generateEntityHtml
*
*/
// public function generateEntityHtml(Designer $designer, $entity, $contact = null) :string
// {
// $entity->load('client');
// $client = $entity->client;
// App::setLocale($client->preferredLocale());
// $values_and_labels = $entity->buildLabelsAndValues($contact);
// $designer->build();
// $data = [];
// $data['entity'] = $entity;
// $data['lang'] = $client->preferredLocale();
// $data['includes'] = $designer->getIncludes();
// $data['header'] = $designer->getHeader();
// $data['body'] = $designer->getBody();
// $data['footer'] = $designer->getFooter();
// $html = view('pdf.stub', $data)->render();
// $html = $this->parseLabelsAndValues($values_and_labels['labels'], $values_and_labels['values'], $html);
// return $html;
// }
// public function generateEmailEntityHtml($entity, $content, $contact = null) :string
// {
// $entity->load('client');
// $client = $entity->client;
// App::setLocale($client->preferredLocale());
// $data = $entity->buildLabelsAndValues($contact);
// return $this->parseLabelsAndValues($data['labels'], $data['values'], $content);
// }
private function parseLabelsAndValues($labels, $values, $section) :string private function parseLabelsAndValues($labels, $values, $section) :string
{ {

295
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -116,301 +116,6 @@ trait MakesInvoiceValues
return $data; return $data;
} }
// public function buildLabelsAndValues($contact)
// {
// $data = [];
// $values = $this->makeLabelsAndValues($contact);
// foreach ($values as $key => $value) {
// $data['values'][$key] = $value['value'];
// $data['labels'][$key.'_label'] = $value['label'];
// }
// return $data;
// }
// private function makeLabelsAndValues($contact = null) :array
// {
// if (! $this->client->currency() || ! $this->client) {
// throw new \Exception(debug_backtrace()[1]['function'], 1);
// exit;
// }
// $settings = $this->client->getMergedSettings();
// if (! $contact) {
// $contact = $this->client->primary_contact()->first();
// }
// $calc = $this->calc();
// $invitation = $this->invitations->where('client_contact_id', $contact->id)->first();
// $data = [];
// $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
// $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
// $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
// $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
// $data['$total_tax_labels'] = ['value' => $this->totalTaxLabels(), 'label' => ctrans('texts.taxes')];
// $data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')];
// $data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')];
// $data['$line_tax_values'] = ['value' => $this->lineTaxValues(), 'label' => ctrans('texts.taxes')];
// $data['$date'] = ['value' => $this->date ?: '&nbsp;', 'label' => ctrans('texts.date')];
// //$data['$invoice_date'] = ['value' => $this->date ?: '&nbsp;', 'label' => ctrans('texts.invoice_date')];
// $data['$invoice.date'] = &$data['$date'];
// $data['$invoice.due_date'] = ['value' => $this->due_date ?: '&nbsp;', 'label' => ctrans('texts.due_date')];
// $data['$due_date'] = &$data['$invoice.due_date'];
// $data['$invoice.number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.invoice_number')];
// $data['$invoice.po_number'] = ['value' => $this->po_number ?: '&nbsp;', 'label' => ctrans('texts.po_number')];
// $data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.line_taxes'] = &$data['$line_taxes'];
// $data['$total_taxes'] = ['value' => $this->makeTotalTaxes() ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.total_taxes'] = &$data['$total_taxes'];
// if ($this instanceof Invoice) {
// $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.invoice')];
// $data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.invoice_number')];
// $data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.invoice_terms')];
// $data['$terms'] = &$data['$entity.terms'];
// if($invitation)
// $data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
// // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
// }
// if ($this instanceof Quote) {
// $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.quote')];
// $data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.quote_number')];
// $data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.quote_terms')];
// $data['$terms'] = &$data['$entity.terms'];
// if($invitation)
// $data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_quote').'</a>', 'label' => ctrans('texts.view_quote')];
// // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_quote')];
// }
// if ($this instanceof Credit) {
// $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.credit')];
// $data['$number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.credit_number')];
// $data['$entity.terms'] = ['value' => $this->terms ?: '&nbsp;', 'label' => ctrans('texts.credit_terms')];
// $data['$terms'] = &$data['$entity.terms'];
// if($invitation)
// $data['$view_link'] = ['value' => '<a href="'.$invitation->getLink().'">'.ctrans('texts.view_credit').'</a>', 'label' => ctrans('texts.view_credit')];
// // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_credit')];
// }
// $data['$entity_number'] = &$data['$number'];
// $data['$invoice.discount'] = ['value' => Number::formatMoney($calc->getTotalDiscount(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.discount')];
// $data['$discount'] = &$data['$invoice.discount'];
// $data['$subtotal'] = ['value' => Number::formatMoney($calc->getSubTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.subtotal')];
// $data['$invoice.subtotal'] = &$data['$subtotal'];
// $data['$invoice.balance_due'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.balance_due')];
// $data['$quote.balance_due'] = &$data['$invoice.balance_due'];
// $data['$balance_due'] = &$data['$invoice.balance_due'];
// $data['$invoice.partial_due'] = ['value' => Number::formatMoney($this->partial, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.partial_due')];
// $data['$total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.total')];
// $data['$amount'] = &$data['$total'];
// $data['$quote.total'] = &$data['$total'];
// $data['$invoice.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.invoice_total')];
// $data['$invoice.amount'] = &$data['$total'];
// $data['$quote.amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.quote_total')];
// $data['$credit.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.credit_total')];
// $data['$credit.number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.credit_number')];
// $data['$credit.total'] = &$data['$credit.total'];
// $data['$credit.po_number'] = &$data['$invoice.po_number'];
// $data['$credit.date'] = ['value' => $this->date, 'label' => ctrans('texts.credit_date')];
// $data['$balance'] = ['value' => Number::formatMoney($calc->getBalance(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.balance')];
// $data['$credit.balance'] = &$data['$balance'];
// $data['$invoice.balance'] = &$data['$balance'];
// $data['$taxes'] = ['value' => Number::formatMoney($calc->getItemTotalTaxes(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.taxes')];
// $data['$invoice.taxes'] = &$data['$taxes'];
// $data['$invoice.custom1'] = ['value' => $this->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice1')];
// $data['$invoice.custom2'] = ['value' => $this->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice2')];
// $data['$invoice.custom3'] = ['value' => $this->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice3')];
// $data['$invoice.custom4'] = ['value' => $this->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('invoice4')];
// $data['$invoice.public_notes'] = ['value' => $this->public_notes ?: '&nbsp;', 'label' => ctrans('texts.public_notes')];
// $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
// // $data['$your_invoice'] = ;
// // $data['$quote'] = ;
// // $data['$your_quote'] = ;
// //
// $data['$quote.date'] = ['value' => $this->date ?: '&nbsp;', 'label' => ctrans('texts.quote_date')];
// $data['$quote.number'] = ['value' => $this->number ?: '&nbsp;', 'label' => ctrans('texts.quote_number')];
// $data['$quote.po_number'] = &$data['$invoice.po_number'];
// $data['$quote.quote_number'] = &$data['$quote.number'];
// $data['$quote_no'] = &$data['$quote.number'];
// $data['$quote.quote_no'] = &$data['$quote.number'];
// $data['$quote.valid_until'] = ['value' => $this->due_date, 'label' => ctrans('texts.valid_until')];
// $data['$credit_amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: '&nbsp;', 'label' => ctrans('texts.credit_amount')];
// $data['$credit_balance'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.credit_balance')];
// $data['$credit_number'] = &$data['$number'];
// $data['$credit_no'] = &$data['$number'];
// $data['$credit.credit_no'] = &$data['$number'];
// // $data['$invoice_issued_to'] = ;
// // $data['$quote_issued_to'] = ;
// // $data['$rate'] = ;
// // $data['$hours'] = ;
// // $data['$from'] = ;
// // $data['$to'] = ;
// // $data['$invoice_to'] = ;
// // $data['$quote_to'] = ;
// // $data['$details'] = ;
// $data['$invoice_no'] = &$data['$number'];
// $data['$invoice.invoice_no'] = &$data['$number'];
// $data['$client1'] = ['value' => $this->client->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('client1')];
// $data['$client2'] = ['value' => $this->client->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('client2')];
// $data['$client3'] = ['value' => $this->client->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('client3')];
// $data['$client4'] = ['value' => $this->client->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('client4')];
// $data['$address1'] = ['value' => $this->client->address1 ?: '&nbsp;', 'label' => ctrans('texts.address1')];
// $data['$address2'] = ['value' => $this->client->address2 ?: '&nbsp;', 'label' => ctrans('texts.address2')];
// $data['$id_number'] = ['value' => $this->client->id_number ?: '&nbsp;', 'label' => ctrans('texts.id_number')];
// $data['$vat_number'] = ['value' => $this->client->vat_number ?: '&nbsp;', 'label' => ctrans('texts.vat_number')];
// $data['$website'] = ['value' => $this->client->present()->website() ?: '&nbsp;', 'label' => ctrans('texts.website')];
// $data['$phone'] = ['value' => $this->client->present()->phone() ?: '&nbsp;', 'label' => ctrans('texts.phone')];
// $data['$country'] = ['value' => isset($this->client->country->name) ? $this->client->country->name : 'No Country Set', 'label' => ctrans('texts.country')];
// $data['$email'] = ['value' => isset($contact) ? $contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
// $data['$client_name'] = ['value' => $this->present()->clientName() ?: '&nbsp;', 'label' => ctrans('texts.client_name')];
// $data['$client.name'] = &$data['$client_name'];
// $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
// $data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
// $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
// $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];
// $data['$client.address1'] = &$data['$address1'];
// $data['$client.address2'] = &$data['$address2'];
// $data['$client_address'] = ['value' => $this->present()->address() ?: '&nbsp;', 'label' => ctrans('texts.address')];
// $data['$client.address'] = &$data['$client_address'];
// $data['$client.id_number'] = &$data['$id_number'];
// $data['$client.vat_number'] = &$data['$vat_number'];
// $data['$client.website'] = &$data['$website'];
// $data['$client.phone'] = &$data['$phone'];
// $data['$city_state_postal'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, false) ?: '&nbsp;', 'label' => ctrans('texts.city_state_postal')];
// $data['$client.city_state_postal'] = &$data['$city_state_postal'];
// $data['$postal_city_state'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, true) ?: '&nbsp;', 'label' => ctrans('texts.postal_city_state')];
// $data['$client.postal_city_state'] = &$data['$postal_city_state'];
// $data['$client.country'] = &$data['$country'];
// $data['$client.email'] = &$data['$email'];
// $data['$contact.full_name'] = ['value' => $contact->present()->name(), 'label' => ctrans('texts.name')];
// $data['$contact.email'] = ['value' => $contact->email, 'label' => ctrans('texts.email')];
// $data['$contact.phone'] = ['value' => $contact->phone, 'label' => ctrans('texts.phone')];
// $data['$contact.name'] = ['value' => isset($contact) ? $contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
// $data['$contact.first_name'] = ['value' => isset($contact) ? $contact->first_name : '', 'label' => ctrans('texts.first_name')];
// $data['$contact.last_name'] = ['value' => isset($contact) ? $contact->last_name : '', 'label' => ctrans('texts.last_name')];
// $data['$contact.custom1'] = ['value' => isset($contact) ? $contact->custom_value1 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$contact.custom2'] = ['value' => isset($contact) ? $contact->custom_value2 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$contact.custom3'] = ['value' => isset($contact) ? $contact->custom_value3 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$contact.custom4'] = ['value' => isset($contact) ? $contact->custom_value4 : '&nbsp;', 'label' => $this->makeCustomField('contact1')];
// $data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, false) ?: '&nbsp;', 'label' => ctrans('texts.city_state_postal')];
// $data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, true) ?: '&nbsp;', 'label' => ctrans('texts.postal_city_state')];
// $data['$company.name'] = ['value' => $this->company->present()->name() ?: '&nbsp;', 'label' => ctrans('texts.company_name')];
// $data['$company.address1'] = ['value' => $settings->address1 ?: '&nbsp;', 'label' => ctrans('texts.address1')];
// $data['$company.address2'] = ['value' => $settings->address2 ?: '&nbsp;', 'label' => ctrans('texts.address2')];
// $data['$company.city'] = ['value' => $settings->city ?: '&nbsp;', 'label' => ctrans('texts.city')];
// $data['$company.state'] = ['value' => $settings->state ?: '&nbsp;', 'label' => ctrans('texts.state')];
// $data['$company.postal_code'] = ['value' => $settings->postal_code ?: '&nbsp;', 'label' => ctrans('texts.postal_code')];
// $data['$company.country'] = ['value' => Country::find($settings->country_id)->first()->name ?: '&nbsp;', 'label' => ctrans('texts.country')];
// $data['$company.phone'] = ['value' => $settings->phone ?: '&nbsp;', 'label' => ctrans('texts.phone')];
// $data['$company.email'] = ['value' => $settings->email ?: '&nbsp;', 'label' => ctrans('texts.email')];
// $data['$company.vat_number'] = ['value' => $settings->vat_number ?: '&nbsp;', 'label' => ctrans('texts.vat_number')];
// $data['$company.id_number'] = ['value' => $settings->id_number ?: '&nbsp;', 'label' => ctrans('texts.id_number')];
// $data['$company.website'] = ['value' => $settings->website ?: '&nbsp;', 'label' => ctrans('texts.website')];
// $data['$company.address'] = ['value' => $this->company->present()->address($settings) ?: '&nbsp;', 'label' => ctrans('texts.address')];
// $logo = $this->company->present()->logo($settings);
// $data['$company.logo'] = ['value' => "<img src='{$logo}' class='h-32' alt='logo'>" ?: '&nbsp;', 'label' => ctrans('texts.logo')];
// $data['$company_logo'] = &$data['$company.logo'];
// $data['$company1'] = ['value' => $settings->custom_value1 ?: '&nbsp;', 'label' => $this->makeCustomField('company1')];
// $data['$company2'] = ['value' => $settings->custom_value2 ?: '&nbsp;', 'label' => $this->makeCustomField('company2')];
// $data['$company3'] = ['value' => $settings->custom_value3 ?: '&nbsp;', 'label' => $this->makeCustomField('company3')];
// $data['$company4'] = ['value' => $settings->custom_value4 ?: '&nbsp;', 'label' => $this->makeCustomField('company4')];
// $data['$custom_surcharge1'] = ['value' => $this->custom_surcharge1, 'label' => $this->makeCustomField('custom_surcharge1')];
// $data['$custom_surcharge2'] = ['value' => $this->custom_surcharge2, 'label' => $this->makeCustomField('custom_surcharge2')];
// $data['$custom_surcharge3'] = ['value' => $this->custom_surcharge3, 'label' => $this->makeCustomField('custom_surcharge3')];
// $data['$custom_surcharge4'] = ['value' => $this->custom_surcharge4, 'label' => $this->makeCustomField('custom_surcharge4')];
// $data['$product.date'] = ['value' => '', 'label' => ctrans('texts.date')];
// $data['$product.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
// $data['$product.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
// $data['$product.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
// $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')];
// $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
// $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
// $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
// $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')];
// $data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
// //$data['$contact.signature']
// // $data['custom_label1'] = ['value' => '', 'label' => ctrans('texts.')];
// // $data['custom_label2'] = ['value' => '', 'label' => ctrans('texts.')];
// // $data['custom_label3'] = ['value' => '', 'label' => ctrans('texts.')];
// // $data['custom_label4'] = ['value' => '', 'label' => ctrans('texts.')];
// //$data['$blank'] = ;
// //$data['$surcharge'] = ;
// /*
// $data['$tax_invoice'] =
// $data['$tax_quote'] =
// $data['$statement'] = ;
// $data['$statement_date'] = ;
// $data['$your_statement'] = ;
// $data['$statement_issued_to'] = ;
// $data['$statement_to'] = ;
// $data['$credit_note'] = ;
// $data['$credit_date'] = ;
// $data['$credit_issued_to'] = ;
// $data['$credit_to'] = ;
// $data['$your_credit'] = ;
// $data['$phone'] = ;
// $data['$outstanding'] = ;
// $data['$invoice_due_date'] = ;
// $data['$quote_due_date'] = ;
// $data['$service'] = ;
// $data['$product_key'] = ;
// $data['$unit_cost'] = ;
// $data['$custom_value1'] = ;
// $data['$custom_value2'] = ;
// $data['$delivery_note'] = ;
// $data['$date'] = ;
// $data['$method'] = ;
// $data['$payment_date'] = ;
// $data['$reference'] = ;
// $data['$amount'] = ;
// $data['$amount_paid'] =;
// */
// $arrKeysLength = array_map('strlen', array_keys($data));
// array_multisort($arrKeysLength, SORT_DESC, $data);
// return $data;
// }
/** /**
* V2 of building a table header for PDFs. * V2 of building a table header for PDFs.
* @param array $columns The array (or string of column headers) * @param array $columns The array (or string of column headers)

2
config/ninja.php
View File

@ -13,7 +13,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.9', 'app_version' => '5.1.10',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),

2
routes/api.php
View File

@ -177,6 +177,6 @@ Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id
->middleware(['guest', 'api_db']) ->middleware(['guest', 'api_db'])
->name('payment_webhook'); ->name('payment_webhook');
Route::post('postmark_webhook', 'PostMarkController@webhook'); Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook');
Route::fallback('BaseController@notFound'); Route::fallback('BaseController@notFound');

94
tests/Feature/TaskStatusSortOnUpdateTest.php Normal file
View File

@ -0,0 +1,94 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace Tests\Feature;
use App\Models\Project;
use App\Models\Task;
use App\Models\TaskStatus;
use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Tests\MockAccountData;
use Tests\TestCase;
/**
* @test
*/
class TaskStatusSortOnUpdateTest extends TestCase
{
use DatabaseTransactions;
use MockAccountData;
use MakesHash;
public function setUp() :void
{
parent::setUp();
$this->makeTestData();
$this->withoutMiddleware(
ThrottleRequests::class
);
}
public function testTasksSort()
{
$project = Project::factory()->create([
'user_id' => $this->user->id,
'company_id' => $this->company->id,
'name' => 'Test Project',
]);
for($x=0; $x<10; $x++)
{
$task = Task::factory()->create([
'user_id' => $this->user->id,
'company_id' => $this->company->id,
'project_id' => $project->id
]);
$task->status_id = TaskStatus::where('company_id', $this->company->id)->first()->id;
$task->save();
}
$this->assertTrue($task->project()->exists());
$this->assertEquals($task->project->tasks->count(), 10);
$task->status_order = 1;
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->put('/api/v1/tasks/'.$this->encodePrimaryKey($task->id), $task->toArray());
$response->assertStatus(200);
$this->assertEquals($task->fresh()->status_order, 1);
$task->status_order = 10;
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->put('/api/v1/tasks/'.$this->encodePrimaryKey($task->id), $task->toArray());
$response->assertStatus(200);
nlog($task->fresh()->project->tasks->toArray());
$this->assertEquals($task->fresh()->status_order, 9);
}
}

6
tests/MockAccountData.php
View File

@ -20,6 +20,7 @@ use App\Factory\InvoiceInvitationFactory;
use App\Factory\InvoiceItemFactory; use App\Factory\InvoiceItemFactory;
use App\Factory\InvoiceToRecurringInvoiceFactory; use App\Factory\InvoiceToRecurringInvoiceFactory;
use App\Helpers\Invoice\InvoiceSum; use App\Helpers\Invoice\InvoiceSum;
use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Models\Account; use App\Models\Account;
use App\Models\Client; use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
@ -201,6 +202,8 @@ trait MockAccountData
$user_id = $user->id; $user_id = $user->id;
$this->user = $user; $this->user = $user;
CreateCompanyTaskStatuses::dispatchNow($this->company, $this->user);
$this->cu = CompanyUserFactory::create($user->id, $this->company->id, $this->account->id); $this->cu = CompanyUserFactory::create($user->id, $this->company->id, $this->account->id);
$this->cu->is_owner = true; $this->cu->is_owner = true;
$this->cu->is_admin = true; $this->cu->is_admin = true;
@ -286,6 +289,9 @@ trait MockAccountData
'company_id' => $this->company->id, 'company_id' => $this->company->id,
]); ]);
$this->task->status_id = TaskStatus::where('company_id', $this->company->id)->first()->id;
$this->task->save();
$this->expense_category = ExpenseCategory::factory()->create([ $this->expense_category = ExpenseCategory::factory()->create([
'user_id' => $user_id, 'user_id' => $user_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,