Commit Graph

2135 Commits

Author SHA1 Message Date
abhishek-webkul
4404ccee51 Update form.tpl 2024-03-15 21:04:13 +05:30
abhishek-webkul
c17a992aa7 Merge branch 'develop' into gli-1619 2024-03-15 21:03:24 +05:30
Rohit Jain
e398e69a77 Merge pull request #924 from shreesh-webkul/gli-1775
Fixed: Incorrect room price and final price when admin remove service product or update room price from admin end and proceed for payment at front office
2024-03-15 18:29:33 +05:30
Rohit Jain
303f01fd74 Merge pull request #916 from shreesh-webkul/gli-1767
Fixed: Auto added services price not showing in cart summary in admin book now page
2024-03-15 18:23:26 +05:30
Rohit Jain
7477563b35 Merge pull request #909 from vishal-singh-webkul/gli-1751
Fixed : Missing translation from the templates of the modules.
2024-03-15 18:22:26 +05:30
Rohit Jain
4a9d396445 Merge pull request #934 from vishal-singh-webkul/gli-1779
Fixed: If advance price rule discount is applied on a room type having auto add service with "Add price in room price", discounted price is not displayed on room block section in front office.
2024-03-15 18:22:13 +05:30
vishalsingh.qlo325
a59482235b Merge branch 'origin/develop' into gli-1751 2024-03-15 17:58:26 +05:30
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
54f929a35c Merge pull request #885 from abhishek-webkul/gli-1608
Updated: Address country of demo customer 'pub@qloapps.com' changed to website default country
2024-03-15 16:30: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
Rohit Jain
d4a72ac549 Merge pull request #901 from sumitwebkul/gli-963
Added: Upgrade of rooms while reallocation and also fixed reallocation and swapping issues
2024-03-15 16:26:30 +05:30
vishalsingh.qlo325
afdcee9179 Merge branch 'origin/develop' into gli-1748 2024-03-15 15:22:23 +05:30
vishalsingh.qlo325
118404f0dc Merge branch 'origin/develop' into gli-1751 2024-03-15 15:19:23 +05:30
vishalsingh.qlo325
8233009047 Merge branch 'origin/develop' into gli-1751 2024-03-15 15:13:22 +05:30
Sumit Panwar
14d042f37f Conflicts resolved 2024-03-15 14:43:39 +05:30
Rohit Jain
a437cca465 Merge pull request #914 from abhishek-webkul/gli-1737
Fixed: Unable to create new account on checkout page
2024-03-15 13:43:19 +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
9ee2ce3637 Merge pull request #882 from abhishek-webkul/gli-1356
Added: Links of Suggested Modules and Themes during installation
2024-03-15 13:04:50 +05:30
Rohit Jain
befe40af1b Merge pull request #860 from abhishek-webkul/gli-981
Fixed: Front office 'hotel-reservation-theme' RTL compatibility
2024-03-15 13:04:00 +05:30
Rohit Jain
69f3920b1f Merge pull request #833 from abhishek-webkul/gli-1043
Added: 'Show at front office' option to enable/disable booking from front office
2024-03-15 12:58:52 +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
c3f5371b87 Merge pull request #728 from abhishek-webkul/gli-1507
Removed: Unused module folders from themes/hotel-reservation-theme/
2024-03-15 12:48:50 +05:30
Rohit Jain
89518b578f Merge pull request #891 from abhishek-webkul/gli-1637
Updated: Design of back office page toolbar
2024-03-15 12:46:17 +05:30
Rohit Jain
59d6876c02 Merge pull request #810 from abhishek-webkul/gli-927
Use datepicker plugin to format dates using $.datepicker.parseDate() wherever applicable
2024-03-15 12:43:48 +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
ff7229b48d Merge pull request #894 from abhishek-webkul/gli-1660
Added: Allow modules to override module admin and front controllers
2024-03-15 12:28:02 +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
2b7a78665d Merge pull request #907 from vishal-singh-webkul/gli-1747
Fixed:  Room reallocation process on AdminHotelRoomsBooking controller caused by space in the name of the room.
2024-03-15 12:22:54 +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
906b432817 Merge pull request #917 from vishal-singh-webkul/gli-1539
Fixed:: Order currency symbol changes on currency change event on order confirmation page.
2024-03-15 12:20:00 +05:30
Rohit Jain
b0f3709862 Merge pull request #824 from shreesh-webkul/gli-1449
Fixed: Allotment Type selection in partial available rooms in book now page
2024-03-15 12:18:27 +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
31dea14fd3 Merge pull request #929 from vishal-singh-webkul/gli-1700
Fixed: AdminOrdersRefundRequestsController showing exception to all employees except the super admin.
2024-03-15 12:14:00 +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
868e81709f Merge pull request #915 from shreesh-webkul/gli-1761
Resolved: translated text not visible on admin controllers
2024-03-15 12:10:04 +05:30
Rohit Jain
1c080ed6d5 Merge pull request #906 from shreesh-webkul/gli-1735-2
Fix: When no tax is applies on room extra services, service tax column is shown empty in invoice
2024-03-15 12:09:14 +05:30
Rohit Jain
52cf39abb5 Merge pull request #903 from shreesh-webkul/gli-912
Fix: Smarty index.php in smarty cache and compile directory gets deleted when clearing cache
2024-03-15 12:08:35 +05:30
Rohit Jain
a8079d5b8c Merge pull request #872 from shreesh-webkul/gli-659
Fixed: Invalid tax details in invoice and credit slips
2024-03-15 12:07:41 +05:30
Rohit Jain
72b63dac0a Merge pull request #921 from shreesh-webkul/gli-1535
Fixed: Pricing issue in order confirmation email
2024-03-15 12:04:28 +05:30
Rohit Jain
35be00af4a Merge pull request #874 from shreesh-webkul/gli-933
Fixed: Incorrect forcast data in "stats Dasboard" tab  in admin stats page
2024-03-15 12:03:10 +05:30
Rohit Jain
33ab4f34a8 Merge pull request #925 from shreesh-webkul/gli-1754
Fixed: Multiple Advance Price Rule can be created with same conditions
2024-03-15 12:02:17 +05:30
Rohit Jain
74e0a95941 Merge pull request #904 from shreesh-webkul/gli-1734
Fixed: Wrong room price calculated in booking popup and cart dropdown in front office
2024-03-15 12:01:31 +05:30