Skip to content

Commit

Permalink
Merge pull request #8674 from turbo124/v5-stable
Browse files Browse the repository at this point in the history 
v5.6.23
  • Loading branch information
@turbo124
turbo124 committed Jul 27, 2023
2 parents 538cfcd + 4869586 commit a52e138
Show file tree
Hide file tree
Showing 20 changed files with 349 additions and 267 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.6.22
5.6.23
26 changes: 13 additions & 13 deletions app/Export/CSV/BaseExport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ private function resolveExpenseKey($column, $entity, $transformer)

private function resolveTaskKey($column, $entity, $transformer)
{
nlog("searching for {$column}");
// nlog("searching for {$column}");

$transformed_entity = $transformer->transform($entity);

Expand Down Expand Up @@ -499,7 +499,7 @@ private function resolveVendorKey($column, $entity, $transformer)
if(array_key_exists($column, $transformed_entity))
return $transformed_entity[$column];

nlog("export: Could not resolve vendor key: {$column}");
// nlog("export: Could not resolve vendor key: {$column}");

return '';

Expand Down Expand Up @@ -547,15 +547,15 @@ private function resolveClientKey($column, $entity, $transformer)
if(array_key_exists($column, $transformed_client))
return $transformed_client[$column];

nlog("export: Could not resolve client key: {$column}");
// nlog("export: Could not resolve client key: {$column}");

return '';

}

private function resolvePurchaseOrderKey($column, $entity, $transformer)
{
nlog("searching for {$column}");
// nlog("searching for {$column}");

$transformed_entity = $transformer->transform($entity);

Expand All @@ -567,7 +567,7 @@ private function resolvePurchaseOrderKey($column, $entity, $transformer)

private function resolveQuoteKey($column, $entity, $transformer)
{
nlog("searching for {$column}");
// nlog("searching for {$column}");

$transformed_entity = $transformer->transform($entity);

Expand All @@ -581,7 +581,7 @@ private function resolveQuoteKey($column, $entity, $transformer)

private function resolveInvoiceKey($column, $entity, $transformer)
{
nlog("searching for {$column}");
// nlog("searching for {$column}");
$transformed_invoice = false;

if($transformer instanceof PaymentTransformer) {
Expand Down Expand Up @@ -643,27 +643,27 @@ private function resolvePaymentKey($column, $entity, $transformer)
return $transformed_payment[$column];
}

nlog("export: Could not resolve payment key: {$column}");
// nlog("export: Could not resolve payment key: {$column}");

return '';

}

if($column == 'amount')
return $entity->payments()->exists() ? Number::formatMoney($entity->payments()->sum('paymentables.amount'), $entity->company) : ctrans('texts.unpaid');
return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.amount') : ctrans('texts.unpaid');

if($column == 'refunded') {
return $entity->payments()->exists() ? Number::formatMoney($entity->payments()->sum('paymentables.refunded'), $entity->company) : 0;
return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.refunded') : '';
}

if($column == 'applied') {
$refunded = $entity->payments()->sum('paymentables.refunded');
$amount = $entity->payments()->sum('paymentables.amount');
$refunded = $entity->payments()->withoutTrashed()->sum('paymentables.refunded');
$amount = $entity->payments()->withoutTrashed()->sum('paymentables.amount');

return $entity->payments()->exists() ? Number::formatMoney(($amount - $refunded), $entity->company) : 0;
return $entity->payments()->withoutTrashed()->exists() ? ($amount - $refunded) : '';
}

$payment = $entity->payments()->first();
$payment = $entity->payments()->withoutTrashed()->first();

if(!$payment)
return '';
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/BaseController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,9 @@ protected function listResponse(Builder $query)
if ($this->entity_type == BankIntegration::class && !$user->isSuperUser() && $user->hasIntersectPermissions(['create_bank_transaction','edit_bank_transaction','view_bank_transaction'])) {
$query->exclude(["balance"]);
} //allows us to selective display bank integrations back to the user if they can view / create bank transactions but without the bank balance being present in the response
elseif($this->entity_type == TaxRate::class && $user->hasIntersectPermissions(['create_invoice','edit_invoice','create_quote','edit_quote','create_purchase_order','edit_purchase_order'])){
// need to show tax rates if the user has the ability to create documents.
}
else {
$query->where('user_id', '=', $user->id);
}
Expand Down Expand Up @@ -980,9 +983,6 @@ protected function listResponse(Builder $query)
$resource = new Collection($query, $transformer, $this->entity_type);
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
}
// else {
// $resource = new Collection($query, $transformer, $this->entity_type);
// }

return $this->response($this->manager->createData($resource)->toArray());
}
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/ExpenseController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ExpenseController extends BaseController
protected $entity_transformer = ExpenseTransformer::class;

/**
* @var ExpensRepository
* @var ExpenseRepository
*/
protected $expense_repo;

Expand All @@ -72,7 +72,7 @@ public function __construct(ExpenseRepository $expense_repo)
* summary="Gets a list of expenses",
* description="Lists expenses, search and filters allow fine grained lists to be generated.
Query parameters can be added to performed more fine grained filtering of the expenses, these are handled by the ExpenseFilters class which defines the methods available",
* Query parameters can be added to performed more fine grained filtering of the expenses, these are handled by the ExpenseFilters class which defines the methods available",
* @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
* @OA\Parameter(ref="#/components/parameters/include"),
Expand Down
56 changes: 37 additions & 19 deletions app/Http/Controllers/TwilioController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

namespace App\Http\Controllers;

use App\Models\User;
use Twilio\Rest\Client;
use App\Libraries\MultiDB;
use App\Http\Requests\Twilio\Confirm2faRequest;
use App\Http\Requests\Twilio\ConfirmSmsRequest;
use App\Http\Requests\Twilio\Generate2faRequest;
use App\Http\Requests\Twilio\GenerateSmsRequest;
use App\Libraries\MultiDB;
use App\Models\User;
use Twilio\Rest\Client;

class TwilioController extends BaseController
{
Expand All @@ -29,11 +29,14 @@ public function __construct()
/**
* Display a listing of the resource.
*
* @return void
* @return \Illuminate\Http\JsonResponse;
*/
public function generate(GenerateSmsRequest $request)
{
$account = auth()->user()->company()->account;
/** @var \App\Models\User $user */
$user = auth()->user();

$account = $user->company()->account;

if (MultiDB::hasPhoneNumber($request->phone)) {
return response()->json(['message' => 'This phone number has already been verified with another account'], 400);
Expand Down Expand Up @@ -65,11 +68,14 @@ public function generate(GenerateSmsRequest $request)
/**
* Show the form for creating a new resource.
*
* @return void
* @return \Illuminate\Http\JsonResponse;
*/
public function confirm(ConfirmSmsRequest $request)
{
$account = auth()->user()->company()->account;
/** @var \App\Models\User $user */
$user = auth()->user();

$account = $user->company()->account;

$sid = config('ninja.twilio_account_sid');
$token = config('ninja.twilio_auth_token');
Expand All @@ -90,8 +96,9 @@ public function confirm(ConfirmSmsRequest $request)
$account->account_sms_verified = true;
$account->save();

//on confirmation we set the users phone number.
/** @var \App\Models\User $user */
$user = auth()->user();

$user->phone = $account->account_sms_verification_number;
$user->verified_phone_number = true;
$user->save();
Expand All @@ -102,7 +109,12 @@ public function confirm(ConfirmSmsRequest $request)

return response()->json(['message' => 'SMS not verified'], 400);
}


/**
* generate2faResetCode
*
* @return \Illuminate\Http\JsonResponse;
*/
public function generate2faResetCode(Generate2faRequest $request)
{
$user = User::where('email', $request->email)->first();
Expand Down Expand Up @@ -131,7 +143,13 @@ public function generate2faResetCode(Generate2faRequest $request)

return response()->json(['message' => 'Code sent.'], 200);
}


/**
* confirm2faResetCode
*
* @param Confirm2faRequest $request
* @return \Illuminate\Http\JsonResponse;
*/
public function confirm2faResetCode(Confirm2faRequest $request)
{
$user = User::where('email', $request->email)->first();
Expand Down Expand Up @@ -171,16 +189,16 @@ public function confirm2faResetCode(Confirm2faRequest $request)
return response()->json(['message' => 'SMS not verified.'], 400);
}

public function validatePhoneNumber()
{
$sid = config('ninja.twilio_account_sid');
$token = config('ninja.twilio_auth_token');
// public function validatePhoneNumber()
// {
// $sid = config('ninja.twilio_account_sid');
// $token = config('ninja.twilio_auth_token');

$twilio = new Client($sid, $token);
// $twilio = new Client($sid, $token);

$phone_number = $twilio->lookups->v1->phoneNumbers("0417918829")
->fetch(["countryCode" => "AU"]);
// $phone_number = $twilio->lookups->v1->phoneNumbers("0417918829")
// ->fetch(["countryCode" => "AU"]);

print($phone_number);
}
// print($phone_number);
// }
}
4 changes: 4 additions & 0 deletions app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ public function prepareForValidation()
$input['due_date_days'] = 'terms';
}

if(!isset($input['next_send_date']) || $input['next_send_date'] == '') {
$input['next_send_date'] = now()->format('Y-m-d');
}

if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
$input['next_send_date_client'] = $input['next_send_date'];
}
Expand Down
4 changes: 4 additions & 0 deletions app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ public function prepareForValidation()
$input['due_date_days'] = 'terms';
}

if(!isset($input['next_send_date']) || $input['next_send_date'] == '') {
$input['next_send_date'] = now()->format('Y-m-d');
}

if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
$input['next_send_date_client'] = $input['next_send_date'];
}
Expand Down
4 changes: 2 additions & 2 deletions app/Jobs/Util/ReminderJob.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private function sendReminderForInvoice(Invoice $invoice)
}

$reminder_template = $invoice->calculateTemplate('invoice');
// nlog("reminder template = {$reminder_template}");
nlog("reminder template = {$reminder_template}");
$invoice->service()->touchReminder($reminder_template)->save();
$fees = $this->calcLateFee($invoice, $reminder_template);

Expand All @@ -139,7 +139,7 @@ private function sendReminderForInvoice(Invoice $invoice)
if ($reminder_template == 'endless_reminder') {
$enabled_reminder = 'enable_reminder_endless';
}

if (in_array($reminder_template, ['reminder1', 'reminder2', 'reminder3', 'reminder_endless', 'endless_reminder']) &&
$invoice->client->getSetting($enabled_reminder) &&
$invoice->client->getSetting('send_reminders') &&
Expand Down
2 changes: 1 addition & 1 deletion app/Mail/SupportMessageSent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function build()
$db = str_replace('db-ninja-', '', $company->db);
$is_large = $company->is_large ? 'L' : 'S';
$platform = array_key_exists('platform', $this->data) ? $this->data['platform'] : 'U';
$migrated = strlen($company->company_key) == 32 ? 'M' : '';
$migrated = ctype_lower(preg_replace('/[0-9]+/', '', $company->company_key)) ? 'M' : '';
$trial = $account->isTrial() ? 'T' : '';
$plan = str_replace('_', ' ', $plan);

Expand Down

0 comments on commit a52e138

Please sign in to comment.