push them all
This commit is contained in:
@@ -185,7 +185,7 @@
|
||||
</view>
|
||||
<view class="hz-flex-row hz-mr-t-30">
|
||||
<view style="width:100%">
|
||||
<view class="hz-font-color-black hz-font-lg">{{$t("approval.pendingResponse")}}: {{bookingData.approver || '-'}}</view>
|
||||
<view class="hz-font-color-black hz-font-lg">{{$t("approval.pendingResponse")}}: {{bookingData.approverName || '-'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -219,13 +219,15 @@
|
||||
<!-- DUE_OUT -->
|
||||
<view v-else-if="currentBookingStatus == 'DUE_OUT'" class="hz-flex-row hz-spacing" style=" display: flex; justify-content: space-around;" :style="showExtendLayout() ? {width:'100%'}:{width:'34%'}">
|
||||
<view @click="popupLang()" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center">{{$t("bookingDetail.saveImage")}}</view>
|
||||
<view v-if="showExtendLayout()" @click="popupCalendar()" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:4px;">{{$t("bookingDetail.extension")}}</view>
|
||||
<view v-if="showExtendLayout() && isExtendBooker()" @click="popupCalendar()" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:4px;">{{$t("bookingDetail.extension")}}</view>
|
||||
<view v-else-if="showExtendLayout()" @click="showExtendBookerPopup()" class="hz-cancel-disabled hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:4px;">{{$t("bookingDetail.extension")}}</view>
|
||||
</view>
|
||||
<!-- CHECKED_IN -->
|
||||
<view v-else-if="currentBookingStatus == 'CHECKED_IN'" class="hz-flex-row hz-spacing" style=" display: flex; justify-content: space-around;" :style="showExtendLayout() ? {width:'100%'}:{width:'34%'}">
|
||||
<view @click="popupLang()" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center">{{$t("bookingDetail.saveImage")}}</view>
|
||||
<view v-if="bookingData.propertyCategory != 'OTHER'" @click="showMisChargeMsg = true" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:4px;">{{$t("common.misCharge").toUpperCase()}}</view>
|
||||
<view v-if="showExtendLayout()" @click="popupCalendar()" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:8px;">{{$t("bookingDetail.extension")}}</view>
|
||||
<view v-if="showExtendLayout() && isExtendBooker()" @click="popupCalendar()" class="hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:8px;">{{$t("bookingDetail.extension")}}</view>
|
||||
<view v-else-if="showExtendLayout()" @click="showExtendBookerPopup()" class="hz-cancel-disabled hz-btn hz-bg-primary hz-font-lg hz-font-bold hz-font-color-white hz-text-center" style="margin-left:8px;">{{$t("bookingDetail.extension")}}</view>
|
||||
</view>
|
||||
<!-- WAITLIST -->
|
||||
<view v-else-if="currentBookingStatus == 'WAITLIST'" class="hz-flex-row hz-spacing" style="width:100%;">
|
||||
@@ -666,6 +668,15 @@
|
||||
return false;
|
||||
}
|
||||
},
|
||||
isExtendBooker(){
|
||||
return this.userData.userId == this.bookingData.createdBy;
|
||||
},
|
||||
showExtendBookerPopup(){
|
||||
uni.showToast({
|
||||
title: this.$t("bookingDetail.onlyBookerCanExtend"),
|
||||
icon: "none"
|
||||
});
|
||||
},
|
||||
showOtherPopup(){
|
||||
uni.showToast({
|
||||
title:this.$t("bookingDetail.cannotCancel"),
|
||||
@@ -920,7 +931,7 @@
|
||||
if( ( dayjs(day.date).isAfter(startDate) || dayjs(day.date).isSame(startDate,'day')) &&
|
||||
( dayjs(day.date).isBefore(endDate) ||dayjs(day.date).isSame(endDate,'day')) ){
|
||||
// console.log(cdate)
|
||||
|
||||
|
||||
var operaStatus = this.bookingData.lastOperaStatus;
|
||||
var checkExp = (operaStatus.toUpperCase()==='CHECKED_IN')||(operaStatus.toUpperCase()==='DUE_OUT');
|
||||
if((this.bookingData.expDate==null||this.bookingData.expDate=='')&&checkExp){
|
||||
@@ -1003,7 +1014,7 @@
|
||||
const res = await changeMiscCharge(params);
|
||||
if(res.success!==null && res.success == true){
|
||||
this.iconPath = '../../static/images/ico_suc.png';
|
||||
this.popMsgStr = this.$t("bookingDetail.changeMiscChargeSuccess");
|
||||
this.popMsgStr = this.$t("bookingDetail.changeMisChargeSuccess");
|
||||
this.showMsgBox = true;
|
||||
this.showETAMsg = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user