From 905af4ef8fe7d9cd37c4d7b3308d0ef6aa657049 Mon Sep 17 00:00:00 2001 From: Mouhamed Lamine Date: Tue, 21 Aug 2018 16:56:47 +0800 Subject: [PATCH] Delivery CRUD Fix --- .../Controllers/DeliveryInfoController.php | 19 +-- public/home.html | 146 +++++++++++------- routes/api.php | 6 +- 3 files changed, 103 insertions(+), 68 deletions(-) diff --git a/app/Http/Controllers/DeliveryInfoController.php b/app/Http/Controllers/DeliveryInfoController.php index d7959aa..14d2d53 100644 --- a/app/Http/Controllers/DeliveryInfoController.php +++ b/app/Http/Controllers/DeliveryInfoController.php @@ -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); } } diff --git a/public/home.html b/public/home.html index 20b8e97..db4a946 100644 --- a/public/home.html +++ b/public/home.html @@ -168,7 +168,7 @@
-
+
@@ -1028,7 +1028,7 @@
-

Edit Warehouse

+

Edit Delivery

@@ -1036,70 +1036,72 @@
+
+ +
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- - + +
@@ -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('
'+deliName+'
'); + }); + + } + }); + } + jQuery.noConflict(); jQuery(document).ready(function ($) { console.log( "ready!" ); - $.ajax({ - type: "GET", - url: 'api/deliveryinfo/', - success: function (response) { - var element = '
'+response.deli_info +'
'; - 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 = '
Delivery '+count+'
'; - $(".list-box-non").append(deliveryListItem); + var deliveryListItem = '
'+count+' New Delivery Added
'; + $("#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(); + } }); - }); + } + diff --git a/routes/api.php b/routes/api.php index 2a0d129..9ed07d4 100644 --- a/routes/api.php +++ b/routes/api.php @@ -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 */