diff --git a/app/Http/Controllers/User/Api/EntityController.php b/app/Http/Controllers/User/Api/EntityController.php
index d595626..df17024 100644
--- a/app/Http/Controllers/User/Api/EntityController.php
+++ b/app/Http/Controllers/User/Api/EntityController.php
@@ -45,4 +45,11 @@ class EntityController extends BaseController
$entity = EntityModule::delete($request, $hash_id);
return $entity;
}
+
+ public function validCheck(Request $request, $hash_id = '')
+ {
+ $method = empty($hash_id) ? 'POST' :'PUT';
+ $valid = EntityModule::validCheck($request, $hash_id, $method);
+ return $valid;
+ }
}
diff --git a/app/Http/Controllers/User/Web/cookies.txt b/app/Http/Controllers/User/Web/cookies.txt
new file mode 100644
index 0000000..d2a6281
--- /dev/null
+++ b/app/Http/Controllers/User/Web/cookies.txt
@@ -0,0 +1,6 @@
+# Netscape HTTP Cookie File
+# https://curl.haxx.se/docs/http-cookies.html
+# This file was generated by libcurl! Edit at your own risk.
+
+#HttpOnly_www.starbuyers-global-auction.com FALSE / TRUE 1625823333 star_buyers_auction_session PC7Uf6I2TFtUqH2kIPkLFJnpJxvyfRuEmmbit4Wv
+www.starbuyers-global-auction.com FALSE / TRUE 1625823333 XSRF-TOKEN eyJpdiI6Ik00SnJCTEJxTVZ5U2ExVUFzNGhIb2c9PSIsInZhbHVlIjoiY2JHVjEwYno1ZjI4TTFDcnIzZ1BaOERGWnQybDFPcm10eGtkalZVbU9hVUwzb1Nkd09LbHFHS3hSYkhZXC9GTFkiLCJtYWMiOiJiNzAzM2ZhMTE4NDFjMmZiZmJkMjQ2MzNkMGIyMjkzOGUzYmYxYjM1NWQwMTQyNDk5NmY4NTE1ODI1MzFlMmRmIn0%3D
diff --git a/app/Http/Modules/User/ContractTemplateModule.php b/app/Http/Modules/User/ContractTemplateModule.php
index f782693..25f04e5 100644
--- a/app/Http/Modules/User/ContractTemplateModule.php
+++ b/app/Http/Modules/User/ContractTemplateModule.php
@@ -100,7 +100,7 @@ class ContractTemplateModule extends BaseController
$contract_template->user_id = Auth::guard('user-api')->user()->id;
$contract_template->name = $name;
$contract_template->complete_day_range = $complete_day_range;
- $contract_template->status = config('constants.contact_template.status.pending');
+ $contract_template->status = config('constants.contact_template.status.active');
$contract_template->save();
// log
diff --git a/app/Http/Modules/User/ContractTemplateObligationModule.php b/app/Http/Modules/User/ContractTemplateObligationModule.php
index 40ac5e8..b10c816 100644
--- a/app/Http/Modules/User/ContractTemplateObligationModule.php
+++ b/app/Http/Modules/User/ContractTemplateObligationModule.php
@@ -30,7 +30,9 @@ class ContractTemplateObligationModule extends BaseController
public static function list(Request $request)
{
General::storeCachePerviousQuery($request->query(), 'contract_template_obligation_query');
-
+
+ $contract_template_hash_id = $contract_template_id = $request->get('contract_template_id', []);
+
$name = $request->get('name', null);
$status = $request->get('status', []);
$page = $request->get('page', null);
@@ -38,7 +40,12 @@ class ContractTemplateObligationModule extends BaseController
$query = ContractTemplateObligation::query();
- if (strlen($name) > 0) {
+ if (!empty($contract_template_id)) {
+ $contract_template_id = Hasher::decodeArray('contract_templates', $contract_template_id);
+ $query->whereIn('contract_template_id', $contract_template_id);
+ }
+
+ if (strlen($name) > 0) {
$query->where('name', 'like', '%' . $name . '%');
}
@@ -48,9 +55,10 @@ class ContractTemplateObligationModule extends BaseController
$query->where('user_id', Auth::guard('user-api')->user()->id);
- $query->orderBy('id', 'desc');
+ $query->orderBy('sequence', 'desc');
$params = [
+ 'contract_template_id' => $contract_template_hash_id,
'name' => $name,
'status' => $status,
'page' => $page
@@ -105,6 +113,7 @@ class ContractTemplateObligationModule extends BaseController
$contract_template_obligation = new ContractTemplateObligation();
$contract_template_obligation->contract_template_id = $contarct_template->id;
$contract_template_obligation->user_id = Auth::guard('user-api')->user()->id;
+ $contract_template_obligation->name = $name;
$contract_template_obligation->sequence = $sequence;
$contract_template_obligation->reference = $reference;
$contract_template_obligation->content = json_encode($content);
@@ -112,7 +121,7 @@ class ContractTemplateObligationModule extends BaseController
$contract_template_obligation->must_accept = $must_accept;
$contract_template_obligation->complete_day_range = $complete_day_range;
$contract_template_obligation->type = $type;
- $contract_template_obligation->status = config('constants.contract_template_obligation.status.pending');
+ $contract_template_obligation->status = config('constants.contract_template_obligation.status.active');
$contract_template_obligation->save();
// log
@@ -208,7 +217,7 @@ class ContractTemplateObligationModule extends BaseController
'must_complete' => '',
'must_accept' => '',
'complete_day_range' => 'required|numeric|gt:-1',
- 'type' => 'required',
+ // 'type' => 'required',
];
}
@@ -216,13 +225,13 @@ class ContractTemplateObligationModule extends BaseController
$data['id'] = $id;
$rule = [
'id' => [new UnderCheck('contract_template_obligation'), new ExistCheck('contract_template_obligation')],
- 'name' => '',
- 'sequence' => 'nullable|numeric|gt:-1',
+ 'name' => 'required',
+ 'sequence' => 'required|numeric|gt:-1',
'reference' => '',
'content' => '',
'must_complete' => '',
'must_accept' => '',
- 'complete_day_range' => 'nullable|numeric|gt:-1',
+ 'complete_day_range' => 'required|numeric|gt:-1',
'type' => '',
];
}
diff --git a/app/Http/Modules/User/EntityModule.php b/app/Http/Modules/User/EntityModule.php
index 03f377e..05e9a31 100644
--- a/app/Http/Modules/User/EntityModule.php
+++ b/app/Http/Modules/User/EntityModule.php
@@ -159,6 +159,14 @@ class EntityModule extends BaseController
return response()->json($data);
}
+ public static function validCheck(Request $request, $hash_id = '', $method = 'POST')
+ {
+ $id = $hash_id ? Hasher::decode('entities', $hash_id) : '';
+ $validation = EntityModule::validation($request, $id, $method);
+ if (!$validation->status) {
+ return response()->json($validation, 422);
+ }
+ }
private static function validation(Request $request, $id = '', $method = 'POST')
{
diff --git a/resources/js/user/langs/en.js b/resources/js/user/langs/en.js
index d92642d..a9d0f9c 100644
--- a/resources/js/user/langs/en.js
+++ b/resources/js/user/langs/en.js
@@ -5,6 +5,7 @@ const En = {
'email': 'email',
'password': 'password',
'complete_day_range': 'complete day range',
+ 'sequence': 'sequence',
// Error
diff --git a/resources/js/user/pages/contract-template-obligations/CreateModal.vue b/resources/js/user/pages/contract-template-obligations/CreateModal.vue
new file mode 100644
index 0000000..dcf990b
--- /dev/null
+++ b/resources/js/user/pages/contract-template-obligations/CreateModal.vue
@@ -0,0 +1,149 @@
+
+ Contract Template Obligation Create
+
+
+ Contract Template Obligation {{ mode == 'create' ? 'Create' : 'Edit' }}
+
+
+ Contract Template Obligation List
+
+
+
+
+
+
+
+
+
+
+
+
+ #
+ Details
+ Contract Template
+ Sequence
+ Status
+ Created
+ Actions
+
+
+ {{ $index + 1 }}
+
+
+
+ {{ contract.contract_template_list[0].name }}
+
+ {{ contract.sequence }}
+
+ {{ contract.status[0].name }}
+
+
+ {{ contract.created_at }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Total: {{ contract_template_obligation_list.total }}
+
+
| # | +Details | +Status | +Created | +Actions | +
|---|---|---|---|---|
| {{ $index + 1 }} | +
+ Name: {{ contract.name }}
+ |
+ + {{ contract.status[0].name }} + | ++ {{ contract.created_at }} + | +
+ |
+
|
+ |
+ ||||
| + Total: {{ entity_list.total }} + | +