From 11b2f955938327e8c0890c514325f7446b1bdbb2 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 14 Jun 2024 08:44:03 +0530 Subject: [PATCH 1/4] GWM : staff form changes --- app/Views/staff_form.php | 79 ++++++++++++++++--------------------- app/Views/template_form.php | 12 +++--- 2 files changed, 41 insertions(+), 50 deletions(-) diff --git a/app/Views/staff_form.php b/app/Views/staff_form.php index 9a00b12..87caae6 100644 --- a/app/Views/staff_form.php +++ b/app/Views/staff_form.php @@ -51,7 +51,7 @@
- $value) { ?>
- $value) { ?>
- - + + + diff --git a/app/Views/template_form.php b/app/Views/template_form.php index 2a3549b..4c845c8 100644 --- a/app/Views/template_form.php +++ b/app/Views/template_form.php @@ -28,8 +28,8 @@
-
-
+
+

Template

@@ -42,14 +42,14 @@
-
+
-
-
+
+
@@ -114,7 +114,7 @@
-
+
From 30c43de33f00c36f5359b78c88f9532eb55492b9 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 14 Jun 2024 09:54:17 +0530 Subject: [PATCH 2/4] gwm --- app/Models/ClientDocsModel.php | 2 +- app/Views/client_docs_preview.php | 8 ++++++-- app/Views/client_list.php | 21 +++++++++++++++------ public/uploads/downArrow.png | Bin 362 -> 0 bytes public/uploads/ia.jpg | Bin 480228 -> 0 bytes 5 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 public/uploads/downArrow.png delete mode 100644 public/uploads/ia.jpg diff --git a/app/Models/ClientDocsModel.php b/app/Models/ClientDocsModel.php index df51a88..f930988 100644 --- a/app/Models/ClientDocsModel.php +++ b/app/Models/ClientDocsModel.php @@ -37,7 +37,7 @@ class ClientDocsModel extends Model public function docPreview($doc_id){ - $this->select('client_docs.is_approved ,client_docs.id as doc_id,client_docs.client_branch_id ,client_docs.updated_at,client_docs.ip_address,template.template_name,client_docs.body_html ,client_docs.is_active, services.service_name , business.header_html, business.footer_html'); + $this->select('client_docs.is_approved ,client_docs.id as doc_id,client_docs.client_branch_id ,client_docs.updated_at,client_docs.ip_address,template.template_name,client_docs.body_html ,client_docs.is_active,client_docs.document_name, services.service_name , business.header_html, business.footer_html'); $this->join('template', 'template.template_id = client_docs.template_id'); $this->join('services', 'services.service_id = template.service_id'); $this->join('business', 'business.business_id = template.template_header_business'); diff --git a/app/Views/client_docs_preview.php b/app/Views/client_docs_preview.php index 215cd11..d03e067 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -326,11 +326,13 @@ + + + diff --git a/app/Views/share_docs.php b/app/Views/share_docs.php index ff4ea61..b050d48 100644 --- a/app/Views/share_docs.php +++ b/app/Views/share_docs.php @@ -85,8 +85,18 @@
- Preview - History + + + Preview + + + + Edit + + + + History + Revert diff --git a/app/Views/template_form.php b/app/Views/template_form.php index 4c845c8..688ab3e 100644 --- a/app/Views/template_form.php +++ b/app/Views/template_form.php @@ -76,11 +76,7 @@
-
- - - '> -
+
@@ -92,6 +88,12 @@
+
+ + + '> +
+
@@ -290,6 +292,32 @@ $("#service_group_id").on("change", function() $("#savedata").on("click", function() { + + + var service_group_id = $('#service_group_id').val(); + var service_id = $('#service_id').val(); + var template_name = $('#template_name').val(); + var template_header_business = $('#template_header_business').val(); + + + // Check if required fields are filled + if (!service_group_id) { + toastr.warning('Service Group is required', 'Warning'); + return; + } + if (!service_id) { + toastr.warning('Service is required', 'Warning'); + return; + } + if (!template_header_business) { + toastr.warning('Template Header and Footer is required', 'Warning'); + return; + } + if (!template_name) { + toastr.warning('Template Name is required', 'Warning'); + return; + } + var body_html = $('#summernote-basic').summernote('code'); formData ={ service_group_id : $('#service_group_id').val(), diff --git a/app/Views/template_list.php b/app/Views/template_list.php index a394e04..3d43d2b 100644 --- a/app/Views/template_list.php +++ b/app/Views/template_list.php @@ -58,12 +58,16 @@
- Edit - + + Preview + + Edit + +
From 646eba706c8960c138b34a2cc6b4d259df2ecc84 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 15 Jun 2024 09:44:19 +0530 Subject: [PATCH 4/4] tracker issue : gwm --- app/Views/branch_list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/branch_list.php b/app/Views/branch_list.php index 491d8f5..57ff9be 100644 --- a/app/Views/branch_list.php +++ b/app/Views/branch_list.php @@ -38,7 +38,7 @@ Address City State - Postal Code + PIN Code Contact Status Action @@ -182,7 +182,7 @@
- +