Commit Graph

75 Commits

Author SHA1 Message Date
Dillon Ngo fabc7522ae Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-09-03 17:42:44 +08:00
Dillon Ngo b7fd252bf0 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 12:43:33 +08:00
Dillon Ngo 811057173d Merge branch 'dillon/63.7-company-with-multiple-employees' into dillon/34.6-jenkins-vapor 2024-08-23 13:36:18 +08:00
Dillon Ngo 6093ce896e Allow user account to see and use all vouchers that belongs to all employees under the same company in checkout 2024-08-20 17:21:00 +08:00
Dillon Ngo 1ba95de72d Merge branch 'master' into dillon/34.6-jenkins-vapor 2024-08-14 02:13:51 +08:00
Dillon Ngo cfcc5fbe26 Fix an error with refund for transaction that used a voucher earlier, get discount amount for voucher so to get details breakdown 2024-08-12 09:34:45 +08:00
Dillon Ngo 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +08:00
Dillon Ngo 5da53651d4 Laravel Vapor - Code Sync from Shipping Portal to use S3 Bucket to replace local storage 2024-05-25 12:12:18 +08:00
Dillon Ngo f9d7e48b58 Merge branch 'master' into dillon/34.3-jenkins-vapor 2024-05-17 14:55:01 +08:00
Omair Saleh f57b1e625f update estimated delivery date for E2E 2024-04-30 17:49:30 +08:00
Omair Saleh f3e35ec31d Merge remote-tracking branch 'origin/master' 2024-04-30 17:46:42 +08:00
Omair Saleh b528ac66fc update estimated delivery date for E2E 2024-04-30 17:46:25 +08:00
JiaSheng 02d28f8fba fix invoice amount not tally when voucher is apply for booking 2024-04-08 21:17:37 +08:00
Dillon Ngo 93b44d816f Merge branch 'master' into dillon/34.1-jenkins-vapor 2024-03-22 14:05:47 +08:00
JiaSheng 04b8dfb0dd -fix issue where cannot approve PO when we have refunded transaction 2024-03-19 00:23:09 +08:00
JiaSheng daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +08:00
JiaSheng 81c81e3b48 -show remark and categorized in export refund booking
-make refund function available for internal only, not for customer
2024-03-15 10:34:21 +08:00
edmondlang 609b71f549 code upfate for refund booking 2024-02-19 00:57:42 +08:00
edmondlang f083434390 update refund ui and logic 2024-02-16 14:59:11 +08:00
Dillon 85664dfcce Merge branch 'dillon/jenkins-vapor-34-vue-polling' into dillon/34-jenkins-vapor 2023-10-20 22:26:59 +08:00
edmondlang b0caccc0c1 update generate booking marking to 6 digits 2023-09-28 20:37:37 +08:00
Dillon c6bc43640d Vue Polling 2023-08-24 19:22:20 +08:00
Dillon c7927847c4 Voucherify phase 2 2023-07-17 21:29:19 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +08:00
edmondlang f4cc6113a7 transfer booking owner 2023-02-07 00:48:20 +08:00
Omair Saleh fe07b820f5 fix create purchase order for 1688 processor 2022-09-30 05:08:40 +08:00
Omair Saleh 879d6abdbd convert 1688 purchase order to po on document upload 2022-09-30 03:33:08 +08:00
Omair Saleh 2873a08256 convert 1688 purchase order to po on document upload 2022-09-30 03:29:53 +08:00
Omair Saleh ff3baa2b9c convert 1688 purchase order to po on document upload 2022-09-30 02:30:05 +08:00
Omair Saleh c9fadcaed5 convert 1688 purchase order to po on document upload 2022-09-30 02:19:35 +08:00
omair saleh f4138e4aad update timer for quotation 2022-03-17 10:22:33 +08:00
omair saleh 481426bec9 clean up development 2022-03-12 17:02:21 +08:00
edmondlang eb466ef227 add transfer date notice 2022-03-11 10:34:27 +08:00
omair saleh 7996b7167c fix bill seeder 2022-02-22 01:53:31 +08:00
omair saleh 273bef2f22 fix bill seeder 2022-02-22 01:53:00 +08:00
omair saleh 154fca122e fix bill seeder 2022-02-22 01:42:39 +08:00
omair saleh 396bace885 fix bill seeder 2022-02-22 01:32:37 +08:00
omair saleh 4c1c8db0e4 fix bill seeder 2022-02-22 01:20:36 +08:00
omair saleh 51eb0d54be fix bill seeder 2022-02-22 01:15:53 +08:00
omair saleh 2ab048240b performa invoice 2021-11-29 11:01:34 +08:00
edmondlang 2153774cde Merge branch 'change-booking-price' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2021-11-25 15:20:34 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
ahmedsophyudden cdc9ef449b Refund API - Booking Resources' include refund data, prevent unlimited refund 2021-11-16 09:56:17 +08:00
edmondlang 87614bdcec tidy up change booking price 2021-11-05 12:24:00 +08:00
omair saleh 61605c8efa fix booking rate average bug 2021-09-24 18:11:34 +08:00
omair saleh fc78a6cbd8 Merge branch 'invoice-add-adjusment-and-fix-calculate-booking-rate' into 'master'
-created data on OP

See merge request CIEFWorldwideSdnBhd/exchange-2.0!61
2021-09-14 03:46:21 +00:00
fuadzaidan7 165d80537e Signed-off-by: fuadzaidan7 <fuadzaidan7@gmail.com> 2021-09-06 13:34:14 +08:00
ahmedsophyudden 16f5897750 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into full-payment-request-refund 2021-08-28 10:21:09 +08:00
omair saleh 42d064d07f add cancel order and restore order function 2021-08-26 15:09:32 +08:00
ahmedsophyudden 50f2127d42 Refund request - api endpoint for refund request 2021-08-21 21:38:02 +08:00