 Omair Saleh
|
84cd253d7c
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 16:37:45 +08:00 |
|
|
Omair Saleh
|
1f831348a7
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 16:35:35 +08:00 |
|
|
Omair Saleh
|
b954766e99
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 16:31:56 +08:00 |
|
|
Omair Saleh
|
9c08a5cf70
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 15:58:50 +08:00 |
|
|
Omair Saleh
|
d959c8087f
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 15:50:48 +08:00 |
|
|
Omair Saleh
|
9db1f9f66e
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 15:50:05 +08:00 |
|
|
Omair Saleh
|
8a4718686a
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 15:48:31 +08:00 |
|
|
Omair Saleh
|
e1136a193e
|
Merge remote-tracking branch 'origin/development' into development
|
2023-06-11 15:43:17 +08:00 |
|
|
Omair Saleh
|
9ccd51af08
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 15:42:49 +08:00 |
|
 Dillon
|
715af173a2
|
Merge branch 'dillon/jenkins-aws-s3-34' into development
|
2023-06-08 08:57:39 +08:00 |
|
|
Dillon
|
361ea9719f
|
Revert previous testing code
|
2023-06-08 08:56:18 +08:00 |
|
|
Dillon
|
e4988c374d
|
Merge branch 'dillon/jenkins-aws-s3-34' into development
|
2023-06-04 22:06:52 +08:00 |
|
|
Dillon
|
2ec51be653
|
Testing of csrf
|
2023-06-04 22:06:10 +08:00 |
|
|
Dillon
|
64f7150c95
|
Testing of csrf
|
2023-06-04 22:04:13 +08:00 |
|
|
Dillon
|
3c1654d2de
|
Merge branch 'dillon/jenkins-aws-s3-34' into development
|
2023-06-04 21:03:23 +08:00 |
|
|
Dillon
|
81b5fc5eb6
|
Testing of csrf
|
2023-06-04 21:02:13 +08:00 |
|
|
Dillon
|
c29bf79b0b
|
Merge branch 'dillon/jenkins-aws-s3-34' into development
|
2023-06-04 20:55:30 +08:00 |
|
|
Dillon
|
5cab357805
|
Testing of csrf
|
2023-06-04 20:54:25 +08:00 |
|
 edmondlang
|
3bc3e10ddc
|
Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-03 19:20:53 +08:00 |
|
|
edmondlang
|
763902879d
|
update send email payment proof, send email only in production
|
2023-06-03 19:19:35 +08:00 |
|
|
edmondlang
|
dc5b96403c
|
update email payment proof
|
2023-06-03 19:02:41 +08:00 |
|
|
edmondlang
|
1a7109b892
|
Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-03 17:01:35 +08:00 |
|
|
edmondlang
|
ec85ec07ab
|
send email payment proof
|
2023-06-03 17:01:15 +08:00 |
|
|
edmondlang
|
8f7ab425d2
|
Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-03 15:58:41 +08:00 |
|
|
edmondlang
|
f1ce5c6a86
|
update email payment proof
|
2023-06-03 15:58:13 +08:00 |
|
|
edmondlang
|
920b994b36
|
Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# routes/web.php
|
2023-06-03 15:49:16 +08:00 |
|
|
edmondlang
|
6b73f31993
|
email payment proof
|
2023-06-03 15:48:33 +08:00 |
|
|
edmondlang
|
a98ac9b3ce
|
Merge branch 'company-name-warning-text' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-03 14:43:00 +08:00 |
|
|
edmondlang
|
4218a4e398
|
company name warning text
|
2023-06-03 14:42:37 +08:00 |
|
|
Omair Saleh
|
6fed2d47e0
|
Merge remote-tracking branch 'origin/master'
|
2023-06-01 23:52:57 +08:00 |
|
|
Omair Saleh
|
585ce66e3c
|
xpo 03-2023
|
2023-06-01 23:52:18 +08:00 |
|
|
Dillon
|
ffe16baebc
|
Merge branch 'dillon/voucherify-35' into development
|
2023-06-01 21:21:17 +08:00 |
|
|
Dillon
|
f6cbb52bee
|
Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35
|
2023-06-01 21:20:53 +08:00 |
|
|
Dillon
|
cf09d3db9d
|
Fix a problem based on logs: Illegal string offset 'message'
|
2023-06-01 21:20:27 +08:00 |
|
|
Dillon
|
ca38ba9688
|
Merge branch 'dillon/voucherify-35' into development
|
2023-06-01 18:58:47 +08:00 |
|
|
Dillon
|
c323d416da
|
Fix double loading icons showing when validating voucher
|
2023-06-01 18:58:29 +08:00 |
|
|
Dillon
|
d98685f867
|
Merge branch 'dillon/voucherify-35' into development
|
2023-06-01 17:40:48 +08:00 |
|
|
Dillon
|
eb8dfea254
|
Update voucher details into pdfs i.e invoice, purchase order, delivery order
|
2023-06-01 17:40:13 +08:00 |
|
|
edmondlang
|
6aea566760
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-05-31 17:57:14 +08:00 |
|
|
edmondlang
|
619ebc7269
|
update SegmentCompanyComponent
|
2023-05-31 17:56:25 +08:00 |
|
|
edmondlang
|
672bcde0ee
|
update SegmentCompanyComponent
|
2023-05-31 17:54:01 +08:00 |
|
|
edmondlang
|
38fc12e86b
|
Merge branch 'register-honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
|
2023-05-31 08:25:06 +08:00 |
|
|
edmondlang
|
209c843b2d
|
add segment 'honey trap new registration' to new registered customer
|
2023-05-31 08:21:47 +08:00 |
|
|
Dillon
|
455ce0fe08
|
Vourcherify manual merged conflict resolved
|
2023-05-30 22:33:26 +08:00 |
|
|
Dillon
|
20d6ca47dc
|
Vourcherify
|
2023-05-30 22:02:09 +08:00 |
|
|
edmondlang
|
4bd28e3cca
|
add company id in support
|
2023-05-30 19:38:45 +08:00 |
|
|
edmondlang
|
94b1b045c9
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-05-30 19:06:47 +08:00 |
|
|
edmondlang
|
f37d775e97
|
honey trap changes
|
2023-05-30 19:06:28 +08:00 |
|
|
edmondlang
|
839cce3320
|
honey trap changes
|
2023-05-30 18:09:20 +08:00 |
|
|
Omair Saleh
|
b89b911f71
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 12:32:46 +08:00 |
|