mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git
synced 2026-08-19 04:24:01 +00:00
Delivery CRUD Fix
This commit is contained in:
Mouhamed Lamine
@@ -12,7 +12,7 @@ class DeliveryinfoController extends Controller
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$deliveryinfos = App\Deliveryinfo::all();
|
||||
$deliveryinfos = Deliveryinfo::all();
|
||||
return response()->json($deliveryinfos, 200);
|
||||
}
|
||||
|
||||
@@ -24,8 +24,8 @@ class DeliveryinfoController extends Controller
|
||||
*/
|
||||
public function show(Deliveryinfo $id)
|
||||
{
|
||||
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->first();
|
||||
|
||||
//$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->first();
|
||||
$deliveryinfo = Deliveryinfo::find($id)->first();
|
||||
return response()->json($deliveryinfo, 200);
|
||||
}
|
||||
|
||||
@@ -63,8 +63,9 @@ class DeliveryinfoController extends Controller
|
||||
*/
|
||||
public function update(Request $request, $id)
|
||||
{
|
||||
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||
|
||||
$user = Auth::user();
|
||||
//$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||
$deliveryinfo = Deliveryinfo::find($id)->first();
|
||||
if (!$deliveryinfo)
|
||||
{
|
||||
return response()->json(['message'=>'Access Denied!'], 404);
|
||||
@@ -78,7 +79,7 @@ class DeliveryinfoController extends Controller
|
||||
$deliveryinfo->country = $request->input('country');
|
||||
$deliveryinfo->contact_person = $request->input('contact_person');
|
||||
$deliveryinfo->contact_person_no = $request->input('contact_person_no');
|
||||
$deliveryinfo->com_id = $user->company();
|
||||
$deliveryinfo->com_id = $user->company()->first()->id;
|
||||
$deliveryinfo->save();
|
||||
|
||||
return response()->json(['deliveryinfo'=>$deliveryinfo],200);
|
||||
@@ -93,8 +94,8 @@ class DeliveryinfoController extends Controller
|
||||
*/
|
||||
public function destroy(Deliveryinfo $id)
|
||||
{
|
||||
$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();
|
||||
if (!$deliveryinfo)
|
||||
{
|
||||
return response()->json(['message'=>'Access Denied!'], 404);
|
||||
@@ -102,6 +103,6 @@ class DeliveryinfoController extends Controller
|
||||
|
||||
$deliveryinfo->delete($id);
|
||||
|
||||
return response()->json($deliveryinfo, 204);
|
||||
return response()->json(['deliveryinfo'=>$deliveryinfo], 204);
|
||||
}
|
||||
}
|
||||
|
||||
+90
-56
@@ -168,7 +168,7 @@
|
||||
<!-- Page Content Start Here -->
|
||||
<main>
|
||||
<!-- SEARCH START -->
|
||||
<div class="list-box-non">
|
||||
<div class="list-box-non" id="deliveryList">
|
||||
<a class="list-item" data-popup="formPopup3">
|
||||
<i class="fa fa-truck"></i>
|
||||
<em class="seperate"></em>
|
||||
@@ -1028,7 +1028,7 @@
|
||||
<!-- if you dont want overlay add class .no-overlay -->
|
||||
<div class="popup-container">
|
||||
<div class="popup-header">
|
||||
<h3 class="popup-title">Edit Warehouse</h3>
|
||||
<h3 class="popup-title">Edit Delivery</h3>
|
||||
<span class="popup-close" data-dismiss="true">
|
||||
<i class="fa fa-times"></i>
|
||||
</span>
|
||||
@@ -1036,70 +1036,72 @@
|
||||
<div class="popup-content">
|
||||
|
||||
<div class="form-row-group with-icons-no-padding">
|
||||
<div class="form-row no-padding">
|
||||
<input type="hidden" id="deliv_id">
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Warehouse Name</label>
|
||||
<label style="color: #000">Delivery Info</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_info" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Warehouse Address</label>
|
||||
<label style="color: #000">Delivery Address</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="Jalan Persiaran Apec" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_address" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Warehouse City</label>
|
||||
<label style="color: #000">City</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="Cyberjaya" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_city" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Warehouse Postcode</label>
|
||||
<label style="color: #000">Postcode</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="63000" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_postcode" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Warehouse State</label>
|
||||
<label style="color: #000">State</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="Selangor" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_state" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Warehouse Country</label>
|
||||
<label style="color: #000">Country</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="Malaysia" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_country" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Contact Person</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="Lamine" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_contact_person" required />
|
||||
</div>
|
||||
|
||||
<div class="form-row no-padding">
|
||||
<div class="form-element-title">
|
||||
<label style="color: #000">Contact Person No</label>
|
||||
</div>
|
||||
<input type="text" class="form-element" value="019-7951905" required />
|
||||
<input type="text" class="form-element" value="" id="deliv_contact_person_no" required />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="popup-footer">
|
||||
<button id="updateDelivery" class="button blue" data-dismiss="true">Edit Warehouse</button>
|
||||
<button class="button blue" data-dismiss="true">Delete Warehouse</button>
|
||||
<button onclick="updateDelivery()" class="button blue" data-dismiss="true">Edit Delivery</button>
|
||||
<button onclick="deleteDelivery()" class="button blue" data-dismiss="true">Delete Delivery</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1303,25 +1305,33 @@
|
||||
document.getElementById("branchText8").value = document.getElementById(type).value.textContent =
|
||||
"Populate Contact Person No";
|
||||
}
|
||||
function displayDeliveries() {
|
||||
console.log("Displayed");
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: 'api/deliveryinfo/',
|
||||
headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
|
||||
dataType: 'json',
|
||||
success: function (data) {
|
||||
console.log(data);
|
||||
data.forEach(element => {
|
||||
console.log(element);
|
||||
var deliName = element.deli_info;
|
||||
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>');
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
jQuery.noConflict();
|
||||
jQuery(document).ready(function ($) {
|
||||
console.log( "ready!" );
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: 'api/deliveryinfo/',
|
||||
success: function (response) {
|
||||
var element = '<div class="list-box-emp"><a href="#" class="list-item" data-popup="formPopup4"><i class="fa fa-truck"></i><em class="seperate"></em><span class="list-item-title"> '+response.deli_info +'</span></a></div>';
|
||||
response.forEach(element => {
|
||||
(".list-box-non").append(element);
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
displayDeliveries();
|
||||
var count = 1;
|
||||
$('#PopUp3Form').on('submit',function(e){
|
||||
e.preventDefault();
|
||||
console.log("test");
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
|
||||
@@ -1338,19 +1348,42 @@
|
||||
},
|
||||
success: function (data) {
|
||||
console.log('Form submitted!');
|
||||
var deliveryListItem = '<div class="list-box-emp"><a href="#" class="list-item" data-popup="formPopup4"><i class="fa fa-truck"></i><em class="seperate"></em><span class="list-item-title"> Delivery '+count+'</span></a></div>';
|
||||
$(".list-box-non").append(deliveryListItem);
|
||||
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>';
|
||||
$("#deliveryList").append(deliveryListItem);
|
||||
count++;
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
$(function () {
|
||||
$('updateDelivery').on('click', function () {
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: '/deliveryinfo/{com_id}',
|
||||
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() {
|
||||
var id = $("#deliv_id").val();
|
||||
console.log('Delivery Update Initiated.');
|
||||
$.ajax({
|
||||
type: "PUT",
|
||||
url: 'api/deliveryinfo/'+id,
|
||||
headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
|
||||
data: {
|
||||
deli_info: $('#deliv_info').val(),
|
||||
address: $('#deliv_address').val(),
|
||||
@@ -1363,26 +1396,27 @@
|
||||
},
|
||||
success: function (data) {
|
||||
alert('Delivery Updated!');
|
||||
$("#").append()
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
$(function () {
|
||||
$('deleteDelivery').on('click', function () {
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
type: "DELETE",
|
||||
url: '/deliveryinfo/{com_id}',
|
||||
data: {
|
||||
|
||||
},
|
||||
success: function (data) {
|
||||
alert('Delivery Deleted!');
|
||||
}
|
||||
});
|
||||
function deleteDelivery() {
|
||||
var id = $("#deliv_id").val();
|
||||
console.log('Delivery Update Initiated.');
|
||||
$.ajax({
|
||||
type: "DELETE",
|
||||
url: 'api/deliveryinfo/'+id,
|
||||
headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
|
||||
data: {
|
||||
id: $('#deliv_id').val(),
|
||||
},
|
||||
success: function (data) {
|
||||
console.log('Delivery Deleted!');
|
||||
$('.delivery-list-item'+id+'').remove();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
<!-- Change Header Title Acccording To The Tab Title End Here -->
|
||||
<script src="js/global.script.js"></script>
|
||||
|
||||
+3
-3
@@ -55,10 +55,10 @@ Route::group(['middleware' => ['jwt.auth']], function() {
|
||||
|
||||
// Delivery-Info
|
||||
Route::get('/deliveryinfo/','DeliveryinfoController@index');
|
||||
Route::get('/deliveryinfo/{com_id}','DeliveryinfoController@show');
|
||||
Route::get('/deliveryinfo/{id}','DeliveryinfoController@show');
|
||||
Route::post('/deliveryinfo', 'DeliveryinfoController@store');
|
||||
Route::put('/deliveryinfo/{com_id}', 'DeliveryinfoController@update');
|
||||
Route::delete('/deliveryinfo/{com_id}', 'DeliveryinfoController@destroy');
|
||||
Route::put('/deliveryinfo/{id}', 'DeliveryinfoController@update');
|
||||
Route::delete('/deliveryinfo/{id}', 'DeliveryinfoController@destroy');
|
||||
|
||||
|
||||
/* Company */
|
||||
|
||||
Reference in New Issue
Block a user