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

Merge branch 'dillon/63.5-ui-update' into development

Browse Source
This commit is contained in:
Dillon Ngo
2024-08-17 09:07:29 +08:00
parent c60a5d3d88 de008d593e
commit 89ca4b48ac
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+2 -1
View File
@@ -135,10 +135,11 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
$quotationBeforeCurrentRefund = $this->fetchBookingQuotation->execute($booking->company, $conversionObjectBeforeCurrentRefund, $voucherCode, $redemptionId);
$quotationAfterRefund = $this->fetchBookingQuotation->execute($booking->company, $conversionObjectAfterRefund, $voucherCode);
$quotationAfterRefund = $this->fetchBookingQuotation->execute($booking->company, $conversionObjectAfterRefund, $voucherCode, $redemptionId);
$service_charges_to_refund = $isFullyRefund ? $quotationBeforeCurrentRefund->getServiceCharge() : $quotationBeforeCurrentRefund->getServiceCharge() - $quotationAfterRefund->getServiceCharge();
// refund service charges if booking is not E2E
$refundTotal = $refundAmount;
resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+40 -9
View File
@@ -14,15 +14,46 @@
</div> -->
</div>
<div class="row">
<span v-if="item.voucher.end_date && new Date() > new Date(item.voucher.end_date)">
This voucher has expired.
</span>
<span v-else-if="item.voucher.end_date">
Valid till {{ item.voucher.end_date }}
</span>
<span v-else>
Non-expired
</span>
<div class="col-12 col-md-8 text-left no-padding">
<span v-if="item.voucher.end_date && new Date() > new Date(item.voucher.end_date)">
This voucher has expired.
</span>
<span v-else-if="item.voucher.end_date">
Valid till {{ item.voucher.end_date }}
</span>
<span v-else>
Non-expired
</span>
</div>
<div class="col-12 col-md-4 text-right no-padding">
<a class="requestModal" :data-type="'showVoucherTnC-' + item.id">Terms</a>
</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" size="extra-large" :type="'showVoucherTnC-' + item.id">
<div class="container">
<div class="card">
<div class="card-header">
Terms & Conditions
</div>
<div class="card-body">
<ol>
<li>Vouchers are only valid for purchases made on <a href="https://exchange.cief-malaysia.com/" target="_blank">https://exchange.cief-malaysia.com/</a>.</li>
<li>Each voucher is applicable for a single transaction (unless stated otherwise).</li>
<li>Each voucher is only applicable for new orders.</li>
<li>Voucher codes are to be entered at the checkout or cart page (unless stated otherwise).</li>
<li>Vouchers are not valid for promotions or discounted products (unless stated otherwise).</li>
<li>Customers should take note of the expiry dates of the voucher(s) that they wish to redeem. Any voucher(s) which have expired will be invalid.</li>
<li>Individual vouchers are only valid during its respective promotion period. This guideline overrides any individual voucher policy (unless stated otherwise).</li>
<li>CIEF reserves the right to cancel any order if a customer’s purchasing behavior appears to be suspicious or potentially fraudulent.</li>
<li>CIEF vouchers are not exchangeable for cash at <a href="https://exchange.cief-malaysia.com/" target="_blank">https://exchange.cief-malaysia.com/</a>.</li>
<li>This voucher can only be used and redeemed by a registered customer who has already logged into their account during purchase.</li>
<li>CIEF reserves the right to amend the terms & conditions or cancel any vouchers/promotions without prior notice.</li>
<li>Additional terms & conditions are stated on the respective promotion banners (e.g., duration, discount amounts, validity for campaigns/promotions or certain services).</li>
</ol>
<button type="button" class="btn btn-primary" data-dismiss="modal">OK</button>
</div>
</div>
</div>
</modal-component>
</div>
</div>
</div>