Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Merge pull request #8333 from turbo124/v5-develop

Browse Source 
v5.5.82
This commit is contained in:
David Bomba 2023-03-04 09:16:24 +11:00 committed by GitHub
commit 95c7ce2294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 118 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
_ide_helper.php
View File

@ -4,7 +4,7 @@
/** /**
* A helper file for Laravel, to provide autocomplete information to your IDE * A helper file for Laravel, to provide autocomplete information to your IDE
* Generated for Laravel 9.52.0. * Generated for Laravel 9.52.4.
* *
* This file should not be included in your code, only analyzed by your IDE! * This file should not be included in your code, only analyzed by your IDE!
* *
@ -4193,7 +4193,7 @@
*/ */
public static function lock($name, $seconds = 0, $owner = null) public static function lock($name, $seconds = 0, $owner = null)
{ {
/** @var \Illuminate\Cache\FileStore $instance */ /** @var \Illuminate\Cache\RedisStore $instance */
return $instance->lock($name, $seconds, $owner); return $instance->lock($name, $seconds, $owner);
} }
/** /**
@ -4206,7 +4206,7 @@
*/ */
public static function restoreLock($name, $owner) public static function restoreLock($name, $owner)
{ {
/** @var \Illuminate\Cache\FileStore $instance */ /** @var \Illuminate\Cache\RedisStore $instance */
return $instance->restoreLock($name, $owner); return $instance->restoreLock($name, $owner);
} }
/** /**
@ -4217,30 +4217,65 @@
*/ */
public static function flush() public static function flush()
{ {
/** @var \Illuminate\Cache\FileStore $instance */ /** @var \Illuminate\Cache\RedisStore $instance */
return $instance->flush(); return $instance->flush();
} }
/** /**
* Get the Filesystem instance. * Get the Redis connection instance.
* *
* @return \Illuminate\Filesystem\Filesystem * @return \Illuminate\Redis\Connections\Connection
* @static * @static
*/ */
public static function getFilesystem() public static function connection()
{ {
/** @var \Illuminate\Cache\FileStore $instance */ /** @var \Illuminate\Cache\RedisStore $instance */
return $instance->getFilesystem(); return $instance->connection();
} }
/** /**
* Get the working directory of the cache. * Get the Redis connection instance that should be used to manage locks.
* *
* @return string * @return \Illuminate\Redis\Connections\Connection
* @static * @static
*/ */
public static function getDirectory() public static function lockConnection()
{ {
/** @var \Illuminate\Cache\FileStore $instance */ /** @var \Illuminate\Cache\RedisStore $instance */
return $instance->getDirectory(); return $instance->lockConnection();
}
/**
* Specify the name of the connection that should be used to store data.
*
* @param string $connection
* @return void
* @static
*/
public static function setConnection($connection)
{
/** @var \Illuminate\Cache\RedisStore $instance */
$instance->setConnection($connection);
}
/**
* Specify the name of the connection that should be used to manage locks.
*
* @param string $connection
* @return \Illuminate\Cache\RedisStore
* @static
*/
public static function setLockConnection($connection)
{
/** @var \Illuminate\Cache\RedisStore $instance */
return $instance->setLockConnection($connection);
}
/**
* Get the Redis database instance.
*
* @return \Illuminate\Contracts\Redis\Factory
* @static
*/
public static function getRedis()
{
/** @var \Illuminate\Cache\RedisStore $instance */
return $instance->getRedis();
} }
/** /**
* Get the cache key prefix. * Get the cache key prefix.
@ -4250,8 +4285,20 @@
*/ */
public static function getPrefix() public static function getPrefix()
{ {
/** @var \Illuminate\Cache\FileStore $instance */ /** @var \Illuminate\Cache\RedisStore $instance */
return $instance->getPrefix(); return $instance->getPrefix();
}
/**
* Set the cache key prefix.
*
* @param string $prefix
* @return void
* @static
*/
public static function setPrefix($prefix)
{
/** @var \Illuminate\Cache\RedisStore $instance */
$instance->setPrefix($prefix);
} }
} }
@ -9854,45 +9901,44 @@
return $instance->setConnectionName($name); return $instance->setConnectionName($name);
} }
/** /**
* Release a reserved job back onto the queue after (n) seconds. * Migrate the delayed jobs that are ready to the regular queue.
* *
* @param string $queue * @param string $from
* @param \Illuminate\Queue\Jobs\DatabaseJobRecord $job * @param string $to
* @param int $delay * @param int $limit
* @return mixed * @return array
* @static * @static
*/ */
public static function release($queue, $job, $delay) public static function migrateExpiredJobs($from, $to)
{ {
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->release($queue, $job, $delay); return $instance->migrateExpiredJobs($from, $to);
} }
/** /**
* Delete a reserved job from the queue. * Delete a reserved job from the queue.
* *
* @param string $queue * @param string $queue
* @param string $id * @param \Illuminate\Queue\Jobs\RedisJob $job
* @return void * @return void
* @throws \Throwable
* @static * @static
*/ */
public static function deleteReserved($queue, $id) public static function deleteReserved($queue, $job)
{ {
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
$instance->deleteReserved($queue, $id); $instance->deleteReserved($queue, $job);
} }
/** /**
* Delete a reserved job from the reserved queue and release it. * Delete a reserved job from the reserved queue and release it.
* *
* @param string $queue * @param string $queue
* @param \Illuminate\Queue\Jobs\DatabaseJob $job * @param \Illuminate\Queue\Jobs\RedisJob $job
* @param int $delay * @param int $delay
* @return void * @return void
* @static * @static
*/ */
public static function deleteAndRelease($queue, $job, $delay) public static function deleteAndRelease($queue, $job, $delay)
{ {
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
$instance->deleteAndRelease($queue, $job, $delay); $instance->deleteAndRelease($queue, $job, $delay);
} }
/** /**
@ -9904,7 +9950,7 @@
*/ */
public static function clear($queue) public static function clear($queue)
{ {
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->clear($queue); return $instance->clear($queue);
} }
/** /**
@ -9916,19 +9962,30 @@
*/ */
public static function getQueue($queue) public static function getQueue($queue)
{ {
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getQueue($queue); return $instance->getQueue($queue);
} }
/** /**
* Get the underlying database instance. * Get the connection for the queue.
* *
* @return \Illuminate\Database\Connection * @return \Illuminate\Redis\Connections\Connection
* @static * @static
*/ */
public static function getDatabase() public static function getConnection()
{ {
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getDatabase(); return $instance->getConnection();
}
/**
* Get the underlying Redis instance.
*
* @return \Illuminate\Contracts\Redis\Factory
* @static
*/
public static function getRedis()
{
/** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getRedis();
} }
/** /**
* Get the backoff for an object-based queue handler. * Get the backoff for an object-based queue handler.
@ -9939,7 +9996,7 @@
*/ */
public static function getJobBackoff($job) public static function getJobBackoff($job)
{ //Method inherited from \Illuminate\Queue\Queue { //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getJobBackoff($job); return $instance->getJobBackoff($job);
} }
/** /**
@ -9951,7 +10008,7 @@
*/ */
public static function getJobExpiration($job) public static function getJobExpiration($job)
{ //Method inherited from \Illuminate\Queue\Queue { //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getJobExpiration($job); return $instance->getJobExpiration($job);
} }
/** /**
@ -9963,7 +10020,7 @@
*/ */
public static function createPayloadUsing($callback) public static function createPayloadUsing($callback)
{ //Method inherited from \Illuminate\Queue\Queue { //Method inherited from \Illuminate\Queue\Queue
\Illuminate\Queue\DatabaseQueue::createPayloadUsing($callback); \Illuminate\Queue\RedisQueue::createPayloadUsing($callback);
} }
/** /**
* Get the container instance being used by the connection. * Get the container instance being used by the connection.
@ -9973,7 +10030,7 @@
*/ */
public static function getContainer() public static function getContainer()
{ //Method inherited from \Illuminate\Queue\Queue { //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
return $instance->getContainer(); return $instance->getContainer();
} }
/** /**
@ -9985,7 +10042,7 @@
*/ */
public static function setContainer($container) public static function setContainer($container)
{ //Method inherited from \Illuminate\Queue\Queue { //Method inherited from \Illuminate\Queue\Queue
/** @var \Illuminate\Queue\DatabaseQueue $instance */ /** @var \Illuminate\Queue\RedisQueue $instance */
$instance->setContainer($container); $instance->setContainer($container);
} }
@ -10803,12 +10860,12 @@
* Clones a request and overrides some of its parameters. * Clones a request and overrides some of its parameters.
* *
* @return static * @return static
* @param array $query The GET parameters * @param array|null $query The GET parameters
* @param array $request The POST parameters * @param array|null $request The POST parameters
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...) * @param array|null $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
* @param array $cookies The COOKIE parameters * @param array|null $cookies The COOKIE parameters
* @param array $files The FILES parameters * @param array|null $files The FILES parameters
* @param array $server The SERVER parameters * @param array|null $server The SERVER parameters
* @static * @static
*/ */
public static function duplicate($query = null, $request = null, $attributes = null, $cookies = null, $files = null, $server = null) public static function duplicate($query = null, $request = null, $attributes = null, $cookies = null, $files = null, $server = null)
@ -17797,25 +17854,6 @@
/** /**
* *
* *
* @method static void createSubscription(array|string $channels, \Closure $callback, string $method = 'subscribe')
* @method static \Illuminate\Redis\Limiters\ConcurrencyLimiterBuilder funnel(string $name)
* @method static \Illuminate\Redis\Limiters\DurationLimiterBuilder throttle(string $name)
* @method static mixed client()
* @method static void subscribe(array|string $channels, \Closure $callback)
* @method static void psubscribe(array|string $channels, \Closure $callback)
* @method static mixed command(string $method, array $parameters = [])
* @method static void listen(\Closure $callback)
* @method static string|null getName()
* @method static \Illuminate\Redis\Connections\Connection setName(string $name)
* @method static \Illuminate\Contracts\Events\Dispatcher getEventDispatcher()
* @method static void setEventDispatcher(\Illuminate\Contracts\Events\Dispatcher $events)
* @method static void unsetEventDispatcher()
* @method static void macro(string $name, object|callable $macro)
* @method static void mixin(object $mixin, bool $replace = true)
* @method static bool hasMacro(string $name)
* @method static void flushMacros()
* @method static mixed macroCall(string $method, array $parameters)
* @see \Illuminate\Redis\RedisManager
*/ */
class Redis { class Redis {
/** /**

3
app/Http/Controllers/ActivityController.php
View File

@ -87,7 +87,8 @@ class ActivityController extends BaseController
{ {
$default_activities = $request->has('rows') ? $request->input('rows') : 50; $default_activities = $request->has('rows') ? $request->input('rows') : 50;
$activities = Activity::orderBy('created_at', 'DESC') $activities = Activity::with('user')
->orderBy('created_at', 'DESC')
->company() ->company()
->take($default_activities); ->take($default_activities);

13
app/PaymentDrivers/Authorize/ChargePaymentProfile.php
View File

@ -30,7 +30,7 @@ class ChargePaymentProfile
{ {
use MakesHash; use MakesHash;
public function __construct(AuthorizePaymentDriver $authorize) public function __construct(public AuthorizePaymentDriver $authorize)
{ {
$this->authorize = $authorize; $this->authorize = $authorize;
} }
@ -49,6 +49,7 @@ class ChargePaymentProfile
$profileToCharge->setPaymentProfile($paymentProfile); $profileToCharge->setPaymentProfile($paymentProfile);
$invoice_numbers = ''; $invoice_numbers = '';
$po_numbers = '';
$taxAmount = 0; $taxAmount = 0;
$invoiceTotal = 0; $invoiceTotal = 0;
$invoiceTaxes = 0; $invoiceTaxes = 0;
@ -57,6 +58,8 @@ class ChargePaymentProfile
$invoice_numbers = collect($this->authorize->payment_hash->data->invoices)->pluck('invoice_number')->implode(','); $invoice_numbers = collect($this->authorize->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
$invObj = Invoice::whereIn('id', $this->transformKeys(array_column($this->authorize->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get(); $invObj = Invoice::whereIn('id', $this->transformKeys(array_column($this->authorize->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$po_numbers = $invObj->pluck('po_number')->implode(',');
$invoiceTotal = round($invObj->pluck('amount')->sum(), 2); $invoiceTotal = round($invObj->pluck('amount')->sum(), 2);
$invoiceTaxes = round($invObj->pluck('total_taxes')->sum(), 2); $invoiceTaxes = round($invObj->pluck('total_taxes')->sum(), 2);
@ -73,6 +76,7 @@ class ChargePaymentProfile
$order = new OrderType(); $order = new OrderType();
$order->setInvoiceNumber(substr($invoice_numbers, 0, 19)); $order->setInvoiceNumber(substr($invoice_numbers, 0, 19));
$order->setDescription(substr($description, 0, 255)); $order->setDescription(substr($description, 0, 255));
$order->setSupplierOrderReference(substr($po_numbers, 0, 19));// 04-03-2023
$tax = new ExtendedAmountType(); $tax = new ExtendedAmountType();
$tax->setName('tax'); $tax->setName('tax');
@ -99,14 +103,9 @@ class ChargePaymentProfile
if ($tresponse != null && $tresponse->getMessages() != null) { if ($tresponse != null && $tresponse->getMessages() != null) {
nlog(' Transaction Response code : '.$tresponse->getResponseCode()); nlog(' Transaction Response code : '.$tresponse->getResponseCode());
nlog('Charge Customer Profile APPROVED :'); nlog(' Charge Customer Profile APPROVED :');
nlog(' Charge Customer Profile AUTH CODE : '.$tresponse->getAuthCode()); nlog(' Charge Customer Profile AUTH CODE : '.$tresponse->getAuthCode());
nlog(' Charge Customer Profile TRANS ID : '.$tresponse->getTransId()); nlog(' Charge Customer Profile TRANS ID : '.$tresponse->getTransId());
nlog(' Code : '.$tresponse->getMessages()[0]->getCode());
nlog(' Description : '.$tresponse->getMessages()[0]->getDescription());
//nlog(" Charge Customer Profile TRANS STATUS : " . $tresponse->getTransactionStatus() );
//nlog(" Charge Customer Profile Amount : " . $tresponse->getAuthAmount());
nlog(' Code : '.$tresponse->getMessages()[0]->getCode()); nlog(' Code : '.$tresponse->getMessages()[0]->getCode());
nlog(' Description : '.$tresponse->getMessages()[0]->getDescription()); nlog(' Description : '.$tresponse->getMessages()[0]->getDescription());
nlog(print_r($tresponse->getMessages()[0], 1)); nlog(print_r($tresponse->getMessages()[0], 1));

5
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.5.81', 'app_version' => '5.5.82',
'app_tag' => '5.5.81', 'app_tag' => '5.5.82',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),
@ -212,4 +212,5 @@ return [
'dev_mode' => env("YODLEE_DEV_MODE", false), 'dev_mode' => env("YODLEE_DEV_MODE", false),
'config_name' => env("YODLEE_CONFIG_NAME", false), 'config_name' => env("YODLEE_CONFIG_NAME", false),
], ],
'licenses' => env('LICENSES',false),
]; ];

4
database/seeders/RandomDataSeeder.php
View File

@ -151,8 +151,8 @@ class RandomDataSeeder extends Seeder
'email' => 'permissions@example.com', 'email' => 'permissions@example.com',
]); ]);
$user->first_name = 'per'; $user->first_name = 'Permissions';
$user->last_name = 'missions'; $user->last_name = 'Test';
$user->password = Hash::make('password'); $user->password = Hash::make('password');
$user->account_id = $account->id; $user->account_id = $account->id;
$user->email_verified_at = now(); $user->email_verified_at = now();