Transfer edit fixed currency rate #nz9k0y

akaunting · Jul 29, 2021 · 091f3d7 · 091f3d7
1 parent 64b640e
commit 091f3d7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 7 deletions.
diff --git a/resources/assets/js/views/banking/transfers.js b/resources/assets/js/views/banking/transfers.js
@@ -30,6 +30,11 @@ const app = new Vue({
             form: new Form('transfer'),
             bulk_action: new BulkAction('transfers'),
             show_rate: false,
+            edit: {
+                status: false,
+                form_account: false,
+                to_account: false,
+            },
 
             transfer_form: new Form('template'),
             template: {
@@ -48,6 +53,11 @@ const app = new Vue({
                 return;
             }
 
+            if (this.edit.status && this.edit.form_account < 2) {
+                this.edit.form_account++;
+                return;
+            }
+
             let from_promise = Promise.resolve(window.axios.get(url + '/banking/accounts/currency', {
                 params: {
                     account_id: from_account_id
@@ -77,6 +87,11 @@ const app = new Vue({
                 return;
             }
 
+            if (this.edit.status && this.edit.to_account < 2) {
+                this.edit.to_account++;
+                return;
+            }
+
             let to_promise = Promise.resolve(window.axios.get(url + '/banking/accounts/currency', {
                 params: {
                     account_id: to_account_id
@@ -126,5 +141,15 @@ const app = new Vue({
                 errors: this.transfer_form.errors
             };
         },
-    }
+    },
+
+    created() {
+        if (typeof transfer_edit !== 'undefined' && transfer_edit) {
+            this.show_rate = true;
+
+            this.edit.status = true;
+            this.edit.form_account = 1;
+            this.edit.to_account = 1;
+        }
+    },
 });
diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php
@@ -22,15 +22,27 @@
 
                     {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts, $transfer->to_account_id, ['required' => 'required', 'change' => 'onChangeToAccount']) }}
 
-                    <div class="d-none w-100" :class="[{'d-flex' : show_rate}]">
-                        {!! Form::hidden('from_currency_code', $transfer->from_currency_code, ['id' => 'from_currency_code', 'v-model' => 'form.from_currency_code']) !!}
+                    @if ($transfer->from_currency_code != $transfer->to_currency_code)
+                        <div class="w-100" :class="[show_rate ? 'd-flex' : 'd-none']">
+                            {!! Form::hidden('from_currency_code', $transfer->from_currency_code, ['id' => 'from_currency_code', 'v-model' => 'form.from_currency_code']) !!}
 
-                        {{ Form::textGroup('from_account_rate', trans('transfers.from_account_rate'), 'sliders-h', [':disabled' => "form.from_currency_code == '" . setting('default.currency') . "'"], $transfer->from_account_rate) }}
+                            {{ Form::textGroup('from_account_rate', trans('transfers.from_account_rate'), 'sliders-h', [':disabled' => "form.from_currency_code == '" . setting('default.currency') . "'"], $transfer->from_account_rate) }}
 
-                        {!! Form::hidden('to_currency_code', $transfer->to_currency_code, ['id' => 'to_currency_code', 'v-model' => 'form.to_currency_code']) !!}
+                            {!! Form::hidden('to_currency_code', $transfer->to_currency_code, ['id' => 'to_currency_code', 'v-model' => 'form.to_currency_code']) !!}
 
-                        {{ Form::textGroup('to_account_rate', trans('transfers.to_account_rate'), 'sliders-h', [':disabled' => "form.to_currency_code == '" . setting('default.currency') . "'"], $transfer->to_account_rate) }}
-                    </div>
+                            {{ Form::textGroup('to_account_rate', trans('transfers.to_account_rate'), 'sliders-h', [':disabled' => "form.to_currency_code == '" . setting('default.currency') . "'"], $transfer->to_account_rate) }}
+                        </div>
+                    @else
+                        <div class="d-none w-100" :class="[{'d-flex' : show_rate}]">
+                            {!! Form::hidden('from_currency_code', $transfer->from_currency_code, ['id' => 'from_currency_code', 'v-model' => 'form.from_currency_code']) !!}
+
+                            {{ Form::textGroup('from_account_rate', trans('transfers.from_account_rate'), 'sliders-h', [':disabled' => "form.from_currency_code == '" . setting('default.currency') . "'"], $transfer->from_account_rate) }}
+
+                            {!! Form::hidden('to_currency_code', $transfer->to_currency_code, ['id' => 'to_currency_code', 'v-model' => 'form.to_currency_code']) !!}
+
+                            {{ Form::textGroup('to_account_rate', trans('transfers.to_account_rate'), 'sliders-h', [':disabled' => "form.to_currency_code == '" . setting('default.currency') . "'"], $transfer->to_account_rate) }}
+                        </div>
+                    @endif
 
                     {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], $transfer->amount) }}
 
@@ -61,5 +73,9 @@
 @endsection
 
 @push('scripts_start')
+    <script type="text/javascript">
+        var transfer_edit = {{ $transfer->id }};
+    </script>
+
     <script src="{{ asset('public/js/banking/transfers.js?v=' . version('short')) }}"></script>
 @endpush