omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-19 04:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into unit_test

Browse Source
This commit is contained in:
glovetleong
2022-05-10 23:28:00 +08:00
parent e29cd2cb79 06dd1efa24
commit c34395b2d0
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
+2 -1
View File
@@ -14,6 +14,7 @@ use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\BusinessType;
use App\Classes\ValueObjects\Constants\CompanyType;
use App\Classes\ValueObjects\Constants\RoleTypes;
use App\Models\Company;
use App\Models\User;
@@ -91,7 +92,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
$user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
/** @var Company $company */
$company = $this->createCompanyProcessor->execute($request, BusinessType::IMPORTER, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
$company = $this->createCompanyProcessor->execute($request, BusinessType::IMPORTER, $request->input('type') === CompanyType::COMPANY_BUSINESS ? CompanyType::COMPANY_BUSINESS : CompanyType::PERSONAL_BUSINESS, ApprovalStatus::PENDING_SUBMISSION);
$this->createContactProcessor->execute($request, $company);
app/Classes/ValueObjects/Constants/TransactionType.php
+2 -2
View File
@@ -24,10 +24,10 @@ final class TransactionType {
public const CREDIT_NOTE = 9;
public const WITHDRAW = 10;
public const DEBIT_NOTE = 11;
public const WITHDRAW = 10;
public const TRANSFER_FEE = 12;
public const CASH_BACK = 13;
app/Models/Booking.php
+1 -1
View File
@@ -38,7 +38,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable
*/
public function company(): BelongsTo
{
return $this->BelongsTo(Company::class, 'company_id');
return $this->BelongsTo(Company::class, 'company_id')->withTrashed();
}
/**
resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue
-5
View File
@@ -3,11 +3,6 @@
<div class="col">
<div class="row">
<div class="col">
<div class="row m-b-20">
<div class="col text-center no-padding">
<img src="https://izyim.cief-malaysia.com/images/raya-announcement.jpg" class="w-75">
</div>
</div>
<div class="row">
<div class="col-12">
<list-component style="min-height: auto;" section="customerAnnouncements" :emptyListSection=false :endpoint="route('api.announcement.list')" :options="{has_segments:true,is_published:true}">