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 @@ +