diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 0f59bb3..85e3e6a 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -173,6 +173,7 @@ class UsersController extends Controller "bank_acc_number" => $req->bank_acc_number, "bank_acc_name" => $req->bank_acc_name, "status" => $req->status, + "status_sms" => $req->status_sms, "is_tracking" => $req->is_tracking, "vehicles" => $req->vehicles, "is_vdr_bcng" => $req->is_vdr_bcng, @@ -195,6 +196,7 @@ class UsersController extends Controller "bank_acc_number" => "nullable|numeric", "bank_acc_name" => "nullable|string|max:255", "status" => "required|integer|not_in:0", + "status_sms" => "required|integer", "is_tracking" => "nullable|numeric", "vehicles" => "nullable|array", "is_vdr_bcng" => "nullable|numeric", @@ -294,6 +296,7 @@ class UsersController extends Controller "crt_by" => $req->auth->uid, "updt" => $now, "updt_by" => $req->auth->uid, + "status_sms" => $req->status_sms, ]; if ($req->roles == Users::ROLE_CHECKER) { // $data['chk_type'] = $req->chk_type; @@ -352,6 +355,7 @@ class UsersController extends Controller "bank_acc_number" => $req->bank_acc_number, "bank_acc_name" => $req->bank_acc_name, "is_vdr_bcng" => $req->is_vdr_bcng, + "status_sms" => $req->status_sms, ]; $rulesInput = [ "uid" => "required|integer|not_in:0", @@ -365,6 +369,7 @@ class UsersController extends Controller "bank_acc_number" => "nullable|numeric", "bank_acc_name" => "nullable|string|max:255", "is_vdr_bcng" => "nullable|numeric", + "status_sms" => "required|integer", ]; $data = [ "id" => $req->uid, @@ -440,6 +445,7 @@ class UsersController extends Controller return new Response($apiResp, $apiResp["meta"]["code"]); } } + $data["status_sms"] = $req->status_sms; // validasi input $isValidInput = Validator::make($input, $rulesInput); diff --git a/resources/views/menu_v1/users.blade.php b/resources/views/menu_v1/users.blade.php index 82f3f8e..e125261 100755 --- a/resources/views/menu_v1/users.blade.php +++ b/resources/views/menu_v1/users.blade.php @@ -7,8 +7,8 @@ @section('customcss') @endsection @@ -200,6 +200,13 @@ +
+ +
+ + +
+
@@ -382,6 +389,13 @@
+
+ +
+ + +
+
@@ -456,18 +470,20 @@ Filter.activate(); }, event: function() { - $('#add-status').bind('change', function() { - if ($(this).is(':checked')) - $('#add-txtStatus').html('Active') - else - $('#add-txtStatus').html('Inactive') - }); - $('#updt-status').bind('change', function() { - if ($(this).is(':checked')) - $('#updt-txtStatus').html('Active') - else - $('#updt-txtStatus').html('Inactive') + $('#add-status, #add-status-sms, #updt-status, #updt-status-sms').bind('change', function() { + const labelSpan = $(this).closest('.form-check').find('span'); + labelSpan.html($(this).is(':checked') ? 'Active' : 'Inactive'); + // if ($(this).is(':checked')) + // $('#add-txtStatus').html('Active') + // else + // $('#add-txtStatus').html('Inactive') }); + // $('#updt-status').bind('change', function() { + // if ($(this).is(':checked')) + // $('#updt-txtStatus').html('Active') + // else + // $('#updt-txtStatus').html('Inactive') + // }); // $('#add-roles').on('change', function() { // let role = $('#add-roles').val(); // if (role == State.user_roles.checker) { @@ -781,6 +797,8 @@ data.status = State.user_status.inactive; } + data.status_sms = ($('#add-status-sms').prop('checked')) ? 1 : 0; + data.is_tracking = $('#add-is_tracking').val(); data.vehicles = $('#add-vehicles').val(); return data; @@ -920,6 +938,8 @@ }); }, passDataToView: function(data) { + console.log("data", data); + $('#updt-first_name').val(data.first_name); $('#updt-fulladdress').val(data.fulladdress); $('#updt-phone').val(data.phone); @@ -961,6 +981,8 @@ $('#updtUserModal').data('id', data.id); $('#updtUserModal').modal('show'); + + $('#updt-status-sms').prop('checked', (data.status_sms == 1) ? true : false).trigger('change'); }, getData: function() { let data = {}; @@ -996,6 +1018,8 @@ data.is_tracking = $('#updt-is_tracking').val(); data.vehicles = $('#updt-vehicles').val(); + data.status_sms = ($('#updt-status-sms').prop('checked')) ? 1 : 0; + return data; }, submitData: async function(data) {