 edmondlang
|
9a863e2143
|
Merge branch 'update-create-dilivery-address' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-02 23:18:12 +08:00 |
|
|
edmondlang
|
8024865d5d
|
create order with force enter billing address
|
2023-03-02 23:17:42 +08:00 |
|
|
edmondlang
|
579dd02ebf
|
update allow user to edit billing address
|
2023-03-02 22:20:08 +08:00 |
|
 Martin Kiragu
|
66abe81e73
|
Merge remote-tracking branch 'origin/development' into development
|
2023-03-02 12:24:07 +03:00 |
|
|
Martin Kiragu
|
ca178e1b31
|
add HasFactory facade to Users model
|
2023-03-02 12:23:49 +03:00 |
|
|
edmondlang
|
e52a27aedb
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-02 17:06:55 +08:00 |
|
|
edmondlang
|
1e6ac000ac
|
fix invoice command
|
2023-03-02 17:06:29 +08:00 |
|
|
edmondlang
|
8e7970a925
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-02 16:16:23 +08:00 |
|
|
edmondlang
|
2421f6dcf0
|
allow user to edit billing address
|
2023-03-02 16:15:51 +08:00 |
|
 Dillon
|
9318e7471f
|
Merge branch 'dillon/crm-create-task' into development
|
2023-03-01 12:36:15 +08:00 |
|
|
Dillon
|
ba2bd59b04
|
Add new tasks post payment into CRM + Add task append to lead
|
2023-03-01 12:29:47 +08:00 |
|
|
edmondlang
|
8cffae079b
|
test approve invoice
|
2023-02-28 14:46:04 +08:00 |
|
|
edmondlang
|
594b25b71b
|
temporary disable all other cron on development server
|
2023-02-28 14:29:04 +08:00 |
|
|
edmondlang
|
d142a86683
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-28 14:23:11 +08:00 |
|
|
edmondlang
|
981ec9bbeb
|
approve invoice function for testing
|
2023-02-28 14:22:32 +08:00 |
|
 Omair Saleh
|
d61a0c2104
|
fix duplicated invoices
|
2023-02-28 12:03:17 +08:00 |
|
|
edmondlang
|
935f3e9bf5
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-27 15:59:49 +08:00 |
|
|
omair saleh
|
997a9da276
|
Merge branch 'dillon/crm-integration' into 'master'
Dockerising shipping-portal usign the same setting from exchange-2.0.
See merge request CIEFWorldwideSdnBhd/shipping-portal!145
|
2023-02-27 05:14:32 +00:00 |
|
|
edmondlang
|
9f4b04b9fb
|
update show duplicated invoice
|
2023-02-27 12:57:46 +08:00 |
|
|
edmondlang
|
dedd6464f4
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-24 18:08:22 +08:00 |
|
|
edmondlang
|
6b5ae9b0b7
|
export invoice for PAID INVOICE and PENDING PAYMENT
|
2023-02-24 18:06:39 +08:00 |
|
|
Dillon
|
091119c244
|
Merge branch 'dillon/crm-integration' into development
|
2023-02-22 18:09:51 +08:00 |
|
|
Dillon
|
2b20160334
|
User feedback fix and enhancement on crm integration
|
2023-02-22 18:09:34 +08:00 |
|
|
Dillon
|
4d095b5459
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-22 17:10:08 +08:00 |
|
|
Dillon
|
1c50181132
|
Merge branch 'dillon/crm-integration' into development
|
2023-02-22 10:37:19 +08:00 |
|
|
Dillon
|
8a29f10ef3
|
Include company name and phone number into lead during regirstration
|
2023-02-22 10:36:35 +08:00 |
|
|
edmondlang
|
4c0bf164a0
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-21 23:43:18 +08:00 |
|
|
edmondlang
|
e5af2bf171
|
Merge branch 'auto-generate-invoice' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal
|
2023-02-21 23:42:58 +08:00 |
|
|
edmondlang
|
2443575744
|
correct typo
|
2023-02-21 23:42:37 +08:00 |
|
|
edmondlang
|
8ab7f72e90
|
reverse invoice search function
|
2023-02-21 23:42:00 +08:00 |
|
|
edmondlang
|
5772e30575
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-21 23:41:19 +08:00 |
|
|
edmondlang
|
c439bb5d61
|
invoice search function
|
2023-02-21 23:31:20 +08:00 |
|
|
edmondlang
|
4b2daa62d7
|
test auto generate invoice function
|
2023-02-21 17:32:20 +08:00 |
|
|
edmondlang
|
2bd8700a61
|
Merge branch 'auto-generate-invoice' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-21 16:50:42 +08:00 |
|
|
edmondlang
|
272ce5fa39
|
auto generate invoice
|
2023-02-21 16:50:14 +08:00 |
|
|
edmondlang
|
ad7e77c169
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-21 15:01:09 +08:00 |
|
|
edmondlang
|
7f4fdf0191
|
update export-customer-order
|
2023-02-20 20:31:52 +08:00 |
|
|
edmondlang
|
1c4d9520f9
|
update export-customer-order
|
2023-02-20 20:23:02 +08:00 |
|
|
edmondlang
|
6c7685dac2
|
update export-customer-order
|
2023-02-20 20:17:48 +08:00 |
|
|
edmondlang
|
e95c41bd3e
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-20 19:51:11 +08:00 |
|
|
edmondlang
|
4653e8403b
|
export-customer-order
|
2023-02-20 19:50:53 +08:00 |
|
|
edmondlang
|
903269e714
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-20 18:22:48 +08:00 |
|
|
edmondlang
|
4120a50559
|
commented on the web routes and api routes to test on the crm
|
2023-02-18 23:09:24 +08:00 |
|
|
Dillon
|
88b31f2d3f
|
Merge branch 'dillon/crm-integration' into development
|
2023-02-18 21:08:08 +08:00 |
|
|
Dillon
|
cb8d808562
|
done debugging, undo changes
|
2023-02-18 21:07:50 +08:00 |
|
|
Dillon
|
a2f9bf83ce
|
Merge branch 'dillon/crm-integration' into development
|
2023-02-18 20:29:57 +08:00 |
|
|
Dillon
|
130aca262a
|
debug
|
2023-02-18 20:29:49 +08:00 |
|
|
Dillon
|
dd2ac4c966
|
Merge branch 'dillon/crm-integration' into development
|
2023-02-18 20:09:08 +08:00 |
|
|
Dillon
|
06ab1be86e
|
debug
|
2023-02-18 20:08:53 +08:00 |
|
|
Omair Saleh
|
a78ed8271f
|
auto generate invoices
|
2023-02-17 13:56:42 +08:00 |
|