Tracking pull request to merge release-1.20.0 to main (#583)

* Update to 1.20.0 * Update pr number and release version * Update dev release * Update pipeline name to 1.20.0 * fix: itvr - fix for viewing household application console (#584) * fix: itvr-rebate-expiration-timing-issue (#585) --------- Co-authored-by: tim738745 <[email protected]>
bcgov · Aug 24, 2023 · cf46138 · cf46138
1 parent 98e4dcc
commit cf46138
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/dev-cicd.yaml b/.github/workflows/dev-cicd.yaml
@@ -1,6 +1,6 @@
 ## For each release, the value of workflow name, branches and PR_NUMBER need to be adjusted accordingly
 
-name: ITVR Dev release-1.19.0
+name: ITVR Dev release-1.20.0
 
 on:
   pull_request:

diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml
@@ -1,16 +1,16 @@
-name: ITVR release-1.19.0
+name: ITVR release-1.20.0
 
 on:
   workflow_dispatch:
     inputs:
       pull_request:
         description: 'Tracking pull request number'
         required: true
-        default: 573
+        default: 583
       release_branch:
         description: 'The name of the release branch'
         required: true
-        default: release-1.19.0 
+        default: release-1.20.0 
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/django/api/admin.py b/django/api/admin.py
@@ -36,7 +36,7 @@ def has_change_permission(self, request, obj=None):
 class ITVRInlineAdmin(admin.StackedInline):
     actions = None
 
-    def has_add_permission(self, request):
+    def has_add_permission(self, request, obj):
         return False
 
     def has_change_permission(self, request, obj=None):

diff --git a/django/api/tasks.py b/django/api/tasks.py
@@ -541,9 +541,10 @@ def expire_rebate(rebate):
                     pass
 
     def inner():
+        threshold = timezone.now().date() - timedelta(days=2)
         expired_rebates = (
             GoElectricRebate.objects.filter(redeemed=False)
-            .filter(expiry_date__lte=timezone.now().date())
+            .filter(expiry_date__lte=threshold)
             .filter(ncda_id__isnull=False)
             .filter(application__status=GoElectricRebateApplication.Status.APPROVED)
         )[:max_number_of_rebates]

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^2.14.0",