Allow user to set multi-currency available budget. WIP

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -24,15 +24,23 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Budget;
 
 
+use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Log;
 
 /**
  *
@@ -40,6 +48,7 @@ use Illuminate\Http\Request;
  */
 class BudgetLimitController extends Controller
 {
+    use DateCalculation;
 
     /** @var AvailableBudgetRepositoryInterface */
     private $abRepository;
@@ -73,6 +82,35 @@ class BudgetLimitController extends Controller
         );
     }
 
+    /**
+     * @param Budget $budget
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function create(Budget $budget, Carbon $start, Carbon $end)
+    {
+        $collection   = $this->currencyRepos->getEnabled();
+        $budgetLimits = $this->blRepository->getBudgetLimits($budget, $start, $end);
+
+        // remove already budgeted currencies:
+        $currencies = $collection->filter(
+            static function (TransactionCurrency $currency) use ($budgetLimits) {
+                /** @var AvailableBudget $budget */
+                foreach ($budgetLimits as $budget) {
+                    if ($budget->transaction_currency_id === $currency->id) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+        );
+
+        return view('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
+    }
+
     /**
      * @param Request     $request
      * @param BudgetLimit $budgetLimit
@@ -90,21 +128,62 @@ class BudgetLimitController extends Controller
     /**
      * @param Request $request
      *
-     * @return JsonResponse
+     * @return JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @throws FireflyException
      */
-    public function store(Request $request): JsonResponse
+    public function store(Request $request)
     {
-        $limit = $this->blRepository->store(
-            [
-                'budget_id'               => $request->get('budget_id'),
-                'transaction_currency_id' => $request->get('transaction_currency_id'),
-                'start_date'              => $request->get('start'),
-                'end_date'                => $request->get('end'),
-                'amount'                  => $request->get('amount'),
-            ]
-        );
+        // first search for existing one and update it if necessary.
+        $currency = $this->currencyRepos->find((int)$request->get('transaction_currency_id'));
+        $budget   = $this->repository->findNull((int)$request->get('budget_id'));
+        if (null === $currency || null === $budget) {
+            throw new FireflyException('No valid currency or budget.');
+        }
+        $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
+        $end   = Carbon::createFromFormat('Y-m-d', $request->get('end'));
+        $start->startOfDay();
+        $end->endOfDay();
 
-        return response()->json($limit->toArray());
+
+        Log::debug(sprintf('Start: %s, end: %s', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+
+        $limit = $this->blRepository->find($budget, $currency, $start, $end);
+        if (null !== $limit) {
+            $limit->amount = $request->get('amount');
+            $limit->save();
+        }
+        if (null === $limit) {
+            $limit = $this->blRepository->store(
+                [
+                    'budget_id'               => $request->get('budget_id'),
+                    'transaction_currency_id' => $request->get('transaction_currency_id'),
+                    'start_date'              => $request->get('start'),
+                    'end_date'                => $request->get('end'),
+                    'amount'                  => $request->get('amount'),
+                ]
+            );
+        }
+
+        if ($request->expectsJson()) {
+            $array = $limit->toArray();
+
+
+            // add some extra meta data:
+            $spentArr                  = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
+            $array['spent']            = $spentArr[$currency->id]['sum'] ?? '0';
+            $array['left_formatted']   = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
+            $array['amount_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
+            $array['days_left']        = (string)$this->activeDaysLeft($start, $end);
+            // left per day:
+            $array['left_per_day'] = bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
+
+            // left per day formatted.
+            $array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
+
+            return response()->json($array);
+        }
+
+        return redirect(route('budgets.index'));
     }
 
     /**

app/Http/Controllers/Budget/IndexController.php

@@ -149,6 +149,7 @@ class IndexController extends Controller
         // number of days for consistent budgeting.
         $activeDaysPassed = $this->activeDaysPassed($start, $end); // see method description.
         $activeDaysLeft   = $this->activeDaysLeft($start, $end); // see method description.
+        Log::debug(sprintf('Start: %s, end: %s', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
 
         // get all budgets, and paginate them into $budgets.
         $collection = $this->repository->getActiveBudgets();
@@ -221,18 +222,14 @@ class IndexController extends Controller
     public function reorder(Request $request, BudgetRepositoryInterface $repository): JsonResponse
     {
         $budgetIds = $request->get('budgetIds');
-        $page      = (int)$request->get('page');
-        $pageSize  = (int)app('preferences')->get('listPageSize', 50)->data;
 
-        $currentOrder = (($page - 1) * $pageSize) + 1;
-        foreach ($budgetIds as $budgetId) {
+        foreach ($budgetIds as $index => $budgetId) {
             $budgetId = (int)$budgetId;
             $budget   = $repository->findNull($budgetId);
             if (null !== $budget) {
-                Log::debug(sprintf('Set budget #%d ("%s") to position %d', $budget->id, $budget->name, $currentOrder));
-                $repository->setBudgetOrder($budget, $currentOrder);
+                Log::debug(sprintf('Set budget #%d ("%s") to position %d', $budget->id, $budget->name, $index + 1));
+                $repository->setBudgetOrder($budget, $index + 1);
             }
-            $currentOrder++;
         }
 
         return response()->json(['OK']);