Commit Graph

381 Commits

Author SHA1 Message Date
Dillon Ngo d485352f10 Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development 2024-05-17 14:22:43 +08:00
Dillon Ngo 39de1fbdf0 Laravel Vapor - test uploading an excel file to S3 bucket 2024-05-17 14:22:26 +08:00
Dillon Ngo acca20dba0 Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development 2024-05-16 22:31:31 +08:00
Dillon Ngo f7c2b7d5e9 Laravel Vapor - test uploading a excel file 2024-05-16 22:31:25 +08:00
Dillon Ngo 55d75f084b Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development 2024-05-16 21:49:28 +08:00
Dillon Ngo e8367c18bf Laravel Vapor - test uploading a excel file 2024-05-16 21:49:22 +08:00
Dillon Ngo c3cd8f2eae Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development 2024-05-16 21:23:54 +08:00
Dillon Ngo b08c1159f3 Laravel Vapor - test uploading a excel file 2024-05-16 21:23:48 +08:00
Dillon Ngo 71f1fd494d Merge branch 'dillon/34.2-jenkins-vapor' into vapor/development 2024-05-15 16:49:01 +08:00
Dillon Ngo 496fc09f03 Laravel Vapor - test read from database export excel file to S3 bucket through a command 2024-05-15 16:48:51 +08:00
Dillon Ngo 02827fbb56 Merge branch 'dillon/34.2-jenkins-vapor' into vapor/development 2024-05-03 16:06:14 +08:00
Dillon Ngo 0b1fd84b49 Laravel Vapor - code amendment for changing local storage to AWS S3 storage (code sync from exchange-2.0) 2024-05-03 16:06:03 +08:00
Dillon Ngo 1c592010bb Merge branch 'dillon/34.2-jenkins-vapor' into vapor/development 2024-05-03 15:29:29 +08:00
Dillon Ngo 3b454890d8 Laravel Vapor - code amendment for changing local storage to AWS S3 storage (code sync from exchange-2.0) 2024-05-03 15:23:05 +08:00
Dillon Ngo 1784dd9003 Merge branch 'master' into dillon/34.2-jenkins-vapor 2024-05-02 11:31:41 +08:00
Dillon Ngo 693662983c Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-04-30 13:08:17 +08:00
Dillon Ngo a7c03d7fb2 Laravel Vapor - code amendment for changing local storage to AWS S3 storage (code sync from exchange-2.0) 2024-04-30 12:56:53 +08:00
Dillon Ngo 7c2dd70d11 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-04-30 11:53:00 +08:00
Dillon Ngo 849935aee3 Laravel Vapor - code amendment for changing local storage to AWS S3 storage (code sync from exchange-2.0) 2024-04-30 11:52:41 +08:00
edmondlang 7e029c5610 delete paid group transaction 2024-03-30 00:49:55 +08:00
Dillon Ngo 8fa899828c Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-03-19 17:30:14 +08:00
Dillon Ngo 640fa3b738 Merge branch 'master' into dillon/34.1-jenkins-vapor 2024-03-19 16:53:26 +08:00
edmondlang 898b63cbd2 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-03-14 12:48:41 +08:00
edmondlang 66ddb5da23 update send permits reminder 2024-03-14 12:46:47 +08: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 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 af1b6ac373 Merge branch 'dillon/46.4-warehouse-storage-charges' into 'master'
User interface to allow admin to waive warehouse storage invoice transaction

See merge request CIEFWorldwideSdnBhd/shipping-portal!200
2024-02-15 13:47:31 +00: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
edmondlang bc6a31d458 Merge branch 'permits-reminder' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-01-30 00:38:46 +08:00
edmondlang f389efa6af add permits edit 2024-01-30 00:07:31 +08:00
edmondlang d1426c7f05 all api and ui to create permits reminder 2024-01-17 00:43:17 +08:00
edmondlang 3375934651 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into permits-reminder
# Conflicts:
#	routes/api.php
2024-01-16 21:16:11 +08:00
edmondlang c79f58d246 permits reminder first commit 2024-01-16 21:15:29 +08:00
Dillon Ngo 8f695401d2 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-01-04 02:33:59 +08:00
Dillon Ngo ede9712513 Debug 2023-12-20 17:18:25 +08:00
Dillon Ngo 18df1c0c7b Proof of concept - Vue Polling a workaround for AWS API Gateway limitation 2023-12-20 14:47:56 +08:00
Dillon Ngo c519f34bac Merge branch 'dillon/45-air-shipment' into development 2023-12-02 17:01:31 +08:00
Dillon Ngo 3098bc7d18 An api requested by WePost for air shipment for inbound notification 2023-12-02 16:59:54 +08:00
JiaSheng 8b8edeab36 Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
#	app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
2023-11-24 17:30:29 +08:00
JiaSheng 575379adc0 centralize izyim exchange 2023-11-19 17:14:39 +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
edmondlang 36809f34cc Merge branch 'steve/aging-listing' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal 2023-10-23 23:53:35 +08:00
JiaSheng 56bba0eaaf wallet pagination, export 2023-10-22 23:46:09 +08:00
edmondlang fcd7fa655c Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2023-10-19 22:55:05 +08:00