From eeb88b6892c79381a1766384cd11a0e844fb6e9d Mon Sep 17 00:00:00 2001
From: "weiken.intex" <weiken.intex@gmail.com>
Date: Mon, 26 Jul 2021 15:42:03 +0800
Subject: [PATCH] - follow the standard coding

---
 app/Http/Modules/User/ContractModule.php                    | 4 ++--
 .../Modules/User/ContractObligationDependencyModule.php     | 2 +-
 app/Http/Modules/User/ContractObligationModule.php          | 5 ++---
 app/Http/Modules/User/ContractTemplateModule.php            | 5 ++---
 ...ctTemplateObligationContractTemplateDependencyModule.php | 2 +-
 .../User/ContractTemplateObligationDependencyModule.php     | 5 ++---
 app/Http/Modules/User/ContractTemplateObligationModule.php  | 5 ++---
 app/Http/Modules/User/EntityModule.php                      | 5 ++---
 app/Http/Modules/User/EntitySignatureModule.php             | 5 ++---
 .../pages/contract-template-obligations/DeleteModal.vue     | 4 ----
 resources/js/user/pages/contract-templates/DeleteModal.vue  | 4 ----
 resources/js/user/pages/contracts/DeleteModal.vue           | 3 ---
 resources/js/user/pages/entities/DeleteModal.vue            | 6 +-----
 13 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/app/Http/Modules/User/ContractModule.php b/app/Http/Modules/User/ContractModule.php
index e990a0a..25b2d21 100644
--- a/app/Http/Modules/User/ContractModule.php
+++ b/app/Http/Modules/User/ContractModule.php
@@ -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);
diff --git a/app/Http/Modules/User/ContractObligationDependencyModule.php b/app/Http/Modules/User/ContractObligationDependencyModule.php
index cfbef66..7354b0c 100644
--- a/app/Http/Modules/User/ContractObligationDependencyModule.php
+++ b/app/Http/Modules/User/ContractObligationDependencyModule.php
@@ -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);
diff --git a/app/Http/Modules/User/ContractObligationModule.php b/app/Http/Modules/User/ContractObligationModule.php
index d9f8174..5173325 100644
--- a/app/Http/Modules/User/ContractObligationModule.php
+++ b/app/Http/Modules/User/ContractObligationModule.php
@@ -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);
diff --git a/app/Http/Modules/User/ContractTemplateModule.php b/app/Http/Modules/User/ContractTemplateModule.php
index 4641b73..06f8e5e 100644
--- a/app/Http/Modules/User/ContractTemplateModule.php
+++ b/app/Http/Modules/User/ContractTemplateModule.php
@@ -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);
diff --git a/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php b/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php
index ff583c6..9fae0a8 100644
--- a/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php
+++ b/app/Http/Modules/User/ContractTemplateObligationContractTemplateDependencyModule.php
@@ -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);
diff --git a/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php b/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php
index 8bd03b7..79f9a1f 100644
--- a/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php
+++ b/app/Http/Modules/User/ContractTemplateObligationDependencyModule.php
@@ -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);
diff --git a/app/Http/Modules/User/ContractTemplateObligationModule.php b/app/Http/Modules/User/ContractTemplateObligationModule.php
index 07e031b..12e519f 100644
--- a/app/Http/Modules/User/ContractTemplateObligationModule.php
+++ b/app/Http/Modules/User/ContractTemplateObligationModule.php
@@ -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);
diff --git a/app/Http/Modules/User/EntityModule.php b/app/Http/Modules/User/EntityModule.php
index b744a99..5fc6732 100644
--- a/app/Http/Modules/User/EntityModule.php
+++ b/app/Http/Modules/User/EntityModule.php
@@ -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);
diff --git a/app/Http/Modules/User/EntitySignatureModule.php b/app/Http/Modules/User/EntitySignatureModule.php
index 5d468fd..d98d884 100644
--- a/app/Http/Modules/User/EntitySignatureModule.php
+++ b/app/Http/Modules/User/EntitySignatureModule.php
@@ -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;
diff --git a/resources/js/user/pages/contract-template-obligations/DeleteModal.vue b/resources/js/user/pages/contract-template-obligations/DeleteModal.vue
index 963c825..7dade48 100644
--- a/resources/js/user/pages/contract-template-obligations/DeleteModal.vue
+++ b/resources/js/user/pages/contract-template-obligations/DeleteModal.vue
@@ -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">
diff --git a/resources/js/user/pages/contract-templates/DeleteModal.vue b/resources/js/user/pages/contract-templates/DeleteModal.vue
index 0dca64a..7ad0beb 100644
--- a/resources/js/user/pages/contract-templates/DeleteModal.vue
+++ b/resources/js/user/pages/contract-templates/DeleteModal.vue
@@ -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">
diff --git a/resources/js/user/pages/contracts/DeleteModal.vue b/resources/js/user/pages/contracts/DeleteModal.vue
index 7f24bbd..06f5306 100644
--- a/resources/js/user/pages/contracts/DeleteModal.vue
+++ b/resources/js/user/pages/contracts/DeleteModal.vue
@@ -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">
diff --git a/resources/js/user/pages/entities/DeleteModal.vue b/resources/js/user/pages/entities/DeleteModal.vue
index ea98f00..8fe71c4 100644
--- a/resources/js/user/pages/entities/DeleteModal.vue
+++ b/resources/js/user/pages/entities/DeleteModal.vue
@@ -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">