From 24d23833181da63ef5fe4fdffd6e54d34e45bf1a Mon Sep 17 00:00:00 2001
From: Mouhamed Lamine <mouhamedlaminebah@gmail.com>
Date: Fri, 24 Aug 2018 17:19:46 +0800
Subject: [PATCH] Dynamic Delivery CRUD FIX

---
 .../Controllers/DeliveryInfoController.php    |  7 +-
 public/home.html                              | 67 ++++++++++---------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/app/Http/Controllers/DeliveryInfoController.php b/app/Http/Controllers/DeliveryInfoController.php
index 14d2d53..4a5c20e 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 = Deliveryinfo::all();  
+        $deliveryinfos = Deliveryinfo::orderBy('id', 'desc')->get(); 
         return response()->json($deliveryinfos, 200);
     }
     
@@ -64,13 +64,14 @@ class DeliveryinfoController extends Controller
     public function update(Request $request, $id)
     {
         $user = Auth::user();
+        
         //$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
-        $deliveryinfo = Deliveryinfo::find($id)->first();
+        $deliveryinfo = Deliveryinfo::find($id);
         if (!$deliveryinfo)
         {
             return response()->json(['message'=>'Access Denied!'], 404);
         }
-
+        
         $deliveryinfo->deli_info = $request->input('deli_info');
         $deliveryinfo->address = $request->input('address');
         $deliveryinfo->city = $request->input('city');
diff --git a/public/home.html b/public/home.html
index db4a946..a7f2668 100644
--- a/public/home.html
+++ b/public/home.html
@@ -958,7 +958,9 @@
                 <div class="popup-content">
                     <form id="PopUp3Form" action="#" method="POST">
                         <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-element-title">
                                     <label style="color: #000">Delivery Information Name</label>
@@ -1313,9 +1315,9 @@
                             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>');
@@ -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(document).ready(function ($) {
                 console.log( "ready!" );
@@ -1332,6 +1354,7 @@
                 var count = 1;
                 $('#PopUp3Form').on('submit',function(e){
                     e.preventDefault();
+                    var id = $("#deli_id").val();
                     $.ajax({
                         type: "POST",
                         headers:{"Authorization": "Bearer " + localStorage.getItem('token')},
@@ -1346,37 +1369,15 @@
                             contact_person: $('#deli_contact_person').val(),
                             contact_person_no: $('#deli_contact_person_no').val(),
                         },
-                        success: function (data) {
-                            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>';
+                        success: function (response) {
+    
+                            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);
                             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() {
                 var id = $("#deliv_id").val();
                 console.log('Delivery Update Initiated.');
@@ -1395,14 +1396,15 @@
                             contact_person_no: $('#deliv_contact_person_no').val(),
                         },
                         success: function (data) {
-                            alert('Delivery Updated!');
+                            console.log('Delivery Updated!');
+                            $('#deliveryList').children('.list-box-emp').remove();
+                            displayDeliveries();
                         }
                     });
             }
 
             function deleteDelivery() {
                 var id = $("#deliv_id").val();
-                console.log('Delivery Update Initiated.');
                  $.ajax({
                     type: "DELETE",
                     url: 'api/deliveryinfo/'+id,
@@ -1412,7 +1414,8 @@
                     },
                     success: function (data) {
                          console.log('Delivery Deleted!');
-                         $('.delivery-list-item'+id+'').remove();
+                         $('#deliveryList').children('.list-box-emp').remove();
+                         displayDeliveries();
                     }
                 });
             }