From d2fa8d8d34f33d77e41e2e6cc10644b84dfdb1a6 Mon Sep 17 00:00:00 2001
From: Jesus Guerrero <jesusant.guerrero@gmail.com>
Date: Sun, 10 Mar 2024 16:47:59 -0400
Subject: [PATCH] fix: allow just ready to assign as inflow category (#368)

---
 app/Listeners/UpdateBudgetAvailable.php       | 26 ++++++++++++++++
 app/Providers/EventServiceProvider.php        | 13 ++++----
 resources/js/Components/atoms/LogerButton.vue |  2 +-
 .../components/TransactionItems.vue           | 30 ++++++++++++++-----
 .../components/TransactionModal.vue           |  1 +
 5 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 app/Listeners/UpdateBudgetAvailable.php

diff --git a/app/Listeners/UpdateBudgetAvailable.php b/app/Listeners/UpdateBudgetAvailable.php
new file mode 100644
index 00000000..55e4b01f
--- /dev/null
+++ b/app/Listeners/UpdateBudgetAvailable.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\BudgetAssigned;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Domains\Budget\Services\BudgetCategoryService;
+use App\Domains\Budget\Services\BudgetRolloverService;
+
+class UpdateBudgetAvailable implements ShouldQueue
+{
+    protected $formData;
+
+
+    public function __construct()
+    {
+
+    }
+
+    public function handle($event)
+    {
+        $teamId = $event->transaction->team_id;
+        $date = $event->transaction->date;
+        (new BudgetRolloverService(new BudgetCategoryService()))->startFrom($teamId, substr($date, 0, 7));
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 8c58a483..95db0d81 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -16,6 +16,7 @@
 use App\Listeners\CreateBudgetCategory;
 use App\Listeners\CreateBudgetMovement;
 use App\Listeners\CreateStartingBalance;
+use App\Listeners\UpdateBudgetAvailable;
 use Insane\Journal\Events\AccountCreated;
 use Insane\Journal\Events\AccountUpdated;
 use Laravel\Jetstream\Events\TeamCreated;
@@ -23,6 +24,9 @@
 use App\Listeners\HandleTransactionCreated;
 use App\Listeners\CreateOccurrenceAutomation;
 use Insane\Journal\Events\TransactionCreated;
+use Insane\Journal\Events\TransactionDeleted;
+use Insane\Journal\Events\TransactionUpdated;
+use Laravel\Jetstream\Events\TeamMemberAdded;
 use Insane\Journal\Listeners\CreateTeamAccounts;
 use App\Listeners\CreateBudgetTransactionMovement;
 use App\Domains\Transaction\Listeners\UpdateOpenReconciliations;
@@ -54,28 +58,25 @@ class EventServiceProvider extends ServiceProvider
         AccountCreated::class => [
             CreateBudgetCategory::class,
             CreateStartingBalance::class,
-            CreateBudgetMovement::class,
         ],
         AccountUpdated::class => [
             CreateBudgetCategory::class,
-            CreateBudgetMovement::class,
         ],
         TransactionCreated::class => [
             CreateBudgetTransactionMovement::class,
             HandleTransactionCreated::class,
             CheckOccurrence::class,
             UpdateOpenReconciliations::class,
-            CreateBudgetMovement::class,
+            UpdateBudgetAvailable::class,
         ],
         TransactionUpdated::class => [
             CreateBudgetTransactionMovement::class,
-            CreateBudgetMovement::class,
+            UpdateBudgetAvailable::class,
         ],
         TransactionDeleted::class => [
             CreateBudgetTransactionMovement::class,
-            CreateBudgetMovement::class,
+            UpdateBudgetAvailable::class,
         ],
-        // App events
         AppCreated::class => [
             ShowInApp::class,
         ],
diff --git a/resources/js/Components/atoms/LogerButton.vue b/resources/js/Components/atoms/LogerButton.vue
index 4a884461..b8951b90 100644
--- a/resources/js/Components/atoms/LogerButton.vue
+++ b/resources/js/Components/atoms/LogerButton.vue
@@ -18,7 +18,7 @@ export type ButtonVariants = keyof typeof variants;
 const props = withDefaults(defineProps<{
     variant: ButtonVariants,
     as?: Object| string,
-    processing: boolean,
+    processing?: boolean,
     disabled?: boolean
     icon?: string | Object
 }>(), {
diff --git a/resources/js/domains/transactions/components/TransactionItems.vue b/resources/js/domains/transactions/components/TransactionItems.vue
index e34253c2..ceb5b053 100644
--- a/resources/js/domains/transactions/components/TransactionItems.vue
+++ b/resources/js/domains/transactions/components/TransactionItems.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { reactive, computed, inject, ref } from "vue";
-// @ts-expect-error: no definitions
 import { AtField } from "atmosphere-ui";
 import { NSelect } from "naive-ui";
 
@@ -11,6 +10,7 @@ import CategoryPicker from "./CategoryPicker.vue";
 import { IAccount, ICategory } from "../models";
 import { formatMoney } from "@/utils";
 import LogerInput from "@/Components/atoms/LogerInput.vue";
+import { TRANSACTION_DIRECTIONS } from "..";
 
 interface SplitItem {
     payee_id: null|number,
@@ -20,8 +20,9 @@ interface SplitItem {
     category_id: null|number,
     counter_account_id: null|number,
     account_id: null|number,
-    amount: number,
-    history: string|number[]
+    amount: string,
+    history: string|number[];
+    concept: string;
 }
 
 const props = defineProps<{
@@ -29,7 +30,8 @@ const props = defineProps<{
   categories: ICategory[],
   accounts: IAccount[],
   isTransfer: boolean
-  fullHeight: boolean
+  fullHeight: boolean;
+  mode?: string;
 }>();
 const accountLabel = computed(() => {
   return !props.isTransfer ? "Account" : "Source";
@@ -46,7 +48,15 @@ const categoryOptions = inject("categoryOptions", []);
 const accountsOptions = inject("accountsOptions", []);
 
 const categoryAccounts = computed(() => {
-  return props.isTransfer ? accountsOptions : categoryOptions;
+    if (props.isTransfer) {
+        return accountsOptions;
+
+    } else {
+        return categoryOptions.filter((category) => {
+            const isInflow = props.mode == TRANSACTION_DIRECTIONS.DEPOSIT;
+            return (isInflow && category.display_id == "inflow") || !isInflow; 
+        });
+    }
 });
 
 const splits = reactive<SplitItem[]>(props.items ?? []);
@@ -65,8 +75,8 @@ const defaultRow = {
 };
 
 const splitsTotal = computed(() =>
-    splits.reduce((total: number, splitItem: Record<string, string>): number => {
-        return total + parseFloat(splitItem.amount ?? 0);
+    splits.reduce((total: number, splitItem): number => {
+        return total + parseFloat(splitItem.amount ?? "0");
     }, 0)
 )
 
@@ -205,7 +215,11 @@ const isPickerOpen = ref(false);
       </footer>
     </section>
 
-    <LogerButton variant="neutral" @click="addSplit()" v-if="!isTransfer">
+    <LogerButton 
+        v-if="!isTransfer"
+        variant="neutral" 
+        @click="addSplit()" 
+    >
       <IMdiCallSplit />
       Add split
     </LogerButton>
diff --git a/resources/js/domains/transactions/components/TransactionModal.vue b/resources/js/domains/transactions/components/TransactionModal.vue
index c1a2a348..f191917d 100644
--- a/resources/js/domains/transactions/components/TransactionModal.vue
+++ b/resources/js/domains/transactions/components/TransactionModal.vue
@@ -312,6 +312,7 @@ const saveText = computed(() => {
                 ref="gridSplitsRef"
                 :items="splits"
                 :is-transfer="isTransfer"
+                :mode="form.direction"
                 :categories="categoryOptions"
                 :accounts="accountOptions"
                 :full-height="fullHeight"