Update Product POS

This commit is contained in:
aditya.siregar 2024-08-24 14:25:58 +07:00
parent 57f019b1e9
commit 97d02c3537
5 changed files with 19 additions and 14 deletions

View File

@ -230,6 +230,7 @@ type OrderPrintDetail struct {
ID int64 `gorm:"column:id"`
Logo string `gorm:"logo"`
PartnerName string `gorm:"column:partner_name"`
SiteName string `gorm:"column:site_name"`
OrderID string `gorm:"column:order_id"`
VisitDate time.Time `gorm:"column:visit_date"`
PaymentType string `gorm:"column:payment_type"`

View File

@ -21,7 +21,7 @@ type Product struct {
DeletedAt *time.Time `gorm:"column:deleted_at"`
CreatedBy int64 `gorm:"type:int;column:created_by"`
UpdatedBy int64 `gorm:"type:int;column:updated_by"`
Stock int64 `gorm:"type:int;column:stock"`
Stock int64 `gorm:"type:int;column:stock"`
}
func (Product) TableName() string {
@ -94,7 +94,8 @@ func (b *ProductList) ToProductList() []*Product {
func (b *ProductList) ToProductListPOS() []*Product {
var Products []*Product
today := time.Now().Weekday()
location, _ := time.LoadLocation("Asia/Jakarta")
today := time.Now().In(location).Weekday()
isWeekend := today == time.Saturday || today == time.Sunday
for _, p := range *b {

View File

@ -446,11 +446,12 @@ func MapOrderToPrintDetailResponse(order *entity.OrderPrintDetail, casherName st
orderItems := make([]response.CreateOrderItemResponse, len(order.OrderItems))
for i, item := range order.OrderItems {
orderItems[i] = response.CreateOrderItemResponse{
ID: item.ID,
ItemID: item.ItemID,
Quantity: item.Quantity,
Price: item.Price,
Name: item.Product.Name,
ID: item.ID,
ItemID: item.ItemID,
Quantity: item.Quantity,
Price: item.Price,
Name: item.Product.Name,
IsSeasonTicket: item.Product.IsSeasonTicket,
}
}
@ -465,7 +466,7 @@ func MapOrderToPrintDetailResponse(order *entity.OrderPrintDetail, casherName st
VisitTime: time.Now().Format("15:04:05"),
OrderItems: orderItems,
CasheerName: casherName,
PartnerName: order.PartnerName,
PartnerName: order.SiteName,
Logo: order.Logo,
}
}

View File

@ -146,11 +146,12 @@ type CheckingInquiryResponse struct {
}
type CreateOrderItemResponse struct {
ID int64 `json:"id"`
ItemID int64 `json:"item_id"`
Quantity int64 `json:"quantity"`
Price float64 `json:"price"`
Name string `json:"name"`
ID int64 `json:"id"`
ItemID int64 `json:"item_id"`
Quantity int64 `json:"quantity"`
Price float64 `json:"price"`
Name string `json:"name"`
IsSeasonTicket bool `json:"is_season_ticket"`
}
type ProductDailySales struct {

View File

@ -70,10 +70,11 @@ func (r *OrderRepository) FindPrintDetailByID(ctx context.Context, id int64) (*e
err := r.db.WithContext(ctx).
Table("orders").
Select("orders.id, partners.name as partner_name, partners.logo as logo, orders.ref_id as order_id, "+
Select("orders.id, partners.name as partner_name, sites.name as site_name, partners.logo as logo, orders.ref_id as order_id, "+
"orders.visit_date, orders.payment_type, orders.source, "+
"orders.ticket_status, orders.total, orders.fee").
Joins("JOIN partners ON partners.id = orders.partner_id").
Joins("JOIN sites ON sites.id = orders.site_id").
Where("orders.id = ?", id).
Scan(&printDetail).Error