cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-19 04:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic Delivery CRUD FIX

Browse Source
This commit is contained in:
Mouhamed Lamine
2018-08-24 17:19:46 +08:00
parent 905af4ef8f
commit 24d2383318
2 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/DeliveryInfoController.php
+3 -2
View File
@@ -12,7 +12,7 @@ class DeliveryinfoController extends Controller
{ {
public function index() public function index()
{ {
$deliveryinfos = Deliveryinfo::all(); $deliveryinfos = Deliveryinfo::orderBy('id', 'desc')->get();
return response()->json($deliveryinfos, 200); return response()->json($deliveryinfos, 200);
} }
@@ -64,8 +64,9 @@ class DeliveryinfoController extends Controller
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
$user = Auth::user(); $user = Auth::user();
//$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail(); //$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
$deliveryinfo = Deliveryinfo::find($id)->first(); $deliveryinfo = Deliveryinfo::find($id);
if (!$deliveryinfo) if (!$deliveryinfo)
{ {
return response()->json(['message'=>'Access Denied!'], 404); return response()->json(['message'=>'Access Denied!'], 404);
public/home.html
+34 -31
View File
@@ -958,7 +958,9 @@
<div class="popup-content"> <div class="popup-content">
<form id="PopUp3Form" action="#" method="POST"> <form id="PopUp3Form" action="#" method="POST">
<div class="form-row-group with-icons-no-padding"> <div class="form-row-group with-icons-no-padding">
<div class="form-row no-padding">
<input type="hidden" id="deli_id">
</div>
<div class="form-row no-padding"> <div class="form-row no-padding">
<div class="form-element-title"> <div class="form-element-title">
<label style="color: #000">Delivery Information Name</label> <label style="color: #000">Delivery Information Name</label>
@@ -1313,9 +1315,9 @@
headers:{"Authorization": "Bearer " + localStorage.getItem('token')}, headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
console.log(data);
data.forEach(element => { data.forEach(element => {
console.log(element);
var deliName = element.deli_info; var deliName = element.deli_info;
var deliId = element.id; var deliId = element.id;
$("#deliveryList").append('<div class="list-box-emp"><a href="#" class="list-item delivery-list-item" data-popup="formPopup4" onclick="showDelivery('+element.id+')"><i class="fa fa-truck"></i><em class="seperate"></em><span class="list-item-title">'+deliName+'</span></a></div>'); $("#deliveryList").append('<div class="list-box-emp"><a href="#" class="list-item delivery-list-item" data-popup="formPopup4" onclick="showDelivery('+element.id+')"><i class="fa fa-truck"></i><em class="seperate"></em><span class="list-item-title">'+deliName+'</span></a></div>');
@@ -1324,7 +1326,27 @@
} }
}); });
} }
function showDelivery(id) {
console.log("delivery has been clicked");
$.ajax({
type: "GET",
url: 'api/deliveryinfo/'+id,
headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
dataType: 'json',
success: function (response) {
$("#deliv_id").val(response.id);
$("#deliv_info").val(response.deli_info);
$('#deliv_address').val(response.address);
$('#deliv_city').val(response.city);
$('#deliv_postcode').val(response.postcode);
$('#deliv_state').val(response.state);
$('#deliv_country').val(response.country);
$('#deliv_contact_person').val(response.contact_person);
$('#deliv_contact_person_no').val(response.contact_person_no);
}
});
}
jQuery.noConflict(); jQuery.noConflict();
jQuery(document).ready(function ($) { jQuery(document).ready(function ($) {
console.log( "ready!" ); console.log( "ready!" );
@@ -1332,6 +1354,7 @@
var count = 1; var count = 1;
$('#PopUp3Form').on('submit',function(e){ $('#PopUp3Form').on('submit',function(e){
e.preventDefault(); e.preventDefault();
var id = $("#deli_id").val();
$.ajax({ $.ajax({
type: "POST", type: "POST",
headers:{"Authorization": "Bearer " + localStorage.getItem('token')}, headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
@@ -1346,37 +1369,15 @@
contact_person: $('#deli_contact_person').val(), contact_person: $('#deli_contact_person').val(),
contact_person_no: $('#deli_contact_person_no').val(), contact_person_no: $('#deli_contact_person_no').val(),
}, },
success: function (data) { success: function (response) {
console.log('Form submitted!');
var deliveryListItem = '<div class="list-box-emp"><a href="#" class="list-item delivery-list-item" data-popup="formPopup4"><i class="fa fa-truck"></i><em class="seperate"></em><span class="list-item-title">'+count+' New Delivery Added</span></a></div>'; var deliveryListItem = '<div class="list-box-emp"><a href="#" class="list-item delivery-list-item" data-popup="formPopup4" onclick="showDelivery('+response.deliveryinfo.id+')"><i class="fa fa-truck"></i><em class="seperate"></em><span class="list-item-title">'+count+' New Delivery Added</span></a></div>';
$("#deliveryList").append(deliveryListItem); $("#deliveryList").append(deliveryListItem);
count++; count++;
} }
}); });
}); });
}); });
function showDelivery(id) {
console.log("delivery has been clicked");
$.ajax({
type: "GET",
url: 'api/deliveryinfo/'+id,
headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
dataType: 'json',
success: function (response) {
console.log(response);
//$("#deliv_info").attr("value",response.deli_info);
$("#deliv_id").val(response.id);
$("#deliv_info").val(response.deli_info);
$('#deliv_address').val(response.address);
$('#deliv_city').val(response.city);
$('#deliv_postcode').val(response.postcode);
$('#deliv_state').val(response.state);
$('#deliv_country').val(response.country);
$('#deliv_contact_person').val(response.contact_person);
$('#deliv_contact_person_no').val(response.contact_person_no);
}
});
}
function updateDelivery() { function updateDelivery() {
var id = $("#deliv_id").val(); var id = $("#deliv_id").val();
console.log('Delivery Update Initiated.'); console.log('Delivery Update Initiated.');
@@ -1395,14 +1396,15 @@
contact_person_no: $('#deliv_contact_person_no').val(), contact_person_no: $('#deliv_contact_person_no').val(),
}, },
success: function (data) { success: function (data) {
alert('Delivery Updated!'); console.log('Delivery Updated!');
$('#deliveryList').children('.list-box-emp').remove();
displayDeliveries();
} }
}); });
} }
function deleteDelivery() { function deleteDelivery() {
var id = $("#deliv_id").val(); var id = $("#deliv_id").val();
console.log('Delivery Update Initiated.');
$.ajax({ $.ajax({
type: "DELETE", type: "DELETE",
url: 'api/deliveryinfo/'+id, url: 'api/deliveryinfo/'+id,
@@ -1412,7 +1414,8 @@
}, },
success: function (data) { success: function (data) {
console.log('Delivery Deleted!'); console.log('Delivery Deleted!');
$('.delivery-list-item'+id+'').remove(); $('#deliveryList').children('.list-box-emp').remove();
displayDeliveries();
} }
}); });
} }