Commit Graph

990 Commits

Author SHA1 Message Date
omair saleh 5b1fbdc9a3 dubug completed bookings with unapproved po's 2021-09-24 12:40:31 +08:00
omair saleh 780a5ddcfc dubug completed bookings with unapproved po's 2021-09-24 12:38:18 +08:00
omair saleh c209536c0a dubug completed bookings with unapproved po's 2021-09-24 12:37:12 +08:00
omair saleh a6eefd0824 dubug completed bookings with unapproved po's 2021-09-24 12:29:42 +08:00
omair saleh a52ccc2c05 Merge remote-tracking branch 'origin/master' 2021-09-23 15:35:19 +08:00
omair saleh 68f879506a add download button to pdf file viewer 2021-09-23 15:29:14 +08:00
ahmedsophyudden 75cad8b351 Merge branch 'payment-refund-ui' into payment-refund 2021-09-23 10:11:32 +08:00
edmondlang 40ede165cd online-payment-ui 2021-09-19 17:06:13 +08:00
omair saleh f244203130 Merge branch 'change-email-address-ui' into 'master'
change email address ui,

See merge request CIEFWorldwideSdnBhd/exchange-2.0!62
2021-09-14 03:47:25 +00: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
Haziq Danial 6c39bc780b added update email controller and logic 2021-09-11 13:15:25 +08:00
ahmedsophyudden fa4042ecff edit refund calculation to correct formulat 2021-09-08 23:41:56 +08:00
glovetleong f68fd19b7f -created data on OP
-fix payment proof file select bug
2021-09-08 17:38:24 +08:00
Haziq Danial 28bdccca9a Merge remote-tracking branch 'origin/change-email-address-ui' into change-email-address-ui
# Conflicts:
#	resources/views/pages/settings.blade.php
2021-09-08 05:50:31 +08:00
omair saleh da35d80fbe debug invoice 2021-09-06 17:41:24 +08:00
omair saleh fa6aab7df0 debug invoice 2021-09-06 17:37:20 +08:00
omair saleh 007ae648e6 debug invoice 2021-09-06 17:34:30 +08:00
omair saleh ce20fd0d6a debug invoice 2021-09-06 17:33:36 +08:00
omair saleh 8ce3bf85d8 debug invoice 2021-09-06 17:30:29 +08:00
omair saleh c28c5fc545 debug invoice 2021-09-06 17:29:35 +08:00
omair saleh 6750dfefde debug invoice 2021-09-06 17:26:01 +08:00
omair saleh 9881a19927 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2021-09-06 17:24:49 +08:00
omair saleh af083bb707 debug invoice 2021-09-06 17:24:21 +08:00
omair saleh d27c3da276 debug invoice 2021-09-06 17:23:56 +08:00
omair saleh 5d168b7937 debug invoice 2021-09-06 17:22:51 +08:00
fuadzaidan7 165d80537e Signed-off-by: fuadzaidan7 <fuadzaidan7@gmail.com> 2021-09-06 13:34:14 +08:00
ahmedsophyudden 1c4669a857 add partial refund credit note flow 2021-09-06 09:21:56 +08:00
ahmedsophyudden 2b167b1950 add partial refund credit note flow 2021-09-05 22:52:33 +08:00
ahmedsophyudden 67a0a63b9b edit booking quotation calculation for partial refund request 2021-09-05 20:27:41 +08:00
ahmedsophyudden 4b5f64ca9b add booking quotation calculation for partial refund request 2021-09-05 12:18:08 +08:00
ahmedsophyudden 579f6df6ba add booking quotation calculation for partial refund request 2021-09-05 12:15:32 +08:00
ahmedsophyudden 489df7083d Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 2021-09-05 09:58:15 +08:00
omair saleh ba8837f3a1 Merge branch 'credit-note-request-refund' into 'master'
Credit note request refund

See merge request CIEFWorldwideSdnBhd/exchange-2.0!60
2021-09-01 09:00:33 +00:00
omair saleh 2f77417e24 Merge branch 'full-payment-request-refund' into 'master'
Full payment request refund

See merge request CIEFWorldwideSdnBhd/exchange-2.0!59
2021-09-01 08:58:15 +00:00
ahmedsophyudden 410c55e2bf Add credit note controller and logic 2021-08-29 20:52:43 +08:00
ahmedsophyudden 43530352ee Add credit note controller and logic 2021-08-28 11:40:04 +08:00
ahmedsophyudden f63f57ad57 Add update transaction status to refunded transaction 2021-08-28 10:39:00 +08:00
ahmedsophyudden f3cb50c231 Merge branch 'full-payment-request-refund' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into credit-note-request-refund 2021-08-28 10:31:10 +08:00
ahmedsophyudden 338b8dd648 Add update transaction status to refunded transaction 2021-08-28 10:28:38 +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
ahmedsophyudden 5857317fa4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into credit-note-request-refund 2021-08-27 19:05:26 +08:00
ahmedsophyudden b75dc28674 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 2021-08-27 18:59:13 +08:00
omair saleh 509a681bcc add cancel order and restore order function 2021-08-27 15:19:58 +08:00
omair saleh 42d064d07f add cancel order and restore order function 2021-08-26 15:09:32 +08:00
edmondlang 9a7ec75033 create payment refund ui 2021-08-25 15:48:30 +08:00
edmondlang 53fb271bf7 Merge branch 'change-email-address-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into change-email-address-ui 2021-08-24 13:28:28 +08:00
omair saleh 1f35b6c456 hide announcement from user profile 2021-08-24 13:09:03 +08:00
omair saleh 080843f2fd hide announcement from user profile 2021-08-24 13:06:47 +08:00
edmondlang ca1936d4eb change email address ui,
add input column for email
2021-08-24 13:05:55 +08:00
omair saleh 508e71aeb4 hide announcement from user profile 2021-08-24 13:03:05 +08:00