Commit Graph

97 Commits

Author SHA1 Message Date
Sumit Panwar
e5601cabc8 Updated: Validations of order status changes while changing order status using bulk action 2024-06-01 12:58:32 +05:30
Sumit Panwar
3f232d6ce6 Fixed: Getting fatal error if admin tries to add coupon having values equals to the order total. 2024-05-18 18:33:06 +05:30
vishalsingh.qlo325
8d5a269696 Fixed: error on checkout if the user choses other lanuage than default language 2024-04-19 11:21:25 +05:30
Sumit Panwar
5169b319ac Redesign of Order detail page of Back office 2024-04-01 13:24:32 +05:30
amandeepsharma.qlo548
988a190ceb conflict issues resolved 2024-03-17 15:21:57 +05:30
Shreesh Arora
d271727afe Merge branch 'origin/develop' into gli-1606 2024-03-17 10:35:12 +05:30
Sumit Panwar
0c86d0d353 Conflicts resolved 2024-03-15 13:42:48 +05:30
Sumit Panwar
2f14333b16 Merge branch 'develop' into gli-1607 2024-03-15 13:35:06 +05:30
Rohit Jain
a8079d5b8c Merge pull request #872 from shreesh-webkul/gli-659
Fixed: Invalid tax details in invoice and credit slips
2024-03-15 12:07:41 +05:30
Rohit Jain
07e50d2ee7 Merge pull request #862 from shreesh-webkul/gli-1615
Update: Order cancel status mail content
2024-03-15 11:50:35 +05:30
Rohit Jain
973ef4d7bf Merge pull request #940 from shreesh-webkul/gli-1707_2
Fixed: Employee was able to download invoice for all hotels from Admin Invoice controller
2024-03-15 11:32:44 +05:30
Sumit Panwar
d3aaf3fdc3 conflicts resolved 2024-03-15 10:23:58 +05:30
Sumit Panwar
bc05eae819 Merge branch 'develop' into overbooking_issues 2024-03-15 09:33:43 +05:30
Rohit Jain
e61e80de77 Merge pull request #920 from sumitwebkul/gli-1731
Fixed:Super admin profile id is used instead of SuperAdmin employees ids while sending Order-Confirmation and Refund emails
2024-03-14 20:11:32 +05:30
Shreesh Arora
6c0b943abd Fixed: Employee was able to download invoice for all hotels from Admin Invoice controller 2024-03-14 16:47:07 +05:30
Rohit Jain
21f1a22767 Merge pull request #856 from sumitwebkul/gli-1459
Fixed: Price conversion issues while changing currency in order detail page in back office
2024-03-13 20:34:13 +05:30
Sumit Panwar
42bb3f52b8 Fixed:Super admin profile id is used instead of Superadmin employees ids while sending Order-Confirmation and Refund emails 2024-03-07 14:46:05 +05:30
Sumit Panwar
730d03e257 Fixed:IF order->paid = 1 and invoice creation in order status is not selected the rest amount is not added in order payments 2024-03-06 19:16:43 +05:30
Sumit Panwar
e6b505d482 Merge branch 'webkul:develop' into order_status_changes 2024-02-17 11:14:31 +05:30
Sumit Panwar
8e9f00e2a9 Fixed: Testing issues of changes in Order flow and refund flow 2024-01-21 18:46:56 +05:30
Sumit Panwar
9efa630464 Fixed:: Need to Consider each payment amount to calculate average conversion rate. 2024-01-13 15:59:04 +05:30
Shreesh Arora
f98ba4fad2 Fix currency conversion in admin statas page 2023-11-30 15:18:16 +05:30
Shreesh Arora
d17de51f4c Fix invalid tax details in invoice and credit slip 2023-11-21 11:42:11 +05:30
Sumit Panwar
5c0d3cb2af Order Status changes, Refund issues resolved and order cancellation process impeoved 2023-10-24 17:25:58 +05:30
Sumit Panwar
01392fd3a5 Fixed: Average conversion rate insertion and currency sign issue resolved in order list 2023-10-12 18:39:01 +05:30
Sumit Panwar
9bb17f0b8e Fixed: Currency conversion issues while adding payment and removing discount from BO 2023-10-12 17:14:35 +05:30
Shreesh Arora
c6410cebe6 update cancelled mail content 2023-10-06 18:40:35 +05:30
Sumit Panwar
3e09c4c2c5 Added: Configuration in Preferences->order tab for price display currency in order list page 2023-10-05 18:35:14 +05:30
Sumit Panwar
7056b6e4e1 Improved overbooking workflow and resolve bugs in overbooking management 2023-09-29 14:51:08 +05:30
Abhishek Kumar
f51ad2fe0e Comment delivery related order state options 2023-09-26 15:08:34 +05:30
Shreesh Arora
90a83062cc fix room total price in refund request when order is not paid 2023-04-17 13:28:54 +05:30
Rohit Jain
dc06382101 Merge pull request #702 from shreesh-webkul/invoice_total
Update: Order invoice pdf, changed totals summary details.
2023-04-14 17:57:33 +05:30
Shreesh Arora
dd27980c76 changes getTotalOrderWithTaxes function 2023-04-14 16:52:59 +05:30
Shreesh Arora
ed12611348 fix price calculation in total summary 2023-04-14 14:32:33 +05:30
Shreesh Arora
26ffb343d9 updated rooms refund detail table 2023-04-14 12:53:34 +05:30
Sumit Panwar
bee9b42694 Resolved: issues while creating order from webservice api 2023-03-31 14:32:00 +05:30
Sumit Panwar
087f69a88d Merge remote-tracking branch 'origin/develop' into gli-1076-clone 2023-03-31 11:28:04 +05:30
Rohit Jain
6cb808744c Merge pull request #636 from lakshya-webkul/gli-886
Resolved: refund request payment calculation
2023-03-30 15:30:02 +05:30
Shreesh Arora
e95180b995 updated refund details on admin and backoffice pages 2023-03-30 14:49:52 +05:30
Sumit Panwar
b1e506293f Merge branch 'webkul:develop' into gli-1076-clone 2023-03-28 19:57:57 +05:30
Shreesh Arora
2eca1a3c3a updated refund request info 2023-03-28 19:23:15 +05:30
Shreesh Arora
1aa027c4e1 updated price calculation for refund and after order cancelation 2023-03-27 20:58:55 +05:30
Shreesh Arora
3fbe592cd0 Merge branch 'develop' into gli-886 2023-03-25 18:59:25 +05:30
Shreesh Arora
445e7a9703 added per day price feature in extra services 2023-03-25 14:18:38 +05:30
lakshya.chauhan193
08b8d39ad2 added is_cancelled column in orderdetail table 2023-03-24 19:50:58 +05:30
abhishek-webkul
2a7e9ed04a Merge branch 'webkul:develop' into gli-1129 2023-03-16 11:56:43 +05:30
lakshya.chauhan193
d2e03bd8fd resolved refund request payment calculation 2023-03-15 20:02:11 +05:30
Shreesh Arora
0fb92ee32b updated getOrdersReturn function query 2023-03-10 14:26:47 +05:30
Abhishek Kumar
15d794f32e Remove refund ID column on refunds list page 2023-03-05 16:14:03 +05:30
Shreesh Arora
6855ef13b4 resolve admin refund page issue 2023-03-02 18:41:12 +05:30