mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-06-09 15:07:49 +00:00
Merge branch 'feat/marketing-filter-range-date' into 'development'
[FEAT][BE] Marketing Filter Range Date See merge request mbugroup/lti-api!585
This commit is contained in:
@@ -75,6 +75,9 @@ func (u *DeliveryOrdersController) GetAll(c *fiber.Ctx) error {
|
||||
WarehouseID: uint(c.QueryInt("warehouse_id", 0)),
|
||||
SortBy: sortBy,
|
||||
SortOrder: sortOrder,
|
||||
StartDate: strings.TrimSpace(c.Query("start_date", "")),
|
||||
EndDate: strings.TrimSpace(c.Query("end_date", "")),
|
||||
FilterBy: strings.TrimSpace(c.Query("filter_by", "")),
|
||||
}
|
||||
|
||||
if isAllExcelExportRequest(c) {
|
||||
|
||||
@@ -321,6 +321,21 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
|
||||
return db.Where("id = ?", params.MarketingId)
|
||||
}
|
||||
|
||||
dateStart, dateEnd, dateErr := utils.ParseDateRangeForQuery(params.StartDate, params.EndDate)
|
||||
if dateErr != nil {
|
||||
return db.Where("1 = 0")
|
||||
}
|
||||
dateCol := "marketings.so_date"
|
||||
if strings.TrimSpace(params.FilterBy) == "created_at" {
|
||||
dateCol = "marketings.created_at"
|
||||
}
|
||||
if dateStart != nil {
|
||||
db = db.Where(dateCol+" >= ?", *dateStart)
|
||||
}
|
||||
if dateEnd != nil {
|
||||
db = db.Where(dateCol+" < ?", *dateEnd)
|
||||
}
|
||||
|
||||
orderDir := "DESC"
|
||||
if params.SortOrder != "" {
|
||||
orderDir = strings.ToUpper(params.SortOrder)
|
||||
|
||||
@@ -34,6 +34,9 @@ type DeliveryOrderQuery struct {
|
||||
WarehouseID uint `query:"warehouse_id" validate:"omitempty,gt=0"`
|
||||
SortBy string `query:"sort_by" validate:"omitempty,oneof=so_number so_date status customer grand_total created_at"`
|
||||
SortOrder string `query:"sort_order" validate:"omitempty,oneof=asc desc"`
|
||||
StartDate string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
|
||||
EndDate string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
|
||||
FilterBy string `query:"filter_by" validate:"omitempty,oneof=so_date created_at"`
|
||||
}
|
||||
|
||||
type DeliveryOrderApprove struct {
|
||||
|
||||
Reference in New Issue
Block a user