diff --git a/frontend/src/components/transactions/Edit.vue b/frontend/src/components/transactions/Edit.vue index 0a11adb05f..00b39950e6 100644 --- a/frontend/src/components/transactions/Edit.vue +++ b/frontend/src/components/transactions/Edit.vue @@ -383,8 +383,7 @@ export default { linkDirection = 'outward'; } // add meta data to promise context. - promises.push(new Promise((resolve) => { - resolve( + promises.push(Promise.resolve( { link: link, journalId: journalId, @@ -392,8 +391,8 @@ export default { index: index, direction: linkDirection } - ); - })); + )); + // get stuff from the API: promises.push(axios.get('./api/v1/transaction-journals/' + opposingId)); @@ -700,9 +699,7 @@ export default { // console.log(submission); if (!shouldSubmit) { // console.log('No need to submit transaction.'); - return new Promise((resolve) => { - resolve({}); - }); + return Promise.resolve({}); } const url = './api/v1/transactions/' + this.groupId; return axios.put(url, submission); @@ -733,21 +730,13 @@ export default { } } journals = journals.reverse(); - return new Promise((resolve) => { - resolve( - { - journals: journals, - } - ); - }); + return Promise.resolve({journals:journals}); }, submitLinks: function (shouldSubmit) { //console.log('submitLinks()'); if (!shouldSubmit) { //console.log('no need!'); - return new Promise((resolve) => { - resolve({}); - }); + return Promise.resolve({}); } return this.deleteAllOriginalLinks().then(() => this.submitNewLinks()); }, @@ -756,9 +745,7 @@ export default { if (!shouldSubmit) { // console.log('no need!'); this.submittedAttachments = 1; - return new Promise((resolve) => { - resolve({}); - }); + return Promise.resolve({}); } //console.log('Do upload thing!'); //console.log(response); @@ -1074,9 +1061,7 @@ export default { promises.push(this.deleteOriginalLinks(originalTransaction)); } } else { - promises.push(new Promise((resolve) => { - resolve({}); - })); + promises.push(Promise.resolve({})); } } } diff --git a/frontend/src/components/transactions/Index.vue b/frontend/src/components/transactions/Index.vue index ad0c736423..d35a163563 100644 --- a/frontend/src/components/transactions/Index.vue +++ b/frontend/src/components/transactions/Index.vue @@ -21,7 +21,23 @@ @@ -121,9 +140,16 @@ +
+
+
+ Box previous period +
+
+
-
+
+
+ (refresh) +
diff --git a/resources/views/v2/transactions/indexx.twig b/resources/views/v2/transactions/index.twig similarity index 100% rename from resources/views/v2/transactions/indexx.twig rename to resources/views/v2/transactions/index.twig