diff --git a/app/Models/Client.php b/app/Models/Client.php index 5a4ec88f74b1..959243ccb768 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -544,9 +544,9 @@ class Client extends BaseModel implements HasLocalePreference return $this->settings->{$setting}; } elseif (is_bool($this->settings->{$setting})) { return $this->settings->{$setting}; - } elseif (is_int($this->settings->{$setting})) { //10-08-2022 integer client values are not being passed back! This resolves it. + } elseif (is_int($this->settings->{$setting})) { return $this->settings->{$setting}; - } elseif(is_float($this->settings->{$setting})) { //10-08-2022 integer client values are not being passed back! This resolves it. + } elseif(is_float($this->settings->{$setting})) { return $this->settings->{$setting}; } } diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php index 79de7603c75d..720d5f0b02be 100644 --- a/app/PaymentDrivers/PayTrace/CreditCard.php +++ b/app/PaymentDrivers/PayTrace/CreditCard.php @@ -123,6 +123,7 @@ class CreditCard 'city' => $this->paytrace->client->city, 'state' => $this->paytrace->client->state, 'zip' => $this->paytrace->client->postal_code, + 'country' => $this->paytrace->client->country->iso_3166_2 ]; return $data; diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php index 7fb5c8826638..48a3ed7c4a7d 100644 --- a/app/Transformers/ExpenseTransformer.php +++ b/app/Transformers/ExpenseTransformer.php @@ -14,12 +14,12 @@ namespace App\Transformers; use App\Models\Vendor; use App\Models\Expense; use App\Models\Invoice; -use App\Models\Document; use App\Models\ExpenseCategory; +use App\Transformers\ExpenseCategoryTransformer; +use App\Models\Document; use App\Utils\Traits\MakesHash; use League\Fractal\Resource\Item; use Illuminate\Database\Eloquent\SoftDeletes; -use App\Transformers\ExpenseCategoryTransformer; /** * class ExpenseTransformer.