Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers
This commit is contained in:
@@ -42,6 +42,11 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
|
||||
(3, JSON_COMPACT('{"name":"admin-products","trans":{"pl":{"label":"admin-products"},"en":{"label":"admin-products"},"de":{"label":"admin-products"}}}'),1,JSON_COMPACT('{}'),1,1),
|
||||
(9, JSON_COMPACT('{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}'),3,JSON_COMPACT('{"route": {"name": "home", "params":{"locale": ""}}}'),1,1);
|
||||
|
||||
CREATE TABLE `b2b_route_roles` (
|
||||
`route_id` INT NOT NULL,
|
||||
`role_id` BIGINT UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (`id`, `role_id`)
|
||||
);
|
||||
|
||||
|
||||
-- +goose Down
|
||||
|
||||
@@ -339,6 +339,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)
|
||||
@@ -439,6 +457,7 @@ 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;
|
||||
|
||||
@@ -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
|
||||
@@ -58,4 +59,32 @@ 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_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