Commit Graph

1261 Commits

Author SHA1 Message Date
Shreesh Arora
3bac634af5 Merge branch 'develop' into gli-2217 2024-07-24 12:16:09 +05:30
Rohit Jain
310e5008cb Merge pull request #1123 from sumitwebkul/bo_order_design
Fixed: Issues in order detail page design changes in Back-office
2024-07-23 15:03:08 +05:30
Rohit Jain
5524b79400 Merge pull request #1046 from vishal-singh-webkul/gli-2046
Fixed: Getting errors in the back office if the id in the URL is updated manually to an invalid one.
2024-07-23 15:02:29 +05:30
Rohit Jain
b3dbfd7459 Merge pull request #1084 from vishal-singh-webkul/gli-982
Updated: The google maps will now display the map icon for the hotel locations.
2024-07-23 15:01:52 +05:30
Shreesh Arora
28996df417 Updated: id_address_delivery is now set as 0 by default 2024-07-23 14:58:20 +05:30
Sumit Panwar
461a096f82 Merge branch 'develop' into bo_order_design 2024-07-23 11:29:14 +05:30
vishalsingh.qlo325
89f1a38e25 Merge branch 'develop' into gli-1868 2024-07-22 13:18:16 +05:30
vishalsingh.qlo325
73fd3d7322 Merge branch 'develop' into gli-982 2024-07-22 13:17:40 +05:30
vishalsingh.qlo325
ed1251a4a0 Merge branch 'develop' into gli-2046 2024-07-22 12:22:11 +05:30
Rohit Jain
ba2f6829e9 Merge pull request #1157 from sumitwebkul/Refund-Process-Issues
Fixed: Refund process issues
2024-07-16 20:01:16 +05:30
vishalsingh.qlo325
706a250303 Fixed the issues for hotel features caused by manually adding an invalid id url 2024-07-16 18:55:56 +05:30
vishalsingh.qlo325
c300cd571e Removed the PS_STORES_ICON from the category front controller and added in hotel reservation system 2024-07-16 17:32:59 +05:30
vishalsingh.qlo325
d8b0367d32 Added validation for the controllers which displays the errors after invalid id is provided in the url 2024-07-16 17:25:58 +05:30
vishalsingh.qlo325
ea94bb82a9 fixed the flow for the ps_stores_icon assign process 2024-07-16 15:16:45 +05:30
vishalsingh.qlo325
28746f296a Merge branch 'develop' into gli-2046 2024-07-15 15:12:47 +05:30
vishalsingh.qlo325
78585f9627 Merge branch 'develop' into gli-1782 2024-07-15 12:53:03 +05:30
vishalsingh.qlo325
f68bdc766d optimized the js file for the custom navigation controller 2024-07-15 12:53:01 +05:30
Sumit Panwar
c1e89d52d6 Updated: Validation for refund voucher creation and action of the refund form in Admin refund request controller 2024-07-13 16:09:15 +05:30
Sumit Panwar
ae1cb8b2b7 Fixed: Canceled status changed into Refunded if 1 room is cancelled before payment and other is after payment 2024-07-13 16:04:46 +05:30
Sumit Panwar
c63768eb81 Fixed: Unable to save the occupancy while editing booking when the room has been reallocated once. 2024-07-13 11:41:14 +05:30
vishalsingh.qlo325
fc8882ea9c Merge branch 'develop' into gli-982 2024-07-13 10:24:24 +05:30
Sumit Panwar
0ca6d6bf75 Merge branch 'develop' into bo_order_design 2024-07-12 14:32:06 +05:30
vishalsingh.qlo325
f43aae5f28 Merge branch 'develop' into gli-1868 2024-07-11 19:40:37 +05:30
Rohit Jain
f90e5d25bf Merge pull request #1009 from vishal-singh-webkul/gli-1840
Fixed: Incorrect default dates in the date range selector for booking form and search block, if preparation time is applied on the hotel.
2024-07-11 18:22:24 +05:30
Rohit Jain
de06bde652 Merge pull request #1149 from vishal-singh-webkul/gli-2193
Updated: Preparation time to minimum booking offset and its definition in the admin order preferences controller.
2024-07-11 18:22:07 +05:30
Rohit Jain
7ce0bfea48 Merge pull request #1114 from shreesh-webkul/gli-2028
Fixed: Admin cannot create different Advance price rule for different group for same date ranges
2024-07-11 18:20:25 +05:30
Rohit Jain
d1260ab359 Merge pull request #1094 from shreesh-webkul/gli-1993
Added: Admin can set voucher expiry along with voucher when managing refund request
2024-07-11 18:20:01 +05:30
Rohit Jain
9ba78a5bf3 Merge pull request #1062 from shreesh-webkul/gli-2092
Updated: htaccess files comptible with apache 2.2 and 2.4
2024-07-11 18:18:48 +05:30
Rohit Jain
9728e3d7cd Merge pull request #1140 from vishal-singh-webkul/gli-2016
Updated: The hero image and its upload process.
2024-07-11 18:03:36 +05:30
Rohit Jain
581af7c060 Merge pull request #1016 from vishal-singh-webkul/gli-1568
Added: Display global max order date and global preparation time in the restriction tab in mange hotels.
2024-07-11 16:57:04 +05:30
Rohit Jain
21e4212c2c Merge pull request #1007 from vishal-singh-webkul/gli-1825
Fixed: Maximum occupancy, length of stay and specific prices are not duplicating correctly while duplicating a room type.
2024-07-11 16:55:45 +05:30
Rohit Jain
fe17f5fb3e Merge pull request #1050 from vishal-singh-webkul/gli-1792
Fixed: Hotel locations on maps on the front is displayed even if option 'Display Google Maps For Hotel Location' is disabled in the hotel settings
2024-07-11 16:54:27 +05:30
Rohit Jain
7e22c01966 Merge pull request #1036 from vishal-singh-webkul/gli-2057
Fixed: The redirection to page not found controller when the user inserts invalid date range in the URL in the category and product page.
2024-07-11 16:53:26 +05:30
Shreesh Arora
ac0de7b6f5 set voucher expiry is required 2024-07-11 13:19:11 +05:30
vishalsingh.qlo325
bdb0f298bc optmized code for cms page option while adding/editing navigation link 2024-07-10 17:48:18 +05:30
Shreesh Arora
c4a6babd25 Show voucher expiry date when creating voucher from refund request 2024-07-10 15:06:58 +05:30
vishalsingh.qlo325
afdb1b588e Added requried comment in the admin customers controller to the code used to display the deleted customers 2024-07-10 10:14:02 +05:30
vishalsingh.qlo325
3cdb7ba268 revert the non required changes from dashactivity.js 2024-07-10 10:01:50 +05:30
Sumit Panwar
d14173cbd0 Conflicts Resolved 2024-07-09 13:18:13 +05:30
vishalsingh.qlo325
107f195857 Merge branch 'develop' into gli-2193 2024-07-09 12:48:13 +05:30
vishalsingh.qlo325
594eb5e480 Merge branch 'develop' into gli-1825 2024-07-09 10:39:28 +05:30
vishalsingh.qlo325
4edee1e803 Fixed display issue while editing navigation pages after admin adds custom link 2024-07-09 10:19:49 +05:30
vishalsingh.qlo325
ee5307c168 Fixed new customer filter for dashactivity on dashboard 2024-07-08 19:25:54 +05:30
vishalsingh.qlo325
fa86af848a Optimized code for the max global booking dates 2024-07-08 18:33:58 +05:30
vishalsingh.qlo325
f40d77b430 Merge branch 'develop' into gli-2016 2024-07-08 16:09:43 +05:30
vishalsingh.qlo325
6a40033b4f Merge branch 'develop' into gli-1868 2024-07-08 15:37:14 +05:30
vishalsingh.qlo325
5fc974b1a7 Merge branch 'develop' into gli-982 2024-07-08 15:30:46 +05:30
vishalsingh.qlo325
72bf417d34 Merge branch 'develop' into gli-1792 2024-07-08 15:28:40 +05:30
vishalsingh.qlo325
966b142221 Merge branch 'develop' into gli-2046 2024-07-08 15:26:10 +05:30
vishalsingh.qlo325
9585d27a38 Merge branch 'develop' into gli-2057 2024-07-08 15:18:59 +05:30