goc_daniel/b2b
2
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into order-actions

Browse Source
This commit is contained in:
Wiktor Dudzic
2026-04-17 09:49:11 +02:00
parent 16f92e53ff 931840c243
commit c91f420cbe
27 changed files with 689 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/repos/ordersRepo/ordersRepo.go
View File

@@ -1,6 +1,8 @@
package ordersRepo
import (
"time"
"git.ma-al.com/goc_daniel/b2b/app/db"
"git.ma-al.com/goc_daniel/b2b/app/model"
"git.ma-al.com/goc_daniel/b2b/app/model/enums"
@@ -12,7 +14,7 @@ type UIOrdersRepo interface {
UserHasOrder(user_id uint, order_id uint) (bool, error)
Get(orderId uint) (*model.CustomerOrder, error)
Find(user_id uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error)
PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string, originalUserId uint) (*model.CustomerOrder, error)
PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string, originalUserId uint, base_price float64, tax_incl float64, tax_excl float64) (*model.CustomerOrder, error)
ChangeOrderAddress(order_id uint, country_id uint, address_info string) error
ChangeOrderStatus(orderId uint, newStatus enums.OrderStatus, userId uint) error
GetOrderStatus(orderID uint) (enums.OrderStatus, error)
@@ -83,7 +85,7 @@ func (repo *OrdersRepo) Find(user_id uint, p find.Paging, filt *filters.FiltersL
}, nil
}
func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string, originalUserId uint) (*model.CustomerOrder, error) {
func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string, originalUserId uint, base_price float64, tax_incl float64, tax_excl float64) (*model.CustomerOrder, error) {
order := model.CustomerOrder{
UserID: cart.UserID,
Name: name,
@@ -100,6 +102,11 @@ func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, cou
Amount: product.Amount,
})
}
order.CreatedAt = time.Now()
order.UpdatedAt = time.Now()
order.BasePrice = base_price
order.TaxIncl = tax_incl
order.TaxExcl = tax_excl
tx := db.Get().Begin()
err := tx.Create(&order).Error
if err != nil {
@@ -133,6 +140,7 @@ func (repo *OrdersRepo) ChangeOrderAddress(order_id uint, country_id uint, addre
Updates(map[string]interface{}{
"country_id": country_id,
"address_string": address_info,
"updated_at": time.Now(),
}).
Error
}