Merge pull request #769 from uw-it-aca/develop

Develop

Author: mikeseibel

endorsement/fixtures/test_data/itbill_quantity.json

@@ -31,5 +31,27 @@
       "end_date": null,
       "stage": null
     }
+  },
+  {
+    "model": "endorsement.itbillquantity",
+    "pk": 4,
+    "fields": {
+      "provision": 3,
+      "quantity": 2,
+      "start_date": "2025-04-04",
+      "end_date": "2025-09-29",
+      "stage": null
+    }
+  },
+  {
+    "model": "endorsement.itbillquantity",
+    "pk": 5,
+    "fields": {
+      "provision": 3,
+      "quantity": 9,
+      "start_date": "2025-12-01",
+      "end_date": null,
+      "stage": null
+    }
   }
 ]

endorsement/static/endorsement/js/tab/google.js

@@ -215,7 +215,7 @@ var ManageSharedDrives = (function () {
                         var starting = this.start_date ? moment(this.start_date) : null,
                             ending = this.end_date ? moment(this.end_date): null,
                             is_future = starting && starting.diff(billing_period_end) > 0 && this.quota_limit != drive.drive.drive_quota.quota_limit,
-                            is_ending = ending && ending.diff(billing_period_end) < 0 && ending.diff(billing_period_start) > 0,
+                            is_ending = ending && ending.diff(billing_period_start) > 0 && ending.diff(billing_period_end) < 0 && ending.diff(now) > 0 && this.quota_limit != drive.drive.drive_quota.quota_limit,
                             is_increasing = this.quota_limit > drive.drive.drive_quota.quota_limit,
                             is_decreasing = this.quota_limit < drive.drive.drive_quota.quota_limit,
                             is_changing = (is_future || is_ending);