Merge remote-tracking branch 'origin/main' into front-styles
This commit is contained in:
@@ -141,7 +141,6 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
|
||||
(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;
|
||||
|
||||
@@ -130,7 +130,7 @@ FOREIGN KEY (role_id) REFERENCES b2b_roles(id);
|
||||
|
||||
-- customer_carts
|
||||
CREATE TABLE IF NOT EXISTS b2b_customer_carts (
|
||||
cart_id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
cart_id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
user_id BIGINT UNSIGNED NOT NULL,
|
||||
name VARCHAR(255) NULL,
|
||||
CONSTRAINT fk_customer_carts_customers FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE CASCADE ON UPDATE CASCADE
|
||||
@@ -140,8 +140,8 @@ CREATE INDEX IF NOT EXISTS idx_customer_carts_user_id ON b2b_customer_carts (use
|
||||
|
||||
-- carts_products
|
||||
CREATE TABLE IF NOT EXISTS b2b_carts_products (
|
||||
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
cart_id INT UNSIGNED NOT NULL,
|
||||
id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
cart_id BIGINT UNSIGNED NOT NULL,
|
||||
product_id INT UNSIGNED NOT NULL,
|
||||
product_attribute_id INT NULL,
|
||||
amount INT UNSIGNED NOT NULL,
|
||||
@@ -224,7 +224,7 @@ ON `b2b_countries` (
|
||||
CREATE TABLE IF NOT EXISTS b2b_addresses (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL,
|
||||
b2b_customer_id BIGINT UNSIGNED NOT NULL,
|
||||
address_info TEXT NOT NULL,
|
||||
address_string TEXT NOT NULL,
|
||||
b2b_country_id BIGINT UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
CONSTRAINT fk_b2b_addresses_b2b_customers FOREIGN KEY (b2b_customer_id) REFERENCES b2b_customers (id) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||
@@ -232,6 +232,34 @@ CREATE TABLE IF NOT EXISTS b2b_addresses (
|
||||
) ENGINE = InnoDB;
|
||||
|
||||
|
||||
-- customer_orders
|
||||
CREATE TABLE IF NOT EXISTS b2b_customer_orders (
|
||||
order_id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
user_id BIGINT UNSIGNED NOT NULL,
|
||||
name TEXT NOT NULL,
|
||||
country_id BIGINT UNSIGNED NOT NULL,
|
||||
address_string TEXT NOT NULL,
|
||||
status VARCHAR(50) NOT NULL,
|
||||
CONSTRAINT fk_customer_orders_customers FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE NO ACTION ON UPDATE CASCADE,
|
||||
CONSTRAINT fk_customer_orders_countries FOREIGN KEY (country_id) REFERENCES b2b_countries(id) ON DELETE NO ACTION ON UPDATE CASCADE
|
||||
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
|
||||
CREATE INDEX idx_customer_orders_user_id ON b2b_customer_orders (user_id);
|
||||
CREATE INDEX idx_customer_orders_country_id ON b2b_customer_orders (country_id);
|
||||
|
||||
|
||||
-- orders_products
|
||||
CREATE TABLE IF NOT EXISTS b2b_orders_products (
|
||||
id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
order_id BIGINT UNSIGNED NOT NULL,
|
||||
product_id INT UNSIGNED NOT NULL,
|
||||
product_attribute_id INT NULL,
|
||||
amount INT UNSIGNED NOT NULL,
|
||||
CONSTRAINT fk_orders_products_customer_orders FOREIGN KEY (order_id) REFERENCES b2b_customer_orders (order_id) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||
CONSTRAINT fk_orders_products_product FOREIGN KEY (product_id) REFERENCES ps_product (id_product) ON DELETE CASCADE ON UPDATE CASCADE
|
||||
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
|
||||
CREATE INDEX IF NOT EXISTS idx_orders_products_order_id ON b2b_orders_products (order_id);
|
||||
|
||||
|
||||
CREATE TABLE b2b_specific_price (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
name VARCHAR(255) NOT NULL,
|
||||
@@ -310,6 +338,24 @@ ON b2b_specific_price_customer (b2b_id_customer);
|
||||
CREATE INDEX idx_bsp_country_rel
|
||||
ON b2b_specific_price_country (b2b_id_country);
|
||||
|
||||
CREATE TABLE b2b_route_roles (
|
||||
route_id INT NOT NULL,
|
||||
role_id BIGINT UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (route_id, role_id),
|
||||
INDEX idx_role_id (role_id),
|
||||
INDEX idx_route_id (route_id),
|
||||
CONSTRAINT FK_b2b_route_roles_route_id
|
||||
FOREIGN KEY (route_id)
|
||||
REFERENCES b2b_routes (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE CASCADE,
|
||||
CONSTRAINT FK_b2b_route_roles_role_id
|
||||
FOREIGN KEY (role_id)
|
||||
REFERENCES b2b_roles (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE CASCADE
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
DELIMITER //
|
||||
|
||||
CREATE FUNCTION IF NOT EXISTS slugify_eu(input TEXT)
|
||||
@@ -402,16 +448,27 @@ DELIMITER ;
|
||||
|
||||
-- +goose Down
|
||||
|
||||
DROP TABLE IF EXISTS b2b_countries;
|
||||
DROP TABLE IF EXISTS b2b_language;
|
||||
DROP TABLE IF EXISTS b2b_components;
|
||||
DROP TABLE IF EXISTS b2b_scopes;
|
||||
DROP TABLE IF EXISTS b2b_translations;
|
||||
DROP TABLE IF EXISTS b2b_customers;
|
||||
DROP TABLE IF EXISTS b2b_refresh_tokens;
|
||||
DROP TABLE IF EXISTS b2b_currencies;
|
||||
DROP TABLE IF EXISTS b2b_currency_rates;
|
||||
DROP TABLE IF EXISTS b2b_specific_price;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_product;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_category;
|
||||
DROP TABLE IF EXISTS b2b_addresses;
|
||||
DROP TABLE IF EXISTS b2b_top_menu_roles;
|
||||
DROP TABLE IF EXISTS b2b_favorites;
|
||||
DROP TABLE IF EXISTS b2b_carts_products;
|
||||
DROP TABLE IF EXISTS b2b_customer_carts;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_country;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_customer;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_product_attribute;
|
||||
DROP TABLE IF EXISTS b2b_route_roles;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_category;
|
||||
DROP TABLE IF EXISTS b2b_specific_price_product;
|
||||
DROP TABLE IF EXISTS b2b_specific_price;
|
||||
DROP TABLE IF EXISTS b2b_role_permissions;
|
||||
DROP TABLE IF EXISTS b2b_permissions;
|
||||
DROP TABLE IF EXISTS b2b_roles;
|
||||
DROP TABLE IF EXISTS b2b_countries;
|
||||
DROP TABLE IF EXISTS b2b_currency_rates;
|
||||
DROP TABLE IF EXISTS b2b_currencies;
|
||||
DROP TABLE IF EXISTS b2b_refresh_tokens;
|
||||
DROP TABLE IF EXISTS b2b_customers;
|
||||
DROP TABLE IF EXISTS b2b_translations;
|
||||
DROP TABLE IF EXISTS b2b_scopes;
|
||||
DROP TABLE IF EXISTS b2b_components;
|
||||
DROP TABLE IF EXISTS b2b_language;
|
||||
|
||||
@@ -10,6 +10,7 @@ VALUES
|
||||
INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('user','1');
|
||||
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 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)
|
||||
@@ -34,15 +35,64 @@ INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('2', 'user.write.any');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('3', 'user.delete.any');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('4', 'currency.write');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('5', 'specific_price.manage');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('6', 'webdav.create_token');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('7', 'product_translation.save');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('8', 'product_translation.translate');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('9', 'search.create_index');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('10', 'orders.view_all');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('11', 'orders.modify_all');
|
||||
INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('12', 'teleport');
|
||||
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '1');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '2');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '3');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '4');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '5');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '6');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '7');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '8');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '9');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '10');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '11');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '12');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '1');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '2');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '3');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '4');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '5');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '6');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '7');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '8');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '9');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '10');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '11');
|
||||
INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '12');
|
||||
|
||||
INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
|
||||
(1, '1'),
|
||||
(1, '2'),
|
||||
(1, '3'),
|
||||
(2, '1'),
|
||||
(2, '2'),
|
||||
(2, '3'),
|
||||
(3, '1'),
|
||||
(3, '2'),
|
||||
(3, '3'),
|
||||
(3, '4'),
|
||||
(4, '1'),
|
||||
(4, '2'),
|
||||
(4, '3'),
|
||||
(4, '4'),
|
||||
(5, '1'),
|
||||
(5, '2'),
|
||||
(5, '3'),
|
||||
(5, '4'),
|
||||
(6, '1'),
|
||||
(6, '2'),
|
||||
(6, '3'),
|
||||
(6, '4'),
|
||||
(7, '1'),
|
||||
(7, '2'),
|
||||
(7, '3'),
|
||||
(7, '4');
|
||||
-- +goose Down
|
||||
@@ -319,7 +319,8 @@ DROP PROCEDURE IF EXISTS get_product_base //
|
||||
CREATE PROCEDURE get_product_base(
|
||||
IN p_id_product INT,
|
||||
IN p_id_shop INT,
|
||||
IN p_id_lang INT
|
||||
IN p_id_lang INT,
|
||||
IN p_id_customer INT
|
||||
)
|
||||
BEGIN
|
||||
SELECT
|
||||
@@ -376,14 +377,12 @@ BEGIN
|
||||
|
||||
-- Relations
|
||||
m.name AS manufacturer,
|
||||
cl.name AS category
|
||||
cl.name AS category,
|
||||
|
||||
-- This doesn't fit to base product, I'll add proper is_favorite to product later
|
||||
|
||||
-- EXISTS(
|
||||
-- SELECT 1 FROM b2b_favorites f
|
||||
-- WHERE f.user_id = p_id_customer AND f.product_id = p_id_product
|
||||
-- ) AS is_favorite
|
||||
EXISTS(
|
||||
SELECT 1 FROM b2b_favorites f
|
||||
WHERE f.user_id = p_id_customer AND f.product_id = p_id_product
|
||||
) AS is_favorite
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user