#update: update store voucher

Latipe-EC · Jun 24, 2024 · 96bddad · 96bddad
1 parent 50e28fa
commit 96bddad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/internal/domain/dto/voucher_details.go b/internal/domain/dto/voucher_details.go
@@ -30,7 +30,7 @@ type VoucherRequireResp struct {
 }
 
 type DiscountDataResp struct {
-	DiscountType    int     `json:"discount_type,omitempty"`
+	DiscountType    int     `json:"discount_type"`
 	ShippingValue   uint    `json:"shipping_value,omitempty"`
 	DiscountValue   uint    `json:"discount_value,omitempty"`
 	DiscountPercent float32 `json:"discount_percent,omitempty"`

diff --git a/internal/services/voucherserv/utils.go b/internal/services/voucherserv/utils.go
@@ -72,7 +72,6 @@ func (sh VoucherService) validateVoucherRequest(ctx context.Context, req *dto.Cr
 
 	if req.VoucherType == entities.STORE_DISCOUNT && !sh.validateStoreVoucherPolicy(ctx, req) {
 		return responses.ErrOutOfStorePolicy
-
 	}
 
 	if startTime.Before(currentTime) || endedTime.Before(currentTime) || startTime.After(endedTime) {
@@ -117,6 +116,10 @@ func (sh VoucherService) validateStoreVoucherPolicy(ctx context.Context, req *dt
 		return false
 	}
 
+	if req.DiscountData.DiscountType == entities.FREE_SHIP {
+		return false
+	}
+
 	if req.DiscountData.DiscountType == entities.FIXED_DISCOUNT &&
 		req.DiscountData.DiscountValue > entities.STORE_MAX_FIXED_VALUE_POLICY {
 		return false