Feature: Tax Analysis

barker/routes.py

@@ -358,8 +358,8 @@ def includeme(config):
     config.add_route("v1_checkout_blank", "/v1/checkout")
 
     config.add_route("v1_sa_sale", "/v1/sale-analysis/sale")
-    config.add_route("v1_sa_settlements", "/v1_sale-analysis/settlements")
-    config.add_route("v1_sa_tax", "/v1_sale-analysis/tax")
+    config.add_route("v1_sa_settlements", "/v1/sale-analysis/settlements")
+    config.add_route("v1_sa_tax", "/v1/sale-analysis/tax")
     config.add_route("v1_sale_analysis", "/v1/sale-analysis")
 
     # Done till here

barker/views/reports/sale_analysis.py

@@ -138,29 +138,18 @@ def get_settlements(start_date, finish_date, dbsession):
     permission=("Tax Analysis", "Sales Analysis"),
 )
 def get_tax_view(request):
-    start_date = request.GET.get("s", None)
-    if not start_date:
-        start_date = datetime.today().replace(hour=7, minute=0)
-    else:
-        start_date = datetime.strptime(start_date, "%d-%b-%Y").replace(hour=7, minute=0)
-
-    finish_date = request.GET.get("f", None)
-    if not finish_date:
-        finish_date = datetime.today().replace(hour=7, minute=0) + timedelta(days=1)
-    else:
-        finish_date = datetime.strptime(finish_date, "%d-%b-%Y").replace(
-            hour=7, minute=0
-        ) + timedelta(days=1)
+    start_date = get_start_date(request.GET.get("s", None))
+    finish_date = get_finish_date(request.GET.get("f", None))
 
     if (
-        datetime.date().today() - start_date.date()
+        datetime.today() - start_date.replace(hour=0)
     ).days > 5 and "Accounts Audit" not in request.effective_principals:
         raise ValidationError("Accounts Audit")
 
     return {
         "startDate": start_date.date().strftime("%d-%b-%Y"),
         "finishDate": (finish_date - timedelta(days=1)).date().strftime("%d-%b-%Y"),
-        "amounts": get_settlements(start_date, finish_date, request.dbsession),
+        "amounts": get_tax(start_date, finish_date, request.dbsession),
     }
 
 
@@ -188,7 +177,7 @@ def get_tax(start_date, finish_date, dbsession):
         {
             "name": "{0} - {1:.2%}".format(i[0], i[1]),
             "taxRate": i[1],
-            "netSale": i[2],
+            "saleAmount": i[2],
             "amount": i[3],
         }
         for i in amounts