]>
gitweb.erp-flowers.ru Git - yii-erp24/.git/log
Aleksey Filippov [Mon, 29 Apr 2024 12:31:27 +0000 (15:31 +0300)]
добавил страницу Статистика по остаткам
Aleksey Filippov [Mon, 29 Apr 2024 10:33:47 +0000 (13:33 +0300)]
правки по графику план
Aleksey Filippov [Sun, 28 Apr 2024 19:24:50 +0000 (19:24 +0000)]
Merge branch 'bugfix_smirnov_2024_04_28_api3_timetable_plan_create_rules' into 'develop'
store_id skip on empty but required
See merge request gitlab-instance/yii-erp24!94
Alexander Smirnov [Sun, 28 Apr 2024 18:28:37 +0000 (21:28 +0300)]
store_id skip on empty but required
Aleksey Filippov [Sun, 28 Apr 2024 17:30:44 +0000 (17:30 +0000)]
Merge branch 'feature_filippov_20240428_bot_income_show_fix' into 'develop'
правки по загрузке чеков и конфигам api2
See merge request gitlab-instance/yii-erp24!93
Aleksey Filippov [Sun, 28 Apr 2024 17:30:11 +0000 (20:30 +0300)]
правки по загрузке чеков и конфигам api2
Aleksey Filippov [Sun, 28 Apr 2024 17:26:13 +0000 (17:26 +0000)]
Merge branch 'feature_smirnov_2024_04_28_api3_report_show_weeks' into 'develop'
add report show weeks
See merge request gitlab-instance/yii-erp24!92
Alexander Smirnov [Sun, 28 Apr 2024 17:22:37 +0000 (20:22 +0300)]
add report show weeks
Aleksey Filippov [Sun, 28 Apr 2024 15:22:17 +0000 (15:22 +0000)]
Merge branch 'feature_filippov_20240428_bot_income_show_fix' into 'develop'
правки по боту income show fix
See merge request gitlab-instance/yii-erp24!91
Aleksey Filippov [Sun, 28 Apr 2024 15:21:40 +0000 (18:21 +0300)]
правки по боту income show fix
Aleksey Filippov [Sun, 28 Apr 2024 12:55:26 +0000 (12:55 +0000)]
Merge branch 'feature_smirnov_2024_04_28_may_5000_bonus_1000' into 'develop'
add 1000 bonus per 5000 sale
See merge request gitlab-instance/yii-erp24!89
Alexander Smirnov [Sun, 28 Apr 2024 12:53:07 +0000 (15:53 +0300)]
fix 1000 per 5000
Aleksey Filippov [Sun, 28 Apr 2024 11:11:33 +0000 (11:11 +0000)]
Merge branch 'feature_smirnov_2024_04_28_contest001_update' into 'develop'
contest001 update
See merge request gitlab-instance/yii-erp24!90
Alexander Smirnov [Sun, 28 Apr 2024 11:07:02 +0000 (14:07 +0300)]
contest001 update
Alexander Smirnov [Sun, 28 Apr 2024 10:56:42 +0000 (13:56 +0300)]
add check_id to user bonus
Alexander Smirnov [Sun, 28 Apr 2024 10:47:48 +0000 (13:47 +0300)]
add 1000 bonus per 5000 sale
Aleksey Filippov [Sun, 28 Apr 2024 06:58:41 +0000 (06:58 +0000)]
Merge branch 'feature_filippov_20240428_1c_view_fix' into 'develop'
правки по странице 1c list
See merge request gitlab-instance/yii-erp24!88
Aleksey Filippov [Sun, 28 Apr 2024 06:58:12 +0000 (09:58 +0300)]
правки по странице 1c list
Aleksey Filippov [Sun, 28 Apr 2024 06:55:23 +0000 (06:55 +0000)]
Merge branch 'feature_filippov_20240428_1c_view_fix' into 'develop'
правки по странице 1c list
See merge request gitlab-instance/yii-erp24!87
Aleksey Filippov [Sun, 28 Apr 2024 06:54:36 +0000 (09:54 +0300)]
правки по странице 1c list
Aleksey Filippov [Sun, 28 Apr 2024 06:01:36 +0000 (06:01 +0000)]
Merge branch 'feature_filippov_20240428_timetable_fact_fix' into 'develop'
правки по странице timetable fact
See merge request gitlab-instance/yii-erp24!86
Aleksey Filippov [Sun, 28 Apr 2024 06:00:49 +0000 (09:00 +0300)]
правки по странице timetable fact
Aleksey Filippov [Sat, 27 Apr 2024 21:08:40 +0000 (21:08 +0000)]
Merge branch 'feature_filippov_20240428_chekin_fix' into 'develop'
правки по открытия и закрытия смены десктоп
See merge request gitlab-instance/yii-erp24!85
Aleksey Filippov [Sat, 27 Apr 2024 21:07:54 +0000 (00:07 +0300)]
правки по открытия и закрытия смены десктоп
Aleksey Filippov [Sat, 27 Apr 2024 16:01:36 +0000 (16:01 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
insert ignore c mysql переведен postgresql правки
See merge request gitlab-instance/yii-erp24!84
marina [Sat, 27 Apr 2024 15:59:01 +0000 (18:59 +0300)]
insert ignore c mysql переведен postgresql правки
Aleksey Filippov [Sat, 27 Apr 2024 15:50:15 +0000 (15:50 +0000)]
Merge branch 'feature_filippov_20240427_config_fix' into 'develop'
Feature filippov
20240427 config fix
See merge request gitlab-instance/yii-erp24!83
Aleksey Filippov [Sat, 27 Apr 2024 15:49:18 +0000 (18:49 +0300)]
правки по конфиги
Aleksey Filippov [Sat, 27 Apr 2024 15:16:25 +0000 (15:16 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
insert ignore c mysql переведен postgresql правки
See merge request gitlab-instance/yii-erp24!82
marina [Sat, 27 Apr 2024 15:13:49 +0000 (18:13 +0300)]
insert ignore c mysql переведен postgresql правки
Aleksey Filippov [Sat, 27 Apr 2024 15:09:03 +0000 (15:09 +0000)]
Merge branch 'feature_pavlikov_20240427_session_drop' into 'develop'
delete session if required data not exists
See merge request gitlab-instance/yii-erp24!79
Aleksey Filippov [Sat, 27 Apr 2024 15:08:38 +0000 (15:08 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
insert ignore c mysql переведен postgresql правки
See merge request gitlab-instance/yii-erp24!81
Aleksey Filippov [Sat, 27 Apr 2024 15:08:09 +0000 (15:08 +0000)]
Merge branch 'feature_smirnov_2024_04_27_product_prices' into 'develop'
product prices
See merge request gitlab-instance/yii-erp24!80
marina [Sat, 27 Apr 2024 15:07:32 +0000 (18:07 +0300)]
insert ignore c mysql переведен postgresql правки
Alexander Smirnov [Sat, 27 Apr 2024 15:06:34 +0000 (18:06 +0300)]
product prices
pavlikov_maxim [Sat, 27 Apr 2024 15:05:13 +0000 (18:05 +0300)]
delete session if required data not exists
Aleksey Filippov [Sat, 27 Apr 2024 14:53:17 +0000 (14:53 +0000)]
Merge branch 'feature_smirnov_2024_04_27_admin_list' into 'develop'
admin list
See merge request gitlab-instance/yii-erp24!78
Alexander Smirnov [Sat, 27 Apr 2024 14:51:39 +0000 (17:51 +0300)]
admin list
Aleksey Filippov [Sat, 27 Apr 2024 14:35:55 +0000 (14:35 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
Insert ignore from mysql to pgsql
See merge request gitlab-instance/yii-erp24!77
marina [Sat, 27 Apr 2024 14:35:07 +0000 (17:35 +0300)]
insert ignore c mysql переведен postgresql правки
Aleksey Filippov [Sat, 27 Apr 2024 14:28:19 +0000 (14:28 +0000)]
Merge branch 'feature_smirnov_2024_04_27_product_item_list' into 'develop'
add products item list
See merge request gitlab-instance/yii-erp24!76
Alexander Smirnov [Sat, 27 Apr 2024 14:25:14 +0000 (17:25 +0300)]
add products item list
Aleksey Filippov [Sat, 27 Apr 2024 14:05:49 +0000 (14:05 +0000)]
Merge branch 'feature_smirnov_2024_04_27_admin_auth_by_hash' into 'develop'
add admin/auth-by-hash
See merge request gitlab-instance/yii-erp24!75
Alexander Smirnov [Sat, 27 Apr 2024 14:04:37 +0000 (17:04 +0300)]
add admin/auth-by-hash
Aleksey Filippov [Sat, 27 Apr 2024 13:52:04 +0000 (13:52 +0000)]
Merge branch 'feature_pavlikov_20240427_session_drop' into 'develop'
delete session if required data not exists
See merge request gitlab-instance/yii-erp24!74
pavlikov_maxim [Sat, 27 Apr 2024 13:51:28 +0000 (16:51 +0300)]
delete session if required data not exists
pavlikov_maxim [Sat, 27 Apr 2024 13:49:15 +0000 (16:49 +0300)]
delete session if required data not exists
Aleksey Filippov [Sat, 27 Apr 2024 13:34:27 +0000 (13:34 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
Insert ignore from mysql to pgsql
See merge request gitlab-instance/yii-erp24!72
Marina Zozirova [Sat, 27 Apr 2024 13:34:27 +0000 (13:34 +0000)]
Insert ignore from mysql to pgsql
marina [Sat, 27 Apr 2024 13:16:44 +0000 (16:16 +0300)]
insert ignore c mysql переведен postgresql правки
Aleksey Filippov [Sat, 27 Apr 2024 13:12:34 +0000 (13:12 +0000)]
Merge branch 'feature_pavlikov_20240427_session_drop' into 'develop'
delete session if required data not exists
See merge request gitlab-instance/yii-erp24!73
pavlikov_maxim [Sat, 27 Apr 2024 13:10:34 +0000 (16:10 +0300)]
delete session if required data not exists
marina [Sat, 27 Apr 2024 13:07:50 +0000 (16:07 +0300)]
insert ignore c mysql переведен postgresql правки
Aleksey Filippov [Sat, 27 Apr 2024 13:04:17 +0000 (13:04 +0000)]
Merge branch 'feature_pavlikov_20240427_session_drop' into 'develop'
Feature pavlikov
20240427 session drop
See merge request gitlab-instance/yii-erp24!71
pavlikov_maxim [Sat, 27 Apr 2024 13:02:46 +0000 (16:02 +0300)]
delete session if required data not exists
pavlikov_maxim [Sat, 27 Apr 2024 13:02:29 +0000 (16:02 +0300)]
delete session if required data not exists
Aleksey Filippov [Sat, 27 Apr 2024 12:41:32 +0000 (12:41 +0000)]
Merge branch 'insert_ignore_from_mysql_to_pgsql' into 'develop'
insert ignore c mysql переведен postgresql
See merge request gitlab-instance/yii-erp24!70
Marina Zozirova [Sat, 27 Apr 2024 12:41:32 +0000 (12:41 +0000)]
insert ignore c mysql переведен postgresql
marina [Sat, 27 Apr 2024 12:18:39 +0000 (15:18 +0300)]
insert ignore c mysql переведен postgresql правки
marina [Sat, 27 Apr 2024 12:09:21 +0000 (15:09 +0300)]
insert ignore c mysql переведен postgresql
Aleksey Filippov [Sat, 27 Apr 2024 12:09:15 +0000 (12:09 +0000)]
Merge branch 'feature_pavlikov_20240427_session_drop' into 'develop'
delete session if required data not exists
See merge request gitlab-instance/yii-erp24!69
pavlikov_maxim [Sat, 27 Apr 2024 11:52:45 +0000 (14:52 +0300)]
delete session if required data not exists
pavlikov_maxim [Sat, 27 Apr 2024 11:37:53 +0000 (14:37 +0300)]
delete session if required data not exists
Aleksey Filippov [Fri, 26 Apr 2024 14:21:50 +0000 (14:21 +0000)]
Merge branch 'feature_filippov_20240425_amo_token_refresh' into 'develop'
правки по api
See merge request gitlab-instance/yii-erp24!68
Aleksey Filippov [Fri, 26 Apr 2024 14:19:44 +0000 (17:19 +0300)]
правки по api
Aleksey Filippov [Fri, 26 Apr 2024 14:19:02 +0000 (14:19 +0000)]
Merge branch 'feature_smirnov_2024_04_26_bonus_users_sale_update' into 'develop'
fix bonus users sale update
See merge request gitlab-instance/yii-erp24!67
Alexander Smirnov [Fri, 26 Apr 2024 14:17:15 +0000 (17:17 +0300)]
fix bonus users sale update
Aleksey Filippov [Fri, 26 Apr 2024 09:27:54 +0000 (09:27 +0000)]
Merge branch 'change_column_type_on_page_statistics' into 'develop'
изменен тип колонки, так как при фильтрации выпадала ошибка о слишком длинном...
See merge request gitlab-instance/yii-erp24!66
Marina Zozirova [Fri, 26 Apr 2024 09:27:54 +0000 (09:27 +0000)]
изменен тип колонки, так как при фильтрации выпадала ошибка о слишком длинном...
Aleksey Filippov [Fri, 26 Apr 2024 06:55:16 +0000 (06:55 +0000)]
Merge branch 'feature_filippov_20240426_rate_category_admin_fix' into 'develop'
правки по лк отключение расчёта категории нормасмены
See merge request gitlab-instance/yii-erp24!65
Aleksey Filippov [Fri, 26 Apr 2024 06:51:57 +0000 (09:51 +0300)]
правки по лк отключение расчёта категории нормасмены
Aleksey Filippov [Thu, 25 Apr 2024 14:59:09 +0000 (14:59 +0000)]
Merge branch 'fix_timetable_filter' into 'develop'
выправлен фильтр на странице /timetable/plan
See merge request gitlab-instance/yii-erp24!64
marina [Thu, 25 Apr 2024 14:57:54 +0000 (17:57 +0300)]
выправлен фильтр на странице /timetable/plan
Aleksey Filippov [Thu, 25 Apr 2024 14:55:47 +0000 (14:55 +0000)]
Merge branch 'feature_filippov_20240424_sales_fix' into 'develop'
правки по api
See merge request gitlab-instance/yii-erp24!63
Aleksey Filippov [Thu, 25 Apr 2024 14:54:13 +0000 (17:54 +0300)]
правки по api
Aleksey Filippov [Thu, 25 Apr 2024 14:21:09 +0000 (14:21 +0000)]
Merge branch 'feature_smirnov_2024_04_25_products_products_1c' into 'develop'
add products/products-1c
See merge request gitlab-instance/yii-erp24!62
Alexander Smirnov [Thu, 25 Apr 2024 14:19:28 +0000 (17:19 +0300)]
add products/products-1c
Aleksey Filippov [Wed, 24 Apr 2024 17:44:13 +0000 (17:44 +0000)]
Merge branch 'feature_smirnov_2024_04_24_bonus_bonus_users' into 'develop'
add bonus/bonus-users
See merge request gitlab-instance/yii-erp24!61
Alexander Smirnov [Wed, 24 Apr 2024 15:46:02 +0000 (18:46 +0300)]
add bonus/bonus-users
Aleksey Filippov [Wed, 24 Apr 2024 13:16:59 +0000 (13:16 +0000)]
Merge branch 'feature_pavlikov_20240424_palnogramma_edit' into 'develop'
фикс модуля polnogramm edit
See merge request gitlab-instance/yii-erp24!60
pavlikov_maxim [Wed, 24 Apr 2024 12:49:43 +0000 (15:49 +0300)]
фикс модуля polnogramm edit
Aleksey Filippov [Wed, 24 Apr 2024 12:06:38 +0000 (12:06 +0000)]
Merge branch 'fix_timetable_query' into 'develop'
выправлен вызов модалки на странице /timetable/fact
See merge request gitlab-instance/yii-erp24!59
marina [Wed, 24 Apr 2024 12:04:04 +0000 (15:04 +0300)]
выправлен вызов модалки на странице /timetable/fact
Aleksey Filippov [Wed, 24 Apr 2024 12:00:32 +0000 (12:00 +0000)]
Merge branch 'feature_pavlikov_20240424_palnogramma_edit' into 'develop'
фикс модуля polnogramm edit
See merge request gitlab-instance/yii-erp24!58
pavlikov_maxim [Wed, 24 Apr 2024 11:22:04 +0000 (14:22 +0300)]
фикс модуля polnogramm edit
Aleksey Filippov [Wed, 24 Apr 2024 08:40:28 +0000 (08:40 +0000)]
Merge branch 'feature_filippov_20240424_sales_fix' into 'develop'
правки по дашборду Продажи сегодня
See merge request gitlab-instance/yii-erp24!57
Aleksey Filippov [Wed, 24 Apr 2024 08:39:40 +0000 (11:39 +0300)]
правки по дашборду Продажи сегодня
Aleksey Filippov [Tue, 23 Apr 2024 18:51:51 +0000 (18:51 +0000)]
Merge branch 'bugfix_smirnov_2024_04_23_shipment_shipment_p2' into 'develop'
shipment shipment fix 2
See merge request gitlab-instance/yii-erp24!56
Alexander Smirnov [Tue, 23 Apr 2024 18:43:28 +0000 (21:43 +0300)]
shipment shipment fix 2
Aleksey Filippov [Tue, 23 Apr 2024 14:42:26 +0000 (14:42 +0000)]
Merge branch 'bugfix_smirnov_2024_04_23_shipment_shipment' into 'develop'
shipment bugfixment
See merge request gitlab-instance/yii-erp24!55
Alexander Smirnov [Tue, 23 Apr 2024 14:39:55 +0000 (17:39 +0300)]
shipment bugfixment
Aleksey Filippov [Tue, 23 Apr 2024 12:39:15 +0000 (12:39 +0000)]
Merge branch 'feature_smirnov_2024_04_22_shipment_polnogramm' into 'develop'
shipment polnogram
See merge request gitlab-instance/yii-erp24!54
Alexander Smirnov [Tue, 23 Apr 2024 09:15:42 +0000 (12:15 +0300)]
shipment polnogram
Aleksey Filippov [Mon, 22 Apr 2024 13:45:30 +0000 (13:45 +0000)]
Merge branch 'feature_pavlikov_20240422_shipment_info' into 'develop'
фикс модуля couriers stats
See merge request gitlab-instance/yii-erp24!53
pavlikov_maxim [Mon, 22 Apr 2024 13:39:11 +0000 (16:39 +0300)]
фикс модуля couriers stats
Aleksey Filippov [Mon, 22 Apr 2024 12:02:50 +0000 (12:02 +0000)]
Merge branch 'feature_pavlikov_20240422_couriers_stats' into 'develop'
фикс модуля couriers stats
See merge request gitlab-instance/yii-erp24!52
pavlikov_maxim [Mon, 22 Apr 2024 11:59:24 +0000 (14:59 +0300)]
фикс модуля couriers stats
Aleksey Filippov [Mon, 22 Apr 2024 11:20:49 +0000 (11:20 +0000)]
Merge branch 'feature_filippov_20240422_shipments_ajax_field_edit_fix' into 'develop'
правки по автозаказу фикс редактирования полей ajax
See merge request gitlab-instance/yii-erp24!51
Aleksey Filippov [Mon, 22 Apr 2024 11:19:08 +0000 (14:19 +0300)]
правки по автозаказу фикс редактирования полей ajax
Aleksey Filippov [Mon, 22 Apr 2024 10:37:41 +0000 (10:37 +0000)]
Merge branch 'feature_pavlikov_20240422_couriers_stats' into 'develop'
фикс модуля couriers stats
See merge request gitlab-instance/yii-erp24!50
projects / yii-erp24 / .git / log