Upload 2 files

query_seller_sale.py

@@ -1,16 +1,9 @@
-# query_seller_sale.py
+# query_seller_sale.py\
+
 queries = {
     "query": """
-    select
-        *,
-        (seller_sale_cc - tds_cc - tcs_cc) as seller_net_cc,
-        round((seller_sale_cc - tds_cc - tcs_cc - seller_net_collection),2) as net_diff_cc,
-        Concat(bag_id,",")as conccat,
-        COUNT(bag_cc) as comment,
-        concat(company_id,'_',segement_code, '_', settlement_model_code, '_', order_type) as ledger_name
-    from 
-    (
-        select
+    WITH seller_net_data AS (
+    SELECT
         company_id,
         company_name,
         ordering_channel,
@@ -19,40 +12,91 @@ queries = {
         settlement_model,
         settlement_model_code,
         order_type,
-        recon_status,
-        fiscal_Year,
+        order_date,
+        fiscal_year,
         bag_id,
         settlement_type,
-        Concat(bag_id,settlement_type) as bag_cc ,
+        recon_status,
+        return_window_date,
+        payout_window_date,
+        expected_payout_date,
+        sett_no,
+        sett_id,
         mrp,
         seller_discounts,
         store_discount_amount,
         bca,
-        vog,
+        product_gst_perc,
+        round(vog,2) as vog,
         tds_on_bca,
         tcs_on_vog,
         seller_fees,
         seller_tender_value,
-        seller_net_collection,
-        mrp - seller_discounts -store_discount_amount as bca_cc,
-        bca - (mrp - seller_discounts -store_discount_amount) as diff_bca_cc,
-        round((mrp - seller_discounts -store_discount_amount)*100/(100 +product_gst_perc),2) as vog_cc,
-        vog - (round((mrp - seller_discounts -store_discount_amount)*100/(100 +product_gst_perc),2)) as diff_vog_cc,
+        round(seller_net_collection,2) as seller_net_collection,
+        ROUND(mrp - seller_discounts - store_discount_amount,2) AS bca_cc,
+        ROUND(bca - (mrp - seller_discounts - store_discount_amount),2) AS diff_bca_cc,
+        ROUND((mrp - seller_discounts - store_discount_amount) * 100 / (100 + ABS(product_gst_perc)), 2) AS vog_cc,
+        ROUND(vog - ROUND((mrp - seller_discounts - store_discount_amount) * 100 / (100 + ABS(product_gst_perc)), 2),2) AS diff_vog_cc,
+
+        -- TDS calculation logic
         CASE 
-        WHEN segement_code = 'FY' or segement_code = 'UN' THEN (mrp - seller_discounts -store_discount_amount)*0.01
-        ELSE 0
-        END as tds_cc,
+            WHEN segement_code IN ("FY", "UN") AND DATE(order_date) >= '2024-10-01' THEN 
+                ROUND((mrp - seller_discounts - store_discount_amount), 2) * 0.001
+            WHEN segement_code IN ("FY", "UN") AND DATE(order_date) < '2024-10-01' THEN 
+                ROUND((mrp - seller_discounts - store_discount_amount), 2) * 0.01
+            ELSE 0
+        END AS tds_cc,
+
+        -- TCS calculation logic
         CASE 
-        WHEN segement_code = 'FY' or segement_code = 'UN' THEN (round((mrp - seller_discounts -store_discount_amount)*100/(100 +product_gst_perc),2))*0.005
-        ELSE 0
-        END as tcs_cc,
-        (mrp - seller_discounts -store_discount_amount - seller_tender_value + seller_fees) as seller_sale_cc
-    from 
+            WHEN segement_code IN ("FY", "UN") AND DATE(order_date) >= '2024-07-10' THEN 
+                ROUND((mrp - seller_discounts - store_discount_amount) * 100 / (100 + ABS(product_gst_perc)), 2) * 0.005
+            WHEN segement_code IN ("FY", "UN") AND DATE(order_date) < '2024-07-10' THEN 
+                ROUND((mrp - seller_discounts - store_discount_amount) * 100 / (100 + ABS(product_gst_perc)), 2) * 0.01
+            ELSE 0
+        END AS tcs_cc
+    FROM 
         `fynd-db.finance_recon_tool_asia.09_seller_net_collection_daily`
-    where
-        expected_payout_date between "2024-09-03"
-        and "2024-09-09"
-    ) as A
-    group by all
+    WHERE
+        expected_payout_date BETWEEN "{start_date}" AND "{end_date}"
+),
+
+-- Subquery to count occurrences of each bag_id and concatenation of bag_id and settlement_type
+bag_con_count_data AS (
+    SELECT
+        bag_id,
+        settlement_type,
+        COUNT(*) AS bagg_count,
+        CONCAT(bag_id, settlement_type) AS bag_settlement_concat,
+        COUNT(CONCAT(bag_id, settlement_type)) AS bag_settlement_concat_count  -- Count of concatenated values
+    FROM
+        seller_net_data
+    GROUP BY
+        bag_id, settlement_type
+)
+
+-- Final query
+SELECT
+    sd.*,
+    ROUND((tds_cc - tds_on_bca), 2) AS diff_tds,
+    ROUND((tcs_cc - tcs_on_vog), 2) AS diff_tcs,
+    ROUND((mrp - seller_discounts - store_discount_amount - seller_tender_value + seller_fees),2) AS seller_sale_cc,
+    ROUND(((mrp - seller_discounts - store_discount_amount - seller_tender_value + seller_fees) - tds_cc - tcs_cc),2) AS seller_net_cc,
+    ROUND(((mrp - seller_discounts - store_discount_amount - seller_tender_value + seller_fees) - tds_cc - tcs_cc - seller_net_collection), 2) AS net_diff_cc,
+    CONCAT(sd.bag_id, ",") AS conccat,  -- Concatenated bag_id
+    CONCAT(sd.bag_id, sd.settlement_type) AS bag_cc,  -- Bag ID with settlement type
+    bcc.bagg_count AS bag_count,  -- Count of each bag_id and settlement type
+    bcc.bag_settlement_concat AS bag_con,  -- Concatenated bag_id and settlement_type
+    bcc.bag_settlement_concat_count AS bag_con_count,  -- Count of concatenated values
+    CASE
+        WHEN order_type = 'COD' THEN CONCAT(company_id, '_', segement_code, '_', settlement_model_code, '_', order_type, '_V')
+        WHEN order_type = 'PPD' THEN CONCAT(company_id, '_', segement_code, '_', settlement_model_code, '_', order_type, '_C')
+    END AS ledger_name
+FROM
+    seller_net_data sd
+LEFT JOIN
+    bag_con_count_data bcc
+ON
+    sd.bag_id = bcc.bag_id AND sd.settlement_type = bcc.settlement_type;
     """
 }

seller.py

@@ -68,13 +68,14 @@ html_subject = """
 st.markdown(html_subject, unsafe_allow_html=True)
 # selection = st.multiselect("", webhook_url)
 
+
 def check_duplicates(credentials_file):
     """Check for duplicates using BigQuery with the provided credentials file."""
     results = {}
     credentials = service_account.Credentials.from_service_account_info(json.loads(credentials_file))
     client = bigquery.Client(credentials=credentials, project=credentials.project_id)
     
-    query = queries["query"]  # Access the query string from the dictionary
+    query = queries["query"].format(start_date = start_date_str, end_date = end_date_str) # Access the query string from the dictionary
 
     # Show a loading spinner
     with st.spinner(":red[Performing seller sale validation...]"):
@@ -166,39 +167,112 @@ html_subject = """
 
 st.markdown(html_subject, unsafe_allow_html=True)
 
+
+
 # Upload credentials file
 credentials_file = st.file_uploader("", type="json")
 
+
+
+html_subject = """
+    <html>
+    <head>
+    <style>
+        .button {
+            display: inline-block;
+            padding: 10px 20px;
+            border-radius: 12px;
+            background: linear-gradient(to bottom, #f8f9fa, #e0e0e0);
+            box-shadow: 
+                0 6px 12px rgba(0, 0, 0, 0.3), 
+                0 8px 16px rgba(0, 0, 0, 0.2), 
+                inset 0 -2px 4px rgba(255, 255, 255, 0.6);
+            text-align: center;
+            position: relative;
+            transform: translateY(4px);
+            transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out;
+            cursor: pointer;
+            user-select: none;
+        }
+        .button:hover {
+            box-shadow: 
+                0 8px 16px rgba(0, 0, 0, 0.3), 
+                0 12px 24px rgba(0, 0, 0, 0.2);
+            transform: translateY(2px);
+        }
+        .button:active {
+            box-shadow: 
+                0 4px 8px rgba(0, 0, 0, 0.3), 
+                0 6px 12px rgba(0, 0, 0, 0.2);
+            transform: translateY(0);
+        }
+    </style>
+    </head>
+    <body>
+        <div class="button">
+            <h3 style="
+                font-size: 20px;
+                color: #ffffff;
+                background-image: linear-gradient(to right, #800000, #ff0000, #ffdab9);
+                background-clip: text;
+                -webkit-background-clip: text;
+                text-fill-color: transparent;
+                -webkit-text-fill-color: transparent;
+                margin: 0;
+                text-shadow: 0 2px 5px rgba(0, 0, 0, 0.4);
+            ">Select the expected payout date</h3>
+        </div>
+    </body>
+    </html>
+    """
+
+st.markdown(html_subject, unsafe_allow_html=True)
+
+
+st.write("")
+col1, col2 = st.columns([0.118, 0.125])
+with col1:
+    start_date = st.date_input("Start date", value = None)
+with col2:
+    end_date = st.date_input("End date", value = None)
+
+
 if credentials_file is not None:
-    # Read the credentials file
-    credentials_data = credentials_file.read().decode("utf-8")
-    
-    # Check for duplicates
-    results = check_duplicates(credentials_data)
-    
-    if "Query Result" in results:
-        df = results["Query Result"]
+    if start_date and end_date:  # Ensure dates are selected
+        start_date_str = start_date.strftime("%Y-%m-%d")
+        end_date_str = end_date.strftime("%Y-%m-%d")
         
-        # Download buttons
-        csv = df.to_csv(index=False)
-        excel = io.BytesIO()
-        with pd.ExcelWriter(excel, engine='openpyxl') as writer:
-            df.to_excel(writer, index=False)
-        excel.seek(0)
+        # Read the credentials file
+        credentials_data = credentials_file.read().decode("utf-8")
         
-        col1, col2 = st.columns([0.125, 0.5])
-        with col1:
-            st.download_button(
-                label=":red[Download CSV]",
-                data=csv,
-                file_name="seller_sale_recon.csv",
-                mime="text/csv"
-            )
-
-        with col2:
-            st.download_button(
-                label=":red[Download Excel]",
-                data=excel,
-                file_name="seller_sale_recon.xlsx",
-                mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-        )
+        # Check for duplicates
+        results = check_duplicates(credentials_data)
+        
+        if "Query Result" in results:
+            df = results["Query Result"]
+            
+            # Download buttons
+            csv = df.to_csv(index=False)
+            excel = io.BytesIO()
+            with pd.ExcelWriter(excel, engine='openpyxl') as writer:
+                df.to_excel(writer, index=False)
+            excel.seek(0)
+            
+            col1, col2 = st.columns([0.125, 0.5])
+            with col1:
+                st.download_button(
+                    label=":red[Download CSV]",
+                    data=csv,
+                    file_name="seller_sale_recon.csv",
+                    mime="text/csv"
+                )
+
+            with col2:
+                st.download_button(
+                    label=":red[Download Excel]",
+                    data=excel,
+                    file_name="seller_sale_recon.xlsx",
+                    mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                )
+    else:
+        st.warning("Please select both the start and end dates to proceed.")