Commit Graph

2188 Commits

Author SHA1 Message Date
Rohit Jain
c6352de17a Merge pull request #835 from abhishek-webkul/gli-1066
Updated: Make Customer Groups inaccessible if option Customer Groups is disabled on Advanced Parameters > Performance page
2024-03-15 16:55:30 +05:30
Rohit Jain
638b94e175 Merge pull request #939 from vishal-singh-webkul/gli-1309_2
Updated: Optimized search results in the admin search page.
2024-03-15 16:42:18 +05:30
Rohit Jain
2e4586bc10 Merge pull request #936 from vishal-singh-webkul/gli-1748
Fixed: Date selection corrections at different places in admin controllers.
2024-03-15 16:42:05 +05:30
Rohit Jain
5c4c20372c Merge pull request #896 from sumitwebkul/gli-1607
Added: Configuration for Showing prices in Order list in (Default currency or Payment Currency)
2024-03-15 16:27:16 +05:30
Shreesh Arora
491af40f09 Merge remote-tracking branch 'origin/develop' into gli-1753 2024-03-15 16:20:12 +05:30
Shreesh Arora
8ce12fbfa9 Added: Admin can add custom price for facilities and service while editing order 2024-03-15 16:13:46 +05:30
vishalsingh.qlo325
afdcee9179 Merge branch 'origin/develop' into gli-1748 2024-03-15 15:22:23 +05:30
Sumit Panwar
14d042f37f Conflicts resolved 2024-03-15 14:43:39 +05:30
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
5e04fd22e9 Merge pull request #779 from abhishek-webkul/gli-1503
Fixed: Module zip validation on Module upload on Modules and Services page
2024-03-15 13:06:49 +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
32fcacccdc Merge pull request #798 from abhishek-webkul/gli-1502
Move navbar Customer Support contact settings to Hotel Reservation System > Settings > General Settings page
2024-03-15 12:43:21 +05:30
Rohit Jain
e0828d1ea6 Merge pull request #841 from shreesh-webkul/gli-1332
Updated: Prevent room deletion and room status update to inactive when room has future booking
2024-03-15 12:38:05 +05:30
Rohit Jain
3fb7822329 Merge pull request #815 from abhishek-webkul/gli-1381
Updated: Added Rooms filter and added suggestions for Hotel and Room type filter inputs on admin orders list page
2024-03-15 12:27:01 +05:30
Rohit Jain
0009956058 Merge pull request #826 from abhishek-webkul/gli-1532
Updated: Filter by Places panel removed and added advanced filters and room type positioning on Manage Room Types page at back office
2024-03-15 12:25:27 +05:30
Rohit Jain
c6d066b7ed Merge pull request #913 from vishal-singh-webkul/gli-1736_2
Fixed: Added auto add services to the rooms added to the order by admin on edit order from the admin panel
2024-03-15 12:21:21 +05:30
Rohit Jain
25bb332193 Merge pull request #928 from vishal-singh-webkul/gli-1683
Added: Hooks in the AdminDashDashboardController and in some template files.
2024-03-15 12:16:33 +05:30
Rohit Jain
96783770fc Merge pull request #933 from vishal-singh-webkul/gli-1781
Fixed: Admin is able to add/update the quantity of auto added services from the AdminOrdersController, while updating any order.
2024-03-15 12:16:05 +05:30
Rohit Jain
4ba1c5b172 Merge pull request #930 from vishal-singh-webkul/gli-1752
Removed:: Hotel wise access restriction for the employees on AdminCustomerController
2024-03-15 12:13:01 +05:30
Rohit Jain
e525993331 Merge pull request #932 from vishal-singh-webkul/gli-1756
Removed: Hotel wise access for the employees on the customers addresses
2024-03-15 12:12:43 +05:30
Rohit Jain
47816ea8f8 Merge pull request #926 from abhishek-webkul/gli-1785
Updated: Renamed tab Configure to Rooms on Catalog > Manage Room Types page
2024-03-15 12:00:18 +05:30
Rohit Jain
e8cca562e9 Merge pull request #937 from vishal-singh-webkul/gli-1711
Added: Hotel wise restriction on the customer messages belonging to an order.
2024-03-15 11:58:44 +05:30
Rohit Jain
252da3840a Merge pull request #935 from vishal-singh-webkul/gli-1743
Added New hooks in AdminProductsController, ObjectModel and in some template files.
2024-03-15 11:57:27 +05:30
Rohit Jain
83604ff7d8 Merge pull request #804 from abhishek-webkul/gli-996
Updated flow of blocknewsletter module
2024-03-15 11:51:23 +05:30
Rohit Jain
973ef4d7bf Merge pull request #940 from shreesh-webkul/gli-1707_2
Fixed: Employee was able to download invoice for all hotels from Admin Invoice controller
2024-03-15 11:32:44 +05:30
Shreesh Arora
cca6697387 Merge branch 'origin/develop' into gli-1078 2024-03-15 10:54:30 +05:30
vishalsingh.qlo325
f9e331838c Fixed the price calculation for same service on multiple rooms in order on order update 2024-03-15 10:45:01 +05:30
Sumit Panwar
a80249e315 conflicts resolved 2024-03-15 10:36:55 +05:30
Shreesh Arora
5f0bc9950c updated order edit restrictions 2024-03-15 10:25:00 +05:30
Sumit Panwar
d3aaf3fdc3 conflicts resolved 2024-03-15 10:23:58 +05:30
Sumit Panwar
bc05eae819 Merge branch 'develop' into overbooking_issues 2024-03-15 09:33:43 +05:30
Rohit Jain
321284e947 Merge pull request #859 from abhishek-webkul/gli-1370
Fixed: Admin login page opens in recommendations popup
2024-03-14 20:44:56 +05:30
Rohit Jain
b146659461 Merge pull request #883 from abhishek-webkul/gli-1671
Added: 'Save and stay' button on missing pages at back office
2024-03-14 20:39:06 +05:30
Rohit Jain
61c1a4c26b Merge pull request #890 from abhishek-webkul/gli-1652
Added: Service products can now be assigned to a room type from room type edit page at back office
2024-03-14 20:30:09 +05:30
Rohit Jain
509008b32e Merge pull request #801 from abhishek-webkul/gli-1405
Code for unused addons login feature at the back office has been commented
2024-03-14 20:29:24 +05:30
Rohit Jain
b9731bbfb1 Merge pull request #900 from sumitwebkul/dashboard_issues_final
Fixed: Dashboard stats issues and also improved the view of the dashboard
2024-03-14 20:04:59 +05:30
Rohit Jain
df4046b5d6 Merge pull request #792 from sumitwebkul/gli-1544
Fixed: Warnings displayed after deleting all booked rooms from the orders detail page in back-office
2024-03-14 20:02:06 +05:30
Shreesh Arora
0e554b4d4d updated admin payment country restriction panel 2024-03-14 19:35:28 +05:30
Shreesh Arora
6c0b943abd Fixed: Employee was able to download invoice for all hotels from Admin Invoice controller 2024-03-14 16:47:07 +05:30
vishalsingh.qlo325
8d96b12962 Removed mails from being sent on booking import, added more optimized validation to the import process 2024-03-14 16:45:00 +05:30
vishalsingh.qlo325
bba795faf5 Fixed function name in Group.php 2024-03-14 15:20:30 +05:30
vishalsingh.qlo325
8539c75820 Added country, states in address search results, added constants for the search type 2024-03-14 11:58:02 +05:30
Rohit Jain
21f1a22767 Merge pull request #856 from sumitwebkul/gli-1459
Fixed: Price conversion issues while changing currency in order detail page in back office
2024-03-13 20:34:13 +05:30
Rohit Jain
7a12b26c90 Merge pull request #854 from sumitwebkul/gli-1454-linked
Fixed: Errors shown on order detail page in back office when booked hotel is deleted
2024-03-13 19:33:22 +05:30
Rohit Jain
39354db431 Merge pull request #802 from sumitwebkul/gli-898
Fixed: Blank space displayed in Customer panel of order detail page in the back-office when customer has deleted
2024-03-13 19:29:03 +05:30
Rohit Jain
121da053af Merge pull request #793 from sumitwebkul/gli-1353
Fixed : Order status submitted even on clicking Cancel button while changing status from Bulk actions in orders list
2024-03-13 19:28:04 +05:30
Rohit Jain
49838e18b9 Merge pull request #791 from sumitwebkul/gli-1434
Fixed: Getting PS exception when admin sends <script> in the Message from admin order detail page
2024-03-13 19:22:33 +05:30
vishalsingh.qlo325
ecde8d0baa Added validation of the missing required fields from the csv file 2024-03-13 16:41:13 +05:30
vishalsingh.qlo325
4ec665427d Fixed: tax on the services on order date range update 2024-03-13 16:11:11 +05:30