Fix a problem in merge conflict done wrong

This commit is contained in:
Dillon Ngo
2024-06-22 13:06:31 +08:00
parent 7f5d5e769e
commit 172e326a35
@@ -13,7 +13,7 @@
<div class="col">
<div class="d-flex align-items-center h-100">
<span class="btn btn-md fs-11 bg-primary text-white fs-12 m-r-5" :class="[{'bg-primary-darker': showingPreciseAmount}]" @click="showingPreciseAmount=!showingPreciseAmount">{{ showingPreciseAmount ? 'Showing Precise Transaction' : 'Show Precise Transaction'}}</span>
<a v-if="this.id" @click="downloadTransaction(item)" target="_blank" class="btn btn-md btn-primary fs-11"><i class="fa fa-download m-r-5"></i>{{ showingPreciseAmount ? 'Download Precise Transaction' : 'Download Transaction'}}</a>
<a v-if="this.id" @click="downloadTransaction(this, showingPreciseAmount)" target="_blank" class="btn btn-md btn-primary fs-11"><i class="fa fa-download m-r-5"></i>{{ showingPreciseAmount ? 'Download Precise Transaction' : 'Download Transaction'}}</a>
</div>
</div>
<div class="col-2">
@@ -128,8 +128,8 @@ export default {
this.key ++;
},
downloadTransaction(paramItem) {
let url = this.route('company.transaction.export', this.id, showingPreciseAmount);
downloadTransaction(paramItem, showingPreciseAmount) {
let url = this.route('company.transaction.export', paramItem.id, showingPreciseAmount);
if(window.LARAVEL_VAPOR_ENABLED){
return fetch(url, {
method: 'GET',