Commit Graph

1901 Commits

Author SHA1 Message Date
amit sharma
475b0d9db9 Merge branch 'develop' into gli-2941 2026-07-13 13:28:38 +05:30
Rohit Jain
5b4d65cbb8 Merge pull request #1761 from Azhar-Webkul/gli-3044
Fixed: Make status optional in Bulk Update Rooms in back-office
2026-07-10 15:55:21 +05:30
azhar bhat
9884494f59 code optimization
Co-authored-by: Name <sumit201@webkul.in>
2026-07-06 13:14:21 +05:30
azhar bhat
9de0be290e Merge branch 'develop' into gli-2961 2026-07-02 16:47:15 +05:30
azhar bhat
5c73a8ea4b Fixed: Make status optional in Bulk Update Rooms in back-office
Co-authored-by: Name <sumit201@webkul.in>
2026-07-02 16:02:55 +05:30
Rohit Jain
74de5be267 Merge pull request #1732 from amitsharma322/gli-3022
Fix service product price removal from cart total after occupancy change for orders created via the back-office
2026-06-23 19:56:04 +05:30
Rohit Jain
a7c81072d2 Merge pull request #1750 from amitsharma322/gli-3039
Fixed: incorrect KPI implementation in AdminCartController view page in the back-office
2026-06-23 14:21:46 +05:30
Amit sharma
70b08b23e7 Fixed: correct KPI implementation on AdminCartController view page
Co-authored-by: Name <sumit201@webkul.in>
2026-06-17 15:39:41 +05:30
azhar bhat
cde7d4b7f8 Tooltip UI updated
Co-authored-by: Name <sumit201@webkul.in>
2026-06-17 15:36:56 +05:30
azhar bhat
db87a56a99 Merge branch 'develop' into gli-2961 2026-06-17 15:22:22 +05:30
varun kewlani
00c195e205 Merge branch 'develop' into gli-2852 2026-06-15 13:52:22 +05:30
shazar rahman
653fdf3f7f Fixed: KPI access is now under employee permission in back-office
Co-authored-by: Name <sumit201@webkul.in>
2026-06-12 17:50:59 +05:30
azhar bhat
0eb0e3ea3b Merge branch 'develop' into gli-2961 2026-06-12 12:12:19 +05:30
azhar bhat
e40c33aab7 Merge branch 'develop' into gli-2961 2026-06-05 12:10:57 +05:30
Amit sharma
0dc272fbff fix: preserve service product price in cart total after occupancy update 2026-06-04 17:00:19 +05:30
varun kewlani
8847cf8ddc Merge branch 'develop' into gli-2852 2026-06-04 11:46:05 +05:30
Amit sharma
76c2f688e8 Add a centralized, reusable back Office tooltip system 2026-06-02 18:57:56 +05:30
Amit sharma
90dcc1faff Merge branch 'develop' into gli-2941 2026-06-01 17:49:46 +05:30
Amit sharma
eb92d137d3 Merge branch 'develop' into gli-2939 2026-06-01 17:41:40 +05:30
Amit sharma
412f43919b Fix: Incorrect selling type context during order validation for multi-preference service products 2026-05-29 19:12:37 +05:30
Amit sharma
71cd5573da changes product const name 2026-05-29 13:14:04 +05:30
Amit sharma
fa775f8169 Refactor back office code by removing unused and redundant logic 2026-05-29 13:02:45 +05:30
Rohit Jain
de000a3b66 Merge pull request #1656 from Azhar-Webkul/gli-2963
Updated: Customer Service  Enhancements, bug fixes, and new features.
2026-05-28 21:04:04 +05:30
Rohit Jain
8015495ca7 Merge pull request #1719 from AradhanaSingh63/gli-3013
Fixed: Validate translation import files in back-office
2026-05-28 21:02:27 +05:30
Amit sharma
a940ad173e Fix: Incorrect Product Selling Type Handling During Order Validation 2026-05-28 19:37:51 +05:30
Amit sharma
3acacf95f9 Added: price calculation info tooltip on service products list 2026-05-26 17:53:50 +05:30
Amit sharma
bfb9d3ba3c Merge branch 'develop' into gli-2941 2026-05-25 14:42:51 +05:30
Amit sharma
b324022600 Fixed: Service product prices are incorrect when added to an order created in a different currency. 2026-05-25 14:33:49 +05:30
aradhana kumari
4bf8f43c57 Add some more restrictions
Co-authored-by: Name <sumit201@webkul.in>
2026-05-20 19:00:10 +05:30
Rohit Jain
64e9722e7e Merge pull request #1689 from amitsharma322/gli-2987
Fixed: Upgraded the password hashing algorithm from MD5 to bcrypt.
2026-05-19 13:23:14 +05:30
aradhana kumari
61ddc310c4 fix: prevent remote code execution in AdminTranslations language pack import
Co-authored-by: Name <sumit201@webkul.in>
2026-05-15 14:58:01 +05:30
aradhana kumari
ca1c222c36 Fixed: Prevent unauthorized file read via email parameter in ajax endpoint
Co-authored-by: Name <sumit201@webkul.in>
2026-05-15 12:30:30 +05:30
azhar bhat
a1f0dcdd1e remark message update 2026-05-11 18:26:47 +05:30
azhar bhat
f1d5aea8e5 Merge branch 'develop' into gli-2961 2026-05-11 18:02:13 +05:30
varun kewlani
e8299f1017 Merge branch 'develop' into gli-2852 2026-05-11 17:10:48 +05:30
azhar bhat
926ae19d90 Merge branch 'develop' into gli-2963 2026-05-08 20:20:31 +05:30
azhar bhat
470e66aa63 updated: remark feature
Co-authored-by: Name <sumit201@webkul.in>
2026-05-08 20:18:54 +05:30
Rohit Jain
b70cecfa8a Merge pull request #1709 from amitsharma322/gli-3004
Remove: Remove extra hook related to KPI from AdminOrderController in the back-office
2026-05-07 20:02:42 +05:30
Rohit Jain
cb14764513 Merge pull request #1665 from AradhanaSingh63/gli-2938
Added: Add configuration for infant age in GeneralSetting controller in back-office
2026-05-07 19:52:04 +05:30
Amit sharma
114d9498d8 Fixed: Fix code review changes
Co-authored-by: Name <sumit201@webkul.in>
2026-05-05 11:19:59 +05:30
Amit sharma
17abcc3f95 Merge branch 'develop' into gli-2910 2026-05-04 18:19:42 +05:30
Amit sharma
be95ca879f Merge branch 'develop' into gli-2987 2026-05-04 18:18:31 +05:30
Amit sharma
3ae1dd20a9 update desc hint in configuration 2026-05-04 12:01:10 +05:30
aradhana kumari
2394694b0a Update the validation
Co-authored-by: Name <sumit201@webkul.in>
2026-05-01 19:33:38 +05:30
aradhana kumari
685f37c4da Update the validation
Co-authored-by: Name <sumit201@webkul.in>
2026-05-01 19:22:05 +05:30
varun kewlani
971df08c5f fixed: removed pdf button from inittoolbar function, and added in initPageHeaderToolbar
Co-authored-by: Name <sumit201@webkul.in>
2026-05-01 13:21:27 +05:30
varun kewlani
fa22d23f75 removed print order button 2026-05-01 13:09:48 +05:30
varun kewlani
11bd6f9f0a Merge branch 'develop' into gli-2852 2026-05-01 12:44:48 +05:30
azhar bhat
7ade5a92d6 code optimized
Co-authored-by: Name <sumit201@webkul.in>
2026-05-01 12:17:50 +05:30
varun kewlani
ca6139bc50 Added feature: Booking Voucher PDF in order detail page
Co-authored-by: Name <sumit201@webkul.in>
2026-05-01 12:12:31 +05:30