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

Merge branch 'dillon/38-voucherify-phase-2' into development

Browse Source
This commit is contained in:
Dillon
2023-07-28 11:01:20 +08:00
parent 478c4d2719 79a153d3e5
commit 1fc09d693e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
+2 -2
View File
@@ -89,8 +89,8 @@ class AssignCompanyToSegmentLogic extends AbstractControllerLogic
}
//cief todo: case study 3
$user = $company->employees()->first();
$this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_3]);
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_3]);
return $this->resourceResponse(new CompanyResource($company));
}
app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
+2 -2
View File
@@ -95,8 +95,8 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
}
//cief todo: case study 2
$user = $company->employees()->first();
$this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_2]);
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_2]);
return $this->response([]);
}
resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+4 -4
View File
@@ -252,17 +252,17 @@
<i class="fa fa-times muted"></i>
</div>
</div>
<div class="col-auto p-r-10 p-l-10">
<!-- <div class="col-auto p-r-10 p-l-10">
<button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
<i class="fa fa-list"></i>
</button>
</div>
</div> -->
</div>
</validation-wrapper-component>
</div>
<modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
<!-- <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
<list-vouchers :isClicked="!voucherListDropDownStatus" :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers>
</modal-component>
</modal-component> -->
</div>
<span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
<div class="row m-l-0 m-r-0" style="height: 20px">
resources/views/partials/header.blade.php
+2 -2
View File
@@ -61,9 +61,9 @@
<div v-if="$store.getters.isCustomer" class="col-auto p-r-20">
<a href="{{route('banks')}}"><div class="text-white all-caps fs-12">Bank Accounts</div></a>
</div>
<div v-if="$store.getters.isCustomer" class="col-auto p-r-20">
<!-- <div v-if="$store.getters.isCustomer" class="col-auto p-r-20">
<a href="{{route('rewards')}}"><div class="text-white all-caps fs-12">Vouchers</div></a>
</div>
</div> -->
</div>
</div>
</div>