diff --git a/assets/modul-js/orders/shipping-order/create.js b/assets/modul-js/orders/shipping-order/create.js index 82a9470..3775246 100755 --- a/assets/modul-js/orders/shipping-order/create.js +++ b/assets/modul-js/orders/shipping-order/create.js @@ -171,7 +171,15 @@ var TableDatatablesEditable = function() { }, packaging_quantity: { required: true, - + + + }, + packaging_type1:{ + required: true, + + }, + total_cartons:{ + required: true, }, messages: { description: { @@ -180,6 +188,7 @@ var TableDatatablesEditable = function() { packaging_quantity: { required: "You must choose package quantity to proceed", }, + }, @@ -212,7 +221,7 @@ var TableDatatablesEditable = function() { .addClass('valid') // mark the current input as valid and display OK icon .closest('.form-group').removeClass('has-error').addClass('has-success'); // set success class to the control group } - } + }} }); success.hide(); error.hide(); diff --git a/modul/arrangements/shipment/init.php b/modul/arrangements/shipment/init.php index 0a521fd..33f5940 100755 --- a/modul/arrangements/shipment/init.php +++ b/modul/arrangements/shipment/init.php @@ -32,7 +32,7 @@ function create_shipment_arrangement_js() { - + bind("so_item_id", $warehouse_arrangement_item['so_item_id']); $db->bind("warehouse_arrangement_id", $warehouse_arrangement_id); + + + $warehouse_arrangement_itemsCreate = $db->query("INSERT INTO warehouse_arrangement_items (actual_ctn, actual_measurement_ctn, actual_weight_ctn, actual_height_ctn, actual_width_ctn, actual_depth_ctn, status, isDamaged, image, so_item_id, warehouse_arrangement_id) VALUES (:actual_ctn, :actual_measurement_ctn, :actual_weight_ctn, :actual_height_ctn, :actual_width_ctn, :actual_depth_ctn, :status, :isDamaged, :image, :so_item_id, :warehouse_arrangement_id);"); if($warehouse_arrangement_item['status'] == 1 || $warehouse_arrangement_item['isDamaged'] == 1){ diff --git a/modul/orders/shipping-order/create.tpl.php b/modul/orders/shipping-order/create.tpl.php index 9071ce4..add7332 100755 --- a/modul/orders/shipping-order/create.tpl.php +++ b/modul/orders/shipping-order/create.tpl.php @@ -368,8 +368,15 @@ +
+ +
+ +
+
- +
+
diff --git a/modul/orders/shipping-order/init.php b/modul/orders/shipping-order/init.php index cb507fb..0f8fdfe 100755 --- a/modul/orders/shipping-order/init.php +++ b/modul/orders/shipping-order/init.php @@ -36,7 +36,7 @@ function create_so_js() { - + 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']); if($shippingorderitem['packaging_type1'] == "new"){ @@ -346,7 +347,7 @@ function the_so(){ $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, 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);"); + $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);"); } }