Commit Graph

3045 Commits

Author SHA1 Message Date
Sumit Panwar
62f35618ce Merge branch 'develop' into gli-1768 2024-07-23 11:29:55 +05:30
Rohit Jain
05964925a9 Merge pull request #1138 from vishal-singh-webkul/gli-2178
Added: Variable in validateOrder function call of the payment module to prevent the emails on the order validation process.
2024-07-16 20:07:26 +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
Rohit Jain
eca8491190 Merge pull request #1021 from vishal-singh-webkul/gli-1782
Updated: Improvement in the block navigation link module regarding CMS pages.
2024-07-16 20:00:16 +05:30
Rohit Jain
d752e30b33 Merge pull request #1045 from vishal-singh-webkul/gli-1910
Fixed: The email selection process while creating new address for the customer and back button for the AdminAddressController.
2024-07-16 19:59:48 +05:30
Rohit Jain
f618abd840 Merge pull request #1131 from vishal-singh-webkul/gli-1699
Removed: Non required emails from the order status template list
2024-07-16 19:58:17 +05:30
Rohit Jain
09825110f0 Merge pull request #1158 from vishal-singh-webkul/gli-2106
Updated: The trademark of the head tag of the admin login page
2024-07-16 19:57:59 +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
vishalsingh.qlo325
9fd4d52519 Merge branch 'develop' into gli-2106 2024-07-15 09:46:14 +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
vishalsingh.qlo325
3b9a1b13ee Merge branch 'develop' into gli-1699 2024-07-13 10:28:58 +05:30
vishalsingh.qlo325
881d21437f added header_order_conf email templates to ignore while selecting the template for the order status 2024-07-13 10:28:53 +05:30
Rohit Jain
10bb208106 Merge pull request #1152 from shreesh-webkul/gli-2204
Removed: Incompatible null coalescing operator used in cache
2024-07-11 19:56:37 +05:30
Rohit Jain
b7873f0057 Merge pull request #1155 from shreesh-webkul/gli-1803-2
Fixed: Extra services pop up not working in checkout page
2024-07-11 19:56:09 +05:30
Shreesh Arora
6b65035dfc Fixed: Extra services pop up not working in checkout page 2024-07-11 19:45:41 +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
204258cdc8 Merge pull request #1154 from vishal-singh-webkul/gli-1881_2
Fixed: Errors set in parent class of order opc controller are not displayed  on the checkout page in the front office.
2024-07-11 18:19:31 +05:30
Rohit Jain
7849875043 Merge pull request #1141 from shreesh-webkul/gli-764
Updated: Default invoice will be shown even in case of b2b invoice
2024-07-11 18:19:07 +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
4dd3feef5b Merge pull request #1118 from vishal-singh-webkul/gli-2060
Fixed:  Admin was able to create new account using the banned account email.
2024-07-11 18:18:16 +05:30
Rohit Jain
a933c64387 Merge pull request #1139 from vishal-singh-webkul/gli-2133
Updated: The validation for the city name.
2024-07-11 18:18:04 +05:30
Rohit Jain
eaf2f8f7a2 Merge pull request #1044 from vishal-singh-webkul/gli-2048
Fixed: The issues in catalog price rule (AdminSpecificPriceRuleController).
2024-07-11 18:04:23 +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
e3f8ebe90a Merge pull request #1144 from vishal-singh-webkul/gli-2001
Fixed: the design for the 'Subscribe' button on the order-detail page
2024-07-11 18:02:05 +05:30
vishalsingh.qlo325
140fef2759 Updated the Minimum booking offset tooltip for the admin 2024-07-11 18:00:45 +05:30
Rohit Jain
aa4b0859c8 Merge pull request #1145 from vishal-singh-webkul/gli-1823
Added: Empty dropdown will appear if no options are available and empty message is not set.
2024-07-11 18:00:03 +05:30
Rohit Jain
55adffed5c Merge pull request #1146 from vishal-singh-webkul/gli-1885
Udpated: Text of column 'tax' to 'Tax rule' in both 'Additional Facilities' & 'Service Products' tab of room type detail page
2024-07-11 17:58:10 +05:30
Rohit Jain
18879ce16d Merge pull request #1151 from vishal-singh-webkul/gli-2023
Fixed: Admin is unable to permanently delete customers with bookings on localhost.
2024-07-11 16:58:28 +05:30
Rohit Jain
04c2227286 Merge pull request #1041 from vishal-singh-webkul/gli-2116
Added: Added 'Show at front' column and updated display of 'Advanced payment' column in the room type list in back office.
2024-07-11 16:57:40 +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
Rohit Jain
cf1a9c511e Merge pull request #1032 from vishal-singh-webkul/gli-2111
Fixed: The incorrect information on the KPIs in the AdminProductController and AdminCustomerController
2024-07-11 16:52:28 +05:30
Shreesh Arora
ac0de7b6f5 set voucher expiry is required 2024-07-11 13:19:11 +05:30
vishalsingh.qlo325
9e56a0f11d Fixed: some of the errors from parent order controller are not displayed in the front 2024-07-11 12:09:14 +05:30
vishalsingh.qlo325
bdb0f298bc optmized code for cms page option while adding/editing navigation link 2024-07-10 17:48:18 +05:30
vishalsingh.qlo325
2c84f09821 Optimized function getCustomers() for easy understanding 2024-07-10 15:29:40 +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
5e4cae78e0 Revert the changes made to the ajaxprocess in the admin address controller 2024-07-10 12:37:51 +05:30
vishalsingh.qlo325
69056e4ed8 optimized the function getCustomers() to get the customers list for address creation 2024-07-10 12:07:41 +05:30
vishalsingh.qlo325
2594424234 Updated variable names in ajax process verify customer email 2024-07-10 10:37:40 +05:30
vishalsingh.qlo325
38568afb0b Added validateOrderAmount variable in the payment module class 2024-07-10 10:27:05 +05:30
vishalsingh.qlo325
3cdb7ba268 revert the non required changes from dashactivity.js 2024-07-10 10:01:50 +05:30
vishalsingh.qlo325
0308df218c Fixed the size of the input fields 2024-07-09 19:16:59 +05:30