D2452.1775190902.diff
No OneTemporary
Actions

Authored By

Unknown

Size

27 KB

Referenced Files

None

Subscribers

None

D2452.1775190902.diff
View Options

	diff --git a/src/app/Console/Command.php b/src/app/Console/Command.php
	--- a/src/app/Console/Command.php
	+++ b/src/app/Console/Command.php
	@@ -2,6 +2,8 @@

	namespace App\Console;

	+use Illuminate\Support\Facades\DB;
	+
	abstract class Command extends \Illuminate\Console\Command
	{
	/**
	@@ -43,23 +45,67 @@
	*/
	public function getObject($objectClass, $objectIdOrTitle, $objectTitle = null)
	{
	- if ($this->hasOption('with-deleted') && $this->option('with-deleted')) {
	- $object = $objectClass::withTrashed()->find($objectIdOrTitle);
	- } else {
	- $object = $objectClass::find($objectIdOrTitle);
	- }
	+ $withDeleted = $this->hasOption('with-deleted') && $this->option('with-deleted');
	+
	+ $object = $this->getObjectModel($objectClass, $withDeleted)->find($objectIdOrTitle);

	if (!$object && !empty($objectTitle)) {
	- if ($this->hasOption('with-deleted') && $this->option('with-deleted')) {
	- $object = $objectClass::withTrashed()->where($objectTitle, $objectIdOrTitle)->first();
	- } else {
	- $object = $objectClass::where($objectTitle, $objectIdOrTitle)->first();
	- }
	+ $object = $this->getObjectModel($objectClass, $withDeleted)
	+ ->where($objectTitle, $objectIdOrTitle)->first();
	}

	return $object;
	}

	+ /**
	+ * Returns a preconfigured Model object for a specified class.
	+ *
	+ * @param string $objectClass The name of the class
	+ * @param bool $withDeleted Include withTrashed() query
	+ *
	+ * @return mixed
	+ */
	+ protected function getObjectModel($objectClass, $withDeleted = false)
	+ {
	+ if ($withDeleted) {
	+ $model = $objectClass::withTrashed();
	+ } else {
	+ $model = new $objectClass();
	+ }
	+
	+ $modelsWithTenant = [
	+ \App\Discount::class,
	+ \App\Domain::class,
	+ \App\Group::class,
	+ \App\Package::class,
	+ \App\Plan::class,
	+ \App\Sku::class,
	+ \App\User::class,
	+ ];
	+
	+ $modelsWithOwner = [
	+ \App\Wallet::class,
	+ ];
	+
	+ $tenant_id = \config('app.tenant_id');
	+
	+ // Add tenant filter
	+ if (in_array($objectClass, $modelsWithTenant)) {
	+ $model = $model->withEnvTenant();
	+ } elseif (in_array($objectClass, $modelsWithOwner)) {
	+ $model = $model->whereExists(function ($query) {
	+ $query->select(DB::raw(1))
	+ ->from('users')
	+ ->whereRaw('wallets.user_id = users.id')
	+ ->whereRaw('users.tenant_id ' . ($tenant_id ? "= $tenant_id" : 'is null'));
	+ });
	+ }
	+
	+ // TODO: tenant check for Entitlement, Transaction, etc.
	+
	+ return $model;
	+ }
	+
	/**
	* Find the user.
	*
	diff --git a/src/app/Console/Commands/Discount/MergeCommand.php b/src/app/Console/Commands/Discount/MergeCommand.php
	--- a/src/app/Console/Commands/Discount/MergeCommand.php
	+++ b/src/app/Console/Commands/Discount/MergeCommand.php
	@@ -60,14 +60,14 @@
	*/
	public function handle()
	{
	- $source = \App\Discount::find($this->argument('source'));
	+ $source = \App\Discount::withEnvTenant()->find($this->argument('source'));

	if (!$source) {
	$this->error("No such source discount: {$source}");
	return 1;
	}

	- $target = \App\Discount::find($this->argument('target'));
	+ $target = \App\Discount::withEnvTenant()->find($this->argument('target'));

	if (!$target) {
	$this->error("No such target discount: {$target}");
	diff --git a/src/app/Console/Commands/DomainDelete.php b/src/app/Console/Commands/DomainDelete.php
	--- a/src/app/Console/Commands/DomainDelete.php
	+++ b/src/app/Console/Commands/DomainDelete.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $domain = \App\Domain::where('id', $this->argument('domain'))->first();
	+ $domain = \App\Domain::withEnvTenant()->where('id', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/DomainList.php b/src/app/Console/Commands/DomainList.php
	--- a/src/app/Console/Commands/DomainList.php
	+++ b/src/app/Console/Commands/DomainList.php
	@@ -44,7 +44,7 @@
	$domains = Domain::orderBy('namespace');
	}

	- $domains->each(
	+ $domains->withEnvTenant()->each(
	function ($domain) {
	$msg = $domain->namespace;

	diff --git a/src/app/Console/Commands/DomainListUsers.php b/src/app/Console/Commands/DomainListUsers.php
	--- a/src/app/Console/Commands/DomainListUsers.php
	+++ b/src/app/Console/Commands/DomainListUsers.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $domain = \App\Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = \App\Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/DomainRestore.php b/src/app/Console/Commands/DomainRestore.php
	--- a/src/app/Console/Commands/DomainRestore.php
	+++ b/src/app/Console/Commands/DomainRestore.php
	@@ -28,7 +28,8 @@
	*/
	public function handle()
	{
	- $domain = \App\Domain::withTrashed()->where('namespace', $this->argument('domain'))->first();
	+ $domain = \App\Domain::withTrashed()->withEnvTenant()
	+ ->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	$this->error("Domain not found.");
	diff --git a/src/app/Console/Commands/DomainSetStatus.php b/src/app/Console/Commands/DomainSetStatus.php
	--- a/src/app/Console/Commands/DomainSetStatus.php
	+++ b/src/app/Console/Commands/DomainSetStatus.php
	@@ -29,7 +29,7 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/DomainSetWallet.php b/src/app/Console/Commands/DomainSetWallet.php
	--- a/src/app/Console/Commands/DomainSetWallet.php
	+++ b/src/app/Console/Commands/DomainSetWallet.php
	@@ -32,7 +32,7 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	$this->error("Domain not found.");
	@@ -41,7 +41,7 @@

	$wallet = Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withEnvTenant()->withTrashed()->first()) {
	$this->error("Wallet not found.");
	return 1;
	}
	diff --git a/src/app/Console/Commands/DomainStatus.php b/src/app/Console/Commands/DomainStatus.php
	--- a/src/app/Console/Commands/DomainStatus.php
	+++ b/src/app/Console/Commands/DomainStatus.php
	@@ -38,7 +38,10 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+
	+
	+
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/DomainSuspend.php b/src/app/Console/Commands/DomainSuspend.php
	--- a/src/app/Console/Commands/DomainSuspend.php
	+++ b/src/app/Console/Commands/DomainSuspend.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/DomainUnsuspend.php b/src/app/Console/Commands/DomainUnsuspend.php
	--- a/src/app/Console/Commands/DomainUnsuspend.php
	+++ b/src/app/Console/Commands/DomainUnsuspend.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/Job/DomainCreate.php b/src/app/Console/Commands/Job/DomainCreate.php
	--- a/src/app/Console/Commands/Job/DomainCreate.php
	+++ b/src/app/Console/Commands/Job/DomainCreate.php
	@@ -28,7 +28,7 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/Job/DomainUpdate.php b/src/app/Console/Commands/Job/DomainUpdate.php
	--- a/src/app/Console/Commands/Job/DomainUpdate.php
	+++ b/src/app/Console/Commands/Job/DomainUpdate.php
	@@ -28,7 +28,7 @@
	*/
	public function handle()
	{
	- $domain = Domain::where('namespace', $this->argument('domain'))->first();
	+ $domain = Domain::withEnvTenant()->where('namespace', $this->argument('domain'))->first();

	if (!$domain) {
	return 1;
	diff --git a/src/app/Console/Commands/Job/UserCreate.php b/src/app/Console/Commands/Job/UserCreate.php
	--- a/src/app/Console/Commands/Job/UserCreate.php
	+++ b/src/app/Console/Commands/Job/UserCreate.php
	@@ -28,7 +28,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/Job/UserUpdate.php b/src/app/Console/Commands/Job/UserUpdate.php
	--- a/src/app/Console/Commands/Job/UserUpdate.php
	+++ b/src/app/Console/Commands/Job/UserUpdate.php
	@@ -28,7 +28,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/Job/WalletCheck.php b/src/app/Console/Commands/Job/WalletCheck.php
	--- a/src/app/Console/Commands/Job/WalletCheck.php
	+++ b/src/app/Console/Commands/Job/WalletCheck.php
	@@ -30,7 +30,7 @@
	{
	$wallet = Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	diff --git a/src/app/Console/Commands/MollieInfo.php b/src/app/Console/Commands/MollieInfo.php
	--- a/src/app/Console/Commands/MollieInfo.php
	+++ b/src/app/Console/Commands/MollieInfo.php
	@@ -29,7 +29,7 @@
	public function handle()
	{
	if ($this->argument('user')) {
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/OpenVidu/RoomCreate.php b/src/app/Console/Commands/OpenVidu/RoomCreate.php
	--- a/src/app/Console/Commands/OpenVidu/RoomCreate.php
	+++ b/src/app/Console/Commands/OpenVidu/RoomCreate.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/PackageSkus.php b/src/app/Console/Commands/PackageSkus.php
	--- a/src/app/Console/Commands/PackageSkus.php
	+++ b/src/app/Console/Commands/PackageSkus.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $packages = Package::all();
	+ $packages = Package::withEnvTenant()->get();

	foreach ($packages as $package) {
	$this->info(sprintf("Package: %s", $package->title));
	diff --git a/src/app/Console/Commands/PlanPackages.php b/src/app/Console/Commands/PlanPackages.php
	--- a/src/app/Console/Commands/PlanPackages.php
	+++ b/src/app/Console/Commands/PlanPackages.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $plans = Plan::all();
	+ $plans = Plan::withEnvTenant()->get();

	foreach ($plans as $plan) {
	$this->info(sprintf("Plan: %s", $plan->title));
	diff --git a/src/app/Console/Commands/Sku/ListUsers.php b/src/app/Console/Commands/Sku/ListUsers.php
	--- a/src/app/Console/Commands/Sku/ListUsers.php
	+++ b/src/app/Console/Commands/Sku/ListUsers.php
	@@ -27,7 +27,7 @@
	*/
	public function handle()
	{
	- $sku = \App\Sku::find($this->argument('sku'));
	+ $sku = \App\Sku::withEnvTenant()->find($this->argument('sku'));

	if (!$sku) {
	$sku = \App\Sku::where('title', $this->argument('sku'))->first();
	diff --git a/src/app/Console/Commands/StripeInfo.php b/src/app/Console/Commands/StripeInfo.php
	--- a/src/app/Console/Commands/StripeInfo.php
	+++ b/src/app/Console/Commands/StripeInfo.php
	@@ -31,7 +31,7 @@
	public function handle()
	{
	if ($this->argument('user')) {
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserAddAlias.php b/src/app/Console/Commands/UserAddAlias.php
	--- a/src/app/Console/Commands/UserAddAlias.php
	+++ b/src/app/Console/Commands/UserAddAlias.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserAssignSku.php b/src/app/Console/Commands/UserAssignSku.php
	--- a/src/app/Console/Commands/UserAssignSku.php
	+++ b/src/app/Console/Commands/UserAssignSku.php
	@@ -27,17 +27,17 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	$this->error("Unable to find the user {$this->argument('user')}.");
	return 1;
	}

	- $sku = \App\Sku::find($this->argument('sku'));
	+ $sku = \App\Sku::withEnvTenant()->find($this->argument('sku'));

	if (!$sku) {
	- $sku = \App\Sku::where('title', $this->argument('sku'))->first();
	+ $sku = \App\Sku::withEnvTenant()->where('title', $this->argument('sku'))->first();
	}

	if (!$sku) {
	diff --git a/src/app/Console/Commands/UserDelete.php b/src/app/Console/Commands/UserDelete.php
	--- a/src/app/Console/Commands/UserDelete.php
	+++ b/src/app/Console/Commands/UserDelete.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserDiscount.php b/src/app/Console/Commands/UserDiscount.php
	--- a/src/app/Console/Commands/UserDiscount.php
	+++ b/src/app/Console/Commands/UserDiscount.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	@@ -48,7 +48,7 @@
	if ($this->argument('discount') === '0') {
	$discount = null;
	} else {
	- $discount = \App\Discount::find($this->argument('discount'));
	+ $discount = \App\Discount::withEnvTenant()->find($this->argument('discount'));

	if (!$discount) {
	return 1;
	diff --git a/src/app/Console/Commands/UserDomains.php b/src/app/Console/Commands/UserDomains.php
	--- a/src/app/Console/Commands/UserDomains.php
	+++ b/src/app/Console/Commands/UserDomains.php
	@@ -40,7 +40,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('userid'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('userid'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserEntitlements.php b/src/app/Console/Commands/UserEntitlements.php
	--- a/src/app/Console/Commands/UserEntitlements.php
	+++ b/src/app/Console/Commands/UserEntitlements.php
	@@ -39,7 +39,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('userid'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('userid'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserForceDelete.php b/src/app/Console/Commands/UserForceDelete.php
	--- a/src/app/Console/Commands/UserForceDelete.php
	+++ b/src/app/Console/Commands/UserForceDelete.php
	@@ -28,7 +28,8 @@
	*/
	public function handle()
	{
	- $user = \App\User::withTrashed()->where('email', $this->argument('user'))->first();
	+ $user = \App\User::withTrashed()->withEnvTenant()
	+ ->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserRestore.php b/src/app/Console/Commands/UserRestore.php
	--- a/src/app/Console/Commands/UserRestore.php
	+++ b/src/app/Console/Commands/UserRestore.php
	@@ -28,7 +28,8 @@
	*/
	public function handle()
	{
	- $user = \App\User::withTrashed()->where('email', $this->argument('user'))->first();
	+ $user = \App\User::withTrashed()->withEnvTenant()
	+ ->where('email', $this->argument('user'))->first();

	if (!$user) {
	$this->error('User not found.');
	diff --git a/src/app/Console/Commands/UserStatus.php b/src/app/Console/Commands/UserStatus.php
	--- a/src/app/Console/Commands/UserStatus.php
	+++ b/src/app/Console/Commands/UserStatus.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserSuspend.php b/src/app/Console/Commands/UserSuspend.php
	--- a/src/app/Console/Commands/UserSuspend.php
	+++ b/src/app/Console/Commands/UserSuspend.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserUnsuspend.php b/src/app/Console/Commands/UserUnsuspend.php
	--- a/src/app/Console/Commands/UserUnsuspend.php
	+++ b/src/app/Console/Commands/UserUnsuspend.php
	@@ -38,7 +38,7 @@
	*/
	public function handle()
	{
	- $user = User::where('email', $this->argument('user'))->first();
	+ $user = User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserVerify.php b/src/app/Console/Commands/UserVerify.php
	--- a/src/app/Console/Commands/UserVerify.php
	+++ b/src/app/Console/Commands/UserVerify.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/UserWallets.php b/src/app/Console/Commands/UserWallets.php
	--- a/src/app/Console/Commands/UserWallets.php
	+++ b/src/app/Console/Commands/UserWallets.php
	@@ -37,7 +37,7 @@
	*/
	public function handle()
	{
	- $user = \App\User::where('email', $this->argument('user'))->first();
	+ $user = \App\User::withEnvTenant()->where('email', $this->argument('user'))->first();

	if (!$user) {
	return 1;
	diff --git a/src/app/Console/Commands/WalletAddTransaction.php b/src/app/Console/Commands/WalletAddTransaction.php
	--- a/src/app/Console/Commands/WalletAddTransaction.php
	+++ b/src/app/Console/Commands/WalletAddTransaction.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	diff --git a/src/app/Console/Commands/WalletBalances.php b/src/app/Console/Commands/WalletBalances.php
	--- a/src/app/Console/Commands/WalletBalances.php
	+++ b/src/app/Console/Commands/WalletBalances.php
	@@ -37,13 +37,18 @@
	*/
	public function handle()
	{
	- \App\Wallet::all()->each(
	+ $wallets = \App\Wallet::select('wallets.*')
	+ ->join('users', 'users.id', '=', 'wallets.user_id')
	+ ->withEnvTenant('users')
	+ ->all();
	+
	+ $wallets->each(
	function ($wallet) {
	if ($wallet->balance == 0) {
	return;
	}

	- $user = \App\User::where('id', $wallet->user_id)->first();
	+ $user = $wallet->owner;

	if (!$user) {
	return;
	diff --git a/src/app/Console/Commands/WalletDiscount.php b/src/app/Console/Commands/WalletDiscount.php
	--- a/src/app/Console/Commands/WalletDiscount.php
	+++ b/src/app/Console/Commands/WalletDiscount.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::where('id', $this->argument('wallet'))->first();

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	@@ -48,7 +48,7 @@
	if ($this->argument('discount') === '0') {
	$wallet->discount()->dissociate();
	} else {
	- $discount = \App\Discount::find($this->argument('discount'));
	+ $discount = \App\Discount::withEnvTenant()->find($this->argument('discount'));

	if (!$discount) {
	return 1;
	diff --git a/src/app/Console/Commands/WalletExpected.php b/src/app/Console/Commands/WalletExpected.php
	--- a/src/app/Console/Commands/WalletExpected.php
	+++ b/src/app/Console/Commands/WalletExpected.php
	@@ -38,7 +38,8 @@
	public function handle()
	{
	if ($this->option('user')) {
	- $user = \App\User::where('email', $this->option('user'))
	+ $user = \App\User::withEnvTenant()
	+ ->where('email', $this->option('user'))
	->orWhere('id', $this->option('user'))->first();

	if (!$user) {
	@@ -47,7 +48,10 @@

	$wallets = $user->wallets;
	} else {
	- $wallets = \App\Wallet::all();
	+ $wallets = \App\Wallet::select('wallets.*')
	+ ->join('users', 'users.id', '=', 'wallets.user_id')
	+ ->withEnvTenant('users')
	+ ->all();
	}

	foreach ($wallets as $wallet) {
	diff --git a/src/app/Console/Commands/WalletGetBalance.php b/src/app/Console/Commands/WalletGetBalance.php
	--- a/src/app/Console/Commands/WalletGetBalance.php
	+++ b/src/app/Console/Commands/WalletGetBalance.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	diff --git a/src/app/Console/Commands/WalletGetDiscount.php b/src/app/Console/Commands/WalletGetDiscount.php
	--- a/src/app/Console/Commands/WalletGetDiscount.php
	+++ b/src/app/Console/Commands/WalletGetDiscount.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	diff --git a/src/app/Console/Commands/WalletMandate.php b/src/app/Console/Commands/WalletMandate.php
	--- a/src/app/Console/Commands/WalletMandate.php
	+++ b/src/app/Console/Commands/WalletMandate.php
	@@ -40,7 +40,7 @@
	{
	$wallet = \App\Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	diff --git a/src/app/Console/Commands/WalletSetBalance.php b/src/app/Console/Commands/WalletSetBalance.php
	--- a/src/app/Console/Commands/WalletSetBalance.php
	+++ b/src/app/Console/Commands/WalletSetBalance.php
	@@ -39,11 +39,11 @@
	{
	$wallet = \App\Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	- $wallet->balance = (int)($this->argument('balance'));
	+ $wallet->balance = (int) $this->argument('balance');
	$wallet->save();
	}
	}
	diff --git a/src/app/Console/Commands/WalletSetDiscount.php b/src/app/Console/Commands/WalletSetDiscount.php
	--- a/src/app/Console/Commands/WalletSetDiscount.php
	+++ b/src/app/Console/Commands/WalletSetDiscount.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::where('id', $this->argument('wallet'))->first();

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	@@ -48,7 +48,7 @@
	if ($this->argument('discount') === '0') {
	$wallet->discount()->dissociate();
	} else {
	- $discount = \App\Discount::find($this->argument('discount'));
	+ $discount = \App\Discount::withEnvTenant()->find($this->argument('discount'));

	if (!$discount) {
	return 1;
	diff --git a/src/app/Console/Commands/WalletTransactions.php b/src/app/Console/Commands/WalletTransactions.php
	--- a/src/app/Console/Commands/WalletTransactions.php
	+++ b/src/app/Console/Commands/WalletTransactions.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::where('id', $this->argument('wallet'))->first();

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

	diff --git a/src/app/Console/Commands/WalletUntil.php b/src/app/Console/Commands/WalletUntil.php
	--- a/src/app/Console/Commands/WalletUntil.php
	+++ b/src/app/Console/Commands/WalletUntil.php
	@@ -39,7 +39,7 @@
	{
	$wallet = \App\Wallet::find($this->argument('wallet'));

	- if (!$wallet) {
	+ if (!$wallet \|\| !$wallet->owner()->withTrashed()->withEnvTenant()->first()) {
	return 1;
	}

File Metadata

Mime Type: text/plain
Expires: Fri, Apr 3, 4:35 AM (12 h, 24 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 18822588
Default Alt Text: D2452.1775190902.diff (27 KB)

D2452.1775190902.diffNo OneTemporaryActions

D2452.1775190902.diffView Options

File Metadata

Event Timeline

D2452.1775190902.diff
No OneTemporary
Actions

D2452.1775190902.diff
View Options