Commit Graph

656 Commits

Author SHA1 Message Date
Sumit Panwar
154a7689c2 Fixed: Issues in customer address update from the order address 2024-08-03 17:41:24 +05:30
Sumit Panwar
5dc069b7c5 Merge branch 'develop' into gli-2183 2024-08-03 11:00:54 +05:30
Sumit Panwar
86b0834b7f resolved conflicts 2024-07-27 15:59:29 +05:30
Sumit Panwar
26703f7770 Added: Panel to add/update customer address from order detail page of Back office 2024-07-27 15:52:21 +05:30
vishalsingh.qlo325
edb49ae059 Merge branch 'develop' into gli-2107_2 2024-07-23 18:29:15 +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
Sumit Panwar
461a096f82 Merge branch 'develop' into bo_order_design 2024-07-23 11:29:14 +05:30
vishalsingh.qlo325
0411e347c8 Merge branch 'develop' into gli-2107_2 2024-07-22 13:18:51 +05:30
vishalsingh.qlo325
89f1a38e25 Merge branch 'develop' into gli-1868 2024-07-22 13:18: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
9fd4d52519 Merge branch 'develop' into gli-2106 2024-07-15 09:46:14 +05:30
Sumit Panwar
4d8affa891 Merge branch 'develop' into gli-2183 2024-07-13 17:11:36 +05:30
Sumit Panwar
91558046dd Removed: Unused file when order edit process 2024-07-13 15:00:58 +05:30
Sumit Panwar
b18f9f3612 Updated:: Admin can edit occupancy after order from backoffice whether order is created with occupancy or with rooms selection by guest 2024-07-13 14:41:33 +05:30
Sumit Panwar
d3d3d05a64 Fixed: Text years is wrong if child age is 1 in bookings list and overbookings list in order details page in back office 2024-07-13 12:01:26 +05:30
Sumit Panwar
60e9437f0f Fixed: Select 1 instead of Select age in the child age when age is already selected while order edit and also while creating booking in backoffice 2024-07-13 11:14:25 +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
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
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
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
Sumit Panwar
14792dbe66 Added: option to add/edit customer address from order detail page of BO 2024-07-09 14:48:12 +05:30
Sumit Panwar
5e276db6be Revert: Code for - Added: option to add/edit customer address from order detail page of BO 2024-07-09 13:25:19 +05:30
Sumit Panwar
d14173cbd0 Conflicts Resolved 2024-07-09 13:18:13 +05:30
vishalsingh.qlo325
feb34d8dd4 Merge branch 'develop' into gli-1885 2024-07-09 12:46:28 +05:30
vishalsingh.qlo325
a55c7ea1a3 Merge branch 'develop' into gli-1823 2024-07-08 16:28:48 +05:30
vishalsingh.qlo325
b872d80caf Merge branch 'develop' into gli-2107_2 2024-07-08 15:45:10 +05:30
vishalsingh.qlo325
6a40033b4f Merge branch 'develop' into gli-1868 2024-07-08 15:37:14 +05:30
Shreesh Arora
13aa486726 Merge branch 'develop' into gli-2092 2024-07-05 13:13:48 +05:30
vishalsingh.qlo325
75b89ca27c Merge branch 'develop' into gli-1910 2024-07-05 12:09:25 +05:30
vishalsingh.qlo325
8f524f0daa Fixed admin was able to create the address for banned user 2024-07-05 12:09:20 +05:30
Rohit Jain
8b3146781f Merge pull request #1023 from shreesh-webkul/gli-1663
Fixed: Backoffice design issue in RTL language
2024-07-04 20:00:12 +05:30
Rohit Jain
d40574895c Merge pull request #1063 from shreesh-webkul/gli-2053
Fixed: Order prices decimal value not shown according to configuration when boking from back office
2024-07-04 19:57:53 +05:30
Rohit Jain
fee18dd1f9 Merge pull request #1081 from shreesh-webkul/gli-1749
Fixed:  Render list filter values are saved without validation
2024-07-04 19:55:30 +05:30
Rohit Jain
c6d1715421 Merge pull request #1119 from vishal-singh-webkul/gli-1944
Added: check-all and uncheck-all option in the tree for normal products and scroll bar for the rendered tree.
2024-07-04 19:44:10 +05:30
Shreesh Arora
8049f7b9de fixed kip design in rtl 2024-07-04 17:21:09 +05:30
Shreesh Arora
fd79b68b46 fixed additional RTL issues 2024-07-04 16:43:15 +05:30
vishalsingh.qlo325
8425cd2c30 Merge branch 'develop' into gli-1823 2024-07-04 16:00:53 +05:30
vishalsingh.qlo325
761e727130 Merge branch 'develop' into gli-1885 2024-07-04 16:00:24 +05:30
vishalsingh.qlo325
33a68bf0fc Merge branch 'develop' into gli-1944 2024-07-03 10:06:52 +05:30
vishalsingh.qlo325
2983e833f4 Removed non required code from hotel tree script 2024-07-03 10:06:49 +05:30
vishalsingh.qlo325
495e2caf95 Merge branch 'develop' into gli-1910 2024-07-02 17:44:02 +05:30
Shreesh Arora
940e93626f Merge branch 'develop' into gli-1865 2024-07-02 17:11:37 +05:30
Shreesh Arora
a4e80383f4 Merge branch 'develop' into gli-1749 2024-07-02 16:52:15 +05:30
Shreesh Arora
ec9c376308 Merge branch 'develop' into gli-2053 2024-07-02 16:50:49 +05:30
Shreesh Arora
288de31d47 Merge branch 'develop' into gli-2092 2024-07-02 16:50:31 +05:30
Shreesh Arora
15a129eea6 Merge branch 'develop' into gli-1663 2024-07-02 16:42:35 +05:30
Rohit Jain
da3fbbb0a8 Merge pull request #1134 from vishal-singh-webkul/gli-2012
Removed: The gender icon from customer information in the AdminCartsController
2024-07-02 15:27:35 +05:30
Rohit Jain
65b4bc7799 Merge pull request #1127 from sumitwebkul/reallocate-swap-issues
Fixed: Issues in the updated(Room types upgrade/degrade) process of Reallocation and Swapping of rooms from back-office
2024-07-02 15:27:28 +05:30