From 6e6c3d82dea785f26d0fc536e83134a175a40ed8 Mon Sep 17 00:00:00 2001 From: Jackk Goh Date: Tue, 3 Apr 2018 11:00:02 +0800 Subject: [PATCH 1/3] ignore vendor folder --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 72f9ae6f823420944e798047d74f907f3b867a1b Mon Sep 17 00:00:00 2001 From: Jackk Goh Date: Wed, 4 Apr 2018 17:22:29 +0800 Subject: [PATCH 2/3] fix create shipping order --- assets/modul-js/orders/shipping-order/create.js | 7 ++++--- assets/modul-js/orders/shipping-order/create.min.js | 1 + modul/orders/shipping-order/create.tpl.php | 8 +------- modul/orders/shipping-order/init.php | 8 ++++---- 4 files changed, 10 insertions(+), 14 deletions(-) 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() { "

", "

", "

", + "

", "
", "
  • packaging_nett = 15kg
", "
" + @@ -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 @@ Model UOM Qty + Total Carton CBM Weight Photo @@ -368,13 +369,6 @@ -
- -
- -
-
diff --git a/modul/orders/shipping-order/init.php b/modul/orders/shipping-order/init.php index 0f8fdfe..610ffdc 100755 --- a/modul/orders/shipping-order/init.php +++ b/modul/orders/shipping-order/init.php @@ -327,9 +327,9 @@ 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("quantity", (int)$shippingorderitem['quantity']); + //$db->bind("total_cartons", (int)$shippingorderitem['total_cartons']); + $db->bind("packaging_quantity", (int)$shippingorderitem['packaging_quantity']); $db->bind("packaging_cbm", $shippingorderitem['packaging_cbm']); if($shippingorderitem['packaging_type1'] == "new"){ $db->bind("packaging_type", $shippingorderitem['packaging_type2']); @@ -347,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,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);"); } } From 3f2a6179dbed00a1dae6372797f56ded7609c2b7 Mon Sep 17 00:00:00 2001 From: Jackk Goh Date: Wed, 4 Apr 2018 17:45:43 +0800 Subject: [PATCH 3/3] convert to int for int field --- modul/orders/shipping-order/init.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modul/orders/shipping-order/init.php b/modul/orders/shipping-order/init.php index 610ffdc..f3b56be 100755 --- a/modul/orders/shipping-order/init.php +++ b/modul/orders/shipping-order/init.php @@ -330,17 +330,17 @@ function the_so(){ $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", $shippingorderitem['packaging_cbm']); + $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)); @@ -348,6 +348,7 @@ function the_so(){ $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);"); + } }