diff --git a/assets/modul-js/orders/shipping-order/create.js b/assets/modul-js/orders/shipping-order/create.js
index 96f22cb..82a9470 100755
--- a/assets/modul-js/orders/shipping-order/create.js
+++ b/assets/modul-js/orders/shipping-order/create.js
@@ -164,7 +164,25 @@ var TableDatatablesEditable = function() {
ignore: [],
errorElement: 'span',
errorClass: 'help-block help-block-error',
- focusInvalid: false,
+ focusInvalid: false,
+ rules: {
+ description: {
+ required: true,
+ },
+ packaging_quantity: {
+ required: true,
+
+ },
+ messages: {
+ description: {
+ required: "You must choose description to proceed",
+ },
+ packaging_quantity: {
+ required: "You must choose package quantity to proceed",
+ },
+
+ },
+
errorPlacement: function(error, element) { // render error placement for each input type
error.insertAfter(element); // for other inputs, just perform default behavior
},
@@ -622,11 +640,18 @@ var FormWizard = function() {
}
});
- } else {
- $("#finish").show();
- $("#wait").hide();
- //$("#suksesupdate").show();
- $("#gagalupdate").show();
+ }
+ else if (e.status === 403){
+ $("#finish").show();
+ $("#wait").hide();
+ //$("#suksesupdate").show();
+ alert(e.responseText);
+ }
+ else {
+ $("#finish").show();
+ $("#wait").hide();
+ //$("#suksesupdate").show();
+ $("#gagalupdate").show();
}
}
diff --git a/includes/func.class/logs/2018-03-27.txt b/includes/func.class/logs/2018-03-27.txt
index f15fa71..5973e29 100644
--- a/includes/func.class/logs/2018-03-27.txt
+++ b/includes/func.class/logs/2018-03-27.txt
@@ -1,7 +1 @@
-Time : 14:24:01
-SQLSTATE[HY000] [2002] No connection could be made because the target machine actively refused it.
-
-
-Time : 14:23:57
-SQLSTATE[HY000] [2002] No connection could be made because the target machine actively refused it.
-
+skip
\ No newline at end of file
diff --git a/modul/arrangements/warehouse/warehouse.func.php b/modul/arrangements/warehouse/warehouse.func.php
index f2578ef..0d823c8 100755
--- a/modul/arrangements/warehouse/warehouse.func.php
+++ b/modul/arrangements/warehouse/warehouse.func.php
@@ -57,9 +57,12 @@ function getAllSOWithoutWarehouse(){
$PO = "";
foreach ($data as $key => $value) {
- if(getItemBalanceFromSOID($value['so_id']) <> 0){
- $PO .= "';
- }
+ // Fix display all shipping order
+ // if(getItemBalanceFromSOID($value['so_id']) <> 0){
+ // $PO .= "';
+ // }
+ $PO .= "';
+
}
return $PO;
}
diff --git a/modul/orders/shipping-order/create.tpl.php b/modul/orders/shipping-order/create.tpl.php
index 2e6b38f..14e0420 100755
--- a/modul/orders/shipping-order/create.tpl.php
+++ b/modul/orders/shipping-order/create.tpl.php
@@ -315,10 +315,10 @@
diff --git a/modul/orders/shipping-order/init.php b/modul/orders/shipping-order/init.php
index a7e55e1..cb507fb 100755
--- a/modul/orders/shipping-order/init.php
+++ b/modul/orders/shipping-order/init.php
@@ -312,6 +312,16 @@ function the_so(){
foreach ($shippingorderitems as $key => $shippingorderitem) {
+ # check reqired description and quantity
+
+ if ( $shippingorderitem['description'] == "" ){
+ return new Response("Please make sure all your item have a description", 403);
+ }
+
+ if ( $shippingorderitem['packaging_quantity'] == "") {
+ return new Response("Please make sure all your item have a quantity", 403);
+ }
+
$db->bind("description", $shippingorderitem['description']);
$db->bind("model_no", $shippingorderitem['model_no']);
$db->bind("brand_no", $shippingorderitem['brand_no']);
diff --git a/uploads/company/36/1323522628.tmp b/uploads/company/36/1323522628.tmp
new file mode 100644
index 0000000..5b18dce
Binary files /dev/null and b/uploads/company/36/1323522628.tmp differ
diff --git a/uploads/company/36/1448490655.tmp b/uploads/company/36/1448490655.tmp
new file mode 100644
index 0000000..8f91dd2
Binary files /dev/null and b/uploads/company/36/1448490655.tmp differ
diff --git a/uploads/company/36/1466372378.tmp b/uploads/company/36/1466372378.tmp
new file mode 100644
index 0000000..5b18dce
Binary files /dev/null and b/uploads/company/36/1466372378.tmp differ
diff --git a/uploads/company/36/1570888087.tmp b/uploads/company/36/1570888087.tmp
new file mode 100644
index 0000000..5b18dce
Binary files /dev/null and b/uploads/company/36/1570888087.tmp differ
diff --git a/uploads/company/36/1660929268.tmp b/uploads/company/36/1660929268.tmp
new file mode 100644
index 0000000..8f91dd2
Binary files /dev/null and b/uploads/company/36/1660929268.tmp differ
diff --git a/uploads/company/36/1662179150.tmp b/uploads/company/36/1662179150.tmp
new file mode 100644
index 0000000..4777482
Binary files /dev/null and b/uploads/company/36/1662179150.tmp differ
diff --git a/uploads/company/36/1678124825.tmp b/uploads/company/36/1678124825.tmp
new file mode 100644
index 0000000..4777482
Binary files /dev/null and b/uploads/company/36/1678124825.tmp differ
diff --git a/uploads/company/36/1782889206.tmp b/uploads/company/36/1782889206.tmp
new file mode 100644
index 0000000..672bf8c
Binary files /dev/null and b/uploads/company/36/1782889206.tmp differ
diff --git a/uploads/company/36/1790352342.tmp b/uploads/company/36/1790352342.tmp
new file mode 100644
index 0000000..f33caf1
Binary files /dev/null and b/uploads/company/36/1790352342.tmp differ
diff --git a/uploads/company/36/2094641508.tmp b/uploads/company/36/2094641508.tmp
new file mode 100644
index 0000000..672bf8c
Binary files /dev/null and b/uploads/company/36/2094641508.tmp differ
diff --git a/uploads/company/36/2107895833.tmp b/uploads/company/36/2107895833.tmp
new file mode 100644
index 0000000..0982fe4
Binary files /dev/null and b/uploads/company/36/2107895833.tmp differ
diff --git a/uploads/company/36/472702445.tmp b/uploads/company/36/472702445.tmp
new file mode 100644
index 0000000..5b18dce
Binary files /dev/null and b/uploads/company/36/472702445.tmp differ