Merge pull request 'order-actions' (#79) from order-actions into main

Reviewed-on: #79
Reviewed-by: goc_daniel <goc_daniel@ma-al.com>

.env

@@ -64,3 +64,6 @@ IMAGE_PREFIX=https://www.naluconcept.com # remove prefix to serv them from same
 CORS_ORGIN=https://www.naluconcept.com
 
 DSN=root:Maal12345678@tcp(localhost:3306)/nalu
+
+LOG_LEVEL=warn
+LOG_COLORIZE=true

app/actions/orderStatusActions/examples.go

@@ -0,0 +1,116 @@
+package orderStatusActions
+
+// func init() {
+// 	GlobalRegistry.Register(enums.OrderStatusConfirmed, ActionChain{
+// 		SendOrderConfirmationEmail,
+// 		NotifyInventorySystem,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusProcessing, ActionChain{
+// 		NotifyWarehouse,
+// 		ReserveInventory,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusShipped, ActionChain{
+// 		NotifyWarehouseShipped,
+// 		GenerateTrackingNumber,
+// 		SendShippingNotificationEmail,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusDelivered, ActionChain{
+// 		SendDeliveryConfirmationEmail,
+// 		NotifyFulfillmentComplete,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusCancelled, ActionChain{
+// 		SendCancellationEmail,
+// 		ReleaseInventory,
+// 		ProcessRefund,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusReturned, ActionChain{
+// 		SendReturnConfirmationEmail,
+// 		NotifyReturnsDepartment,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusRefunded, ActionChain{
+// 		NotifyRefundProcessed,
+// 	})
+
+// 	GlobalRegistry.Register(enums.OrderStatusPending, ActionChain{})
+// }
+
+// var SendOrderConfirmationEmail = WithID("send_order_confirmation_email", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Sending order confirmation email for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var NotifyInventorySystem = WithID("notify_inventory_system", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Notifying inventory system for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var NotifyWarehouse = WithID("notify_warehouse", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Notifying warehouse for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var ReserveInventory = WithID("reserve_inventory", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Reserving inventory for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var NotifyWarehouseShipped = WithID("notify_warehouse_shipped", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Notifying warehouse of shipment for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var GenerateTrackingNumber = WithID("generate_tracking_number", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Generating tracking number for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var SendShippingNotificationEmail = WithID("send_shipping_notification_email", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Sending shipping notification email for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var SendDeliveryConfirmationEmail = WithID("send_delivery_confirmation_email", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Sending delivery confirmation email for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var NotifyFulfillmentComplete = WithID("notify_fulfillment_complete", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Notifying fulfillment complete for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var SendCancellationEmail = WithID("send_cancellation_email", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Sending cancellation email for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var ReleaseInventory = WithID("release_inventory", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Releasing inventory for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var ProcessRefund = WithID("process_refund", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Processing refund for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var SendReturnConfirmationEmail = WithID("send_return_confirmation_email", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Sending return confirmation email for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var NotifyReturnsDepartment = WithID("notify_returns_department", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Notifying returns department for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })
+
+// var NotifyRefundProcessed = WithID("notify_refund_processed", func(actionCtx ActionContext) ActionResult {
+// 	log.Printf("Notifying refund processed for order %d", actionCtx.OrderId)
+// 	return ActionResult{Err: nil}
+// })

app/actions/orderStatusActions/pending.go

@@ -0,0 +1,21 @@
+package orderStatusActions
+
+import (
+	"fmt"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
+)
+
+func init() {
+	var sendNewOrderEmail = WithID("send_new_order_email", func(actionCtx ActionContext) ActionResult {
+
+		if actionCtx.EmailService == nil {
+			return ActionResult{Err: fmt.Errorf("emailService not provided")}
+		}
+		return ActionResult{Err: actionCtx.EmailService.SendNewOrderPlacedNotification(*actionCtx.UserId)}
+	})
+
+	GlobalRegistry.Register(enums.OrderStatusPending, ActionChain{
+		sendNewOrderEmail,
+	})
+}

app/actions/orderStatusActions/registry.go

@@ -0,0 +1,88 @@
+package orderStatusActions
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
+	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
+)
+
+var GlobalRegistry = make(ActionRegistry)
+
+type ActionID string
+
+type ActionContext struct {
+	Order        *model.CustomerOrder
+	UserId       *uint
+	EmailService *emailService.EmailService
+}
+
+type ActionResult struct {
+	Err      error
+	Metadata map[string]any
+}
+
+type OrderAction interface {
+	ID() ActionID
+	Execute(actionCtx ActionContext) ActionResult
+}
+
+type ActionChain []OrderAction
+
+func (c ActionChain) Execute(actionCtx ActionContext) []ActionResult {
+	results := make([]ActionResult, 0, len(c))
+	for _, action := range c {
+		result := action.Execute(actionCtx)
+		results = append(results, result)
+		if result.Err != nil {
+			logger.Debug("action failed",
+				"action_id", action.ID(),
+				"order", actionCtx.Order,
+				"user_id", actionCtx.UserId,
+				"error", result.Err,
+			)
+		}
+	}
+	return results
+}
+
+type ActionRegistry map[enums.OrderStatus]ActionChain
+
+func (r ActionRegistry) Register(status enums.OrderStatus, chain ActionChain) {
+	r[status] = chain
+}
+
+func (r ActionRegistry) ExecuteForStatus(status enums.OrderStatus, actionCtx ActionContext) []ActionResult {
+	chain, exists := r[status]
+	if !exists {
+		return nil
+	}
+	return chain.Execute(actionCtx)
+}
+
+type ActionFunc func(actionCtx ActionContext) ActionResult
+
+func (f ActionFunc) ID() ActionID {
+	return "anonymous"
+}
+
+func (f ActionFunc) Execute(actionCtx ActionContext) ActionResult {
+	return f(actionCtx)
+}
+
+type actionAdapter struct {
+	id ActionID
+	fn ActionFunc
+}
+
+func (a *actionAdapter) ID() ActionID {
+	return a.id
+}
+
+func (a *actionAdapter) Execute(actionCtx ActionContext) ActionResult {
+	return a.fn(actionCtx)
+}
+
+func WithID(id ActionID, fn ActionFunc) OrderAction {
+	return &actionAdapter{id: id, fn: fn}
+}

app/cmd/cmds/startServer.go

@@ -4,8 +4,11 @@ import (
 	"log"
 	"os"
 
+	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/web"
+
 	"git.ma-al.com/goc_daniel/b2b/app/service/langsService"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/version"
 	"github.com/spf13/cobra"
 )
@@ -21,6 +24,8 @@ var (
 				return
 			}
 
+			logger.Init("b2b", nil, config.Get().Log.LogLevel, config.Get().Log.LogColorize)
+
 			// Create and setup the server
 			server := web.New()
 

app/config/config.go

@@ -28,6 +28,7 @@ type Config struct {
 	Cors            CorsConfig
 	MeiliSearch     MeiliSearchConfig
 	Storage         StorageConfig
+	Log             LogConfig
 }
 
 type I18n struct {
@@ -87,6 +88,11 @@ type AppConfig struct {
 	BaseURL     string `env:"APP_BASE_URL,http://localhost:5173"`
 }
 
+type LogConfig struct {
+	LogLevel    string `env:"LOG_LEVEL,warn"`
+	LogColorize bool   `env:"LOG_COLORIZE,true"`
+}
+
 type EmailConfig struct {
 	SMTPHost     string `env:"EMAIL_SMTP_HOST,localhost"`
 	SMTPPort     int    `env:"EMAIL_SMTP_PORT,587"`
@@ -209,6 +215,11 @@ func load() *Config {
 	if err != nil {
 		slog.Error("not possible to load env variables for storage : ", err.Error(), "")
 	}
+
+	err = loadEnv(&cfg.Log)
+	if err != nil {
+		slog.Error("not possible to load env variables for logger : ", err.Error(), "")
+	}
 	cfg.Storage.RootFolder = ResolveRelativePath(cfg.Storage.RootFolder)
 
 	return cfg

app/delivery/web/api/public/auth.go

@@ -1,7 +1,6 @@
 package public
 
 import (
-	"log"
 	"strconv"
 	"time"
 
@@ -11,6 +10,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/authService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -178,7 +178,13 @@ func (h *AuthHandler) ForgotPassword(c fiber.Ctx) error {
 	// Request password reset - always return success to prevent email enumeration
 	err := h.authService.RequestPasswordReset(req.Email)
 	if err != nil {
-		log.Printf("Password reset request error: %v", err)
+
+		logger.Warn("password reset request failed",
+			"handler", "AuthHandler.ForgotPassword",
+
+			"email", req.Email,
+			"error", err.Error(),
+		)
 	}
 
 	return c.JSON(fiber.Map{
@@ -307,7 +313,6 @@ func (h *AuthHandler) Register(c fiber.Ctx) error {
 	// Attempt registration
 	err := h.authService.Register(&req)
 	if err != nil {
-		log.Printf("Register error: %v", err)
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, err),
 		})
@@ -447,7 +452,6 @@ func (h *AuthHandler) GoogleCallback(c fiber.Ctx) error {
 
 	response, rawRefreshToken, err := h.authService.HandleGoogleCallback(code)
 	if err != nil {
-		log.Printf("Google OAuth callback error: %v", err)
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, err),
 		})

app/delivery/web/api/restricted/addresses.go

@@ -6,6 +6,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -45,6 +46,13 @@ func (h *AddressesHandler) GetTemplate(c fiber.Ctx) error {
 
 	template, err := h.addressesService.GetTemplate(uint(country_id))
 	if err != nil {
+
+		logger.Error("failed to get address template",
+			"handler", "AddressesHandler.GetTemplate",
+
+			"country_id", country_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -74,6 +82,13 @@ func (h *AddressesHandler) AddNewAddress(c fiber.Ctx) error {
 
 	err = h.addressesService.AddNewAddress(userID, address_info, uint(country_id))
 	if err != nil {
+
+		logger.Error("failed to add new address",
+			"handler", "AddressesHandler.AddNewAddress",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -110,6 +125,14 @@ func (h *AddressesHandler) ModifyAddress(c fiber.Ctx) error {
 
 	err = h.addressesService.ModifyAddress(userID, uint(address_id), address_info, uint(country_id))
 	if err != nil {
+
+		logger.Error("failed to modify address",
+			"handler", "AddressesHandler.ModifyAddress",
+
+			"user_id", userID,
+			"address_id", address_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -126,6 +149,13 @@ func (h *AddressesHandler) RetrieveAddressesInfo(c fiber.Ctx) error {
 
 	addresses, err := h.addressesService.RetrieveAddresses(userID)
 	if err != nil {
+
+		logger.Error("failed to retrieve addresses",
+			"handler", "AddressesHandler.RetrieveAddressesInfo",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -149,6 +179,14 @@ func (h *AddressesHandler) DeleteAddress(c fiber.Ctx) error {
 
 	err = h.addressesService.DeleteAddress(userID, uint(address_id))
 	if err != nil {
+
+		logger.Error("failed to delete address",
+			"handler", "AddressesHandler.DeleteAddress",
+
+			"user_id", userID,
+			"address_id", address_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/carts.go

@@ -6,6 +6,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/cartsService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -28,12 +29,12 @@ func NewCartsHandler() *CartsHandler {
 func CartsHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewCartsHandler()
 
-	r.Get("/add-new-cart", handler.AddNewCart)
+	r.Post("/add-new-cart", handler.AddNewCart)
 	r.Delete("/remove-cart", handler.RemoveCart)
-	r.Get("/change-cart-name", handler.ChangeCartName)
+	r.Patch("/change-cart-name", handler.ChangeCartName)
 	r.Get("/retrieve-carts-info", handler.RetrieveCartsInfo)
 	r.Get("/retrieve-cart", handler.RetrieveCart)
-	r.Get("/add-product-to-cart", handler.AddProduct)
+	r.Post("/add-product-to-cart", handler.AddProduct)
 	r.Delete("/remove-product-from-cart", handler.RemoveProduct)
 
 	return r
@@ -49,6 +50,13 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 	name := c.Query("name")
 	new_cart, err := h.cartsService.CreateNewCart(userID, name)
 	if err != nil {
+
+		logger.Error("failed to create cart",
+			"handler", "CartsHandler.AddNewCart",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -72,6 +80,14 @@ func (h *CartsHandler) RemoveCart(c fiber.Ctx) error {
 
 	err = h.cartsService.RemoveCart(userID, uint(cart_id))
 	if err != nil {
+
+		logger.Error("failed to remove cart",
+			"handler", "CartsHandler.RemoveCart",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -97,6 +113,14 @@ func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 
 	err = h.cartsService.UpdateCartName(userID, uint(cart_id), new_name)
 	if err != nil {
+
+		logger.Error("failed to update cart name",
+			"handler", "CartsHandler.ChangeCartName",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -113,6 +137,13 @@ func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
 
 	carts_info, err := h.cartsService.RetrieveCartsInfo(userID)
 	if err != nil {
+
+		logger.Error("failed to retrieve carts info",
+			"handler", "CartsHandler.RetrieveCartsInfo",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -136,6 +167,14 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 
 	cart, err := h.cartsService.RetrieveCart(userID, uint(cart_id))
 	if err != nil {
+
+		logger.Error("failed to retrieve cart",
+			"handler", "CartsHandler.RetrieveCart",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -195,6 +234,15 @@ func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
 
 	err = h.cartsService.AddProduct(userID, uint(cart_id), uint(product_id), product_attribute_id, amount, set_amount)
 	if err != nil {
+
+		logger.Error("failed to add product to cart",
+			"handler", "CartsHandler.AddProduct",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"product_id", product_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -240,6 +288,15 @@ func (h *CartsHandler) RemoveProduct(c fiber.Ctx) error {
 
 	err = h.cartsService.RemoveProduct(userID, uint(cart_id), uint(product_id), product_attribute_id)
 	if err != nil {
+
+		logger.Error("failed to remove product from cart",
+			"handler", "CartsHandler.RemoveProduct",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"product_id", product_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/currency.go

@@ -9,6 +9,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/currencyService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -46,6 +47,12 @@ func (h *CurrencyHandler) PostCurrencyRate(c fiber.Ctx) error {
 
 	err := h.CurrencyService.CreateCurrencyRate(&currencyRate)
 	if err != nil {
+
+		logger.Error("failed to create currency rate",
+			"handler", "CurrencyHandler.PostCurrencyRate",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -63,6 +70,13 @@ func (h *CurrencyHandler) GetCurrencyRate(c fiber.Ctx) error {
 
 	currency, err := h.CurrencyService.GetCurrency(uint(id))
 	if err != nil {
+
+		logger.Error("failed to get currency",
+			"handler", "CurrencyHandler.GetCurrencyRate",
+
+			"currency_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 

app/delivery/web/api/restricted/customer.go

@@ -9,6 +9,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/customerService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -64,6 +65,13 @@ func (h *customerHandler) customerData(fc fiber.Ctx) error {
 
 	customer, err := h.service.GetById(customerId)
 	if err != nil {
+
+		logger.Error("failed to get customer",
+			"handler", "customerHandler.customerData",
+
+			"customer_id", customerId,
+			"error", err.Error(),
+		)
 		return fc.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
 	}
@@ -88,6 +96,12 @@ func (h *customerHandler) listCustomers(fc fiber.Ctx) error {
 
 	customer, err := h.service.Find(user.LangID, p, filt, search)
 	if err != nil {
+
+		logger.Error("failed to list customers",
+			"handler", "customerHandler.listCustomers",
+
+			"error", err.Error(),
+		)
 		return fc.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
 	}
@@ -120,6 +134,13 @@ func (h *customerHandler) setCustomerNoVatStatus(fc fiber.Ctx) error {
 	}
 
 	if err := h.service.SetCustomerNoVatStatus(req.CustomerID, req.IsNoVat); err != nil {
+
+		logger.Error("failed to set customer no vat status",
+			"handler", "customerHandler.setCustomerNoVatStatus",
+
+			"customer_id", req.CustomerID,
+			"error", err.Error(),
+		)
 		return fc.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
 	}

app/delivery/web/api/restricted/localeSelector.go

@@ -3,6 +3,7 @@ package restricted
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/localeSelectorService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -34,6 +35,12 @@ func LocaleSelectorHandlerRoutes(r fiber.Router) fiber.Router {
 func (h *LocaleSelectorHandler) GetLanguages(c fiber.Ctx) error {
 	languages, err := h.localeSelectorService.GetLanguages()
 	if err != nil {
+
+		logger.Error("failed to get languages",
+			"handler", "LocaleSelectorHandler.GetLanguages",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -44,6 +51,12 @@ func (h *LocaleSelectorHandler) GetLanguages(c fiber.Ctx) error {
 func (h *LocaleSelectorHandler) GetCountries(c fiber.Ctx) error {
 	countries, err := h.localeSelectorService.GetCountriesAndCurrencies()
 	if err != nil {
+
+		logger.Error("failed to get countries",
+			"handler", "LocaleSelectorHandler.GetCountries",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/menu.go

@@ -3,9 +3,12 @@ package restricted
 import (
 	"strconv"
 
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -29,6 +32,7 @@ func MenuHandlerRoutes(r fiber.Router) fiber.Router {
 	r.Get("/get-category-tree", handler.GetCategoryTree)
 	r.Get("/get-breadcrumb", handler.GetBreadcrumb)
 	r.Get("/get-top-menu", handler.GetTopMenu)
+	r.Get("/get-customer-management-menu", middleware.Require(perms.UserReadAny), handler.GetCustomerManagementMenu)
 
 	return r
 }
@@ -49,6 +53,12 @@ func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
 
 	category_tree, err := h.menuService.GetCategoryTree(uint(root_category_id), lang_id)
 	if err != nil {
+
+		logger.Error("failed to get category tree",
+			"handler", "MenuHandler.GetCategoryTree",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -79,6 +89,12 @@ func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
 
 	breadcrumb, err := h.menuService.GetBreadcrumb(uint(root_category_id), uint(category_id), lang_id)
 	if err != nil {
+
+		logger.Error("failed to get breadcrumb",
+			"handler", "MenuHandler.GetBreadcrumb",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -93,6 +109,27 @@ func (h *MenuHandler) GetTopMenu(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 	menu, err := h.menuService.GetTopMenu(customer.LangID, customer.RoleID)
+	if err != nil {
+
+		logger.Error("failed to get top menu",
+			"handler", "MenuHandler.GetTopMenu",
+
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&menu, len(menu), i18n.T_(c, response.Message_OK)))
+}
+
+func (h *MenuHandler) GetCustomerManagementMenu(c fiber.Ctx) error {
+	langId, ok := localeExtractor.GetLangID(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+	menu, err := h.menuService.GetCustomerManagementMenu(langId)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))

app/delivery/web/api/restricted/orders.go

@@ -2,11 +2,16 @@ package restricted
 
 import (
 	"strconv"
+	"strings"
 
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
 	"git.ma-al.com/goc_daniel/b2b/app/service/orderService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -31,7 +36,7 @@ func OrdersHandlerRoutes(r fiber.Router) fiber.Router {
 	r.Get("/list", handler.ListOrders)
 	r.Post("/place-new-order", handler.PlaceNewOrder)
 	r.Post("/change-order-address", handler.ChangeOrderAddress)
-	r.Get("/change-order-status", handler.ChangeOrderStatus)
+	r.Patch("/change-order-status", middleware.Require(perms.OrdersModifyAll), handler.ChangeOrderStatus)
 
 	return r
 }
@@ -53,6 +58,12 @@ func (h *OrdersHandler) ListOrders(c fiber.Ctx) error {
 
 	list, err := h.ordersService.Find(user, paging, filters)
 	if err != nil {
+
+		logger.Error("failed to list orders",
+			"handler", "OrdersHandler.ListOrders",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -102,8 +113,21 @@ func (h *OrdersHandler) PlaceNewOrder(c fiber.Ctx) error {
 
 	name := c.Query("name")
 
-	err = h.ordersService.PlaceNewOrder(userID, uint(cart_id), name, uint(country_id), address_info)
+	originalUserId, ok := localeExtractor.GetOriginalUserID(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	err = h.ordersService.PlaceNewOrder(userID, uint(cart_id), name, uint(country_id), address_info, originalUserId)
 	if err != nil {
+
+		logger.Error("failed to place order",
+			"handler", "OrdersHandler.PlaceNewOrder",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -141,6 +165,13 @@ func (h *OrdersHandler) ChangeOrderAddress(c fiber.Ctx) error {
 
 	err = h.ordersService.ChangeOrderAddress(user, uint(order_id), uint(country_id), address_info)
 	if err != nil {
+
+		logger.Error("failed to change order address",
+			"handler", "OrdersHandler.ChangeOrderAddress",
+
+			"order_id", order_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -151,23 +182,27 @@ func (h *OrdersHandler) ChangeOrderAddress(c fiber.Ctx) error {
 // we base permissions and user based on target user only.
 // TODO: well, permissions and all that.
 func (h *OrdersHandler) ChangeOrderStatus(c fiber.Ctx) error {
-	user, ok := localeExtractor.GetCustomer(c)
+	userId, ok := localeExtractor.GetUserID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	order_id_attribute := c.Query("order_id")
+	order_id, err := strconv.Atoi(c.Query("order_id"))
-	order_id, err := strconv.Atoi(order_id_attribute)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	status := c.Query("status")
+	err = h.ordersService.ChangeOrderStatus(userId, uint(order_id), enums.OrderStatus(strings.ToUpper(c.Query("status"))))
-
-	err = h.ordersService.ChangeOrderStatus(user, uint(order_id), status)
 	if err != nil {
+
+		logger.Error("failed to change order status",
+			"handler", "OrdersHandler.ChangeOrderStatus",
+
+			"order_id", order_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/product.go

@@ -9,6 +9,7 @@ import (
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -74,6 +75,15 @@ func (h *ProductsHandler) GetProductJson(c fiber.Ctx) error {
 	}
 	productJson, err := h.productService.Get(uint(p_id_product), customer.LangID, customer.ID, uint(b2b_id_country), uint(p_quantity))
 	if err != nil {
+		logger.Error("failed to get product",
+			"handler", "ProductsHandler.GetProductJson",
+			"product_id", p_id_product,
+			"lang_id", customer.LangID,
+			"customer_id", customer.ID,
+			"b2b_id_country", b2b_id_country,
+			"quantity", p_quantity,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -96,6 +106,13 @@ func (h *ProductsHandler) ListProducts(c fiber.Ctx) error {
 
 	list, err := h.productService.Find(customer.LangID, customer.ID, paging, filters, customer, constdata.DEFAULT_PRODUCT_QUANTITY, constdata.SHOP_ID)
 	if err != nil {
+
+		logger.Error("failed to list products",
+			"handler", "ProductsHandler.ListProducts",
+			"lang_id", customer.LangID,
+			"customer_id", customer.ID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -132,6 +149,13 @@ func (h *ProductsHandler) AddToFavorites(c fiber.Ctx) error {
 
 	err = h.productService.AddToFavorites(userID, uint(productID))
 	if err != nil {
+
+		logger.Error("failed to add to favorites",
+			"handler", "ProductsHandler.AddToFavorites",
+			"user_id", userID,
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -156,6 +180,12 @@ func (h *ProductsHandler) RemoveFromFavorites(c fiber.Ctx) error {
 
 	err = h.productService.RemoveFromFavorites(userID, uint(productID))
 	if err != nil {
+		logger.Error("failed to remove from favorites",
+			"handler", "ProductsHandler.RemoveFromFavorites",
+			"user_id", userID,
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -180,6 +210,15 @@ func (h *ProductsHandler) ListProductVariants(c fiber.Ctx) error {
 
 	list, err := h.productService.GetProductAttributes(customer.LangID, uint(productID), constdata.SHOP_ID, customer.ID, customer.CountryID, constdata.DEFAULT_PRODUCT_QUANTITY)
 	if err != nil {
+
+		logger.Error("failed to list product variants",
+			"handler", "ProductsHandler.ListProductVariants",
+			"product_id", productID,
+			"customer_id", customer.ID,
+			"lang_id", customer.LangID,
+			"country_id", customer.CountryID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/productTranslation.go

@@ -9,6 +9,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/productTranslationService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -66,6 +67,13 @@ func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
 
 	description, err := h.productTranslationService.GetProductDescription(userID, uint(productID), uint(productLangID))
 	if err != nil {
+
+		logger.Error("failed to get product description",
+			"handler", "ProductTranslationHandler.GetProductDescription",
+
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -103,6 +111,13 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 
 	err = h.productTranslationService.SaveProductDescription(userID, uint(productID), uint(productLangID), updates)
 	if err != nil {
+
+		logger.Error("failed to save product description",
+			"handler", "ProductTranslationHandler.SaveProductDescription",
+
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -147,6 +162,13 @@ func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) err
 
 	description, err := h.productTranslationService.TranslateProductDescription(userID, uint(productID), uint(productFromLangID), uint(productToLangID), aiModel)
 	if err != nil {
+
+		logger.Error("failed to translate product description",
+			"handler", "ProductTranslationHandler.TranslateProductDescription",
+
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/search.go

@@ -2,7 +2,6 @@ package restricted
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
@@ -10,6 +9,7 @@ import (
 	searchservice "git.ma-al.com/goc_daniel/b2b/app/service/searchService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -47,7 +47,13 @@ func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
 
 	err := h.meiliService.CreateIndex(id_lang)
 	if err != nil {
-		fmt.Printf("CreateIndex error: %v\n", err)
+
+		logger.Error("failed to create search index",
+			"handler", "MeiliSearchHandler.CreateIndex",
+
+			"lang_id", id_lang,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -72,6 +78,13 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 
 	result, err := h.searchService.Search(index, c.Body(), id_lang)
 	if err != nil {
+
+		logger.Error("failed to search",
+			"handler", "MeiliSearchHandler.Search",
+
+			"index", index,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -80,6 +93,13 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 		if createErr := h.meiliService.CreateIndex(id_lang); createErr == nil {
 			result, err = h.searchService.Search(index, c.Body(), id_lang)
 			if err != nil {
+
+				logger.Error("failed to search after index creation",
+					"handler", "MeiliSearchHandler.Search",
+
+					"index", index,
+					"error", err.Error(),
+				)
 				return c.Status(responseErrors.GetErrorStatus(err)).
 					JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 			}
@@ -100,6 +120,13 @@ func (h *MeiliSearchHandler) GetSettings(c fiber.Ctx) error {
 
 	result, err := h.searchService.GetIndexSettings(index)
 	if err != nil {
+
+		logger.Error("failed to get index settings",
+			"handler", "MeiliSearchHandler.GetSettings",
+
+			"index", index,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/specificPrice.go

@@ -9,6 +9,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/specificPriceService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -51,6 +52,12 @@ func (h *SpecificPriceHandler) Create(c fiber.Ctx) error {
 
 	result, err := h.SpecificPriceService.Create(c.Context(), &pr)
 	if err != nil {
+
+		logger.Error("failed to create specific price",
+			"handler", "SpecificPriceHandler.Create",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -74,6 +81,13 @@ func (h *SpecificPriceHandler) Update(c fiber.Ctx) error {
 
 	result, err := h.SpecificPriceService.Update(c.Context(), id, &pr)
 	if err != nil {
+
+		logger.Error("failed to update specific price",
+			"handler", "SpecificPriceHandler.Update",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -84,6 +98,12 @@ func (h *SpecificPriceHandler) Update(c fiber.Ctx) error {
 func (h *SpecificPriceHandler) List(c fiber.Ctx) error {
 	result, err := h.SpecificPriceService.List(c.Context())
 	if err != nil {
+
+		logger.Error("failed to list specific prices",
+			"handler", "SpecificPriceHandler.List",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -101,6 +121,13 @@ func (h *SpecificPriceHandler) GetByID(c fiber.Ctx) error {
 
 	result, err := h.SpecificPriceService.GetByID(c.Context(), id)
 	if err != nil {
+
+		logger.Error("failed to get specific price",
+			"handler", "SpecificPriceHandler.GetByID",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -118,6 +145,13 @@ func (h *SpecificPriceHandler) Activate(c fiber.Ctx) error {
 
 	err = h.SpecificPriceService.SetActive(c.Context(), id, true)
 	if err != nil {
+
+		logger.Error("failed to activate specific price",
+			"handler", "SpecificPriceHandler.Activate",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -135,6 +169,13 @@ func (h *SpecificPriceHandler) Deactivate(c fiber.Ctx) error {
 
 	err = h.SpecificPriceService.SetActive(c.Context(), id, false)
 	if err != nil {
+
+		logger.Error("failed to deactivate specific price",
+			"handler", "SpecificPriceHandler.Deactivate",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -152,6 +193,13 @@ func (h *SpecificPriceHandler) Delete(c fiber.Ctx) error {
 
 	err = h.SpecificPriceService.Delete(c.Context(), id)
 	if err != nil {
+
+		logger.Error("failed to delete specific price",
+			"handler", "SpecificPriceHandler.Delete",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/storage.go

@@ -9,6 +9,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/storageService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -52,6 +53,12 @@ func (h *StorageHandler) ListContent(c fiber.Ctx) error {
 	entries_in_list, err := h.storageService.ListContent(abs_path)
 
 	if err != nil {
+
+		logger.Error("failed to list storage content",
+			"handler", "StorageHandler.ListContent",
+			"path", abs_path,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -68,6 +75,12 @@ func (h *StorageHandler) DownloadFile(c fiber.Ctx) error {
 
 	f, filename, filesize, err := h.storageService.DownloadFilePrep(abs_path)
 	if err != nil {
+
+		logger.Error("failed to prepare file download",
+			"handler", "StorageHandler.DownloadFile",
+			"path", abs_path,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -87,6 +100,12 @@ func (h *StorageHandler) CreateNewWebdavToken(c fiber.Ctx) error {
 
 	new_token, err := h.storageService.NewWebdavToken(userID)
 	if err != nil {
+
+		logger.Error("failed to create webdav token",
+			"handler", "StorageHandler.CreateNewWebdavToken",
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/model/enums/orderStatus.go

@@ -0,0 +1,16 @@
+package enums
+
+type OrderStatus string
+
+const (
+	OrderStatusPending        OrderStatus = "PENDING"
+	OrderStatusConfirmed      OrderStatus = "CONFIRMED"
+	OrderStatusProcessing     OrderStatus = "PROCESSING"
+	OrderStatusShipped        OrderStatus = "SHIPPED"
+	OrderStatusOutForDelivery OrderStatus = "OUT_FOR_DELIVERY"
+	OrderStatusDelivered      OrderStatus = "DELIVERED"
+	OrderStatusCancelled      OrderStatus = "CANCELLED"
+	OrderStatusReturned       OrderStatus = "RETURNED"
+	OrderStatusRefunded       OrderStatus = "REFUNDED"
+	OrderStatusFailed         OrderStatus = "FAILED"
+)

app/model/menu.go

@@ -2,7 +2,7 @@ package model
 
 import "encoding/json"
 
-type B2BTopMenu struct {
+type B2BMenu struct {
 	MenuID   int             `gorm:"column:menu_id;primaryKey;autoIncrement" json:"menu_id"`
 	Label    json.RawMessage `gorm:"column:label;type:longtext;not null;default:'{}'" json:"label"`
 	ParentID *int            `gorm:"column:parent_id;index:FK_b2b_top_menu_parent_id" json:"parent_id,omitempty"`
@@ -10,10 +10,22 @@ type B2BTopMenu struct {
 	Active   int8            `gorm:"column:active;type:tinyint;not null;default:1" json:"active"`
 	Position int             `gorm:"column:position;not null;default:1" json:"position"`
 
-	Parent   *B2BTopMenu   `gorm:"foreignKey:ParentID;references:MenuID;constraint:OnDelete:RESTRICT,OnUpdate:RESTRICT" json:"parent,omitempty"`
+	Parent   *B2BMenu   `gorm:"foreignKey:ParentID;references:MenuID;constraint:OnDelete:RESTRICT,OnUpdate:RESTRICT" json:"parent,omitempty"`
-	Children []*B2BTopMenu `gorm:"foreignKey:ParentID" json:"children,omitempty"`
+	Children []*B2BMenu `gorm:"foreignKey:ParentID" json:"children,omitempty"`
+}
+
+type B2BTopMenu struct {
+	B2BMenu
 }
 
 func (B2BTopMenu) TableName() string {
 	return "b2b_top_menu"
 }
+
+type B2BCustomerManagementMenu struct {
+	B2BMenu
+}
+
+func (B2BCustomerManagementMenu) TableName() string {
+	return "b2b_customer_management_menu"
+}

app/model/order.go

@@ -1,6 +1,10 @@
 package model
 
-import "time"
+import (
+	"time"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
+)
 
 type CustomerOrder struct {
 	OrderID         uint              `gorm:"column:order_id;primaryKey;autoIncrement" json:"order_id"`
@@ -9,7 +13,7 @@ type CustomerOrder struct {
 	CountryID       uint              `gorm:"column:country_id;not null" json:"country_id"`
 	AddressString   string            `gorm:"column:address_string;not null" json:"address_string"`
 	AddressUnparsed *AddressUnparsed  `gorm:"-" json:"address_unparsed"`
-	Status          string           `gorm:"column:status;size:50;not null" json:"status"`
+	Status          enums.OrderStatus `gorm:"column:status;size:50;not null" json:"status"`
 	BasePrice       float64           `gorm:"column:base_price;type:decimal(10,2);not null" json:"base_price"`
 	TaxIncl         float64           `gorm:"column:tax_incl;type:decimal(10,2);not null" json:"tax_incl"`
 	TaxExcl         float64           `gorm:"column:tax_excl;type:decimal(10,2);not null" json:"tax_excl"`

app/model/orderStatusHistory.go

@@ -0,0 +1,20 @@
+package model
+
+import (
+	"time"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
+)
+
+type OrderStatusHistory struct {
+	Id        uint               `gorm:"column:id;primaryKey;autoIncrement"`
+	OrderId   uint               `gorm:"column:order_id;not null;index:idx_order_status_history_order"`
+	OldStatus *enums.OrderStatus `gorm:"column:old_status;type:varchar(50)"`
+	NewStatus enums.OrderStatus  `gorm:"column:new_status;type:varchar(50);not null"`
+	CreatedAt time.Time          `gorm:"column:created_at;not null;autoCreateTime"`
+	UserId    uint               `gorm:"column:user_id;index:idx_order_status_history_user;not null"`
+}
+
+func (OrderStatusHistory) TableName() string {
+	return "b2b_order_status_history"
+}

app/repos/ordersRepo/ordersRepo.go

@@ -5,17 +5,19 @@ import (
 
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 )
 
 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, base_price float64, tax_incl float64, tax_excl float64) 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(order_id uint, status string) error
+	ChangeOrderStatus(orderId uint, newStatus enums.OrderStatus, userId uint) error
+	GetOrderStatus(orderID uint) (enums.OrderStatus, error)
 }
 
 type OrdersRepo struct{}
@@ -37,6 +39,18 @@ func (repo *OrdersRepo) UserHasOrder(user_id uint, order_id uint) (bool, error)
 	return amt >= 1, err
 }
 
+func (repo *OrdersRepo) Get(orderId uint) (*model.CustomerOrder, error) {
+	var order model.CustomerOrder
+
+	err := db.Get().
+		Model(&model.CustomerOrder{}).
+		Preload("Products").
+		Where("order_id = ?", orderId).
+		First(&order).Error
+
+	return &order, err
+}
+
 func (repo *OrdersRepo) Find(user_id uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) {
 	var list []model.CustomerOrder
 	var total int64
@@ -71,13 +85,13 @@ 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, base_price float64, tax_incl float64, tax_excl float64) 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,
 		CountryID:     country_id,
 		AddressString: address_info,
-		Status:        constdata.NEW_ORDER_STATUS,
+		Status:        enums.OrderStatusPending,
 		Products:      make([]model.OrderProduct, 0, len(cart.Products)),
 	}
 
@@ -88,14 +102,35 @@ 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 {
+		tx.Rollback()
+		return nil, err
+	}
+	history := model.OrderStatusHistory{
+		OrderId:   order.OrderID,
+		OldStatus: nil,
+		NewStatus: enums.OrderStatusPending,
+		UserId:    originalUserId,
+	}
 
-	return db.DB.Create(&order).Error
+	err = tx.Create(&history).Error
+	if err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+	err = tx.Commit().Error
+	if err != nil {
+		return nil, err
+	}
+
+	return &order, nil
 }
 
 func (repo *OrdersRepo) ChangeOrderAddress(order_id uint, country_id uint, address_info string) error {
@@ -110,13 +145,48 @@ func (repo *OrdersRepo) ChangeOrderAddress(order_id uint, country_id uint, addre
 		Error
 }
 
-func (repo *OrdersRepo) ChangeOrderStatus(order_id uint, status string) error {
+func (repo *OrdersRepo) ChangeOrderStatus(orderID uint, newStatus enums.OrderStatus, userId uint) error {
-	return db.DB.
+	tx := db.Get().Begin()
-		Table("b2b_customer_orders").
+
-		Where("order_id = ?", order_id).
+	var currentStatus enums.OrderStatus
-		Updates(map[string]interface{}{
+	err := tx.Table("b2b_customer_orders").
-			"status":     status,
+		Select("status").
-			"updated_at": time.Now(),
+		Where("order_id = ?", orderID).
-		}).
+		Scan(&currentStatus).Error
-		Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	err = tx.Table("b2b_customer_orders").
+		Where("order_id = ?", orderID).
+		Update("status", string(newStatus)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	history := model.OrderStatusHistory{
+		OrderId:   orderID,
+		OldStatus: &currentStatus,
+		NewStatus: newStatus,
+		UserId:    userId,
+	}
+
+	err = tx.Create(&history).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return tx.Commit().Error
+}
+
+func (repo *OrdersRepo) GetOrderStatus(orderID uint) (enums.OrderStatus, error) {
+	var status enums.OrderStatus
+	err := db.DB.Table("b2b_customer_orders").
+		Select("status").
+		Where("order_id = ?", orderID).
+		Scan(&status).Error
+	return status, err
 }

app/repos/routesRepo/routesRepo.go

@@ -9,6 +9,7 @@ import (
 type UIRoutesRepo interface {
 	GetRoutes(langId uint, roleId uint) ([]model.Route, error)
 	GetTopMenu(id uint, roleId uint) ([]model.B2BTopMenu, error)
+	GetCustomerManagementMenu(langId uint) ([]model.B2BCustomerManagementMenu, error)
 }
 
 type RoutesRepo struct{}
@@ -38,10 +39,23 @@ func (p *RoutesRepo) GetTopMenu(langId uint, roleId uint) ([]model.B2BTopMenu, e
 		Get().
 		Model(model.B2BTopMenu{}).
 		Joins("JOIN b2b_top_menu_roles tmr ON tmr.top_menu_id = b2b_top_menu.menu_id").
-		Where(model.B2BTopMenu{Active: 1}).
+		Where(model.B2BTopMenu{B2BMenu: model.B2BMenu{Active: 1}}).
 		Where("tmr.role_id = ?", roleId).
 		Order("b2b_top_menu.parent_id ASC, b2b_top_menu.position ASC").
 		Find(&menus).Error
 
 	return menus, err
 }
+
+func (p *RoutesRepo) GetCustomerManagementMenu(langId uint) ([]model.B2BCustomerManagementMenu, error) {
+	var menus []model.B2BCustomerManagementMenu
+
+	err := db.
+		Get().
+		Model(model.B2BCustomerManagementMenu{}).
+		Where(model.B2BCustomerManagementMenu{B2BMenu: model.B2BMenu{Active: 1}}).
+		Order("b2b_customer_management_menu.parent_id ASC, b2b_customer_management_menu.position ASC").
+		Find(&menus).Error
+
+	return menus, err
+}

app/service/authService/auth.go

@@ -15,6 +15,7 @@ import (
 	roleRepo "git.ma-al.com/goc_daniel/b2b/app/repos/rolesRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 
 	"github.com/dlclark/regexp2"
@@ -68,22 +69,47 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	// Find user by email
 	if err := s.db.Preload("Role.Permissions").Where("email = ?", req.Email).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
+			logger.Info("login failed - invalid credentials",
+				"service", "AuthService.Login",
+				"email", req.Email,
+				"reason", "user not found",
+			)
 			return nil, "", responseErrors.ErrInvalidCredentials
 		}
+		logger.Error("login failed - database error",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return nil, "", fmt.Errorf("database error: %w", err)
 	}
 	// Check if user is active
 	if !user.IsActive {
+		logger.Info("login failed - user inactive",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"reason", "user account is inactive",
+		)
 		return nil, "", responseErrors.ErrUserInactive
 	}
 
 	// Check if email is verified
 	if !user.EmailVerified {
+		logger.Info("login failed - email not verified",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"reason", "email not verified",
+		)
 		return nil, "", responseErrors.ErrEmailNotVerified
 	}
 
 	// Verify password
 	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(req.Password)); err != nil {
+		logger.Info("login failed - invalid credentials",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"reason", "wrong password",
+		)
 		return nil, "", responseErrors.ErrInvalidCredentials
 	}
 
@@ -94,6 +120,11 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	if req.LangID != nil {
 		_, err := s.GetLangISOCode(*req.LangID)
 		if err != nil {
+			logger.Warn("login failed - invalid language ID",
+				"service", "AuthService.Login",
+				"email", req.Email,
+				"reason", "invalid language ID",
+			)
 			return nil, "", responseErrors.ErrBadLangID
 		}
 		user.LangID = *req.LangID
@@ -105,12 +136,22 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	// Generate access token (JWT)
 	accessToken, err := s.generateAccessToken(&user)
 	if err != nil {
+		logger.Error("login failed - token generation error",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return nil, "", fmt.Errorf("failed to generate access token: %w", err)
 	}
 
 	// Generate opaque refresh token and store in DB
 	rawRefreshToken, err := s.createRefreshToken(user.ID)
 	if err != nil {
+		logger.Error("login failed - refresh token creation error",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return nil, "", fmt.Errorf("failed to create refresh token: %w", err)
 	}
 
@@ -171,6 +212,11 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 	}
 
 	if err := s.db.Create(&user).Error; err != nil {
+		logger.Error("registration failed - database error",
+			"service", "AuthService.Register",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return fmt.Errorf("failed to create user: %w", err)
 	}
 
@@ -182,8 +228,11 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 	}
 
 	if err := s.email.SendVerificationEmail(user.Email, user.EmailVerificationToken, baseURL, lang); err != nil {
-		// Log error but don't fail registration - user can request resend
+		logger.Warn("failed to send verification email",
-		_ = err
+			"service", "AuthService.Register",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 	}
 
 	return nil
@@ -307,6 +356,10 @@ func (s *AuthService) ResetPassword(token, newPassword string) error {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return responseErrors.ErrInvalidResetToken
 		}
+		logger.Error("password reset failed - database error",
+			"service", "AuthService.ResetPassword",
+			"error", err.Error(),
+		)
 		return fmt.Errorf("database error: %w", err)
 	}
 
@@ -333,6 +386,10 @@ func (s *AuthService) ResetPassword(token, newPassword string) error {
 
 	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
+		logger.Error("password reset failed - database error",
+			"service", "AuthService.ResetPassword",
+			"error", err.Error(),
+		)
 		return fmt.Errorf("failed to update password: %w", err)
 	}
 

app/service/authService/google_oauth.go

@@ -8,10 +8,12 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 	"time"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 	"git.ma-al.com/goc_daniel/b2b/app/view"
 	"golang.org/x/oauth2"
@@ -77,6 +79,13 @@ func (s *AuthService) HandleGoogleCallback(code string) (*model.AuthResponse, st
 	// Find or create user
 	user, err := s.findOrCreateGoogleUser(userInfo)
 	if err != nil {
+		if strings.Contains(err.Error(), "database") {
+			logger.Error("google oauth callback failed - database error",
+				"service", "AuthService.HandleGoogleCallback",
+				"email", userInfo.Email,
+				"error", err.Error(),
+			)
+		}
 		return nil, "", err
 	}
 

app/service/cartsService/cartsService.go

@@ -4,6 +4,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/cartsRepo"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 )
 
@@ -34,6 +35,15 @@ func (s *CartsService) CreateNewCart(user_id uint, name string) (model.CustomerC
 
 	// create new cart for customer
 	cart, err = s.repo.CreateNewCart(user_id, name)
+	if err != nil {
+		return cart, err
+	}
+
+	logger.Info("cart created",
+		"service", "cartsService",
+		"user_id", user_id,
+		"cart_id", cart.CartID,
+	)
 
 	return cart, nil
 }

app/service/emailService/email.go

@@ -12,6 +12,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/templ/emails"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/view"
 )
 
@@ -44,6 +45,11 @@ func getLangID(isoCode string) uint {
 // SendEmail sends an email to the specified recipient
 func (s *EmailService) SendEmail(to, subject, body string) error {
 	if !s.config.Enabled {
+		logger.Debug("email service is disabled",
+			"service", "EmailService.SendEmail",
+			"to", to,
+			"subject", subject,
+		)
 		return fmt.Errorf("email service is disabled")
 	}
 
@@ -69,6 +75,12 @@ func (s *EmailService) SendEmail(to, subject, body string) error {
 	// Send email
 	addr := fmt.Sprintf("%s:%d", s.config.SMTPHost, s.config.SMTPPort)
 	if err := smtp.SendMail(addr, auth, s.config.FromEmail, []string{to}, []byte(msg.String())); err != nil {
+		logger.Error("failed to send email",
+			"service", "EmailService.SendEmail",
+			"to", to,
+			"subject", subject,
+			"error", err.Error(),
+		)
 		return fmt.Errorf("failed to send email: %w", err)
 	}
 
@@ -120,9 +132,12 @@ func (s *EmailService) SendNewUserAdminNotification(userEmail, userName, baseURL
 // SendNewOrderPlacedNotification sends an email to admin when new order is placed
 func (s *EmailService) SendNewOrderPlacedNotification(userID uint) error {
 	if s.config.AdminEmail == "" {
-		return nil // No admin email configured
+		logger.Warn("no admin email setup in the config",
+			"service", "EmailService.SendNewOrderPlacedNotification",
+			"user_id", userID,
+		)
+		return nil
 	}
-
 	subject := "New Order Created"
 	body := s.newOrderPlacedTemplate(userID)
 

app/service/menuService/menuService.go

@@ -10,6 +10,7 @@ import (
 	routesRepo "git.ma-al.com/goc_daniel/b2b/app/repos/routesRepo"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 )
 
@@ -193,18 +194,52 @@ func (s *MenuService) GetBreadcrumb(root_category_id uint, start_category_id uin
 	return breadcrumb, nil
 }
 
-func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopMenu, error) {
+func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BMenu, error) {
 	items, err := s.routesRepo.GetTopMenu(languageId, roleId)
 	if err != nil {
+		logger.Error("failed to get top menu",
+			"handler", "ManuService.GetTopMenu",
+			"language_id", languageId,
+			"role_id", roleId,
+			"error", err.Error(),
+		)
 		return nil, err
 	}
 
-	menuMap := make(map[int]*model.B2BTopMenu, len(items))
+	menus := make([]model.B2BMenu, len(items))
-	roots := make([]*model.B2BTopMenu, 0)
+	for i := range items {
+		menus[i] = items[i].B2BMenu
+	}
+
+	return buildMenu(menus), nil
+}
+
+func (s *MenuService) GetCustomerManagementMenu(languageId uint) ([]*model.B2BMenu, error) {
+	items, err := s.routesRepo.GetCustomerManagementMenu(languageId)
+	if err != nil {
+		logger.Error("failed to get customer management menu",
+			"handler", "ManuService.GetCustomerManagementMenu",
+			"language_id", languageId,
+			"error", err.Error(),
+		)
+		return nil, err
+	}
+
+	menus := make([]model.B2BMenu, len(items))
+	for i := range items {
+		menus[i] = items[i].B2BMenu
+	}
+
+	return buildMenu(menus), nil
+}
+
+func buildMenu(items []model.B2BMenu) []*model.B2BMenu {
+	menuMap := make(map[int]*model.B2BMenu, len(items))
+	roots := make([]*model.B2BMenu, 0)
 
 	for i := range items {
 		menu := &items[i]
-		menu.Children = make([]*model.B2BTopMenu, 0)
+		menu.Children = make([]*model.B2BMenu, 0)
 		menuMap[menu.MenuID] = menu
 	}
 
@@ -226,7 +261,7 @@ func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopM
 		parent.Children = append(parent.Children, menu)
 	}
 
-	return roots, nil
+	return roots
 }
 
 func (s *MenuService) appendAdditional(all_categories *[]model.ScannedCategory, id_lang uint, iso_code string) {

app/service/orderService/orderService.go

@@ -1,17 +1,19 @@
 package orderService
 
 import (
-	"fmt"
 	"strconv"
 
+	"git.ma-al.com/goc_daniel/b2b/app/actions/orderStatusActions"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/enums"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/cartsRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/ordersRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -23,6 +25,7 @@ type OrderService struct {
 	productsRepo     productsRepo.UIProductsRepo
 	addressesService *addressesService.AddressesService
 	emailService     *emailService.EmailService
+	actionRegistry   *orderStatusActions.ActionRegistry
 }
 
 func New() *OrderService {
@@ -32,9 +35,23 @@ func New() *OrderService {
 		productsRepo:     productsRepo.New(),
 		addressesService: addressesService.New(),
 		emailService:     emailService.NewEmailService(),
+		actionRegistry:   &orderStatusActions.GlobalRegistry,
 	}
 }
 
+var ValidStatuses = map[enums.OrderStatus]bool{
+	enums.OrderStatusPending:        true,
+	enums.OrderStatusConfirmed:      true,
+	enums.OrderStatusProcessing:     true,
+	enums.OrderStatusShipped:        true,
+	enums.OrderStatusOutForDelivery: true,
+	enums.OrderStatusDelivered:      true,
+	enums.OrderStatusCancelled:      true,
+	enums.OrderStatusReturned:       true,
+	enums.OrderStatusRefunded:       true,
+	enums.OrderStatusFailed:         true,
+}
+
 func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) {
 	if !user.HasPermission(perms.OrdersViewAll) {
 		// append filter to view only this user's orders
@@ -49,9 +66,12 @@ func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.F
 
 	for i := 0; i < len(list.Items); i++ {
 		address_unparsed, err := s.addressesService.ValidateAddressJson(list.Items[i].AddressString, list.Items[i].CountryID)
-		// log such errors
 		if err != nil {
-			fmt.Printf("err: %v\n", err)
+			logger.Warn("failed to validate address",
+				"service", "orderService",
+				"order_id", list.Items[i].OrderID,
+				"error", err.Error(),
+			)
 		}
 
 		list.Items[i].AddressUnparsed = &address_unparsed
@@ -60,7 +80,7 @@ func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.F
 	return list, nil
 }
 
-func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, country_id uint, address_info string) error {
+func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, country_id uint, address_info string, originalUserId uint) error {
 	_, err := s.addressesService.ValidateAddressJson(address_info, country_id)
 	if err != nil {
 		return err
@@ -89,7 +109,7 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
 	base_price, tax_incl, tax_excl, err := s.getOrderTotalPrice(user_id, cart_id, country_id)
 
 	// all checks passed
-	err = s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info, base_price, tax_incl, tax_excl)
+	order, err := s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info, originalUserId, base_price, tax_incl, tax_excl)
 	if err != nil {
 		return err
 	}
@@ -98,20 +118,16 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
 	// if no error is returned, remove the cart. This should be smooth
 	err = s.cartsRepo.RemoveCart(user_id, cart_id)
 	if err != nil {
-		// Log error but don't fail placing order
+		logger.Warn("failed to remove cart after order placement",
-		_ = err
+			"service", "orderService",
+			"user_id", user_id,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 	}
 
-	// send email to admin
+	return s.ChangeOrderStatus(user_id, order.OrderID, enums.OrderStatusPending)
-	go func(user_id uint) {
-		err := s.emailService.SendNewOrderPlacedNotification(user_id)
-		if err != nil {
-			// Log error but don't fail placing order
-			_ = err
-		}
-	}(user_id)
 
-	return nil
 }
 
 func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, country_id uint, address_info string) error {
@@ -134,20 +150,35 @@ func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, c
 	return s.ordersRepo.ChangeOrderAddress(order_id, country_id, address_info)
 }
 
-// This is obiously just an initial version of this function
+func (s *OrderService) ChangeOrderStatus(userId, orderId uint, newStatus enums.OrderStatus) error {
-func (s *OrderService) ChangeOrderStatus(user *model.Customer, order_id uint, status string) error {
+	order, err := s.ordersRepo.Get(orderId)
-	if !user.HasPermission(perms.OrdersModifyAll) {
+	if err != nil {
-		exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
+		return err
+	}
+	if order == nil {
+		return responseErrors.ErrOrderNotFound
+	}
+
+	if !ValidStatuses[newStatus] {
+		return responseErrors.ErrInvalidStatus
+	}
+
+	err = s.ordersRepo.ChangeOrderStatus(order.OrderID, newStatus, userId)
 	if err != nil {
 		return err
 	}
 
-		if !exists {
+	actionCtx := orderStatusActions.ActionContext{
-			return responseErrors.ErrUserHasNoSuchOrder
+		Order:        order,
-		}
+		UserId:       &userId,
+		EmailService: s.emailService,
 	}
 
-	return s.ordersRepo.ChangeOrderStatus(order_id, status)
+	go func() {
+		_ = s.actionRegistry.ExecuteForStatus(newStatus, actionCtx)
+	}()
+
+	return nil
 }
 
 func (s *OrderService) getOrderTotalPrice(user_id uint, cart_id uint, country_id uint) (float64, float64, float64, error) {

app/utils/localeExtractor/localeExtractor.go

@@ -14,6 +14,14 @@ func GetLangID(c fiber.Ctx) (uint, bool) {
 	return user_locale.OriginalUser.LangID, true
 }
 
+func GetOriginalUserID(c fiber.Ctx) (uint, bool) {
+	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	if !ok || user_locale.OriginalUser == nil {
+		return 0, false
+	}
+	return user_locale.OriginalUser.ID, true
+}
+
 func GetUserID(c fiber.Ctx) (uint, bool) {
 	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
 	if !ok || user_locale.User == nil {

app/utils/logger/logger.go

@@ -0,0 +1,151 @@
+package logger
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"log/slog"
+	"os"
+	"strings"
+)
+
+var L *slog.Logger
+
+const (
+	reset  = "\033[0m"
+	red    = "\033[31m"
+	yellow = "\033[33m"
+	green  = "\033[32m"
+	blue   = "\033[36m"
+	gray   = "\033[90m"
+)
+
+type consoleHandler struct {
+	w        io.Writer
+	colorize bool
+}
+
+func (h *consoleHandler) Enabled(ctx context.Context, level slog.Level) bool {
+	return true
+}
+
+func (h *consoleHandler) Handle(ctx context.Context, r slog.Record) error {
+	level := r.Level.String()
+	color := reset
+
+	switch r.Level {
+	case slog.LevelError:
+		color = red
+	case slog.LevelWarn:
+		color = yellow
+	case slog.LevelInfo:
+		color = blue
+	case slog.LevelDebug:
+		color = gray
+	}
+
+	var msg string
+	if h.colorize {
+		msg = fmt.Sprintf("%s%s%s %s%s%s %s%s%s",
+			reset, r.Time.Format("15:04:05"), reset,
+			color, level, reset,
+			reset, r.Message, reset)
+	} else {
+		msg = fmt.Sprintf("%s %s %s", r.Time.Format("15:04:05"), level, r.Message)
+	}
+
+	var pairs []string
+	r.Attrs(func(attr slog.Attr) bool {
+		if h.colorize {
+			pairs = append(pairs, fmt.Sprintf("%s%s=%s%v%s", green, attr.Key, reset, attr.Value, reset))
+		} else {
+			pairs = append(pairs, fmt.Sprintf("%s=%v", attr.Key, attr.Value))
+		}
+		return true
+	})
+
+	if len(pairs) > 0 {
+		msg += " " + strings.Join(pairs, " ")
+	}
+
+	fmt.Fprintln(h.w, msg)
+	return nil
+}
+
+func (h *consoleHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	return &consoleHandler{w: h.w, colorize: h.colorize}
+}
+
+func (h *consoleHandler) WithGroup(name string) slog.Handler {
+	return &consoleHandler{w: h.w, colorize: h.colorize}
+}
+
+func Init(service string, output io.Writer, level string, colorize bool) {
+	if output == nil {
+		output = os.Stderr
+	}
+
+	var lvl slog.Level
+	switch level {
+	case "debug":
+		lvl = slog.LevelDebug
+	case "warn":
+		lvl = slog.LevelWarn
+	case "error":
+		lvl = slog.LevelError
+	default:
+		lvl = slog.LevelInfo
+	}
+
+	if colorize {
+		L = slog.New(&consoleHandler{w: output, colorize: true}).With("service", service, "level", lvl.String())
+	} else {
+		L = slog.New(slog.NewJSONHandler(output, &slog.HandlerOptions{
+			Level:     lvl,
+			AddSource: false,
+			ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
+				if a.Key == slog.TimeKey && groups == nil {
+					a.Key = "timestamp"
+				}
+				if a.Key == slog.LevelKey {
+					a.Key = "level"
+				}
+				if a.Key == slog.MessageKey {
+					a.Key = "message"
+				}
+				return a
+			},
+		})).With("service", service)
+	}
+}
+
+func Info(msg string, args ...any) {
+	if L != nil {
+		L.Info(msg, args...)
+	}
+}
+
+func Warn(msg string, args ...any) {
+	if L != nil {
+		L.Warn(msg, args...)
+	}
+}
+
+func Error(msg string, args ...any) {
+	if L != nil {
+		L.Error(msg, args...)
+	}
+}
+
+func Debug(msg string, args ...any) {
+	if L != nil {
+		L.Debug(msg, args...)
+	}
+}
+
+func With(args ...any) *slog.Logger {
+	if L == nil {
+		return nil
+	}
+	return L.With(args...)
+}

app/utils/responseErrors/responseErrors.go

@@ -71,6 +71,8 @@ var (
 	// Typed errors for orders handler
 	ErrEmptyCart          = errors.New("the cart is empty")
 	ErrUserHasNoSuchOrder = errors.New("user does not have order with given id")
+	ErrInvalidStatus      = errors.New("invalid order status")
+	ErrOrderNotFound      = errors.New("order not found")
 
 	// Typed errors for price reduction handler
 	ErrInvalidReductionType  = errors.New("invalid reduction type: must be 'amount' or 'percentage'")
@@ -314,7 +316,8 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrMaxAmtOfAddressesReached),
 		errors.Is(err, ErrUserHasNoSuchAddress),
 		errors.Is(err, ErrInvalidCountryID),
-		errors.Is(err, ErrInvalidAddressJSON):
+		errors.Is(err, ErrInvalidAddressJSON),
+		errors.Is(err, ErrInvalidStatus):
 		return fiber.StatusBadRequest
 	case errors.Is(err, ErrSpecificPriceNotFound):
 		return fiber.StatusNotFound

bruno/api_v1/Delete Index - MeiliSearch.yml

@@ -1,7 +1,7 @@
 info:
   name: Delete Index - MeiliSearch
   type: http
-  seq: 7
+  seq: 8
 
 http:
   method: DELETE

bruno/api_v1/cart/Add new cart.yml

@@ -0,0 +1,19 @@
+info:
+  name: Add new cart
+  type: http
+  seq: 1
+
+http:
+  method: POST
+  url: "{{bas_url}}/restricted/carts/add-new-cart?name=TestCart"
+  params:
+    - name: name
+      value: TestCart
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/Add product to cart.yml

@@ -0,0 +1,31 @@
+info:
+  name: Add product to cart
+  type: http
+  seq: 6
+
+http:
+  method: POST
+  url: "{{bas_url}}/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=1&set_amount=true"
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: product_id
+      value: "51"
+      type: query
+    - name: product_attribute_id
+      value: "1115"
+      type: query
+    - name: amount
+      value: "1"
+      type: query
+    - name: set_amount
+      value: "true"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/Change cart name.yml

@@ -0,0 +1,22 @@
+info:
+  name: Change cart name
+  type: http
+  seq: 3
+
+http:
+  method: PATCH
+  url: "{{bas_url}}/restricted/carts/change-cart-name?cart_id=1&new_name=UpdatedCart"
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: new_name
+      value: UpdatedCart
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/Remove cart.yml

@@ -0,0 +1,19 @@
+info:
+  name: Remove cart
+  type: http
+  seq: 2
+
+http:
+  method: DELETE
+  url: "{{bas_url}}/restricted/carts/remove-cart?cart_id=1"
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/Remove product from cart.yml

@@ -0,0 +1,25 @@
+info:
+  name: Remove product from cart
+  type: http
+  seq: 7
+
+http:
+  method: DELETE
+  url: "{{bas_url}}/restricted/carts/remove-product-from-cart?cart_id=1&product_id=51&product_attribute_id=1115"
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: product_id
+      value: "51"
+      type: query
+    - name: product_attribute_id
+      value: "1115"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/Retrieve cart.yml

@@ -0,0 +1,19 @@
+info:
+  name: Retrieve cart
+  type: http
+  seq: 5
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/carts/retrieve-cart?cart_id=1"
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/Retrieve carts info.yml

@@ -0,0 +1,15 @@
+info:
+  name: Retrieve carts info
+  type: http
+  seq: 4
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/carts/retrieve-carts-info"
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/cart/folder.yml

@@ -0,0 +1,7 @@
+info:
+  name: cart
+  type: folder
+  seq: 7
+
+request:
+  auth: inherit

bruno/api_v1/currency/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: currency
   type: folder
-  seq: 9
+  seq: 10
 
 request:
   auth: inherit

bruno/api_v1/customer/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: customer
   type: folder
-  seq: 10
+  seq: 11
 
 request:
   auth: inherit

bruno/api_v1/menu/Breadcrumb.yml

@@ -0,0 +1,22 @@
+info:
+  name: Breadcrumb
+  type: http
+  seq: 1
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/menu/get-breadcrumb?root_category_id=2&category_id=13
+  params:
+    - name: root_category_id
+      value: "2"
+      type: query
+    - name: category_id
+      value: "13"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/menu/Category tree.yml

@@ -0,0 +1,19 @@
+info:
+  name: Category tree
+  type: http
+  seq: 2
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/menu/get-category-tree?root_category_id=2
+  params:
+    - name: root_category_id
+      value: "2"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/menu/Top Customer Management Menu.yml

@@ -0,0 +1,15 @@
+info:
+  name: Top Customer Management Menu
+  type: http
+  seq: 4
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/menu/get-customer-management-menu"
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/menu/Top Menu.yml

@@ -0,0 +1,15 @@
+info:
+  name: Top Menu
+  type: http
+  seq: 3
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/menu/get-top-menu"
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/menu/folder.yml

@@ -0,0 +1,7 @@
+info:
+  name: menu
+  type: folder
+  seq: 12
+
+request:
+  auth: inherit

bruno/api_v1/order/Change order address.yml

@@ -0,0 +1,33 @@
+info:
+  name: Change order address
+  type: http
+  seq: 3
+
+http:
+  method: POST
+  url: "{{bas_url}}/restricted/orders/change-order-address?order_id=1&country_id=1"
+  params:
+    - name: order_id
+      value: "1"
+      type: query
+    - name: country_id
+      value: "1"
+      type: query
+  body:
+    type: json
+    data: |-
+      {
+        "postal_code": "31-154",
+        "city": "Kraków",
+        "voivodeship": "śląskie",
+        "street": "Długa",
+        "building_no": "5",
+        "recipient": "Adam Adamowicz"
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/order/Change order status.yml

@@ -0,0 +1,22 @@
+info:
+  name: Change order status
+  type: http
+  seq: 1
+
+http:
+  method: PATCH
+  url: "{{bas_url}}/restricted/orders/change-order-status?order_id=2&status=PENDING"
+  params:
+    - name: order_id
+      value: "2"
+      type: query
+    - name: status
+      value: PENDING
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/order/List.yml

@@ -0,0 +1,25 @@
+info:
+  name: List
+  type: http
+  seq: 1
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/orders/list?p=1&elems=30&sort=order_id,desc"
+  params:
+    - name: p
+      value: "1"
+      type: query
+    - name: elems
+      value: "30"
+      type: query
+    - name: sort
+      value: order_id,desc
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/order/Place new order.yml

@@ -0,0 +1,37 @@
+info:
+  name: Place new order
+  type: http
+  seq: 2
+
+http:
+  method: POST
+  url: "{{bas_url}}/restricted/orders/place-new-order?cart_id=1&name=Test+Order&country_id=1"
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: name
+      value: Test Order
+      type: query
+    - name: country_id
+      value: "1"
+      type: query
+  body:
+    type: json
+    data: |-
+      {
+        "postal_code": "31-154",
+        "city": "Kraków",
+        "voivodeship": "małopolskie",
+        "street": "Długa",
+        "building_no": "5",
+        "apartment_no": "7",
+        "recipient": "Jan Kowalski"
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/order/folder.yml

@@ -0,0 +1,7 @@
+info:
+  name: order
+  type: folder
+  seq: 13
+
+request:
+  auth: inherit

bruno/api_v1/product/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: product
   type: folder
-  seq: 8
+  seq: 9
 
 request:
   auth: inherit

bruno/api_v1/routes/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: routes
   type: folder
-  seq: 10
+  seq: 12
 
 request:
   auth: inherit

i18n/migrations/20260302163100_routes.sql

@@ -42,9 +42,32 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
 (3, JSON_COMPACT('{"name":"admin-products","trans":{"pl":{"label":"admin-products"},"en":{"label":"admin-products"},"de":{"label":"admin-products"}}}'),1,JSON_COMPACT('{}'),1,1),
 (9, JSON_COMPACT('{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}'),3,JSON_COMPACT('{"route": {"name": "home", "params":{"locale": ""}}}'),1,1);
 
+CREATE TABLE IF NOT EXISTS b2b_customer_management_menu (
+  menu_id INT AUTO_INCREMENT NOT NULL,
+  label LONGTEXT NOT NULL DEFAULT '{}',
+  parent_id INT NULL DEFAULT NULL,
+  params LONGTEXT NOT NULL DEFAULT '{}',
+  active TINYINT NOT NULL DEFAULT 1,
+  position INT NOT NULL DEFAULT 1,
+  PRIMARY KEY (menu_id),
+  CONSTRAINT FK_b2b_customer_management_menu_parent_id FOREIGN KEY (parent_id) 
+      REFERENCES b2b_customer_management_menu (menu_id) 
+      ON DELETE RESTRICT ON UPDATE RESTRICT,
+  INDEX FK_b2b_customer_management_menu_parent_id_idx (parent_id ASC)
+) ENGINE = InnoDB;
+
+INSERT IGNORE INTO `b2b_customer_management_menu` (`menu_id`, `label`, `parent_id`, `params`, `active`, `position`) VALUES
+(1, JSON_COMPACT('{"name":"root","trans":{"pl":{"label":"Menu główne"},"en":{"label":"Main Menu"},"de":{"label":"Hauptmenü"}}}'),NULL,JSON_COMPACT('{}'),1,1),
+(3, JSON_COMPACT('{"name":"admin-products","trans":{"pl":{"label":"admin-products"},"en":{"label":"admin-products"},"de":{"label":"admin-products"}}}'),1,JSON_COMPACT('{}'),1,1),
+(9, JSON_COMPACT('{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}'),3,JSON_COMPACT('{"route": {"name": "home", "params":{"locale": ""}}}'),1,1);
+
+INSERT INTO `b2b_customer_management_menu` (`menu_id`, `label`, `parent_id`, `params`, `active`, `position`) VALUES (1, '{"name":"root","trans":{"pl":{"label":"Menu główne"},"en":{"label":"Main Menu"},"de":{"label":"Hauptmenü"}}}', NULL, '{}', 1, 1);
+INSERT INTO `b2b_customer_management_menu` (`menu_id`, `label`, `parent_id`, `params`, `active`, `position`) VALUES (3, '{"name":"admin-products","trans":{"pl":{"label":"admin-products"},"en":{"label":"admin-products"},"de":{"label":"admin-products"}}}', 1, '{}', 1, 1);
+INSERT INTO `b2b_customer_management_menu` (`menu_id`, `label`, `parent_id`, `params`, `active`, `position`) VALUES (9, '{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}', 3, '{"route":{"name":"home","params":{"locale":""}}}', 1, 1);
 
 -- +goose Down
 
 DROP TABLE IF EXISTS b2b_routes;
 DROP TABLE IF EXISTS b2b_top_menu;
+DROP TABLE IF EXISTS b2b_customer_management_menu;
 DROP FUNCTION IF EXISTS `slugify_eu`;

i18n/migrations/20260302163122_create_tables.sql

@@ -113,7 +113,7 @@ CREATE TABLE IF NOT EXISTS b2b_customers (
   created_at                      DATETIME(6) NULL,
   updated_at                      DATETIME(6) NULL,
   deleted_at                      DATETIME(6) NULL,
-  is_no_vat                     TINYINT(1) NULL DEFAULT 0 
+  is_no_vat                     TINYINT(1) NOT NULL DEFAULT 0 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE UNIQUE INDEX IF NOT EXISTS idx_customers_email
@@ -462,6 +462,30 @@ END$$
 
 DELIMITER ;
 
+CREATE TABLE b2b_order_status_history (
+    id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+    order_id BIGINT UNSIGNED NOT NULL,
+    old_status VARCHAR(50) NULL,
+    new_status VARCHAR(50) NOT NULL,
+    created_at TIMESTAMP NOT NULL DEFAULT NOW(),
+    user_id BIGINT UNSIGNED NULL
+);
+
+CREATE INDEX idx_order_status_history_order
+    ON b2b_order_status_history(order_id);
+
+CREATE INDEX idx_order_status_history_user
+    ON b2b_order_status_history(user_id);
+
+ALTER TABLE b2b_order_status_history
+ADD CONSTRAINT fk_order
+FOREIGN KEY (order_id) REFERENCES b2b_customer_orders(order_id);
+
+ALTER TABLE b2b_order_status_history
+ADD CONSTRAINT fk_user
+FOREIGN KEY (user_id) REFERENCES b2b_customers(id);
+
+
 -- +goose Down
 
 DROP TABLE IF EXISTS b2b_addresses;

i18n/migrations/20260302163123_create_tables_data.sql

@@ -12,6 +12,19 @@ INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('admin','2');
 INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('super_admin','3');
 INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('unlogged','4');
 
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (1, '1');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (3, '1');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (9, '1');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (1, '2');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (3, '2');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (9, '2');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (1, '3');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (3, '3');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (9, '3');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (1, '4');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (3, '4');
+INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (9, '4');
+
 
 -- insert sample admin user admin@ma-al.com/Maal12345678
 INSERT IGNORE INTO b2b_customers (id, email, password, first_name, last_name, role_id, provider, provider_id, avatar_url, is_active, email_verified, email_verification_token, email_verification_expires, password_reset_token, password_reset_expires, last_password_reset_request, last_login_at, lang_id, country_id, created_at, updated_at, deleted_at)

i18n/migrations/20260319163200_procedures.sql

@@ -415,7 +415,7 @@ BEGIN
     LEFT JOIN ps_manufacturer m 
         ON m.id_manufacturer = p.id_manufacturer
     LEFT JOIN ps_configuration
-        ON ps_configuration.name = PS_NB_DAYS_NEW_PRODUCT
+        ON ps_configuration.name = 'PS_NB_DAYS_NEW_PRODUCT'
 
     WHERE p.id_product = p_id_product
     LIMIT 1;