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

Document form currency invalid issue solved. #rvqttv

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-10-05 11:16:12 +03:00
parent 3fbe4691f5
commit c54c078e87
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Abstracts/View/Components/DocumentForm.php
View File

@ -250,7 +250,7 @@ abstract class DocumentForm extends Base
$this->document = $document; $this->document = $document;
$this->currencies = $this->getCurrencies($currencies); $this->currencies = $this->getCurrencies($currencies);
$this->currency = $this->getCurrency($document, $currency, $currency_code); $this->currency = $this->getCurrency($document, $currency, $currency_code);
$this->currency_code = $this->currency->code; $this->currency_code = !empty($this->currency) ? $this->currency->code : setting('default.currency');
/** Advanced Component Start */ /** Advanced Component Start */
$this->categoryType = $this->getCategoryType($type, $categoryType); $this->categoryType = $this->getCategoryType($type, $categoryType);
@ -348,14 +348,18 @@ abstract class DocumentForm extends Base
} }
if (!empty($currency_code)) { if (!empty($currency_code)) {
return Currency::where('code', $currency_code)->first(); $currency = Currency::where('code', $currency_code)->first();
} }
if (!empty($document)) { if (empty($currency) && !empty($document)) {
return Currency::where('code', $document->currency_code)->first(); $currency = Currency::where('code', $document->currency_code)->first();
} }
return Currency::where('code', setting('default.currency'))->first(); if (empty($currency)) {
$currency = Currency::where('code', setting('default.currency'))->first();
}
return $currency;
} }
protected function getRouteStore($type, $routeStore) protected function getRouteStore($type, $routeStore)