From edf162c81f0942d8e69f487d4f1eba3a3fe19d2c Mon Sep 17 00:00:00 2001
From: Smart <kamali@watermelon.us>
Date: Fri, 20 Sep 2024 15:14:09 +0530
Subject: [PATCH] Merge : GWM

---
 app/Controllers/Purchaseorder.php      |  7 +++++--
 app/Views/editRevenuepurchaseorder.php | 18 ++++++------------
 app/Views/porelease_view.php           | 10 +++++-----
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php
index 5624d679..3f50a443 100755
--- a/app/Controllers/Purchaseorder.php
+++ b/app/Controllers/Purchaseorder.php
@@ -1214,7 +1214,7 @@ class Purchaseorder extends BaseController
   function EditRevenuePurchaseOrder()
   {
 
- 
+   
     $PONO = $this->request->getPost('txtPONO');
     $POdt = $this->request->getPost('PODate');
     $PODate =  get_date_time_format($POdt);
@@ -1452,8 +1452,11 @@ class Purchaseorder extends BaseController
 
           $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList);
         }
+       
         $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
-        if (count($isExists) == 0) {
+       
+        if (is_array($isExists) && count($isExists) == 0) {
+
         } else {
 
           $RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip);
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 80e189c3..6c1abed8 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -4000,18 +4000,12 @@ if (!empty($getlogpodtl)) {
 					<td align="left">${Reqnumber}</td>
 					<td align="left">${materialCode}</td>
 					<td align="left">${materialName}</td>
-					<td align="right">${quantity}</td>
+					<td align="left">${quantity}</td>
 					<td align="left">${uom}</td>
-					<td align="right">${itemRate}</td>
-					<td align="right">${PER}</td>
-					<td align="right">${service_description}</td>
-					<td align="right">${basicval}</td>
-					<td align="right">${TotalTaxValue}</td>
-					<td align="right">${TotalOrderValue}</td>
-					<td align="right">${quantity}</td>
-					<td align="right">0</td>
-					<td align="right">${quantity}</td>
-
+					<td align="left">${itemRate}</td>
+					<td align="left">${basicval}</td>
+					<td align="left">${TotalTaxValue}</td>
+					<td align="left">${TotalOrderValue}</td>
 					<td>
 						<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
 							<i class="ri-pencil-fill"></i>
@@ -4902,7 +4896,7 @@ if (!empty($getlogpodtl)) {
 							window.location = "purchaseorderListing";
 
 						} else {
-							alert("Error");
+							alert("Something went wrong");
 						}
 
 					},
diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php
index b7da87f9..4307bb2e 100755
--- a/app/Views/porelease_view.php
+++ b/app/Views/porelease_view.php
@@ -315,7 +315,7 @@ if (empty($Status)) {
 			/* MSG*/
 			var answer = confirm(strMsg);
 			if (answer) {
-				$('#content').loader('show');
+				$('#loader').show();
 				$.ajax({
 					data: {
 						PONO: PO,
@@ -326,7 +326,7 @@ if (empty($Status)) {
 					url: "<?php echo base_url() ?>purchaseorder/ReleasePO",
 					success: function(data) {
 						if (data) {
-							$('#content').loader('hide');
+							$('#loader').hide();
 							alert(data);
 							location.reload();
 						} else {
@@ -388,7 +388,7 @@ if (empty($Status)) {
 		$("#txtSpcialInstruction").val('');
 		$('#AlertImg').attr("style", "display:none;");
 
-		$('#content').loader('show');
+		$('#loader').show();
 		$.ajax({
 			data: {
 				id: ReqId
@@ -397,8 +397,8 @@ if (empty($Status)) {
 			dataType: 'json',
 			url: "<?php echo base_url() ?>requisitionform/ViewRequest",
 			success: function(json) {
-				//	success:function(data) {
-				$('#content').loader('hide');
+				
+				$('#loader').hide();
 				//alert(data);
 				$("#ReqType").val(json.Requist[0]['ReqType']);
 				$("#ReqBy").val(json.Requist[0]['Requestedby']);