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

Merge pull request #8392 from turbo124/v5-develop

Browse Source 
v5.5.95
This commit is contained in:
David Bomba 2023-03-21 08:15:30 +11:00 committed by GitHub
commit c7764f296e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
233 changed files with 9662 additions and 7418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.5.95 5.5.96

2
app/Console/Commands/BackupUpdate.php
View File

@ -190,14 +190,12 @@ class BackupUpdate extends Command
->where('filename', '!=', '') ->where('filename', '!=', '')
->cursor() ->cursor()
->each(function ($backup) { ->each(function ($backup) {
$backup_bin = Storage::disk('s3')->get($backup->filename); $backup_bin = Storage::disk('s3')->get($backup->filename);
if ($backup_bin) { if ($backup_bin) {
Storage::disk($this->option('disk'))->put($backup->filename, $backup_bin); Storage::disk($this->option('disk'))->put($backup->filename, $backup_bin);
nlog("Backups - Moving {$backup->filename} to {$this->option('disk')}"); nlog("Backups - Moving {$backup->filename} to {$this->option('disk')}");
} }
}); });
} }

56
app/Console/Commands/CheckData.php
View File

@ -12,36 +12,36 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App; use App;
use Exception;
use App\Models\User;
use App\Utils\Ninja;
use App\Models\Quote;
use App\Models\Client;
use App\Models\Credit;
use App\Models\Vendor;
use App\Models\Account;
use App\Models\Company;
use App\Models\Contact;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\CompanyUser;
use Illuminate\Support\Str;
use App\Models\CompanyToken;
use App\Models\ClientContact;
use App\Models\CompanyLedger;
use App\Models\PurchaseOrder;
use App\Models\VendorContact;
use App\Models\QuoteInvitation;
use Illuminate\Console\Command;
use App\Models\CreditInvitation;
use App\Models\InvoiceInvitation;
use App\DataMapper\ClientSettings; use App\DataMapper\ClientSettings;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
use App\Factory\ClientContactFactory; use App\Factory\ClientContactFactory;
use App\Factory\VendorContactFactory; use App\Factory\VendorContactFactory;
use App\Jobs\Company\CreateCompanyToken; use App\Jobs\Company\CreateCompanyToken;
use App\Models\Account;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Company;
use App\Models\CompanyLedger;
use App\Models\CompanyToken;
use App\Models\CompanyUser;
use App\Models\Contact;
use App\Models\Credit;
use App\Models\CreditInvitation;
use App\Models\Invoice;
use App\Models\InvoiceInvitation;
use App\Models\Payment;
use App\Models\PurchaseOrder;
use App\Models\Quote;
use App\Models\QuoteInvitation;
use App\Models\RecurringInvoiceInvitation; use App\Models\RecurringInvoiceInvitation;
use App\Models\User;
use App\Models\Vendor;
use App\Models\VendorContact;
use App\Utils\Ninja;
use Exception;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
/* /*
@ -176,13 +176,11 @@ class CheckData extends Command
if (CompanyToken::where('user_id', $cu->user_id)->where('company_id', $cu->company_id)->where('is_system', 1)->doesntExist()) { if (CompanyToken::where('user_id', $cu->user_id)->where('company_id', $cu->company_id)->where('is_system', 1)->doesntExist()) {
$this->logMessage("Creating missing company token for user # {$cu->user_id} for company id # {$cu->company_id}"); $this->logMessage("Creating missing company token for user # {$cu->user_id} for company id # {$cu->company_id}");
if($cu->company && $cu->user) if ($cu->company && $cu->user) {
(new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle(); (new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle();
} }
}
}); });
} }
/** /**

1
app/Console/Kernel.php
View File

@ -27,7 +27,6 @@ use App\Jobs\Subscription\CleanStaleInvoiceOrder;
use App\Jobs\Util\DiskCleanup; use App\Jobs\Util\DiskCleanup;
use App\Jobs\Util\ReminderJob; use App\Jobs\Util\ReminderJob;
use App\Jobs\Util\SchedulerCheck; use App\Jobs\Util\SchedulerCheck;
use App\Jobs\Util\SendFailedEmails;
use App\Jobs\Util\UpdateExchangeRates; use App\Jobs\Util\UpdateExchangeRates;
use App\Jobs\Util\VersionCheck; use App\Jobs\Util\VersionCheck;
use App\Models\Account; use App\Models\Account;

4
app/DataMapper/ClientSettings.php
View File

@ -84,13 +84,13 @@ class ClientSettings extends BaseSettings
*/ */
public static function buildClientSettings($company_settings, $client_settings) public static function buildClientSettings($company_settings, $client_settings)
{ {
if (! $client_settings) { if (! $client_settings) {
return $company_settings; return $company_settings;
} }
if(is_array($client_settings)) if (is_array($client_settings)) {
$client_settings = (object)$client_settings; $client_settings = (object)$client_settings;
}
foreach ($company_settings as $key => $value) { foreach ($company_settings as $key => $value) {
/* pseudo code /* pseudo code

7
app/DataMapper/Schedule/ScheduleInvoice.php → app/DataMapper/Schedule/ScheduleEntity.php
View File

@ -11,21 +11,21 @@
namespace App\DataMapper\Schedule; namespace App\DataMapper\Schedule;
class ScheduleInvoice class ScheduleEntity
{ {
/** /**
* Defines the template name * Defines the template name
* *
* @var string * @var string
*/ */
public string $template = 'schedule_invoice'; public string $template = 'schedule_entity';
/** /**
* Defines the template name * Defines the template name
* *
* @var string * @var string
*/ */
public string $entity = ''; public string $entity = ''; // invoice, credit, quote, purchase_order
/** /**
* Defines the template name * Defines the template name
@ -33,5 +33,4 @@ class ScheduleInvoice
* @var string * @var string
*/ */
public string $entity_id = ''; public string $entity_id = '';
} }

17
app/DataMapper/Tax/RuleInterface.php Normal file
View File

@ -0,0 +1,17 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\DataMapper\Tax;
interface RuleInterface
{
public function run();
}

66
app/DataMapper/Tax/ZipTax/Response.php Normal file
View File

@ -0,0 +1,66 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\DataMapper\Tax\ZipTax;
class Response
{
public string $version = 'v40';
public int $rCode = 100;
/**
* ["results" => [
* [
* "geoPostalCode" => "92582",
* "geoCity" => "SAN JACINTO",
* "geoCounty" => "RIVERSIDE",
* "geoState" => "CA",
* "taxSales" => 0.0875,
* "taxUse" => 0.0875,
* "txbService" => "N",
* "txbFreight" => "N",
* "stateSalesTax" => 0.06,
* "stateUseTax" => 0.06,
* "citySalesTax" => 0.01,
* "cityUseTax" => 0.01,
* "cityTaxCode" => "874",
* "countySalesTax" => 0.0025,
* "countyUseTax" => 0.0025,
* "countyTaxCode" => "",
* "districtSalesTax" => 0.015,
* "districtUseTax" => 0.015,
* "district1Code" => "26",
* "district1SalesTax" => 0,
* "district1UseTax" => 0,
* "district2Code" => "26",
* "district2SalesTax" => 0.005,
* "district2UseTax" => 0.005,
* "district3Code" => "",
* "district3SalesTax" => 0,
* "district3UseTax" => 0,
* "district4Code" => "33",
* "district4SalesTax" => 0.01,
* "district4UseTax" => 0.01,
* "district5Code" => "",
* "district5SalesTax" => 0,
* "district5UseTax" => 0,
* "originDestination" => "D",
* ],
* ]
* ];
*
* @var mixed[]
*/
public array $results = [];
}

96
app/DataMapper/Tax/de/Rule.php Normal file
View File

@ -0,0 +1,96 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\DataMapper\Tax\de;
use App\DataMapper\Tax\RuleInterface;
class Rule implements RuleInterface
{
public float $vat_rate = 19;
public float $vat_threshold = 10000;
public float $vat_reduced_rate = 7;
public float $vat_reduced_threshold = 10000;
public float $at_vat_rate = 20; // Austria
public float $be_vat_rate = 21; // Belgium
public float $bg_vat_rate = 20; // Bulgaria
public float $hr_vat_rate = 25; // Croatia
public float $cy_vat_rate = 19; // Cyprus
public float $cz_vat_rate = 21; // Czech Republic
public float $dk_vat_rate = 25; // Denmark
public float $ee_vat_rate = 20; // Estonia
public float $fi_vat_rate = 24; // Finland
public float $fr_vat_rate = 20; // France
public float $de_vat_rate = 19; // Germany
public float $gr_vat_rate = 24; // Greece
public float $hu_vat_rate = 27; // Hungary
public float $ie_vat_rate = 23; // Ireland
public float $it_vat_rate = 22; // Italy
public float $lv_vat_rate = 21; // Latvia
public float $lt_vat_rate = 21; // Lithuania
public float $lu_vat_rate = 17; // Luxembourg
public float $mt_vat_rate = 18; // Malta
public float $nl_vat_rate = 21; // Netherlands
public float $pl_vat_rate = 23; // Poland
public float $pt_vat_rate = 23; // Portugal
public float $ro_vat_rate = 19; // Romania
public float $sk_vat_rate = 20; // Slovakia
public float $si_vat_rate = 22; // Slovenia
public float $es_vat_rate = 21; // Spain
public float $se_vat_rate = 25; // Sweden
public float $gb_vat_rate = 20; // United Kingdom
public bool $consumer_tax_exempt = false;
public bool $business_tax_exempt = true;
public bool $eu_business_tax_exempt = true;
public bool $foreign_business_tax_exempt = true;
public bool $foreign_consumer_tax_exempt = true;
public function run()
{
return $this;
}
}

70
app/DataMapper/Tax/us/Rule.php Normal file
View File

@ -0,0 +1,70 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\DataMapper\Tax\us;
class Rule
{
public float $al_sales_tax_rate = 4; // Alabama
public float $ak_sales_tax_rate = 0; // Alaska
public float $az_sales_tax_rate = 5.6; // Arizona
public float $ar_sales_tax_rate = 6.5; // Arkansas
public float $ca_sales_tax_rate = 7.25; // California - https://services.maps.cdtfa.ca.gov/api/taxrate/GetRateByAddress?address=2444+s+alameda+st&city=los+angeles&zip=90058
public float $co_sales_tax_rate = 2.9; // Colorado
public float $ct_sales_tax_rate = 6.35; // Connecticut
public float $de_sales_tax_rate = 0; // Delaware
public float $fl_sales_tax_rate = 6; // Florida
public float $ga_sales_tax_rate = 4; // Georgia
public float $hi_sales_tax_rate = 4; // Hawaii
public float $id_sales_tax_rate = 6; // Idaho
public float $il_sales_tax_rate = 6.25; // Illinois
public float $in_sales_tax_rate = 7; // Indiana
public float $ia_sales_tax_rate = 6; // Iowa
public float $ks_sales_tax_rate = 6.5; // Kansas
public float $ky_sales_tax_rate = 6; // Kentucky
public float $la_sales_tax_rate = 4.45; // Louisiana
public float $me_sales_tax_rate = 5.5; // Maine
public float $md_sales_tax_rate = 6; // Maryland
public float $ma_sales_tax_rate = 6.25; // Massachusetts
public float $mi_sales_tax_rate = 6; // Michigan
public float $mn_sales_tax_rate = 6.875; // Minnesota
public float $ms_sales_tax_rate = 7; // Mississippi
public float $mo_sales_tax_rate = 4.225; // Missouri
public float $mt_sales_tax_rate = 0; // Montana
public float $ne_sales_tax_rate = 5.5; // Nebraska
public float $nv_sales_tax_rate = 6.85; // Nevada
public float $nh_sales_tax_rate = 0; // New Hampshire
public float $nj_sales_tax_rate = 6.625; // New Jersey
public float $nm_sales_tax_rate = 5.125; // New Mexico
public float $ny_sales_tax_rate = 4; // New York
public float $nc_sales_tax_rate = 4.75; // North Carolina
public float $nd_sales_tax_rate = 5; // North Dakota
public float $oh_sales_tax_rate = 5.75; // Ohio
public float $ok_sales_tax_rate = 4.5; // Oklahoma
public float $or_sales_tax_rate = 0; // Oregon
public float $pa_sales_tax_rate = 6; // Pennsylvania
public float $ri_sales_tax_rate = 7; // Rhode Island
public float $sc_sales_tax_rate = 6; // South Carolina
public float $sd_sales_tax_rate = 4.5; // South Dakota
public float $tn_sales_tax_rate = 7; // Tennessee
public float $tx_sales_tax_rate = 6.25; // Texas
public float $ut_sales_tax_rate = 4.7; // Utah
public float $vt_sales_tax_rate = 6; // Vermont
public float $va_sales_tax_rate = 5.3; // Virginia
public float $wa_sales_tax_rate = 6.5; // Washington
public float $wv_sales_tax_rate = 6; // West Virginia
public float $wi_sales_tax_rate = 5; // Wisconsin
public float $wy_sales_tax_rate = 4; // Wyoming
public float $dc_sales_tax_rate = 6; // District of Columbia
public float $pr_sales_tax_rate = 11.5; // Puerto Rico
}

1
app/Events/Client/ClientWasArchived.php
View File

@ -16,7 +16,6 @@ use App\Models\Company;
use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\Channel;
use Illuminate\Broadcasting\InteractsWithSockets; use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Broadcasting\PrivateChannel;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;

4
app/Events/Invoice/InvoiceWasCreated.php
View File

@ -13,11 +13,11 @@ namespace App\Events\Invoice;
use App\Models\Company; use App\Models\Company;
use App\Models\Invoice; use App\Models\Invoice;
use Illuminate\Queue\SerializesModels; use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Broadcasting\PrivateChannel;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets; use Illuminate\Queue\SerializesModels;
/** /**
* Class InvoiceWasCreated. * Class InvoiceWasCreated.

3
app/Export/CSV/BaseExport.php
View File

@ -12,8 +12,8 @@
namespace App\Export\CSV; namespace App\Export\CSV;
use App\Models\Client; use App\Models\Client;
use Illuminate\Support\Carbon;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Support\Carbon;
class BaseExport class BaseExport
{ {
@ -34,7 +34,6 @@ class BaseExport
protected function filterByClients($query) protected function filterByClients($query)
{ {
if (isset($this->input['client_id']) && $this->input['client_id'] != 'all') { if (isset($this->input['client_id']) && $this->input['client_id'] != 'all') {
$client = Client::withTrashed()->find($this->input['client_id']); $client = Client::withTrashed()->find($this->input['client_id']);
$this->client_description = $client->present()->name; $this->client_description = $client->present()->name;
return $query->where('client_id', $this->input['client_id']); return $query->where('client_id', $this->input['client_id']);

32
app/Export/CSV/ProductSalesExport.php
View File

@ -11,15 +11,15 @@
namespace App\Export\CSV; namespace App\Export\CSV;
use App\Utils\Ninja; use App\Libraries\MultiDB;
use League\Csv\Writer;
use App\Models\Company; use App\Models\Company;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Product; use App\Models\Product;
use App\Libraries\MultiDB; use App\Utils\Ninja;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Database\Eloquent\Collection; use League\Csv\Writer;
class ProductSalesExport extends BaseExport class ProductSalesExport extends BaseExport
{ {
@ -118,7 +118,6 @@ class ProductSalesExport extends BaseExport
$grouped = $this->sales->groupBy('product_key')->map(function ($key, $value) { $grouped = $this->sales->groupBy('product_key')->map(function ($key, $value) {
$data = [ $data = [
'product' => $value, 'product' => $value,
'quantity' => $key->sum('quantity'), 'quantity' => $key->sum('quantity'),
@ -183,7 +182,6 @@ class ProductSalesExport extends BaseExport
$this->sales->push($entity); $this->sales->push($entity);
return $entity; return $entity;
} }
private function decorateAdvancedFields(Invoice $invoice, $entity) :array private function decorateAdvancedFields(Invoice $invoice, $entity) :array
@ -207,23 +205,23 @@ class ProductSalesExport extends BaseExport
if (strlen($entity['tax_name1']) > 1) { if (strlen($entity['tax_name1']) > 1) {
$entity['tax_name1'] = $entity['tax_name1'] . ' [' . $entity['tax_rate1'] . '%]'; $entity['tax_name1'] = $entity['tax_name1'] . ' [' . $entity['tax_rate1'] . '%]';
$entity['tax_amount1'] = $this->calculateTax($invoice, $entity['line_total'], $entity['tax_rate1']); $entity['tax_amount1'] = $this->calculateTax($invoice, $entity['line_total'], $entity['tax_rate1']);
} } else {
else
$entity['tax_amount1'] = 0; $entity['tax_amount1'] = 0;
}
if (strlen($entity['tax_name2']) > 1) { if (strlen($entity['tax_name2']) > 1) {
$entity['tax_name2'] = $entity['tax_name2'] . ' [' . $entity['tax_rate2'] . '%]'; $entity['tax_name2'] = $entity['tax_name2'] . ' [' . $entity['tax_rate2'] . '%]';
$entity['tax_amount2'] = $this->calculateTax($invoice, $entity['line_total'], $entity['tax_rate2']); $entity['tax_amount2'] = $this->calculateTax($invoice, $entity['line_total'], $entity['tax_rate2']);
} } else {
else
$entity['tax_amount2'] = 0; $entity['tax_amount2'] = 0;
}
if (strlen($entity['tax_name3']) > 1) { if (strlen($entity['tax_name3']) > 1) {
$entity['tax_name3'] = $entity['tax_name3'] . ' [' . $entity['tax_rate3'] . '%]'; $entity['tax_name3'] = $entity['tax_name3'] . ' [' . $entity['tax_rate3'] . '%]';
$entity['tax_amount3'] = $this->calculateTax($invoice, $entity['line_total'], $entity['tax_rate3']); $entity['tax_amount3'] = $this->calculateTax($invoice, $entity['line_total'], $entity['tax_rate3']);
} } else {
else
$entity['tax_amount3'] = 0; $entity['tax_amount3'] = 0;
}
return $entity; return $entity;
} }
@ -242,11 +240,9 @@ class ProductSalesExport extends BaseExport
if ($invoice->uses_inclusive_taxes) { if ($invoice->uses_inclusive_taxes) {
return round($amount - ($amount / (1 + ($tax_rate / 100))), 2); return round($amount - ($amount / (1 + ($tax_rate / 100))), 2);
} } else {
else {
return round(($amount * $tax_rate / 100), 2); return round(($amount * $tax_rate / 100), 2);
} }
} }
@ -260,13 +256,13 @@ class ProductSalesExport extends BaseExport
*/ */
private function calculateDiscount(Invoice $invoice, $entity) :float private function calculateDiscount(Invoice $invoice, $entity) :float
{ {
if($entity['discount'] == 0) if ($entity['discount'] == 0) {
return 0; return 0;
}
if ($invoice->is_amount_discount && $entity['discount'] != 0) { if ($invoice->is_amount_discount && $entity['discount'] != 0) {
return $entity['discount']; return $entity['discount'];
} } elseif (!$invoice->is_amount_discount && $entity['discount'] != 0) {
elseif(!$invoice->is_amount_discount && $entity['discount'] != 0) {
return round($entity['line_total'] * ($entity['discount'] / 100), 2); return round($entity['line_total'] * ($entity['discount'] / 100), 2);
} }

1
app/Filters/InvoiceFilters.php
View File

@ -69,7 +69,6 @@ class InvoiceFilters extends QueryFilters
if (in_array('overdue', $status_parameters)) { if (in_array('overdue', $status_parameters)) {
$query->orWhereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]) $query->orWhereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
->where('due_date', '<', Carbon::now()) ->where('due_date', '<', Carbon::now())
->orWhere('due_date', null)
->orWhere('partial_due_date', '<', Carbon::now()); ->orWhere('partial_due_date', '<', Carbon::now());
} }
}); });

4
app/Filters/PurchaseOrderFilters.php
View File

@ -63,8 +63,8 @@ class PurchaseOrderFilters extends QueryFilters
$po_status[] = PurchaseOrder::STATUS_CANCELLED; $po_status[] = PurchaseOrder::STATUS_CANCELLED;
} }
if (count($status_parameters) >=1) { if (count($po_status) >=1) {
$query->whereIn('status_id', $status_parameters); $query->whereIn('status_id', $po_status);
} }
}); });

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

@ -154,7 +154,7 @@ class AccountController extends BaseController
$truth->setUser(auth()->user()); $truth->setUser(auth()->user());
$truth->setCompany($ct->first()->company); $truth->setCompany($ct->first()->company);
return $this->listResponse($ct->fresh()); return $this->listResponse($ct);
} }
public function update(UpdateAccountRequest $request, Account $account) public function update(UpdateAccountRequest $request, Account $account)

1
app/Http/Controllers/BankTransactionController.php
View File

@ -531,7 +531,6 @@ class BankTransactionController extends BaseController
*/ */
public function match(MatchBankTransactionRequest $request) public function match(MatchBankTransactionRequest $request)
{ {
$bts = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle(); $bts = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle();
return $this->listResponse($bts); return $this->listResponse($bts);

23
app/Http/Controllers/ClientPortal/PaymentController.php
View File

@ -12,24 +12,24 @@
namespace App\Http\Controllers\ClientPortal; namespace App\Http\Controllers\ClientPortal;
use App\Factory\PaymentFactory;
use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
use App\Models\CompanyGateway;
use App\Models\GatewayType;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use Illuminate\View\View;
use App\Models\GatewayType;
use App\Models\PaymentHash; use App\Models\PaymentHash;
use App\Models\PaymentType; use App\Models\PaymentType;
use Illuminate\Http\Request;
use App\Models\CompanyGateway;
use App\Factory\PaymentFactory;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesDates;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Contracts\View\Factory;
use App\PaymentDrivers\Stripe\BankTransfer; use App\PaymentDrivers\Stripe\BankTransfer;
use App\Services\ClientPortal\InstantPayment; use App\Services\ClientPortal\InstantPayment;
use App\Services\Subscription\SubscriptionService; use App\Services\Subscription\SubscriptionService;
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest; use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesHash;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
/** /**
* Class PaymentController. * Class PaymentController.
@ -65,7 +65,6 @@ class PaymentController extends Controller
$gateway = false; $gateway = false;
if ($payment->gateway_type_id == GatewayType::DIRECT_DEBIT && $payment->type_id == PaymentType::DIRECT_DEBIT) { if ($payment->gateway_type_id == GatewayType::DIRECT_DEBIT && $payment->type_id == PaymentType::DIRECT_DEBIT) {
if (method_exists($payment->company_gateway->driver($payment->client), 'getPaymentIntent')) { if (method_exists($payment->company_gateway->driver($payment->client), 'getPaymentIntent')) {
$stripe = $payment->company_gateway->driver($payment->client); $stripe = $payment->company_gateway->driver($payment->client);
$payment_intent = $stripe->getPaymentIntent($payment->transaction_reference); $payment_intent = $stripe->getPaymentIntent($payment->transaction_reference);

1
app/Http/Controllers/ClientPortal/PaymentMethodController.php
View File

@ -15,7 +15,6 @@ namespace App\Http\Controllers\ClientPortal;
use App\Events\Payment\Methods\MethodDeleted; use App\Events\Payment\Methods\MethodDeleted;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\PaymentMethod\CreatePaymentMethodRequest; use App\Http\Requests\ClientPortal\PaymentMethod\CreatePaymentMethodRequest;
use App\Http\Requests\ClientPortal\PaymentMethod\VerifyPaymentMethodRequest;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\ClientGatewayToken; use App\Models\ClientGatewayToken;
use App\Models\GatewayType; use App\Models\GatewayType;

16
app/Http/Controllers/ClientPortal/PrePaymentController.php
View File

@ -12,16 +12,16 @@
namespace App\Http\Controllers\ClientPortal; namespace App\Http\Controllers\ClientPortal;
use App\Utils\Number;
use Illuminate\View\View;
use App\DataMapper\InvoiceItem; use App\DataMapper\InvoiceItem;
use App\Factory\InvoiceFactory; use App\Factory\InvoiceFactory;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesDates;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory;
use App\Repositories\InvoiceRepository;
use App\Http\Requests\ClientPortal\PrePayments\StorePrePaymentRequest; use App\Http\Requests\ClientPortal\PrePayments\StorePrePaymentRequest;
use App\Repositories\InvoiceRepository;
use App\Utils\Number;
use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesHash;
use Illuminate\Contracts\View\Factory;
use Illuminate\View\View;
/** /**
* Class PrePaymentController. * Class PrePaymentController.
@ -38,7 +38,6 @@ class PrePaymentController extends Controller
*/ */
public function index() public function index()
{ {
$data = [ $data = [
'title' => ctrans('texts.amount'). " " .auth()->guard('contact')->user()->client->currency()->code." (".auth()->guard('contact')->user()->client->currency()->symbol . ")", 'title' => ctrans('texts.amount'). " " .auth()->guard('contact')->user()->client->currency()->code." (".auth()->guard('contact')->user()->client->currency()->symbol . ")",
'allows_recurring' => auth()->guard('contact')->user()->client->getSetting('client_initiated_payments_recurring'), 'allows_recurring' => auth()->guard('contact')->user()->client->getSetting('client_initiated_payments_recurring'),
@ -51,7 +50,6 @@ class PrePaymentController extends Controller
public function process(StorePrePaymentRequest $request) public function process(StorePrePaymentRequest $request)
{ {
$invoice = InvoiceFactory::create(auth()->guard('contact')->user()->company_id, auth()->guard('contact')->user()->user_id); $invoice = InvoiceFactory::create(auth()->guard('contact')->user()->company_id, auth()->guard('contact')->user()->user_id);
$invoice->due_date = now()->format('Y-m-d'); $invoice->due_date = now()->format('Y-m-d');
$invoice->is_proforma = true; $invoice->is_proforma = true;
@ -114,7 +112,5 @@ class PrePaymentController extends Controller
]; ];
return $this->render('invoices.payment', $data); return $this->render('invoices.payment', $data);
} }
} }

2
app/Http/Controllers/ClientPortal/QuoteController.php
View File

@ -178,7 +178,7 @@ class QuoteController extends Controller
if ($process) { if ($process) {
foreach ($quotes as $quote) { foreach ($quotes as $quote) {
if (request()->has('user_input') && strlen(request()->input('user_input')) > 2) { if (request()->has('user_input') && strlen(request()->input('user_input')) > 2) {
$quote->public_notes .= $quote->public_notes . "\n" . request()->input('user_input'); $quote->po_number = substr(request()->input('user_input'), 0, 180);
$quote->saveQuietly(); $quote->saveQuietly();
} }

1
app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php
View File

@ -44,7 +44,6 @@ class SubscriptionPurchaseController extends Controller
public function upgrade(Subscription $subscription, Request $request) public function upgrade(Subscription $subscription, Request $request)
{ {
App::setLocale($subscription->company->locale()); App::setLocale($subscription->company->locale());
/* Make sure the contact is logged into the correct company for this subscription */ /* Make sure the contact is logged into the correct company for this subscription */

56
app/Http/Controllers/CompanyController.php
View File

@ -11,37 +11,37 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Utils\Ninja;
use App\Models\Account;
use App\Models\Company;
use App\Models\CompanyUser;
use Illuminate\Http\Response;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\Uploadable;
use App\Jobs\Mail\NinjaMailerJob;
use App\DataMapper\CompanySettings;
use App\Jobs\Company\CreateCompany;
use App\Jobs\Mail\NinjaMailerObject;
use App\Mail\Company\CompanyDeleted;
use App\Utils\Traits\SavesDocuments;
use Turbo124\Beacon\Facades\LightLogs;
use App\Repositories\CompanyRepository;
use Illuminate\Support\Facades\Storage;
use App\Jobs\Company\CreateCompanyToken;
use App\Transformers\CompanyTransformer;
use App\DataMapper\Analytics\AccountDeleted; use App\DataMapper\Analytics\AccountDeleted;
use App\Transformers\CompanyUserTransformer; use App\DataMapper\CompanySettings;
use Illuminate\Foundation\Bus\DispatchesJobs; use App\Http\Requests\Company\CreateCompanyRequest;
use App\Jobs\Company\CreateCompanyPaymentTerms; use App\Http\Requests\Company\DefaultCompanyRequest;
use App\Jobs\Company\CreateCompanyTaskStatuses; use App\Http\Requests\Company\DestroyCompanyRequest;
use App\Http\Requests\Company\EditCompanyRequest; use App\Http\Requests\Company\EditCompanyRequest;
use App\Http\Requests\Company\ShowCompanyRequest; use App\Http\Requests\Company\ShowCompanyRequest;
use App\Http\Requests\Company\StoreCompanyRequest; use App\Http\Requests\Company\StoreCompanyRequest;
use App\Http\Requests\Company\CreateCompanyRequest;
use App\Http\Requests\Company\UpdateCompanyRequest; use App\Http\Requests\Company\UpdateCompanyRequest;
use App\Http\Requests\Company\UploadCompanyRequest; use App\Http\Requests\Company\UploadCompanyRequest;
use App\Http\Requests\Company\DefaultCompanyRequest; use App\Jobs\Company\CreateCompany;
use App\Http\Requests\Company\DestroyCompanyRequest; use App\Jobs\Company\CreateCompanyPaymentTerms;
use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\Mail\NinjaMailerJob;
use App\Jobs\Mail\NinjaMailerObject;
use App\Mail\Company\CompanyDeleted;
use App\Models\Account;
use App\Models\Company;
use App\Models\CompanyUser;
use App\Repositories\CompanyRepository;
use App\Transformers\CompanyTransformer;
use App\Transformers\CompanyUserTransformer;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\SavesDocuments;
use App\Utils\Traits\Uploadable;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Storage;
use Turbo124\Beacon\Facades\LightLogs;
/** /**
* Class CompanyController. * Class CompanyController.
@ -489,8 +489,7 @@ class CompanyController extends BaseController
try { try {
Storage::disk(config('filesystems.default'))->deleteDirectory($company->company_key); Storage::disk(config('filesystems.default'))->deleteDirectory($company->company_key);
} } catch(\Exception $e) {
catch(\Exception $e) {
} }
$account->delete(); $account->delete();
@ -502,9 +501,6 @@ class CompanyController extends BaseController
LightLogs::create(new AccountDeleted()) LightLogs::create(new AccountDeleted())
->increment() ->increment()
->batch(); ->batch();
} else { } else {
$company_id = $company->id; $company_id = $company->id;

28
app/Http/Controllers/EmailController.php
View File

@ -11,26 +11,26 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Utils\Ninja; use App\Events\Credit\CreditWasEmailed;
use App\Models\Quote; use App\Events\Quote\QuoteWasEmailed;
use App\Http\Requests\Email\SendEmailRequest;
use App\Jobs\Entity\EmailEntity;
use App\Jobs\PurchaseOrder\PurchaseOrderEmail;
use App\Models\Credit; use App\Models\Credit;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\PurchaseOrder; use App\Models\PurchaseOrder;
use App\Services\Email\Email; use App\Models\Quote;
use Illuminate\Http\Response;
use App\Utils\Traits\MakesHash;
use App\Jobs\Entity\EmailEntity;
use App\Models\RecurringInvoice; use App\Models\RecurringInvoice;
use App\Services\Email\Email;
use App\Services\Email\EmailObject; use App\Services\Email\EmailObject;
use App\Events\Quote\QuoteWasEmailed;
use App\Transformers\QuoteTransformer;
use App\Events\Credit\CreditWasEmailed;
use App\Transformers\CreditTransformer; use App\Transformers\CreditTransformer;
use App\Transformers\InvoiceTransformer; use App\Transformers\InvoiceTransformer;
use App\Http\Requests\Email\SendEmailRequest;
use App\Jobs\PurchaseOrder\PurchaseOrderEmail;
use App\Transformers\PurchaseOrderTransformer; use App\Transformers\PurchaseOrderTransformer;
use App\Transformers\QuoteTransformer;
use App\Transformers\RecurringInvoiceTransformer; use App\Transformers\RecurringInvoiceTransformer;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
use Illuminate\Http\Response;
use Illuminate\Mail\Mailables\Address; use Illuminate\Mail\Mailables\Address;
class EmailController extends BaseController class EmailController extends BaseController
@ -136,8 +136,9 @@ class EmailController extends BaseController
$mo->email_template_body = $request->input('template'); $mo->email_template_body = $request->input('template');
$mo->email_template_subject = str_replace("template", "subject", $request->input('template')); $mo->email_template_subject = str_replace("template", "subject", $request->input('template'));
if($request->has('cc_email')) if ($request->has('cc_email')) {
$mo->cc[] = new Address($request->cc_email); $mo->cc[] = new Address($request->cc_email);
}
// if ($entity == 'purchaseOrder' || $entity == 'purchase_order' || $template == 'purchase_order' || $entity == 'App\Models\PurchaseOrder') { // if ($entity == 'purchaseOrder' || $entity == 'purchase_order' || $template == 'purchase_order' || $entity == 'App\Models\PurchaseOrder') {
// return $this->sendPurchaseOrder($entity_obj, $data, $template); // return $this->sendPurchaseOrder($entity_obj, $data, $template);
@ -152,7 +153,6 @@ class EmailController extends BaseController
$mo->invitation_id = $invitation->id; $mo->invitation_id = $invitation->id;
Email::dispatch($mo, $invitation->company); Email::dispatch($mo, $invitation->company);
} }
}); });
@ -217,7 +217,6 @@ class EmailController extends BaseController
private function resolveClass(string $entity): string private function resolveClass(string $entity): string
{ {
match ($entity) { match ($entity) {
'invoice' => $class = Invoice::class, 'invoice' => $class = Invoice::class,
'App\Models\Invoice' => $class = Invoice::class, 'App\Models\Invoice' => $class = Invoice::class,
@ -232,6 +231,5 @@ class EmailController extends BaseController
}; };
return $class; return $class;
} }
} }

4
app/Http/Controllers/ImportController.php
View File

@ -163,7 +163,6 @@ class ImportController extends Controller
$bestDelimiter = ' '; $bestDelimiter = ' ';
$count = 0; $count = 0;
foreach ($delimiters as $delimiter) { foreach ($delimiters as $delimiter) {
// if (substr_count($csvfile, $delimiter) > $count) { // if (substr_count($csvfile, $delimiter) > $count) {
// $count = substr_count($csvfile, $delimiter); // $count = substr_count($csvfile, $delimiter);
// $bestDelimiter = $delimiter; // $bestDelimiter = $delimiter;
@ -173,9 +172,6 @@ class ImportController extends Controller
$count = substr_count($csvfile, $delimiter); $count = substr_count($csvfile, $delimiter);
$bestDelimiter = $delimiter; $bestDelimiter = $delimiter;
} }
} }
return $bestDelimiter; return $bestDelimiter;
} }

22
app/Http/Controllers/LicenseController.php
View File

@ -11,13 +11,13 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use stdClass;
use Carbon\Carbon;
use App\Models\Account; use App\Models\Account;
use App\Utils\CurlUtils; use App\Utils\CurlUtils;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Http\Request; use stdClass;
class LicenseController extends BaseController class LicenseController extends BaseController
{ {
@ -89,6 +89,10 @@ class LicenseController extends BaseController
$license_key = request()->input('license_key'); $license_key = request()->input('license_key');
$product_id = 3; $product_id = 3;
if(substr($license_key, 0, 3) == 'v5_') {
return $this->v5ClaimLicense($license_key, $product_id);
}
$url = config('ninja.license_url')."/claim_license?license_key={$license_key}&product_id={$product_id}&get_date=true"; $url = config('ninja.license_url')."/claim_license?license_key={$license_key}&product_id={$product_id}&get_date=true";
$data = trim(CurlUtils::get($url)); $data = trim(CurlUtils::get($url));
@ -149,21 +153,19 @@ class LicenseController extends BaseController
return response()->json($error, 400); return response()->json($error, 400);
} }
public function v5ClaimLicense(Request $request) public function v5ClaimLicense(string $license_key)
{ {
$this->checkLicense(); $this->checkLicense();
/* Catch claim license requests */ /* Catch claim license requests */
if (config('ninja.environment') == 'selfhost' && request()->has('license_key')) { if (config('ninja.environment') == 'selfhost') {
// $response = Http::get( "http://ninja.test:8000/claim_license", [ // $response = Http::get( "http://ninja.test:8000/claim_license", [
$response = Http::get("https://invoicing.co/claim_license", [ $response = Http::get("https://invoicing.co/claim_license", [
'license_key' => $request->input('license_key'), 'license_key' => $license_key,
'product_id' => 3, 'product_id' => 3,
]); ]);
if ($response->successful()) { if ($response->successful()) {
$payload = $response->json(); $payload = $response->json();
$account = auth()->user()->account; $account = auth()->user()->account;
@ -180,7 +182,6 @@ class LicenseController extends BaseController
return response()->json($error, 200); return response()->json($error, 200);
} else { } else {
$error = [ $error = [
'message' => trans('texts.white_label_license_error'), 'message' => trans('texts.white_label_license_error'),
'errors' => new stdClass, 'errors' => new stdClass,
@ -188,7 +189,6 @@ class LicenseController extends BaseController
return response()->json($error, 400); return response()->json($error, 400);
} }
} }
$error = [ $error = [
@ -197,7 +197,6 @@ class LicenseController extends BaseController
]; ];
return response()->json($error, 400); return response()->json($error, 400);
} }
@ -210,6 +209,5 @@ class LicenseController extends BaseController
$account->plan_expires = null; $account->plan_expires = null;
$account->save(); $account->save();
} }
} }
} }

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

@ -23,7 +23,6 @@ use App\Libraries\MultiDB;
use App\Models\Client; use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\Credit; use App\Models\Credit;
use App\Models\GroupSetting;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\InvoiceInvitation; use App\Models\InvoiceInvitation;
use App\Models\Quote; use App\Models\Quote;
@ -37,7 +36,6 @@ use App\Services\PdfMaker\Design;
use App\Services\PdfMaker\Design as PdfDesignModel; use App\Services\PdfMaker\Design as PdfDesignModel;
use App\Services\PdfMaker\Design as PdfMakerDesign; use App\Services\PdfMaker\Design as PdfMakerDesign;
use App\Services\PdfMaker\PdfMaker; use App\Services\PdfMaker\PdfMaker;
use App\Services\Preview\StubBuilder;
use App\Utils\HostedPDF\NinjaPdf; use App\Utils\HostedPDF\NinjaPdf;
use App\Utils\HtmlEngine; use App\Utils\HtmlEngine;
use App\Utils\Ninja; use App\Utils\Ninja;

31
app/Http/Controllers/RecurringInvoiceController.php
View File

@ -11,29 +11,29 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Utils\Ninja;
use App\Models\Account;
use Illuminate\Http\Response;
use App\Utils\Traits\MakesHash;
use App\Models\RecurringInvoice;
use App\Utils\Traits\SavesDocuments;
use Illuminate\Support\Facades\Storage;
use App\Factory\RecurringInvoiceFactory;
use App\Filters\RecurringInvoiceFilters;
use App\Jobs\RecurringInvoice\UpdateRecurring;
use App\Repositories\RecurringInvoiceRepository;
use App\Transformers\RecurringInvoiceTransformer;
use App\Events\RecurringInvoice\RecurringInvoiceWasCreated; use App\Events\RecurringInvoice\RecurringInvoiceWasCreated;
use App\Events\RecurringInvoice\RecurringInvoiceWasUpdated; use App\Events\RecurringInvoice\RecurringInvoiceWasUpdated;
use App\Factory\RecurringInvoiceFactory;
use App\Filters\RecurringInvoiceFilters;
use App\Http\Requests\RecurringInvoice\ActionRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\BulkRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\BulkRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\CreateRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\DestroyRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\EditRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\EditRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\ShowRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\ShowRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\StoreRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\StoreRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\ActionRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\CreateRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\UpdateRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\UpdateRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\UploadRecurringInvoiceRequest; use App\Http\Requests\RecurringInvoice\UploadRecurringInvoiceRequest;
use App\Http\Requests\RecurringInvoice\DestroyRecurringInvoiceRequest; use App\Jobs\RecurringInvoice\UpdateRecurring;
use App\Models\Account;
use App\Models\RecurringInvoice;
use App\Repositories\RecurringInvoiceRepository;
use App\Transformers\RecurringInvoiceTransformer;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\SavesDocuments;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Storage;
/** /**
* Class RecurringInvoiceController. * Class RecurringInvoiceController.
@ -406,7 +406,6 @@ class RecurringInvoiceController extends BaseController
*/ */
public function bulk(BulkRecurringInvoiceRequest $request) public function bulk(BulkRecurringInvoiceRequest $request)
{ {
$percentage_increase = request()->has('percentage_increase') ? request()->input('percentage_increase') : 0; $percentage_increase = request()->has('percentage_increase') ? request()->input('percentage_increase') : 0;
if (in_array($request->action, ['increase_prices', 'update_prices'])) { if (in_array($request->action, ['increase_prices', 'update_prices'])) {

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

@ -13,8 +13,8 @@ namespace App\Http\Controllers;
use App\Factory\SchedulerFactory; use App\Factory\SchedulerFactory;
use App\Filters\SchedulerFilters; use App\Filters\SchedulerFilters;
use App\Http\Requests\TaskScheduler\DestroySchedulerRequest;
use App\Http\Requests\TaskScheduler\CreateSchedulerRequest; use App\Http\Requests\TaskScheduler\CreateSchedulerRequest;
use App\Http\Requests\TaskScheduler\DestroySchedulerRequest;
use App\Http\Requests\TaskScheduler\ShowSchedulerRequest; use App\Http\Requests\TaskScheduler\ShowSchedulerRequest;
use App\Http\Requests\TaskScheduler\StoreSchedulerRequest; use App\Http\Requests\TaskScheduler\StoreSchedulerRequest;
use App\Http\Requests\TaskScheduler\UpdateSchedulerRequest; use App\Http\Requests\TaskScheduler\UpdateSchedulerRequest;

22
app/Http/Controllers/WebhookController.php
View File

@ -12,22 +12,22 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Webhook;
use Illuminate\Support\Str;
use Illuminate\Http\Response;
use App\Factory\WebhookFactory; use App\Factory\WebhookFactory;
use App\Filters\WebhookFilters; use App\Filters\WebhookFilters;
use App\Utils\Traits\MakesHash; use App\Http\Requests\Webhook\CreateWebhookRequest;
use App\Http\Requests\Webhook\DestroyWebhookRequest;
use App\Http\Requests\Webhook\EditWebhookRequest;
use App\Http\Requests\Webhook\RetryWebhookRequest;
use App\Http\Requests\Webhook\ShowWebhookRequest;
use App\Http\Requests\Webhook\StoreWebhookRequest;
use App\Http\Requests\Webhook\UpdateWebhookRequest;
use App\Jobs\Util\WebhookSingle; use App\Jobs\Util\WebhookSingle;
use App\Models\Webhook;
use App\Repositories\BaseRepository; use App\Repositories\BaseRepository;
use App\Transformers\WebhookTransformer; use App\Transformers\WebhookTransformer;
use App\Http\Requests\Webhook\EditWebhookRequest; use App\Utils\Traits\MakesHash;
use App\Http\Requests\Webhook\ShowWebhookRequest; use Illuminate\Http\Response;
use App\Http\Requests\Webhook\RetryWebhookRequest; use Illuminate\Support\Str;
use App\Http\Requests\Webhook\StoreWebhookRequest;
use App\Http\Requests\Webhook\CreateWebhookRequest;
use App\Http\Requests\Webhook\UpdateWebhookRequest;
use App\Http\Requests\Webhook\DestroyWebhookRequest;
class WebhookController extends BaseController class WebhookController extends BaseController
{ {

85
app/Http/Kernel.php
View File

@ -11,54 +11,55 @@
namespace App\Http; namespace App\Http;
use App\Http\Middleware\ApiSecretCheck; use App\Utils\Ninja;
use App\Http\Middleware\Cors;
use App\Http\Middleware\SetDb;
use App\Http\Middleware\Locale;
use App\Http\Middleware\SetWebDb;
use App\Http\Middleware\UrlSetDb;
use App\Http\Middleware\TokenAuth;
use App\Http\Middleware\SetEmailDb;
use App\Http\Middleware\VerifyHash;
use App\Http\Middleware\SetInviteDb;
use App\Http\Middleware\TrimStrings;
use App\Http\Middleware\Authenticate; use App\Http\Middleware\Authenticate;
use App\Http\Middleware\CheckClientExistence; use App\Http\Middleware\ContactSetDb;
use App\Http\Middleware\CheckForMaintenanceMode; use App\Http\Middleware\QueryLogging;
use App\Http\Middleware\ClientPortalEnabled; use App\Http\Middleware\TrustProxies;
use App\Http\Middleware\UserVerified;
use App\Http\Middleware\VendorLocale;
use App\Http\Middleware\PhantomSecret;
use App\Http\Middleware\SetDocumentDb;
use App\Http\Middleware\ApiSecretCheck;
use App\Http\Middleware\ContactAccount; use App\Http\Middleware\ContactAccount;
use App\Http\Middleware\EncryptCookies;
use App\Http\Middleware\SessionDomains;
use App\Http\Middleware\ContactKeyLogin; use App\Http\Middleware\ContactKeyLogin;
use App\Http\Middleware\ContactRegister; use App\Http\Middleware\ContactRegister;
use App\Http\Middleware\ContactSetDb;
use App\Http\Middleware\ContactTokenAuth;
use App\Http\Middleware\Cors;
use App\Http\Middleware\EncryptCookies;
use App\Http\Middleware\Locale;
use App\Http\Middleware\PasswordProtection;
use App\Http\Middleware\PhantomSecret;
use App\Http\Middleware\QueryLogging;
use App\Http\Middleware\RedirectIfAuthenticated;
use App\Http\Middleware\SessionDomains;
use App\Http\Middleware\SetDb;
use App\Http\Middleware\SetDbByCompanyKey;
use App\Http\Middleware\SetDocumentDb;
use App\Http\Middleware\SetDomainNameDb; use App\Http\Middleware\SetDomainNameDb;
use App\Http\Middleware\SetEmailDb;
use App\Http\Middleware\SetInviteDb;
use App\Http\Middleware\SetWebDb;
use App\Http\Middleware\Shop\ShopTokenAuth;
use App\Http\Middleware\TokenAuth;
use App\Http\Middleware\TrimStrings;
use App\Http\Middleware\TrustProxies;
use App\Http\Middleware\UrlSetDb;
use App\Http\Middleware\UserVerified;
use App\Http\Middleware\VendorContactKeyLogin;
use App\Http\Middleware\VendorLocale;
use App\Http\Middleware\VerifyCsrfToken; use App\Http\Middleware\VerifyCsrfToken;
use App\Http\Middleware\VerifyHash; use App\Http\Middleware\ContactTokenAuth;
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
use Illuminate\Auth\Middleware\Authorize; use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Auth\Middleware\EnsureEmailIsVerified; use App\Http\Middleware\SetDbByCompanyKey;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use App\Http\Middleware\PasswordProtection;
use Illuminate\Foundation\Http\Kernel as HttpKernel; use App\Http\Middleware\ClientPortalEnabled;
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull; use App\Http\Middleware\CheckClientExistence;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize; use App\Http\Middleware\VendorContactKeyLogin;
use Illuminate\Http\Middleware\SetCacheHeaders; use Illuminate\Http\Middleware\SetCacheHeaders;
use Illuminate\Routing\Middleware\SubstituteBindings;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Routing\Middleware\ValidateSignature;
use Illuminate\Session\Middleware\StartSession; use Illuminate\Session\Middleware\StartSession;
use App\Http\Middleware\CheckForMaintenanceMode;
use App\Http\Middleware\RedirectIfAuthenticated;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
use Illuminate\Routing\Middleware\ValidateSignature;
use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
use Illuminate\Routing\Middleware\SubstituteBindings;
use Illuminate\View\Middleware\ShareErrorsFromSession; use Illuminate\View\Middleware\ShareErrorsFromSession;
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Illuminate\Routing\Middleware\ThrottleRequestsWithRedis;
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
class Kernel extends HttpKernel class Kernel extends HttpKernel
{ {
@ -75,9 +76,7 @@ class Kernel extends HttpKernel
TrimStrings::class, TrimStrings::class,
ConvertEmptyStringsToNull::class, ConvertEmptyStringsToNull::class,
TrustProxies::class, TrustProxies::class,
// \Illuminate\Http\Middleware\HandleCors::class,
Cors::class, Cors::class,
]; ];
/** /**
@ -140,7 +139,6 @@ class Kernel extends HttpKernel
'cors' => Cors::class, 'cors' => Cors::class,
'guest' => RedirectIfAuthenticated::class, 'guest' => RedirectIfAuthenticated::class,
'signed' => ValidateSignature::class, 'signed' => ValidateSignature::class,
'throttle' => ThrottleRequests::class,
'verified' => EnsureEmailIsVerified::class, 'verified' => EnsureEmailIsVerified::class,
'query_logging' => QueryLogging::class, 'query_logging' => QueryLogging::class,
'token_auth' => TokenAuth::class, 'token_auth' => TokenAuth::class,
@ -152,7 +150,6 @@ class Kernel extends HttpKernel
'email_db' => SetEmailDb::class, 'email_db' => SetEmailDb::class,
'invite_db' => SetInviteDb::class, 'invite_db' => SetInviteDb::class,
'password_protected' => PasswordProtection::class, 'password_protected' => PasswordProtection::class,
'signed' => ValidateSignature::class,
'portal_enabled' => ClientPortalEnabled::class, 'portal_enabled' => ClientPortalEnabled::class,
'url_db' => UrlSetDb::class, 'url_db' => UrlSetDb::class,
'web_db' => SetWebDb::class, 'web_db' => SetWebDb::class,
@ -162,7 +159,6 @@ class Kernel extends HttpKernel
'vendor_locale' => VendorLocale::class, 'vendor_locale' => VendorLocale::class,
'contact_register' => ContactRegister::class, 'contact_register' => ContactRegister::class,
'verify_hash' => VerifyHash::class, 'verify_hash' => VerifyHash::class,
'shop_token_auth' => ShopTokenAuth::class,
'phantom_secret' => PhantomSecret::class, 'phantom_secret' => PhantomSecret::class,
'contact_key_login' => ContactKeyLogin::class, 'contact_key_login' => ContactKeyLogin::class,
'vendor_contact_key_login' => VendorContactKeyLogin::class, 'vendor_contact_key_login' => VendorContactKeyLogin::class,
@ -170,6 +166,7 @@ class Kernel extends HttpKernel
'user_verified' => UserVerified::class, 'user_verified' => UserVerified::class,
'document_db' => SetDocumentDb::class, 'document_db' => SetDocumentDb::class,
'session_domain' => SessionDomains::class, 'session_domain' => SessionDomains::class,
//we dyanamically add the throttle middleware in RouteServiceProvider
]; ];
protected $middlewarePriority = [ protected $middlewarePriority = [
@ -189,7 +186,6 @@ class Kernel extends HttpKernel
ContactTokenAuth::class, ContactTokenAuth::class,
ContactKeyLogin::class, ContactKeyLogin::class,
Authenticate::class, Authenticate::class,
ShopTokenAuth::class,
ContactRegister::class, ContactRegister::class,
PhantomSecret::class, PhantomSecret::class,
CheckClientExistence::class, CheckClientExistence::class,
@ -199,4 +195,5 @@ class Kernel extends HttpKernel
SubstituteBindings::class, SubstituteBindings::class,
ContactAccount::class, ContactAccount::class,
]; ];
} }

26
app/Http/Livewire/BillingPortalPurchase.php
View File

@ -11,24 +11,24 @@
namespace App\Http\Livewire; namespace App\Http\Livewire;
use App\Utils\Ninja; use App\DataMapper\ClientSettings;
use App\Models\Client;
use App\Models\Invoice;
use Livewire\Component;
use App\Libraries\MultiDB;
use Illuminate\Support\Str;
use App\Models\Subscription;
use App\Models\ClientContact;
use App\Factory\ClientFactory; use App\Factory\ClientFactory;
use App\Jobs\Mail\NinjaMailerJob; use App\Jobs\Mail\NinjaMailerJob;
use App\DataMapper\ClientSettings;
use App\Jobs\Mail\NinjaMailerObject; use App\Jobs\Mail\NinjaMailerObject;
use App\Libraries\MultiDB;
use App\Mail\ContactPasswordlessLogin;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Invoice;
use App\Models\Subscription;
use App\Repositories\ClientContactRepository;
use App\Repositories\ClientRepository;
use App\Services\Subscription\SubscriptionService;
use App\Utils\Ninja;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use App\Mail\ContactPasswordlessLogin; use Illuminate\Support\Str;
use App\Repositories\ClientRepository; use Livewire\Component;
use App\Repositories\ClientContactRepository;
use App\Services\Subscription\SubscriptionService;
class BillingPortalPurchase extends Component class BillingPortalPurchase extends Component
{ {

12
app/Http/Livewire/BillingPortalPurchasev2.php
View File

@ -172,8 +172,7 @@ class BillingPortalPurchasev2 extends Component
$this->contact = auth()->guard('contact')->user(); $this->contact = auth()->guard('contact')->user();
$this->authenticated = true; $this->authenticated = true;
$this->payment_started = true; $this->payment_started = true;
} } else {
else {
$this->bundle = collect(); $this->bundle = collect();
} }
@ -276,7 +275,6 @@ class BillingPortalPurchasev2 extends Component
*/ */
public function handleCoupon() public function handleCoupon()
{ {
$this->resetErrorBag('coupon'); $this->resetErrorBag('coupon');
$this->resetValidation('coupon'); $this->resetValidation('coupon');
@ -311,7 +309,7 @@ class BillingPortalPurchasev2 extends Component
'description' => $p->notes, 'description' => $p->notes,
'product_key' => $p->product_key, 'product_key' => $p->product_key,
'unit_cost' => $p->price, 'unit_cost' => $p->price,
'product' => nl2br(substr($p->notes, 0, 50)), 'product' => substr(strip_tags($p->markdownNotes()), 0, 50),
'price' => Number::formatMoney($total, $this->subscription->company).' / '. RecurringInvoice::frequencyForKey($this->subscription->frequency_id), 'price' => Number::formatMoney($total, $this->subscription->company).' / '. RecurringInvoice::frequencyForKey($this->subscription->frequency_id),
'total' => $total, 'total' => $total,
'qty' => $qty, 'qty' => $qty,
@ -329,7 +327,7 @@ class BillingPortalPurchasev2 extends Component
'description' => $p->notes, 'description' => $p->notes,
'product_key' => $p->product_key, 'product_key' => $p->product_key,
'unit_cost' => $p->price, 'unit_cost' => $p->price,
'product' => nl2br(substr($p->notes, 0, 50)), 'product' => substr(strip_tags($p->markdownNotes()), 0, 50),
'price' => Number::formatMoney($total, $this->subscription->company), 'price' => Number::formatMoney($total, $this->subscription->company),
'total' => $total, 'total' => $total,
'qty' => $qty, 'qty' => $qty,
@ -352,7 +350,7 @@ class BillingPortalPurchasev2 extends Component
'description' => $p->notes, 'description' => $p->notes,
'product_key' => $p->product_key, 'product_key' => $p->product_key,
'unit_cost' => $p->price, 'unit_cost' => $p->price,
'product' => nl2br(substr($p->notes, 0, 50)), 'product' => substr(strip_tags($p->markdownNotes()), 0, 50),
'price' => Number::formatMoney($total, $this->subscription->company).' / '. RecurringInvoice::frequencyForKey($this->subscription->frequency_id), 'price' => Number::formatMoney($total, $this->subscription->company).' / '. RecurringInvoice::frequencyForKey($this->subscription->frequency_id),
'total' => $total, 'total' => $total,
'qty' => $qty, 'qty' => $qty,
@ -375,7 +373,7 @@ class BillingPortalPurchasev2 extends Component
'description' => $p->notes, 'description' => $p->notes,
'product_key' => $p->product_key, 'product_key' => $p->product_key,
'unit_cost' => $p->price, 'unit_cost' => $p->price,
'product' => nl2br(substr($p->notes, 0, 50)), 'product' => substr(strip_tags($p->markdownNotes()), 0, 50),
'price' => Number::formatMoney($total, $this->subscription->company), 'price' => Number::formatMoney($total, $this->subscription->company),
'total' => $total, 'total' => $total,
'qty' => $qty, 'qty' => $qty,

3
app/Http/Livewire/RequiredClientInfo.php
View File

@ -232,9 +232,10 @@ class RequiredClientInfo extends Component
if ($cg && $cg->update_details) { if ($cg && $cg->update_details) {
$payment_gateway = $cg->driver($this->client)->init(); $payment_gateway = $cg->driver($this->client)->init();
if(method_exists($payment_gateway, "updateCustomer")) if (method_exists($payment_gateway, "updateCustomer")) {
$payment_gateway->updateCustomer(); $payment_gateway->updateCustomer();
} }
}
return true; return true;
} }

124
app/Http/Middleware/ThrottleRequestsWithPredis.php Normal file
View File

@ -0,0 +1,124 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Cache\RateLimiter;
use Illuminate\Redis\Limiters\DurationLimiter;
use Illuminate\Routing\Middleware\ThrottleRequests;
class ThrottleRequestsWithPredis extends ThrottleRequests
{
/**
* The Redis factory implementation.
*
* @var \Illuminate\Contracts\Redis\Factory
*/
protected $redis;
/**
* The timestamp of the end of the current duration by key.
*
* @var array
*/
public $decaysAt = [];
/**
* The number of remaining slots by key.
*
* @var array
*/
public $remaining = [];
/**
* Create a new request throttler.
*
* @param \Illuminate\Cache\RateLimiter $limiter
* @return void
*/
public function __construct(RateLimiter $limiter)
{
parent::__construct($limiter);
$this->redis = \Illuminate\Support\Facades\Redis::connection('sentinel-cache');
}
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param array $limits
* @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Illuminate\Http\Exceptions\ThrottleRequestsException
*/
protected function handleRequest($request, Closure $next, array $limits)
{
foreach ($limits as $limit) {
if ($this->tooManyAttempts($limit->key, $limit->maxAttempts, $limit->decayMinutes)) {
throw $this->buildException($request, $limit->key, $limit->maxAttempts, $limit->responseCallback);
}
}
$response = $next($request);
foreach ($limits as $limit) {
$response = $this->addHeaders(
$response,
$limit->maxAttempts,
$this->calculateRemainingAttempts($limit->key, $limit->maxAttempts)
);
}
return $response;
}
/**
* Determine if the given key has been "accessed" too many times.
*
* @param string $key
* @param int $maxAttempts
* @param int $decayMinutes
* @return mixed
*/
protected function tooManyAttempts($key, $maxAttempts, $decayMinutes)
{
$limiter = new DurationLimiter(
$this->redis,
$key,
$maxAttempts,
$decayMinutes * 60
);
return tap(! $limiter->acquire(), function () use ($key, $limiter) {
[$this->decaysAt[$key], $this->remaining[$key]] = [
$limiter->decaysAt, $limiter->remaining,
];
});
}
/**
* Calculate the number of remaining attempts.
*
* @param string $key
* @param int $maxAttempts
* @param int|null $retryAfter
* @return int
*/
protected function calculateRemainingAttempts($key, $maxAttempts, $retryAfter = null)
{
return is_null($retryAfter) ? $this->remaining[$key] : 0;
}
/**
* Get the number of seconds until the lock is released.
*
* @param string $key
* @return int
*/
protected function getTimeUntilNextRetry($key)
{
return $this->decaysAt[$key] - $this->currentTime();
}
}

5
app/Http/Requests/BankIntegration/UploadBankIntegrationRequest.php
View File

@ -29,10 +29,11 @@ class UploadBankIntegrationRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/BankTransaction/UploadBankTransactionRequest.php
View File

@ -29,10 +29,11 @@ class UploadBankTransactionRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -38,10 +38,11 @@ class StoreClientRequest extends Request
public function rules() public function rules()
{ {
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -38,10 +38,11 @@ class UpdateClientRequest extends Request
{ {
/* Ensure we have a client name, and that all emails are unique*/ /* Ensure we have a client name, and that all emails are unique*/
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Client/UploadClientRequest.php
View File

@ -29,10 +29,11 @@ class UploadClientRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

2
app/Http/Requests/ClientPortal/PrePayments/StorePrePaymentRequest.php
View File

@ -15,7 +15,6 @@ class StorePrePaymentRequest extends FormRequest
public function authorize() public function authorize()
{ {
return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES; return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
} }
/** /**
@ -30,5 +29,4 @@ class StorePrePaymentRequest extends FormRequest
'amount' => 'required|bail|', 'amount' => 'required|bail|',
]; ];
} }
} }

5
app/Http/Requests/Company/UploadCompanyRequest.php
View File

@ -29,10 +29,11 @@ class UploadCompanyRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Credit/StoreCreditRequest.php
View File

@ -43,10 +43,11 @@ class StoreCreditRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Credit/UpdateCreditRequest.php
View File

@ -42,10 +42,11 @@ class UpdateCreditRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Credit/UploadCreditRequest.php
View File

@ -29,10 +29,11 @@ class UploadCreditRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Expense/UploadExpenseRequest.php
View File

@ -29,10 +29,11 @@ class UploadExpenseRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
View File

@ -29,10 +29,11 @@ class UploadGroupSettingRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -37,10 +37,11 @@ class StoreInvoiceRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Invoice/UpdateInvoiceRequest.php
View File

@ -39,10 +39,11 @@ class UpdateInvoiceRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

6
app/Http/Requests/Invoice/UploadInvoiceRequest.php
View File

@ -29,10 +29,11 @@ class UploadInvoiceRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;
@ -45,6 +46,5 @@ class UploadInvoiceRequest extends Request
public function prepareForValidation() public function prepareForValidation()
{ {
} }
} }

5
app/Http/Requests/Payment/StorePaymentRequest.php
View File

@ -112,10 +112,11 @@ class StorePaymentRequest extends Request
]; ];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Payment/UpdatePaymentRequest.php
View File

@ -44,10 +44,11 @@ class UpdatePaymentRequest extends Request
$rules['number'] = Rule::unique('payments')->where('company_id', auth()->user()->company()->id)->ignore($this->payment->id); $rules['number'] = Rule::unique('payments')->where('company_id', auth()->user()->company()->id)->ignore($this->payment->id);
} }
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Payment/UploadPaymentRequest.php
View File

@ -29,10 +29,11 @@ class UploadPaymentRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

4
app/Http/Requests/Preview/PreviewInvoiceRequest.php
View File

@ -12,10 +12,6 @@
namespace App\Http\Requests\Preview; namespace App\Http\Requests\Preview;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\Credit;
use App\Models\Invoice;
use App\Models\Quote;
use App\Models\RecurringInvoice;
use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\CleanLineItems;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;

1
app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php
View File

@ -12,7 +12,6 @@
namespace App\Http\Requests\Preview; namespace App\Http\Requests\Preview;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\PurchaseOrder;
use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\CleanLineItems;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;

5
app/Http/Requests/Product/StoreProductRequest.php
View File

@ -28,10 +28,11 @@ class StoreProductRequest extends Request
public function rules() public function rules()
{ {
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

6
app/Http/Requests/Product/UpdateProductRequest.php
View File

@ -12,7 +12,6 @@
namespace App\Http\Requests\Product; namespace App\Http\Requests\Product;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\Product;
use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\ChecksEntityStatus;
class UpdateProductRequest extends Request class UpdateProductRequest extends Request
@ -31,10 +30,11 @@ class UpdateProductRequest extends Request
public function rules() public function rules()
{ {
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Product/UploadProductRequest.php
View File

@ -28,10 +28,11 @@ class UploadProductRequest extends Request
public function rules() public function rules()
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

3
app/Http/Requests/Project/CreateProjectRequest.php
View File

@ -11,8 +11,8 @@
namespace App\Http\Requests\Project; namespace App\Http\Requests\Project;
use App\Models\Project;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Models\Project;
class CreateProjectRequest extends Request class CreateProjectRequest extends Request
{ {
@ -24,6 +24,5 @@ class CreateProjectRequest extends Request
public function authorize() : bool public function authorize() : bool
{ {
return auth()->user()->can('create', Project::class); return auth()->user()->can('create', Project::class);
} }
} }

1
app/Http/Requests/Project/ShowProjectRequest.php
View File

@ -24,7 +24,6 @@ class ShowProjectRequest extends Request
{ {
// return auth()->user()->isAdmin(); // return auth()->user()->isAdmin();
return auth()->user()->can('view', $this->project); return auth()->user()->can('view', $this->project);
} }
/** /**

5
app/Http/Requests/Project/StoreProjectRequest.php
View File

@ -42,10 +42,11 @@ class StoreProjectRequest extends Request
$rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id); $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id);
} }
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Project/UpdateProjectRequest.php
View File

@ -37,10 +37,11 @@ class UpdateProjectRequest extends Request
$rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id)->ignore($this->project->id); $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id)->ignore($this->project->id);
} }
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Project/UploadProjectRequest.php
View File

@ -29,10 +29,11 @@ class UploadProjectRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
View File

@ -47,10 +47,11 @@ class StorePurchaseOrderRequest extends Request
$rules['is_amount_discount'] = ['boolean']; $rules['is_amount_discount'] = ['boolean'];
$rules['line_items'] = 'array'; $rules['line_items'] = 'array';
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
View File

@ -50,10 +50,11 @@ class UpdatePurchaseOrderRequest extends Request
$rules['discount'] = 'sometimes|numeric'; $rules['discount'] = 'sometimes|numeric';
$rules['is_amount_discount'] = ['boolean']; $rules['is_amount_discount'] = ['boolean'];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/PurchaseOrder/UploadPurchaseOrderRequest.php
View File

@ -29,10 +29,11 @@ class UploadPurchaseOrderRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Quote/StoreQuoteRequest.php
View File

@ -39,10 +39,11 @@ class StoreQuoteRequest extends Request
$rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id; $rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Quote/UpdateQuoteRequest.php
View File

@ -37,10 +37,11 @@ class UpdateQuoteRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Quote/UploadQuoteRequest.php
View File

@ -29,10 +29,11 @@ class UploadQuoteRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
View File

@ -48,10 +48,11 @@ class StoreRecurringExpenseRequest extends Request
$rules['tax_amount2'] = 'numeric'; $rules['tax_amount2'] = 'numeric';
$rules['tax_amount3'] = 'numeric'; $rules['tax_amount3'] = 'numeric';
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
View File

@ -48,10 +48,11 @@ class UpdateRecurringExpenseRequest extends Request
$rules['tax_amount3'] = 'numeric'; $rules['tax_amount3'] = 'numeric';
$rules['category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; $rules['category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringExpense/UploadRecurringExpenseRequest.php
View File

@ -29,10 +29,11 @@ class UploadRecurringExpenseRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -38,10 +38,11 @@ class StoreRecurringInvoiceRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -38,10 +38,11 @@ class UpdateRecurringInvoiceRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringInvoice/UploadRecurringInvoiceRequest.php
View File

@ -29,10 +29,11 @@ class UploadRecurringInvoiceRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
View File

@ -37,10 +37,11 @@ class StoreRecurringQuoteRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
View File

@ -37,10 +37,11 @@ class UpdateRecurringQuoteRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/RecurringQuote/UploadRecurringQuoteRequest.php
View File

@ -29,10 +29,11 @@ class UploadRecurringQuoteRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

1
app/Http/Requests/Report/GenericReportRequest.php
View File

@ -58,6 +58,5 @@ class GenericReportRequest extends Request
} }
$this->replace($input); $this->replace($input);
} }
} }

5
app/Http/Requests/Task/StoreTaskRequest.php
View File

@ -59,10 +59,11 @@ class StoreTaskRequest extends Request
} }
}]; }];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Task/UpdateTaskRequest.php
View File

@ -66,10 +66,11 @@ class UpdateTaskRequest extends Request
} }
}]; }];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

2
app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php
View File

@ -43,6 +43,8 @@ class StoreSchedulerRequest extends Request
'parameters.date_range' => 'bail|sometimes|string|in:last7_days,last30_days,last365_days,this_month,last_month,this_quarter,last_quarter,this_year,last_year,custom', 'parameters.date_range' => 'bail|sometimes|string|in:last7_days,last30_days,last365_days,this_month,last_month,this_quarter,last_quarter,this_year,last_year,custom',
'parameters.start_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom'], 'parameters.start_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom'],
'parameters.end_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom', 'after_or_equal:parameters.start_date'], 'parameters.end_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom', 'after_or_equal:parameters.start_date'],
'parameters.entity' => ['bail', 'sometimes', 'string', 'in:invoice,credit,quote,purchase_order'],
'parameters.entity_id' => ['bail', 'sometimes', 'string'],
]; ];
return $rules; return $rules;

2
app/Http/Requests/User/DetachCompanyUserRequest.php
View File

@ -12,11 +12,9 @@
namespace App\Http\Requests\User; namespace App\Http\Requests\User;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Utils\Traits\MakesHash;
class DetachCompanyUserRequest extends Request class DetachCompanyUserRequest extends Request
{ {
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
* *

6
app/Http/Requests/Vendor/StoreVendorRequest.php vendored
View File

@ -41,10 +41,11 @@ class StoreVendorRequest extends Request
$rules['currency_id'] = 'bail|required|exists:currencies,id'; $rules['currency_id'] = 'bail|required|exists:currencies,id';
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;
@ -57,7 +58,6 @@ class StoreVendorRequest extends Request
public function prepareForValidation() public function prepareForValidation()
{ {
$input = $this->all(); $input = $this->all();
if (!array_key_exists('currency_id', $input) || empty($input['currency_id'])) { if (!array_key_exists('currency_id', $input) || empty($input['currency_id'])) {

5
app/Http/Requests/Vendor/UpdateVendorRequest.php vendored
View File

@ -44,10 +44,11 @@ class UpdateVendorRequest extends Request
$rules['contacts.*.email'] = 'nullable|distinct'; $rules['contacts.*.email'] = 'nullable|distinct';
$rules['currency_id'] = 'bail|sometimes|exists:currencies,id'; $rules['currency_id'] = 'bail|sometimes|exists:currencies,id';
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

5
app/Http/Requests/Vendor/UploadVendorRequest.php vendored
View File

@ -29,10 +29,11 @@ class UploadVendorRequest extends Request
{ {
$rules = []; $rules = [];
if($this->file('documents') && is_array($this->file('documents'))) if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation; $rules['documents.*'] = $this->file_validation;
elseif($this->file('documents')) } elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation; $rules['documents'] = $this->file_validation;
}
if ($this->file('file') && is_array($this->file('file'))) { if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation; $rules['file.*'] = $this->file_validation;

2
app/Http/ValidationRules/PaymentAppliedValidAmount.php
View File

@ -85,12 +85,10 @@ class PaymentAppliedValidAmount implements Rule
$inv = $inv_collection->firstWhere('id', $invoice['invoice_id']); $inv = $inv_collection->firstWhere('id', $invoice['invoice_id']);
if ($inv->balance < $invoice['amount']) { if ($inv->balance < $invoice['amount']) {
$this->message = 'Amount cannot be greater than invoice balance'; $this->message = 'Amount cannot be greater than invoice balance';
return false; return false;
} }
} }
} }

5
app/Import/Providers/BaseImport.php
View File

@ -134,8 +134,6 @@ class BaseImport
$count = substr_count($csvfile, $delimiter); $count = substr_count($csvfile, $delimiter);
$bestDelimiter = $delimiter; $bestDelimiter = $delimiter;
} }
} }
return $bestDelimiter; return $bestDelimiter;
} }
@ -641,8 +639,6 @@ class BaseImport
public function preTransform(array $data, $entity_type) public function preTransform(array $data, $entity_type)
{ {
$keys = array_shift($data); $keys = array_shift($data);
ksort($keys); ksort($keys);
@ -666,7 +662,6 @@ class BaseImport
ksort($keys); ksort($keys);
$data = array_map(function ($row) use ($keys) { $data = array_map(function ($row) use ($keys) {
$row_count = count($row); $row_count = count($row);
$key_count = count($keys); $key_count = count($keys);

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

@ -126,6 +126,8 @@ class CreateAccount
NinjaMailerJob::dispatch($nmo, true); NinjaMailerJob::dispatch($nmo, true);
// \Modules\Admin\Jobs\Account\NinjaUser::dispatch([], $sp035a66);
(new \Modules\Admin\Jobs\Account\NinjaUser([], $sp035a66))->handle(); (new \Modules\Admin\Jobs\Account\NinjaUser([], $sp035a66))->handle();
} }

57
app/Jobs/Inventory/AdjustProductInventory.php
View File

@ -71,36 +71,20 @@ class AdjustProductInventory implements ShouldQueue
collect($this->invoice->line_items)->filter(function ($item) { collect($this->invoice->line_items)->filter(function ($item) {
return $item->type_id == '1'; return $item->type_id == '1';
})->each(function ($i) { })->each(function ($i) {
$p = Product::where('product_key', $i->product_key)->where('company_id', $this->company->id)->first(); $p = Product::where('product_key', $i->product_key)->where('company_id', $this->company->id)->first();
if ($p) { if ($p) {
$p->in_stock_quantity += $i->quantity; $p->in_stock_quantity += $i->quantity;
$p->saveQuietly(); $p->saveQuietly();
} }
}); });
} }
public function handleRestoredInvoice() public function handleRestoredInvoice()
{ {
MultiDB::setDb($this->company->db); MultiDB::setDb($this->company->db);
// foreach ($this->invoice->line_items as $item) {
// $p = Product::where('product_key', $item->product_key)->where('company_id', $this->company->id)->first();
// if (! $p) {
// continue;
// }
// $p->in_stock_quantity -= $item->quantity;
// $p->saveQuietly();
// }
collect($this->invoice->line_items)->filter(function ($item) { collect($this->invoice->line_items)->filter(function ($item) {
return $item->type_id == '1'; return $item->type_id == '1';
})->each(function ($i) { })->each(function ($i) {
@ -112,8 +96,6 @@ class AdjustProductInventory implements ShouldQueue
$p->saveQuietly(); $p->saveQuietly();
} }
}); });
} }
public function middleware() public function middleware()
@ -123,24 +105,6 @@ class AdjustProductInventory implements ShouldQueue
private function newInventoryAdjustment() private function newInventoryAdjustment()
{ {
// $line_items = $this->invoice->line_items;
// foreach ($line_items as $item) {
// $p = Product::where('product_key', $item->product_key)->where('company_id', $this->company->id)->where('in_stock_quantity', '>', 0)->first();
// if (! $p) {
// continue;
// }
// $p->in_stock_quantity -= $item->quantity;
// $p->saveQuietly();
// if ($this->company->stock_notification && $p->stock_notification && $p->stock_notification_threshold && $p->in_stock_quantity <= $p->stock_notification_threshold) {
// $this->notifyStockLevels($p, 'product');
// } elseif ($this->company->stock_notification && $p->stock_notification && $this->company->inventory_notification_threshold && $p->in_stock_quantity <= $this->company->inventory_notification_threshold) {
// $this->notifyStocklevels($p, 'company');
// }
// }
collect($this->invoice->line_items)->filter(function ($item) { collect($this->invoice->line_items)->filter(function ($item) {
return $item->type_id == '1'; return $item->type_id == '1';
@ -151,32 +115,21 @@ class AdjustProductInventory implements ShouldQueue
$p->in_stock_quantity -= $i->quantity; $p->in_stock_quantity -= $i->quantity;
$p->saveQuietly(); $p->saveQuietly();
nlog($p->stock_notification_threshold);
nlog($p->in_stock_quantity);
nlog($p->stock_notification_threshold);
if ($this->company->stock_notification && $p->stock_notification && $p->stock_notification_threshold && $p->in_stock_quantity <= $p->stock_notification_threshold) { if ($this->company->stock_notification && $p->stock_notification && $p->stock_notification_threshold && $p->in_stock_quantity <= $p->stock_notification_threshold) {
$this->notifyStockLevels($p, 'product'); $this->notifyStockLevels($p, 'product');
} elseif ($this->company->stock_notification && $p->stock_notification && $this->company->inventory_notification_threshold && $p->in_stock_quantity <= $this->company->inventory_notification_threshold) { } elseif ($this->company->stock_notification && $p->stock_notification && $this->company->inventory_notification_threshold && $p->in_stock_quantity <= $this->company->inventory_notification_threshold) {
$this->notifyStocklevels($p, 'company'); $this->notifyStocklevels($p, 'company');
} }
} }
}); });
} }
private function existingInventoryAdjustment() private function existingInventoryAdjustment()
{ {
// foreach ($this->old_invoice as $item) {
// $p = Product::where('product_key', $item->product_key)->where('company_id', $this->company->id)->first();
// if (! $p) {
// continue;
// }
// $p->in_stock_quantity += $item->quantity;
// $p->saveQuietly();
// }
collect($this->invoice->line_items)->filter(function ($item) { collect($this->invoice->line_items)->filter(function ($item) {
return $item->type_id == '1'; return $item->type_id == '1';
@ -189,8 +142,6 @@ class AdjustProductInventory implements ShouldQueue
$p->saveQuietly(); $p->saveQuietly();
} }
}); });
} }
private function notifyStocklevels(Product $product, string $notification_level) private function notifyStocklevels(Product $product, string $notification_level)
@ -201,7 +152,7 @@ class AdjustProductInventory implements ShouldQueue
$nmo->settings = $this->company->settings; $nmo->settings = $this->company->settings;
$this->company->company_users->each(function ($cu) use ($product, $nmo) { $this->company->company_users->each(function ($cu) use ($product, $nmo) {
if ($this->checkNotificationExists($cu, $product, ['inventory_all', 'inventory_user'])) { if ($this->checkNotificationExists($cu, $product, ['inventory_all', 'inventory_user', 'inventory_threshold_all', 'inventory_threshold_user'])) {
$nmo->to_user = $cu->user; $nmo->to_user = $cu->user;
NinjaMailerJob::dispatch($nmo); NinjaMailerJob::dispatch($nmo);
} }

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

@ -584,8 +584,9 @@ class NinjaMailerJob implements ShouldQueue
$guzzle = new \GuzzleHttp\Client(); $guzzle = new \GuzzleHttp\Client();
$url = 'https://login.microsoftonline.com/common/oauth2/v2.0/token'; $url = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
if(!$user->oauth_user_refresh_token || $user->oauth_user_refresh_token == '') if (!$user->oauth_user_refresh_token || $user->oauth_user_refresh_token == '') {
return false; return false;
}
$token = json_decode($guzzle->post($url, [ $token = json_decode($guzzle->post($url, [
'form_params' => [ 'form_params' => [

10
app/Jobs/Ninja/AdjustEmailQuota.php
View File

@ -21,8 +21,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Turbo124\Beacon\Facades\LightLogs;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
use Turbo124\Beacon\Facades\LightLogs;
class AdjustEmailQuota implements ShouldQueue class AdjustEmailQuota implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
@ -78,14 +79,11 @@ class AdjustEmailQuota implements ShouldQueue
$keys = $redis->keys($prefix); $keys = $redis->keys($prefix);
if(is_array($keys)) if (is_array($keys)) {
{
$redis->pipeline(function ($pipe) use ($keys) { $redis->pipeline(function ($pipe) use ($keys) {
foreach ($keys as $key) { foreach ($keys as $key) {
$pipe->del($key); $pipe->del($key);
} }
}); });
} }
$keys = null; $keys = null;
@ -101,7 +99,5 @@ class AdjustEmailQuota implements ShouldQueue
} }
}); });
} }
} }
} }

1
app/Jobs/Ninja/SendReminders.php
View File

@ -215,7 +215,6 @@ class SendReminders implements ShouldQueue
EmailEntity::dispatch($invitation, $invitation->company, $template)->delay(10); EmailEntity::dispatch($invitation, $invitation->company, $template)->delay(10);
event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $template)); event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $template));
} }
}); });

3
app/Jobs/Payment/EmailPayment.php
View File

@ -73,8 +73,9 @@ class EmailPayment implements ShouldQueue
$this->payment->load('invoices'); $this->payment->load('invoices');
if(!$this->contact) if (!$this->contact) {
$this->contact = $this->payment->client->contacts()->first(); $this->contact = $this->payment->client->contacts()->first();
}
$this->contact->load('client'); $this->contact->load('client');

1
app/Jobs/PurchaseOrder/PurchaseOrderEmail.php
View File

@ -57,6 +57,7 @@ class PurchaseOrderEmail implements ShouldQueue
MultiDB::setDb($this->company->db); MultiDB::setDb($this->company->db);
$this->purchase_order->last_sent_date = now(); $this->purchase_order->last_sent_date = now();
$this->purchase_order->save();
$this->purchase_order->invitations->load('contact.vendor.country', 'purchase_order.vendor.country', 'purchase_order.company')->each(function ($invitation) { $this->purchase_order->invitations->load('contact.vendor.country', 'purchase_order.vendor.country', 'purchase_order.company')->each(function ($invitation) {
/* Don't fire emails if the company is disabled */ /* Don't fire emails if the company is disabled */

22
app/Jobs/Util/ReminderJob.php
View File

@ -11,24 +11,22 @@
namespace App\Jobs\Util; namespace App\Jobs\Util;
use App\Utils\Ninja;
use App\Models\Invoice;
use App\Libraries\MultiDB;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Carbon;
use App\DataMapper\InvoiceItem; use App\DataMapper\InvoiceItem;
use App\Jobs\Entity\EmailEntity; use App\Jobs\Entity\EmailEntity;
use App\Models\TransactionEvent;
use App\Utils\Traits\MakesDates;
use App\Jobs\Ninja\TransactionLog; use App\Jobs\Ninja\TransactionLog;
use Illuminate\Support\Facades\App; use App\Libraries\MultiDB;
use App\Models\Invoice;
use App\Models\TransactionEvent;
use App\Utils\Ninja;
use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesReminders; use App\Utils\Traits\MakesReminders;
use Illuminate\Queue\SerializesModels; use Illuminate\Bus\Queueable;
use Illuminate\Queue\InteractsWithQueue;
use App\Events\Invoice\InvoiceWasEmailed;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use App\Events\Invoice\InvoiceReminderWasEmailed; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\App;
class ReminderJob implements ShouldQueue class ReminderJob implements ShouldQueue
{ {

4
app/Listeners/Payment/PaymentBalanceActivity.php
View File

@ -12,8 +12,8 @@
namespace App\Listeners\Payment; namespace App\Listeners\Payment;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\Middleware\WithoutOverlapping;
class PaymentBalanceActivity implements ShouldQueue class PaymentBalanceActivity implements ShouldQueue
@ -35,11 +35,9 @@ class PaymentBalanceActivity implements ShouldQueue
*/ */
public function handle($event) public function handle($event)
{ {
MultiDB::setDb($event->company->db); MultiDB::setDb($event->company->db);
$event->payment->client->service()->updatePaymentBalance(); $event->payment->client->service()->updatePaymentBalance();
} }
public function middleware($event): array public function middleware($event): array

5
app/Listeners/Payment/PaymentEmailedActivity.php
View File

@ -11,15 +11,13 @@
namespace App\Listeners\Payment; namespace App\Listeners\Payment;
use App\Models\Activity;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Models\Activity;
use App\Repositories\ActivityRepository; use App\Repositories\ActivityRepository;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use App\Utils\Traits\Notifications\UserNotifies;
class PaymentEmailedActivity implements ShouldQueue class PaymentEmailedActivity implements ShouldQueue
{ {
protected $activity_repo; protected $activity_repo;
/** /**
@ -52,6 +50,5 @@ class PaymentEmailedActivity implements ShouldQueue
$fields->payment_id = $event->payment->id; $fields->payment_id = $event->payment->id;
$this->activity_repo->save($fields, $event->payment, $event->event_vars); $this->activity_repo->save($fields, $event->payment, $event->event_vars);
} }
} }

21
app/Mail/Engine/PaymentEmailEngine.php
View File

@ -251,6 +251,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$emailSignature'] = &$data['$signature']; $data['$emailSignature'] = &$data['$signature'];
$data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')]; $data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')];
$data['$invoice_references_subject'] = ['value' => $this->formatInvoiceReferencesSubject(), 'label' => ctrans('texts.invoices')];
$data['$invoice_references'] = ['value' => $this->formatInvoiceReferences(), 'label' => ctrans('texts.invoices')]; $data['$invoice_references'] = ['value' => $this->formatInvoiceReferences(), 'label' => ctrans('texts.invoices')];
$data['$invoice'] = ['value' => $this->formatInvoice(), 'label' => ctrans('texts.invoices')]; $data['$invoice'] = ['value' => $this->formatInvoice(), 'label' => ctrans('texts.invoices')];
$data['$invoice.po_number'] = ['value' => $this->formatPoNumber(), 'label' => ctrans('texts.po_number')]; $data['$invoice.po_number'] = ['value' => $this->formatPoNumber(), 'label' => ctrans('texts.po_number')];
@ -329,6 +330,24 @@ class PaymentEmailEngine extends BaseEmailEngine
return $invoice_list; return $invoice_list;
} }
private function formatInvoiceReferencesSubject()
{
$invoice_list = '';
foreach ($this->payment->invoices as $invoice) {
if (strlen($invoice->po_number) > 1) {
$invoice_list .= ctrans('texts.po_number')." {$invoice->po_number} <br>";
}
$invoice_list .= ctrans('texts.invoice_number_short')." {$invoice->number} " . Number::formatMoney($invoice->pivot->amount, $this->client).', ';
}
return $invoice_list;
}
private function formatInvoiceReferences() private function formatInvoiceReferences()
{ {
$invoice_list = '<br><br>'; $invoice_list = '<br><br>';
@ -388,8 +407,6 @@ class PaymentEmailEngine extends BaseEmailEngine
*/ */
private function buildViewButton(string $link, string $text): string private function buildViewButton(string $link, string $text): string
{ {
if ($this->settings->email_style == 'plain') { if ($this->settings->email_style == 'plain') {
return '<a href="'. $link .'" target="_blank">'. $text .'</a>'; return '<a href="'. $link .'" target="_blank">'. $text .'</a>';
} }

Some files were not shown because too many files have changed in this diff Show More