Merge branch 'master' into 'Asif/fixing_bugs'

# Conflicts:
#   includes/func.class/logs/2018-03-27.txt

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();
 								}
 							}
 

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

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 .= "<option value='" . $value['so_id'] . "'>" . $value['order_no'] . " (" .  $value['marking'] . ')</option>';
-		}		 
+		// Fix display all shipping order 
+		// if(getItemBalanceFromSOID($value['so_id']) <> 0){
+		//	$PO .= "<option value='" . $value['so_id'] . "'>" . $value['order_no'] . " (" .  $value['marking'] . ')</option>';
+		//	}
+		$PO .= "<option value='" . $value['so_id'] . "'>" . $value['order_no'] . " (" .  $value['marking'] . ')</option>';
+			 		 
 	}
 	return $PO;
 }

modul/orders/shipping-order/create.tpl.php

@@ -315,10 +315,10 @@
 															</div>
 														</div>
 														<div class="form-group">
-															<label class="control-label col-md-3">Quantity <span class="required"> * </span>
+															<label class="control-label col-md-3">Quantity </span>
 															</label>
 															<div class="col-md-6">
-																<input type="number" class="form-control int" id="quantity" name="quantity" placeholder="4" required>
+																<input type="number" class="form-control int" id="quantity" name="quantity" placeholder="4">
 															</div>
 														</div>
 														<div class="form-group">

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']);