cief/unity
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/unity.git synced 2026-08-19 04:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

- follow the standard coding

Browse Source
This commit is contained in:
weiken.intex
2021-07-26 15:42:03 +08:00
parent 504a07cc59
commit eeb88b6892
13 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Modules/User/ContractModule.php
+2 -2
View File
@@ -40,7 +40,7 @@ class ContractModule extends BaseController
$page = $request->get('page', null);
$limit = $request->get('limit', 10);
$status_default[] = config('constants.contact.status.active');
//$status_default[] = config('constants.contact.status.active');
$query = Contract::query();
@@ -51,7 +51,7 @@ class ContractModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.contact.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/ContractObligationDependencyModule.php
+1 -1
View File
@@ -48,7 +48,7 @@ class ContractObligationDependencyModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.contract_dependency.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/ContractObligationModule.php
+2 -3
View File
@@ -34,8 +34,7 @@ class ContractObligationModule extends BaseController
$page = $request->get('page', null);
$limit = $request->get('limit', 10);
$status_default[] = config('constants.contact.status.active');
$query = Contract::query();
if (strlen($name) > 0) {
@@ -45,7 +44,7 @@ class ContractObligationModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status',[config('constants.contact.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/ContractTemplateModule.php
+2 -3
View File
@@ -35,8 +35,7 @@ class ContractTemplateModule extends BaseController
$page = $request->get('page', null);
$limit = $request->get('limit', 10);
$status_default[] = config('constants.contact_template.status.active');
$query = ContractTemplate::query();
if (strlen($name) > 0) {
@@ -46,7 +45,7 @@ class ContractTemplateModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.contact_template.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php
+1 -1
View File
@@ -57,7 +57,7 @@ class ContractTemplateObligationContractTemplateDependencyModule extends BaseCon
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.contract_template_obligation_contract_template_dependency.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/ContractTemplateObligationDependencyModule.php
+2 -3
View File
@@ -40,8 +40,7 @@ class ContractTemplateObligationDependencyModule extends BaseController
$page = $request->get('page', null);
$limit = $request->get('limit', 10);
$status_default[] = config('constants.contract_template_obligation_dependency.status.active');
$query = ContractTemplateObligationDependency::query();
if (!empty($contract_template_obligation_id)) {
@@ -56,7 +55,7 @@ class ContractTemplateObligationDependencyModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.contract_template_obligation_dependency.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/ContractTemplateObligationModule.php
+2 -3
View File
@@ -34,8 +34,7 @@ class ContractTemplateObligationModule extends BaseController
$not_hash_id = $not_id = $request->get('not_id', []);
$contract_template_hash_id = $contract_template_id = $request->get('contract_template_id', []);
$status_default[] = config('constants.contract_template_obligation.status.active');
$name = $request->get('name', null);
$status = $request->get('status', []);
$page = $request->get('page', null);
@@ -60,7 +59,7 @@ class ContractTemplateObligationModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.contract_template_obligation.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/EntityModule.php
+2 -3
View File
@@ -35,8 +35,7 @@ class EntityModule extends BaseController
$page = $request->get('page', null);
$limit = $request->get('limit', 10);
$status_default[] = config('constants.entity.status.active');
$query = Entity::query();
if (strlen($name) > 0) {
@@ -46,7 +45,7 @@ class EntityModule extends BaseController
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.entity.status.active')]);
}
$query->where('user_id', Auth::guard('user-api')->user()->id);
app/Http/Modules/User/EntitySignatureModule.php
+2 -3
View File
@@ -37,14 +37,13 @@ class EntitySignatureModule extends BaseController
$page = $request->get('page', null);
$limit = $request->get('limit', 10);
$status_default[] = config('constants.entity.status.active');
$query = EntitySignature::query();
if (!empty($status) > 0) {
$query->whereIn('status', $status);
}else{
$query->whereIn('status', $status_default);
$query->whereIn('status', [config('constants.entity.status.active')]);
}
$user_id = Auth::guard('user-api')->user()->id;
resources/js/user/pages/contract-template-obligations/DeleteModal.vue
-4
View File
@@ -4,13 +4,9 @@
<template v-slot:modal-title>
<h4 class="modal-title">Contract Template Obligation Delete</h4>
</template>
<p class="text-center">
Are you sure want to delete?
</p>
<template v-slot:modal-footer>
<form @submit.prevent="onSubmit">
resources/js/user/pages/contract-templates/DeleteModal.vue
-4
View File
@@ -4,13 +4,9 @@
<template v-slot:modal-title>
<h4 class="modal-title">Contract Template Delete</h4>
</template>
<p class="text-center">
Are you sure want to delete?
</p>
<template v-slot:modal-footer>
<form @submit.prevent="onSubmit">
resources/js/user/pages/contracts/DeleteModal.vue
-3
View File
@@ -4,12 +4,9 @@
<template v-slot:modal-title>
<h4 class="modal-title">Contract Delete</h4>
</template>
<p class="text-center">
Are you sure want to delete?
</p>
<template v-slot:modal-footer>
<form @submit.prevent="onSubmit">
resources/js/user/pages/entities/DeleteModal.vue
+1 -5
View File
@@ -4,11 +4,7 @@
<template v-slot:modal-title>
<h4 class="modal-title">Entity Delete</h4>
</template>
Are you sure want to delete?
<p class="text-center">Are you sure want to delete?</p>
<template v-slot:modal-footer>
<form @submit.prevent="onSubmit">