Commit Graph

1353 Commits

Author SHA1 Message Date
vishalsingh.qlo325
dba77fac06 Merge branch 'develop' into gli-2145 2024-08-05 20:10:19 +05:30
Rohit Jain
588d76e3e2 Merge pull request #1065 from shreesh-webkul/gli-2071
Added: option to view frequent customer in backoffice customer page
2024-08-05 12:48:31 +05:30
Rohit Jain
15bcc9172e Merge pull request #1164 from sumitwebkul/gli-2183
Added: Option to add/edit customer address from order detail page of Back office
2024-08-05 12:48:14 +05:30
Rohit Jain
175966c0cd Merge pull request #1166 from sumitwebkul/Refund-Process-Issues
Fixed: Undefined indexes of refund and google map on GuestTracking Controller
2024-08-05 12:46:34 +05:30
Sumit Panwar
154a7689c2 Fixed: Issues in customer address update from the order address 2024-08-03 17:41:24 +05:30
Sumit Panwar
51fa098759 Merge branch 'develop' into gli-2058 2024-08-03 11:02:34 +05:30
Sumit Panwar
e5cfbe1206 Merge branch 'develop' into Refund-Process-Issues 2024-08-03 11:01:40 +05:30
Sumit Panwar
5dc069b7c5 Merge branch 'develop' into gli-2183 2024-08-03 11:00:54 +05:30
Sumit Panwar
026d7cdb27 Fixed:After making fields as required and clicking on save and stay, customer eamail is not showing on customer detail page. 2024-08-03 10:58:41 +05:30
Shreesh Arora
c09af3959f Merge branch 'develop' into gli-2071 2024-08-01 15:05:45 +05:30
Sumit Panwar
dfaf5c3fc9 Fixed: Undefined indexes issues on GuestTracking Controller 2024-07-30 13:23:01 +05:30
vishalsingh.qlo325
3cbfa2e98f Merge branch 'develop' into gli-2145 2024-07-30 10:10:17 +05:30
vishalsingh.qlo325
f793093f39 updated the original price view on the booking form 2024-07-29 16:10:44 +05:30
Sumit Panwar
a2f188b917 Merge branch 'develop' into gli-2058 2024-07-28 10:00:27 +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
Shreesh Arora
a3c4e8c7ac Merge branch 'develop' into gli-2071 2024-07-24 13:06:18 +05:30
vishalsingh.qlo325
28d0f0ef97 Merge branch 'develop' into gli-2145 2024-07-23 18:29:51 +05:30
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
Shreesh Arora
c39b97d408 fix num orders for frequent customers can be set to 0 2024-07-19 15:40:41 +05:30
vishalsingh.qlo325
ff2a3962db Merge branch 'develop' into gli-2103 2024-07-17 17:44:19 +05:30
vishalsingh.qlo325
4a987d110b Merge branch 'develop' into gli-2145 2024-07-17 16:09:15 +05:30
vishalsingh.qlo325
99a15ad344 applied the changes to get the discounted price of a room 2024-07-17 16:09:01 +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
Sumit Panwar
4d8affa891 Merge branch 'develop' into gli-2183 2024-07-13 17:11:36 +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