cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-23 14:34:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,679 Commits 149 Branches 1 Tag
development
Commit Graph

189 Commits

Author SHA1 Message Date
Dillon Ngo c223aec7c9 Merge branch 'dillon/46.12-warehouse-storage-manual-payment' into development 2024-06-02 20:19:11 +08:00
Dillon Ngo 3c622dc6ca Stop warehouse storage fee from calculating whenever there is a manual payment submitted for verification 2024-06-02 20:17:32 +08:00
Omair Saleh 863dc94dad Revert "Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'"" 
This reverts commit a49920973e.
 2024-04-18 02:09:16 +08:00
Omair Saleh a49920973e Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'" 
This reverts commit 7cd376a9b5, reversing
changes made to 6176135f85.
 2024-04-16 13:21:07 +08:00
Dillon Ngo b26fea9a49 Merge branch 'dillon/58-shipping-portal-sst' into development 2024-04-07 10:43:32 +08:00
Dillon Ngo a809aec9a7 SST Impelemtation 2024-04-07 10:22:12 +08:00
Dillon Ngo 68ce8373e9 SST Impelemtation 2024-04-07 09:27:09 +08:00
edmondlang a87ab6c27f logging delete paid group transaction 2024-03-31 21:41:42 +08:00
edmondlang 462a4776cd delete paid group transaction 2024-03-31 17:36:12 +08:00
edmondlang b5efe6139d Merge branch 'delete-paid-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-03-30 00:50:14 +08:00
edmondlang 7e029c5610 delete paid group transaction 2024-03-30 00:49:55 +08:00
Dillon Ngo e15170bc7f Merge branch 'dillon/46.9-warehouse-storage-charges-fixes' into 'master' 
Multiple fixes related to storage invoices

See merge request CIEFWorldwideSdnBhd/shipping-portal!212
 2024-03-26 00:44:33 +00:00
Dillon Ngo 8d5edbd716 Merge branch 'dillon/46.9-warehouse-storage-charges-fixes' into development 2024-03-16 15:50:36 +08:00
Dillon Ngo 5de2554d63 Fix a problem with storage invoice checking when a payment related transaction is deleted at order page 2024-03-15 03:33:58 +08:00
Dillon Ngo 20f0d54844 Merge branch 'dillon/55-billplz-fix' into development 2024-03-14 12:44:17 +08:00
Dillon Ngo 65782ebf8a Long term solution to prevent customer making payment to a shipping invoice when there is a ongoing dispute 2024-03-14 12:43:58 +08:00
Dillon Ngo 5ac8911fab Merge branch 'dillon/55-billplz-fix' into development 2024-03-14 12:32:26 +08:00
Dillon Ngo 96a089df16 Long term solution to prevent customer making payment to a shipping invoice when there is a ongoing dispute 2024-03-14 12:32:03 +08:00
Dillon Ngo bf1cb09ece Merge branch 'dillon/46.9-warehouse-storage-charges-fixes' into development 2024-03-09 02:20:57 +08:00
Dillon Ngo 6d210d3713 Fix a problem with deleting a pending verification group payment at order page 2024-03-09 02:16:32 +08:00
Dillon Ngo 74e9b23f91 Merge branch 'dillon/46.7-warehouse-storage-charges-fixes' into 'master' 
Create a regenerate storage invoice feature to debug problem in reading and...

See merge request CIEFWorldwideSdnBhd/shipping-portal!203
 2024-02-24 03:49:50 +00:00
Dillon Ngo 476f5ba506 Merge branch 'dillon/46.7-warehouse-storage-charges-fixes' into development 2024-02-24 11:41:05 +08:00
Dillon Ngo f949877a7f Create a regenerate storage invoice feature to debug problem in reading and downloading storage invoice 2024-02-24 11:40:51 +08:00
Dillon Ngo 1e876dd103 Merge branch 'dillon/46.7-warehouse-storage-charges-fixes' into 'master' 
Create a regenerate storage invoice feature to debug problem in reading and...

See merge request CIEFWorldwideSdnBhd/shipping-portal!202
 2024-02-24 03:20:17 +00:00
Dillon Ngo ef934626d6 Merge branch 'dillon/46.7-warehouse-storage-charges-fixes' into development 2024-02-24 10:48:42 +08:00
Dillon Ngo aaae8bcafa Create a regenerate storage invoice feature to debug problem in reading and downloading storage invoice 2024-02-24 10:48:26 +08:00
Dillon Ngo 8fbf163d4b Merge branch 'dillon/46.5-warehouse-storage-charges-fixes' into development 2024-02-24 10:09:26 +08:00
Dillon Ngo b66dfa8649 Implement authorization module for update customer credit term status 2024-02-24 10:08:24 +08:00
Dillon Ngo 014244f453 Merge branch 'dillon/46.5-warehouse-storage-charges-fixes' into development 2024-02-23 10:49:48 +08:00
Dillon Ngo 62191c2711 Undo a changes made on previous commit 2024-02-23 10:49:09 +08:00
Dillon Ngo d15c5d9bc9 Merge branch 'dillon/46.5-warehouse-storage-charges-fixes' into development 2024-02-18 10:00:57 +08:00
Dillon Ngo 78573db17d User interface to allow admin to update company whether is a credit term customer for warehoue storage charges 2024-02-18 10:00:35 +08:00
Dillon Ngo 6c12d4b436 Merge branch 'dillon/46.4-warehouse-storage-charges' into development 2024-02-15 21:18:11 +08:00
Dillon Ngo c427ae42a0 User interface to allow admin to waive warehouse storage invoice transaction 2024-02-15 21:18:02 +08:00
Dillon Ngo aad694ff2e Merge branch 'dillon/46.4-warehouse-storage-charges' into development 2024-02-15 21:02:15 +08:00
Dillon Ngo 8a7a4ce38a User interface to allow admin to waive warehouse storage invoice transaction 2024-02-15 21:01:50 +08:00
Dillon Ngo 1ad8f81080 Merge branch 'dillon/46.4-warehouse-storage-charges' into development 2024-02-15 20:45:56 +08:00
Dillon Ngo 1b6fe7445e User interface to allow admin to waive warehouse storage invoice transaction 2024-02-15 20:45:32 +08:00
Dillon Ngo 7e1a0a1bc4 Merge branch 'dillon/46.3.1-warehouse-storage-charges-fixes' into development 2024-01-15 08:38:45 +08:00
Dillon Ngo 0e822ff1dd UI/UX amendment for order page when paying with storage invoice 2024-01-15 08:38:13 +08:00
Dillon Ngo 341fe0ff52 Merge branch 'dillon/46-warehouse-storage-charges-2-merge-conflict' into development 2023-12-20 23:59:27 +08:00
Dillon Ngo b4eca67a2f Emergency fix problem with group payment (reported by Eileen) 2023-12-20 23:58:56 +08:00
Dillon Ngo e7279ec4d0 Merge branch 'master' into dillon/46-warehouse-storage-charges-2-merge-conflict 2023-12-11 21:29:06 +08:00
Dillon Ngo 74f4cfda0c Merge branch 'dillon/46-warehouse-storage-charges' into development 2023-11-16 23:05:18 +08:00
Dillon Ngo 76e3668563 20231109 Meeting Feedback 1 Fixes for warehouse storage charges 2023-11-16 22:40:26 +08:00
edmondlang 1d3ab46cc7 Merge branch 'add-delivery-order-to-invoice' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2023-10-27 09:16:42 +08:00
edmondlang 97eaefa45a regenerate single invoice 2023-10-27 09:16:23 +08:00
edmondlang 012ead1a8f Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	app/Classes/General/Eloquent/Filters/OwnerType.php
 2023-10-24 01:06:26 +08:00
edmondlang 0ebea79750 Merge branch 'wallet-new-feature' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal 2023-10-24 00:51:16 +08:00
JiaSheng d41bd3db39 fix bug when packing list is deleted 2023-10-23 22:00:31 +08:00