Commit Graph

Select branches

Hide Pull Requests

ChangeCompanie

Cleison-Multipaymentui

SDEV-478-Setup-Docker-Compose-For-Exchange-and-Shipping

activity-route-log

activity-route-log-dev

add-attached-timestamp

add-delivery-order-to-invoice

address

address-extra-fields

admin-move-order

admin-settings-ui

ads-implementation

api-intergration

api-response-time-logging

api-to-update-segment-constants

arrived_parcel_export_unclaimed

auto-generate-invoice

centralize-izyim-exchange

change-company-name-debtor

change-company-type

change-company-ui

change-delivery-address-form-update

change-packinglist-owner

cief-coins

combine-invoices

connetction-segment-integration

container-payment-ui

container-profile-ui

dashboard_console_error_bugfixing

debug-multiple-invoice-one-payment

debug-multipleinvoiceswithonepayment

debug-testing

delete-packing-list

delete-paid-group-transaction

delivery-complete-button-ui

dev

development

dillon/34-jenkins-vapor

dillon/42-crm-code-sync-with-exchange

dillon/42-crm-code-sync-with-exchange-a

dillon/42-crm-code-sync-with-exchange-b

dillon/44-customer-satisfaction-feedback-project

dillon/44-customer-satisfaction-feedback-project-a

dillon/44-customer-satisfaction-feedback-project-b

dillon/44-quick-undo

dillon/46-warehouse-storage-charges

dillon/46-warehouse-storage-charges-2-merge-conflict

dillon/46.11-warehouse-storage-related-fixes

dillon/46.13-missing-payment-proof-feature

dillon/46.14-data-patch

dillon/46.15-onhold-list-anomaly-fix

dillon/46.3-warehouse-storage-charges-fixes

dillon/46.3.1-warehouse-storage-charges-fixes

dillon/46.4-warehouse-storage-charges

dillon/46.5-warehouse-storage-charges-fixes

dillon/46.6-warehouse-storage-charges-fixes

dillon/46.7-warehouse-storage-charges-fixes

dillon/46.8-warehouse-storage-charges-fixes

dillon/46.9-warehouse-storage-charges-fixes

dillon/48-feedback-form-improvement

dillon/49-problem-with-new-registration-with-existing-credentials

dillon/51.3-vue-polling-experimental

dillon/51.4-explore-multiple-queues

dillon/51.5-vue-store-update

dillon/55-billplz-fix

dillon/58-shipping-portal-sst

dillon/60-shipping-portal-fixes

dillon/62-fixes-and-new-features

dillon/62.1-fixes

dillon/62.2-benchmarking-yd-api-cron-job

dillon/62.3-fixes

dillon/70-laravel-vapor

dillon/accounting-bank-mapping

dillon/crm-create-invoice

dillon/crm-create-task

dillon/crm-create-task-2

dillon/crm-create-task-3-26

dillon/crm-feed-improvement-1

dillon/crm-invoice-update-23

dillon/crm-tasks-department

dillon/debug-and-fixes-1

dillon/debug-and-fixes-2

dillon/improvement-1

dillon/multiple-invoices-combined

dillon/multiple-payment-ui

dillon/search-marking-by-email

display_without_parcel_filter

export-customer-order-list

export-delivery-list

feature/codeception_configurations

feature/pipeline

fix-account-statement-issue

fix-migration

fix-missing-packinglist

foshan-warehouse

fulfilment-banner

ga4-user-id

invoice-search-function

last-mile-integration

list-order-v2

master

multi-invoice-combined-ui

multi-payment-final

multi-select-address-extra-fields

multiple-invoice-one-payment

multiple-payment-ui

new-air-shipment-module

new-registration-ui

new-signup

notification-ui

order-profile-pagination

order-v2

package-ui

pakage-remark

payment-and-billing-ui

payment-export-decimal-point

permits-reminder

qr-api-issue

qrcode_download_ui

regenerate-Invoive

regenerate-invoice

rename-qr-warehouse-prefix

replicate-support

responsive-order-details

show_extra_parcel_information

staging

steve/account-mapping

steve/aging-listing

system/transformers

test

update-admin-role-type

update-create-dilivery-address

update-delivery-date

update-laravelmpdf

update-wallet-when-credit-or-debit

vapor-address-extra-fields

vapor/development

vapor/development-20250620

vapor/production

vapor/staging

vapor/staging-20250719

vapor/tax-rebate-qr

vapor/test

vue-multi-select-implementation

wallet-audit

wallet-credit-note

wallet-new-feature

wip-invoice-tab

wip-sso-design

v0.0.0

Mono Color

• 8afa6a496e Minor update on UX Dillon Ngo 2026-02-23 03:22:47 +08:00
• a207e8fc88 Merge branch 'dillon/140-group-payment-dissapear' into vapor/staging Dillon Ngo 2026-02-18 23:06:59 +08:00
• 03a7ed5785 Added missing environment variable into .env.example Dillon Ngo 2026-02-18 23:06:18 +08:00
• b51617efef Merge branch 'dillon/140-group-payment-dissapear' into vapor/staging Dillon Ngo 2026-02-18 21:19:30 +08:00
• efe5ccecea Fix a problem reported by Joanne about group payment invoices not appearing properly Dillon Ngo 2026-02-12 16:05:33 +08:00
• 7faeec6ef7 Fix a problem reported by Joanne about group payment invoices not appearing properly Dillon Ngo 2026-02-12 15:44:05 +08:00
• 5c2d92c143 Merge branch 'dillon/138-fix-generate-summary-invoice-issue' into vapor/staging Dillon Ngo 2026-02-06 16:12:55 +08:00
• 20e7e19bc6 Merge branch 'dillon/138-fix-generate-summary-invoice-issue' into vapor/production Dillon Ngo 2026-02-06 15:56:56 +08:00
• 151447c573 Emergency DB issue Restore Dillon Ngo 2026-02-06 15:53:59 +08:00
• a21614ba32 Emergency DB issue Restore Dillon Ngo 2026-02-06 15:32:21 +08:00
• d99cb103ce Fix an issue reported by Eileen not able to generate summary invoice for multiple pending payment shipping invoices Dillon Ngo 2026-02-06 14:32:44 +08:00
• 4c92ac5a83 Fix an issue reported by Eileen not able to generate summary invoice for multiple pending payment shipping invoices Dillon Ngo 2026-02-06 14:30:07 +08:00
• 1c291134a1 admin move order admin-move-order Edmond Lang 2026-01-25 23:39:44 +08:00
• 98a93feea9 Merge branch 'admin-move-order' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/staging Edmond Lang 2026-01-25 23:13:51 +08:00
• 66576b6eea no message Edmond Lang 2026-01-25 23:13:09 +08:00
• d1e39e35e2 Merge branch 'dillon/132-claude' into vapor/staging Dillon Ngo 2026-01-25 15:37:04 +08:00
• 7be3614f96 New anthropic claude service to replace openai chatgpt Dillon Ngo 2026-01-25 15:31:00 +08:00
• 9a1b33a413 Fix a problem reported by Eileen for an order with cbm calculation issue, removal of inline hardcode, use segment settings instead Dillon Ngo 2026-01-21 19:16:17 +08:00
• 406b433852 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2026-01-19 10:57:08 +08:00
• 70ad358e5d Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/production Dillon Ngo 2026-01-19 10:56:48 +08:00
• c8249b9276 E-Invoice - Allow admin to download all reports Dillon Ngo 2026-01-19 10:56:14 +08:00
• 0484eabb0e Quick fix for group payment issue got stuck reported by enqi Dillon Ngo 2026-01-06 10:20:04 +08:00
• 7a5cf5f2ce Quick fix for group payment issue got stuck reported by enqi Dillon Ngo 2026-01-06 10:08:37 +08:00
• 6917a45267 Merge branch 'dillon/126-fix-tracking-page-issue' into vapor/staging Dillon Ngo 2025-12-17 13:08:32 +08:00
• 49a31a743c Allow all admin role type to view tracking no Dillon Ngo 2025-12-17 12:52:47 +08:00
• ec3d0c2ff5 Merge branch 'dillon/125-css-ui-update' into vapor/staging Dillon Ngo 2025-12-12 10:38:16 +08:00
• f3d6521e2c CSS / UI Update Dillon Ngo 2025-12-09 11:01:49 +08:00
• f7a9358202 Merge branch 'dillon/123-update-district-listing-ui-to-show-state-info' into vapor/production Dillon Ngo 2025-12-07 17:36:23 +08:00
• db499bfecf Fix district listing to display state info for clarity when 2 state share the same district name Dillon Ngo 2025-12-07 16:53:28 +08:00
• 0538653bca Fix district listing to display state info for clarity when 2 state share the same district name Dillon Ngo 2025-12-07 16:52:20 +08:00
• 9147a4cfec Fix district listing to display state info for clarity when 2 state share the same district name Dillon Ngo 2025-12-07 16:13:08 +08:00
• a20f4ed9be Fix district listing to display state info for clarity when 2 state share the same district name Dillon Ngo 2025-12-07 15:50:19 +08:00
• d542a20f76 Fix district listing to display state info for clarity when 2 state share the same district name Dillon Ngo 2025-12-07 15:36:39 +08:00
• e706e278ac Merge branch 'dillon/123-update-district-listing-ui-to-show-state-info' into vapor/staging Dillon Ngo 2025-12-07 15:11:00 +08:00
• 6d20c8d49e Fix district listing to display state info for clarity when 2 state share the same district name Dillon Ngo 2025-12-07 14:22:11 +08:00
• 86deb2a6cb Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-12-05 08:09:54 +08:00
• f02220fda8 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/production Dillon Ngo 2025-12-05 08:08:51 +08:00
• 2bf511a1cb E-Invoice - Fix Process E-Invoices button missed some orders left unprocessed Dillon Ngo 2025-12-05 08:08:33 +08:00
• 4868583dcf Merge branch 'dillon/121-fix-wallet-with-extra-top-up' into vapor/staging Dillon Ngo 2025-12-02 16:03:59 +08:00
• 4242777e7d Fix double wallet top up for group payment transaction problem Dillon Ngo 2025-12-02 16:03:32 +08:00
• 714493689c Merge branch 'dillon/121-fix-wallet-with-extra-top-up' into vapor/staging Dillon Ngo 2025-12-02 12:23:58 +08:00
• 65bd979b31 Fix double wallet top up for group payment transaction problem Dillon Ngo 2025-12-02 12:23:12 +08:00
• 12e38b7648 Merge branch 'dillon/121-fix-wallet-with-extra-top-up' into vapor/staging Dillon Ngo 2025-11-28 12:08:16 +08:00
• e0213108d2 Fix a broken link at wallet details page Dillon Ngo 2025-11-28 12:07:50 +08:00
• 3917dece42 Merge branch 'dillon/119-fix-unsuccessful-group-payment' into vapor/staging Dillon Ngo 2025-11-19 09:29:51 +08:00
• 71f50b646b Fix a unsucccessful group payment reported by Eileen Dillon Ngo 2025-11-19 09:19:37 +08:00
• 2a662b42e0 Fix a unsucccessful group payment reported by Eileen Dillon Ngo 2025-11-17 21:06:03 +08:00
• 024e0d666a Fix a unsucccessful group payment reported by Eileen Dillon Ngo 2025-11-17 20:47:47 +08:00
• 9eeebf86e9 Merge branch 'dillon/118-fix-issue-invoice-generated' into vapor/staging Dillon Ngo 2025-11-17 19:50:26 +08:00
• 37119344f3 Fix a problem on invoice generated has incorrect freight service charge (reported by Brian) Dillon Ngo 2025-11-17 19:48:56 +08:00
• 2d5185cbdc Merge branch 'dillon/113-debug-yd-api-container-integration' into vapor/staging Dillon Ngo 2025-11-13 21:52:56 +08:00
• 37cb4fca18 Fix an issue reported by Eileen on order tracking page drive info not support to appear Dillon Ngo 2025-11-13 21:37:24 +08:00
• 0406faee54 Merge branch 'dillon/113-debug-yd-api-container-integration' into vapor/staging Dillon Ngo 2025-11-08 04:53:22 +08:00
• 37e8bf4d9a Attempt to fix container integration from YD API with duplication Dillon Ngo 2025-11-08 04:52:19 +08:00
• 17d6a9589b Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-11-06 23:47:04 +08:00
• 0df85daf2e E-Invoice - Update 'Process E-Invoice' date range filtering target Dillon Ngo 2025-11-06 23:08:24 +08:00
• 650cfba74a E-Invoice - Update 'Process E-Invoice' date range filtering target Dillon Ngo 2025-11-06 22:40:16 +08:00
• 122cf9581a Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-24 14:13:38 +08:00
• 7f94148ed9 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-24 13:37:07 +08:00
• 539da4f551 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-24 13:35:47 +08:00
• 7c8f5fe791 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-24 13:06:57 +08:00
• 60c083a9cf E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-24 12:58:01 +08:00
• 5b32fe9d6f E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-24 12:52:01 +08:00
• 4c50816be9 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-24 12:46:20 +08:00
• d315880067 E-Invoice - Fix some problem reported y Mira on exporting report Dillon Ngo 2025-10-24 12:34:56 +08:00
• 1f7527c1e2 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-23 19:31:53 +08:00
• 9cd2051cac E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 19:31:27 +08:00
• 8c3e8fdeaf E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 19:18:48 +08:00
• c31e7aaf37 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 19:06:41 +08:00
• 5b6f419d9e E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 18:52:27 +08:00
• c7f00a7ce2 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 18:17:56 +08:00
• 35932e5351 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 18:04:13 +08:00
• 012b88ee37 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 17:48:55 +08:00
• b2b3962c1c Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-23 17:30:58 +08:00
• 88869dcadb E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 17:30:15 +08:00
• df1d80756a E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 17:10:57 +08:00
• 066f5f52d5 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 16:54:44 +08:00
• 4d76ffd545 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 16:15:17 +08:00
• 58f62de2e8 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 16:03:12 +08:00
• 773b30d224 E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 15:12:57 +08:00
• 9a6cefebf1 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-23 15:10:33 +08:00
• 74811f177c E-Invoice - Update Sales Invoice Report to have paid and unpaid invoices in the report Dillon Ngo 2025-10-23 15:09:50 +08:00
• 0330364929 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-21 15:57:36 +08:00
• 82de9ae6f9 E-Invoice - Update Sales Invoice Report Dillon Ngo 2025-10-21 15:57:15 +08:00
• 9048510361 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-18 15:21:44 +08:00
• 6cb27096f7 E-Invoice - New Report Export (Sales Invoice Report, unpaid) Dillon Ngo 2025-10-18 15:08:48 +08:00
• 8e42ea722f Merge branch 'dillon/90-e-invoice-shipping-portal-e-1' into vapor/staging Dillon Ngo 2025-10-14 12:42:31 +08:00
• 10660b8350 Merge branch 'dillon/90-e-invoice-shipping-portal-e-1' into vapor/production Dillon Ngo 2025-10-14 12:41:26 +08:00
• 5c42d383d0 Merge branch 'dillon/90-e-invoice-shipping-portal-f' into dillon/90-e-invoice-shipping-portal-e-1 (Lost Tracked Task) Dillon Ngo 2025-10-14 12:40:40 +08:00
• d3966e8b28 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/production Dillon Ngo 2025-10-05 13:47:12 +08:00
• 72135a46b3 Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/staging Dillon Ngo 2025-10-05 12:24:48 +08:00
• 6a4570442a E-Invoice - Amendment for storage invoice to generate E-Invoice Dillon Ngo 2025-10-05 12:12:45 +08:00
• 300f7b6642 fix bug: unexpected token "use" (View: /Users/edmondlang/Herd/shipping-portal/resources/views/pages/pdfs/shipping_invoices_sst_combined_v2.blade.php) Edmond Lang 2025-10-03 16:41:36 +08:00
• ace4375abd Merge branch 'dillon/109-fix-invoice-with-min-charge' into vapor/staging Dillon Ngo 2025-10-01 18:27:40 +08:00
• c28ee64878 Fix a problem reported by Brian where minimum charge not suppose to be applied Dillon Ngo 2025-10-01 18:26:52 +08:00
• ce6b47763c E-Invoice - Amendment for storage invoice to generate E-Invoice (partial completion) Dillon Ngo 2025-09-29 14:21:03 +08:00
• 86392af0f2 Merge branch 'dillon/90-e-invoice-shipping-portal-f' into vapor/staging Dillon Ngo 2025-09-26 10:53:41 +08:00
• 881dd71ef0 E-Invoice - Amendment for storage invoice to generate E-Invoice (partial completion) Dillon Ngo 2025-09-26 09:27:26 +08:00
• beec9aef24 E-Invoice - Amendment for storage invoice to generate E-Invoice (partial completion) Dillon Ngo 2025-09-26 09:04:39 +08:00
• fcd6f2d6a8 E-Invoice - Amendment for storage invoice to generate E-Invoice (partial completion) Dillon Ngo 2025-09-25 17:46:33 +08:00