459b301ff4
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-26 16:13:28 +08:00
f5df0c9f1f
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production
2024-11-26 15:58:51 +08:00
e50bab014d
Laravel Vapor - Fix a problem where packages not updating correct status
2024-11-26 15:58:31 +08:00
0ea6d5b577
Merge branch 'vapor/production' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/development
...
# Conflicts:
# app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php
2024-11-21 14:55:29 +08:00
1933787fc3
addd function to revert identification document approval
2024-11-21 14:46:22 +08:00
5535f13aff
Merge branch 'dillon/34.8a-enhancement' into vapor/production
2024-11-18 20:56:19 +08:00
caf79c9dfa
Merge branch 'dillon/34.8a-enhancement' into vapor/development
2024-11-17 13:52:09 +08:00
3a2131a04d
Laravel Vapor - Enhancement to prevent customer from underpay when a payment transaction include storage invoice(s)
2024-11-17 13:51:54 +08:00
4c819a1297
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-16 15:50:13 +08:00
c8e8c9cb0e
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production
2024-11-16 15:49:18 +08:00
0e617f5ce2
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-16 15:49:00 +08:00
462effb75c
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-16 14:29:52 +08:00
ccb77ce56c
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production
2024-11-16 14:29:21 +08:00
8f8c3ca660
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-16 14:28:43 +08:00
8e0e9e1c77
Merge branch 'dillon/34.8a-enhancement' into vapor/development
2024-11-16 09:17:32 +08:00
922718f7c2
Laravel Vapor - Enhancement to prevent customer from underpay when a payment transaction include storage invoice(s)
2024-11-16 09:17:15 +08:00
cd4b12a88c
Merge branch 'dillon/34.8a-enhancement' into vapor/development
2024-11-15 18:34:21 +08:00
54e6041fe5
Laravel Vapor - Enhancement to prevent customer from underpay when a payment transaction include storage invoice(s)
2024-11-15 18:34:08 +08:00
6275574ec2
Merge branch 'dillon/34.8a-enhancement' into vapor/development
2024-11-15 09:17:43 +08:00
141f1ed9d5
Laravel Vapor - Enhancement to prevent customer from underpay when a payment transaction include storage invoice(s)
2024-11-15 09:17:16 +08:00
9fa274cd55
Merge branch 'dillon/34.8a-enhancement' into vapor/development
2024-11-14 14:03:43 +08:00
61d7ad22e7
Laravel Vapor - Enhancement to prevent customer from underpay when a transaction also invoice storage invoices
2024-11-14 14:03:29 +08:00
798bf4e70e
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production
2024-11-14 12:02:24 +08:00
04b9861eea
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-14 11:48:40 +08:00
aa833f7a9f
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-14 11:48:26 +08:00
8dd3fbf97a
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/production
2024-11-13 21:38:36 +08:00
61ab80a283
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-13 21:37:54 +08:00
63e1b767fc
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-13 21:37:20 +08:00
60ff1c5130
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-13 21:36:56 +08:00
c729daba18
Merge branch 'vapor/development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/development
2024-11-13 10:54:54 +08:00
c3ffed5af9
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-13 10:54:37 +08:00
22aac2df04
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-13 10:54:17 +08:00
5c3a3b8fc9
Merge branch 'vapor/production' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/development
2024-11-13 00:19:05 +08:00
33d65be53b
tax rebate feedback:
...
1. add the word "退税“ behind the order number as requested by YD
2. the word "供应商” should change to “联络人”
3, Tax Rebate Refund only applicable on GZ warehouse. YW and FS warehouse cannot do Tax Rebate. Can you block or disallow the tax rebate section for this both warehouse ?
4. It will be good if a delete button can be implemented in the Created Tax Rebate QR code, so customer can remove them if they created wrongly
2024-11-13 00:18:16 +08:00
ed36609bfe
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-12 17:45:14 +08:00
d2f6f4e8a1
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-12 17:45:01 +08:00
1e077ebb24
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-12 13:48:19 +08:00
299c384cb2
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-12 13:48:06 +08:00
b43a77754d
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-12 12:18:29 +08:00
be171f550b
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-12 12:18:07 +08:00
8295b80f73
Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production
2024-11-12 09:24:09 +08:00
3d12df183a
Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development
2024-11-12 09:09:27 +08:00
67969c63d3
Laravel Vapor - Logs output minor amendments (code sync with Exchange)
2024-11-12 09:05:45 +08:00
2074c8661a
Laravel Vapor - Remove comments
2024-11-12 08:01:59 +08:00
9518928b7d
Laravel Vapor - Remove comments
2024-11-12 07:59:38 +08:00
634a39b1ea
Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production
2024-11-11 15:08:14 +08:00
5808fd0b2f
Laravel Vapor - Fix missing info with order packages where in China Warehoue
2024-11-11 15:06:30 +08:00
1902b70b53
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-11 15:01:37 +08:00
d7ce1df29b
Laravel Vapor - YD API integration code rewrite to fix eta/etd
2024-11-11 15:01:31 +08:00
a2641ac96b
Merge branch 'dillon/34.8b-yd-api-bug-fix' into vapor/development
2024-11-11 14:48:13 +08:00
Dillon Ngo
edmondlang