Commit Graph

1654 Commits

Author SHA1 Message Date
Uwais Al-Qarni da45c16d9e upload sales agreement 2022-05-18 16:07:52 +08:00
Uwais Al-Qarni ad49b8e339 Add new column to booking, create new api to trust the seller from online 2022-05-16 14:55:41 +08:00
Uwais Al-Qarni e9114670ed Create company info table, insert data into company info, update companyResource when businessType is online shop 2022-05-16 14:55:05 +08:00
Uwais Al-Qarni 87c79fbf7d Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into Add-new-service-type-for-booking 2022-05-14 18:49:53 +08:00
edmondlang 22aa003777 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-13 23:04:57 +08:00
omair saleh 4b12ea3fc5 update po day limit notice 2022-05-11 13:25:54 +08:00
omair saleh 60936ffadf update po day limit notice 2022-05-11 13:15:06 +08:00
omair saleh 5fc2f76bc6 fix transaction export 2022-05-10 19:08:11 +08:00
omair saleh bb5a2b8259 fix transaction export 2022-05-10 19:06:52 +08:00
omair saleh 0da50ebae6 fix transaction export 2022-05-10 19:00:46 +08:00
omair saleh 2bb93d9743 fix transaction export 2022-05-10 18:59:53 +08:00
omair saleh 2ff84186b8 fix transaction export 2022-05-10 16:40:41 +08:00
omair saleh 2c4804a2a0 fix transaction export 2022-05-10 16:36:34 +08:00
omair saleh da7a259000 fix transaction export 2022-05-10 16:28:12 +08:00
omair saleh bea34174ba fix transaction export 2022-05-10 16:25:04 +08:00
omair saleh 28122890af fix transaction export 2022-05-10 16:24:52 +08:00
omair saleh 71fde21bd5 fix transaction export 2022-05-10 16:15:07 +08:00
omair saleh fb59937a8d fix transaction export 2022-05-10 16:07:59 +08:00
omair saleh 1e782e9e49 fix transaction export 2022-05-10 15:48:48 +08:00
omair saleh bb39831c9a fix transaction export 2022-05-10 15:35:56 +08:00
omair saleh 6bbfa1b24f fix transaction export 2022-05-10 15:05:51 +08:00
omair saleh 9e7216d545 fix transaction export 2022-05-10 14:50:37 +08:00
omair saleh ea9ca284f2 fix transaction export 2022-05-10 14:49:46 +08:00
omair saleh f6090732d1 fix transaction export 2022-05-10 14:48:31 +08:00
omair saleh da22d17b7a fix transaction export 2022-05-10 14:47:34 +08:00
omair saleh 4bf5c4081d fix transaction export 2022-05-10 11:35:01 +08:00
omair saleh 505398f9c5 fix transaction export 2022-05-10 11:33:16 +08:00
omair saleh 293bd1ffc0 fix transaction export 2022-05-10 11:32:14 +08:00
omair saleh c856fff203 fix transaction export 2022-05-10 11:30:10 +08:00
omair saleh 74279d6dda fix transaction export 2022-05-10 11:27:33 +08:00
omair saleh 1526f36e92 remove raya announcement 2022-05-06 13:53:47 +08:00
omair saleh 06dd1efa24 remove raya announcement 2022-05-06 13:49:37 +08:00
omair saleh c9fca28c49 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-05-03 13:40:03 +08:00
omair saleh b62ba94e41 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-05-03 13:39:05 +08:00
omair saleh 860e1314ea debug export booking analytics 2022-05-03 13:27:35 +08:00
omair saleh 060ae247f0 debug export booking analytics 2022-05-03 13:20:29 +08:00
omair saleh 78c2fd6c2d debug export booking analytics 2022-05-03 13:17:35 +08:00
omair saleh e6c6a12b0a Merge branch 'export-booking-analytic' into 'master'
export booking analytic

See merge request CIEFWorldwideSdnBhd/exchange-2.0!107
2022-05-03 05:11:04 +00:00
edmondlang 9f9d12ed0f Merge branch 'export-booking-analytic' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-01 23:14:53 +08:00
edmondlang 7e791a64b4 update code on export booking analytic data for Hybrid payment method 2022-05-01 23:14:27 +08:00
edmondlang 0004d53901 update code on export analytic booking data for Hybrid paymentMethod 2022-05-01 23:11:38 +08:00
edmondlang 6b97a58ab1 Merge branch 'export-booking-analytic' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-01 16:52:18 +08:00
edmondlang 960b46daea export booking analytic 2022-05-01 16:49:57 +08:00
edmondlang bdf2613c5b Merge branch 'export-booking-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-01 12:22:01 +08:00
edmondlang 6e1d31159b update export booking transaction add in supplier name 2022-05-01 12:21:31 +08:00
Uwais Al-Qarni 6259b19f68 fix cannot create if service type is 1688 2022-04-29 12:13:49 +08:00
Leong Chee Siong 1d640e5d03 Merge branch 'debtor' into 'development'
no file error

See merge request CIEFWorldwideSdnBhd/exchange-2.0!106
2022-04-29 01:11:14 +00:00
glovetleong 7756726ea8 no file error 2022-04-29 09:09:58 +08:00
edmondlang 134868029a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Exports/Services/ExportsTransactions.php
2022-04-28 19:59:05 +08:00
Uwais Al-Qarni cd4bc4fb72 Add new seeder, add new public const variable for 1668, update code in CreateBookingLogic for 1688 booking flow 2022-04-28 16:40:17 +08:00