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

1247 Commits

Author SHA1 Message Date
Dillon Ngo e25377d62d Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development 2024-09-13 01:02:52 +08:00
Dillon Ngo c9570db825 Debugging 2024-09-13 01:02:40 +08:00
Dillon Ngo 807af317a1 Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development 2024-09-13 00:49:29 +08:00
Dillon Ngo 5c60de2851 Debugging 2024-09-13 00:49:20 +08:00
Dillon Ngo ee1bab12bf Merge branch 'dillon/69-shipping-portal-debugging-on-dev' into development 2024-09-13 00:31:22 +08:00
Dillon Ngo b077730214 Debugging 2024-09-13 00:31:02 +08:00
edmondlang eacf428c00 Merge branch 'cief-coins' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-09-01 23:16:03 +08:00
edmondlang 4faf3064d1 cief coins 2024-09-01 23:15:42 +08:00
edmondlang bb273b6334 Merge branch 'cief-coins' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-09-01 20:50:57 +08:00
edmondlang d7ef783443 cief coins 2024-09-01 20:49:46 +08:00
edmondlang 9f4c657122 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-09-01 19:59:09 +08:00
edmondlang b7c6c13bde fix payment-and-billing vue console error 2024-09-01 19:58:51 +08:00
edmondlang 4c5483cb7c Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-09-01 19:49:03 +08:00
edmondlang 01d666d92a fix payment-and-billing vue console error 2024-09-01 19:48:44 +08:00
edmondlang ec3c596352 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-08-04 00:46:02 +08:00
edmondlang 499782bbec update /export/aging-list, add 'is credit term customer' column 2024-08-04 00:39:15 +08:00
edmondlang f3eca3dd89 Export Group Transactions CSV 2024-08-03 23:04:47 +08:00
Dillon Ngo 3fe98b24a4 Data patch for storage invoice 2024-07-23 07:06:34 +08:00
Dillon Ngo 39892a0938 Data patch for storage invoice 2024-07-23 06:58:10 +08:00
edmondlang a0a2c335ba Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-07-18 00:14:51 +08:00
edmondlang bcfeb49275 update address extra fields 2024-07-18 00:14:19 +08:00
edmondlang 4a2c0db044 Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
#	package.json
 2024-07-05 00:28:12 +08:00
edmondlang cf3e7f04e4 Merge branches 'master' and 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into address-extra-fields 2024-07-05 00:26:12 +08:00
edmondlang be0cd16285 update address extra fields 2024-07-05 00:25:57 +08:00
edmondlang b08e4c618f Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-06-26 13:48:21 +08:00
edmondlang 669cac9bd4 fix-approved-payment-failed-group 2024-06-26 13:47:58 +08:00
edmondlang 57532e9afd Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-06-26 13:03:07 +08:00
edmondlang 2f55821046 add multi select 2024-06-24 23:13:48 +08:00
edmondlang 4a9ac3de02 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into address-extra-fields 2024-06-20 10:03:57 +08:00
edmondlang 1e6fafef28 make address line 2 required 2024-06-20 10:02:15 +08:00
Dillon Ngo fd75da5778 Merge branch 'dillon/51.5-vue-store-update' into 'master' 
A minor fix to not allow non-admin user to see admin data by navigating to the...

See merge request CIEFWorldwideSdnBhd/shipping-portal!229
 2024-06-17 00:58:05 +00:00
Dillon Ngo b593605c72 A minor fix to not allow non-admin user to see admin data by navigating to the url /payment-and-billing-2 2024-06-17 08:51:09 +08:00
Dillon Ngo ea920717a1 Fix a rounding problem in group payment which will result in goods cannot be released through CallbackBillplzLogic 2024-06-15 05:56:23 +08:00
Dillon Ngo e1b49f6be0 Merge branch 'dillon/46.13-missing-payment-proof-feature' into 'master' 
Restore missing payment proof feature

See merge request CIEFWorldwideSdnBhd/shipping-portal!224
 2024-06-14 21:45:15 +00:00
Dillon Ngo 8ff459c373 Merge branch 'dillon/62-fixes-and-new-features' into development 2024-06-15 05:36:38 +08:00
Dillon Ngo 707c48ab12 Fix a rounding problem in group payment which will result in goods cannot be released through CallbackBillplzLogic 2024-06-15 05:36:10 +08:00
Dillon Ngo 6d006ba60b Merge branch 'master' into dillon/62-fixes-and-new-features 2024-06-15 03:23:45 +08:00
edmondlang 1be405ca93 fix error message in admin dashbaord 2024-06-13 23:47:43 +08:00
edmondlang 4087df6649 Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
#	app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
#	app/Models/Address.php
 2024-06-12 12:06:00 +08:00
edmondlang 9d0924c674 address extra fields 2024-06-12 12:02:31 +08:00
edmondlang 4ac1fdb1ba Merge branch 'ga4-user-id' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-06-09 21:26:06 +08:00
edmondlang d21a930889 ga4 with user id 2024-06-09 21:25:36 +08:00
Dillon Ngo cdf5e89a4a Merge branch 'dillon/46.13-missing-payment-proof-feature' into development 2024-06-09 12:01:13 +08:00
Dillon Ngo b000c25e66 'Your Payment Proof' feature missing for order with storage invoices through group payment 2024-06-09 12:00:19 +08:00
edmondlang a32e63b74f Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-06-07 17:41:05 +08:00
edmondlang 1e9af59b91 test gtag 2024-06-07 17:40:48 +08:00
edmondlang 32d3aebf37 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	resources/views/layouts/base.blade.php
 2024-06-07 17:36:33 +08:00
edmondlang a392b8a5eb test ga4 2024-06-07 17:35:57 +08:00
edmondlang 1b2ae413e3 test ga4 2024-06-07 17:35:04 +08:00
edmondlang 1059251b6b test gtag 2024-06-07 17:25:38 +08:00