Merge pull request #777 from coral-erm/development

Fix for Resources Module
coral-erm · Oct 4, 2024 · dd24afe · dd24afe
2 parents 14fa51f + 8a25c86
commit dd24afe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/resources/ajax_processing/submitCost.php b/resources/ajax_processing/submitCost.php
@@ -32,10 +32,10 @@
 					$resourcePayment->subscriptionStartDate = $start;
 					$resourcePayment->subscriptionEndDate   = $end;
 					$resourcePayment->fundID        = $fundIDArray[$key];
-					$resourcePayment->priceTaxExcluded = $pteArray[$key];
+					$resourcePayment->priceTaxExcluded = is_numeric($pteArray[$key]) ? $pteArray[$key] : null;
 					$resourcePayment->taxRate       = is_numeric($taxRateArray[$key]) ? $taxRateArray[$key] : null;
-					$resourcePayment->priceTaxIncluded = $ptiArray[$key];
-					$resourcePayment->paymentAmount = $paymentAmountArray[$key];
+					$resourcePayment->priceTaxIncluded = is_numeric($ptiArray[$key]) ? $ptiArray[$key] : null;
+					$resourcePayment->paymentAmount = is_numeric($paymentAmountArray[$key]) ? $paymentAmountArray[$key] : null;
 					$resourcePayment->currencyCode  = $currencyCodeArray[$key];
 					$resourcePayment->orderTypeID   = $value;
 					$resourcePayment->costDetailsID = $costDetailsArray[$key];

diff --git a/resources/directory.php b/resources/directory.php
@@ -38,7 +38,7 @@ function integer_to_cost($price) {
     if ($price > 0){
         return $nf->format($price / 100);
     }else{
-        return "";
+        return $nf->format(0);
     }
 }
 
@@ -90,7 +90,7 @@ function resource_sidemenu($selected_link = '') {
     } else {
       $class = 'sidemenuunselected';
     }
-    if ($key != 'accounts' || $user->accountTabIndicator == '1') {
+    if ($key != 'accounts' || $user->accountTabIndicator == '1' || $user->isAdmin) {
     ?>
     <div class="<?php echo $class; ?>" style='position: relative; width: 105px'><span class='link'><a href='javascript:void(0)' class='show<?php echo $name; ?>' title="<?php echo $value; ?>"><?php echo $value; ?></a></span>
       <?php if ($key == 'attachments') { ?>

diff --git a/resources/js/forms/externalLoginForm.js b/resources/js/forms/externalLoginForm.js
@@ -130,7 +130,7 @@ function submitExternalLogin(){
 				$("#span_errors").html(html);
 				$("#submitExternalLoginForm").removeAttr("disabled");
 			}else{
-				myDialogClose();
+				myCloseDialog();
 				window.parent.updateAccounts();
 				return false;
 			}