added order cancelation

assets/modul-js/common/dashboard/dashboard.so.js

@@ -106,12 +106,12 @@ $(document).ready(function() {
 	        });
 		});
 
-		$(document).on("click", ".soDelete", function() {
+		$(document).on("click", ".soCancel", function() {
 	        var id = $(this).data('id');
 			var dataStringg = 'id=' + id;
 	        $.ajax({
 	            type: "POST",
-	            url: "/dashboard/shipping-order/delete",
+	            url: "/dashboard/shipping-order/cancel",
 	            cache: false,
 	            data: dataStringg,
 	            success: function(data, statusText, xhr) {

modul/common/dashboard/dashboard.func.php

@@ -39,10 +39,11 @@ function getGeneralStatus($so_id){
 		}elseif($daStatus == 5){
 			return "Delivery Request Rejected";
 		}
-	elseif($soStatus == 4 ){
-		return "Order Canceled";
 	}
-	}else{
+	elseif($soStatus == 4 ){
+		return "Canceled";
+	}
+	else{
 		return "Order Created";
 	}
 }

modul/common/dashboard/dashboard.so.list.php

@@ -48,26 +48,35 @@ $requestData= $_REQUEST;
 								<button class="btn green btn-xs btn-circle btn-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false"> Actions
 									<i class="fa fa-angle-down"></i>
 								</button>
-								<ul class="dropdown-menu" role="menu">
+								<ul class="dropdown-menu" role="menu">'
+									.(getGeneralStatus($value['so_id']) != "Canceled" ? '<li>
+									<a href="/shipping-order/edit/'.$value["so_id"].'">Edit</a>
+									</li>' : '')
+									.
+									'
 									<li>
 										<a href="/shipping-order/details/'.$value["so_id"].'">Details</a>
 									</li>
 									<li>
 										<a href="/track-order?id='.$value["so_id"].'">Track Order</a>
 									</li>
+									<!--
 									<li>
 										<a href="/messenger/order/'.getRoomIDFromSO($value["so_id"]).'">Chat</a>
 									</li>
+									-->
 									<li>
 										<a class="previewPL" data-id="'.$value["so_id"].'">Preview PL</a>
 									</li>
 									<li>
 										<a class="previewMarking" data-id="'.$value["so_id"].'">Print Marking</a>
 									</li>
-									<li>
-										<a class="soDelete" data-id="'.$value["so_id"].'">Delete</a>
-									</li>
-									
+									'
+									.(getGeneralStatus($value['so_id']) != "Canceled" ? '<li>
+									<a class="soCancel" data-id="'.$value["so_id"].'">Cancel Order</a>
+									</li>':'')
+									.
+									'
 								</ul>
 							</div>';
 

modul/common/dashboard/init.php

@@ -93,46 +93,6 @@ function the_dashboard(){
         include 'dashboard.so.list.php';
         return '';
 	});
-
-	$app->post('/dashboard/shipping-order/delete', function(Request $request)  { 
-		global $db;
-
-		$so_id = $request->get('id');
-		$db->bind("so_id",$so_id);		
-		$result=$db->query('DELETE FROM shipping_orders where so_id = :so_id');
-
-		
-
-		//return new Response('success', 200);
-	
-			   
-			   
-
-		
-		$db->bind("so_id",$so_id);		
-		$result2 = $db->query('DELETE FROM shipping_order_items WHERE so_id = :so_id');
-
-		
-
-		  if($result && $result2){
-
-		  return new Response('Success', 200);
-
-		  }
-		  else{
-		  return new Response('failed', 201) ;}
-
-		 // return new Response(print_r(array_values($order_items)), 201);
-		// 	 if(result&&)
-		// 	 {
-			//$orderselection['id'];
-
-
-		// 	 }
-			
-		//  }
-		
-	});
 }
 
 include 'dashboard.func.php';

modul/orders/shipping-order/init.php

@@ -446,7 +446,27 @@ function the_so(){
 		
 		$html = "<span id='SOmarking'>" .getModalMarking($id) . "</span><div id='img-out'></div>";
 		return $html;
-    });	
+	});	
+
+	$app->post('/dashboard/shipping-order/cancel', function(Request $request)  { 
+		global $db;
+
+		$so_id = $request->get('id');
+		$db->bind("so_id",$so_id);	
+
+		$soUpdate = $db->query("UPDATE `shipping_orders` SET `status`=4 WHERE so_id = :so_id");
+
+		if ($soUpdate){
+			return new Response($so_id, 200);
+		}
+
+		else{
+			return new Response($so_id, 201);
+		}
+
+		
+	});
+	
 }
 
 include 'so.func.php';