Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements

resources/assets/js/views/common/companies.js

@@ -30,5 +30,22 @@ const app = new Vue({
             form: new Form('company'),
             bulk_action: new BulkAction('companies')
         }
+    },
+
+    methods: {
+        // Form Submit
+        onSubmit() {
+            this.form.loading = true;
+
+            if (this.form.country === "") {
+                this.form.errors.set('country', [country_validation_required_message]);
+
+                this.form.loading = false;
+
+                return;
+            }
+
+            this.form.submit();
+        },
     }
 });

resources/assets/js/views/common/documents.js

@@ -696,7 +696,7 @@ const app = new Vue({
 
             let payment = {
                 modal: false,
-                url: url + '/modals/documents/' + document_id + '/transactions/edit/' + transaction_id,
+                url: url + '/modals/documents/' + document_id + '/transactions/' + transaction_id + '/edit',
                 title: '',
                 html: '',
                 buttons:{}