Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (33 commits) permissions finish contact process create contact form create example for mail usage permission cleanup change place where absolute url is create when rewritten url is enabled fix issue #43 fix typo in product breadcrumb update countries list fix issue #35 fix cartItem updateQuantity method add some verification on country default trigger not allowed to delete default country WIP : admin profiles fiw test suite clear cache when a module is removed end module removal create event object for module delete action update insert script new model ... Conflicts: core/lib/Thelia/Controller/Admin/CouponController.php
This commit is contained in:
gmorel
@@ -19,7 +19,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
|
||||
('image_cache_dir_from_web_root', 'cache/images', 0, 0, NOW(), NOW()),
|
||||
('document_cache_dir_from_web_root', 'cache/documents', 0, 0, NOW(), NOW()),
|
||||
('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()),
|
||||
('page_not_found_view', '404', 0, 0, NOW(), NOW()),
|
||||
('page_not_found_view', '404.html', 0, 0, NOW(), NOW()),
|
||||
('passed_url_view', 'passed-url', 0, 0, NOW(), NOW()),
|
||||
('use_tax_free_amounts', 0, 0, 0, NOW(), NOW()),
|
||||
('process_assets', '1', 0, 0, NOW(), NOW()),
|
||||
@@ -28,7 +28,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
|
||||
('thelia_customer_remember_me_cookie_name', 'tcrmcn', 0, 0, NOW(), NOW()),
|
||||
('thelia_customer_remember_me_cookie_expiration', 31536000, 0, 0, NOW(), NOW()),
|
||||
('session_config.handlers', 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler', 0, 0, NOW(), NOW()),
|
||||
('company_name','', 0, 0, NOW(), NOW())
|
||||
('company_name','', 0, 0, NOW(), NOW()),
|
||||
('contact_email','', 0, 0, NOW(), NOW())
|
||||
;
|
||||
|
||||
|
||||
@@ -39,6 +40,8 @@ INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namesp
|
||||
(4, 'FakeCB', 3, 0, 2, 'FakeCB\\FakeCB', NOW(), NOW());
|
||||
|
||||
INSERT INTO `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
|
||||
('1', 'en_US', 'Debug bar', NULL, NULL, NULL),
|
||||
('1', 'fr_FR', 'Debug bar', NULL, NULL, NULL),
|
||||
('2', 'en_US', '72h delivery', NULL, NULL, NULL),
|
||||
('2', 'fr_FR', 'Livraison par colissimo en 72h', NULL, NULL, NULL);
|
||||
|
||||
@@ -275,7 +278,6 @@ INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `by
|
||||
(187, NULL, '862', 'VE', 'VEN', 0, NOW(), NOW()),
|
||||
(188, NULL, '704', 'VN', 'VNM', 0, NOW(), NOW()),
|
||||
(189, NULL, '887', 'YE', 'YEM', 0, NOW(), NOW()),
|
||||
(190, NULL, '807', 'MK', 'MKD', 0, NOW(), NOW()),
|
||||
(191, NULL, '180', 'CD', 'COD', 0, NOW(), NOW()),
|
||||
(192, NULL, '894', 'ZM', 'ZMB', 0, NOW(), NOW()),
|
||||
(193, NULL, '716', 'ZW', 'ZWE', 0, NOW(), NOW()),
|
||||
@@ -915,9 +917,6 @@ INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `po
|
||||
(189, 'en_US', 'Yemen', '', '', ''),
|
||||
(189, 'es_ES', 'Yemen', '', '', ''),
|
||||
(189, 'fr_FR', 'Yémen', '', '', ''),
|
||||
(190, 'en_US', 'Yougoslavia', '', '', ''),
|
||||
(190, 'es_ES', 'Yugoslavia', '', '', ''),
|
||||
(190, 'fr_FR', 'Yougoslavie', '', '', ''),
|
||||
(191, 'en_US', 'Zaire', '', '', ''),
|
||||
(191, 'es_ES', 'Zaire', '', '', ''),
|
||||
(191, 'fr_FR', 'Zaïre', '', '', ''),
|
||||
@@ -1193,3 +1192,101 @@ INSERT INTO `order_status_i18n` (`id`, `locale`, `title`, `description`, `chapo`
|
||||
(4, 'fr_FR', 'Envoyée', '', '', ''),
|
||||
(5, 'en_US', 'Canceled', '', '', ''),
|
||||
(5, 'fr_FR', 'Annulée', '', '', '');
|
||||
|
||||
|
||||
/**
|
||||
generated with command : php Thelia thelia:generate-resources --output sql
|
||||
*/
|
||||
INSERT INTO resource (`id`, `code`, `created_at`, `updated_at`) VALUES
|
||||
(NULL, 'admin.address.view', NOW(), NOW()),
|
||||
(NULL, 'admin.address.create', NOW(), NOW()),
|
||||
(NULL, 'admin.address.update', NOW(), NOW()),
|
||||
(NULL, 'admin.address.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.admin.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.admin.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.admin.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.admin.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.area.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.area.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.area.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.area.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.attribute.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.attribute.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.attribute.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.attribute.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.category.view', NOW(), NOW()),
|
||||
(NULL, 'admin.category.create', NOW(), NOW()),
|
||||
(NULL, 'admin.category.update', NOW(), NOW()),
|
||||
(NULL, 'admin.category.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.content.view', NOW(), NOW()),
|
||||
(NULL, 'admin.content.create', NOW(), NOW()),
|
||||
(NULL, 'admin.content.update', NOW(), NOW()),
|
||||
(NULL, 'admin.content.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.country.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.country.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.country.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.country.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.coupon.view', NOW(), NOW()),
|
||||
(NULL, 'admin.coupon.create', NOW(), NOW()),
|
||||
(NULL, 'admin.coupon.update', NOW(), NOW()),
|
||||
(NULL, 'admin.coupon.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.currency.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.currency.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.currency.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.currency.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.customer.view', NOW(), NOW()),
|
||||
(NULL, 'admin.customer.create', NOW(), NOW()),
|
||||
(NULL, 'admin.customer.update', NOW(), NOW()),
|
||||
(NULL, 'admin.customer.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.feature.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.feature.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.feature.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.feature.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.folder.view', NOW(), NOW()),
|
||||
(NULL, 'admin.folder.create', NOW(), NOW()),
|
||||
(NULL, 'admin.folder.update', NOW(), NOW()),
|
||||
(NULL, 'admin.folder.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.language.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.language.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.language.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.language.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.mailing-system.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.mailing-system.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.mailing-system.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.mailing-system.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.message.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.message.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.message.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.message.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.module.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.module.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.module.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.module.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.order.view', NOW(), NOW()),
|
||||
(NULL, 'admin.order.create', NOW(), NOW()),
|
||||
(NULL, 'admin.order.update', NOW(), NOW()),
|
||||
(NULL, 'admin.order.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.product.view', NOW(), NOW()),
|
||||
(NULL, 'admin.product.create', NOW(), NOW()),
|
||||
(NULL, 'admin.product.update', NOW(), NOW()),
|
||||
(NULL, 'admin.product.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.profile.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.profile.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.profile.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.profile.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.shipping-zone.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.shipping-zone.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.shipping-zone.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.shipping-zone.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.tax.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.tax.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.tax.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.tax.delete', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.template.view', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.template.create', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.template.update', NOW(), NOW()),
|
||||
(NULL, 'admin.configuration.template.delete', NOW(), NOW());
|
||||
|
||||
@@ -50,7 +50,7 @@ CREATE TABLE `product`
|
||||
FOREIGN KEY (`tax_rule_id`)
|
||||
REFERENCES `tax_rule` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
ON DELETE SET NULL,
|
||||
ON DELETE RESTRICT,
|
||||
CONSTRAINT `fk_product_template`
|
||||
FOREIGN KEY (`template_id`)
|
||||
REFERENCES `template` (`id`)
|
||||
@@ -365,11 +365,12 @@ CREATE TABLE `product_sale_elements`
|
||||
`newness` TINYINT DEFAULT 0,
|
||||
`weight` FLOAT DEFAULT 0,
|
||||
`is_default` TINYINT(1) DEFAULT 0,
|
||||
`ean_code` VARCHAR(255),
|
||||
`created_at` DATETIME,
|
||||
`updated_at` DATETIME,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE INDEX `ref_UNIQUE` (`ref`),
|
||||
INDEX `idx_product_sale_element_product_id` (`product_id`),
|
||||
INDEX `ref` (`ref`),
|
||||
CONSTRAINT `fk_product_sale_element_product_id`
|
||||
FOREIGN KEY (`product_id`)
|
||||
REFERENCES `product` (`id`)
|
||||
@@ -775,6 +776,7 @@ CREATE TABLE `order_product`
|
||||
`was_new` TINYINT NOT NULL,
|
||||
`was_in_promo` TINYINT NOT NULL,
|
||||
`weight` VARCHAR(45),
|
||||
`ean_code` VARCHAR(255),
|
||||
`tax_rule_title` VARCHAR(255),
|
||||
`tax_rule_description` LONGTEXT,
|
||||
`parent` INTEGER COMMENT 'not managed yet',
|
||||
@@ -929,12 +931,12 @@ CREATE TABLE `area_delivery_module`
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- group
|
||||
-- profile
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
DROP TABLE IF EXISTS `group`;
|
||||
DROP TABLE IF EXISTS `profile`;
|
||||
|
||||
CREATE TABLE `group`
|
||||
CREATE TABLE `profile`
|
||||
(
|
||||
`id` INTEGER NOT NULL AUTO_INCREMENT,
|
||||
`code` VARCHAR(30) NOT NULL,
|
||||
@@ -953,7 +955,7 @@ DROP TABLE IF EXISTS `resource`;
|
||||
CREATE TABLE `resource`
|
||||
(
|
||||
`id` INTEGER NOT NULL AUTO_INCREMENT,
|
||||
`code` VARCHAR(30) NOT NULL,
|
||||
`code` VARCHAR(255) NOT NULL,
|
||||
`created_at` DATETIME,
|
||||
`updated_at` DATETIME,
|
||||
PRIMARY KEY (`id`),
|
||||
@@ -969,6 +971,7 @@ DROP TABLE IF EXISTS `admin`;
|
||||
CREATE TABLE `admin`
|
||||
(
|
||||
`id` INTEGER NOT NULL AUTO_INCREMENT,
|
||||
`profile_id` INTEGER,
|
||||
`firstname` VARCHAR(100) NOT NULL,
|
||||
`lastname` VARCHAR(100) NOT NULL,
|
||||
`login` VARCHAR(100) NOT NULL,
|
||||
@@ -979,61 +982,39 @@ CREATE TABLE `admin`
|
||||
`remember_me_serial` VARCHAR(255),
|
||||
`created_at` DATETIME,
|
||||
`updated_at` DATETIME,
|
||||
PRIMARY KEY (`id`)
|
||||
PRIMARY KEY (`id`),
|
||||
INDEX `fk_admin_profile_id` (`profile_id`),
|
||||
CONSTRAINT `fk_admin_profile_id`
|
||||
FOREIGN KEY (`profile_id`)
|
||||
REFERENCES `profile` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
ON DELETE RESTRICT
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- admin_group
|
||||
-- profile_resource
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
DROP TABLE IF EXISTS `admin_group`;
|
||||
DROP TABLE IF EXISTS `profile_resource`;
|
||||
|
||||
CREATE TABLE `admin_group`
|
||||
CREATE TABLE `profile_resource`
|
||||
(
|
||||
`id` INTEGER NOT NULL AUTO_INCREMENT,
|
||||
`group_id` INTEGER NOT NULL,
|
||||
`admin_id` INTEGER NOT NULL,
|
||||
`created_at` DATETIME,
|
||||
`updated_at` DATETIME,
|
||||
PRIMARY KEY (`id`,`group_id`,`admin_id`),
|
||||
INDEX `idx_admin_group_group_id` (`group_id`),
|
||||
INDEX `idx_admin_group_admin_id` (`admin_id`),
|
||||
CONSTRAINT `fk_admin_group_group_id`
|
||||
FOREIGN KEY (`group_id`)
|
||||
REFERENCES `group` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
ON DELETE CASCADE,
|
||||
CONSTRAINT `fk_admin_group_admin_id`
|
||||
FOREIGN KEY (`admin_id`)
|
||||
REFERENCES `admin` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
ON DELETE CASCADE
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- group_resource
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
DROP TABLE IF EXISTS `group_resource`;
|
||||
|
||||
CREATE TABLE `group_resource`
|
||||
(
|
||||
`id` INTEGER NOT NULL AUTO_INCREMENT,
|
||||
`group_id` INTEGER NOT NULL,
|
||||
`profile_id` INTEGER NOT NULL,
|
||||
`resource_id` INTEGER NOT NULL,
|
||||
`read` TINYINT DEFAULT 0,
|
||||
`write` TINYINT DEFAULT 0,
|
||||
`created_at` DATETIME,
|
||||
`updated_at` DATETIME,
|
||||
PRIMARY KEY (`id`,`group_id`,`resource_id`),
|
||||
INDEX `id_group_resource_group_id` (`group_id`),
|
||||
INDEX `idx_group_resource_resource_id` (`resource_id`),
|
||||
CONSTRAINT `fk_group_resource_group_id`
|
||||
FOREIGN KEY (`group_id`)
|
||||
REFERENCES `group` (`id`)
|
||||
PRIMARY KEY (`id`,`profile_id`,`resource_id`),
|
||||
INDEX `id_profile_resource_profile_id` (`profile_id`),
|
||||
INDEX `idx_profile_resource_resource_id` (`resource_id`),
|
||||
CONSTRAINT `fk_profile_resource_profile_id`
|
||||
FOREIGN KEY (`profile_id`)
|
||||
REFERENCES `profile` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
ON DELETE CASCADE,
|
||||
CONSTRAINT `fk_group_resource_resource_id`
|
||||
CONSTRAINT `fk_profile_resource_resource_id`
|
||||
FOREIGN KEY (`resource_id`)
|
||||
REFERENCES `resource` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
@@ -1041,28 +1022,28 @@ CREATE TABLE `group_resource`
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- group_module
|
||||
-- profile_module
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
DROP TABLE IF EXISTS `group_module`;
|
||||
DROP TABLE IF EXISTS `profile_module`;
|
||||
|
||||
CREATE TABLE `group_module`
|
||||
CREATE TABLE `profile_module`
|
||||
(
|
||||
`id` INTEGER NOT NULL AUTO_INCREMENT,
|
||||
`group_id` INTEGER NOT NULL,
|
||||
`profile_id` INTEGER NOT NULL,
|
||||
`module_id` INTEGER,
|
||||
`access` TINYINT DEFAULT 0,
|
||||
`created_at` DATETIME,
|
||||
`updated_at` DATETIME,
|
||||
PRIMARY KEY (`id`),
|
||||
INDEX `idx_group_module_group_id` (`group_id`),
|
||||
INDEX `idx_group_module_module_id` (`module_id`),
|
||||
CONSTRAINT `fk_group_module_group_id`
|
||||
FOREIGN KEY (`group_id`)
|
||||
REFERENCES `group` (`id`)
|
||||
INDEX `idx_profile_module_profile_id` (`profile_id`),
|
||||
INDEX `idx_profile_module_module_id` (`module_id`),
|
||||
CONSTRAINT `fk_profile_module_profile_id`
|
||||
FOREIGN KEY (`profile_id`)
|
||||
REFERENCES `profile` (`id`)
|
||||
ON UPDATE CASCADE
|
||||
ON DELETE CASCADE,
|
||||
CONSTRAINT `fk_group_module_module_id`
|
||||
CONSTRAINT `fk_profile_module_module_id`
|
||||
FOREIGN KEY (`module_id`)
|
||||
REFERENCES `module` (`id`)
|
||||
ON UPDATE RESTRICT
|
||||
@@ -1971,12 +1952,12 @@ CREATE TABLE `module_i18n`
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- group_i18n
|
||||
-- profile_i18n
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
DROP TABLE IF EXISTS `group_i18n`;
|
||||
DROP TABLE IF EXISTS `profile_i18n`;
|
||||
|
||||
CREATE TABLE `group_i18n`
|
||||
CREATE TABLE `profile_i18n`
|
||||
(
|
||||
`id` INTEGER NOT NULL,
|
||||
`locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
|
||||
@@ -1985,9 +1966,9 @@ CREATE TABLE `group_i18n`
|
||||
`chapo` TEXT,
|
||||
`postscriptum` TEXT,
|
||||
PRIMARY KEY (`id`,`locale`),
|
||||
CONSTRAINT `group_i18n_FK_1`
|
||||
CONSTRAINT `profile_i18n_FK_1`
|
||||
FOREIGN KEY (`id`)
|
||||
REFERENCES `group` (`id`)
|
||||
REFERENCES `profile` (`id`)
|
||||
ON DELETE CASCADE
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user