From c8a79a40fe9590ddebf70dd63c02418385bd256d Mon Sep 17 00:00:00 2001
From: Asif <ferdous.asif2012@gmail.com>
Date: Mon, 2 Jul 2018 22:25:51 +0800
Subject: [PATCH] fetching branchname and popup

---
 .../Controllers/DeliveryInfoController.php    |  7 +++-
 public/home.html                              | 40 ++++++++++++++-----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/DeliveryInfoController.php b/app/Http/Controllers/DeliveryInfoController.php
index 66e32ad..23109fc 100644
--- a/app/Http/Controllers/DeliveryInfoController.php
+++ b/app/Http/Controllers/DeliveryInfoController.php
@@ -11,7 +11,8 @@ class DeliveryinfoController extends Controller
 {
     public function index()
     {
-        $deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->get();
+        $com_id = Auth::user()->company()->first()->id;
+        $deliveryinfo = Deliveryinfo::where('com_id', $com_id)->get();
         return response()->json($deliveryinfo, 200);
     }
     
@@ -23,7 +24,9 @@ class DeliveryinfoController extends Controller
      */
     public function show(Deliveryinfo $id)
     {
-        $deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
+        // TODO : make user company not array
+        $com_id = Auth::user()->company()->get()[0]['id'];
+        $deliveryinfo = Deliveryinfo::where('com_id', $com_id)->where('id', $id)->firstOrFail();
         return response()->json($deliveryinfo, 200);
     }
 
diff --git a/public/home.html b/public/home.html
index 56536b9..9fbb76e 100644
--- a/public/home.html
+++ b/public/home.html
@@ -643,7 +643,7 @@
                                     <!--</div>-->
                                     <div class="profile-menu-xAxisP">
                                         <a href="#">
-                                            <img class="avatar-img" id="del-inf" src="images/Azure-DeliveryIcon.png" width="80" height="80" />
+                                            <img class="avatar-img" id="del-info-btn" src="images/Azure-DeliveryIcon.png" width="80" height="80" />
                                             <div>
                                                 Delivery Information
                                             </div>
@@ -1305,6 +1305,8 @@
 
     <script type="text/javascript">
         $(document).ready(function() {
+
+
             $('#del-info').click(function() {
                 $.ajax({
                     type: "POST",
@@ -1341,24 +1343,40 @@
             })
 
 
-            $('#del-inf').click(function() {
-                var $infos= $('#del-inf');
+            $('#del-info-btn').click(function() {
+                //console.log('clicked');
+                var $infos= $('#del-no');
 
                 $.ajax({
                     type: "GET",
-                    url: "api/deliveryinfo/1",
+                    url: "api/deliveryinfo",
                     headers: {"Authorization": 'Bearer' + localStorage.getItem('token')},
-                    success: function (infos)
-                    {
-                        $each(infos, function (i, info) {
-
-                            $infos.append('<li>Branch:'+ info.branch +',DelInfo:'+ info.deli_info +',Address:'+ info.address +',City:'+ info.city +'' +
-                                ',PostCode:'+ info.postcode +',State:' +info.state +',Country:' +info.country +',ContactPerson:' +info.contact_person +'' +
-                                ',ContactPersonNo:' +info.contact_person_no +'  </li>');
+                    success: function (data) {
+                        jQuery.each(data, function (i, val) {
+                            console.log(i);
+                            $infos.append('<div class="list-box-emp"> <a href="#" id="warehouse"  class="list-item"> <i class="fa fa-truck"></i> <em class="seperate"></em> <span class="list-item-title"> ' + val.branch + '</span> </a> </div> ');
+                            //data.branch,data.deli_info,data.address,data.city,data.postcode,data.state,data.country,data.contact_person,data.contact_person_no
                         });
                     }
+
                 });
             });
+            $('#warehouse').click(function() {
+                alert('hello');
+            });
+
+           // function  myfunction(branch,deli_info,address,city,postcode,state,country,contact_person,contact_person_no )
+            $(document).on('click', '[data-popup]', function(branch,deli_info,address,city,postcode,state,country,contact_person,contact_person_no){
+                    var warehouse = $(this).attr('data-popup');
+                    $('#'+warehouse).fadeIn('fast');
+                });
+
+
+
+
+
+
+          //  }
 
 
                     // success: function (data) {