]>
gitweb.erp-flowers.ru Git - yii-erp24/.git/log
Alexander Smirnov [Mon, 13 May 2024 13:44:59 +0000 (16:44 +0300)]
dashboard service fix
Aleksey Filippov [Mon, 13 May 2024 12:48:50 +0000 (12:48 +0000)]
Merge branch 'bugfix_smirnov_2024_05_13_erp_16_dashboard_sales_fix' into 'develop'
fix to_char in dashboard/sales
See merge request gitlab-instance/yii-erp24!130
Alexander Smirnov [Mon, 13 May 2024 12:39:21 +0000 (15:39 +0300)]
fix to_char in dashboard/sales
Aleksey Filippov [Mon, 13 May 2024 08:37:29 +0000 (08:37 +0000)]
Merge branch 'feature_filippov_20240508_list_admins_disable_history' into 'develop'
правки по списку сотрудников с зп
See merge request gitlab-instance/yii-erp24!129
Aleksey Filippov [Mon, 13 May 2024 07:07:24 +0000 (10:07 +0300)]
правки по списку сотрудников с зп
Aleksey Filippov [Wed, 8 May 2024 11:46:50 +0000 (11:46 +0000)]
Merge branch 'feature_smirnov_2024_05_08_kik_feedback_order_id_in_code' into 'develop'
add order_id field to kikFeedbackRequest
See merge request gitlab-instance/yii-erp24!127
Aleksey Filippov [Wed, 8 May 2024 11:46:24 +0000 (11:46 +0000)]
Merge branch 'feature_smirnov_2024_05_08_kik_feedback_order_id_in_migration' into 'develop'
kik feedback request order id migration
See merge request gitlab-instance/yii-erp24!128
Alexander Smirnov [Wed, 8 May 2024 11:44:12 +0000 (14:44 +0300)]
kik feedback request order id migration
Alexander Smirnov [Wed, 8 May 2024 11:30:44 +0000 (14:30 +0300)]
add order_id field to kikFeedbackRequest
Aleksey Filippov [Wed, 8 May 2024 11:28:50 +0000 (11:28 +0000)]
Merge branch 'feature_filippov_20240508_edit_console_config' into 'develop'
правки по настройке подключения к БД из консоли
See merge request gitlab-instance/yii-erp24!126
Aleksey Filippov [Wed, 8 May 2024 11:27:43 +0000 (14:27 +0300)]
правки по настройке подключения к БД из консоли
Aleksey Filippov [Wed, 8 May 2024 10:18:25 +0000 (10:18 +0000)]
Merge branch 'fix_selfie' into 'develop'
убрана лишний слеш из-за которого не отображалось фото на рабочем месте
See merge request gitlab-instance/yii-erp24!123
Aleksey Filippov [Wed, 8 May 2024 09:25:58 +0000 (09:25 +0000)]
Merge branch 'bugfix_smirnov_2024_05_08_bonus_service_empty_levels_part2' into 'develop'
levels are empty
See merge request gitlab-instance/yii-erp24!125
Alexander Smirnov [Wed, 8 May 2024 09:20:59 +0000 (12:20 +0300)]
levels are empty
Aleksey Filippov [Wed, 8 May 2024 09:11:56 +0000 (09:11 +0000)]
Merge branch 'bugfix_smirnov_2024_05_08_bonus_service_empty_levels' into 'develop'
empty bonus levels
See merge request gitlab-instance/yii-erp24!124
Alexander Smirnov [Wed, 8 May 2024 09:09:58 +0000 (12:09 +0300)]
empty bonus levels
marina [Wed, 8 May 2024 06:21:59 +0000 (09:21 +0300)]
убрана лишний слеш из-за которого не отображалось фото на рабочем месте
Aleksey Filippov [Tue, 7 May 2024 11:52:42 +0000 (11:52 +0000)]
Merge branch 'feature_pavlikov_20240705_timezone_fix' into 'develop'
timezone fix
See merge request gitlab-instance/yii-erp24!122
pavlikov_maxim [Tue, 7 May 2024 11:39:01 +0000 (14:39 +0300)]
timezone fix
Aleksey Filippov [Tue, 7 May 2024 11:24:00 +0000 (11:24 +0000)]
Merge branch 'bugfix_smirnov_2024_05_07_bonus_ajax_show_check' into 'develop'
ajax show check fix
See merge request gitlab-instance/yii-erp24!121
Alexander Smirnov [Tue, 7 May 2024 11:00:42 +0000 (14:00 +0300)]
ajax show check fix
Aleksey Filippov [Tue, 7 May 2024 10:54:10 +0000 (10:54 +0000)]
Merge branch 'bugfix_smirnov_2024_05_07_shipment_shipment_form_csrf' into 'develop'
shipment shipment form csrf
See merge request gitlab-instance/yii-erp24!120
Alexander Smirnov [Tue, 7 May 2024 10:42:48 +0000 (13:42 +0300)]
shipment shipment form csrf
Aleksey Filippov [Tue, 7 May 2024 10:28:59 +0000 (10:28 +0000)]
Merge branch 'feature_smirnov_2024_05_07_item_items_site' into 'develop'
item item site
See merge request gitlab-instance/yii-erp24!119
Alexander Smirnov [Tue, 7 May 2024 08:48:12 +0000 (11:48 +0300)]
item item site
Aleksey Filippov [Tue, 7 May 2024 07:41:04 +0000 (07:41 +0000)]
Merge branch 'bugfix_smirnov_2024_05_07_bc_124' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!118
Alexander Smirnov [Tue, 7 May 2024 07:22:49 +0000 (10:22 +0300)]
fix
Aleksey Filippov [Tue, 7 May 2024 06:45:32 +0000 (06:45 +0000)]
Merge branch 'bugfix_smirnov_2024_05_06_sales_phone_filter' into 'develop'
sales phone filter fix
See merge request gitlab-instance/yii-erp24!117
Alexander Smirnov [Mon, 6 May 2024 16:04:47 +0000 (19:04 +0300)]
sales phone filter fix
Aleksey Filippov [Mon, 6 May 2024 15:10:30 +0000 (15:10 +0000)]
Merge branch 'bugfix_smirnov_2024_05_06_timetable_start_shift_step_two_last_check_in' into 'develop'
Просмотр последнего дня необходим для нахождения предыдущего чекина, остальные не релевантны
See merge request gitlab-instance/yii-erp24!116
Alexander Smirnov [Mon, 6 May 2024 15:01:40 +0000 (18:01 +0300)]
Просмотр последнего дня необходим для нахождения предыдущего чекина, остальные не релевантны
Aleksey Filippov [Mon, 6 May 2024 11:51:56 +0000 (11:51 +0000)]
Merge branch 'feature_pavlikov_20240305_store_plan' into 'develop'
store plan page
See merge request gitlab-instance/yii-erp24!115
Aleksey Filippov [Mon, 6 May 2024 11:51:26 +0000 (11:51 +0000)]
Merge branch 'bugfix_smirnov_2024_05_06_users_stop_list_like_quote' into 'develop'
single quote for values
See merge request gitlab-instance/yii-erp24!114
pavlikov_maxim [Mon, 6 May 2024 11:50:30 +0000 (14:50 +0300)]
store plan page
Alexander Smirnov [Mon, 6 May 2024 11:49:35 +0000 (14:49 +0300)]
single quote for values
Aleksey Filippov [Mon, 6 May 2024 09:45:15 +0000 (09:45 +0000)]
Merge branch 'feature_filippov_20240506_payroll_make_start_fix' into 'develop'
правки по запуску зарплатной ведомости
See merge request gitlab-instance/yii-erp24!113
Aleksey Filippov [Mon, 6 May 2024 09:42:07 +0000 (12:42 +0300)]
правки по запуску зарплатной ведомости
Aleksey Filippov [Mon, 6 May 2024 09:32:59 +0000 (09:32 +0000)]
Merge branch 'feature_pavlikov_20240305_store_plan' into 'develop'
store plan page
See merge request gitlab-instance/yii-erp24!112
pavlikov_maxim [Mon, 6 May 2024 08:58:23 +0000 (11:58 +0300)]
store plan page
Aleksey Filippov [Sat, 4 May 2024 08:05:05 +0000 (08:05 +0000)]
Merge branch 'feature_filippov_20240503_amo_upload_fix' into 'develop'
Feature filippov
20240503 amo upload fix
See merge request gitlab-instance/yii-erp24!111
Aleksey Filippov [Sat, 4 May 2024 08:03:35 +0000 (11:03 +0300)]
правки по загрузке данных из АМО
Aleksey Filippov [Sat, 4 May 2024 06:42:19 +0000 (09:42 +0300)]
правки по загрузке данных из АМО
Aleksey Filippov [Fri, 3 May 2024 21:01:47 +0000 (21:01 +0000)]
Merge branch 'feature_filippov_20240503_amo_upload_fix' into 'develop'
правки по загрузке данных из АМО
See merge request gitlab-instance/yii-erp24!110
Aleksey Filippov [Fri, 3 May 2024 21:00:45 +0000 (00:00 +0300)]
правки по загрузке данных из АМО
Aleksey Filippov [Fri, 3 May 2024 13:46:55 +0000 (13:46 +0000)]
Merge branch 'bugfix_smirnov_2024_05_03_admin_person_bonuses_fix' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!109
Aleksey Filippov [Fri, 3 May 2024 13:45:40 +0000 (13:45 +0000)]
Merge branch 'feature_smirnov_2024_05_03_api3_notifiable_expired_bonuses_fix' into 'develop'
fix
See merge request gitlab-instance/yii-erp24!107
Alexander Smirnov [Fri, 3 May 2024 13:38:09 +0000 (16:38 +0300)]
fix
Aleksey Filippov [Fri, 3 May 2024 10:47:09 +0000 (10:47 +0000)]
Merge branch 'feature_filippov_20240503_api_amo_integration_new_token' into 'develop'
правки по загрузке данных из АМО
See merge request gitlab-instance/yii-erp24!108
Aleksey Filippov [Fri, 3 May 2024 10:45:30 +0000 (13:45 +0300)]
правки по загрузке данных из АМО
Alexander Smirnov [Fri, 3 May 2024 10:13:47 +0000 (13:13 +0300)]
fix
Aleksey Filippov [Fri, 3 May 2024 09:30:30 +0000 (09:30 +0000)]
Merge branch 'feature_filippov_20240503_payroll_run_fix' into 'develop'
правки по загрузке данных
See merge request gitlab-instance/yii-erp24!106
Aleksey Filippov [Fri, 3 May 2024 09:19:06 +0000 (12:19 +0300)]
правки по загрузке данных
Aleksey Filippov [Fri, 3 May 2024 09:15:41 +0000 (09:15 +0000)]
Merge branch 'feature_smirnov_2024_05_03_shipment_add_fix' into 'develop'
fix shipment add
See merge request gitlab-instance/yii-erp24!105
Alexander Smirnov [Fri, 3 May 2024 08:30:11 +0000 (11:30 +0300)]
fix shipment add
Aleksey Filippov [Fri, 3 May 2024 06:51:50 +0000 (06:51 +0000)]
Merge branch 'feature_filippov_20240503_payroll_run_fix' into 'develop'
правки по запуску зарплатной ведомости
See merge request gitlab-instance/yii-erp24!104
Aleksey Filippov [Fri, 3 May 2024 06:48:48 +0000 (09:48 +0300)]
правки по запуску зарплатной ведомости
Aleksey Filippov [Thu, 2 May 2024 13:42:28 +0000 (13:42 +0000)]
Merge branch 'feature_smirnov_2024_05_02_orders_delivery' into 'develop'
orders delivery
See merge request gitlab-instance/yii-erp24!102
Aleksey Filippov [Thu, 2 May 2024 13:41:57 +0000 (13:41 +0000)]
Merge branch 'feature_filippov_20240502_amo142_fix' into 'develop'
правки по загрузке данных
See merge request gitlab-instance/yii-erp24!103
Aleksey Filippov [Thu, 2 May 2024 13:40:32 +0000 (16:40 +0300)]
правки по загрузке данных
Alexander Smirnov [Thu, 2 May 2024 13:25:06 +0000 (16:25 +0300)]
orders delivery
Aleksey Filippov [Wed, 1 May 2024 11:52:33 +0000 (11:52 +0000)]
Merge branch 'feature_smirnov_2024_05_01_gitignore' into 'develop'
add .gitignore to api2
See merge request gitlab-instance/yii-erp24!101
Alexander Smirnov [Wed, 1 May 2024 11:51:31 +0000 (14:51 +0300)]
add .gitignore to api2
Aleksey Filippov [Wed, 1 May 2024 11:44:25 +0000 (11:44 +0000)]
Merge branch 'feature_smirnov_2024_04_27_cron_get_token' into 'develop'
amo get token
See merge request gitlab-instance/yii-erp24!100
Aleksey Filippov [Wed, 1 May 2024 11:37:23 +0000 (11:37 +0000)]
Merge branch 'feature_filippov_20240501_delivery_fix' into 'develop'
правки по доставке
See merge request gitlab-instance/yii-erp24!99
Aleksey Filippov [Wed, 1 May 2024 11:36:34 +0000 (14:36 +0300)]
правки по доставке
Aleksey Filippov [Wed, 1 May 2024 09:44:10 +0000 (09:44 +0000)]
Merge branch 'bugfix_smirnov_2024_04_01_bonus_bonus_users' into 'develop'
space between operators
See merge request gitlab-instance/yii-erp24!98
Alexander Smirnov [Wed, 1 May 2024 09:23:36 +0000 (12:23 +0300)]
space between operators
Aleksey Filippov [Tue, 30 Apr 2024 18:27:34 +0000 (18:27 +0000)]
Merge branch 'bugfix_smirnov_2024_04_30_api3_report_show' into 'develop'
fix api3 report show
See merge request gitlab-instance/yii-erp24!97
Alexander Smirnov [Tue, 30 Apr 2024 16:32:05 +0000 (19:32 +0300)]
fix api3 report show
Aleksey Filippov [Mon, 29 Apr 2024 12:48:23 +0000 (12:48 +0000)]
Merge branch 'feature_filippov_20240429_add_page_store_stats' into 'develop'
добавил страницу Статистика по остаткам
See merge request gitlab-instance/yii-erp24!96
Aleksey Filippov [Mon, 29 Apr 2024 12:31:27 +0000 (15:31 +0300)]
добавил страницу Статистика по остаткам
Aleksey Filippov [Mon, 29 Apr 2024 10:34:33 +0000 (10:34 +0000)]
Merge branch 'feature_filippov_20240429_timeteble_add_fix' into 'develop'
правки по графику план
See merge request gitlab-instance/yii-erp24!95
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
projects / yii-erp24 / .git / log