Commit Graph

905 Commits

Author SHA1 Message Date
Rohit Jain
fa19ec3dde Merge pull request #1128 from vishal-singh-webkul/gli-2032
Fixed: Admin is able to create account using 0 as email
2024-07-04 19:58:36 +05:30
Rohit Jain
c6d1715421 Merge pull request #1119 from vishal-singh-webkul/gli-1944
Added: check-all and uncheck-all option in the tree for normal products and scroll bar for the rendered tree.
2024-07-04 19:44:10 +05:30
Rohit Jain
597c43298b Merge pull request #1112 from shreesh-webkul/gli-1930
Fixed: Invalid Extra service price when a room with services is deleted from order
2024-07-04 19:38:37 +05:30
vishalsingh.qlo325
08a0f9fd3b Removed non required code 2024-07-04 11:29:26 +05:30
vishalsingh.qlo325
33a68bf0fc Merge branch 'develop' into gli-1944 2024-07-03 10:06:52 +05:30
vishalsingh.qlo325
18c34e04b7 Merge branch 'develop' into gli-2032 2024-07-02 18:45:18 +05:30
Shreesh Arora
79ba48a5c9 Merge branch 'develop' into gli-1930 2024-07-02 17:11:06 +05:30
Shreesh Arora
3e21a6b5f5 Merge branch 'develop' into gli-1620 2024-07-02 16:41:41 +05:30
Rohit Jain
65b4bc7799 Merge pull request #1127 from sumitwebkul/reallocate-swap-issues
Fixed: Issues in the updated(Room types upgrade/degrade) process of Reallocation and Swapping of rooms from back-office
2024-07-02 15:27:28 +05:30
Rohit Jain
e708020e4e Merge pull request #1124 from sumitwebkul/gli-2075
Added: New KPIs added in order view page in the Back-office
2024-07-02 15:24:41 +05:30
Rohit Jain
523f49521e Merge pull request #1122 from sumitwebkul/gli-1998
Fixed:Getting currency conversion issue in order if default currency is changed while creating booking from back-office
2024-07-02 15:24:29 +05:30
Rohit Jain
43386e3a44 Merge pull request #1113 from sumitwebkul/gli-1931
Fixed: No validation for length of characters in traveller detail fields in Front and Back office
2024-07-02 15:24:09 +05:30
Rohit Jain
9c2a9e256b Merge pull request #1097 from sumitwebkul/Refund-Process-Issues
Fixed: Issues in Refund management flow and Improved Order cancellation flow
2024-07-02 15:10:07 +05:30
Rohit Jain
c5122a507c Merge pull request #1085 from vishal-singh-webkul/gli-1946
Fixed:  Issues in admin cart rule controller.
2024-07-02 15:08:43 +05:30
Rohit Jain
9ec49c1d67 Merge pull request #1069 from vishal-singh-webkul/gli-2043
Fixed: While creating an account from the book now tab, the admin was able to select visitor and guest groups after submitting the ajax form once with errors.
2024-07-02 15:08:12 +05:30
Rohit Jain
2ec5b5113b Merge pull request #1068 from vishal-singh-webkul/gli-813
Added: Validation for the social name in the admin genders controller and changed the neutral gender to the other.
2024-07-02 15:05:31 +05:30
Rohit Jain
37e03ca7f7 Merge pull request #1048 from vishal-singh-webkul/gli-1994
Fixed: The warning for invalid price shown on the Admin products controller if there is any error.
2024-07-02 15:01:35 +05:30
Rohit Jain
d5ec5fc720 Merge pull request #1042 from vishal-singh-webkul/gli-2102
Updated: Created different block for the customer general and customer KPI configuration in the customer preferences in the admin office.
2024-07-02 14:59:42 +05:30
Rohit Jain
36f8d2cddb Merge pull request #1018 from vishal-singh-webkul/gli-1818
Fixed: Notices and display issue when there is no rooms and no hotel available.
2024-07-02 14:20:01 +05:30
vishalsingh.qlo325
f2c9f26185 Updated the warning message for the invalid price for additional facilities in admin products controller 2024-07-02 12:10:36 +05:30
vishalsingh.qlo325
afe671a9eb Removed non required code and added validation in the Gender class 2024-07-02 10:52:51 +05:30
Sumit Panwar
4442977e6c conflicts resolved 2024-06-28 15:32:44 +05:30
vishalsingh.qlo325
c2a141c104 Merge branch 'develop' into gli-2032 2024-06-28 15:17:44 +05:30
vishalsingh.qlo325
f220ddf184 Merge branch 'develop' into gli-1944 2024-06-28 15:16:12 +05:30
Sumit Panwar
0d6065d45b Merge branch 'develop' into reallocate-swap-issues 2024-06-28 15:07:23 +05:30
Sumit Panwar
122f9cd801 Merge branch 'develop' into gli-2075 2024-06-28 15:05:53 +05:30
Sumit Panwar
5911c50161 Merge branch 'develop' into gli-1998 2024-06-28 15:04:45 +05:30
vishalsingh.qlo325
37dbb0b736 Merge branch 'develop' into gli-1946 2024-06-28 15:04:17 +05:30
Sumit Panwar
8a2f4fbef6 Merge branch 'develop' into gli-1931 2024-06-28 15:03:23 +05:30
vishalsingh.qlo325
b7d3c3fe24 Merge branch 'develop' into gli-2043 2024-06-28 15:01:58 +05:30
vishalsingh.qlo325
ec977a41a0 Merge branch 'develop' into gli-813 2024-06-28 15:00:54 +05:30
vishalsingh.qlo325
cf18e71dae Merge branch 'develop' into gli-1994 2024-06-28 12:54:17 +05:30
vishalsingh.qlo325
85f3ebacaa Merge branch 'develop' into gli-2102 2024-06-28 11:49:04 +05:30
vishalsingh.qlo325
15d18295f0 Removed the seperate saving process for the customer general and customer KPI configuration process 2024-06-28 11:48:35 +05:30
Rohit Jain
eaeee5090f Merge pull request #1030 from vishal-singh-webkul/gli-1690
Fixed: The errors not being displayed in the AdminThemesController in the back office.
2024-06-27 20:42:56 +05:30
Rohit Jain
18c021e89e Merge pull request #983 from shreesh-webkul/gli-1795
Fixed: number of associated room types are not shown according to hotel permission in admin service product page
2024-06-27 20:34:29 +05:30
vishalsingh.qlo325
f8c4048e6e Merge branch 'develop' into gli-1690 2024-06-27 20:03:34 +05:30
vishalsingh.qlo325
182f27dd62 Updated the error message for theme compatible check 2024-06-27 20:03:31 +05:30
vishalsingh.qlo325
ab52e1ab8b Merge branch 'develop' into gli-1818 2024-06-27 19:50:24 +05:30
vishalsingh.qlo325
020c1986a3 Fixed fatal error caused by changing the in the AdminNormalProductsController 2024-06-27 16:31:11 +05:30
vishalsingh.qlo325
9c1c4dafd7 Merge branch 'develop' of https://github.com/vishal-singh-webkul/hotelcommerce into gli-1944 2024-06-27 16:28:47 +05:30
Rohit Jain
dfb1c5ec09 Merge pull request #1080 from abhishek-webkul/gli-1688
Added: Option 'Maximum Login Attempts' on Preferences > Maintenance page to allow certain number of employee login attempts
2024-06-25 20:14:27 +05:30
vishalsingh.qlo325
e98e60fd80 Updated the changes made in the previous commits 2024-06-21 11:18:50 +05:30
vishalsingh.qlo325
79d6dbaa6a Fixed: Admin normal products page errors when no hotel is created 2024-06-21 11:08:32 +05:30
Shreesh Arora
2c72e6cfcc Merge branch 'develop' into gli-1795 2024-06-20 13:09:23 +05:30
Shreesh Arora
b36f7735a4 Merge branch 'develop' into gli-1620 2024-06-20 12:49:29 +05:30
Sumit Panwar
322d5abe6d Refund/Cancel Statuses disabled on diffretent conditions to cancel of refund order status from Back office 2024-06-14 13:22:50 +05:30
Sumit Panwar
90166fde28 Fixed: Issues in refund info when order status is Payment error or booking directly cancelled 2024-06-14 12:58:43 +05:30
Sumit Panwar
113aae540f Resolved Refund issues and changed cancelled and refunded and payment error flow for refunds 2024-06-13 20:38:23 +05:30
vishalsingh.qlo325
6f9d5bccc4 Fixed: Admin was able to create account using 0 as email 2024-06-12 18:55:43 +05:30