diff --git a/.env b/.env index 4efe471..e8ba976 100644 --- a/.env +++ b/.env @@ -72,6 +72,5 @@ database.default.port = 3306 -WAAI_INSTANCE = '66712908EB75A' -WAAI_TOKEN = '667128c844c48' -SEND_WAAI_URL = SEND_WAAI_URL \ No newline at end of file +WAAI_INSTANCE = '666FEE6738696' +WAAI_TOKEN = '666fd862df687' diff --git a/.gitignore b/.gitignore index fa9bbd6..b38e96f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /writable -/public/uploads \ No newline at end of file +/public/uploads + +/.env diff --git a/app/Models/BranchModel.php b/app/Models/BranchModel.php index 831eca7..faf2b95 100644 --- a/app/Models/BranchModel.php +++ b/app/Models/BranchModel.php @@ -5,7 +5,7 @@ class BranchModel extends Model { protected $table = 'branches'; protected $primaryKey = 'branch_id'; - protected $allowedFields = ['business_id','branch_id','branch_name','gstno','email','contact','address','city','state','country','postal_code','state_code','isactive']; + protected $allowedFields = ['business_id','branch_id','branch_name','gstno','email','contact','address','city','state','country','pin_code','state_code','isactive']; public function getBranchesByBusinessId($business_id) { diff --git a/app/Views/branch_list.php b/app/Views/branch_list.php index c8b755d..e275c26 100644 --- a/app/Views/branch_list.php +++ b/app/Views/branch_list.php @@ -187,7 +187,7 @@
- +
@@ -215,7 +215,12 @@ }else{ var url = ''; } - + var formDataValidate = $('#model_form_data').serialize(); // Serialize form data + + if(!formDataValidate){ + return ; + } + var formData = { business_id: $('#business').val(), gstno: $('#gst_no').val(), @@ -246,6 +251,7 @@ var business_id = $('#business_id').val(); // console.log(formData); + $('#business_branch_submit').attr('disabled','true'); $.ajax({ type: 'POST', url: url, @@ -253,6 +259,8 @@ dataType: 'json', success: function(response) { console.log(response); + $('#business_branch_submit').removeAttr('disabled'); + $('#bike_model_login-modal').modal('hide'); window.location.reload(); diff --git a/app/Views/client_branch_list.php b/app/Views/client_branch_list.php index f5ac84f..a1017ea 100644 --- a/app/Views/client_branch_list.php +++ b/app/Views/client_branch_list.php @@ -103,7 +103,7 @@
- +
@@ -235,9 +235,8 @@ }) function submitBranch(event,params) { - event.preventDefault(); + // event.preventDefault(); - console.log($('#client').val()); if ($('#client').val() == 0) { toastr.warning('Select Client'); return; @@ -265,6 +264,11 @@ var url = ''; } + var formDataValidate = $('#client_branch_model_form_data').serialize(); // Serialize form data + + if(!formDataValidate){ + return ; + } var form = $(params).parent().parent(); var isValid = true; @@ -277,7 +281,7 @@ if (!isValid) { return; } - + $('#client_branch_submit').attr('disabled','true'); $.ajax({ type: 'POST', url: url, @@ -285,6 +289,7 @@ dataType: 'json', success: function(response) { console.log(response); + $('#client_branch_submit').removeAttr('disabled'); if(response == true){ toastr.success('Branch Added Successfully'); $('#client_branch_modal').modal('hide'); diff --git a/app/Views/client_docs_preview.php b/app/Views/client_docs_preview.php index b17243d..16fe410 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -12,6 +12,23 @@ padding-top: 3px; } + @media (max-width: 992px) { + + .row > .col-2 { + flex: 0 0 0%; + max-width: 0%; + } + .row > .col-8 { + flex: 0 0 100%; + max-width: 100%; + } + } + + @media (max-width: 767.98px) { + .pro-user-name { + display: block !important; + } + } @@ -19,6 +36,11 @@
+
@@ -41,7 +63,7 @@ is_active == 1 && $docData->is_approved == 0){ ?> - Revert + Revert is_active == 0 ) { ?> Share @@ -67,30 +89,30 @@
-
-
-
-
+
+
+
+
-
- -
- -
- -
- is_approved == 1){ echo '
Approved at '.date('d-m-Y H:i:s', strtotime($docData->updated_at)).' through OTP sent to '.$clientData->mobile_no.' from ip address '.$docData->ip_address.'
'; } ?> -
-
- - - +
+
+ +
+ +
+ is_approved == 1){ echo '
Approved at '.date('d-m-Y H:i:s', strtotime($docData->updated_at)).' through OTP sent to '.$clientData->mobile_no.' from ip address '.$docData->ip_address.'
'; } ?> +
+
+ + +
-
-
+
+
+
@@ -333,7 +355,8 @@ // Get the HTML content of the element as a string var htmlContent = element.innerHTML; - + $('.loader').fadeIn(); + $('.loader-mask').fadeIn(); $.ajax({ url: '', method: 'POST', @@ -368,17 +391,22 @@ } }, - error: function(xhr, status, error) { - + error: function(xhr, status, error) { + + $('.loader').fadeOut(); + $('.loader-mask').fadeOut('slow'); console.error('Error : ' + error); } }); + + $('.loader').fadeOut(); + $('.loader-mask').fadeOut('slow'); }); }); function statusChange(params) { - console.log(params); + // console.log(params); var status = params.getAttribute('data-isactive'); var doc_id = params.getAttribute('data-id'); if(status == 1){ @@ -387,6 +415,11 @@ var is_active= 1; } + if($(params).attr('title') == 'Share'){ + $('.loader').fadeIn(); + $('.loader-mask').fadeIn(); + } + var formData = { doc_id: doc_id, is_active: is_active @@ -397,11 +430,15 @@ data: formData, dataType: 'json', success: function(response) { + $('.loader').fadeOut(); + $('.loader-mask').fadeOut('slow'); if (response.data) { window.location.reload(); } }, error: function(xhr, status, error) { + $('.loader').fadeOut(); + $('.loader-mask').fadeOut('slow'); // Handle error response here console.error(xhr.responseText); } diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 57f59ba..9090800 100644 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -151,7 +151,7 @@
- +
@@ -215,6 +215,7 @@ if (!isValid) { return; } + $('#client_submit_button').attr('disabled','true') $.ajax({ type: 'POST', url: url, diff --git a/app/Views/staff_form.php b/app/Views/staff_form.php index 697f394..487684c 100644 --- a/app/Views/staff_form.php +++ b/app/Views/staff_form.php @@ -145,7 +145,7 @@
- @@ -182,7 +182,6 @@ $(document).ready(function() { var staffData = ; var action = staffData ? '' : ''; - console.log(action); $.ajax({ type: 'POST', diff --git a/app/Views/staff_profile.php b/app/Views/staff_profile.php index ef975a3..6d8b845 100644 --- a/app/Views/staff_profile.php +++ b/app/Views/staff_profile.php @@ -6,37 +6,9 @@
-
-
-
-

name; ?>

-

@role; ?>

-
-
- - - - - - - - - - - - - - - - -
Full Name :name; ?>
Mobile :mobile_no; ?>
Email :email; ?>
-
-
-
-
-
-
+ +
@@ -44,28 +16,28 @@
Personal Info
-
+
-
+
-
+ -
-
+ +
-
+