diff --git a/assets/modul-js/orders/shipping-order/create.js b/assets/modul-js/orders/shipping-order/create.js index b9f08e3..3775246 100755 --- a/assets/modul-js/orders/shipping-order/create.js +++ b/assets/modul-js/orders/shipping-order/create.js @@ -178,6 +178,9 @@ var TableDatatablesEditable = function() { required: true, }, + total_cartons:{ + required: true, + }, messages: { description: { required: "You must choose description to proceed", diff --git a/modul/arrangements/warehouse/init.php b/modul/arrangements/warehouse/init.php index 7e5dcdb..048a701 100755 --- a/modul/arrangements/warehouse/init.php +++ b/modul/arrangements/warehouse/init.php @@ -212,9 +212,11 @@ function the_warehouse_arrangement(){ $db->bind("isDamaged", ($warehouse_arrangement_item['isDamaged'] ? $warehouse_arrangement_item['isDamaged'] : 0)); $db->bind("image", $warehouse_arrangement_item['image']); $db->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);"); + + + + $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){ $unmatch_count++; diff --git a/modul/orders/shipping-order/create.tpl.php b/modul/orders/shipping-order/create.tpl.php index e63f891..add7332 100755 --- a/modul/orders/shipping-order/create.tpl.php +++ b/modul/orders/shipping-order/create.tpl.php @@ -368,6 +368,13 @@ +