mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-25 15:34:02 +00:00
Update: laravel 8 to 12, php 7.3 to php 8.3, Jenkinsfile, Unit/Feature testing, vapor, docker
This commit is contained in:
+1
-1
@@ -69,7 +69,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<advertisement-component class="m-b-15 m-t-15" v-if="!isLoading"></advertisement-component>
|
||||
<advertisement-component class="m-b-15 m-t-15"></advertisement-component>
|
||||
<!-- C2C consent -->
|
||||
<div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!data.segments.some(item => item.id === 29)">
|
||||
<div class="col bg-white padding-15">
|
||||
|
||||
+14
-6
@@ -41,10 +41,12 @@
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.parameters = {};
|
||||
this.parameters.type = [0,1].includes(this.data.type) ? this.data.type: 0;
|
||||
this.parameters.email = this.data.contact ? this.data.contact.email : "";
|
||||
this.parameters.phone = this.data.contact ? this.data.contact.phone : "";
|
||||
this.initParameters();
|
||||
},
|
||||
watch: {
|
||||
'data': function() {
|
||||
this.initParameters();
|
||||
}
|
||||
},
|
||||
data(){
|
||||
return {
|
||||
@@ -59,8 +61,14 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
initParameters() {
|
||||
this.parameters = {};
|
||||
this.parameters.type = [0,1].includes(this.data.type) ? this.data.type: 0;
|
||||
this.parameters.email = this.data.contact ? this.data.contact.email : "";
|
||||
this.parameters.phone = this.data.contact ? this.data.contact.phone : "";
|
||||
},
|
||||
submitForm(){
|
||||
this.submit(route('api.company.profile.update', this.data.id), 'put', this.section, true, true);
|
||||
this.submit(route('api.company.profile.update', this.data.id), 'put', this.section + 'EditCompanyType', true, true);
|
||||
},
|
||||
successHandler(){
|
||||
window.location.reload();
|
||||
@@ -68,4 +76,4 @@
|
||||
},
|
||||
mixins: [modalFormHandler]
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
||||
+1
-1
@@ -14,7 +14,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 Wallet Transaction' : 'Show Precise Wallet Transaction'}}</span>
|
||||
<a v-if="company" @click="download(company, 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>
|
||||
<a v-if="company" @click="download(company, showingPreciseAmount)" target="_blank" class="btn btn-md btn-primary fs-12"><i class="fa fa-download m-r-5"></i>{{ showingPreciseAmount ? 'Download Precise Transaction' : 'Download Transaction'}}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ export default {
|
||||
return !unprotectedPaths.includes(currentPath);
|
||||
},
|
||||
isWithTokenRoute(){
|
||||
return window.location.href.includes(this.route('account.password.reset'));
|
||||
return window.location.href.includes(this.route('account.password.reset')) || window.location.href.includes('/account/email/verification');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user