diff --git a/.gitignore b/.gitignore
index 52f735b..0143782 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .htaccess
-**/logs
\ No newline at end of file
+**/logs
+/includes/vendor
\ No newline at end of file
diff --git a/assets/modul-js/orders/shipping-order/create.js b/assets/modul-js/orders/shipping-order/create.js
index 3775246..3c264af 100755
--- a/assets/modul-js/orders/shipping-order/create.js
+++ b/assets/modul-js/orders/shipping-order/create.js
@@ -36,6 +36,7 @@ var TableDatatablesEditable = function() {
                 document.getElementById("shippingorderitems[" + counter + "][model_no]").innerHTML = $('#model_no').val();
                 document.getElementById("shippingorderitems[" + counter + "][uom]").innerHTML = $('#uom').val();
                 document.getElementById("shippingorderitems[" + counter + "][quantity]").innerHTML = $('#quantity').val();
+                document.getElementById("shippingorderitems[" + counter + "][packaging_quantity]").innerHTML = $('#packaging_quantity').val();
                 document.getElementById("shippingorderitems[" + counter + "][packaging_cbm]").innerHTML = ($('#packaging_height').val() * $('#packaging_depth').val() * $('#packaging_width').val()) + "m³";
                 document.getElementById("shippingorderitems[" + counter + "][packaging_height]").innerHTML = "Height = " + $('#packaging_height').val() + "m";
                 document.getElementById("shippingorderitems[" + counter + "][packaging_width]").innerHTML = "Width = " + $('#packaging_width').val() + "m";
@@ -178,9 +179,7 @@ var TableDatatablesEditable = function() {
                         required: true,
 
                     },
-                    total_cartons:{
-                        required: true,
-                    },
+
                     messages: {
                         description: {
                             required: "You must choose description to proceed",
@@ -237,6 +236,7 @@ var TableDatatablesEditable = function() {
                     "<p id='shippingorderitems[" + counter + "][model_no]' class='form-control-static'></p>",
                     "<p id='shippingorderitems[" + counter + "][uom]' class='form-control-static'></p>",
                     "<p id='shippingorderitems[" + counter + "][quantity]' class='form-control-static'></p>",
+                    "<p id='shippingorderitems[" + counter + "][packaging_quantity]' class='form-control-static'></p>",
                     "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'><p id='shippingorderitems[" + counter + "][packaging_cbm]' class='form-control-static'></p><i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li id='shippingorderitems[" + counter + "][packaging_height]'></li><li id='shippingorderitems[" + counter + "][packaging_width]'></li><li id='shippingorderitems[" + counter + "][packaging_depth]'></li></ul></div>",
                     "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'><p id='shippingorderitems[" + counter + "][weight]' class='form-control-static'></p><i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li id='shippingorderitems[" + counter + "][packaging_gross]'></li><li id='shippingorderitems[" + counter + "][packaging_nett]'>packaging_nett = 15kg</li></ul></div>",
                     "<center><img id='shippingorderitems[" + counter + "][image]' style='max-width: 100px; max-height: 100px;' src='http://www.placehold.it/200/EFEFEF/AAAAAA&text=no+image'/></center>" +
@@ -267,6 +267,7 @@ var TableDatatablesEditable = function() {
                 document.getElementById("shippingorderitems[" + counter + "][model_no]").innerHTML = $('#model_no').val();
                 document.getElementById("shippingorderitems[" + counter + "][uom]").innerHTML = $('#uom').val();
                 document.getElementById("shippingorderitems[" + counter + "][quantity]").innerHTML = $('#quantity').val();
+                document.getElementById("shippingorderitems[" + counter + "][packaging_quantity]").innerHTML = $('#packaging_quantity').val();
                 document.getElementById("shippingorderitems[" + counter + "][packaging_cbm]").innerHTML = ($('#packaging_height').val() * $('#packaging_depth').val() * $('#packaging_width').val()) + "m³";
                 document.getElementById("shippingorderitems[" + counter + "][packaging_height]").innerHTML = "Height = " + $('#packaging_height').val() + "m";
                 document.getElementById("shippingorderitems[" + counter + "][packaging_width]").innerHTML = "Width = " + $('#packaging_width').val() + "m";
diff --git a/assets/modul-js/orders/shipping-order/create.min.js b/assets/modul-js/orders/shipping-order/create.min.js
index 598f9dc..3423047 100755
--- a/assets/modul-js/orders/shipping-order/create.min.js
+++ b/assets/modul-js/orders/shipping-order/create.min.js
@@ -36,6 +36,7 @@ var TableDatatablesEditable = function() {
                 document.getElementById("shippingorderitems[" + counter + "][model_no]").innerHTML = $('#model_no').val();
                 document.getElementById("shippingorderitems[" + counter + "][uom]").innerHTML = $('#uom').val();
                 document.getElementById("shippingorderitems[" + counter + "][quantity]").innerHTML = $('#quantity').val();
+                document.getElementById("shippingorderitems[" + counter + "][packaging_quantity]").innerHTML = $('#quantity').val();
                 document.getElementById("shippingorderitems[" + counter + "][packaging_cbm]").innerHTML = ($('#packaging_height').val() * $('#packaging_depth').val() * $('#packaging_width').val()) + "m³";
                 document.getElementById("shippingorderitems[" + counter + "][packaging_height]").innerHTML = "Height = " + $('#packaging_height').val() + "m";
                 document.getElementById("shippingorderitems[" + counter + "][packaging_width]").innerHTML = "Width = " + $('#packaging_width').val() + "m";
diff --git a/modul/orders/shipping-order/create.tpl.php b/modul/orders/shipping-order/create.tpl.php
index add7332..4d5bf1c 100755
--- a/modul/orders/shipping-order/create.tpl.php
+++ b/modul/orders/shipping-order/create.tpl.php
@@ -233,6 +233,7 @@
 													<th> Model </th>
 													<th> UOM </th>
 													<th> Qty </th>
+													<th> Total Carton </th>
 													<th> CBM </th>
 													<th> Weight </th>
 													<th> Photo </th>
@@ -368,13 +369,6 @@
 																<input type="number" name="packaging_quantity" id="packaging_quantity" placeholder="30" class="form-control int" required>
 															</div>
 														</div>
-														<div class="form-group">
-															<label class="control-label col-md-3">Total Cartons<span class="required"> * </span>
-															</label>
-															<div class="col-md-4">
-																<input type="number" name="total_cartons" id="total_cartoons" placeholder="30" class="form-control int" required>
-															</div>
-														</div>
 														<div class="form-group" id="pack_type">
 															<label class="control-label col-md-3">Packaging Type<span class="required"> * </span></label>
 															<div class="col-md-6">
diff --git a/modul/orders/shipping-order/init.php b/modul/orders/shipping-order/init.php
index 0f8fdfe..f3b56be 100755
--- a/modul/orders/shipping-order/init.php
+++ b/modul/orders/shipping-order/init.php
@@ -327,27 +327,28 @@ function the_so(){
 				$db->bind("brand_no", $shippingorderitem['brand_no']);
 				$db->bind("item_code", $shippingorderitem['item_code']);
 				$db->bind("uom", $shippingorderitem['uom']);
-				$db->bind("quantity", $shippingorderitem['quantity']);
-				$db->bind("total_cartons", $shippingorderitem['total_cartons']);
-				$db->bind("packaging_quantity", $shippingorderitem['packaging_quantity']);
-				$db->bind("packaging_cbm", $shippingorderitem['packaging_cbm']);
+				$db->bind("quantity", (int)$shippingorderitem['quantity']);
+				//$db->bind("total_cartons", (int)$shippingorderitem['total_cartons']);
+				$db->bind("packaging_quantity", (int)$shippingorderitem['packaging_quantity']);
+				$db->bind("packaging_cbm", (int)$shippingorderitem['packaging_cbm']);
 				if($shippingorderitem['packaging_type1'] == "new"){
 					$db->bind("packaging_type", $shippingorderitem['packaging_type2']);
 				}else{
 					$db->bind("packaging_type", $shippingorderitem['packaging_type1']);
 				}
-				$db->bind("packaging_height", $shippingorderitem['packaging_height']);
-				$db->bind("packaging_width", $shippingorderitem['packaging_width']);
-				$db->bind("packaging_depth", $shippingorderitem['packaging_depth']);
-				$db->bind("packaging_gross", $shippingorderitem['packaging_gross']);
-				$db->bind("packaging_nett", $shippingorderitem['packaging_nett']);
+				$db->bind("packaging_height", (int)$shippingorderitem['packaging_height']);
+				$db->bind("packaging_width", (int)$shippingorderitem['packaging_width']);
+				$db->bind("packaging_depth", (int)$shippingorderitem['packaging_depth']);
+				$db->bind("packaging_gross", (int)$shippingorderitem['packaging_gross']);
+				$db->bind("packaging_nett", (int)$shippingorderitem['packaging_nett']);
 				$db->bind("image", ($shippingorderitem['image'] <> "" ? $shippingorderitem['image']  : NULL));
 				$db->bind("image2", ($shippingorderitem['image2'] <> "" ? $shippingorderitem['image2']  : NULL));
 				$db->bind("image3", ($shippingorderitem['image3'] <> "" ? $shippingorderitem['image3']  : NULL));
 				$db->bind("image4", ($shippingorderitem['image4'] <> "" ? $shippingorderitem['image4']  : NULL));
 				$db->bind("so_id", $so_id);
 				
-				$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity,total_cartons, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity,:total_cartons, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
+				$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
+
 			}
 		}