Skip to content

fix(Payment): update global scope and currency formatting #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
celikerde wants to merge 1 commit into
base: 0.x
Choose a base branch
from
Open

fix(Payment): update global scope and currency formatting #345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions modules/SystemPayment/Entities/Payment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,14 @@ class Payment extends \Unusualify\Payable\Models\Payment

protected static function booted(): void
{
static::addGlobalScope('price_currency_iso_4217', function (Builder $builder) {
$pricesTable = (new Price)->getTable();
static::addGlobalScope('currency_iso_4217', function (Builder $builder) {
$currenciesTable = (new Currency)->getTable();
$paymentTable = (new static)->getTable();

$builder->addSelect([
'price_currency_iso_4217' => Currency::query()
'currency_iso_4217' => Currency::query()
->select($currenciesTable . '.iso_4217')
->join($pricesTable, $pricesTable . '.currency_id', '=', $currenciesTable . '.id')
->whereColumn($pricesTable . '.id', $paymentTable . '.price_id')
->whereColumn($currenciesTable . '.id', $paymentTable . '.currency_id')
->limit(1),
]);
});
Expand Down Expand Up @@ -168,7 +166,7 @@ protected function amountFormatted(): Attribute
{
return Attribute::make(
get: function () {
return PriceService::formatAmount($this->amount, new \Money\Currency($this->price_currency_iso_4217 ?? $this->currency->iso_4217));
return PriceService::formatAmount($this->amount, new \Money\Currency($this->currency_iso_4217 ?? $this->currency->iso_4217));
},
);
}
Expand Down
Loading