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

orders #58

Merged
goc_daniel merged 13 commits from orders into main 2026-04-14 11:20:06 +00:00
Conversation 3 Commits 13 Files Changed 24 +6 -12
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c610ce38cc - Show all commits

11
app/delivery/middleware/perms/permissions.go
View File

@@ -3,14 +3,6 @@ package perms
type Permission string type Permission string
const ( const (
<<<<<<< HEAD
UserReadAny Permission = "user.read.any"
UserWriteAny Permission = "user.write.any"
UserDeleteAny Permission = "user.delete.any"
CurrencyWrite Permission = "currency.write"
ViewAllOrders Permission = "orders.view"
ModifyAllOrders Permission = "orders.modify"
=======
UserReadAny Permission = "user.read.any" UserReadAny Permission = "user.read.any"
UserWriteAny Permission = "user.write.any" UserWriteAny Permission = "user.write.any"
UserDeleteAny Permission = "user.delete.any" UserDeleteAny Permission = "user.delete.any"
@@ -20,5 +12,6 @@ const (
ProductTranslationSave Permission = "product_translation.save" ProductTranslationSave Permission = "product_translation.save"
ProductTranslationTranslate Permission = "product_translation.translate" ProductTranslationTranslate Permission = "product_translation.translate"
SearchCreateIndex Permission = "search.create_index" SearchCreateIndex Permission = "search.create_index"
>>>>>>> e5988a85f32e0b3324f6d9f48254355fbffd559e OrdersViewAll Permission = "orders.view_all"
OrdersModifyAll Permission = "orders.modify_all"
) )

7
app/service/orderService/orderService.go
View File

@@ -32,7 +32,7 @@ func New() *OrderService {
} }
func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) { func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) {
if !user.HasPermission(perms.ViewAllOrders) { if !user.HasPermission(perms.OrdersViewAll) {
// append filter to view only this user's orders // append filter to view only this user's orders
idStr := strconv.FormatUint(uint64(user.ID), 10) idStr := strconv.FormatUint(uint64(user.ID), 10)
filt.Append(filters.Where("b2b_customer_orders.user_id = " + idStr)) filt.Append(filters.Where("b2b_customer_orders.user_id = " + idStr))
@@ -114,7 +114,7 @@ func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, c
return err return err
} }
if !user.HasPermission(perms.ModifyAllOrders) { if !user.HasPermission(perms.OrdersModifyAll) {
exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id) exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
if err != nil { if err != nil {
return err return err
@@ -128,8 +128,9 @@ func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, c
return s.ordersRepo.ChangeOrderAddress(order_id, country_id, address_info) return s.ordersRepo.ChangeOrderAddress(order_id, country_id, address_info)
} }
// This is obiously just an initial version of this function
func (s *OrderService) ChangeOrderStatus(user *model.Customer, order_id uint, status string) error { func (s *OrderService) ChangeOrderStatus(user *model.Customer, order_id uint, status string) error {
if !user.HasPermission(perms.ModifyAllOrders) { if !user.HasPermission(perms.OrdersModifyAll) {
exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id) exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
if err != nil { if err != nil {
return err return err