mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
Merge branch 'fix-admin-CO-currency-dropdown' into 'master'
fix: Currency drop-down issue in Admin Currency Order. See merge request CIEFWorldwideSdnBhd/exchange-2.0!20
This commit is contained in:
+7
-5
@@ -42,7 +42,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4 p-r-0">
|
||||
<div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedCurrency.status = !selectedCurrency.status">
|
||||
<div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="currencyDropdownLaunch.status = ! currencyDropdownLaunch.status">
|
||||
<div class="row">
|
||||
<div class="col p-t-5 p-b-5">
|
||||
{{selectedCurrency.short_code}}
|
||||
@@ -50,14 +50,14 @@
|
||||
<div class="col-auto b-l b-primary">
|
||||
<div class="row h-100 align-items-center">
|
||||
<div class="col">
|
||||
<i class="fa" :class="[{'fa-angle-down': !selectedCurrency.status}, {'fa-angle-up': selectedCurrency.status}]"></i>
|
||||
<i class="fa" :class="[{'fa-angle-down': !currencyDropdownLaunch.status}, {'fa-angle-up': currencyDropdownLaunch.status}]"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="relative w-100">
|
||||
<div class="absolute w-100 b-l b-b b-r b-success" v-show="selectedCurrency.status" style="top: 100%; right: 0; z-index: 1;">
|
||||
<div class="absolute w-100 b-l b-b b-r b-success" v-show="currencyDropdownLaunch.status" style="top: 100%; right: 0; z-index: 1;">
|
||||
<div class="row text-left no-margin bg-white">
|
||||
<div class="col no-padding">
|
||||
<div class="row no-margin" v-for="currency in selectedSupplier.currencies" v-bind:key="currency.id" :data="currency">
|
||||
@@ -112,6 +112,9 @@
|
||||
name: '',
|
||||
status: false
|
||||
},
|
||||
currencyDropdownLaunch: {
|
||||
status: false
|
||||
},
|
||||
payments: []
|
||||
}
|
||||
},
|
||||
@@ -135,8 +138,7 @@
|
||||
this.selectedCurrency = currency;
|
||||
this.$refs.pendingOrdersList.updateFilters({per_page: 10000, status: 2, type: 1, original_currency_id_in: [this.selectedCurrency.id]});
|
||||
}
|
||||
|
||||
this.selectedCurrency.status = false;
|
||||
this.currencyDropdownLaunch.status = false;
|
||||
this.payments = [];
|
||||
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user