muadzmi02
/
allo
forked from SwissLink/allo
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Edit street in dashboard

ifah
Siti Hajar Ibrahim 4 years ago
parent
5bd5d2f714
commit
fb56a3181b
5 changed files with 209 additions and 40 deletions
Split View Show Diff Stats
  1. 1
    1
      app/Http/Controllers/Contractor/WorkOrderController.php
  2. 7
    9
      app/Http/Controllers/CustomerService/CustomerController.php
  3. 17
    10
      app/Http/Controllers/CustomerService/WorkOrderController.php
  4. 43
    2
      resources/views/customer-service/edit_subscriber.blade.php
  5. 141
    18
      resources/views/customer-service/view_wo_formR.blade.php

+ 1
- 1
app/Http/Controllers/Contractor/WorkOrderController.php View File

@@ -77,7 +77,7 @@ class WorkOrderController extends Controller

$w = WorkOrder::where('wo',$wo)->first();
$form = Form::with('Subscriber','WorkOrder')->where('_id',$w->_id)->first();
$coverage = Coverage::all();
$coverage = Coverage::groupBy('building_name')->orderBy('building_name')->get();

$installer = Staff::with('StaffDetail')->where('_id',$w->installer_id)->first();
if(empty($installer)){

+ 7
- 9
app/Http/Controllers/CustomerService/CustomerController.php View File

@@ -50,7 +50,7 @@ class CustomerController extends Controller
$ss = count(WorkOrder::where('status','Suspend')->get());
$cm = count(WorkOrder::where('status','Completed')->get());

$coverage = Coverage::all();
$coverage = Coverage::groupBy('building_name')->orderBy('building_name')->get();
$company = Company::where('team','Dealer')->get();

return view('customer-service.view_customer',compact('user','pp','sp','rs','ss','cm','coverage','company'));
@@ -441,7 +441,7 @@ class CustomerController extends Controller
$ss = count(WorkOrder::where('status','Suspend')->get());
$cm = count(WorkOrder::where('status','Completed')->get());

$coverage = Coverage::all();
$coverage = Coverage::groupBy('building_name')->orderBy('building_name')->get();
$form = Subscriber::with('Form')->where('_id',$subscriber_id)->first();
return view('customer-service.edit_subscriber',compact('user','pp','sp','rs','ss','cm','form','coverage'));
}
@@ -457,14 +457,11 @@ class CustomerController extends Controller

if($form->Form->type_application == 'R'){

if($request->street != null){
$street = $request->street;
}

$cov = Coverage::where('building_name',$request->building)->first();
$cov = Coverage::where('building_name',$request->building)->where('street',$request->street)->first();
if(!empty($cov)){
$building = $cov->building_name;
$street = $cov->street;
$postcode = $cov->postcode;
$city = $cov->city;
$state = $cov->state;
@@ -499,10 +496,11 @@ class CustomerController extends Controller
$fax = $request->company_fax;
}
$cov = Coverage::where('building_name',$request->building)->first();
$cov = Coverage::where('building_name',$request->building)->where('street', $request->street)->first();
if(!empty($cov)){
$building = $cov->building_name;
$street = $cov->street;
$postcode = $cov->postcode;
$city = $cov->city;
$state = $cov->state;
@@ -689,7 +687,7 @@ class CustomerController extends Controller
$re = count(Form::where('type_application','R')->get());
$bu = count(Form::where('type_application','B')->get());

$coverage = Coverage::all();
$coverage = Coverage::groupBy('building_name')->orderBy('building_name')->get();
$company = Company::where('team','Dealer')->get();

return view('customer-service.view_subscriber', compact('user','pp','sp','rs','ss','cm','rec','re','bu','coverage','company'));

+ 17
- 10
app/Http/Controllers/CustomerService/WorkOrderController.php View File

@@ -72,7 +72,7 @@ class WorkOrderController extends Controller

$w = WorkOrder::where('wo',$wo)->first();
$form = Form::with('Subscriber','WorkOrder')->where('_id',$w->_id)->first();
$coverage = Coverage::all();
$coverage = Coverage::groupBy('building_name')->orderBy('building_name')->get();

if($w->contractor_id != ''){
$company = Company::where('_id',$w->contractor_id)->first();
@@ -193,7 +193,7 @@ class WorkOrderController extends Controller

$w = WorkOrder::where('wo',$wo)->first();
$form = Form::with('Subscriber','WorkOrder')->where('_id',$w->_id)->first();
$coverage = Coverage::all();
$coverage = Coverage::groupBy('building_name')->orderBy('building_name')->get();
$company = Company::where('_id',$w->contractor_id)->first();

return view('customer-service.confirm_work_order', compact('user','pp','sp','rs','ss','cm','pc','pi','form','coverage','wo','company'));
@@ -210,7 +210,7 @@ class WorkOrderController extends Controller
$ss = count(WorkOrder::where('status','Suspend')->get());
$cm = count(WorkOrder::where('status','Completed')->get());

$coverage = Coverage::where('Type','R')->get();
$coverage = Coverage::where('Type', 'R')->groupBy('building_name')->orderBy('building_name')->get();
$product = Product::where('formT','R')->get();

return view('customer-service.view_wo_formR', compact('user','pp','sp','rs','ss','cm','pc','pi','coverage','product'));
@@ -1468,7 +1468,7 @@ class WorkOrderController extends Controller
$su_id = strtoupper('CBB-'.$this->random_code(6).'R');
} while (Subscriber::where("subscriber_id", "=", $su_id)->first() instanceof Subscriber);

$coverage = Coverage::where('_id',$request->buildingsss)->first();
$coverage = Coverage::where('building_name',$request->buildingsss)->where('street',$request->street)->first();

$sdl = new Subscriber();
$sdl->subscriber_id = $su_id;
@@ -1482,7 +1482,7 @@ class WorkOrderController extends Controller
$sdl->phone2 = $request->phone2;
$sdl->unit_no = $request->unit_no;
$sdl->building_name = $coverage->building_name;
$sdl->street = $request->street;
$sdl->street = $coverage->street;
$sdl->postcode = $coverage->postcode;
$sdl->city = $coverage->city;
$sdl->state = $coverage->state;
@@ -1639,15 +1639,22 @@ class WorkOrderController extends Controller
'remark_form' => ''
]);

$building = '-'; $postcode = '-'; $city = '-'; $state = '-';
$coverage = Coverage::where('_id',$request->buildingssss,'Type','R')->first();
$building = '-'; $postcode = '-'; $city = '-'; $state = '-';
if ($request->has('buildingsss')){
$coverage = Coverage::where('building_name', $request->buildingssss, 'Type', 'R', 'street', $request->streets)->first();
} else if ($request->has('buildingssss')){
$coverage = Coverage::where('building_name', $request->buildingsssss, 'Type', 'R', 'street', $request->streetss)->first();
}
if(!empty($coverage)){
$building = $coverage->building_name;
$building = $coverage->building_name;
$street = $coverage->street;
$postcode = $coverage->postcode;
$city = $coverage->city;
$state = $coverage->state;
}else {
$building = $request->buildingssss;
$building = $request->buildingssss;
$street = '-';
$postcode = '-';
$city = '-';
$state = '-';
@@ -1665,7 +1672,7 @@ class WorkOrderController extends Controller
$sdl->phone2 = $request->phone2;
$sdl->unit_no = $request->unit_no;
$sdl->building_name = $building;
$sdl->street = $request->street;
$sdl->street = $street;
$sdl->postcode = $postcode;
$sdl->city = $city;
$sdl->state = $state;

+ 43
- 2
resources/views/customer-service/edit_subscriber.blade.php View File

@@ -139,7 +139,9 @@
</div>
<div class="grid4">
<label><b>Street : </b></label>
<input type="text" name="street" id="street" value="{{ $form->street }}" />
<select id="street" name="street" class="styled" required aria-required="true">
<option value>Select Street</option>
</select>
</div>
<div class="grid2">&nbsp;</div>
</div>
@@ -304,7 +306,9 @@
</div>
<div class="grid4">
<label><b>Street : </b></label>
<input type="text" name="street" id="street" value="{{ $form->street }}" />
<select id="street" name="street" class="styled" required aria-required="true">
<option value>Select Street</option>
</select>
</div>
<div class="grid2">&nbsp;</div>
</div>
@@ -394,4 +398,41 @@
@endsection

@section('external_js')
<script type="text/javascript">
$('#building').change(function(){
if( $(this).val()==""){
$("#street").prop("checked", false);
$('#street').empty();
$('#street').append('<option value="">Please choose street</option>');
}
else {
$('#street').empty();
$('#street').append('<option value="">Please choose street</option>');

$.ajax({
type: "GET",
url: "{{ url('api/get-street') }}"+"/"+$(this).val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#street').append('<option value="' + d.street + '">' + d.street + '</option>');
$('#street').prop('required',true);
});
}
});
}
});
$('#street').change(function(){
$.ajax({
type: "GET",
url: "{{ url('api/get-coverage-detail') }}"+"/"+$('#coverage').val()+"/"+$('#street').val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#city').val(d.city);
$('#state').val(d.state);
$('#postcode').val(d.postcode);
});
}
});
});
</script>
@endsection

+ 141
- 18
resources/views/customer-service/view_wo_formR.blade.php View File

@@ -143,8 +143,8 @@
<label><b>Building<small style="color: red"> * </small>: </b></label>
<select class="styled" id="buildingsss" name="buildingsss" required>
<option value="">Choose building</option>
@foreach($coverage as $c)
<option value="{{ $c->_id }}">{{ $c->building_name }}</option>
@foreach($coverage as $c)
<option value="{{ $c->building_name }}">{{ $c->building_name }}</option>
@endforeach
</select>
</div>
@@ -153,6 +153,17 @@

<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid8">
<label><b>Street<small style="color: red"> * </small>: </b></label>
<select id="street" name="street" class="styled" required aria-required="true">
<option value>Select Street</option>
</select>
</div>
<div class="grid2">&nbsp;</div>
</div>

<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Package<small style="color: red"> * </small>: </b></label></div>
<div class="grid6">
<select class="styled" id="package" name="package" required>
@@ -536,8 +547,8 @@
<label><b>Building<small style="color: red"> * </small>: </b></label>
<select class="styled" id="buildingssss" name="buildingssss" required>
<option value="">Choose building</option>
@foreach($coverage as $c)
<option value="{{ $c->_id }}">{{ $c->building_name }}</option>
@foreach($coverage as $c)
<option value="{{ $c->building_name }}">{{ $c->building_name }}</option>
@endforeach
</select>
</div>
@@ -546,9 +557,11 @@
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Street : </b></label></div>
<div class="grid6">
<textarea rows="3" cols="" name="street" id="street" class="auto" style="overflow: hidden; word-wrap: break-word; resize: horizontal; height: 70px;"></textarea>
<div class="grid8">
<label><b>Street<small style="color: red"> * </small>: </b></label>
<select id="streets" name="streets" class="styled" required aria-required="true">
<option value>Select Street</option>
</select>
</div>
<div class="grid2">&nbsp;</div>
</div>
@@ -605,7 +618,7 @@
<div id="formNFSP">
<form action="{{ url('/customer-service/submit-form-secured-developement') }}" class="main cussPayment" method="POST" enctype="multipart/form-data" id="securedForm" name="securedForm">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="buildingssss" value="-">
{{-- <input type="hidden" name="buildingssss" value="-"> --}}
<input type="hidden" name="citizensss" value="-">
<fieldset>
<div class="widget grid2 widgetH"></div>
@@ -942,22 +955,24 @@
<input type="text" name="unit_no" id="unit_no" required />
</div>
<div class="grid4">
<!-- <label><b>Building<small style="color: red"> * </small>: </b></label>
<select class="styled" id="buildingssss" name="buildingssss" required>
<label><b>Building<small style="color: red"> * </small>: </b></label>
<select class="styled" id="buildingsssss" name="buildingsssss" required>
<option value="">Choose building</option>
@foreach($coverage as $c)
<option value="{{ $c->_id }}">{{ $c->building_name }}</option>
@foreach($coverage as $c)
<option value="{{ $c->building_name }}">{{ $c->building_name }}</option>
@endforeach
</select> -->
</select>
</div>
<div class="grid2">&nbsp;</div>
</div>
<div class="formRow">
<div class="grid2">&nbsp;</div>
<div class="grid2"><label><b>Street : </b></label></div>
<div class="grid6">
<textarea rows="3" cols="" name="street" id="street" class="auto" style="overflow: hidden; word-wrap: break-word; resize: horizontal; height: 70px;"></textarea>
<div class="grid8">
<label><b>Street<small style="color: red"> * </small>: </b></label>
<select id="streetss" name="streetss" class="styled" required aria-required="true">
<option value>Select Street</option>
</select>
</div>
<div class="grid2">&nbsp;</div>
</div>
@@ -1051,7 +1066,43 @@
$('#buildingsss').append($('<option></option>').attr('value', entry.name).text(entry.name));
});
}
});
});

$('#buildingsss').change(function(){
if( $(this).val()==""){
$("#street").prop("checked", false);
$('#street').empty();
$('#street').append('<option value="">Please choose street</option>');
}
else {
$('#street').empty();
$('#street').append('<option value="">Please choose street</option>');

$.ajax({
type: "GET",
url: "{{ url('api/get-street') }}"+"/"+$(this).val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#street').append('<option value="' + d.street + '">' + d.street + '</option>');
$('#street').prop('required',true);
});
}
});
}
});
$('#street').change(function(){
$.ajax({
type: "GET",
url: "{{ url('api/get-coverage-detail') }}"+"/"+$('#coverage').val()+"/"+$('#street').val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#city').val(d.city);
$('#state').val(d.state);
$('#postcode').val(d.postcode);
});
}
});
});

//$(".styled, input:radio, input:checkbox, .dataTables_length select").uniform();
@@ -1076,7 +1127,43 @@
$('#buildingssss').append($('<option></option>').attr('value', entry.name).text(entry.name));
});
}
});
});

$('#buildingssss').change(function(){
if( $(this).val()==""){
$("#streets").prop("checked", false);
$('#streets').empty();
$('#streets').append('<option value="">Please choose street</option>');
}
else {
$('#streets').empty();
$('#streets').append('<option value="">Please choose street</option>');

$.ajax({
type: "GET",
url: "{{ url('api/get-street') }}"+"/"+$(this).val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#streets').append('<option value="' + d.street + '">' + d.street + '</option>');
$('#streets').prop('required',true);
});
}
});
}
});
$('#streets').change(function(){
$.ajax({
type: "GET",
url: "{{ url('api/get-coverage-detail') }}"+"/"+$('#coverage').val()+"/"+$('#street').val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#city').val(d.city);
$('#state').val(d.state);
$('#postcode').val(d.postcode);
});
}
});
});

//$(".styled, input:radio, input:checkbox, .dataTables_length select").uniform();
}else if($('#type_customer').val() == "formNFSP"){
@@ -1104,6 +1191,42 @@
// });

//$(".styled, input:radio, input:checkbox, .dataTables_length select").uniform();

$('#buildingsssss').change(function(){
if( $(this).val()==""){
$("#streetss").prop("checked", false);
$('#streetss').empty();
$('#streetss').append('<option value="">Please choose street</option>');
}
else {
$('#streetss').empty();
$('#streetss').append('<option value="">Please choose street</option>');

$.ajax({
type: "GET",
url: "{{ url('api/get-street') }}"+"/"+$(this).val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#streetss').append('<option value="' + d.street + '">' + d.street + '</option>');
$('#streetss').prop('required',true);
});
}
});
}
});
$('#street').change(function(){
$.ajax({
type: "GET",
url: "{{ url('api/get-coverage-detail') }}"+"/"+$('#coverage').val()+"/"+$('#street').val(),
success: function(result){
$.each(result.data, function(i, d) {
$('#city').val(d.city);
$('#state').val(d.state);
$('#postcode').val(d.postcode);
});
}
});
});
}
});


Write Preview
Loading…
Cancel
Save