Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -21,7 +21,13 @@ func ExportStatementAgingExcelHandler(_ *sql.DB) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
selectedDate := time.Now().Format("2006-01-02")
|
||||
selectedDate := strings.TrimSpace(r.URL.Query().Get("enddate"))
|
||||
if selectedDate == "" {
|
||||
selectedDate = strings.TrimSpace(r.URL.Query().Get("selected_date"))
|
||||
}
|
||||
if selectedDate == "" {
|
||||
selectedDate = time.Now().Format("2006-01-02")
|
||||
}
|
||||
params := models.CustomerBalanceListParams{
|
||||
SelectedDate: selectedDate,
|
||||
CariSearch: strings.TrimSpace(r.URL.Query().Get("cari_search")),
|
||||
@@ -34,9 +40,17 @@ func ExportStatementAgingExcelHandler(_ *sql.DB) http.HandlerFunc {
|
||||
Il: strings.TrimSpace(r.URL.Query().Get("il")),
|
||||
Ilce: strings.TrimSpace(r.URL.Query().Get("ilce")),
|
||||
}
|
||||
if accountCode := strings.TrimSpace(r.URL.Query().Get("accountcode")); accountCode != "" {
|
||||
params.CariSearch = accountCode
|
||||
}
|
||||
excludeZero12 := parseBoolQuery(r.URL.Query().Get("exclude_zero_12"))
|
||||
excludeZero13 := parseBoolQuery(r.URL.Query().Get("exclude_zero_13"))
|
||||
|
||||
if err := queries.RebuildStatementAgingCache(r.Context()); err != nil {
|
||||
http.Error(w, "Error rebuilding aging cache: "+err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
rows, err := queries.GetStatementAgingBalanceList(r.Context(), params)
|
||||
if err != nil {
|
||||
http.Error(w, "db error: "+err.Error(), http.StatusInternalServerError)
|
||||
|
||||
Reference in New Issue
Block a user