Update WhatsApp notification format, add voucher to order reports, and add tenant settings toggle

.gitignore

@@ -28,3 +28,5 @@ bin/
 .DS_Store
 Thumbs.db
 service-warungpos-go
+main
+tmp_build

controllers/company_controller.go

@@ -31,6 +31,7 @@ type CompanyResponse struct {
 	QrisFeeMin         int       `json:"qris_fee_min"`
 	QrisMinTransaction int       `json:"qris_min_transaction"`
 	AllowQrisBelowMin  bool      `json:"allow_qris_below_min"`
+	ChargeFeeBeforeDiscount bool `json:"charge_fee_before_discount"`
 	WalletBalance      float64   `json:"wallet_balance"`
 	WalletLimit        float64   `json:"wallet_limit"`
 	ApprovedAt        *time.Time `json:"approved_at"`
@@ -100,7 +101,7 @@ func ListCompanies(c *gin.Context) {
 	searchQuery := c.Query("search")
 
 	query := config.DB.Model(&models.Company{}).
-		Select("id, name, bank_account_number, bank_name, address, email, phone, logo_url, is_active, fee_percentage, cash_fee_rules, qris_fee_percentage, qris_fee_fixed, qris_fee_min, qris_min_transaction, allow_qris_below_min, wallet_balance, wallet_limit, approved_at, created_at")
+		Select("id, name, bank_account_number, bank_name, address, email, phone, logo_url, is_active, fee_percentage, cash_fee_rules, qris_fee_percentage, qris_fee_fixed, qris_fee_min, qris_min_transaction, allow_qris_below_min, charge_fee_before_discount, wallet_balance, wallet_limit, approved_at, created_at")
 
 	if searchQuery != "" {
 		query = query.Where("name ILIKE ? OR email ILIKE ? OR phone ILIKE ? OR address ILIKE ?", 
@@ -206,8 +207,9 @@ func ListCompanies(c *gin.Context) {
 			QrisFeeFixed:      comp.QrisFeeFixed,
 			QrisFeeMin:        comp.QrisFeeMin,
 			QrisMinTransaction: comp.QrisMinTransaction,
-			AllowQrisBelowMin: comp.AllowQrisBelowMin,
-			WalletBalance:     comp.WalletBalance,
+			AllowQrisBelowMin:  comp.AllowQrisBelowMin,
+			ChargeFeeBeforeDiscount: comp.ChargeFeeBeforeDiscount,
+			WalletBalance:      comp.WalletBalance,
 			WalletLimit:       comp.WalletLimit,
 			CreatedAt:         comp.CreatedAt,
 		})
@@ -932,3 +934,39 @@ func ToggleProductAvailability(c *gin.Context) {
 		"is_available": bp.IsAvailable,
 	})
 }
+
+type UpdateCompanySettingsRequest struct {
+	ChargeFeeBeforeDiscount *bool `json:"charge_fee_before_discount"`
+}
+
+func AdminUpdateCompanySettings(c *gin.Context) {
+	companyIDStr := c.Param("id")
+	companyID, err := strconv.Atoi(companyIDStr)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"detail": "ID Perusahaan tidak valid"})
+		return
+	}
+
+	var req UpdateCompanySettingsRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
+		return
+	}
+
+	var company models.Company
+	if err := config.DB.First(&company, companyID).Error; err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"detail": "Perusahaan tidak ditemukan"})
+		return
+	}
+
+	if req.ChargeFeeBeforeDiscount != nil {
+		company.ChargeFeeBeforeDiscount = *req.ChargeFeeBeforeDiscount
+	}
+
+	if err := config.DB.Save(&company).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"detail": "Gagal menyimpan pengaturan"})
+		return
+	}
+
+	c.JSON(http.StatusOK, company)
+}

controllers/order_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -44,6 +45,9 @@ type OrderResponse struct {
 	BranchID        *uint               `json:"branch_id"`
 	BranchName      string              `json:"branch_name"`
 	TotalAmount     int                 `json:"total_amount"`
+	SubtotalAmount  int                 `json:"subtotal_amount"`
+	DiscountAmount  int                 `json:"discount_amount"`
+	PointsUsed      int                 `json:"points_used"`
 	PlatformFee     int                 `json:"platform_fee"`
 	PaidAmount      int                 `json:"paid_amount"`
 	ChangeAmount    int                 `json:"change_amount"`
@@ -53,15 +57,21 @@ type OrderResponse struct {
 	MidtransToken   string              `json:"midtrans_token"`
 	Items           []OrderItemResponse `json:"items"`
 	CreatedAt       time.Time           `json:"created_at"`
+	ServedBy        string              `json:"served_by"`
+	CustomerName    string              `json:"customer_name"`
+	MemberID        *uint               `json:"member_id"`
+	MemberName      string              `json:"member_name"`
+	VoucherID       *uint               `json:"voucher_id"`
 }
 
 type CashPaymentRequest struct {
 	OrderID       uint   `json:"order_id" binding:"required"`
-	PaidAmount    int    `json:"paid_amount" binding:"required,gt=0"`
+	PaidAmount    int    `json:"paid_amount" binding:"gte=0"`
 	CustomerName  string `json:"customer_name"`
 	CustomerPhone string `json:"customer_phone"`
 	ServedBy      string `json:"served_by"`
 	MemberID      *uint  `json:"member_id"`
+	VoucherID     *uint  `json:"voucher_id"`
 }
 
 type MidtransPaymentRequest struct {
@@ -71,6 +81,7 @@ type MidtransPaymentRequest struct {
 	CustomerPhone string `json:"customer_phone"`
 	ServedBy      string `json:"served_by"`
 	MemberID      *uint  `json:"member_id"`
+	VoucherID     *uint  `json:"voucher_id"`
 }
 type PaymentStatusResponse struct {
 	OrderID       uint   `json:"order_id"`
@@ -114,12 +125,20 @@ func toOrderResponse(order *models.Order) OrderResponse {
 		bName = order.Branch.Name
 	}
 
+	mName := ""
+	if order.Member != nil {
+		mName = order.Member.Name
+	}
+
 	return OrderResponse{
 		ID:              order.ID,
 		OrderNumber:     order.OrderNumber,
 		BranchID:        order.BranchID,
 		BranchName:      bName,
 		TotalAmount:     order.TotalAmount,
+		SubtotalAmount:  order.SubtotalAmount,
+		DiscountAmount:  order.DiscountAmount,
+		PointsUsed:      order.PointsUsed,
 		PlatformFee:     order.PlatformFee,
 		PaidAmount:      order.PaidAmount,
 		ChangeAmount:    order.ChangeAmount,
@@ -129,6 +148,11 @@ func toOrderResponse(order *models.Order) OrderResponse {
 		MidtransToken:   order.MidtransToken,
 		Items:           itemsResp,
 		CreatedAt:       order.CreatedAt,
+		ServedBy:        order.ServedBy,
+		CustomerName:    order.CustomerName,
+		MemberID:        order.MemberID,
+		MemberName:      mName,
+		VoucherID:       order.VoucherID,
 	}
 }
 
@@ -223,6 +247,7 @@ func CreateOrder(c *gin.Context) {
 	}
 
 	// Update total amount order
+	order.SubtotalAmount = total
 	order.TotalAmount = total
 	if err := tx.Save(&order).Error; err != nil {
 		tx.Rollback()
@@ -237,7 +262,7 @@ func CreateOrder(c *gin.Context) {
 	}
 
 	// Load relationships untuk response
-	config.DB.Preload("Branch").Preload("Items.Product").First(&order, order.ID)
+	config.DB.Preload("Branch").Preload("Member").Preload("Items.Product").First(&order, order.ID)
 
 	c.JSON(http.StatusCreated, toOrderResponse(&order))
 }
@@ -255,10 +280,13 @@ func ListOrders(c *gin.Context) {
 	skip, _ := strconv.Atoi(skipStr)
 	limit, _ := strconv.Atoi(limitStr)
 
-	query := config.DB.Select("id, company_id, branch_id, order_number, total_amount, platform_fee, paid_amount, change_amount, payment_method, payment_status, midtrans_order_id, midtrans_token, created_at").
+	query := config.DB.Select("id, company_id, branch_id, order_number, total_amount, platform_fee, paid_amount, change_amount, payment_method, payment_status, midtrans_order_id, midtrans_token, created_at, served_by, customer_name, member_id, voucher_id, discount_amount, points_used").
 		Preload("Branch", func(db *gorm.DB) *gorm.DB {
 			return db.Select("id, name")
 		}).
+		Preload("Member", func(db *gorm.DB) *gorm.DB {
+			return db.Select("id, name")
+		}).
 		Preload("Items", func(db *gorm.DB) *gorm.DB {
 			return db.Select("id, order_id, product_id, quantity, unit_price, subtotal")
 		}).
@@ -317,7 +345,7 @@ func GetOrder(c *gin.Context) {
 	}
 
 	var order models.Order
-	if err := config.DB.Preload("Branch").Preload("Items.Product").Where("id = ? AND company_id = ?", orderID, *user.CompanyID).First(&order).Error; err != nil {
+	if err := config.DB.Preload("Branch").Preload("Member").Preload("Items.Product").Where("id = ? AND company_id = ?", orderID, *user.CompanyID).First(&order).Error; err != nil {
 		c.JSON(http.StatusNotFound, gin.H{"detail": "Order tidak ditemukan"})
 		return
 	}
@@ -371,6 +399,12 @@ func PayCash(c *gin.Context) {
 		return
 	}
 
+	if err := applyVoucher(tx, &order, req.VoucherID, req.MemberID, company.ID); err != nil {
+		tx.Rollback()
+		c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
+		return
+	}
+
 	if req.PaidAmount < order.TotalAmount {
 		tx.Rollback()
 		c.JSON(http.StatusBadRequest, gin.H{
@@ -394,16 +428,27 @@ func PayCash(c *gin.Context) {
 	if req.MemberID != nil {
 		order.MemberID = req.MemberID
 	}
+	if req.CustomerName != "" {
+		order.CustomerName = req.CustomerName
+	}
+	if req.CustomerPhone != "" {
+		order.CustomerPhone = req.CustomerPhone
+	}
 
 	// Hitung fee platform berdasarkan Company
 	fee := 0
+	baseAmountForFee := order.TotalAmount
+	if company.ChargeFeeBeforeDiscount {
+		baseAmountForFee = order.SubtotalAmount
+	}
+
 	if company.CashFeeRules != "" && company.CashFeeRules != "[]" {
 		var rules []map[string]interface{}
 		if err := json.Unmarshal([]byte(company.CashFeeRules), &rules); err == nil {
 			for _, r := range rules {
 				minAmt := int(r["min_amount"].(float64))
 				maxAmt := int(r["max_amount"].(float64))
-				if order.TotalAmount >= minAmt && order.TotalAmount <= maxAmt {
+				if baseAmountForFee >= minAmt && baseAmountForFee <= maxAmt {
 					fee = int(r["fee"].(float64))
 					break
 				}
@@ -412,7 +457,7 @@ func PayCash(c *gin.Context) {
 	}
 	// Fallback ke fee lama jika tidak ada rule yang cocok/diset
 	if fee == 0 && company.FeePercentage > 0 {
-		fee = int(float64(order.TotalAmount) * company.FeePercentage / 100)
+		fee = int(float64(baseAmountForFee) * company.FeePercentage / 100)
 	}
 	order.PlatformFee = fee
 
@@ -470,10 +515,12 @@ func PayCash(c *gin.Context) {
 			}
 
 			var branchName string
+			var branchAddress string
 			if order.BranchID != nil {
 				var branch models.Branch
 				if err := config.DB.First(&branch, *order.BranchID).Error; err == nil {
 					branchName = branch.Name
+					branchAddress = branch.Address
 				}
 			}
 
@@ -487,6 +534,11 @@ func PayCash(c *gin.Context) {
 				order.ChangeAmount,
 				company.Name,
 				branchName,
+				branchAddress,
+				order.SubtotalAmount,
+				order.DiscountAmount,
+				req.ServedBy,
+				order.PointsEarned,
 			)
 		}()
 	}
@@ -536,6 +588,11 @@ func PayTripay(c *gin.Context) {
 		return
 	}
 
+	if err := applyVoucher(config.DB, &order, req.VoucherID, req.MemberID, company.ID); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"detail": err.Error()})
+		return
+	}
+
 	if order.TotalAmount < company.QrisMinTransaction && !company.AllowQrisBelowMin {
 		c.JSON(http.StatusBadRequest, gin.H{"detail": fmt.Sprintf("Minimal transaksi QRIS adalah Rp%s. Silakan hubungi admin untuk mengizinkan transaksi kecil.", fmtRupiah(company.QrisMinTransaction))})
 		return
@@ -746,7 +803,12 @@ func TripayWebhook(c *gin.Context) {
 	if order.PaymentStatus == "paid" && oldStatus != "paid" {
 		var company models.Company
 		if err := tx.First(&company, order.CompanyID).Error; err == nil {
-			fee := int((float64(order.TotalAmount) * company.QrisFeePercentage / 100) + float64(company.QrisFeeFixed))
+			baseAmountForFee := order.TotalAmount
+			if company.ChargeFeeBeforeDiscount {
+				baseAmountForFee = order.SubtotalAmount
+			}
+			
+			fee := int((float64(baseAmountForFee) * company.QrisFeePercentage / 100) + float64(company.QrisFeeFixed))
 			if fee < company.QrisFeeMin {
 				fee = company.QrisFeeMin
 			}
@@ -805,10 +867,12 @@ func TripayWebhook(c *gin.Context) {
 			config.DB.First(&company, order.CompanyID)
 
 			var branchName string
+			var branchAddress string
 			if order.BranchID != nil {
 				var branch models.Branch
 				if err := config.DB.First(&branch, *order.BranchID).Error; err == nil {
 					branchName = branch.Name
+					branchAddress = branch.Address
 				}
 			}
 
@@ -823,6 +887,11 @@ func TripayWebhook(c *gin.Context) {
 					0,
 					company.Name,
 					branchName,
+					branchAddress,
+					order.SubtotalAmount,
+					order.DiscountAmount,
+					order.ServedBy,
+					order.PointsEarned,
 				)
 			}
 		}()
@@ -954,7 +1023,8 @@ func restoreStock(tx *gorm.DB, order *models.Order) {
 }
 
 func awardPoints(tx *gorm.DB, order *models.Order, company *models.Company) {
-	if order.MemberID == nil {
+	// Skip earning points if voucher is used
+	if order.MemberID == nil || order.VoucherID != nil {
 		return
 	}
 
@@ -1020,3 +1090,66 @@ func awardPoints(tx *gorm.DB, order *models.Order, company *models.Company) {
 		}
 	}
 }
+
+func applyVoucher(tx *gorm.DB, order *models.Order, voucherID *uint, memberID *uint, companyID uint) error {
+	if voucherID == nil {
+		return nil
+	}
+	if memberID == nil {
+		return errors.New("Voucher hanya dapat digunakan oleh Member")
+	}
+
+	var voucher models.Voucher
+	if err := tx.Where("id = ? AND company_id = ? AND is_active = true", *voucherID, companyID).First(&voucher).Error; err != nil {
+		return errors.New("Voucher tidak ditemukan atau tidak aktif")
+	}
+
+	if voucher.BranchID != nil && order.BranchID != nil && *voucher.BranchID != *order.BranchID {
+		return errors.New("Voucher ini tidak berlaku untuk cabang ini")
+	}
+
+	if order.TotalAmount < voucher.MinPurchase {
+		return errors.New("Total belanja belum memenuhi syarat minimal voucher")
+	}
+
+	var member models.Member
+	if err := tx.Where("id = ? AND company_id = ?", *memberID, companyID).First(&member).Error; err != nil {
+		return errors.New("Member tidak ditemukan")
+	}
+
+	if member.Points < voucher.PointCost {
+		return errors.New("Poin member tidak mencukupi untuk menggunakan voucher ini")
+	}
+
+	// Kurangi poin member
+	if voucher.PointCost > 0 {
+		member.Points -= voucher.PointCost
+		if err := tx.Save(&member).Error; err != nil {
+			return errors.New("Gagal memotong poin member")
+		}
+
+		// Catat history
+		history := models.PointHistory{
+			CompanyID:   companyID,
+			MemberID:    member.ID,
+			PointsDelta: -voucher.PointCost,
+			Reason:      "Tukar poin untuk voucher " + voucher.Name,
+		}
+		if err := tx.Create(&history).Error; err != nil {
+			return errors.New("Gagal mencatat histori poin")
+		}
+	}
+
+	// Terapkan diskon
+	discount := voucher.DiscountValue
+	if discount > order.TotalAmount {
+		discount = order.TotalAmount
+	}
+
+	order.TotalAmount -= discount
+	order.DiscountAmount = discount
+	order.VoucherID = voucherID
+	order.PointsUsed = voucher.PointCost
+
+	return nil
+}

controllers/report_controller.go

@@ -26,11 +26,12 @@ type SummaryTopProduct struct {
 }
 
 type ReportOrderRow struct {
-	OrderNumber   string    `json:"order_number"`
-	TotalAmount   int       `json:"total_amount"`
-	PaymentMethod string    `json:"payment_method"`
-	CreatedAt     time.Time `json:"created_at"`
-	Items         string    `json:"items"`
+	OrderNumber    string    `json:"order_number"`
+	TotalAmount    int       `json:"total_amount"`
+	SubtotalAmount int       `json:"subtotal_amount"`
+	PaymentMethod  string    `json:"payment_method"`
+	CreatedAt      time.Time `json:"created_at"`
+	Items          string    `json:"items"`
 }
 
 func getDayRange(targetDate time.Time) (time.Time, time.Time) {
@@ -125,11 +126,12 @@ func DailyReport(c *gin.Context) {
 		itemsStr := strings.Join(itemNames, ", ")
 
 		orderRows = append(orderRows, ReportOrderRow{
-			OrderNumber:   o.OrderNumber,
-			TotalAmount:   o.TotalAmount,
-			PaymentMethod: o.PaymentMethod,
-			CreatedAt:     o.CreatedAt,
-			Items:         itemsStr,
+			OrderNumber:    o.OrderNumber,
+			TotalAmount:    o.TotalAmount,
+			SubtotalAmount: o.SubtotalAmount,
+			PaymentMethod:  o.PaymentMethod,
+			CreatedAt:      o.CreatedAt,
+			Items:          itemsStr,
 		})
 	}
 

controllers/voucher_controller.go

@@ -0,0 +1,142 @@
+package controllers
+
+import (
+	"net/http"
+	"service-warungpos-go/config"
+	"service-warungpos-go/models"
+	"strconv"
+
+	"github.com/gin-gonic/gin"
+)
+
+// List Vouchers
+func GetVouchers(c *gin.Context) {
+	userVal, _ := c.Get("user")
+	user := userVal.(*models.User)
+
+	var vouchers []models.Voucher
+	query := config.DB.Where("company_id = ?", *user.CompanyID)
+
+	// Filter by branch_id if provided
+	branchIDStr := c.Query("branch_id")
+	if branchIDStr != "" {
+		if bID, err := strconv.Atoi(branchIDStr); err == nil {
+			// Jika voucher memiliki branch_id spesifik, atau branch_id null (berlaku semua cabang)
+			query = query.Where("branch_id = ? OR branch_id IS NULL", bID)
+		}
+	}
+
+	if err := query.Order("created_at desc").Find(&vouchers).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"detail": "Gagal mengambil data voucher"})
+		return
+	}
+
+	c.JSON(http.StatusOK, vouchers)
+}
+
+// Create Voucher
+type CreateVoucherRequest struct {
+	Name          string `json:"name" binding:"required"`
+	DiscountValue int    `json:"discount_value" binding:"required,gt=0"`
+	PointCost     int    `json:"point_cost" binding:"required,gt=0"`
+	MinPurchase   int    `json:"min_purchase"`
+	BranchID      *uint  `json:"branch_id"`
+	IsActive      *bool  `json:"is_active"`
+}
+
+func CreateVoucher(c *gin.Context) {
+	userVal, _ := c.Get("user")
+	user := userVal.(*models.User)
+
+	if user.Role != "owner" {
+		c.JSON(http.StatusForbidden, gin.H{"detail": "Akses ditolak"})
+		return
+	}
+
+	var req CreateVoucherRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"detail": "Data tidak valid"})
+		return
+	}
+
+	isActive := true
+	if req.IsActive != nil {
+		isActive = *req.IsActive
+	}
+
+	voucher := models.Voucher{
+		CompanyID:     *user.CompanyID,
+		Name:          req.Name,
+		DiscountValue: req.DiscountValue,
+		PointCost:     req.PointCost,
+		MinPurchase:   req.MinPurchase,
+		BranchID:      req.BranchID,
+		IsActive:      isActive,
+	}
+
+	if err := config.DB.Create(&voucher).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"detail": "Gagal menyimpan voucher"})
+		return
+	}
+
+	c.JSON(http.StatusCreated, voucher)
+}
+
+// Update Voucher
+func UpdateVoucher(c *gin.Context) {
+	userVal, _ := c.Get("user")
+	user := userVal.(*models.User)
+
+	if user.Role != "owner" {
+		c.JSON(http.StatusForbidden, gin.H{"detail": "Akses ditolak"})
+		return
+	}
+
+	id := c.Param("id")
+	var voucher models.Voucher
+	if err := config.DB.Where("id = ? AND company_id = ?", id, *user.CompanyID).First(&voucher).Error; err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"detail": "Voucher tidak ditemukan"})
+		return
+	}
+
+	var req CreateVoucherRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"detail": "Data tidak valid"})
+		return
+	}
+
+	voucher.Name = req.Name
+	voucher.DiscountValue = req.DiscountValue
+	voucher.PointCost = req.PointCost
+	voucher.MinPurchase = req.MinPurchase
+	voucher.BranchID = req.BranchID
+	if req.IsActive != nil {
+		voucher.IsActive = *req.IsActive
+	}
+
+	if err := config.DB.Save(&voucher).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"detail": "Gagal mengupdate voucher"})
+		return
+	}
+
+	c.JSON(http.StatusOK, voucher)
+}
+
+// Delete Voucher
+func DeleteVoucher(c *gin.Context) {
+	userVal, _ := c.Get("user")
+	user := userVal.(*models.User)
+
+	if user.Role != "owner" {
+		c.JSON(http.StatusForbidden, gin.H{"detail": "Akses ditolak"})
+		return
+	}
+
+	id := c.Param("id")
+	if err := config.DB.Where("id = ? AND company_id = ?", id, *user.CompanyID).Delete(&models.Voucher{}).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"detail": "Gagal menghapus voucher"})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"detail": "Voucher berhasil dihapus"})
+}

main.go

@@ -39,6 +39,7 @@ func main() {
 		&models.PointRule{},
 		&models.WalletTransaction{},
 		&models.TopupRequest{},
+		&models.Voucher{},
 		&models.PointHistory{},
 	)
 	if err != nil {
@@ -113,6 +114,8 @@ func main() {
 				auth.GET("/users", middleware.RequireSuperAdmin(), controllers.ListUsers)
 				auth.PUT("/users/:user_id", middleware.RequireSuperAdmin(), controllers.UpdateUser)
 
+
+
 				// Owner routes for kasir
 				auth.GET("/kasir", middleware.RequireOwner(), controllers.ListKasir)
 				auth.POST("/kasir", middleware.RequireOwner(), controllers.CreateKasir)
@@ -198,9 +201,22 @@ func main() {
 		{
 			orders.Use(middleware.GetCurrentUser(), middleware.RequireTenantContext())
 			{
-				orders.POST("/", controllers.CreateOrder)
 				orders.GET("/", controllers.ListOrders)
 				orders.GET("/:order_id", controllers.GetOrder)
+				orders.POST("/", controllers.CreateOrder)
+				orders.POST("/pay/cash", controllers.PayCash)
+				orders.POST("/pay/midtrans", controllers.PayTripay)
+			}
+		}
+
+		vouchers := api.Group("/vouchers")
+		{
+			vouchers.Use(middleware.GetCurrentUser())
+			{
+				vouchers.GET("/", controllers.GetVouchers)
+				vouchers.POST("/", controllers.CreateVoucher)
+				vouchers.PUT("/:id", controllers.UpdateVoucher)
+				vouchers.DELETE("/:id", controllers.DeleteVoucher)
 			}
 		}
 
@@ -267,6 +283,7 @@ func main() {
 			adminCompanies.Use(middleware.GetCurrentUser(), middleware.RequireSuperAdmin())
 			{
 				adminCompanies.POST("/:id/adjust-wallet", controllers.AdminAdjustWallet)
+				adminCompanies.PUT("/:id/settings", controllers.AdminUpdateCompanySettings)
 			}
 		}
 	}

models/models.go

@@ -27,6 +27,7 @@ type Company struct {
 	QrisFeeMin         int            `gorm:"default:850" json:"qris_fee_min"`
 	QrisMinTransaction int            `gorm:"default:10000" json:"qris_min_transaction"`
 	AllowQrisBelowMin  bool           `gorm:"default:false" json:"allow_qris_below_min"`
+	ChargeFeeBeforeDiscount bool      `gorm:"default:false" json:"charge_fee_before_discount"`
 	WalletBalance      float64        `gorm:"type:float;default:0.0" json:"wallet_balance"`
 	WalletLimit        float64        `gorm:"type:float;default:-50000.0" json:"wallet_limit"`
 	PointRules         []PointRule    `gorm:"foreignKey:CompanyID;constraint:OnDelete:CASCADE" json:"point_rules"`
@@ -151,6 +152,7 @@ type Order struct {
 	CompanyID       uint        `gorm:"not null;index" json:"company_id"`
 	BranchID        *uint       `gorm:"index" json:"branch_id"`
 	OrderNumber     string      `gorm:"type:varchar(50);not null;index" json:"order_number"`
+	SubtotalAmount  int         `gorm:"not null;default:0" json:"subtotal_amount"`
 	TotalAmount     int         `gorm:"not null;default:0" json:"total_amount"`
 	PaidAmount      int         `gorm:"not null;default:0" json:"paid_amount"`
 	ChangeAmount    int         `gorm:"not null;default:0" json:"change_amount"`
@@ -163,12 +165,29 @@ type Order struct {
 	Company         *Company    `gorm:"foreignKey:CompanyID" json:"company,omitempty"`
 	Branch          *Branch     `gorm:"foreignKey:BranchID;constraint:OnDelete:SET NULL;" json:"branch,omitempty"`
 	MemberID        *uint       `gorm:"index" json:"member_id"`
-	Member          *Member     `gorm:"foreignKey:MemberID;references:ID;constraint:-" json:"member,omitempty"`
+	Member          *Member     `gorm:"constraint:-" json:"member,omitempty"`
 	ServedBy        string      `gorm:"type:varchar(100)" json:"served_by"`
 	CustomerName    string      `gorm:"type:varchar(100)" json:"customer_name"`
 	CustomerPhone   string      `gorm:"type:varchar(50)" json:"customer_phone"`
 	PointsEarned    int         `gorm:"default:0" json:"points_earned"`
 	Items           []OrderItem `gorm:"foreignKey:OrderID;constraint:OnDelete:CASCADE" json:"items"`
+	VoucherID       *uint       `gorm:"index" json:"voucher_id"`
+	Voucher         *Voucher    `gorm:"constraint:-" json:"voucher,omitempty"`
+	DiscountAmount  int         `gorm:"default:0" json:"discount_amount"`
+	PointsUsed      int         `gorm:"default:0" json:"points_used"`
+}
+
+type Voucher struct {
+	ID             uint      `gorm:"primaryKey" json:"id"`
+	CompanyID      uint      `gorm:"not null;index" json:"company_id"`
+	BranchID       *uint     `gorm:"index" json:"branch_id"`
+	Name           string    `gorm:"type:varchar(100);not null" json:"name"`
+	DiscountValue  int       `gorm:"not null;default:0" json:"discount_value"`
+	PointCost      int       `gorm:"not null;default:0" json:"point_cost"`
+	MinPurchase    int       `gorm:"not null;default:0" json:"min_purchase"`
+	IsActive       bool      `gorm:"default:true" json:"is_active"`
+	CreatedAt      time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time `gorm:"autoUpdateTime" json:"updated_at"`
 }
 
 type OrderItem struct {

services/whatsapp.go

@@ -64,6 +64,11 @@ func SendPaymentNotification(
 	changeAmount int,
 	storeName string,
 	branchName string,
+	branchAddress string,
+	subTotal int,
+	discountAmount int,
+	servedBy string,
+	pointsEarned int,
 ) bool {
 	if config.GlobalConfig.FonnteToken == "" {
 		log.Println("[WHATSAPP] Token Fonnte tidak dikonfigurasi, lewati kirim WhatsApp")
@@ -96,34 +101,79 @@ func SendPaymentNotification(
 
 	// Buat isi pesan
 	var lines []string
-	lines = append(lines, "*"+displayName+"*")
-	lines = append(lines, "_Struk Pembayaran_")
+	lines = append(lines, "Berikut adalah e-receipt untuk transaksi Anda")
+	lines = append(lines, orderNumber)
+	lines = append(lines, "")
+	
+	now := time.Now()
+	// Gunakan WIB atau UTC
+	lines = append(lines, fmt.Sprintf("Pembayaran anda telah kami terima pada %s", now.Format("2006-01-02 15:04:05")))
+	lines = append(lines, "")
+	lines = append(lines, fmt.Sprintf("KWITANSI %s", strings.ToUpper(baseStore)))
+	lines = append(lines, "")
+	lines = append(lines, fmt.Sprintf("Outlet : %s", displayName))
+	
+	if branchAddress != "" {
+		lines = append(lines, fmt.Sprintf("Alamat : %s", branchAddress))
+	}
 	lines = append(lines, divider("-", 30))
 
-	lines = append(lines, fmt.Sprintf("No. Order  : ```%s```", orderNumber))
-	lines = append(lines, fmt.Sprintf("Customer   : %s", customerName))
-	lines = append(lines, fmt.Sprintf("Metode     : %s", methodLabel))
+	lines = append(lines, fmt.Sprintf("No. Kwitansi : %s", orderNumber))
+	if customerName != "" {
+		lines = append(lines, fmt.Sprintf("Pelanggan    : %s", customerName))
+	} else {
+		lines = append(lines, "Pelanggan    : Umum")
+	}
+	
+	if servedBy != "" {
+		lines = append(lines, fmt.Sprintf("Kasir        : %s", servedBy))
+	}
+	
+	lines = append(lines, fmt.Sprintf("Tanggal      : %s", now.Format("2006-01-02 15:04:05")))
+	lines = append(lines, fmt.Sprintf("Pembayaran   : %s", methodLabel))
 	lines = append(lines, divider("-", 30))
 
 	if len(items) > 0 {
-		lines = append(lines, "*Daftar Pesanan*")
+		lines = append(lines, "Layanan / Pesanan")
 		for _, item := range items {
 			subtotal := item.Price * item.Quantity
-			lines = append(lines, fmt.Sprintf("  %s x%d", item.Name, item.Quantity))
-			lines = append(lines, fmt.Sprintf("    %20s", fmtRupiah(subtotal)))
+			lines = append(lines, fmt.Sprintf("- %s x%d — %s", item.Name, item.Quantity, fmtRupiah(subtotal)))
 		}
-		lines = append(lines, divider("-", 30))
+		lines = append(lines, "")
 	}
 
-	lines = append(lines, fmt.Sprintf("*Total      : %s*", fmtRupiah(totalAmount)))
+	lines = append(lines, "Ringkasan Pembayaran")
+	if discountAmount > 0 {
+		lines = append(lines, "- Voucher            : Ya")
+	} else {
+		lines = append(lines, "- Voucher            : Tidak")
+	}
+	
+	if subTotal > 0 {
+		lines = append(lines, fmt.Sprintf("- Sub Total          : %s", fmtRupiah(subTotal)))
+	} else {
+		// Fallback
+		lines = append(lines, fmt.Sprintf("- Sub Total          : %s", fmtRupiah(totalAmount+discountAmount)))
+	}
 
+	lines = append(lines, fmt.Sprintf("- Potongan Voucher   : %s", fmtRupiah(discountAmount)))
+	lines = append(lines, fmt.Sprintf("- Total Bayar        : %s", fmtRupiah(totalAmount)))
+	
 	if paymentMethod == "cash" {
-		lines = append(lines, fmt.Sprintf("Dibayar    : %s", fmtRupiah(totalAmount+changeAmount)))
-		lines = append(lines, fmt.Sprintf("*Kembalian  : %s*", fmtRupiah(changeAmount)))
+		lines = append(lines, fmt.Sprintf("- Kembalian          : %s", fmtRupiah(changeAmount)))
+	}
+	
+	if pointsEarned > 0 {
+		lines = append(lines, fmt.Sprintf("- Poin Didapat       : %d Poin", pointsEarned))
 	}
 
 	lines = append(lines, divider("-", 30))
-	lines = append(lines, fmt.Sprintf("_Terima kasih telah berbelanja di %s._", displayName))
+	lines = append(lines, "Terima kasih telah menggunakan jasa kami.")
+	lines = append(lines, "")
+	lines = append(lines, "Hormat kami,")
+	lines = append(lines, "")
+	lines = append(lines, displayName)
+	lines = append(lines, "Jika Anda tidak merasa melakukan transaksi ini, segera hubungi kami.")
 
 	message := strings.Join(lines, "\n")