Commit Graph

68 Commits

Author SHA1 Message Date
Sumit Panwar
0c86d0d353 Conflicts resolved 2024-03-15 13:42:48 +05:30
Sumit Panwar
2f14333b16 Merge branch 'develop' into gli-1607 2024-03-15 13:35:06 +05:30
Rohit Jain
1f39f2412a Merge pull request #762 from abhishek-webkul/gli-1445
Updated: Search Results Page Filters options have been moved to module wkhotelfilterblock
2024-03-15 12:58:09 +05:30
Rohit Jain
045213475a Merge pull request #819 from abhishek-webkul/gli-1447
Added: Configuration to show or hide 'Date of Birth' field in customer registration and customer information form at front office
2024-01-25 17:39:37 +05:30
Sumit Panwar
85890c05f3 Merge branch 'webkul:develop' into gli-1607 2024-01-13 15:53:59 +05:30
Sumit Panwar
3e09c4c2c5 Added: Configuration in Preferences->order tab for price display currency in order list page 2023-10-05 18:35:14 +05:30
Abhishek Kumar
da391c9e9e Do not add tab AdminParentStats on installation 2023-09-12 18:36:34 +05:30
Abhishek Kumar
7df5c2d4cc Remove tabs Search Engines and Referers from Stats tab 2023-09-07 20:01:08 +05:30
Abhishek Kumar
9325301e48 Add configuration to show or not the customer birthday field 2023-08-24 20:17:04 +05:30
Abhishek Kumar
dfc9aab4dc Revert PR #471 2023-08-07 14:46:44 +05:30
Shreesh Arora
3fbe592cd0 Merge branch 'develop' into gli-886 2023-03-25 18:59:25 +05:30
lakshya.chauhan193
08b8d39ad2 added is_cancelled column in orderdetail table 2023-03-24 19:50:58 +05:30
lakshya.chauhan193
d2e03bd8fd resolved refund request payment calculation 2023-03-15 20:02:11 +05:30
Shreesh Arora
29bc2aeb90 fix service products category group 2023-03-07 12:03:17 +00:00
Abhishek Kumar
de1846ec9f Fix stats 2023-03-02 15:11:10 +05:30
Shreesh Arora
a02fceb331 Added feature service products as normal product 2023-02-23 13:17:45 +05:30
Shreesh Arora
2fcc8fecf3 Merge branch 'origin/develop' into qlo-update-order-status 2023-01-20 18:11:22 +05:30
Rohit Jain
0f957224ae Merge pull request #500 from abhishek-webkul/update-refund-states
Improve order refund flow
2023-01-20 16:52:53 +05:30
Shreesh Arora
e904b733b5 updated order statuses icons and mail templates 2023-01-19 14:43:02 +05:30
Abhishek Kumar
8a05bf90c9 Add refund state configuration keys 2023-01-19 12:37:36 +05:30
Rohit Jain
c8bdac6cdd Merge pull request #459 from lakshya-webkul/gli-1046
Security update: Allow admin user to configure the SameSite cookie attribute
2023-01-04 19:42:23 +05:30
Rohit Jain
bd846c95da Merge pull request #471 from abhishek-webkul/gli-1081
Move filter options to Preferences > Room Types page
2023-01-04 19:12:52 +05:30
Shreesh Arora
8e0702c9e8 Merge branch 'origin/develop' into qlo-update-order-status 2023-01-04 18:21:46 +05:30
Shreesh Arora
c47ff9fb3d updated order status logo 2022-12-30 13:13:14 +05:30
Abhishek Kumar
c43d258240 Update order refund states 2022-12-28 13:41:02 +05:30
Shreesh Arora
be780220dc update order status name 2022-12-27 14:55:33 +05:30
abhishek-webkul
9b000b65de Merge branch 'develop' into gli-1081 2022-12-23 17:48:24 +05:30
Shreesh Arora
e50ec74d7c Merge 'origin/develop' into gli-552 2022-12-22 20:06:12 +05:30
Shreesh Arora
684f6a964b Merge remote-tracking branch 'origin/develop' into qlo-update-order-status 2022-12-22 06:25:35 +00:00
abhishek-webkul
ff3d3d97b7 Merge branch 'develop' into stats 2022-12-13 18:32:19 +05:30
Rohit Jain
2fd608c713 Merge pull request #469 from shreesh-webkul/gli-1085
Enable Re-display cart at login by default
2022-12-12 20:43:30 +05:30
Shreesh Arora
9d36f46487 updated remote payment configuration 2022-12-07 15:59:45 +05:30
Shreesh Arora
879be11fbd update code 2022-12-07 15:36:20 +05:30
Shreesh Arora
6f593626c7 enable re-display cart by default 2022-12-07 12:18:21 +05:30
Shreesh Arora
fc3912d24e using image type for hotel images and using standard size fr other images 2022-12-06 16:00:25 +05:30
Shreesh Arora
0dcbcbbd4c order statuses reorder 2022-12-05 21:04:07 +00:00
lakshya.chauhan193
579fadee67 Allow admin user to configure the SameSite cookie attribute 2022-12-02 13:15:05 +05:30
Abhishek Kumar
3998a2ee60 Resolve merge conflicts 2022-11-30 19:39:37 +05:30
Abhishek Kumar
41b6b4caa2 Move search filters to Room Types configurations page 2022-11-28 19:35:15 +05:30
Shreesh Arora
da494b89d9 update configuration key for statuses 2022-11-23 15:52:26 +05:30
Shreesh Arora
5d3ac1158a Merge branch 'develop' into qlo-catalog-update 2022-11-21 14:48:46 +05:30
Rohit Jain
8702ff1cda Merge pull request #401 from abhishek-webkul/gli-771
Remove unused modules
2022-11-10 17:13:01 +05:30
Shreesh Arora
5e9a3990a2 added catalog page, updated dashboard and added recomendation section 2022-11-10 14:37:25 +05:30
Abhishek Kumar
b8d1504868 Add new stats on dashboard and improve stats presentations and calculations 2022-11-03 16:48:03 +05:30
Rohit Jain
92ec35ee71 Merge pull request #410 from abhishek-webkul/gli-888
Add hotel images under room information on room type detail page
2022-10-12 18:36:45 +05:30
Shreesh Arora
2dc9a6860e removed extra order statuses and updated module statuses 2022-08-22 18:47:22 +05:30
abhishek-webkul
54bdc4aaed Merge branch 'develop' into gli-771 2022-07-15 12:34:28 +05:30
Rohit Jain
088a127789 Merge pull request #383 from abhishek-webkul/gli-269
Remove Catalog > Tags page and Tags field from room type edit page
2022-06-27 17:34:49 +05:30
Abhishek Kumar
60fea3b4ec Add hotel images under room information on room type detail page 2022-06-22 19:27:03 +05:30
Abhishek Kumar
091b566fe5 Add hooks actionSubmitIdentityBefore and displayCartRoomImageAfter 2022-06-01 16:26:36 +05:30