Initial user ability to set foreign currency

app/Http/Controllers/JavascriptController.php

@@ -15,6 +15,7 @@ use Amount;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Http\Request;
@@ -29,7 +30,6 @@ use Session;
  */
 class JavascriptController extends Controller
 {
-
     /**
      * @param AccountRepositoryInterface  $repository
      * @param CurrencyRepositoryInterface $currencyRepository
@@ -50,7 +50,7 @@ class JavascriptController extends Controller
             $accountId                    = $account->id;
             $currency                     = intval($account->getMeta('currency_id'));
             $currency                     = $currency === 0 ? $default->id : $currency;
-            $entry                        = ['preferredCurrency' => $currency];
+            $entry                        = ['preferredCurrency' => $currency, 'name' => $account->name];
             $data['accounts'][$accountId] = $entry;
         }
 
@@ -60,6 +60,27 @@ class JavascriptController extends Controller
             ->header('Content-Type', 'text/javascript');
     }
 
+    /**
+     * @param CurrencyRepositoryInterface $repository
+     *
+     * @return $this
+     */
+    public function currencies(CurrencyRepositoryInterface $repository)
+    {
+        $currencies = $repository->get();
+        $data       = ['currencies' => [],];
+        /** @var TransactionCurrency $currency */
+        foreach ($currencies as $currency) {
+            $currencyId                    = $currency->id;
+            $entry                         = ['name' => $currency->name, 'code' => $currency->code, 'symbol' => $currency->symbol];
+            $data['currencies'][$currencyId] = $entry;
+        }
+
+        return response()
+            ->view('javascript.currencies', $data, 200)
+            ->header('Content-Type', 'text/javascript');
+    }
+
     /**
      * @param Request $request
      *

app/Http/Controllers/Json/ExchangeController.php

@@ -14,10 +14,12 @@ namespace FireflyIII\Http\Controllers\Json;
 
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Currency\ExchangeRateInterface;
 use Illuminate\Http\Request;
+use Log;
 use Response;
 
 /**
@@ -42,6 +44,7 @@ class ExchangeController extends Controller
         $rate       = $repository->getExchangeRate($fromCurrency, $toCurrency, $date);
         $amount     = null;
         if (is_null($rate->id)) {
+            Log::debug(sprintf('No cached exchange rate in database for %s to %s on %s', $fromCurrency->code, $toCurrency->code, $date->format('Y-m-d')));
             $preferred = env('EXCHANGE_RATE_SERVICE', config('firefly.preferred_exchange_service'));
             $class     = config('firefly.currency_exchange_services.' . $preferred);
             /** @var ExchangeRateInterface $object */
@@ -53,7 +56,9 @@ class ExchangeController extends Controller
         $return['amount'] = null;
         if (!is_null($request->get('amount'))) {
             // assume amount is in "from" currency:
-            $return['amount'] = bcmul($request->get('amount'), strval($rate->rate));
+            $return['amount'] = bcmul($request->get('amount'), strval($rate->rate), 12);
+            // round to toCurrency decimal places:
+            $return['amount'] = round($return['amount'], $toCurrency->decimal_places);
         }
 
         return Response::json($return);

app/Repositories/Currency/CurrencyRepository.php

@@ -20,6 +20,7 @@ use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use Log;
 use Preferences;
 
 /**
@@ -189,11 +190,21 @@ class CurrencyRepository implements CurrencyRepositoryInterface
      */
     public function getExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date): CurrencyExchangeRate
     {
+        if ($fromCurrency->id === $toCurrency->id) {
+            $rate       = new CurrencyExchangeRate;
+            $rate->rate = 1;
+            $rate->id   = 0;
+
+            return $rate;
+        }
+
         $rate = $this->user->currencyExchangeRates()
                            ->where('from_currency_id', $fromCurrency->id)
                            ->where('to_currency_id', $toCurrency->id)
                            ->where('date', $date->format('Y-m-d'))->first();
         if (!is_null($rate)) {
+            Log::debug(sprintf('Found cached exchange rate in database for %s to %s on %s', $fromCurrency->code, $toCurrency->code, $date->format('Y-m-d')));
+
             return $rate;
         }
 

app/Support/ExpandedForm.php

@@ -261,6 +261,37 @@ class ExpandedForm
         return $html;
     }
 
+    /**
+     * @param string $name
+     * @param null   $value
+     * @param array  $options
+     *
+     * @return string
+     */
+    public function nonSelectableAmount(string $name, $value = null, array $options = []): string
+    {
+        $label            = $this->label($name, $options);
+        $options          = $this->expandOptionArray($name, $label, $options);
+        $classes          = $this->getHolderClasses($name);
+        $value            = $this->fillFieldValue($name, $value);
+        $options['step']  = 'any';
+        $options['min']  = '0.01';
+        $selectedCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
+        unset($options['currency']);
+        unset($options['placeholder']);
+
+        // make sure value is formatted nicely:
+        if (!is_null($value) && $value !== '') {
+            $value = round($value, $selectedCurrency->decimal_places);
+        }
+
+
+        $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+    }
+
+
     /**
      * @param string $name
      * @param null   $value
@@ -270,7 +301,6 @@ class ExpandedForm
      */
     public function nonSelectableBalance(string $name, $value = null, array $options = []): string
     {
-
         $label            = $this->label($name, $options);
         $options          = $this->expandOptionArray($name, $label, $options);
         $classes          = $this->getHolderClasses($name);
@@ -286,7 +316,7 @@ class ExpandedForm
         }
 
 
-        $html = view('form.non-selectable-balance', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
+        $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
 
         return $html;
     }