mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-22 22:13:59 +00:00
Fix a problem in merge conflict done wrong
This commit is contained in:
+3
-3
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user