Commit Graph

133 Commits

Author SHA1 Message Date
Sumit Panwar
86b0834b7f resolved conflicts 2024-07-27 15:59:29 +05:30
Sumit Panwar
4d8affa891 Merge branch 'develop' into gli-2183 2024-07-13 17:11:36 +05:30
Sumit Panwar
03fcae1932 Fixed: Unused code removed came from merging the conflicts with develop branch 2024-07-13 10:26:17 +05:30
Sumit Panwar
0ca6d6bf75 Merge branch 'develop' into bo_order_design 2024-07-12 14:32:06 +05:30
vishalsingh.qlo325
2594424234 Updated variable names in ajax process verify customer email 2024-07-10 10:37:40 +05:30
Sumit Panwar
14792dbe66 Added: option to add/edit customer address from order detail page of BO 2024-07-09 14:48:12 +05:30
Sumit Panwar
5e276db6be Revert: Code for - Added: option to add/edit customer address from order detail page of BO 2024-07-09 13:25:19 +05:30
Sumit Panwar
d14173cbd0 Conflicts Resolved 2024-07-09 13:18:13 +05:30
vishalsingh.qlo325
74bba9eff0 Merge branch 'develop' into gli-2060 2024-07-08 15:40:36 +05:30
vishalsingh.qlo325
2fb73a0b4d Updated the process for verifying customer email using ajax process while admin is trying it add/update the customer account 2024-07-04 12:51:53 +05:30
vishalsingh.qlo325
196c37aa1f Merge branch 'develop' into gli-2060 2024-07-02 18:44:09 +05:30
Shreesh Arora
940e93626f Merge branch 'develop' into gli-1865 2024-07-02 17:11:37 +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
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
Sumit Panwar
4442977e6c conflicts resolved 2024-06-28 15:32:44 +05:30
vishalsingh.qlo325
e213a1cc5a Merge branch 'develop' into gli-2060 2024-06-28 15:14:46 +05:30
Sumit Panwar
0d6065d45b Merge branch 'develop' into reallocate-swap-issues 2024-06-28 15:07:23 +05:30
Sumit Panwar
8a2f4fbef6 Merge branch 'develop' into gli-1931 2024-06-28 15:03:23 +05:30
Sumit Panwar
0af629acfd Added: option to add/edit customer address from order detail page of BO 2024-06-24 20:49:31 +05:30
Sumit Panwar
a66501186c Fixed: Occupancy not selected properly while adding room to the order from back-office 2024-06-18 17:58:28 +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
53974df7da Merge branch 'develop' into gli-2060 2024-06-11 15:15:49 +05:30
Sumit Panwar
b923172439 Updated: Reallocation process from Book now must be as done in the Admin Order detail page 2024-06-10 19:37:59 +05:30
Sumit Panwar
54b8cbc04c Fixed: Issues while reallocation with different room type 2024-06-10 17:02:22 +05:30
Sumit Panwar
f864cb9bfd Merge branch 'develop' into reallocate-swap-issues 2024-06-09 15:12:59 +05:30
Sumit Panwar
5098c0ce67 Fixed: Add room booking modal element comes multiple time in the html when open the modal multiple times 2024-06-07 11:32:15 +05:30
Shreesh Arora
9b13577cda Remove: Retail price field with tax from manage service product panel 2024-06-06 20:12:31 +05:30
Abhishek Kumar
96b57f39c3 Fix attempts issue 2024-06-06 20:05:41 +05:30
Sumit Panwar
fd2042b7ee Fixed: No validation for length of characters in traveller detail fields in Front and Back office 2024-06-06 15:09:06 +05:30
Sumit Panwar
c018403e0c merge with develop 2024-06-05 16:26:53 +05:30
Sumit Panwar
033ffd5acb Updated: Text mentioned in the manual allotment is not visible on the order detail page 2024-06-04 16:26:17 +05:30
Sumit Panwar
04132d354c Fixed: Text mentioned in the manual allotment is not visible on the order detail page in back-office 2024-06-01 13:57:13 +05:30
vishalsingh.qlo325
1a4635e769 Fixed: admin can create new account using the baaned account email 2024-05-29 11:56:26 +05:30
Sumit Panwar
c91935a28d Fixed:The option to select children's age is not showing in the popup while editing occupancy on the order detail page. 2024-05-21 17:50:06 +05:30
Sumit Panwar
6ad9db9efe Fixed: if current room type has no rooms available then by default other available room type are not selected properly 2024-05-21 11:23:34 +05:30
Abhishek Kumar
7b03d06a38 Revert PR #789 and display occupancy on room type detail page using referer 2024-05-02 15:40:47 +05:30
Sumit Panwar
1e49ff071b Rollback css to legacy design of QloApps backoffice and loader added for all modals 2024-04-02 18:36:01 +05:30
Sumit Panwar
0089df14b9 Fixed: Data load issues in extra service show popop 2024-04-01 19:43:38 +05:30
Sumit Panwar
38db9dbb0b Design changes and issues resolved 2024-04-01 18:31:41 +05:30
Sumit Panwar
69d18058ce Resolved: issues when loading extra services in edit room modal after opening only display modal for extra service of the room 2024-04-01 14:07:33 +05:30
Sumit Panwar
5169b319ac Redesign of Order detail page of Back office 2024-04-01 13:24:32 +05:30
Rohit Jain
6263f497c6 Merge pull request #789 from abhishek-webkul/gli-1475
Updated: Set default occupancy chosen on search results, room type detail and admin book now pages
2024-03-18 15:23:06 +05:30
Rohit Jain
c1962e5b70 Merge pull request #895 from sumitwebkul/overbooking_issues
Fixed: Overbooking issues in QloApps and added new configurations for overbooking handling
2024-03-17 15:43:49 +05:30
Abhishek Kumar
c091cc07cd Merge branch 'develop' into gli-1475 2024-03-17 15:27:43 +05:30
amandeepsharma.qlo548
988a190ceb conflict issues resolved 2024-03-17 15:21:57 +05:30
Abhishek Kumar
a0cc454a26 Merge branch 'develop' into gli-1475 2024-03-17 15:21:32 +05:30
Shreesh Arora
06ad8ea0b4 Merge branch 'develop' into gli-1396 2024-03-17 14:56:41 +05:30
Rohit Jain
0e675bbf31 Merge pull request #871 from shreesh-webkul/gli-1659
Updated: Tax of room type will be applied  to auto add services having "price added to room price"
2024-03-17 14:45:52 +05:30
Shreesh Arora
d32f9639cc Merge branch 'develop' into gli-1374 2024-03-17 11:51:37 +05:30
Shreesh Arora
bc85f0b6ef Merge branch 'develop' into gli-1396 2024-03-17 11:27:29 +05:30