From 0fd7fd504daf1fa89968d48f0f242316a0440f04 Mon Sep 17 00:00:00 2001
From: Asif <ferdous.asif2012@gmail.com>
Date: Mon, 2 Apr 2018 13:12:38 +0800
Subject: [PATCH] total cartons add to database

---
 assets/modul-js/orders/shipping-order/create.js | 3 +++
 modul/arrangements/warehouse/init.php           | 6 ++++--
 modul/orders/shipping-order/create.tpl.php      | 7 +++++++
 modul/orders/shipping-order/init.php            | 3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)

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 @@
 																<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 5cc41c5..0f8fdfe 100755
--- a/modul/orders/shipping-order/init.php
+++ b/modul/orders/shipping-order/init.php
@@ -328,6 +328,7 @@ function the_so(){
 				$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']);
 				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);");
 			}
 		}