Commit Graph

528 Commits

Author SHA1 Message Date
amandeepsharma.qlo548
988a190ceb conflict issues resolved 2024-03-17 15:21:57 +05:30
Rohit Jain
9bdcf7bef2 Merge pull request #876 from shreesh-webkul/gli-1606
Fixed: Currency conversion in admin stats page
2024-03-17 14:46:36 +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
Rohit Jain
2909966c29 Merge pull request #866 from shreesh-webkul/gli-943
Fixed: Arrangement of row and column in csv file is wrong
2024-03-17 14:44:35 +05:30
Rohit Jain
54f3f80d59 Merge pull request #881 from shreesh-webkul/gli-1078
Improvement: Address is not required in booking/order flow
2024-03-17 14:37:16 +05:30
Shreesh Arora
e850534e93 Merge branch 'origin/develop' into gli-943 2024-03-17 10:58:47 +05:30
Shreesh Arora
ff84c472e8 Merge branch 'origin/develop' into gli-1659 2024-03-17 10:51:58 +05:30
Shreesh Arora
d271727afe Merge branch 'origin/develop' into gli-1606 2024-03-17 10:35:12 +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
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
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
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
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
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
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
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
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
07e50d2ee7 Merge pull request #862 from shreesh-webkul/gli-1615
Update: Order cancel status mail content
2024-03-15 11:50:35 +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
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
7c45c0d256 Merge pull request #887 from abhishek-webkul/gli-1678
Added: Hook actionObject<<ClassName>>DefinitionModifier in class ObjectModel
2024-03-14 20:39:51 +05:30
Rohit Jain
e790741bbc Merge pull request #765 from abhishek-webkul/gli-1006
Fixed: Same voucher code is generated for same customer when auto-generating voucher
2024-03-14 20:30:23 +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
e61e80de77 Merge pull request #920 from sumitwebkul/gli-1731
Fixed:Super admin profile id is used instead of SuperAdmin employees ids while sending Order-Confirmation and Refund emails
2024-03-14 20:11:32 +05:30
Rohit Jain
b29dff14fc Merge pull request #919 from sumitwebkul/gli-1741
Fixed::Issue while saving hotel with name starts with numeric values
2024-03-14 20:11:04 +05:30
Rohit Jain
1c05375d43 Merge pull request #855 from sumitwebkul/gli-1602
Fixed: Issues in getting(GET), creating(POST) and updating(PUT) hotel by hotel API
2024-03-14 20:03:20 +05:30
Rohit Jain
00cbcee86b Merge pull request #848 from sumitwebkul/gli-774
Fixed: Wrong prices entered in order_detail table when "Round Type" setting is "Round on each item"
2024-03-14 20:02:44 +05:30
Rohit Jain
1fc9a9d062 Merge pull request #722 from sumitwebkul/gli-1543
Resolved: Fatal error when set Awaiting Payment order status as logable and creating partial payment
2024-03-14 20:02:29 +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
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
aca384c45c Merge pull request #857 from sumitwebkul/gli-1069
Fixed: Exception while order crteation when country sent from API is not active in QloApps
2024-03-13 20:35:00 +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
Shreesh Arora
daa8f392ee update order cancellation mail 2024-03-13 19:04:33 +05:30
Shreesh Arora
20f469354b removed uncessary changes 2024-03-13 11:16:43 +05:30
Rohit Jain
7e0a2c51a2 Merge pull request #813 from abhishek-webkul/gli-1084
Fixed: Success message is not displayed for bulk status updates in a list at back office
2024-03-12 20:28:24 +05:30
vishalsingh.qlo325
70abc2793b Fixed: Discount display on the front when the price is larger then the price of the auto add service product 2024-03-12 12:48:17 +05:30
Shreesh Arora
fd67329f9d Fixed room price calculation for serice product auto add services are removed and advance price calculation when custom price is used 2024-03-11 11:05:22 +05:30