3zyX6ZNk

1INSERT INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`)
2    VALUES ('call', 'stock', 'get-companies-act-sizes', 'N');
3set @lastId = LAST_INSERT_ID();
4INSERT INTO `acl_settings` (`acl_roles_id`, `acl_rules_id`, `access_type`, `assert`)
5    VALUES (64, @lastId, 'ALLOW', '');
6
7INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (3673401, 'shop', 'get-document');
8INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (3673401, 'shop', 'incomes');
9
10INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (3968390, 'shop', 'get-document');
11INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (3968390, 'shop', 'incomes');
12
13INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (4039004, 'shop', 'get-document');
14INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (4039004, 'shop', 'incomes');
15
16INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (3972131, 'shop', 'get-document');
17INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (3972131, 'shop', 'incomes');
18
19INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (4120643, 'shop', 'get-document');
20INSERT ignore INTO `acl_exceptions` (`customers_id`, `controller`, `method`) VALUES (4120643, 'shop', 'incomes');
21
22INSERT INTO `acl_settings` (`acl_settings_id`, `acl_roles_id`, `acl_rules_id`, `access_type`, `assert`) VALUES (NULL, 25, 1622, 'ALLOW', '');
23INSERT INTO `acl_settings` (`acl_settings_id`, `acl_roles_id`, `acl_rules_id`, `access_type`, `assert`) VALUES (NULL, 64, 1622, 'ALLOW', '');
24INSERT INTO `acl_settings` (`acl_settings_id`, `acl_roles_id`, `acl_rules_id`, `access_type`, `assert`) VALUES (NULL, 58, 1622, 'ALLOW', '');
25
26INSERT INTO `acl_roles_extends` (`module`, `acl_roles_id`, `parent_acl_roles_id`) VALUES ('partner', 96, 45);
27
28INSERT IGNORE INTO `acl_settings` (`acl_roles_id`, `acl_rules_id`, `access_type`, `assert`)
29  SELECT aro.`acl_roles_id`, aru.`acl_rules_id`, 'ALLOW', '' FROM `acl_roles` aro, `acl_rules` aru
30  WHERE aro.`acl_roles_title_en` = 'mainRealAnalytic' AND aru.`module` = 'partner' AND aru.`controller` = 'dashboard';
31
32  INSERT IGNORE INTO `acl_settings` (`acl_roles_id`, `acl_rules_id`, `access_type`, `assert`)
33  SELECT aro.`acl_roles_id`, aru.`acl_rules_id`, 'ALLOW', '' FROM `acl_roles` aro, `acl_rules` aru
34  WHERE aro.`acl_roles_title_en` = 'financeDirector' AND aru.`module` = 'partner' AND aru.`controller` = 'dashboard';
35
36INSERT IGNORE INTO `acl_settings` (`acl_roles_id`, `acl_rules_id`, `access_type`, `assert`)
37  SELECT aro.`acl_roles_id`, aru.`acl_rules_id`, 'ALLOW', '' FROM `acl_roles` aro, `acl_rules` aru
38  WHERE aro.`acl_roles_title_en` = 'financeDirector' AND aru.`module` = 'call' AND aru.`controller` = 'supplier' AND aru.`action` = 'autocompleate';
39
40ALTER TABLE `stock_zones_log`
41  CHANGE COLUMN `stock_zones_log_type` `stock_zones_log_type` ENUM('','marking','sorting','selection','stuff') NULL DEFAULT NULL AFTER `customers_id`;
42
43
44# история статусов
45DROP TABLE IF EXISTS `refunds_acts_status_history`;
46CREATE TABLE `refunds_acts_status_history` (
47  `refunds_acts_status_history_id` INT(11) NOT NULL AUTO_INCREMENT,
48  `object_id` INT(11) NOT NULL,
49  `customers_id` INT(11) NOT NULL,
50  `status_id` INT(11) NOT NULL,
51  `date_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
52  PRIMARY KEY (`refunds_acts_status_history_id`),
53  INDEX `object_id` (`object_id`),
54  INDEX `status_id` (`status_id`),
55  INDEX `date_added` (`date_added`)
56)
57  COLLATE='utf8_general_ci'
58  ENGINE=InnoDB
59;
60# коменты
61DROP TABLE IF EXISTS `refunds_acts_comment_history`;
62CREATE TABLE `refunds_acts_comment_history` (
63  `refunds_acts_comment_history_id` INT(11) NOT NULL AUTO_INCREMENT,
64  `refunds_acts_status_history_id` INT(11) NOT NULL DEFAULT '0',
65  `object_id` INT(11) NOT NULL,
66  `customers_id` INT(11) NOT NULL,
67  `status_id` INT(11) NOT NULL,
68  `sub_status_id` INT(11) NULL DEFAULT NULL,
69  `date_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
70  `comment` TEXT NULL,
71  `is_important` TINYINT(4) NOT NULL DEFAULT '2' COMMENT '1 - true, 2 - false',
72  `flag` TINYINT(4) NOT NULL DEFAULT '1',
73  PRIMARY KEY (`refunds_acts_comment_history_id`),
74  INDEX `object_id` (`object_id`),
75  INDEX `status_id` (`status_id`),
76  INDEX `sub_status_id` (`sub_status_id`),
77  INDEX `date_added` (`date_added`),
78  INDEX `refunds_acts_status_history_id` (`refunds_acts_status_history_id`)
79)
80  COLLATE='utf8_general_ci'
81  ENGINE=InnoDB
82;
83
84# Статусы, которые сможет принимать сущность Акт возврата поставщику
85set @formedStatusId = 152;
86set @selectionStatusId = 153;
87set @waitApproveStatusId = 154;
88set @readyForShipment1CStatusId = 155;
89set @shipped1CStatusId = 156;
90
91insert into entities_statuses values(null, 52, @formedStatusId, 0, '');
92insert into entities_statuses values(null, 52, @selectionStatusId, 0, '');
93insert into entities_statuses values(null, 52, @waitApproveStatusId, 0, '');
94insert into entities_statuses values(null, 52, @readyForShipment1CStatusId, 0, '');
95insert into entities_statuses values(null, 52, @shipped1CStatusId, 0, '');
96insert into entities_statuses values(null, 52, 1, 0, '');
97
98INSERT INTO `status_maps` (`status_maps_name`, `entities_id`, `entities_types_id`) VALUES ('Акт возврата статического товара с полок поставщику', 52, 66);
99set @statusMapsId = last_insert_id();
100INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, 1, @formedStatusId);
101INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @formedStatusId, @selectionStatusId);
102INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @selectionStatusId, @formedStatusId);
103INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @selectionStatusId, @waitApproveStatusId);
104INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @waitApproveStatusId, @readyForShipment1CStatusId);
105INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @waitApproveStatusId, @selectionStatusId);
106INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @waitApproveStatusId, @formedStatusId);
107INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @selectionStatusId, @readyForShipment1CStatusId);
108INSERT INTO `status_maps_links` (`status_maps_id`, `status_from_id`, `status_to_id`) VALUES (@statusMapsId, @readyForShipment1CStatusId, @shipped1CStatusId);
109
110ALTER TABLE `refunds_acts`
111  ADD COLUMN `refunds_acts_status` INT(10) NULL DEFAULT NULL AFTER `status`,
112  ADD COLUMN `entities_types_id` INT(10) NOT NULL DEFAULT 65 AFTER `refunds_acts_id`, ADD INDEX `entities_types_id` (`entities_types_id`);
113
114INSERT INTO `partner_left_menu` (`pid`, `name`, `url`, `sort`) VALUES (8, 'Возвратные поставки', '/partner/administration/return-incomes', 2);
115
116# доступ к смене статуса SKU+поставка
117INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'change-incomes-attributes-status', 'N');
118INSERT IGNORE INTO acl_settings (acl_roles_id, acl_rules_id, access_type, assert)
119  SELECT aro.acl_roles_id, aru.acl_rules_id, 'ALLOW', '' FROM acl_roles aro, acl_rules aru
120  WHERE aro.acl_roles_title_en IN ('headAnalytic', 'analytic') AND aru.module = 'partner' AND aru.controller = 'administration' AND
121        aru.action IN ('change-incomes-attributes-status');
122
123# доступ buyer, buyerSenior к созданию и просмотру возвратных поставок
124INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'range-suppliers-stock-mamsy-tab', 'N');
125INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'range-suppliers-stock-shiptor-tab', 'N');
126INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'check-return-incomes', 'N');
127INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'create-return-incomes', 'N');
128INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'return-incomes', 'N');
129INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'return-incomes-list', 'N');
130INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'return-incomes-list-filter-form', 'N');
131INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'view-return-income', 'N');
132INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'return-income-products-list', 'N');
133INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'return-income-products-list-filter-form', 'N');
134
135# доступ seniorPacking, headPacking, mainStorekeeper, mainReturner к просмотру возвратных поставок
136INSERT IGNORE INTO acl_settings (acl_roles_id, acl_rules_id, access_type, assert)
137  SELECT aro.acl_roles_id, aru.acl_rules_id, 'ALLOW', '' FROM acl_roles aro, acl_rules aru
138  WHERE aro.acl_roles_title_en IN ('buyer', 'mainReturner') AND aru.module = 'partner' AND aru.controller = 'administration' AND
139        aru.action IN ('range-suppliers-stock-mamsy-tab', 'range-suppliers-stock-shiptor-tab', 'check-return-incomes', 'create-return-incomes', 'return-incomes', 'return-incomes-list', 'return-incomes-list-filter-form', 'view-return-income', 'return-income-products-list', 'return-income-products-list-filter-form');
140
141INSERT IGNORE INTO acl_settings (acl_roles_id, acl_rules_id, access_type, assert)
142  SELECT aro.acl_roles_id, aru.acl_rules_id, 'ALLOW', '' FROM acl_roles aro, acl_rules aru
143  WHERE aro.acl_roles_title_en IN ('packing', 'seniorPacking', 'headPacking', 'mainStorekeeper', 'mainReturner') AND aru.module = 'partner' AND aru.controller = 'administration' AND
144        aru.action IN ('return-incomes', 'return-incomes-list', 'return-incomes-list-filter-form', 'view-return-income', 'return-income-products-list', 'return-income-products-list-filter-form');
145
146INSERT INTO `admin_menu` (`pid`, `name`, `url`) VALUES (5, 'Лист подбора', '/call/shop/return-incomes-selection-sheet');
147
148# подбор возвратных поставок
149DROP TABLE IF EXISTS `return_incomes_selection`;
150CREATE TABLE `return_incomes_selection` (
151  `return_incomes_selection_id` INT(11) NOT NULL AUTO_INCREMENT,
152  `refunds_acts_id` INT(11) NOT NULL COMMENT 'Собираемая возвратная поставка',
153  `customers_id` INT(11) NOT NULL COMMENT 'Пользователь, забронировавший сбор',
154  `is_active` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Активна ли бронь',
155  PRIMARY KEY (`return_incomes_selection_id`),
156  INDEX `customers_id` (`customers_id`),
157  UNIQUE INDEX `refunds_acts_id_customers_id` (`refunds_acts_id`, `customers_id`)
158)
159  COLLATE='utf8_general_ci'
160  ENGINE=InnoDB
161;
162
163# новый тип сканирования на подборе
164ALTER TABLE `log_selection_scan`
165ADD COLUMN `type` INT(10) UNSIGNED NOT NULL DEFAULT '1' AFTER `stock_zones_id`;
166
167ALTER TABLE `stock_zones` MODIFY COLUMN `type` ENUM('city','transit','static','box','box_surplus','sort','surplus','global_sale','photo_shipment','photo_in','photo_out', 'return_incomes') NOT NULL DEFAULT 'city';
168
169# потери по возвратным поставкам
170DROP TABLE IF EXISTS `return_incomes_losses`;
171CREATE TABLE `return_incomes_losses` (
172  `return_incomes_losses_id` INT(11) NOT NULL AUTO_INCREMENT,
173  `refunds_acts_id` INT(11) NOT NULL COMMENT 'ID возвратной поставки',
174  `incomes_items_id` INT(11) NOT NULL COMMENT 'Id вещи',
175  `customers_id` INT(11) NOT NULL COMMENT 'Кто добавил в потери',
176  `date_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
177  PRIMARY KEY (`return_incomes_losses_id`),
178  INDEX `refunds_acts_id` (`refunds_acts_id`),
179  UNIQUE INDEX `incomes_items_id` (`incomes_items_id`),
180  INDEX `customers_id` (`customers_id`)
181)
182  COLLATE='utf8_general_ci'
183  ENGINE=InnoDB
184;
185
186# тарные места
187DROP TABLE IF EXISTS `return_incomes_boxes`;
188CREATE TABLE `return_incomes_boxes` (
189  `return_incomes_boxes_id` INT(11) NOT NULL AUTO_INCREMENT,
190  `refunds_acts_id` INT(11) NOT NULL COMMENT 'ID возвратной поставки',
191  `boxes_id` INT(11) NOT NULL COMMENT 'Id упаковки',
192  `amount` INT(11) NOT NULL COMMENT 'Количество',
193  PRIMARY KEY (`return_incomes_boxes_id`),
194  UNIQUE INDEX `refunds_acts_id_boxes_id` (`refunds_acts_id`, `boxes_id`)
195)
196  COLLATE='utf8_general_ci'
197  ENGINE=InnoDB
198;
199
200# компонент в 1с (к отгрузке)
201INSERT INTO `export_data_1c_component` (`export_data_1c_component_name`, `table_name`, `key_field`, `comment`) VALUES ('return_income_shipment', 'refunds_acts', 'refunds_acts_id', 'Возвратная поставка готова к отгрузке');
202
203# доступ к апруву поставки
204INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('partner', 'administration', 'set-return-income-ready', 'N');
205INSERT IGNORE INTO acl_settings (acl_roles_id, acl_rules_id, access_type, assert)
206  SELECT aro.acl_roles_id, aru.acl_rules_id, 'ALLOW', '' FROM acl_roles aro, acl_rules aru
207  WHERE aro.acl_roles_title_en IN ('mainStorekeeper', 'mainReturner') AND aru.module = 'partner' AND aru.controller = 'administration' AND
208        aru.action IN ('set-return-income-ready');
209
210# доступ к листу подбора возвратных поставок
211INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'return-incomes-selection-cancel', 'N');
212INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'return-income-boxes', 'N');
213INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'set-return-income-boxes', 'N');
214INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'print-return-income-stickers', 'N');
215INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'set-return-income-lost-products', 'N');
216INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'move-product-to-return-incomes-zone', 'N');
217INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'check-product-on-return-incomes-scan', 'N');
218INSERT IGNORE INTO `acl_rules` (`module`, `controller`, `action`, `acl_rules_fake`) VALUES ('call', 'shop', 'return-incomes-selection-sheet', 'N');
219INSERT IGNORE INTO acl_settings (acl_roles_id, acl_rules_id, access_type, assert)
220  SELECT aro.acl_roles_id, aru.acl_rules_id, 'ALLOW', '' FROM acl_roles aro, acl_rules aru
221  WHERE aro.acl_roles_title_en IN ('packing', 'seniorPacking', 'headPacking', 'mainStorekeeper') AND aru.module = 'call' AND aru.controller = 'shop' AND
222        aru.action IN (
223          'return-incomes-selection-cancel',
224          'return-income-boxes',
225          'set-return-income-boxes',
226          'print-return-income-stickers',
227          'set-return-income-lost-products',
228          'move-product-to-return-incomes-zone',
229          'check-product-on-return-incomes-scan',
230          'return-incomes-selection-sheet'
231        );
232
233# вариант для прода
234ALTER TABLE `refunds_acts_to_products`
235  ADD COLUMN `entities_types_id` INT(10) NOT NULL DEFAULT 65 COMMENT 'тип сущности акта возврата' AFTER refunds_acts_to_products_id,
236  CHANGE COLUMN `orders_products_id` `sub_object_id` INT(11) NOT NULL DEFAULT 0;
237
238
239# 0.01408 - курс евро на 11.11.2016 в ЕЦБ
240UPDATE categories c
241  JOIN products_to_categories pc ON pc.categories_id = c.categories_id
242  JOIN products_prices pp ON pp.products_id = pc.products_id
243SET pp.products_trade_price = ROUND(pp.products_trade_price_currency / 0.01408, 2)
244WHERE c.fulfilments_id = 1
245      AND DATE(c.date_added) <= '2016-11-11';
246
247ALTER TABLE `products_change_log`
248  ADD COLUMN `products_trade_price_currency` DECIMAL(15,2) NULL AFTER `products_comment`,
249  ADD COLUMN `products_purchase_price_currency` DECIMAL(15,2) NULL AFTER `products_trade_price_currency`;