Commit Graph

53 Commits

Author SHA1 Message Date
Jia Sheng 7e42bda76e make 1688 supplier in supplier currency order dashboard has the same flow as other supplier 2024-07-31 22:39:04 +08:00
Jia Sheng 1467d0880f update bill group to include the service charge 2024-07-22 00:46:07 +08:00
JiaSheng 5fd2f6ef7f -complete supplier bill group when oustanding is 0
-create refund and supplier refund if the request refund order is in white form
2024-02-28 01:34:39 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
edmondlang 9308975c4a update bull number to 7 digits 2023-09-30 20:01:38 +08:00
edmondlang 9529823430 update generate bill number to random 10 digits 2023-09-29 11:21:36 +08:00
edmondlang 4c972e63cf fix invoice number has decimals 2023-09-28 19:20:11 +08:00
Omair Saleh 39d8ed2e9e fix invoice bugs 2023-09-01 04:32:37 +08:00
Dillon c7927847c4 Voucherify phase 2 2023-07-17 21:29:19 +08:00
edmondlang 1591cb9162 crm changes 2023-06-12 20:41:46 +08:00
Dillon 58bdfaaee7 minor code streamline from shipping portal 2023-03-24 15:16:21 +08:00
Dillon 15f07f553b Update business logic of when invoice at CRM should be generated 2023-03-18 02:11:50 +08:00
Dillon 607a6f111b Add new tasks post payment into CRM + Add task append to lead 2023-03-01 12:27:26 +08:00
Dillon 227486e967 Merge branch 'dillon/crm-integration' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into dillon/crm-integration 2023-02-27 13:08:34 +08:00
Dillon 4d7b41b0a4 CRM integration MVP Phase 1 2023-02-17 06:28:59 +08:00
edmondlang b8885ca46e Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into dillon/crm-integration 2023-02-12 20:04:25 +08:00
Omair Saleh eb3770e843 debug update group rate 2023-01-17 12:20:05 +08:00
Omair Saleh a084f61553 debug update group rate 2023-01-17 12:04:32 +08:00
Dillon 63f0670923 PerfexCRM Integration 2023-01-03 15:41:30 +08:00
omair saleh a3143a0ec7 fix delete group logic 2022-07-20 11:59:09 +08:00
omair saleh 7219bc1301 fix group reference duplicate bug 2022-07-17 14:37:50 +08:00
omair saleh dc992de2fb fix up group transactions bulk purchase orders 2022-07-15 13:08:29 +08:00
ahmedsophyudden 47e287e3ad Fix create order button not working at dashboard 2022-06-12 18:23:21 +08:00
edmondlang 911b928619 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into delete-group-transaction 2022-04-17 10:03:09 +08:00
omair saleh f7de7d290a update transfer fee formula 2022-04-12 11:19:57 +08:00
edmondlang 5647957e9f delete group transaction 2022-04-10 21:31:20 +08:00
omair saleh 89069a8afe clean up development 2022-03-12 19:32:45 +08:00
omair saleh 481426bec9 clean up development 2022-03-12 17:02:21 +08:00
edmondlang eba2eb78f8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-11 14:14:48 +08:00
omair saleh cfbed3917e update xpo 2022-03-11 10:55:36 +08:00
ahmedsophyudden e6ecf74379 Merge branch 'add-transaction-service-charge' into development 2022-02-28 22:50:13 +08:00
ahmedsophyudden 592024d462 Create api to get bank account balance by bank id 2022-02-22 11:35:12 +08:00
ahmedsophyudden 6a2d0dc2a4 Fixed transfer fee count (status == approve only and deduct credit note) 2022-01-27 22:46:36 +08:00
omair saleh 90021ba796 generate xpo 2022-01-19 10:42:41 +08:00
ahmedsophyudden 36c659c84e Transfer Fee Transaction - Company Balance Account API 2022-01-11 23:07:49 +08:00
ahmedsophyudden d2d92f668e add transfer fee transaction and fixed currency_vendor_order pdf calculation 2022-01-08 03:28:18 +08:00
ahmedsophyudden 77b2d21e68 add calculation service charge for transaction bill 2022-01-02 15:01:52 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
omair saleh 419f3ca88b Merge branch 'regenerate-invoice' into 'development'
regenerate booking invoice

See merge request CIEFWorldwideSdnBhd/exchange-2.0!65
2021-11-19 05:52:54 +00:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
glovetleong c907903244 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into task/EXC-353
# Conflicts:
#	app/Models/Company.php
2021-10-25 21:43:55 +08:00
glovetleong 2ffefc03bb fix MorphMany transaction 2021-10-22 14:47:01 +08:00
glovetleong 30884201bd regenerate booking invoice 2021-10-19 21:51:47 +08:00
Fairuz e94ef44928 Wallet operations 2021-10-07 01:34:11 +08:00
ahmedsophyudden fa4042ecff edit refund calculation to correct formulat 2021-09-08 23:41:56 +08:00
ahmedsophyudden 2b167b1950 add partial refund credit note flow 2021-09-05 22:52:33 +08:00
ahmedsophyudden 4b5f64ca9b add booking quotation calculation for partial refund request 2021-09-05 12:18:08 +08:00
omair saleh 21ee4333ba fixing bugs 2021-05-06 14:01:01 +08:00
omair saleh 05401f6bbc large commit 2021-03-11 13:06:40 +08:00