cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into invoice_download

Browse Source
This commit is contained in:
glovetleong
2021-04-03 12:13:07 +08:00
parent b95fa1f2d5 e97d2236a9
commit a339702030
11 changed files with 85737 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/address/elements/AddressListComponent.vue
+1 -2
View File
@@ -1,7 +1,7 @@
<template>
<div class="row zig-zag-top">
<div class="col bg-white padding-25">
<div class="row p-b-20 b-b b-dashed m-b-20 b-grey">
<div class="row p-b-20 b-b b-dashed m-b-20 b-grey" v-if="defaultAddress[0]">
<div class="col">
<div class="row m-b-5">
<div class="col">
@@ -133,7 +133,6 @@
},
data(){
return {
section: 'addressListSection',
isLoading: true,
billingAddress: [],
createAddress: false,
resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+1
View File
@@ -159,6 +159,7 @@
successHandler(response){
this.type !== 2 ? this.closeModal() : this.$emit('createdBank', response.payload.data);
this.formHandler();
this.resetForm();
},
errorHandler(error){
this.formHandler(error.message);
resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+6 -3
View File
@@ -104,7 +104,7 @@
<div class="row text-left no-margin bg-white">
<div class="col no-padding">
<div class="row no-margin" v-for="bank in data.recipientBanks" v-bind:key="bank.id" >
<div class="col b-b b-grey p-t-10 p-b-10 pointer p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="updateBank(bank)">
<div class="col b-b b-grey p-t-10 p-b-10 pointer p-t-10 p-b-10" :class="[{'bg-master-lightest': parameters.bankAccount.id === bank.id}, {'text-master': parameters.bankAccount.id === bank.id}, {'hover-primary': parameters.bankAccount.id !== bank.id}, {'pointer': parameters.bankAccount.id !== bank.id}]" @click="selectBank(bank)">
<div class="row align-items-center justify-content-center">
<div class="col">
<div class="row">
@@ -257,11 +257,14 @@
},
methods: {
updateBank(bank){
this.parameters.bankAccount = bank;
this.parameters.bankAccount.status = false;
this.selectBank(bank);
this.recipientBanks.push(bank);
this.createBank = false;
},
selectBank(bank){
this.parameters.bankAccount = bank;
this.parameters.bankAccount.status = false;
},
},
mixins: [FormHandler]
}
resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
+10 -8
View File
@@ -29,14 +29,16 @@
<div class="row align-items-end">
<div class="col">
<div class="row no-margin">
<div v-for="file in item.documents.files" v-bind:key="file.id" class="col-auto no-padding m-r-5">
<document-file-viewr-component :file="file">
<template slot="button">
<div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
<i class="fa fa-file-image-o fs-10"></i>
</div>
</template>
</document-file-viewr-component>
<div v-if="item.documents != null">
<div v-for="file in item.documents.files" v-bind:key="file.id" class="col-auto no-padding m-r-5">
<document-file-viewr-component :file="file">
<template slot="button">
<div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
<i class="fa fa-file-image-o fs-10"></i>
</div>
</template>
</document-file-viewr-component>
</div>
</div>
</div>
</div>
resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
+3 -1
View File
@@ -275,7 +275,9 @@
this.isloading = false;
},
errorHandler(error){
this.$emit('newCalculation', {});
this.$emit('newCalculation', {
calculation: -1
});
this.error = error.message;
this.loading = false;
}
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+6 -2
View File
@@ -153,7 +153,7 @@
</div>
</div>
<div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" data-type="identificationVerificationModal">
<div class="row align-items-center h-100">
<div @click="selectedID(item.id)" class="row align-items-center h-100">
<div class="col">
<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
width="30" height="30"
@@ -166,7 +166,7 @@
<delete-payment-attempt-form-component :data="item" :section="section" class="text-center"></delete-payment-attempt-form-component>
</modal-component>
<modal-component type="identificationVerificationModal">
<payment-verification-form-component :section="section" :id="booking.id" :data="item"></payment-verification-form-component>
<payment-verification-form-component v-if="selected_id == item.id" :section="section" :id="booking.id" :data="item"></payment-verification-form-component>
</modal-component>
</div>
</div>
@@ -284,6 +284,7 @@
data(){
return {
section: 'bookingDetailSection',
selected_id: '',
isLoading: true,
booking: null,
attention: false,
@@ -320,6 +321,9 @@
},
updateDefaultAddress(){
this.fetchBooking();
},
selectedID(id){
this.selected_id = id;
}
}
}
resources/views/pages/dashboards/admin.blade.php
+1 -1
View File
@@ -60,7 +60,7 @@
<div class="col">
<div class="row">
<div class="col">
<list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'status': 1}">
<list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'status': 1, 'type': 1}">
<template slot="list" slot-scope="{data}">
<payment-verification-component section="paymentVerificationSection" :data="data"></payment-verification-component>
</template>
storage/fonts/dompdf_font_family_cache.php
+86
View File
@@ -0,0 +1,86 @@
<?php return array (
'sans-serif' => array(
'normal' => $rootDir . '/lib/fonts/Helvetica',
'bold' => $rootDir . '/lib/fonts/Helvetica-Bold',
'italic' => $rootDir . '/lib/fonts/Helvetica-Oblique',
'bold_italic' => $rootDir . '/lib/fonts/Helvetica-BoldOblique',
),
'times' => array(
'normal' => $rootDir . '/lib/fonts/Times-Roman',
'bold' => $rootDir . '/lib/fonts/Times-Bold',
'italic' => $rootDir . '/lib/fonts/Times-Italic',
'bold_italic' => $rootDir . '/lib/fonts/Times-BoldItalic',
),
'times-roman' => array(
'normal' => $rootDir . '/lib/fonts/Times-Roman',
'bold' => $rootDir . '/lib/fonts/Times-Bold',
'italic' => $rootDir . '/lib/fonts/Times-Italic',
'bold_italic' => $rootDir . '/lib/fonts/Times-BoldItalic',
),
'courier' => array(
'normal' => $rootDir . '/lib/fonts/Courier',
'bold' => $rootDir . '/lib/fonts/Courier-Bold',
'italic' => $rootDir . '/lib/fonts/Courier-Oblique',
'bold_italic' => $rootDir . '/lib/fonts/Courier-BoldOblique',
),
'helvetica' => array(
'normal' => $rootDir . '/lib/fonts/Helvetica',
'bold' => $rootDir . '/lib/fonts/Helvetica-Bold',
'italic' => $rootDir . '/lib/fonts/Helvetica-Oblique',
'bold_italic' => $rootDir . '/lib/fonts/Helvetica-BoldOblique',
),
'zapfdingbats' => array(
'normal' => $rootDir . '/lib/fonts/ZapfDingbats',
'bold' => $rootDir . '/lib/fonts/ZapfDingbats',
'italic' => $rootDir . '/lib/fonts/ZapfDingbats',
'bold_italic' => $rootDir . '/lib/fonts/ZapfDingbats',
),
'symbol' => array(
'normal' => $rootDir . '/lib/fonts/Symbol',
'bold' => $rootDir . '/lib/fonts/Symbol',
'italic' => $rootDir . '/lib/fonts/Symbol',
'bold_italic' => $rootDir . '/lib/fonts/Symbol',
),
'serif' => array(
'normal' => $rootDir . '/lib/fonts/Times-Roman',
'bold' => $rootDir . '/lib/fonts/Times-Bold',
'italic' => $rootDir . '/lib/fonts/Times-Italic',
'bold_italic' => $rootDir . '/lib/fonts/Times-BoldItalic',
),
'monospace' => array(
'normal' => $rootDir . '/lib/fonts/Courier',
'bold' => $rootDir . '/lib/fonts/Courier-Bold',
'italic' => $rootDir . '/lib/fonts/Courier-Oblique',
'bold_italic' => $rootDir . '/lib/fonts/Courier-BoldOblique',
),
'fixed' => array(
'normal' => $rootDir . '/lib/fonts/Courier',
'bold' => $rootDir . '/lib/fonts/Courier-Bold',
'italic' => $rootDir . '/lib/fonts/Courier-Oblique',
'bold_italic' => $rootDir . '/lib/fonts/Courier-BoldOblique',
),
'dejavu sans' => array(
'bold' => $rootDir . '/lib/fonts/DejaVuSans-Bold',
'bold_italic' => $rootDir . '/lib/fonts/DejaVuSans-BoldOblique',
'italic' => $rootDir . '/lib/fonts/DejaVuSans-Oblique',
'normal' => $rootDir . '/lib/fonts/DejaVuSans',
),
'dejavu sans mono' => array(
'bold' => $rootDir . '/lib/fonts/DejaVuSansMono-Bold',
'bold_italic' => $rootDir . '/lib/fonts/DejaVuSansMono-BoldOblique',
'italic' => $rootDir . '/lib/fonts/DejaVuSansMono-Oblique',
'normal' => $rootDir . '/lib/fonts/DejaVuSansMono',
),
'dejavu serif' => array(
'bold' => $rootDir . '/lib/fonts/DejaVuSerif-Bold',
'bold_italic' => $rootDir . '/lib/fonts/DejaVuSerif-BoldItalic',
'italic' => $rootDir . '/lib/fonts/DejaVuSerif-Italic',
'normal' => $rootDir . '/lib/fonts/DejaVuSerif',
),
'simhei' => array(
'normal' => $fontDir . '/simhei',
'bold' => $fontDir . '/simhei',
'italic' => $fontDir . '/simhei',
'bold_italic' => $fontDir . '/simhei',
),
) ?>
storage/fonts/simhei.ttf
BIN
View File
Binary file not shown.
storage/fonts/simhei.ufm
+28546
View File
File diff suppressed because it is too large Load Diff
storage/fonts/simhei.ufm.php
+57077
View File
File diff suppressed because one or more lines are too long