From 87801d256c149bf923703a0f1b3e923b4397e8e1 Mon Sep 17 00:00:00 2001
From: Hazirah Nabilah <hazirah_zida@yahoo.com>
Date: Wed, 20 Sep 2017 11:22:46 +0800
Subject: [PATCH] im doneeeeee

---
 public/Importer/shippingorder.html | 44 +++++++++++++++++-------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html
index 98b0663..16a2741 100644
--- a/public/Importer/shippingorder.html
+++ b/public/Importer/shippingorder.html
@@ -338,6 +338,13 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                         <div class="col-md-12">
                                                                             <div class="portlet light bordered">
                                                                                 <span class="caption-subject font-dark bold uppercase"><h4><strong>Details</strong></h4></span>
+                                                                                    <div class="table-toolbar" align="right">
+                                                                                        <div class="row">
+                                                                                            <div class="btn-group">
+                                                                                                <a onclick="confirm('Your request has been sent. This order saved as Draft')" class="btn green"> Send to Supplier</a>
+                                                                                            </div>
+																						</div>
+																					</div>
                                                                                     <div class="form-group">
                                                                                         <div class="form-group">
                                                                                             <label for="so" class="col-md-2 control-label">Type</label>
@@ -405,11 +412,11 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                                        <div class="col-md-4">
                                                                                                             <select class="form-control">
                                                                                                                 <option>Please choose your order</option>
-                                                                                                                <option value="000">00012</option>
-                                                                                                                <option value="001">00114</option>
-                                                                                                                <option value="002">00216</option>
-                                                                                                                <option value="004">00418</option>
-                                                                                                                <option value="006">00624</option>
+                                                                                                                <option value="000">00012 - Infinite co.</option>
+                                                                                                                <option value="001">00114 - Indynamic co.</option>
+                                                                                                                <option value="002">00216 - Indinite co.</option>
+                                                                                                                <option value="004">00418 - Def co.</option>
+                                                                                                                <option value="006">00624 - Inner Circle co.</option>
                                                                                                            </select>
                                                                                                        </div>
                                                                                                </div>
@@ -417,7 +424,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                                 <div class="form-group">
                                                                                                     <label for="so" class="col-md-2 control-label">Marking</label>
                                                                                                         <div class="col-md-4">
-                                                                                                            <input type="text" class="form-control" id="marking" placeholder="CIEF/00123">
+                                                                                                            <input type="text" class="form-control" id="marking" placeholder="CIEF/00123" disabled>
                                                                                                         </div>
                                                                                                 </div>
                                                                                                 <div class="form-group">
@@ -470,6 +477,17 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                     <div class="portlet light bordered">
                                                                                 <i class="icon-social-dribbble font-green hide"></i>
                                                                                 <span class="caption-subject font-dark bold uppercase">Details Goods</span>
+                                                                                    <div class="table-toolbar" align="right">
+                                                                                        <div class="row">
+                                                                                                <div class="btn-group">
+                                                                                                    <a onclick="addNewColumn();" class="btn green"> New Column
+                                                                                                        <i class="fa fa-plus"></i>
+                                                                                                    </a>
+                                                                                                </div>
+                                                                                                <a class="btn green" style="margin-left: 15px;" data-toggle="modal" href="#addnew">
+                                                                                           <i class="fa fa-plus"></i> Add New Item </a> 
+																						</div>
+																					</div>
                                                                                     <table id="table1" class="table table-bordered table-striped">
                                                                                         <thead>
                                                                                             <th>No</th>
@@ -562,19 +580,7 @@ License: You must have a valid license purchased only from themeforest(the above
                                                                                             </tr>
                                                                                         </tbody>
                                                                                     </table>
-                                                                                    <div class="table-toolbar">
-                                                                                        <div class="row">
-                                                                                            <div class="col-md-6">
-                                                                                                <div class="btn-group">
-                                                                                                    <a onclick="addNewColumn();" class="btn green"> New Column
-                                                                                                        <i class="fa fa-plus"></i>
-                                                                                                    </a>
-                                                                                                </div>
-                                                                                                <a class="btn green" style="margin-left: 15px;" data-toggle="modal" href="#addnew">
-                                                                                           <i class="fa fa-plus"></i> Add New Item </a> 
-                                                                                            </div>
-																						</div>
-																					</div>
+                                                                                    
                                                                         <div class="form-actions">
                                                                             <div class="row">
                                                                                 <div class="col-md-offset-5 col-md-9">