Tracking pull request to merge release-1.24.0.1 to master (#670)

bcgov · Apr 23, 2021 · 4f7c723 · 4f7c723
1 parent 70ce53c
commit 4f7c723
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/backend/api/serializers/sales_submission.py b/backend/api/serializers/sales_submission.py
@@ -577,8 +577,13 @@ def update(self, instance, validated_data):
             ).exclude(
                 xls_vin__in=awarded_vins
             ).exclude(
-                xls_vin__in=duplicate_vins,
-                xls_sale_date__lte="43102.0"
+                xls_vin__in=duplicate_vins
+            ).exclude(
+                xls_sale_date__lte="43102.0",
+                xls_date_type="3"
+            ).exclude(
+                xls_sale_date__lte="2018-01-02",
+                xls_date_type="1"
             )
 
             for row in content:

diff --git a/backend/api/viewsets/credit_request.py b/backend/api/viewsets/credit_request.py
@@ -257,7 +257,18 @@ def content(self, request, pk):
 
                 if submission_filters['warning'] == '1' or \
                         '5' in submission_filters['warning']:
-                    sale_date = Q(Q(xls_sale_date__lte="43102.0") & ~Q(xls_sale_date=""))
+                    sale_date = Q(
+                        Q(
+                            Q(xls_sale_date__lte="43102.0") &
+                            Q(xls_date_type="3") &
+                            ~Q(xls_sale_date="")
+                        ) |
+                        Q(
+                            Q(xls_sale_date__lte="2018-01-02") &
+                            Q(xls_date_type="1") &
+                            ~Q(xls_sale_date="")
+                        )
+                    )
 
                 if submission_filters['warning'] == '1' or \
                         '6' in submission_filters['warning']:
@@ -356,7 +367,16 @@ def unselected(self, request, pk):
                 ~Q(xls_vin__in=Subquery(
                     IcbcRegistrationData.objects.values('vin')
                 )) |
-                Q(xls_sale_date__lte="43102.0")
+                Q(
+                    Q(
+                        Q(xls_sale_date__lte="43102.0") &
+                        Q(xls_date_type="3")
+                    ) |
+                    Q(
+                        Q(xls_sale_date__lte="2018-01-02") &
+                        Q(xls_date_type="1")
+                    )
+                )
             ).values_list('id', flat=True)
         else:
             selected_vins = Subquery(RecordOfSale.objects.filter(

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zeva-frontend",
-  "version": "1.24.0",
+  "version": "1.24.0-1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",