shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated money package to 5.0 version

Browse Source
This commit is contained in:
Denis Duliçi 2023-07-10 12:53:43 +03:00
parent 7a589e5bbd
commit 20e5b57562
26 changed files with 1887 additions and 1877 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Modals/Currencies.php
View File

@ -64,7 +64,7 @@ class Currencies extends Controller
*/ */
public function store(Request $request) public function store(Request $request)
{ {
$currency = config('money.' . $request->get('code')); $currency = config('money.currencies.' . $request->get('code'));
$request['precision'] = (int) $currency['precision']; $request['precision'] = (int) $currency['precision'];
$request['symbol'] = $currency['symbol']; $request['symbol'] = $currency['symbol'];

2
app/Http/Controllers/Settings/Currencies.php
View File

@ -235,7 +235,7 @@ class Currencies extends Controller
if ($code) { if ($code) {
$currencies = Currency::all()->pluck('rate', 'code'); $currencies = Currency::all()->pluck('rate', 'code');
$currency = config('money.' . $code); $currency = config('money.currencies.' . $code);
$currency['rate'] = isset($currencies[$code]) ? $currencies[$code] : null; $currency['rate'] = isset($currencies[$code]) ? $currencies[$code] : null;
$currency['symbol_first'] = ! empty($currency['symbol_first']) ? 1 : 0; $currency['symbol_first'] = ! empty($currency['symbol_first']) ? 1 : 0;

6
app/Http/Middleware/Money.php
View File

@ -84,7 +84,7 @@ class Money
$amount = $item['price']; $amount = $item['price'];
if (strpos($item['price'], config('money.' . $currency_code . '.symbol')) !== false) { if (strpos($item['price'], config('money.currencies.' . $currency_code . '.symbol')) !== false) {
$amount = $this->getAmount($item['price'], $currency_code); $amount = $this->getAmount($item['price'], $currency_code);
} }
@ -101,8 +101,8 @@ class Money
protected function getAmount($money_format, $currency_code) protected function getAmount($money_format, $currency_code)
{ {
try { try {
if (config('money.' . $currency_code . '.decimal_mark') !== '.') { if (config('money.currencies.' . $currency_code . '.decimal_mark') !== '.') {
$money_format = Str::replaceFirst('.', config('money.' . $currency_code . '.decimal_mark'), $money_format); $money_format = Str::replaceFirst('.', config('money.currencies.' . $currency_code . '.decimal_mark'), $money_format);
} }
$amount = money($money_format, $currency_code)->getAmount(); $amount = money($money_format, $currency_code)->getAmount();

4
app/Jobs/Banking/CreateBankingDocumentTransaction.php
View File

@ -69,7 +69,7 @@ class CreateBankingDocumentTransaction extends Job implements ShouldCreate
$this->request['company_id'] = $this->model->company_id; $this->request['company_id'] = $this->model->company_id;
$this->request['currency_code'] = $currency_code; $this->request['currency_code'] = $currency_code;
$this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->toDateTimeString(); $this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->toDateTimeString();
$this->request['currency_rate'] = config('money.' . $currency_code . '.rate'); $this->request['currency_rate'] = config('money.currencies.' . $currency_code . '.rate');
$this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account'); $this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account');
$this->request['document_id'] = isset($this->request['document_id']) ? $this->request['document_id'] : $this->model->id; $this->request['document_id'] = isset($this->request['document_id']) ? $this->request['document_id'] : $this->model->id;
$this->request['contact_id'] = isset($this->request['contact_id']) ? $this->request['contact_id'] : $this->model->contact_id; $this->request['contact_id'] = isset($this->request['contact_id']) ? $this->request['contact_id'] : $this->model->contact_id;
@ -83,7 +83,7 @@ class CreateBankingDocumentTransaction extends Job implements ShouldCreate
$code = $this->request['currency_code']; $code = $this->request['currency_code'];
$rate = $this->request['currency_rate']; $rate = $this->request['currency_rate'];
$precision = config('money.' . $code . '.precision'); $precision = config('money.currencies.' . $code . '.precision');
$amount = $this->request['amount'] = round($this->request['amount'], $precision); $amount = $this->request['amount'] = round($this->request['amount'], $precision);

2
app/Jobs/Banking/CreateTransfer.php
View File

@ -107,7 +107,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
$currency_rate = $this->request->get($type . '_account_rate'); $currency_rate = $this->request->get($type . '_account_rate');
if (empty($currency_rate)) { if (empty($currency_rate)) {
$currency_rate = config('money.' . $this->getCurrencyCode($type) . '.rate'); $currency_rate = config('money.currencies.' . $this->getCurrencyCode($type) . '.rate');
} }
return $currency_rate; return $currency_rate;

2
app/Jobs/Banking/MatchBankingDocumentTransaction.php
View File

@ -42,7 +42,7 @@ class MatchBankingDocumentTransaction extends Job
$code = $this->transaction->currency_code; $code = $this->transaction->currency_code;
$rate = $this->transaction->currency_rate; $rate = $this->transaction->currency_rate;
$precision = config('money.' . $code . '.precision'); $precision = config('money.currencies.' . $code . '.precision');
$amount = $this->transaction->amount = round($this->transaction->amount, $precision); $amount = $this->transaction->amount = round($this->transaction->amount, $precision);

2
app/Jobs/Banking/SplitTransaction.php
View File

@ -56,7 +56,7 @@ class SplitTransaction extends Job implements ShouldUpdate
$total_amount += $item['amount']; $total_amount += $item['amount'];
} }
$precision = config('money.' . $this->model->currency_code . '.precision'); $precision = config('money.currencies.' . $this->model->currency_code . '.precision');
$compare = bccomp($total_amount, $this->model->amount, $precision); $compare = bccomp($total_amount, $this->model->amount, $precision);

4
app/Jobs/Banking/UpdateBankingDocumentTransaction.php
View File

@ -68,7 +68,7 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
$this->request['company_id'] = $this->model->company_id; $this->request['company_id'] = $this->model->company_id;
$this->request['currency_code'] = $currency_code; $this->request['currency_code'] = $currency_code;
$this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->toDateTimeString(); $this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->toDateTimeString();
$this->request['currency_rate'] = config('money.' . $currency_code . '.rate'); $this->request['currency_rate'] = config('money.currencies.' . $currency_code . '.rate');
$this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account'); $this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account');
$this->request['document_id'] = isset($this->request['document_id']) ? $this->request['document_id'] : $this->model->id; $this->request['document_id'] = isset($this->request['document_id']) ? $this->request['document_id'] : $this->model->id;
$this->request['contact_id'] = isset($this->request['contact_id']) ? $this->request['contact_id'] : $this->model->contact_id; $this->request['contact_id'] = isset($this->request['contact_id']) ? $this->request['contact_id'] : $this->model->contact_id;
@ -82,7 +82,7 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
$code = $this->request['currency_code']; $code = $this->request['currency_code'];
$rate = $this->request['currency_rate']; $rate = $this->request['currency_rate'];
$precision = config('money.' . $code . '.precision'); $precision = config('money.currencies.' . $code . '.precision');
$amount = $this->request['amount'] = round($this->request['amount'], $precision); $amount = $this->request['amount'] = round($this->request['amount'], $precision);

2
app/Jobs/Banking/UpdateTransfer.php
View File

@ -102,7 +102,7 @@ class UpdateTransfer extends Job implements ShouldUpdate
$currency_rate = $this->request->get($type . '_account_rate'); $currency_rate = $this->request->get($type . '_account_rate');
if (empty($currency_rate)) { if (empty($currency_rate)) {
$currency_rate = config('money.' . $this->getCurrencyCode($type) . '.rate'); $currency_rate = config('money.currencies.' . $this->getCurrencyCode($type) . '.rate');
} }
return $currency_rate; return $currency_rate;

2
app/Jobs/Document/CreateDocumentItem.php
View File

@ -29,7 +29,7 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
public function handle(): DocumentItem public function handle(): DocumentItem
{ {
$item_id = ! empty($this->request['item_id']) ? $this->request['item_id'] : 0; $item_id = ! empty($this->request['item_id']) ? $this->request['item_id'] : 0;
$precision = config('money.' . $this->document->currency_code . '.precision'); $precision = config('money.currencies.' . $this->document->currency_code . '.precision');
$item_amount = (double) $this->request['price'] * (double) $this->request['quantity']; $item_amount = (double) $this->request['price'] * (double) $this->request['quantity'];

2
app/Jobs/Document/CreateDocumentItemsAndTotals.php
View File

@ -28,7 +28,7 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
public function handle(): void public function handle(): void
{ {
$precision = config('money.' . $this->document->currency_code . '.precision'); $precision = config('money.currencies.' . $this->document->currency_code . '.precision');
list($sub_total, $actual_total, $discount_amount_total, $taxes) = $this->createItems(); list($sub_total, $actual_total, $discount_amount_total, $taxes) = $this->createItems();

2
app/Models/Banking/Transaction.php
View File

@ -319,7 +319,7 @@ class Transaction extends Model
// Convert amount if not same currency // Convert amount if not same currency
if ($this->account->currency_code != $this->currency_code) { if ($this->account->currency_code != $this->currency_code) {
$to_code = $this->account->currency_code; $to_code = $this->account->currency_code;
$to_rate = config('money.' . $this->account->currency_code . '.rate'); $to_rate = config('money.currencies.' . $this->account->currency_code . '.rate');
$amount = $this->convertBetween($amount, $this->currency_code, $this->currency_rate, $to_code, $to_rate); $amount = $this->convertBetween($amount, $this->currency_code, $this->currency_rate, $to_code, $to_rate);
} }

6
app/Models/Document/Document.php
View File

@ -329,7 +329,7 @@ class Document extends Model
$code = $this->currency_code; $code = $this->currency_code;
$rate = $this->currency_rate; $rate = $this->currency_rate;
$precision = config('money.' . $code . '.precision'); $precision = config('money.currencies.' . $code . '.precision');
if ($this->transactions->count()) { if ($this->transactions->count()) {
foreach ($this->transactions as $transaction) { foreach ($this->transactions as $transaction) {
@ -361,7 +361,7 @@ class Document extends Model
$code = $this->currency_code; $code = $this->currency_code;
$rate = $this->currency_rate; $rate = $this->currency_rate;
$precision = config('money.' . $code . '.precision'); $precision = config('money.currencies.' . $code . '.precision');
if ($this->transactions->count()) { if ($this->transactions->count()) {
foreach ($this->transactions as $transaction) { foreach ($this->transactions as $transaction) {
@ -391,7 +391,7 @@ class Document extends Model
*/ */
public function getAmountDueAttribute() public function getAmountDueAttribute()
{ {
$precision = config('money.' . $this->currency_code . '.precision'); $precision = config('money.currencies.' . $this->currency_code . '.precision');
return round($this->amount - $this->paid, $precision); return round($this->amount - $this->paid, $precision);
} }

10
app/Models/Setting/Currency.php
View File

@ -122,7 +122,7 @@ class Currency extends Model
public function getPrecisionAttribute($value) public function getPrecisionAttribute($value)
{ {
if (is_null($value)) { if (is_null($value)) {
return config('money.' . $this->code . '.precision'); return config('money.currencies.' . $this->code . '.precision');
} }
return (int) $value; return (int) $value;
@ -136,7 +136,7 @@ class Currency extends Model
public function getSymbolAttribute($value) public function getSymbolAttribute($value)
{ {
if (is_null($value)) { if (is_null($value)) {
return config('money.' . $this->code . '.symbol'); return config('money.currencies.' . $this->code . '.symbol');
} }
return $value; return $value;
@ -150,7 +150,7 @@ class Currency extends Model
public function getSymbolFirstAttribute($value) public function getSymbolFirstAttribute($value)
{ {
if (is_null($value)) { if (is_null($value)) {
return config('money.' . $this->code . '.symbol_first'); return config('money.currencies.' . $this->code . '.symbol_first');
} }
return $value; return $value;
@ -164,7 +164,7 @@ class Currency extends Model
public function getDecimalMarkAttribute($value) public function getDecimalMarkAttribute($value)
{ {
if (is_null($value)) { if (is_null($value)) {
return config('money.' . $this->code . '.decimal_mark'); return config('money.currencies.' . $this->code . '.decimal_mark');
} }
return $value; return $value;
@ -178,7 +178,7 @@ class Currency extends Model
public function getThousandsSeparatorAttribute($value) public function getThousandsSeparatorAttribute($value)
{ {
if (is_null($value)) { if (is_null($value)) {
return config('money.' . $this->code . '.thousands_separator'); return config('money.currencies.' . $this->code . '.thousands_separator');
} }
return $value; return $value;

10
app/Traits/Charts.php
View File

@ -98,11 +98,11 @@ trait Charts
public function getChartLabelFormatter($type = 'money', $position = null) public function getChartLabelFormatter($type = 'money', $position = null)
{ {
$label = ''; $label = '';
$decimal_mark = str_replace("'", "\\'", config('money.' . default_currency() . '.decimal_mark')); $decimal_mark = str_replace("'", "\\'", config('money.currencies.' . default_currency() . '.decimal_mark'));
$thousands_separator = str_replace("'", "\\'", config('money.' . default_currency() . '.thousands_separator')); $thousands_separator = str_replace("'", "\\'", config('money.currencies.' . default_currency() . '.thousands_separator'));
$symbol = str_replace("'", "\\'", config('money.' . default_currency() . '.symbol')); $symbol = str_replace("'", "\\'", config('money.currencies.' . default_currency() . '.symbol'));
$symbol_first = str_replace("'", "\\'", config('money.' . default_currency() . '.symbol_first')); $symbol_first = str_replace("'", "\\'", config('money.currencies.' . default_currency() . '.symbol_first'));
$precision = str_replace("'", "\\'", config('money.' . default_currency() . '.precision')); $precision = str_replace("'", "\\'", config('money.currencies.' . default_currency() . '.precision'));
$percent_position = $position ?: setting('localisation.percent_position'); $percent_position = $position ?: setting('localisation.percent_position');
switch ($type) { switch ($type) {

8
app/Traits/Import.php
View File

@ -95,11 +95,11 @@ trait Import
$data = [ $data = [
'company_id' => company_id(), 'company_id' => company_id(),
'code' => $row['currency_code'], 'code' => $row['currency_code'],
'name' => isset($row['currency_name']) ? $row['currency_name'] : config('money.' . $row['currency_code'] . '.name'), 'name' => isset($row['currency_name']) ? $row['currency_name'] : config('money.currencies.' . $row['currency_code'] . '.name'),
'rate' => isset($row['currency_rate']) ? $row['currency_rate'] : 1, 'rate' => isset($row['currency_rate']) ? $row['currency_rate'] : 1,
'symbol' => isset($row['currency_symbol']) ? $row['currency_symbol'] : config('money.' . $row['currency_code'] . '.symbol'), 'symbol' => isset($row['currency_symbol']) ? $row['currency_symbol'] : config('money.currencies.' . $row['currency_code'] . '.symbol'),
'precision' => isset($row['currency_precision']) ? $row['currency_precision'] : config('money.' . $row['currency_code'] . '.precision'), 'precision' => isset($row['currency_precision']) ? $row['currency_precision'] : config('money.currencies.' . $row['currency_code'] . '.precision'),
'decimal_mark' => isset($row['currency_decimal_mark']) ? $row['currency_decimal_mark'] : config('money.' . $row['currency_code'] . '.decimal_mark'), 'decimal_mark' => isset($row['currency_decimal_mark']) ? $row['currency_decimal_mark'] : config('money.currencies.' . $row['currency_code'] . '.decimal_mark'),
'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import', 'created_from' => !empty($row['created_from']) ? $row['created_from'] : $this->getSourcePrefix() . 'import',
'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id, 'created_by' => !empty($row['created_by']) ? $row['created_by'] : user()->id,
]; ];

16
app/Utilities/Overrider.php
View File

@ -73,16 +73,16 @@ class Overrider
$currencies = Currency::all(); $currencies = Currency::all();
foreach ($currencies as $currency) { foreach ($currencies as $currency) {
config(['money.' . $currency->code . '.name' => $currency->name]); config(['money.currencies.' . $currency->code . '.name' => $currency->name]);
config(['money.' . $currency->code . '.rate' => $currency->rate]); config(['money.currencies.' . $currency->code . '.rate' => $currency->rate]);
config(['money.' . $currency->code . '.precision' => $currency->precision]); config(['money.currencies.' . $currency->code . '.precision' => $currency->precision]);
config(['money.' . $currency->code . '.symbol' => $currency->symbol]); config(['money.currencies.' . $currency->code . '.symbol' => $currency->symbol]);
config(['money.' . $currency->code . '.symbol_first' => $currency->symbol_first]); config(['money.currencies.' . $currency->code . '.symbol_first' => $currency->symbol_first]);
config(['money.' . $currency->code . '.decimal_mark' => $currency->decimal_mark]); config(['money.currencies.' . $currency->code . '.decimal_mark' => $currency->decimal_mark]);
config(['money.' . $currency->code . '.thousands_separator' => $currency->thousands_separator]); config(['money.currencies.' . $currency->code . '.thousands_separator' => $currency->thousands_separator]);
} }
// Set currencies with new settings // Set currencies with new settings
\Akaunting\Money\Currency::setCurrencies(config('money')); \Akaunting\Money\Currency::setCurrencies(config('money.currencies'));
} }
} }

2
app/View/Components/Index/Currency.php
View File

@ -38,7 +38,7 @@ class Currency extends Component
{ {
$code = ($this->code) ? $this->code : default_currency(); $code = ($this->code) ? $this->code : default_currency();
$this->currency = config('money.' . $code . '.name'); $this->currency = config('money.currencies.' . $code . '.name');
return view('components.index.currency'); return view('components.index.currency');
} }

4
app/Widgets/CashFlow.php
View File

@ -191,7 +191,7 @@ class CashFlow extends Widget
$totals[$i] += $item->getAmountConvertedToDefault(); $totals[$i] += $item->getAmountConvertedToDefault();
} }
$precision = config('money.' . default_currency() . '.precision'); $precision = config('money.currencies.' . default_currency() . '.precision');
foreach ($totals as $key => $value) { foreach ($totals as $key => $value) {
if ($type == 'expense') { if ($type == 'expense') {
@ -206,7 +206,7 @@ class CashFlow extends Widget
{ {
$profit = []; $profit = [];
$precision = config('money.' . default_currency() . '.precision'); $precision = config('money.currencies.' . default_currency() . '.precision');
foreach ($incomes as $key => $income) { foreach ($incomes as $key => $income) {
$value = $income - abs($expenses[$key]); $value = $income - abs($expenses[$key]);

2
app/Widgets/ProfitLoss.php
View File

@ -195,7 +195,7 @@ class ProfitLoss extends Widget
$totals[$i] += $item->getAmountConvertedToDefault(); $totals[$i] += $item->getAmountConvertedToDefault();
} }
$precision = config('money.' . default_currency() . '.precision'); $precision = config('money.currencies.' . default_currency() . '.precision');
foreach ($totals as $key => $value) { foreach ($totals as $key => $value) {
$totals[$key] = round($value, $precision); $totals[$key] = round($value, $precision);

2
composer.json
View File

@ -33,7 +33,7 @@
"akaunting/laravel-language": "^1.0", "akaunting/laravel-language": "^1.0",
"akaunting/laravel-menu": "^3.0", "akaunting/laravel-menu": "^3.0",
"akaunting/laravel-module": "^3.0", "akaunting/laravel-module": "^3.0",
"akaunting/laravel-money": "^4.0", "akaunting/laravel-money": "^5.0",
"akaunting/laravel-mutable-observer": "^2.0", "akaunting/laravel-mutable-observer": "^2.0",
"akaunting/laravel-setting": "^1.2", "akaunting/laravel-setting": "^1.2",
"akaunting/laravel-sortable": "^2.0", "akaunting/laravel-sortable": "^2.0",

38
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e5aa0bb32c6ddfd816280b738eb71113", "content-hash": "c3f66e10a7d0f5845e1d1a4f99dfced6",
"packages": [ "packages": [
{ {
"name": "akaunting/laravel-apexcharts", "name": "akaunting/laravel-apexcharts",
@ -409,16 +409,16 @@
}, },
{ {
"name": "akaunting/laravel-money", "name": "akaunting/laravel-money",
"version": "4.0.1", "version": "5.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/akaunting/laravel-money.git", "url": "https://github.com/akaunting/laravel-money.git",
"reference": "df99d0f5d415490ef7e79362c3b694e8cc8af903" "reference": "104d41aabc144150054d225fec6b2a0ae8b76d1d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/akaunting/laravel-money/zipball/df99d0f5d415490ef7e79362c3b694e8cc8af903", "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/104d41aabc144150054d225fec6b2a0ae8b76d1d",
"reference": "df99d0f5d415490ef7e79362c3b694e8cc8af903", "reference": "104d41aabc144150054d225fec6b2a0ae8b76d1d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -472,9 +472,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/akaunting/laravel-money/issues", "issues": "https://github.com/akaunting/laravel-money/issues",
"source": "https://github.com/akaunting/laravel-money/tree/4.0.1" "source": "https://github.com/akaunting/laravel-money/tree/5.0.0"
}, },
"time": "2023-03-16T14:39:27+00:00" "time": "2023-07-10T09:34:33+00:00"
}, },
{ {
"name": "akaunting/laravel-mutable-observer", "name": "akaunting/laravel-mutable-observer",
@ -1245,16 +1245,16 @@
}, },
{ {
"name": "barryvdh/reflection-docblock", "name": "barryvdh/reflection-docblock",
"version": "v2.1.0", "version": "v2.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/barryvdh/ReflectionDocBlock.git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
"reference": "bf44b757feb8ba1734659029357646466ded673e" "reference": "e6811e927f0ecc37cc4deaa6627033150343e597"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e", "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/e6811e927f0ecc37cc4deaa6627033150343e597",
"reference": "bf44b757feb8ba1734659029357646466ded673e", "reference": "e6811e927f0ecc37cc4deaa6627033150343e597",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1291,9 +1291,9 @@
} }
], ],
"support": { "support": {
"source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0" "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.1"
}, },
"time": "2022-10-31T15:35:43+00:00" "time": "2023-06-14T05:06:27+00:00"
}, },
{ {
"name": "bkwld/cloner", "name": "bkwld/cloner",
@ -14256,16 +14256,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "10.2.3", "version": "10.2.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "35c8cac1734ede2ae354a6644f7088356ff5b08e" "reference": "68484779b5a2ed711fbdeba6ca01910d87acdff2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35c8cac1734ede2ae354a6644f7088356ff5b08e", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68484779b5a2ed711fbdeba6ca01910d87acdff2",
"reference": "35c8cac1734ede2ae354a6644f7088356ff5b08e", "reference": "68484779b5a2ed711fbdeba6ca01910d87acdff2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -14337,7 +14337,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy", "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.3" "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.4"
}, },
"funding": [ "funding": [
{ {
@ -14353,7 +14353,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-06-30T06:17:38+00:00" "time": "2023-07-10T04:06:08+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

3612
config/money.php
View File

File diff suppressed because it is too large Load Diff

2
database/factories/Currency.php
View File

@ -21,7 +21,7 @@ class Currency extends Factory
*/ */
public function definition() public function definition()
{ {
$currencies = config('money'); $currencies = config('money.currencies');
Model::pluck('code')->each(function ($db_code) use (&$currencies) { Model::pluck('code')->each(function ($db_code) use (&$currencies) {
unset($currencies[$db_code]); unset($currencies[$db_code]);

10
database/seeds/Currencies.php
View File

@ -36,11 +36,11 @@ class Currencies extends Seeder
'code' => 'USD', 'code' => 'USD',
'rate' => '1.00', 'rate' => '1.00',
'enabled' => '1', 'enabled' => '1',
'precision' => config('money.USD.precision'), 'precision' => config('money.currencies.USD.precision'),
'symbol' => config('money.USD.symbol'), 'symbol' => config('money.currencies.USD.symbol'),
'symbol_first' => config('money.USD.symbol_first'), 'symbol_first' => config('money.currencies.USD.symbol_first'),
'decimal_mark' => config('money.USD.decimal_mark'), 'decimal_mark' => config('money.currencies.USD.decimal_mark'),
'thousands_separator' => config('money.USD.thousands_separator'), 'thousands_separator' => config('money.currencies.USD.thousands_separator'),
], ],
]; ];

8
tests/Feature/PaymentTestCase.php
View File

@ -75,13 +75,13 @@ class PaymentTestCase extends FeatureTestCase
} elseif ($this->invoice_currency != null) { } elseif ($this->invoice_currency != null) {
$this->dispatch(new CreateCurrency([ $this->dispatch(new CreateCurrency([
'company_id' => company_id(), 'company_id' => company_id(),
'name' => config('money.' . $this->invoice_currency . '.name'), 'name' => config('money.currencies.' . $this->invoice_currency . '.name'),
'code' => $this->invoice_currency, 'code' => $this->invoice_currency,
'rate' => config(['money.' . $this->invoice_currency . '.rate' => 1]), 'rate' => config(['money.' . $this->invoice_currency . '.rate' => 1]),
'enabled' => 1, 'enabled' => 1,
'symbol_first' => config('money.' . $this->invoice_currency . '.symbol_first'), 'symbol_first' => config('money.currencies.' . $this->invoice_currency . '.symbol_first'),
'decimal_mark' => config('money.' . $this->invoice_currency . '.decimal_mark'), 'decimal_mark' => config('money.currencies.' . $this->invoice_currency . '.decimal_mark'),
'thousands_separator' => config('money.' . $this->invoice_currency . '.thousands_separator'), 'thousands_separator' => config('money.currencies.' . $this->invoice_currency . '.thousands_separator'),
'default_currency' => true, 'default_currency' => true,
])); ]));
} }