kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Add ability to set some transaction flags. Fixes #6526

Browse Source
This commit is contained in:
James Cole
2022-10-22 07:30:12 +02:00
parent 4ad666d964
commit d31fa743d0
5 changed files with 349 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

503
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@@ -9,7 +9,8 @@
"prod": "mix --production" "prod": "mix --production"
}, },
"dependencies": { "dependencies": {
"date-fns": "^2.28.0" "date-fns": "^2.29.3",
"stream-browserify": "^3.0.0"
}, },
"devDependencies": { "devDependencies": {
"@johmun/vue-tags-input": "^2", "@johmun/vue-tags-input": "^2",
@@ -26,8 +27,5 @@
"vue-i18n": "^8", "vue-i18n": "^8",
"vue-loader": "^15", "vue-loader": "^15",
"vue-template-compiler": "^2.7" "vue-template-compiler": "^2.7"
},
"dependencies": {
"stream-browserify": "^3.0.0"
} }
} }

28
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@@ -229,6 +229,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
{{ $t('firefly.submission_options') }}
</h3>
</div>
<div class="box-body">
<div class="checkbox">
<label>
<input v-model="applyRules" name="apply_rules" type="checkbox">
{{ $t('firefly.apply_rules_checkbox') }}
</label>
</div>
<div class="checkbox">
<label>
<input v-model="fireWebhooks" name="fire_webhooks" type="checkbox">
{{ $t('firefly.fire_webhooks_checkbox') }}
</label>
</div>
</div>
</div>
</div>
</div> </div>
</form> </form>
</template> </template>
@@ -293,6 +317,8 @@ export default {
convertData: function () { convertData: function () {
// console.log('Now in convertData()'); // console.log('Now in convertData()');
let data = { let data = {
'apply_rules': this.applyRules,
'fire_webhooks': this.fireWebhooks,
'transactions': [], 'transactions': [],
}; };
let transactionType; let transactionType;
@@ -966,6 +992,8 @@ export default {
cash_account_id: 0, cash_account_id: 0,
createAnother: false, createAnother: false,
resetFormAfter: false, resetFormAfter: false,
fireWebhooks: true,
applyRules: true,
resetButtonDisabled: true, resetButtonDisabled: true,
attachmentCount: 0, attachmentCount: 0,
}; };

28
resources/assets/js/components/transactions/EditTransaction.vue
View File

@@ -232,6 +232,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">
{{ $t('firefly.submission_options') }}
</h3>
</div>
<div class="box-body">
<div class="checkbox">
<label>
<input v-model="applyRules" name="apply_rules" type="checkbox">
{{ $t('firefly.apply_rules_checkbox') }}
</label>
</div>
<div class="checkbox">
<label>
<input v-model="fireWebhooks" name="fire_webhooks" type="checkbox">
{{ $t('firefly.fire_webhooks_checkbox') }}
</label>
</div>
</div>
</div>
</div>
</div> </div>
</form> </form>
</template> </template>
@@ -494,6 +518,8 @@ export default {
}, },
convertData: function () { convertData: function () {
let data = { let data = {
'apply_rules': this.applyRules,
'fire_webhooks': this.fireWebhooks,
'transactions': [], 'transactions': [],
}; };
let transactionType; let transactionType;
@@ -1032,6 +1058,8 @@ export default {
data() { data() {
return { return {
applyRules: true,
fireWebhooks: true,
group: this.groupId, group: this.groupId,
error_message: "", error_message: "",
success_message: "", success_message: "",

2
yarn.lock
View File

@@ -2357,7 +2357,7 @@ csstype@^3.1.0:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
date-fns@^2.28.0: date-fns@^2.29.3:
version "2.29.3" version "2.29.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==