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

fix: edit table and migrations

Browse Source
This commit is contained in:
Arina Yakovenko
2026-04-17 13:56:26 +02:00
parent 3479e5ed8a ec44200332
commit 527656bb7c
59 changed files with 8918 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
app/actions/orderStatusActions/examples.go Normal file
View File

@@ -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}
// })

21
app/actions/orderStatusActions/pending.go Normal file
View File

@@ -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,
})
}

88
app/actions/orderStatusActions/registry.go Normal file
View File

@@ -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}
}

6
app/delivery/web/api/restricted/carts.go
View File

@@ -29,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

18
app/delivery/web/api/restricted/menu.go
View File

@@ -3,6 +3,8 @@ 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"
@@ -30,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
}
@@ -119,3 +122,18 @@ func (h *MenuHandler) GetTopMenu(c fiber.Ctx) error {
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)))
}
return c.JSON(response.Make(&menu, len(menu), i18n.T_(c, response.Message_OK)))
}

23
app/delivery/web/api/restricted/orders.go
View File

@@ -2,8 +2,12 @@ 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"
@@ -32,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
}
@@ -109,7 +113,13 @@ 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",
@@ -172,22 +182,19 @@ 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(order_id_attribute)
order_id, err := strconv.Atoi(c.Query("order_id"))
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(user, uint(order_id), status)
err = h.ordersService.ChangeOrderStatus(userId, uint(order_id), enums.OrderStatus(strings.ToUpper(c.Query("status"))))
if err != nil {
logger.Error("failed to change order status",

16
app/model/enums/orderStatus.go Normal file
View File

@@ -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"
)

18
app/model/topMenu.go → app/model/menu.go
View File

@@ -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"`
Children []*B2BTopMenu `gorm:"foreignKey:ParentID" json:"children,omitempty"`
Parent *B2BMenu `gorm:"foreignKey:ParentID;references:MenuID;constraint:OnDelete:RESTRICT,OnUpdate:RESTRICT" json:"parent,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"
}

32
app/model/order.go
View File

@@ -1,21 +1,25 @@
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"`
UserID uint `gorm:"column:user_id;not null;index" json:"user_id"`
Name string `gorm:"column:name;not null" json:"name"`
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"`
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"`
CreatedAt time.Time `gorm:"column:created_at;not null" json:"created_at"`
UpdatedAt time.Time `gorm:"column:updated_at;not null" json:"updated_at"`
Products []OrderProduct `gorm:"foreignKey:OrderID;references:OrderID" json:"products"`
OrderID uint `gorm:"column:order_id;primaryKey;autoIncrement" json:"order_id"`
UserID uint `gorm:"column:user_id;not null;index" json:"user_id"`
Name string `gorm:"column:name;not null" json:"name"`
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 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"`
CreatedAt time.Time `gorm:"column:created_at;not null" json:"created_at"`
UpdatedAt time.Time `gorm:"column:updated_at;not null" json:"updated_at"`
Products []OrderProduct `gorm:"foreignKey:OrderID;references:OrderID" json:"products"`
}
func (CustomerOrder) TableName() string {

20
app/model/orderStatusHistory.go Normal file
View File

@@ -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"
}

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

@@ -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 {
return db.DB.
Table("b2b_customer_orders").
Where("order_id = ?", order_id).
Updates(map[string]interface{}{
"status": status,
"updated_at": time.Now(),
}).
Error
func (repo *OrdersRepo) ChangeOrderStatus(orderID uint, newStatus enums.OrderStatus, userId uint) error {
tx := db.Get().Begin()
var currentStatus enums.OrderStatus
err := tx.Table("b2b_customer_orders").
Select("status").
Where("order_id = ?", orderID).
Scan(&currentStatus).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
}

16
app/repos/routesRepo/routesRepo.go
View File

@@ -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
}

19
app/service/emailService/email.go
View File

@@ -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)

45
app/service/menuService/menuService.go
View File

@@ -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))
roots := make([]*model.B2BTopMenu, 0)
menus := make([]model.B2BMenu, len(items))
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) {

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

@@ -3,8 +3,10 @@ package orderService
import (
"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"
@@ -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
@@ -63,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
@@ -92,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
}
@@ -109,19 +126,8 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
)
}
// send email to admin
go func(user_id uint) {
err := s.emailService.SendNewOrderPlacedNotification(user_id)
if err != nil {
logger.Warn("failed to send new order notification",
"service", "orderService",
"user_id", user_id,
"error", err.Error(),
)
}
}(user_id)
return s.ChangeOrderStatus(user_id, order.OrderID, enums.OrderStatusPending)
return nil
}
func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, country_id uint, address_info string) error {
@@ -144,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(user *model.Customer, order_id uint, status string) error {
if !user.HasPermission(perms.OrdersModifyAll) {
exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
if err != nil {
return err
}
if !exists {
return responseErrors.ErrUserHasNoSuchOrder
}
func (s *OrderService) ChangeOrderStatus(userId, orderId uint, newStatus enums.OrderStatus) error {
order, err := s.ordersRepo.Get(orderId)
if err != nil {
return err
}
if order == nil {
return responseErrors.ErrOrderNotFound
}
return s.ordersRepo.ChangeOrderStatus(order_id, status)
if !ValidStatuses[newStatus] {
return responseErrors.ErrInvalidStatus
}
err = s.ordersRepo.ChangeOrderStatus(order.OrderID, newStatus, userId)
if err != nil {
return err
}
actionCtx := orderStatusActions.ActionContext{
Order: order,
UserId: &userId,
EmailService: s.emailService,
}
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) {

8
app/utils/localeExtractor/localeExtractor.go
View File

@@ -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 {

5
app/utils/responseErrors/responseErrors.go
View File

@@ -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

11
bo/components.d.ts vendored
View File

@@ -11,6 +11,7 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
AddProduct: typeof import('./src/components/admin/AddProduct.vue')['default']
CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
CategoryMenu: typeof import('./src/components/inner/CategoryMenu.vue')['default']
copy: typeof import('./src/components/admin/ProductDetailView copy.vue')['default']
@@ -41,15 +42,24 @@ declare module 'vue' {
ProductEditor: typeof import('./src/components/inner/ProductEditor.vue')['default']
ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default']
Profile: typeof import('./src/components/customer-management/Profile.vue')['default']
RichEditor: typeof import('./src/components/ui/RichEditor.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
StorageFileBrowser: typeof import('./src/components/customer/StorageFileBrowser.vue')['default']
TabGeneral: typeof import('./src/components/admin/product/TabGeneral.vue')['default']
TabOptions: typeof import('./src/components/admin/product/TabOptions.vue')['default']
TabPricing: typeof import('./src/components/admin/product/TabPricing.vue')['default']
TabQuantities: typeof import('./src/components/admin/product/TabQuantities.vue')['default']
TabSeo: typeof import('./src/components/admin/product/TabSeo.vue')['default']
TabShipping: typeof import('./src/components/admin/product/TabShipping.vue')['default']
TabVariants: typeof import('./src/components/admin/product/TabVariants.vue')['default']
ThemeSwitch: typeof import('./src/components/inner/ThemeSwitch.vue')['default']
TopBar: typeof import('./src/components/TopBar.vue')['default']
TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default']
UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default']
UApp: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/App.vue')['default']
UAvatar: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Avatar.vue')['default']
UBadge: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Badge.vue')['default']
UButton: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Button.vue')['default']
UCard: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Card.vue')['default']
UCheckbox: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Checkbox.vue')['default']
@@ -70,6 +80,7 @@ declare module 'vue' {
UsersList: typeof import('./src/components/admin/UsersList.vue')['default']
UsersSearch: typeof import('./src/components/admin/UsersSearch.vue')['default']
USidebar: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Sidebar.vue')['default']
USwitch: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Switch.vue')['default']
UTable: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Table.vue')['default']
UTabs: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tabs.vue')['default']
UTextarea: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Textarea.vue')['default']

6889
bo/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

3
bo/package.json
View File

@@ -15,6 +15,9 @@
"dependencies": {
"@nuxt/ui": "^4.6.0",
"@tailwindcss/vite": "^4.2.2",
"@tiptap/extension-placeholder": "^3.22.3",
"@tiptap/starter-kit": "^3.22.3",
"@tiptap/vue-3": "^3.22.3",
"chart.js": "^4.5.1",
"pinia": "^3.0.4",
"reka-ui": "^2.9.3",

118
bo/src/components/admin/AddProduct.vue Normal file
View File

@@ -0,0 +1,118 @@
<template>
<div class="space-y-6">
<!-- Header bar -->
<div class="flex items-center justify-between flex-wrap gap-3">
<div class="flex items-center gap-3">
<UIcon name="i-lucide-arrow-left"
class="cursor-pointer text-(--text-sky-light) dark:text-(--text-sky-dark) text-xl"
@click="$router.back()" />
<h1 class="text-2xl font-bold text-black dark:text-white">
{{ isEditMode ? 'Edit Product' : 'Add Product' }}
</h1>
</div>
<div class="flex items-center gap-3">
<div class="flex items-center gap-2">
<span class="text-sm text-gray-500 dark:text-gray-400">Active</span>
<USwitch v-model="store.form.active" color="success" />
</div>
<UButton variant="outline" color="neutral" @click="handleCancel">Cancel</UButton>
<UButton color="info" :loading="store.saving" @click="handleSave">
<UIcon name="i-lucide-save" class="text-base" />
Save
</UButton>
</div>
</div>
<!-- Alerts -->
<UAlert v-if="store.error" color="error" variant="subtle" :title="store.error" icon="i-lucide-alert-circle" />
<UAlert v-if="store.successMessage" color="success" variant="subtle" :title="store.successMessage"
icon="i-lucide-check-circle" />
<!-- Tabs -->
<UTabs :items="tabs" color="info" :ui="{ root: 'gap-6' }">
<template #general>
<ProductTabGeneral />
</template>
<template #pricing>
<ProductTabPricing />
</template>
<template #quantities>
<ProductTabQuantities />
</template>
<template #shipping>
<ProductTabShipping />
</template>
<template #seo>
<ProductTabSeo />
</template>
<template #options>
<ProductTabOptions />
</template>
<template #variants>
<ProductTabVariants :is-edit-mode="isEditMode" />
</template>
</UTabs>
</div>
</template>
<script setup lang="ts">
import { onMounted, computed } from 'vue'
import { useRouter } from 'vue-router'
import { useAddProductStore } from '@/stores/admin/addProduct'
import ProductTabGeneral from './product/TabGeneral.vue'
import ProductTabPricing from './product/TabPricing.vue'
import ProductTabQuantities from './product/TabQuantities.vue'
import ProductTabShipping from './product/TabShipping.vue'
import ProductTabSeo from './product/TabSeo.vue'
import ProductTabOptions from './product/TabOptions.vue'
import ProductTabVariants from './product/TabVariants.vue'
const props = defineProps<{
productId?: number
}>()
const router = useRouter()
const store = useAddProductStore()
const isEditMode = computed(() => !!props.productId)
const tabs = computed(() => [
{ label: 'General', slot: 'general' },
{ label: 'Pricing', slot: 'pricing' },
{ label: 'Quantities', slot: 'quantities' },
{ label: 'Shipping', slot: 'shipping' },
{ label: 'SEO', slot: 'seo' },
{ label: 'Options', slot: 'options' },
...(isEditMode.value ? [{ label: 'Variants', slot: 'variants' }] : []),
])
onMounted(async () => {
store.resetForm()
if (isEditMode.value && props.productId) {
await store.loadProduct(props.productId)
await store.loadVariants(props.productId)
}
})
async function handleSave() {
if (!store.form.name.trim()) {
store.error = 'Product name is required.'
return
}
if (isEditMode.value && props.productId) {
await store.updateProduct(props.productId)
} else {
const newId = await store.createProduct()
if (newId) {
router.push({ name: 'admin-product-edit', params: { product_id: newId } })
}
}
}
function handleCancel() {
store.resetForm()
router.push({ name: 'admin-products' })
}
</script>

278
bo/src/components/admin/product/TabGeneral.vue Normal file
View File

@@ -0,0 +1,278 @@
<template>
<div class="space-y-5">
{{ addProductStore.form }}
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<UFormField label="Product name" name="productName">
<UInput v-model="addProductStore.form.product.name" placeholder="Enter product name" class="w-full" />
</UFormField>
<UFormField label="Reference (SKU)" name="productReference">
<UInput v-model="addProductStore.form.product.reference" placeholder="e.g. REF-001" class="w-full" />
</UFormField>
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<UFormField label="Podsumowanie">
<ProductEditor v-model="addProductStore.form.product.description_short" />
</UFormField>
<UFormField label="Description">
<ProductEditor v-model="addProductStore.form.product.description" />
</UFormField>
</div>
<fieldset
class="rounded-xl border border-(--border-light) dark:border-(--border-dark) p-4 space-y-3 bg-white dark:bg-neutral-900">
<legend class="px-1 block font-medium text-default text-[16px]">Images</legend>
{{ addProductStore.images }}
<div class="flex items-start gap-3 flex-wrap">
<div v-for="(img, idx) in addProductStore.images" :key="idx" class="relative group shrink-0">
<div class="relative w-36 h-36 rounded-xl overflow-hidden border-2 transition-colors" :class="img.cover
? 'border-sky-500'
: 'border-(--border-light) dark:border-(--border-dark)'">
<img :src="img.previewUrl" @error="onImgError"
class="w-full h-full object-contain bg-white dark:bg-neutral-900" />
<div v-if="img.uploading" class="absolute inset-0 flex items-center justify-center bg-black/50">
<UIcon name="svg-spinners:ring-resize" class="text-2xl text-white" />
</div>
<div v-else-if="img.error"
class="absolute bottom-0 left-0 right-0 bg-red-500/80 text-white text-[10px] px-1 py-0.5 text-center truncate">
{{ img.error }}
</div>
<div v-if="img.cover"
class="absolute top-1.5 left-1.5 bg-sky-500 text-white text-[10px] font-semibold px-1.5 py-0.5 rounded-full leading-none">
★ Cover
</div>
<div v-if="!img.uploading"
class="absolute inset-0 flex flex-col items-center justify-center gap-2 opacity-0 group-hover:opacity-100 transition-opacity bg-black/50">
<button v-if="!img.cover" type="button"
class="flex items-center gap-1 px-2 py-1 rounded-md bg-white/20 hover:bg-sky-500 text-white text-xs font-medium transition-colors"
@click.stop="addProductStore.setCover(idx)">
<UIcon name="i-lucide-star" class="text-sm" />
Set cover
</button>
<button type="button"
class="flex items-center gap-1 px-2 py-1 rounded-md bg-white/20 hover:bg-red-500 text-white text-xs font-medium transition-colors"
@click.stop="addProductStore.removeImage(idx)">
<UIcon name="i-lucide-trash-2" class="text-sm" />
Remove
</button>
</div>
</div>
</div>
<label
class="w-36 h-36 shrink-0 flex flex-col items-center justify-center gap-1 rounded-xl border-2 border-dashed border-(--border-light) dark:border-(--border-dark) cursor-pointer hover:border-sky-400 hover:text-sky-400 transition-colors text-gray-400"
@dragover.prevent @drop.prevent="onDrop">
<UIcon name="i-lucide-plus" class="text-2xl" />
<span class="text-xs">Add image</span>
<input type="file" accept="image/*" multiple class="hidden" @change="onFileChange" />
</label>
</div>
</fieldset>
<div class="space-y-2">
<p class="text-sm font-medium text-black dark:text-white">Powiązany produkt</p>
<UInput v-model="relatedSearch" placeholder="Search and add Powiązany produkt" icon="i-lucide-search"
class="w-full" />
<div v-if="addProductStore.relatedProducts.length > 0"
class="rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
<div v-for="p in addProductStore.relatedProducts" :key="p.id_product"
class="flex items-center justify-between px-3 py-2 text-sm text-black dark:text-white border-b border-(--border-light) dark:border-(--border-dark) last:border-0">
<span>{{ p.name }}</span>
<button type="button" @click="removeRelated(p.id_product)"
class="text-gray-400 hover:text-red-500 transition-colors ml-2">
<UIcon name="i-lucide-x" class="text-base" />
</button>
</div>
</div>
<USelect :items="relatedResults" value-key="product_id" />
<div v-if="relatedResults.length > 0"
class="rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden bg-white dark:bg-neutral-900">
<button v-for="p in relatedResults" :key="p.id_product" type="button"
class="w-full text-left px-3 py-2 text-sm text-black dark:text-white hover:bg-gray-50 dark:hover:bg-neutral-800 transition-colors border-b border-(--border-light) dark:border-(--border-dark) last:border-0"
@click="addRelated(p)">
{{ p.name }}
<span class="text-gray-400 ml-1">{{ p.reference }}</span>
</button>
</div>
</div>
<fieldset
class="rounded-xl border border-(--border-light) dark:border-(--border-dark) p-4 space-y-3 bg-white dark:bg-neutral-900">
<legend class="px-1 block font-medium text-default text-[16px]">Kategorie</legend>
<UInput v-model="categorySearch" placeholder="Search" class="w-52" icon="i-lucide-search" />
<div v-if="addProductStore.selectedCategories.length > 0"
class="rounded-lg border border-(--border-light) dark:border-(--border-dark) p-2 min-h-10 flex flex-wrap gap-2">
<span v-for="cat in addProductStore.selectedCategories" :key="cat.id_category"
class="inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-xs font-medium bg-sky-100 dark:bg-sky-900 text-sky-700 dark:text-sky-300">
{{ cat.name }}
<button type="button" @click="removeCategory(cat.id_category)"
class="text-sky-500 hover:text-sky-700 dark:hover:text-sky-200 leading-none ml-0.5">
<UIcon name="i-lucide-x" />
</button>
</span>
</div>
<div class="space-y-0.5 overflow-y-auto flex">
<UNavigationMenu orientation="vertical" type="multiple" :items="filteredCategories" :ui="{
root: 'w-auto'
}">
<template #item="{ item }">
<div
class="flex items-center gap-2.5 cursor-pointer rounded px-1.5 py-1 hover:bg-gray-50 dark:hover:bg-neutral-800 transition-colors"
@click.stop="toggleCategory({ id_category: item.params?.category_id, name: item.label as string })">
<UCheckbox :model-value="isCategorySelected(item.params?.category_id)"
color="info" />
<span class="text-sm text-black dark:text-white">{{ item.label }}</span>
</div>
</template>
</UNavigationMenu>
</div>
<UButton size="xs" variant="outline" color="neutral" icon="i-lucide-plus">
Add new category
</UButton>
</fieldset>
</div>
</template>
<script setup lang="ts">
import { ref, computed } from 'vue'
import { useAddProductStore } from '@/stores/admin/addProduct'
import type { ProductCategory, ProductRelated } from '@/types/product'
import errorImg from '@/assets/error.svg'
import { useFetchJson } from '@/composable/useFetchJson'
import { watch } from 'vue'
import type { NavigationMenuItem } from '@nuxt/ui'
const addProductStore = useAddProductStore()
const loading = ref(false)
function onImgError(e: Event) {
const target = e.target as HTMLImageElement
target.src = errorImg
}
function onFileChange(e: Event) {
const files = (e.target as HTMLInputElement).files
if (files && files.length > 0) addProductStore.addImageFiles(files)
; (e.target as HTMLInputElement).value = ''
}
function onDrop(e: DragEvent) {
const files = e.dataTransfer?.files
if (files && files.length > 0) addProductStore.addImageFiles(files)
}
// categories
const categorySearch = ref('')
const allCategories = computed(() => adaptCategory(addProductStore.categories))
function adaptCategory(menu: NavigationMenuItem[]) {
for (const item of menu) {
if (item.children && item.children.length > 0) {
item.open = true
adaptCategory(item.children);
item.children.unshift({
label: item.label,
icon: 'i-lucide-book-open',
params: item.params,
})
} else {
item.icon = 'i-lucide-file-text'
}
}
return menu;
}
//there have to be request on filter category (but have to return like parent => children =>)
const filteredCategories = computed(() => {
const q = categorySearch.value.trim().toLowerCase()
if (!q) return allCategories.value
return allCategories.value.filter(c => c.name.toLowerCase().includes(q))
})
function isCategorySelected(id: number) {
return addProductStore.selectedCategories.some(c => c.id_category === id)
}
function toggleCategory(cat: ProductCategory) {
console.log(cat);
if (isCategorySelected(cat.id_category)) {
removeCategory(cat.id_category)
} else {
addProductStore.selectedCategories.push(cat)
}
}
function removeCategory(id: number) {
const idx = addProductStore.selectedCategories.findIndex(c => c.id_category === id)
if (idx !== -1) addProductStore.selectedCategories.splice(idx, 1)
}
// related products
const relatedSearch = ref('')
const relatedResults = ref<ProductRelated[]>([])
let searchTimer: ReturnType<typeof setTimeout> | null = null
watch(relatedSearch, (q) => {
if (searchTimer) clearTimeout(searchTimer)
if (!q.trim()) { relatedResults.value = []; return }
searchTimer = setTimeout(async () => {
await fetchProducts(q)
}, 1000)
})
function addRelated(product: ProductRelated) {
if (!addProductStore.relatedProducts.some(p => p.id_product === product.id_product)) {
addProductStore.relatedProducts.push(product)
}
relatedSearch.value = ''
relatedResults.value = []
}
function removeRelated(id: number) {
const idx = addProductStore.relatedProducts.findIndex(p => p.id_product === id)
if (idx !== -1) addProductStore.relatedProducts.splice(idx, 1)
}
const products = ref()
async function fetchProducts(q: string) {
if (!q.trim()) {
products.value = []
return
}
loading.value = true
relatedResults.value = []
try {
const query = `name=~${q.trim()}`
const result = await useFetchJson(
`/api/v1/restricted/product/list?${query}`
)
relatedResults.value = (result.items ?? result) as ProductRelated[]
} catch (e) {
console.log(e);
} finally {
loading.value = false
}
}
await addProductStore.loadCategories()
</script>

47
bo/src/components/admin/product/TabOptions.vue Normal file
View File

@@ -0,0 +1,47 @@
<template>
<div class="card-section space-y-6">
<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
<UFormField label="Visibility">
<USelect v-model="store.form.visibility" :options="visibilityOptions" value-key="value"
label-key="label" class="w-full" />
</UFormField>
<UFormField label="Condition">
<USelect v-model="store.form.condition" :options="conditionOptions" value-key="value"
label-key="label" class="w-full" />
</UFormField>
<UFormField label="EAN-13 / JAN barcode">
<UInput v-model="store.form.ean13" placeholder="4006381333931" :maxlength="13" class="w-full" />
</UFormField>
<UFormField label="UPC barcode">
<UInput v-model="store.form.upc" placeholder="012345678905" :maxlength="12" class="w-full" />
</UFormField>
<UFormField label="ISBN">
<UInput v-model="store.form.isbn" placeholder="978-3-16-148410-0" :maxlength="32"
class="w-full" />
</UFormField>
</div>
</div>
</template>
<script setup lang="ts">
import { useAddProductStore } from '@/stores/admin/addProduct'
const store = useAddProductStore()
const visibilityOptions = [
{ value: 'both', label: 'Everywhere (catalog & search)' },
{ value: 'catalog', label: 'Catalog only' },
{ value: 'search', label: 'Search only' },
{ value: 'none', label: 'Hidden' },
]
const conditionOptions = [
{ value: 'new', label: 'New' },
{ value: 'used', label: 'Used' },
{ value: 'refurbished', label: 'Refurbished' },
]
</script>

26
bo/src/components/admin/product/TabPricing.vue Normal file
View File

@@ -0,0 +1,26 @@
<template>
<div class="card-section space-y-6">
<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
<UFormField label="Price (net)">
<UInputNumber v-model="store.form.price" :min="0" :step="0.01"
:format-options="{ minimumFractionDigits: 2 }" class="w-full" />
</UFormField>
<UFormField label="Wholesale price (net)">
<UInputNumber v-model="store.form.wholesale_price" :min="0" :step="0.01"
:format-options="{ minimumFractionDigits: 2 }" class="w-full" />
</UFormField>
</div>
<div class="flex items-center gap-3">
<USwitch v-model="store.form.on_sale" color="warning" />
<span class="text-sm text-black dark:text-white">Show "On Sale" badge on this product</span>
</div>
</div>
</template>
<script setup lang="ts">
import { useAddProductStore } from '@/stores/admin/addProduct'
const store = useAddProductStore()
</script>

30
bo/src/components/admin/product/TabQuantities.vue Normal file
View File

@@ -0,0 +1,30 @@
<template>
<div class="card-section space-y-6">
<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
<UFormField label="Stock quantity">
<UInputNumber v-model="store.form.quantity" :min="0" class="w-full" />
</UFormField>
<UFormField label="Minimum order quantity">
<UInputNumber v-model="store.form.minimal_quantity" :min="1" class="w-full" />
</UFormField>
</div>
<UFormField label="When out of stock">
<USelect v-model="store.form.out_of_stock" :options="outOfStockOptions" value-key="value"
label-key="label" class="w-72" />
</UFormField>
</div>
</template>
<script setup lang="ts">
import { useAddProductStore } from '@/stores/admin/addProduct'
const store = useAddProductStore()
const outOfStockOptions = [
{ value: 0, label: 'Deny orders' },
{ value: 1, label: 'Allow orders' },
{ value: 2, label: 'Use shop default' },
]
</script>

31
bo/src/components/admin/product/TabSeo.vue Normal file
View File

@@ -0,0 +1,31 @@
<template>
<div class="card-section space-y-6">
<p class="text-sm text-gray-400">
Leave blank to automatically use the product name. Helps search engines find your product.
</p>
<UFormField label="Meta title" hint="Recommended: max 70 characters">
<UInput v-model="store.form.meta_title" placeholder="Leave blank to use product name"
:maxlength="128" class="w-full" />
</UFormField>
<UFormField label="Meta description" hint="Recommended: max 160 characters">
<UTextarea v-model="store.form.meta_description"
placeholder="Brief description shown in search results" :rows="3" :maxlength="512"
class="w-full" />
</UFormField>
<UFormField label="URL slug">
<UInput v-model="store.form.link_rewrite" placeholder="auto-generated-from-name" class="w-full" />
<template #hint>
<span class="text-xs text-gray-400">Lowercase letters, numbers and hyphens only.</span>
</template>
</UFormField>
</div>
</template>
<script setup lang="ts">
import { useAddProductStore } from '@/stores/admin/addProduct'
const store = useAddProductStore()
</script>

32
bo/src/components/admin/product/TabShipping.vue Normal file
View File

@@ -0,0 +1,32 @@
<template>
<div class="card-section space-y-6">
<p class="text-sm text-gray-400">
Package dimensions are used to calculate shipping costs.
</p>
<div class="grid grid-cols-2 md:grid-cols-4 gap-5">
<UFormField label="Width (cm)">
<UInputNumber v-model="store.form.width" :min="0" :step="0.01" class="w-full" />
</UFormField>
<UFormField label="Height (cm)">
<UInputNumber v-model="store.form.height" :min="0" :step="0.01" class="w-full" />
</UFormField>
<UFormField label="Depth (cm)">
<UInputNumber v-model="store.form.depth" :min="0" :step="0.01" class="w-full" />
</UFormField>
<UFormField label="Weight (kg)">
<UInputNumber v-model="store.form.weight" :min="0" :step="0.001" class="w-full" />
</UFormField>
</div>
<UFormField label="Delivery days" hint="Days to ship from local warehouse to customer">
<UInputNumber v-model="store.form.delivery_days" :min="0" class="w-40" />
</UFormField>
</div>
</template>
<script setup lang="ts">
import { useAddProductStore } from '@/stores/admin/addProduct'
const store = useAddProductStore()
</script>

120
bo/src/components/admin/product/TabVariants.vue Normal file
View File

@@ -0,0 +1,120 @@
<template>
<div class="card-section space-y-4">
<div v-if="store.loading" class="flex justify-center py-10">
<UIcon name="svg-spinners:ring-resize" class="text-3xl text-primary" />
</div>
<div v-else-if="store.variants.length === 0" class="flex flex-col items-center gap-3 py-10 text-gray-400">
<UIcon name="i-lucide-layers" class="text-4xl" />
<p class="text-sm text-center">
{{ isEditMode ? 'No variants found for this product.' : 'Save the product first, then variants will appear here.' }}
</p>
</div>
<template v-else>
<p class="text-sm text-gray-400">
Each variant is a combination of attributes (e.g. Color: Red / Size: M).
Edit price offset, stock and other details per variant independently.
</p>
<div v-for="variant in store.variants" :key="variant.id_product_attribute"
class="border border-(--border-light) dark:border-(--border-dark) rounded-xl p-4 space-y-4">
<!-- Variant header -->
<div class="flex items-center justify-between flex-wrap gap-2">
<div class="flex items-center gap-2">
<span class="font-semibold text-black dark:text-white text-sm">
{{ variant.attribute_label || `Variant #${variant.id_product_attribute}` }}
</span>
<UBadge v-if="variant.default_on" color="success" variant="subtle" size="sm">
Default
</UBadge>
</div>
<UButton size="sm" color="info"
:loading="!!store.variantSaving[variant.id_product_attribute!]"
@click="handleSaveVariant(variant)">
Save variant
</UButton>
</div>
<UAlert v-if="store.variantErrors[variant.id_product_attribute!]" color="error"
variant="subtle" :title="store.variantErrors[variant.id_product_attribute!]" />
<!-- Variant fields -->
<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
<UFormField label="Reference">
<UInput v-model="variant.reference" placeholder="REF-001-A" class="w-full" />
</UFormField>
<UFormField label="EAN-13">
<UInput v-model="variant.ean13" placeholder="4006381333931" :maxlength="13"
class="w-full" />
</UFormField>
<UFormField label="Price offset">
<UInputNumber v-model="variant.price" :step="0.01"
:format-options="{ minimumFractionDigits: 2 }" class="w-full" />
</UFormField>
<UFormField label="Wholesale price">
<UInputNumber v-model="variant.wholesale_price" :min="0" :step="0.01"
:format-options="{ minimumFractionDigits: 2 }" class="w-full" />
</UFormField>
<UFormField label="Stock quantity">
<UInputNumber v-model="variant.quantity" :min="0" class="w-full" />
</UFormField>
<UFormField label="Min. quantity">
<UInputNumber v-model="variant.minimal_quantity" :min="1" class="w-full" />
</UFormField>
<UFormField label="Weight offset (kg)">
<UInputNumber v-model="variant.weight" :step="0.001" class="w-full" />
</UFormField>
<UFormField label="">
<div class="flex items-center gap-2 pt-6">
<USwitch v-model="variant.default_on" color="success"
@update:model-value="onSetDefault(variant)" />
<span class="text-sm text-black dark:text-white">Set as default</span>
</div>
</UFormField>
</div>
</div>
</template>
</div>
</template>
<script setup lang="ts">
import { useAddProductStore } from '@/stores/admin/addProduct'
import type { ProductVariantForm } from '@/types/product'
const props = defineProps<{ isEditMode: boolean }>()
const store = useAddProductStore()
async function handleSaveVariant(variant: ProductVariantForm) {
if (!variant.id_product_attribute) return
await store.saveVariant(variant.id_product_attribute, {
reference: variant.reference,
ean13: variant.ean13,
price: variant.price,
wholesale_price: variant.wholesale_price,
quantity: variant.quantity,
minimal_quantity: variant.minimal_quantity,
weight: variant.weight,
default_on: variant.default_on,
})
}
function onSetDefault(selected: ProductVariantForm) {
if (!selected.default_on) return
store.variants.forEach(v => {
if (v.id_product_attribute !== selected.id_product_attribute) v.default_on = false
})
}
</script>

2
bo/src/components/customer/PageSearchProducts.vue
View File

@@ -54,7 +54,7 @@ async function fetchProducts() {
const query = `name=~${searchQuery.value.trim()}`
const result = await useFetchJson(
`/api/v1/restricted/list-products/get-listing?${query}`
`/api/v1/restricted/product/list?${query}`
)
products.value = result.items || result

99
bo/src/components/ui/RichEditor.vue Normal file
View File

@@ -0,0 +1,99 @@
<template>
<div class="rich-editor rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden focus-within:ring-1 focus-within:ring-sky-500 focus-within:border-sky-500 transition-colors">
<!-- Toolbar -->
<div class="flex items-center gap-0.5 px-2 py-1.5 border-b border-(--border-light) dark:border-(--border-dark) bg-gray-50 dark:bg-neutral-800 flex-wrap">
<button type="button" @click="editor?.chain().focus().toggleBold().run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('bold') }"
class="toolbar-btn font-bold">B</button>
<button type="button" @click="editor?.chain().focus().toggleItalic().run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('italic') }"
class="toolbar-btn italic">I</button>
<button type="button" @click="editor?.chain().focus().toggleStrike().run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('strike') }"
class="toolbar-btn line-through">S</button>
<div class="w-px h-4 bg-gray-300 dark:bg-neutral-600 mx-1" />
<button type="button" @click="editor?.chain().focus().toggleHeading({ level: 2 }).run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('heading', { level: 2 }) }"
class="toolbar-btn text-xs font-semibold">H2</button>
<button type="button" @click="editor?.chain().focus().toggleHeading({ level: 3 }).run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('heading', { level: 3 }) }"
class="toolbar-btn text-xs font-semibold">H3</button>
<div class="w-px h-4 bg-gray-300 dark:bg-neutral-600 mx-1" />
<button type="button" @click="editor?.chain().focus().toggleBulletList().run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('bulletList') }"
class="toolbar-btn">
<UIcon name="i-lucide-list" class="text-sm" />
</button>
<button type="button" @click="editor?.chain().focus().toggleOrderedList().run()"
:class="{ 'bg-sky-100 dark:bg-sky-900 text-sky-600 dark:text-sky-300': editor?.isActive('orderedList') }"
class="toolbar-btn">
<UIcon name="i-lucide-list-ordered" class="text-sm" />
</button>
<div class="w-px h-4 bg-gray-300 dark:bg-neutral-600 mx-1" />
<button type="button" @click="editor?.chain().focus().undo().run()" class="toolbar-btn">
<UIcon name="i-lucide-undo-2" class="text-sm" />
</button>
<button type="button" @click="editor?.chain().focus().redo().run()" class="toolbar-btn">
<UIcon name="i-lucide-redo-2" class="text-sm" />
</button>
</div>
<!-- Editor area -->
<EditorContent :editor="editor"
class="min-h-32 px-3 py-2.5 text-sm text-black dark:text-white bg-white dark:bg-neutral-900 prose prose-sm dark:prose-invert max-w-none focus:outline-none" />
</div>
</template>
<script setup lang="ts">
import { watch, onBeforeUnmount } from 'vue'
import { useEditor, EditorContent } from '@tiptap/vue-3'
import StarterKit from '@tiptap/starter-kit'
import Placeholder from '@tiptap/extension-placeholder'
const props = defineProps<{
modelValue: string
placeholder?: string
}>()
const emit = defineEmits<{
'update:modelValue': [value: string]
}>()
const editor = useEditor({
content: props.modelValue,
extensions: [
StarterKit,
Placeholder.configure({ placeholder: props.placeholder ?? '' }),
],
editorProps: {
attributes: { class: 'focus:outline-none' },
},
onUpdate({ editor }) {
emit('update:modelValue', editor.getHTML())
},
})
// Sync external changes (e.g. store reset)
watch(() => props.modelValue, (val) => {
if (editor.value && editor.value.getHTML() !== val) {
editor.value.commands.setContent(val, false)
}
})
onBeforeUnmount(() => editor.value?.destroy())
</script>
<style>
/* .toolbar-btn {
@apply flex items-center justify-center w-7 h-7 rounded text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-neutral-700 transition-colors text-sm;
} */
/* Tiptap placeholder */
.tiptap p.is-editor-empty:first-child::before {
content: attr(data-placeholder);
float: left;
/* color: theme('colors.gray.400'); */
pointer-events: none;
height: 0;
}
</style>

2
bo/src/router/menu.ts
View File

@@ -6,7 +6,7 @@ import { settings } from "./settings";
const categoryId = ref()
export const getMenu = async () => {
if(!categoryId.value){
if (!categoryId.value) {
categoryId.value = settings['app'].category_tree_root_id
}
const resp = await useFetchJson<MenuItem>(`/api/v1/restricted/menu/get-category-tree?root_category_id=${categoryId.value}`);

164
bo/src/stores/admin/addProduct.ts Normal file
View File

@@ -0,0 +1,164 @@
import { defineStore } from 'pinia'
import { ref, reactive } from 'vue'
import { useFetchJson } from '@/composable/useFetchJson'
import type {
ProductCategory,
ProductRelated,
ProductForm,
ProductFormProduct,
ProductFormPrice,
ProductFormVariant,
ProductVariantForm,
ProductImage,
} from '@/types/product'
import type { MenuItem } from '@/types'
import { settings } from '@/router/settings'
// ── Default values ────────────────────────────────────────────────────────────
function emptyForm(): ProductForm {
return {
product: {
reference: '',
base_price: 0,
quantity: 0,
minimal_quantity: 1,
available_for_order: true,
available_date: '',
out_of_stock_behavior: 2,
on_sale: false,
show_price: true,
condition: 'new',
is_virtual: false,
weight: 0,
width: 0,
height: 0,
depth: 0,
delivery_days: null,
active: true,
visibility: 'both',
indexed: true,
date_add: '',
date_upd: '',
name: '',
description: '',
description_short: '',
manufacturer: '',
category: '',
is_favorite: false,
is_oem: false,
is_new: false,
},
price: {
base: 0,
final_tax_excl: 0,
final_tax_incl: 0,
tax_rate: 0,
priority: 0,
},
variants: [],
}
}
// ── Store ─────────────────────────────────────────────────────────────────────
export const useAddProductStore = defineStore('addProduct', () => {
const loading = ref(false)
const saving = ref(false)
const error = ref<string | null>(null)
const successMessage = ref<string | null>(null)
// Form data for creating / editing a product
const form = reactive<ProductForm>(emptyForm())
// Variants loaded when editing an existing product
const variants = ref<ProductVariantForm[]>([])
const variantSaving = ref<Record<number, boolean>>({})
const variantErrors = ref<Record<number, string>>({})
// Images
const images = ref<ProductImage[]>([])
// Categories & related products
const selectedCategories = ref<ProductCategory[]>([])
const relatedProducts = ref<ProductRelated[]>([])
// ── Product ─────────────────────────────────────────────────────────
async function loadProduct(productId: number) {
loading.value = true
error.value = null
try {
// const resp = await useFetchJson<ProductForm>(`/api/v1/restricted/admin/product/${productId}`)
// Object.assign(form, resp.items)
console.log('[addProduct] loadProduct – API not connected yet', productId)
} catch (e: unknown) {
error.value = e instanceof Error ? e.message : 'Failed to load product'
} finally {
loading.value = false
}
}
// ── Images ────────────────────────────────────────────────────────────────
function addImageFiles(files: FileList | File[]) {
const incoming = Array.from(files)
for (const file of incoming) {
const previewUrl = URL.createObjectURL(file)
images.value.push({ previewUrl, file, cover: false, uploading: false })
}
if (!images.value.some(i => i.cover) && images.value.length > 0) {
images.value[0]!.cover = true
}
}
function removeImage(index: number) {
const img = images.value[index]!
if (img.previewUrl.startsWith('blob:')) URL.revokeObjectURL(img.previewUrl)
const wasCover = img.cover
images.value.splice(index, 1)
if (wasCover && images.value.length > 0) {
images.value[0]!.cover = true
}
}
function setCover(index: number) {
images.value.forEach((img, i) => { img.cover = i === index })
}
function resetForm() {
Object.assign(form, emptyForm())
variants.value = []
images.value = []
selectedCategories.value = []
relatedProducts.value = []
error.value = null
successMessage.value = null
}
const categories = ref<MenuItem[]>([])
async function loadCategories() {
const resp = await useFetchJson<MenuItem>(`/api/v1/restricted/menu/get-category-tree?root_category_id=${settings['app'].category_tree_root_id}`);
categories.value = resp.items.children
}
return {
loading,
saving,
error,
successMessage,
form,
images,
selectedCategories,
relatedProducts,
variants,
variantSaving,
variantErrors,
categories,
loadProduct,
addImageFiles,
removeImage,
setCover,
resetForm,
loadCategories
}
})

90
bo/src/types/product.d.ts vendored
View File

@@ -18,3 +18,93 @@ export interface Product {
image_link: string
link_rewrite: string
}
export interface ProductCategory {
id_category: number
name: string
}
export interface ProductRelated {
id_product: number
name: string
reference: string
}
export interface ProductFormProduct {
id?: number
reference: string
base_price: number
quantity: number
minimal_quantity: number
available_for_order: boolean
available_date: string
out_of_stock_behavior: number // 0=deny, 1=allow, 2=default
on_sale: boolean
show_price: boolean
condition: 'new' | 'used' | 'refurbished'
is_virtual: boolean
weight: number
width: number
height: number
depth: number
delivery_days: number | null
active: boolean
visibility: 'both' | 'catalog' | 'search' | 'none'
indexed: boolean
date_add: string
date_upd: string
name: string
description: string
description_short: string
manufacturer: string
category: string
is_favorite: boolean
is_oem: boolean
is_new: boolean
}
export interface ProductFormPrice {
base: number
final_tax_excl: number
final_tax_incl: number
tax_rate: number
priority: number
}
export interface ProductFormVariantAttribute {
group: string
attribute: string
}
export interface ProductFormVariant {
id_product_attribute: number
reference: string
base_price: number
price_tax_excl: number
price_tax_incl: number
quantity: number
attributes: ProductFormVariantAttribute[]
}
export type ProductVariantForm = ProductFormVariant
export interface ProductForm {
product: ProductFormProduct
price: ProductFormPrice
variants: ProductFormVariant[]
}
export interface ProductImage {
/** Temporary local URL for preview before upload */
previewUrl: string
/** File object – present only before upload */
file?: File
/** Server-side image id after upload */
id_image?: number
/** Whether this is the cover image */
cover: boolean
/** Upload in progress */
uploading?: boolean
/** Upload error */
error?: string
}

2
bruno/api_v1/Delete Index - MeiliSearch.yml
View File

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

19
bruno/api_v1/cart/Add new cart.yml Normal file
View File

@@ -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

31
bruno/api_v1/cart/Add product to cart.yml Normal file
View File

@@ -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

22
bruno/api_v1/cart/Change cart name.yml Normal file
View File

@@ -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

19
bruno/api_v1/cart/Remove cart.yml Normal file
View File

@@ -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

25
bruno/api_v1/cart/Remove product from cart.yml Normal file
View File

@@ -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

19
bruno/api_v1/cart/Retrieve cart.yml Normal file
View File

@@ -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

15
bruno/api_v1/cart/Retrieve carts info.yml Normal file
View File

@@ -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

7
bruno/api_v1/cart/folder.yml Normal file
View File

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

2
bruno/api_v1/currency/folder.yml
View File

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

2
bruno/api_v1/customer/folder.yml
View File

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

22
bruno/api_v1/menu/Breadcrumb.yml Normal file
View File

@@ -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

19
bruno/api_v1/menu/Category tree.yml Normal file
View File

@@ -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

15
bruno/api_v1/menu/Top Customer Management Menu.yml Normal file
View File

@@ -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

15
bruno/api_v1/menu/Top Menu.yml Normal file
View File

@@ -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

7
bruno/api_v1/menu/folder.yml Normal file
View File

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

33
bruno/api_v1/order/Change order address.yml Normal file
View File

@@ -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

22
bruno/api_v1/order/Change order status.yml Normal file
View File

@@ -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

25
bruno/api_v1/order/List.yml Normal file
View File

@@ -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

37
bruno/api_v1/order/Place new order.yml Normal file
View File

@@ -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

7
bruno/api_v1/order/folder.yml Normal file
View File

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

2
bruno/api_v1/product/folder.yml
View File

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

2
bruno/api_v1/routes/folder.yml
View File

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

21
i18n/migrations/20260302163100_routes.sql
View File

@@ -56,7 +56,8 @@ INSERT IGNORE INTO `b2b_routes` (`id`, `name`, `path`, `component`, `meta`, `act
', 1),
(17, 'customer-management-profile', ':user_id/profile', '/components/customer-management/Profile.vue', '{
"guest":true,
"name": "Profile"
"name": "Profile",
"layout": "management"
}
', 1),
(18, 'admin-users-search', 'users-search', '/components/admin/UsersSearch.vue', '{
@@ -334,9 +335,27 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
}
}', 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);
-- +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`;

24
i18n/migrations/20260302163122_create_tables.sql
View File

@@ -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;

24
i18n/migrations/20260302163123_create_tables_data.sql
View File

@@ -12,6 +12,27 @@ 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 (4, '1');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (5, '1');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (6, '1');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (10, '1');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (15, '1');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (16, '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 (2, '2');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (12, '2');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (13, '2');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (14, '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 (2, '3');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (12, '3');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (13, '3');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (14, '3');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (17, '1');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (18, '2');
INSERT INTO `b2b_top_menu_roles` (`top_menu_id`, `role_id`) VALUES (18, '3');
-- 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)
VALUES
@@ -108,7 +129,8 @@ INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
(15, '3'),
(16, '2'),
(16, '3'),
(17, '1'),
(17, '2'),
(17, '3'),
(18, '2'),
(18, '3'),
(19, '1'),