mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
Merge branch 'document_upload_multiple_bug' into 'master'
Display Only Payment Transaction See merge request CIEFWorldwideSdnBhd/exchange-2.0!28
This commit is contained in:
omair saleh
@@ -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>
|
||||
|
||||
+6
-2
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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',
|
||||
),
|
||||
) ?>
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user