Commit Graph

1319 Commits

Author SHA1 Message Date
vishalsingh.qlo325
225274b775 Merge branch 'develop' into gli-2103 2024-07-23 18:21:17 +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
Rohit Jain
4e754e7ca3 Merge pull request #1088 from vishal-singh-webkul/gli-1868
Updated: Customer deletion and ban process and added filters for the admin to view the banned customers.
2024-07-23 15:01:17 +05:30
Rohit Jain
8371a0996f Merge pull request #1143 from vishal-singh-webkul/gli-2185
Fixed: Error on AdminTranslationController while translating modules, also optimized the translation process for the modules.
2024-07-23 15:00:48 +05:30
Sumit Panwar
461a096f82 Merge branch 'develop' into bo_order_design 2024-07-23 11:29:14 +05:30
vishalsingh.qlo325
4564d52107 optimized code for admin translation and removed non required variables 2024-07-23 11:29:00 +05:30
vishalsingh.qlo325
ffc404e90b Merge branch 'develop' into gli-2185 2024-07-22 13:19:26 +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
vishalsingh.qlo325
ff2a3962db Merge branch 'develop' into gli-2103 2024-07-17 17:44:19 +05:30
vishalsingh.qlo325
509382929f Fixed the total count of the service products for the list in the back office 2024-07-17 11:46:26 +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
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
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
d7f764c331 Fixed: fatal error on admin products and admin normal products caused when the id in url in not unsigned int 2024-07-15 15:12:24 +05:30
vishalsingh.qlo325
78585f9627 Merge branch 'develop' into gli-1782 2024-07-15 12:53:03 +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
Sumit Panwar
03fcae1932 Fixed: Unused code removed came from merging the conflicts with develop branch 2024-07-13 10:26:17 +05:30
vishalsingh.qlo325
fc8882ea9c Merge branch 'develop' into gli-982 2024-07-13 10:24:24 +05:30
vishalsingh.qlo325
2cac5680d8 Updated the defination lable of the store icon to map icon 2024-07-13 10:24:21 +05:30
vishalsingh.qlo325
e19a2dbe02 Merge branch 'develop' into gli-2103 2024-07-13 10:16:47 +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
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
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
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
vishalsingh.qlo325
140fef2759 Updated the Minimum booking offset tooltip for the admin 2024-07-11 18:00:45 +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
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
2c84f09821 Optimized function getCustomers() for easy understanding 2024-07-10 15:29:40 +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
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
0308df218c Fixed the size of the input fields 2024-07-09 19:16:59 +05:30