From f08e0b85b81a137071076d0de0828522fdfb2aeb Mon Sep 17 00:00:00 2001
From: Nur Nadiah Nabilah Binti Hashinordin <nadiahnabilah93@gmail.com>
Date: Wed, 20 Sep 2017 18:13:25 +0800
Subject: [PATCH] ..

---
 public/Forwarder/custom.html | 46 +++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/public/Forwarder/custom.html b/public/Forwarder/custom.html
index 87a2ed6..11e2bd8 100644
--- a/public/Forwarder/custom.html
+++ b/public/Forwarder/custom.html
@@ -481,7 +481,7 @@
                                                                                 <select class="form-control select2">
                                                                                     <optgroup label="Order No">
                                                                                         <option>Please select</option>
-                                                                                        <option value="000">00012</option>
+                                                                                        <option value="000">00012 </option>
                                                                                         <option value="001">00114</option>
                                                                                         <option value="002">00216</option>
                                                                                         <option value="004">00418</option>
@@ -502,7 +502,16 @@
                                                                                     </optgroup>
                                                                                 </select>
                                                                             </div>
+                                                                            <div class="col-md-6">
+                                                                        <div style="margin-top:30px" class="form-group">
+                                                                            <label class="control-label col-md-4" style="font-size: 100%">Exporter Name</label>
+                                                                            <div class="col-md-7">
+                                                                                <input type="text" class="form-control">
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
                                                                                        </div>
+
                                                                                        </div>
                                                                                         
                                                             <div class="form-actions">
@@ -973,6 +982,11 @@
         <!-- END PAGE LEVEL PLUGINS --> 
         <!-- BEGIN THEME GLOBAL SCRIPTS -->
         <script src="../assets/global/scripts/app.min.js" type="text/javascript"></script>
+        
+        <script src="../assets/pages/scripts/form-repeater.min.js" type="text/javascript"></script>
+         <script src="../assets/pages/scripts/form-repeater.js" type="text/javascript"></script>
+         <script src="../assets/pages/scripts/form-editable.js" type="text/javascript"></script>
+
 
         <!-- END THEME GLOBAL SCRIPTS -->
         <!-- END PAGE LEVEL SCRIPTS -->
@@ -989,12 +1003,12 @@
         
             
             var dataSet = [
-                ["A1245","01-08-2017","","","","","","","","","","", ""],
-                ["A1345","21-08-2017","","","","","","","","","","", ""],
-                ["A9745","06-09-2017","","","","","","","","","","", ""],
-                ["A9075","22-10-2017","","","","","","","","","","", ""],
-                ["A6805","18-11-2017","","","","","","","","","","", ""],               
-                ["A0523","31-12-2017","","","","","","","","","","", ""],
+                ["A1245","01-08-2017","00034","CIEF/00034","ABC SDN BHD","123 SDN BHD","<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>",""],
+                ["A1345","21-08-2017","00076","CIEF/00076","DGT SDN BHD","456 SDN BHD","<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>",""],
+                ["A9745","06-09-2017","00534","CIEF/00534","KLI SDN BHD","064 SDN BHD", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>",""],
+                ["A9075","22-10-2017","00084","CIEF/00084","OUY SDN BHD","111 SDN BHD", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>",""],
+                ["A6805","18-11-2017","00087","CIEF/00087","TYP SDN BHD","563 SDN BHD", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>",""],               
+                ["A0523","31-12-2017","00369","CIEF/00369","MUI SDN BHD","286 SDN BHD", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>",""],
             ];
             
             var dataSet2 = 
@@ -1019,7 +1033,7 @@
                     'targets': [0]
                 },
                 {
-                    "targets": [ 10 ],
+                    "targets": [ 7 ],
                     "visible": false
                 }],
                 // scroller extension: http://datatables.net/extensions/scroller/
@@ -1064,15 +1078,13 @@
                 columns: [
                     { title: 'Reference No' },
                     { title: 'Date<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_1\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_2\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_3\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_9\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_10\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_6\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_7\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_11\')"></span>' },
-                    { title: '<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_11\')"></span>' },
-                ],
+                    { title: 'Order No<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_2\')"></span>' },
+                    { title: 'Marking<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_3\')"></span>' },
+                    { title: 'Supplier Order<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_9\')"></span>' },
+                    { title: 'Exporter Name<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_10\')"></span>' },
+                    { title: 'Actions' },
+                    { title: 'Actions' },
+                 ],
 
                 initComplete: function () {
                     configFilter(this, [1, 2,3, 4,5,6,7,8,9,10,11]);