latest all

This commit is contained in:
Nur Nadiah Nabilah Binti Hashinordin
2017-09-21 16:22:00 +08:00
4 changed files with 218 additions and 75 deletions
+45
View File
@@ -31,6 +31,8 @@
<link href="../assets/layouts/layout/css/themes/darkblue.min.css" rel="stylesheet" type="text/css" id="style_color" />
<link href="../assets/layouts/layout/css/custom.min.css" rel="stylesheet" type="text/css" />
<!-- END THEME LAYOUT STYLES -->
<link href="../assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
<link href="../assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
<style>
div.dt-button-collection {
margin-top: 70px;
@@ -476,6 +478,7 @@
<div class="portlet-body">
<div style="margin-top:60px" class="form-group">
<<<<<<< HEAD
<label for="multiple" class="control-label">Select2 multi select</label>
<select id="multiple" class="form-control select2-multiple" multiple>
<optgroup label="Shipping Order">
@@ -500,6 +503,38 @@
<option value="578">57839</option>
</optgroup>
</select>
=======
<label for="so" class="col-md-2 control-label">Shipping Order</label>
<div class="col-md-10">
<div class="input-group select2-bootstrap-append">
<select id="multi-append" class="form-control select2" multiple>
<option></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="183">18332</option>
<option value="187">18742</option>
<option value="197">19745</option>
<option value="256">25654</option>
<option value="287">28782</option>
<option value="348">34829</option>
<option value="368">36894</option>
<option value="380">38090</option>
<option value="426">42679</option>
<option value="448">44895</option>
<option value="468">46894</option>
<option value="489">48939</option>
<option value="578">57839</option>
</select>
<span class="input-group-btn">
<button class="btn btn-default" type="button" data-select2-open="multi-append">
<span class="glyphicon glyphicon-search"></span>
</button>
</span>
</div>
>>>>>>> 40777d3164b058705971944bdee1a5e66f0ab847
</div>
<div class="col-md-6">
<div style="margin-top:30px" class="form-group">
@@ -999,6 +1034,8 @@
<script src="../assets/layouts/global/scripts/quick-sidebar.min.js" type="text/javascript"></script>
<script src="../assets/layouts/global/scripts/quick-nav.min.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.7/js/materialize.min.js"></script>
<script src="../assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
<!-- END THEME LAYOUT SCRIPTS -->
<script>
@@ -1580,6 +1617,14 @@ var FormWizard = function () {
jQuery(document).ready(function() {
FormWizard.init();
$.fn.select2.defaults.set("theme", "bootstrap");
var placeholder = "Please select order no";
$(".select2, .select2-multiple").select2({
placeholder: placeholder,
width: null
});
});
</script>
+27
View File
@@ -231,6 +231,33 @@
<span class="title">Track Order</span>
<span class="selected"></span>
</a>
</li>
<li class="nav-item active open ">
<a href="javascript:;" class="nav-link nav-toggle">
<i class="icon-basket"></i>
<span class="title">Orders</span>
<span class="arrow"></span>
</a>
<ul class="sub-menu">
<li class="nav-item ">
<a href="purchaseorder.html" class="nav-link ">
<i class="icon-clock"></i>
<span class="title">Purchase Order</span>
</a>
</li>
<li class="nav-item active open ">
<a href="shippingorderstatus.html" class="nav-link ">
<i class="icon-check"></i>
<span class="title">Shipping Order</span>
</a>
</li>
<li class="nav-item ">
<a href="opendraft.html" class="nav-link ">
<i class="icon-envelope"></i>
<span class="title">Open Draft</span>
</a>
</li>
</ul>
</li>
<li class="nav-item ">
<a href="profile.html" class="nav-link nav-toggle">
+140 -50
View File
@@ -311,12 +311,7 @@ License: You must have a valid license purchased only from themeforest(the above
<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">
<label for="so" class="col-md-2 control-label">Type</label>
@@ -423,7 +418,7 @@ License: You must have a valid license purchased only from themeforest(the above
</div>
</div>
</div>
</div>
</form>
</div>
</div>
@@ -436,12 +431,16 @@ License: You must have a valid license purchased only from themeforest(the above
<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>
<a onclick="confirm('This order saved as Draft. This is the link you requested https://gitlab.com/ciefworldwide/IZYIM.git')" class="btn green color-demo tooltips" style="margin-bottom:0px;" data-original-title="Sent the link page for supplier fill in the packing list" >Form Link</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 class="btn-group">
<a onclick="addNewColumn();" style="margin-left: 10px;" class="btn green"><i class="fa fa-plus"></i> New Column</a>
</div>
<a class="btn green" style="margin-left: 10px;" 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">
@@ -459,12 +458,12 @@ License: You must have a valid license purchased only from themeforest(the above
</thead>
<tbody>
<tr>
<td>1 </td>
<td>Television </td>
<td>CS110 </td>
<td>Unit </td>
<td>10 </td>
<td>
<td contenteditable="true">1 </td>
<td contenteditable="true">Television </td>
<td contenteditable="true">CS110 </td>
<td contenteditable="true">Unit </td>
<td contenteditable="true">10 </td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>142m3<i class='fa fa-angle-down'></i>
</button>
@@ -475,7 +474,7 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
</button>
@@ -485,18 +484,18 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td><img src="../assets/global/img/tv.jpg" alt="" style="width:100px;height:75px;" />
<td><img src="../assets/global/img/tv.jpg" data-toggle="modal" href="#tv" alt="" style="width:100px;height:75px;" />
</td>
<td> </td>
<td contenteditable="true"> </td>
</tr>
<tr>
<td>2 </td>
<td>Tire </td>
<td>CS251 </td>
<td>Unit </td>
<td>20 </td>
<td>
<td contenteditable="true">2 </td>
<td contenteditable="true">Tire </td>
<td contenteditable="true">CS251 </td>
<td contenteditable="true">Unit </td>
<td contenteditable="true">20 </td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>452m3<i class='fa fa-angle-down'></i>
</button>
@@ -507,7 +506,7 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
</button>
@@ -517,17 +516,17 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td><img src="../assets/global/img/tire.jpg" alt="" style="width:100px;height:100px;" /> </td>
<td> </td>
<td ><img src="../assets/global/img/tire.jpg" data-toggle="modal" href="#tire" alt="" style="width:100px;height:100px;" /> </td>
<td contenteditable="true"> </td>
</tr>
<tr>
<td>3 </td>
<td>Chair </td>
<td>CS486 </td>
<td>Unit </td>
<td>5 </td>
<td>
<td contenteditable="true">3 </td>
<td contenteditable="true">Chair </td>
<td contenteditable="true">CS486 </td>
<td contenteditable="true">Unit </td>
<td contenteditable="true">5 </td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>145m3<i class='fa fa-angle-down'></i>
</button>
@@ -538,7 +537,7 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
</button>
@@ -548,17 +547,17 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td><img src="../assets/global/img/chair.jpg" alt="" style="width:100px;height:100px;" /> </td>
<td><img src="../assets/global/img/chair.jpg" data-toggle="modal" href="#chair" alt="" style="width:100px;height:100px;"/> </td>
<td> </td>
</tr>
<tr>
<td>4 </td>
<td>Table </td>
<td>CS125 </td>
<td>Unit </td>
<td>5 </td>
<td>
<td contenteditable="true">4 </td>
<td contenteditable="true">Table </td>
<td contenteditable="true">CS125 </td>
<td contenteditable="true">Unit </td>
<td contenteditable="true">5 </td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>154m3<i class='fa fa-angle-down'></i>
</button>
@@ -569,7 +568,7 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td>
<td contenteditable="true">
<div class='btn-group'>
<button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>12kg<i class='fa fa-angle-down'></i>
</button>
@@ -579,8 +578,8 @@ License: You must have a valid license purchased only from themeforest(the above
</ul>
</div>
</td>
<td><img src="../assets/global/img/table.jpg" alt="" style="width:100px;height:100px;" /> </td>
<td> </td>
<td ><img src="../assets/global/img/table.jpg" data-toggle="modal" href="#tbl" alt="" style="width:100px;height:100px;" /> </td>
<td contenteditable="true"> </td>
</tr>
</tbody>
@@ -603,7 +602,7 @@ License: You must have a valid license purchased only from themeforest(the above
<a href="javascript:;" class="btn btn-outline green button-next"> Next
<i class="fa fa-angle-right"></i>
</a>
<a href="chat.html" class="btn green button-submit"> Finish
<a onclick="confirm('Please print out this marking label and paste to every carton.')" data-toggle="modal" href="#marking2" class="btn green button-submit" >Finish
<i class="fa fa-check"></i>
</a>
</div>
@@ -619,6 +618,96 @@ License: You must have a valid license purchased only from themeforest(the above
</div>
</div>
<div class="modal fade" id="tv" tabindex="-1" role="tv" aria-hidden="true" align="center">
<img src="../assets/global/img/tv.jpg" style="width:65%;height:65%;" />
</div>
<div class="modal fade" id="tire" tabindex="-1" role="tire" aria-hidden="true" align="center">
<img src="../assets/global/img/tire.jpg" style="width:65%;height:65%;"/>
</div>
<div class="modal fade" id="chair" tabindex="-1" role="chair" aria-hidden="true" align="center">
<img src="../assets/global/img/chair.jpg" style="width:65%;height:65%;" />
</div>
<div class="modal fade" id="tbl" tabindex="-1" role="tbl" aria-hidden="true" align="center">
<td ><img src="../assets/global/img/table.jpg" style="width:65%;height:65%;"/> </td>
</div>
<div class="modal fade" id="marking2" tabindex="-1" role="marking2" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-body">
<div class="row">
<div class="portlet box green">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><strong>Marking</strong> </div>
<div class="actions">
<div class="btn-group">
<a class="btn white btn-outline btn-circle" href="javascript:;" data-toggle="dropdown">
<i class="fa fa-share"></i>
<span class="hidden-xs"> Actions </span>
<i class="fa fa-angle-down"></i>
</a>
<ul class="dropdown-menu pull-right" id="sample_3_tools">
<li>
<a href="javascript:;" data-action="0" class="tool-action">
<i class="icon-printer"></i> Print</a>
</li>
<li>
<a href="javascript:;" data-action="2" class="tool-action">
<i class="icon-doc"></i> PDF</a>
</li>
</ul>
</div>
</div>
</div>
<div class="portlet-body">
<div class="row">
<div class="col-md-12">
<div class="col-md-4">
<div class="form-body">
<img src="../assets/global/img/qrcode.jpg" style="height:100% ; width:100%"/>
</div>
</div>
<div class="col-md-8">
<div class="form-body" >
<h1 align="center"><strong>CIEF/011257</strong></h1>
<div class="form-group">
<label class="control-label col-md-5">Warehouse Address
</label>
<label class="control-label col-md-6">70 McCullough Dr, New Castle, 19720 Delaware, United State of America
</label>
</div>
<br/>
<br/>
<div class="form-group">
<label class="control-label col-md-5">Contact Person
</label>
<label class="control-label col-md-6">Lisa Wong
</label>
</div>
<br/>
<div class="form-group">
<label class="control-label col-md-5">Contact No
</label>
<label class="control-label col-md-6">0112563786
</label>
</div>
<br/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal fade" id="addnew" tabindex="-1" role="addnew" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
@@ -757,7 +846,7 @@ License: You must have a valid license purchased only from themeforest(the above
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">Packaging</label>
<label class="col-md-3 control-label">Packaging Type</label>
<div class="col-md-5">
<select id="folder2" class="form-control">
<option>Please choose</option>
@@ -901,7 +990,8 @@ License: You must have a valid license purchased only from themeforest(the above
<a href="javascript:;" class="btn btn-outline green button-next2"> Next
<i class="fa fa-angle-right"></i>
</a>
<a href="chat.html" class="btn green button-submit2"> Finish
<a onclick="confirm('This order saved as Draft. This is the link you requested https://gitlab.com/ciefworldwide/IZYIM.git')" class="btn green button-submit2" data-toggle="modal" href="marking"> Finish
<i class="fa fa-check"></i>
</a>
</div>
+6 -25
View File
@@ -64,12 +64,12 @@ License: You must have a valid license purchased only from themeforest(the above
min-width: 100px;
}
.table td, .table th {
font-size: 10px;
font-size: 12px;
text-align:center;
vertical-align: middle;
}
.table thead tr th{
font-size: 10px;
font-size: 12px;
text-align:center;
vertical-align: middle;
}
@@ -327,7 +327,7 @@ License: You must have a valid license purchased only from themeforest(the above
<thead>
<tr>
<th width="1%"> No </th>
<th width="5%"> Order No <br/>
<th width="3%"> Order No <br/>
<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span></button>
</th>
@@ -335,7 +335,7 @@ License: You must have a valid license purchased only from themeforest(the above
<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span></button>
</th>
<th width="3%"> Marking <br/>
<th width="2%"> Marking <br/>
<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span></button>
</th>
@@ -343,7 +343,7 @@ License: You must have a valid license purchased only from themeforest(the above
<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span></button>
</th>
<th width="1%"> Warehouse Name <br/>
<th width="5%"> Warehouse Name <br/>
<button type="button" style="text-decoration: none" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span></button>
</th>
@@ -639,27 +639,10 @@ License: You must have a valid license purchased only from themeforest(the above
<a href="javascript:;" data-action="0" class="tool-action">
<i class="icon-printer"></i> Print</a>
</li>
<li>
<a href="javascript:;" data-action="1" class="tool-action">
<i class="icon-check"></i> Copy</a>
</li>
<li>
<a href="javascript:;" data-action="2" class="tool-action">
<i class="icon-doc"></i> PDF</a>
</li>
<li>
<a href="javascript:;" data-action="3" class="tool-action">
<i class="icon-paper-clip"></i> Excel</a>
</li>
<li>
<a href="javascript:;" data-action="4" class="tool-action">
<i class="icon-cloud-upload"></i> CSV</a>
</li>
<li class="divider"> </li>
<li>
<a href="javascript:;" data-action="5" class="tool-action">
<i class="icon-refresh"></i> Reload</a>
</li>
</ul>
</div>
</div>
@@ -698,9 +681,7 @@ License: You must have a valid license purchased only from themeforest(the above
</label>
</div>
<br/>
<div class="form-group" align="center">
<img src="../assets/global/img/barcode.png" style="height:75px ; width:250px" />
</div>
</div>
</div>
</div>