Commit Graph

2740 Commits

Author SHA1 Message Date
Dillon dac3c5e92f Merge branch 'dillon/39-crm-changes' into development 2023-08-02 23:10:21 +08:00
Dillon 07eac828aa Debug 2023-08-02 23:10:11 +08:00
Dillon 4907a480a1 Debug 2023-08-02 23:00:58 +08:00
Dillon 86c7cded19 Merge branch 'dillon/39-crm-changes' into development 2023-08-02 22:56:01 +08:00
Dillon 4f6887ef20 Debug and fixing a decimal problem at Invoice in CRM 2023-08-02 22:55:12 +08:00
Dillon 82ce88f860 Debug and fixing a decimal problem at Invoice in CRM 2023-08-02 22:52:56 +08:00
Dillon 7e0a3c2297 Merge branch 'dillon/39-crm-changes' into development 2023-08-02 22:46:19 +08:00
Dillon b235304ad8 Debug and fixing a decimal problem at Invoice in CRM 2023-08-02 22:46:08 +08:00
Dillon 1dfac42031 Merge branch 'dillon/39-crm-changes' into development 2023-08-02 22:32:50 +08:00
Dillon 8a67984401 Debug 2023-08-02 22:32:44 +08:00
Dillon 4f9e7a9aef Merge branch 'dillon/39-crm-changes' into development 2023-08-02 22:29:45 +08:00
Dillon f4e40e556b Debug 2023-08-02 22:29:24 +08:00
Dillon ded5688bcb Merge branch 'dillon/39-crm-changes' into development 2023-08-02 22:26:31 +08:00
Dillon dab9a8e810 Debug 2023-08-02 22:26:17 +08:00
Dillon dfa70bf151 Merge branch 'dillon/39-crm-changes' into development 2023-08-02 22:19:32 +08:00
Dillon 60c6b8ea94 Minor rewrite + debug 2023-08-02 22:19:14 +08:00
Dillon 75ec4c1db9 Merge branch 'master' into dillon/39-crm-changes 2023-08-02 21:09:15 +08:00
Dillon f364627eef Merge branch 'dillon/39-crm-changes' into development 2023-08-02 20:44:49 +08:00
Dillon f34333f4c9 Minor rewrite 2023-08-02 20:44:37 +08:00
Dillon 8d13ac1f2d Merge branch 'dillon/39-crm-changes' into development 2023-08-02 20:10:32 +08:00
edmondlang d4bc8c85e0 Merge branch 'credit-note-pdf' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-08-01 23:43:22 +08:00
edmondlang 4031b1eb79 download credit note 2023-08-01 23:42:20 +08:00
edmondlang 2692faa259 credit note 2023-08-01 02:13:40 +08:00
edmondlang d1ac8580b3 credit note 2023-08-01 02:12:01 +08:00
edmondlang 43df375489 credit note 2023-08-01 02:10:57 +08:00
edmondlang 9bfe967c6e credit note 2023-08-01 02:10:09 +08:00
edmondlang 8957d2d10a credit note 2023-08-01 02:07:02 +08:00
edmondlang a87a8f8f9a credit note 2023-08-01 02:05:00 +08:00
edmondlang ef63dad63d credit note 2023-08-01 01:56:31 +08:00
edmondlang 1495cd8520 credit note 2023-08-01 01:51:43 +08:00
edmondlang 6357c7ef9f credit note 2023-08-01 01:46:46 +08:00
edmondlang a21ac646e2 credit note 2023-08-01 01:28:49 +08:00
edmondlang aa6f6a5581 credit note 2023-08-01 01:15:11 +08:00
Omair Saleh 5d1c537147 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	resources/views/pages/pdfs/invoice.blade.php
2023-08-01 01:08:53 +08:00
Omair Saleh 9d27e78bf4 give extra access for smc, and refactor the code for invoice po and do document 2023-08-01 01:04:49 +08:00
Dillon cc14a28d8a Merge branch 'dillon/41-voucherify-phase-2a' into development 2023-07-31 19:17:41 +08:00
Dillon 7cd3dd876c Insert voucherify order source id 2023-07-31 19:17:03 +08:00
Dillon 6fbee2102b Merge branch 'dillon/41-voucherify-phase-2a' into development 2023-07-31 19:05:48 +08:00
Dillon 0bc501b35d Insert voucherify order source id 2023-07-31 19:05:27 +08:00
Dillon cf27045db5 Merge branch 'dillon/41-voucherify-phase-2a' into development 2023-07-31 18:35:12 +08:00
Dillon c61acc26fe Insert voucherify order source id + new component to list WELCOME50%OFF voucher to user 2023-07-31 18:34:52 +08:00
Dillon Ngo 1d147d65c9 Merge branch 'dillon/38-voucherify-phase-2' into 'master'
Voucherify phase 2

See merge request CIEFWorldwideSdnBhd/exchange-2.0!143
2023-07-29 12:33:09 +00:00
Dillon 673ea8d3a5 Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-29 08:02:33 +08:00
Dillon bede985695 Tiny improvement on business logic from test cases 2023-07-29 08:02:22 +08:00
Dillon fe781b82e0 Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-29 07:56:16 +08:00
Dillon 61e32a17d6 Tiny improvement on business logic from test case 2023-07-29 07:55:46 +08:00
Dillon 346817293f Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-28 19:29:44 +08:00
Dillon 5c170151c8 Getting ready for production deployment for phase 2 of Voucherify - Debugging 2023-07-28 19:29:18 +08:00
Dillon 0dd58e50d1 Getting ready for production deployment for phase 2 of Voucherify - Debugging 2023-07-28 19:28:11 +08:00
Dillon 8847c9a89f Getting ready for production deployment for phase 2 of Voucherify - Debugging 2023-07-28 19:16:10 +08:00