Commit Graph

Select branches

Hide Pull Requests

0auth_redesigned_login_page

1688-PO-interface

1688-changes

1688-integration

1688-order-reference

1688-tnc

1688_manual_po

Add-new-service-type-for-booking

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

account-statement-pagination

accounting-bank-mapping

activity-route-log

add-note-to-booking-component

admin-1688-work-flow

admin-1688-work-flow-aqqill

affiliate-program

alipay-daifu

alipay-service

api-response-time-logging

azwa-calculator-api

biling-able-servic-check

bulk-download-invoices

bulk-download-white-form

c2c-onboarding

centralize-izyim-exchange

change-E2E-activation-service

change-admin-role-type

change-credit-note-to-refund-note

clear-booking-backlog

company-credit-report-backend

company-name-warning-text

company-wallet-transaction-pagination

create-index-for-tables

credit-note-pdf

crm-changes

crm-ticket-18009

cross-login

customer-page-booking-transfer-type-alignment

customer-profile-update

delete-1699-po

development

dillon/34-jenkins-vapor

dillon/38-voucherify-phase-2

dillon/39-crm-changes

dillon/41-voucherify-phase-2a

dillon/41-voucherify-phase-2b

dillon/51-vue-polling-experimental-2

dillon/51.2-test-revert-merge-request

dillon/51.4-explore-multiple-queues

dillon/51.5-vue-store-update

dillon/53-voucherify-email-reminder-to-user

dillon/57-second-voucher-first-milestone

dillon/57.1-second-voucher-first-milestone

dillon/63-voucherify-updates

dillon/63.2-sorry-voucher

dillon/63.3-sorry-voucher-debug

dillon/63.4-debugging

dillon/63.5-ui-update

dillon/63.7-company-with-multiple-employees

dillon/63.8-new-promo-voucher-50-percent

dillon/66.1-payment-bank-details

dillon/66.2-exchange-debug

dillon/68-exchange-debugging-refund

dillon/70-laravel-vapor

dillon/71-exchange-benchmarking

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-feedback-improvement-1

dillon/crm-gen-invoice-update

dillon/crm-integration

dillon/crm-tasks-department

dillon/crm-update-multiple-tasks-status

dillon/debug-and-fixes-1-22

dillon/debug-and-fixes-2-29

dillon/development

dillon/edit-bank-details

dillon/improvement-1

dillon/jenkins-aws-s3-34

dillon/jenkins-vapor-34

dillon/jenkins-vapor-34-35

dillon/jenkins-vapor-34-a

dillon/jenkins-vapor-34-vue-polling

dillon/search-marking-by-email

dillon/voucherify-35

disable-enter-myr

district-setting

double-authentication

download-invoice-ui

edit-bank-ui

export-currency-vendor-order-module

export_module

fb-gtag-update

filter-by-original-amount-issuer-bank-account-no

fix-account-statement-issue

fix-duplicate-statement-transactions

fix-export-pending-order

fix-invoice-not-tally-with-voucherify

fix-invoice-refund-service-charge

fix-invoice-refund-service-charge-issue

fix-partial-refund-show-fully-refund

fix-po

fix-proforma-invoice

fix-refund-outstanding

fix-regenerate-bulk-invoice

fix-register-issue-with-autofill-credentials

fix-wrong-currency-rate-group-command

front-end-bootstrap

ga4-user-id

get-transactions-from-production

header-responsive-design

honey-trap

import-ambank-cief-lite-statement

initial-swagger

invoice-adjustment

invoice-amount-not-tally

landing-pages

lark-push-booking-transactions

list-transfer-with-filters

login-dashboard-responsive-design

manual-po-segment-update

master

new-listing-component

payment-billing-document

pending-order-export-fomart-rearrangement

pre-prod

promo-code

purchase_order_import

rate-history

rate-history-refactored

recalculate-wallet-balance

refund-booking

refund-update

refund_remark_refresh_on_pressed

regenerate-invoice

regenerate-invoice-with-first-bill-no

register-honey-trap

remark-module

responsive-dashboard

revert-304379b1

revert-6637d057

revert-b9668bb6

revert-c28544c6

segment-inovice-based-createdon

send-email-payment-proof

staging

steve/account-mapping

steve/allow-revert-matched-transactions

steve/currency-setting

steve/fix-statement-module

steve/fix-view-statement-details

storybook-setup

supplier-bill-group-dashboard

task-EXCHANGE-711

test

test-export

transaction-not-tally

transfer-booking-owner

uncomment-booking-expired-command

unit-testing

unit_test

update-company-name-debtor

update-innoive-amount

update-laravel-mpdf

update-payment-recipient-bank-account

upload-payment-proof-booking-page

vapor/development

vapor/development-20250610

vapor/production

vapor/staging

vapor/test

vapor/weird-branch

white-form-list-upload-bank-slips

Mono Color

• 17e9213346 load fetch_model_attributes API for login_successful Aqqil Azman 2024-07-23 10:21:24 +08:00
• d6e45a0817 added fetch_model_attributes Aqqil Azman 2024-07-23 10:20:15 +08:00
• 4289c65e4f recovered elapsedTime admin-1688-work-flow Aqqil Azman 2024-07-22 18:09:46 +08:00
• 9070c5f0dd reverse commit edmondlang 2024-07-22 18:04:01 +08:00
• 8f1605c31e changed the timer to reset for every step Aqqil Azman 2024-07-22 17:45:43 +08:00
• 4f86ba5980 update typo edmondlang 2024-07-22 15:06:56 +08:00
• 8d48f6f4eb 1688 admin work flow clean up and call api edmondlang 2024-07-22 01:12:51 +08:00
• d95f4829cb Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-22 00:46:40 +08:00
• 1467d0880f update bill group to include the service charge Jia Sheng 2024-07-22 00:46:07 +08:00
• 31282492fe Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into admin-1688-work-flow-aqqill edmondlang 2024-07-21 18:31:23 +08:00
• f7bd74bee4 made buttons bigger and align them horizontally Aqqil Azman 2024-07-18 15:33:39 +08:00
• 2a26c58dda Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-17 10:22:21 +08:00
• 33e6bec752 Finished up 1688 workflow, approve PO and fill PO Aqqil Azman 2024-07-16 13:19:18 +08:00
• ef23d75766 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-16 01:06:52 +08:00
• c3d94f8c4b Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-16 01:04:27 +08:00
• 9b0fbb66f4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-16 00:22:43 +08:00
• 26177eba66 add account holder name for usd order whiteform 1688-order-reference Jia Sheng 2024-07-16 00:22:21 +08:00
• fd00b0ec51 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-15 23:13:21 +08:00
• 53071e21a7 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-15 21:10:28 +08:00
• 8debbd4ef4 add order reference to white form Jia Sheng 2024-07-15 21:09:57 +08:00
• 6fd276e240 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-14 21:08:40 +08:00
• faa1b2ce44 update 1688 ORDER REFERENCE design edmondlang 2024-07-14 21:06:40 +08:00
• d8b1426336 update 1688 ORDER REFERENCE design edmondlang 2024-07-14 21:00:11 +08:00
• fc005a9ef5 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-14 19:58:52 +08:00
• 34d95bbcb7 fix console error messages edmondlang 2024-07-14 19:57:54 +08:00
• 3e9ceed23a Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-14 19:32:53 +08:00
• f2f12a6eb4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-14 19:16:07 +08:00
• cb7c38a50d 1688 order reference Jia Sheng 2024-07-14 19:15:43 +08:00
• ba74a90d87 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-14 12:23:08 +08:00
• c865b28315 update Jia Sheng 2024-07-14 12:22:04 +08:00
• 37e42ed249 Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-14 11:00:58 +08:00
• 63118efc0b delete duplicated 1688 bank account alipay-service Jia Sheng 2024-07-14 11:00:33 +08:00
• 830097f857 Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-13 14:13:49 +08:00
• f533810e42 update Jia Sheng 2024-07-13 14:13:23 +08:00
• d1f319582a alipay service Jia Sheng 2024-07-13 14:12:54 +08:00
• bceaa03e38 Merge branch 'fix-partial-refund-show-fully-refund' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-13 11:08:26 +08:00
• c43e8e3f10 fix partial refund show fully refund fix-partial-refund-show-fully-refund Jia Sheng 2024-07-13 11:07:43 +08:00
• c3961d102e AbstractRule class update, with abstract authorized function updated to accept a parameter Dillon Ngo 2024-07-12 13:27:31 +08:00
• 6e4127a1df Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-09 13:07:40 +08:00
• d76e3cc620 fix bug - customer cant see the Purchase Order section edmondlang 2024-07-09 13:07:17 +08:00
• f4488524fe Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-08 19:10:18 +08:00
• 4f9c6f574e Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-08 19:08:01 +08:00
• a68e919a84 Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-08 19:07:46 +08:00
• 91ce365c62 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-08 19:07:29 +08:00
• 726d06871b 1688 changes 1688-changes edmondlang 2024-07-08 19:07:06 +08:00
• 28ef7fe7de Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-changes edmondlang 2024-07-08 19:03:37 +08:00
• 93ad34b2b8 Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-08 18:57:18 +08:00
• a77481084c Merge branch 'add-note-to-booking-component' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-08 13:29:15 +08:00
• 74e19b1325 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-08 13:28:54 +08:00
• 6d522fdb97 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-08 12:33:03 +08:00
• 7f16b9ead1 update refund logic where E2E do not refund service charge Jia Sheng 2024-07-08 12:30:34 +08:00
• e4e2a8a9a1 Merge branch 'add-note-to-booking-component' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-08 12:10:28 +08:00
• 369054c81d -add note under booking payment history -add additional note when creating booking add-note-to-booking-component Jia Sheng 2024-07-08 12:09:33 +08:00
• eab43a7d05 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-05 20:49:15 +08:00
• e8cb4b8f5a update pdf top header change-credit-note-to-refund-note Jia Sheng 2024-07-05 20:46:48 +08:00
• 8d11f54b01 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-04 23:36:57 +08:00
• 17df7fda44 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-07-04 23:36:18 +08:00
• 1ac4c58a18 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-04 23:04:12 +08:00
• 659a48d7ad update export refund Jia Sheng 2024-07-04 23:03:43 +08:00
• 0758123216 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-04 22:29:10 +08:00
• c43c635661 update Jia Sheng 2024-07-04 22:28:44 +08:00
• 79dd0554b1 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-04 22:08:30 +08:00
• 77140ec751 -change the heading in pdf from credit note to refund note for those transaction after 02 April 2024 Jia Sheng 2024-07-04 22:07:24 +08:00
• 416ec42ebc Merge branch 'dillon/63-voucherify-updates' into 'master' Dillon Ngo 2024-07-03 11:22:27 +00:00
• 929cb2c0a6 Test sending welcome voucher email through server dillon/63-voucherify-updates Dillon Ngo 2024-07-03 19:21:50 +08:00
• 734acfb8d9 Merge branch 'dillon/63-voucherify-updates' into 'master' Dillon Ngo 2024-07-03 11:17:24 +00:00
• 09b3ffe2d5 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Dillon Ngo 2024-07-03 18:41:54 +08:00
• 508260221e Merge branch 'dillon/63-voucherify-updates' into development Dillon Ngo 2024-07-03 18:41:21 +08:00
• 692789d014 Test sending welcome voucher email through server Dillon Ngo 2024-07-03 18:41:03 +08:00
• 6d6ffa003d Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-07-03 14:55:30 +08:00
• 66c2bb0cca 1688 fields changes edmondlang 2024-07-03 14:54:47 +08:00
• f0205bb674 Merge branch 'dillon/63-voucherify-updates' into development Dillon Ngo 2024-07-03 12:13:24 +08:00
• 47d4a163c4 Merge branch 'dillon/63-voucherify-updates' into 'master' Dillon Ngo 2024-07-03 04:10:34 +00:00
• ad06bd4c4c Fix welcome voucher email out of alignment issue in yahoo mail Dillon Ngo 2024-07-03 12:08:57 +08:00
• 975ba1751c Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-02 20:47:19 +08:00
• cf17e9bb11 order export refund by created at Jia Sheng 2024-07-02 20:46:53 +08:00
• b0f4d513eb Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development Dillon Ngo 2024-07-01 13:26:26 +08:00
• a4010fcac2 Laravel Vapor - Renamed a file to fit its purpose (code sync from shipping portal) Dillon Ngo 2024-07-01 13:26:00 +08:00
• 3e56b914a3 Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development Dillon Ngo 2024-07-01 12:59:27 +08:00
• 328417c8cf Laravel Vapor - sync some missing code meant for PerfexCRM Dillon Ngo 2024-07-01 12:57:10 +08:00
• 92dea42a44 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-06-30 12:19:10 +08:00
• a4b09cedb1 include refund service charges for partial refund Jia Sheng 2024-06-30 12:18:40 +08:00
• 6a8006c0b0 continue workflow, added Issue, approve PO and edit order Aqqil Azman 2024-06-25 13:27:14 +08:00
• bb3be71be8 Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development Dillon Ngo 2024-06-25 10:21:06 +08:00
• 8066acdde9 Laravel Vapor - Look into request that returns an error 500 Dillon Ngo 2024-06-25 10:20:25 +08:00
• 60a3c3b1fd Merge branch 'dillon/34.5-vapor-development' into vapor/development Dillon Ngo 2024-06-25 09:30:36 +08:00
• afb7affe44 Laravel Vapor - Development environemnt specific only changes - logging with specific channel Dillon Ngo 2024-06-25 09:30:21 +08:00
• cd78344495 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-06-24 23:17:09 +08:00
• 1013163fc4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-06-24 23:16:48 +08:00
• 9fb4ac7d63 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-06-24 22:45:43 +08:00
• c34bacccfd -fix expired booking command to ignore 1688 as 1688 may not have PO initally -create command to revert those fully refunded payment transaction from status EXPIRED to REFUNDED clear-booking-backlog Jia Sheng 2024-06-24 22:45:21 +08:00
• 95bcf23fc1 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-06-24 21:06:30 +08:00
• 84ff900629 comment out booking expired command in kernel Jia Sheng 2024-06-24 21:06:05 +08:00
• 9f136f1045 Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development Dillon Ngo 2024-06-24 13:35:15 +08:00
• ac676ccc28 Laravel Vapor - Export pdf file through S3 bucket (sync code for bug solved at shipping portal) Dillon Ngo 2024-06-24 13:34:50 +08:00
• b799ebf491 Merge branch 'dillon/34.5-jenkins-vapor' into vapor/development Dillon Ngo 2024-06-23 20:47:14 +08:00
• f0335e86c1 Laraval Vapor - Update development and staging environment to use a duplicated production bucket for the purpose of testing Dillon Ngo 2024-06-23 20:46:59 +08:00
• 6b6fe83e49 Merge branch 'dillon/34.5-vapor-development' into vapor/development Dillon Ngo 2024-06-23 20:03:20 +08:00
• bb5a473fe4 Fix a problem in merge conflict done wrong Dillon Ngo 2024-06-23 20:03:01 +08:00
• af390540b6 Merge branch 'dillon/34.5-vapor-development' into vapor/development Dillon Ngo 2024-06-23 19:40:05 +08:00