diff --git a/Site/Pages/v5/Financial/ApproveCosts.aspx b/Site/Pages/v5/Financial/ApproveCosts.aspx
index 9bb5b24b..37e34e61 100644
--- a/Site/Pages/v5/Financial/ApproveCosts.aspx
+++ b/Site/Pages/v5/Financial/ApproveCosts.aspx
@@ -103,6 +103,8 @@
if (!response) {
// user clicked the RED button, which is "confirm overdraft"
+ console.log(this); // Debug
+
onExpenseApproval(this);
}
}, this));
@@ -204,11 +206,15 @@
function onExpenseApproval(approvalIcon) {
+ alert("debug step 1");
+
var itemId = $(approvalIcon).attr("baseid");
$(approvalIcon).hide();
$("#IconWait" + itemId).show();
$("#IconDenial" + itemId).fadeTo(1000, 0.01);
+ alert("debug step 2");
+
var accountId = $("#IconApproval" + itemId).attr("accountid");
var funds = parseFloat($("#IconApproval" + itemId).attr("amount"));
budgetRemainingLookup[accountId] += funds;
diff --git a/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs
index 70cdd9f7..22540e88 100644
--- a/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs
+++ b/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs
@@ -70,11 +70,11 @@ namespace Swarmops.Frontend.Pages.Financial
"\"amount\":\"{6}\"," +
"\"action\":\"" +
"" +
- "
" +
- "
" +
- "
" +
- "
" +
- "
" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
"\"",
payout.ProtoIdentity,
(payout.ExpectedTransactionDate <= today
diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx b/Site/Pages/v5/Financial/PayOutMoney.aspx
index 36f2d4b8..aaa5ff8a 100644
--- a/Site/Pages/v5/Financial/PayOutMoney.aspx
+++ b/Site/Pages/v5/Financial/PayOutMoney.aspx
@@ -58,7 +58,7 @@
gridsLoaded++;
- if (gridsLoaded == 4) { // onLoadSuccess is triggered _twice_ per grid for some arcane reason
+ if (gridsLoaded == 2) { // onLoadSuccess is triggered _twice_ per grid for some arcane reason
$('#divOcrView').hide();
@@ -142,8 +142,8 @@
$(".LocalIconUndo").click(function() {
$(this).hide();
var itemId = $(this).attr("baseid");
- $(".IconApproved" + itemId).fadeTo(1000, 0.01);
- $(".IconWait" + itemId).show();
+ $("#IconApproved" + itemId).fadeTo(1000, 0.01);
+ $("#IconWait" + itemId).show();
SwarmopsJS.proxiedAjaxCall(
"/Pages/v5/Financial/PayOutMoney.aspx/UndoPayout",
@@ -153,10 +153,10 @@
if (result.Success) {
var itemId = $(this).attr("baseid");
$('.row' + itemId).removeClass("action-list-item-approved");
- $(".IconWait" + itemId).hide();
- $(".IconApproved" + itemId).hide();
- $(".IconApproval" + itemId).fadeTo(200, 1);
- $(".IconDenial" + itemId).fadeTo(200, 1);
+ $("#IconWait" + itemId).hide();
+ $("#IconApproved" + itemId).hide();
+ $("#IconApproval" + itemId).fadeTo(200, 1);
+ $("#IconDenial" + itemId).fadeTo(200, 1);
alertify.log(result.DisplayMessage);
} else {
@@ -284,8 +284,8 @@
}
$(approvalIcon).hide();
- $(".IconWait" + itemId).show();
- $(".IconDenial" + itemId).fadeTo(1000, 0.01);
+ $("#IconWait" + itemId).show();
+ $("#IconDenial" + itemId).fadeTo(1000, 0.01);
SwarmopsJS.proxiedAjaxCall(
"/Pages/v5/Financial/PayOutMoney.aspx/ConfirmPayout",
@@ -296,10 +296,10 @@
var itemId = $(this).attr("baseid");
$('.row' + itemId).addClass("action-list-item-approved");
$("#IconApproval" + itemId).attr("databaseid", result.AssignedId);
- $(".IconWait" + itemId).hide();
- $(".IconDenial" + itemId).hide();
- $(".IconApproved" + itemId).fadeTo(200, 0.5); // half opacity is intentional
- $(".IconUndo" + itemId).fadeTo(1000, 1); // the longer delay is intentional
+ $("#IconWait" + itemId).hide();
+ $("#IconDenial" + itemId).hide();
+ $("#IconApproved" + itemId).fadeTo(200, 0.5); // half opacity is intentional
+ $("#IconUndo" + itemId).fadeTo(1000, 1); // the longer delay is intentional
alertify.success(result.DisplayMessage);
} else {
// There's probably a concurrency error.
@@ -349,22 +349,6 @@
-