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

• de008d593e Minor UI update to show Terms requested by KS dillon/63.5-ui-update Dillon Ngo 2024-08-13 15:59:07 +08:00
• 45533c9179 Quick fix on error when lock booking info forwarded to voucherify dillon/63.4-debugging Dillon Ngo 2024-08-13 14:55:05 +08:00
• ca1d36bac6 fix code merging edmondlang 2024-08-12 23:39:17 +08:00
• 204ebf04ca fix merge code error edmondlang 2024-08-12 23:19:12 +08:00
• f24c1b6263 Merge branch 'fix-wrong-currency-rate-group-command' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-refund-outstanding fix-refund-outstanding edmondlang 2024-08-12 23:11:12 +08:00
• b798f5f92b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-refund-outstanding edmondlang 2024-08-12 23:10:42 +08:00
• c60a5d3d88 Merge branch 'fix-wrong-currency-rate-group-command' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-08-12 22:43:18 +08:00
• 1d5b5f7865 fix group with currency rate more than 100 fix-wrong-currency-rate-group-command Jia Sheng 2024-08-12 22:41:39 +08:00
• f3303493c4 Merge branch 'dillon/68-exchange-debugging-refund' into 'master' Dillon Ngo 2024-08-12 14:30:09 +00:00
• 13dd19d0a1 Fix an error with refund for transaction that used a voucher earlier, get discount amount for voucher so to get details breakdown dillon/68-exchange-debugging-refund Dillon Ngo 2024-08-12 22:29:04 +08:00
• 2e09553e26 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Dillon Ngo 2024-08-12 22:06:39 +08:00
• 3b767b2cd3 Merge branch 'dillon/68-exchange-debugging-refund' into development Dillon Ngo 2024-08-12 22:02:54 +08:00
• 74d3b901ea Merge branch 'fix-refund-outstanding' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-08-12 21:26:57 +08:00
• 03472dc6be fix fully refund oustanding Jia Sheng 2024-08-12 21:25:48 +08:00
• 7f40c3d718 fix fully refund booking with outstanding refund-booking Jia Sheng 2024-08-12 21:18:48 +08:00
• 08e56acc24 update pending_orders, order by updated_at desc edmondlang 2024-08-12 14:17:07 +08:00
• a6174c61bf revert update on pending_orders edmondlang 2024-08-12 14:10:35 +08:00
• a87862d724 Merge branch 'dillon/66.2-exchange-debug' into 'master' Dillon Ngo 2024-08-12 02:50:34 +00:00
• a36b6f5e57 Comments on code dillon/66.2-exchange-debug Dillon Ngo 2024-08-12 10:48:35 +08:00
• 9cadaafbe7 Merge branch dillon/66.2-exchange-debug into development Dillon Ngo 2024-08-12 10:32:56 +08:00
• 92dc84a590 Merge branch 'dillon/66.2-exchange-debug' into 'master' Dillon Ngo 2024-08-12 02:27:57 +00:00
• 77e314c52b Quick fix on recipient_bank_account is null error on frontend Dillon Ngo 2024-08-12 10:25:57 +08:00
• cfcc5fbe26 Fix an error with refund for transaction that used a voucher earlier, get discount amount for voucher so to get details breakdown Dillon Ngo 2024-08-12 09:34:45 +08:00
• 3245abe05d Merge branch 'dillon/66.1-payment-bank-details' into 'master' Dillon Ngo 2024-08-11 16:02:27 +00:00
• 602b69dcba show payment method and date edmondlang 2024-08-09 19:47:58 +08:00
• 3767b41522 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-08-08 21:45:38 +08:00
• 5be2b60e1c update to fix for round up precision Jia Sheng 2024-08-08 21:45:00 +08:00
• f58dea32ac revert fixed pending_orders table 0auth_redesigned_login_page edmondlang 2024-08-07 18:27:58 +08:00
• 5cfd227c44 Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Aqqil Azman 2024-08-07 17:41:19 +08:00
• 698d38db4f added missing <td> pending-order-export-fomart-rearrangement Aqqil Azman 2024-08-07 17:38:41 +08:00
• cfb12dde00 fixed pending_orders table Aqqil Azman 2024-08-07 17:34:03 +08:00
• 957389feed include the fix by edmond, for some reason VSCode is acting wierd today Aqqil Azman 2024-08-07 17:26:30 +08:00
• 1d5e97fe8f removed headers Aqqil Azman 2024-08-07 17:25:17 +08:00
• 79666dded5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-08-07 15:41:51 +08:00
• 8a0005aa17 fix pending_orders table header edmondlang 2024-08-07 15:40:24 +08:00
• 764f242e87 fix pending_orders table header edmondlang 2024-08-07 13:13:26 +08:00
• ea06152dbf update pending_orders table header edmondlang 2024-08-07 10:51:27 +08:00
• 8648cd401f Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Aqqil Azman 2024-08-07 09:59:15 +08:00
• 7013dd4256 added table headers due to account oversight on the database structure, mixing Marking and Ref No up Aqqil Azman 2024-08-07 09:58:39 +08:00
• e732e475bf Fix some merge conflict done wrong Dillon Ngo 2024-08-07 07:55:21 +08:00
• 191a787ecc Merge branch 'dillon/66.1-payment-bank-details' into development Dillon Ngo 2024-08-07 07:23:58 +08:00
• 039d8deeea Fix some breaking changes that is already deployed to master branch dillon/66.1-payment-bank-details Dillon Ngo 2024-08-07 07:23:45 +08:00
• 714e1ad340 Merge branch 'dillon/66.1-payment-bank-details' into development Dillon Ngo 2024-08-07 07:13:08 +08:00
• 32833064b3 Fix some breaking changes that is already deployed to master branch Dillon Ngo 2024-08-07 06:56:49 +08:00
• 6160ec0651 Merge branch 'master' into dillon/66.1-payment-bank-details Dillon Ngo 2024-08-07 06:49:31 +08:00
• 3bd708ed0e Recipient Bank Details to follow payment overriding the default attached to Booking Dillon Ngo 2024-08-07 06:46:17 +08:00
• 9f72823932 Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-08-06 23:11:14 +08:00
• 53950459e2 show warning on manual po, add periodic 1688 manual po Jia Sheng 2024-08-06 22:33:07 +08:00
• 966c5522ae Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Aqqil Azman 2024-08-06 19:42:46 +08:00
• 7e9ffd67e2 rearrange the pending order based on account and PM's request Aqqil Azman 2024-08-06 19:40:25 +08:00
• dea49e7e4a Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-08-05 22:31:07 +08:00
• a90c3644c8 Update c2c display amount edmondlang 2024-08-05 22:27:59 +08:00
• 68fa965d7b Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' Dillon Ngo 2024-08-04 13:28:49 +00:00
• 0e7b9d113a Merge branch 'dillon/63.3-sorry-voucher-debug' into development Dillon Ngo 2024-08-04 21:25:22 +08:00
• bce914a3d3 Sorry voucher minor UI update dillon/63.3-sorry-voucher-debug Dillon Ngo 2024-08-04 21:24:56 +08:00
• 5248dfd281 Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' Dillon Ngo 2024-08-03 20:04:05 +00:00
• a7e422646c Merge branch 'dillon/63.3-sorry-voucher-debug' into development Dillon Ngo 2024-08-04 03:56:17 +08:00
• 79d5471d9e Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month Dillon Ngo 2024-08-04 03:56:05 +08:00
• f44f5d3ffd Merge branch 'dillon/63.3-sorry-voucher-debug' into development Dillon Ngo 2024-08-04 03:23:12 +08:00
• 8973e7b50f Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month Dillon Ngo 2024-08-04 03:22:53 +08:00
• 14f2bd7f2c Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' Dillon Ngo 2024-08-03 17:36:09 +00:00
• bdf0a3afeb Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue Dillon Ngo 2024-08-04 01:35:18 +08:00
• 02e3dce557 Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' Dillon Ngo 2024-08-03 16:36:40 +00:00
• b0a1971ca1 Merge branch 'dillon/63.3-sorry-voucher-debug' into development Dillon Ngo 2024-08-04 00:32:26 +08:00
• 8b50b89449 Sorry voucher debug Dillon Ngo 2024-08-04 00:32:12 +08:00
• de11cdb13c Merge branch 'dillon/63.2-sorry-voucher' into 'master' Dillon Ngo 2024-08-03 15:09:34 +00:00
• ae109c47ae Merge branch 'change-E2E-activation-service' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Aqqil Azman 2024-08-02 16:37:16 +08:00
• 25f97fdae2 fixed PO_Others and some 1688 others admin-1688-work-flow-aqqill Aqqil Azman 2024-08-02 12:10:26 +08:00
• 6b2f674c17 Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-08-02 01:20:15 +08:00
• 049d3cc098 fix adding remark error edmondlang 2024-08-02 01:18:56 +08:00
• 8d45a30dc7 included file types File-Upload-Component Aqqil Azman 2024-08-01 13:15:13 +08:00
• 38e3f8a998 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 change-E2E-activation-service Aqqil Azman 2024-08-01 08:52:59 +08:00
• bd5ef4a0d2 Merge branch 'supplier-bill-group-dashboard' into 'master' omair saleh 2024-07-31 16:33:17 +00:00
• cb9090ec03 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Jia Sheng 2024-07-31 22:39:46 +08:00
• 7e42bda76e make 1688 supplier in supplier currency order dashboard has the same flow as other supplier Jia Sheng 2024-07-31 22:39:04 +08:00
• 3bcae87661 added required props to remark-form-component and fix errors from console Aqqil Azman 2024-07-31 12:25:05 +08:00
• 11bd2fd3b8 amend E2E activation service message to "..minimum amount is CNY 1000.." Aqqil Azman 2024-07-31 10:16:33 +08:00
• ef90e45325 parsing remark component content to remark tabble Aqqil Azman 2024-07-30 17:56:38 +08:00
• 356c226528 added emit submit form Aqqil Azman 2024-07-30 17:56:19 +08:00
• 1f07402c2a remark post attempt for pending PO approval Aqqil Azman 2024-07-29 14:25:19 +08:00
• f94984d01e added create_po_issue_remark and changed create_login_issue_remark to create_issue_remark Aqqil Azman 2024-07-29 14:24:39 +08:00
• e80ad9a6ec Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details Dillon Ngo 2024-07-25 19:34:43 +08:00
• 7ed66f6414 Merge branch 'dillon/63.2-sorry-voucher' into development Dillon Ngo 2024-07-25 18:01:05 +08:00
• 05ceb32ac2 Sorry Voucher with new features enhancement requested by KS dillon/63.2-sorry-voucher Dillon Ngo 2024-07-25 17:57:20 +08:00
• bfe1aa5efd changed api route and api name for issue remark Aqqil Azman 2024-07-25 14:58:41 +08:00
• 0769d4d67c changed create_login_issue_remark_api into create_issue_remark Aqqil Azman 2024-07-25 14:58:17 +08:00
• 12ba031e57 updated the front end, everything should be working aside from the 1688 underpaid, overpaid workflow Aqqil Azman 2024-07-25 11:27:53 +08:00
• 5b88b0ee2e added api for po issue remark Aqqil Azman 2024-07-25 11:27:21 +08:00
• 324af3bd1c Merge branch 'dillon/63.2-sorry-voucher' into development Dillon Ngo 2024-07-24 15:19:02 +08:00
• facced08ff Sorry Voucher with new features enhancement requested by KS Dillon Ngo 2024-07-24 15:18:49 +08:00
• 6123bb5285 Finish 1688 Front end workflow, added if else condition for unqiue issues for login, issues and others Aqqil Azman 2024-07-24 12:10:26 +08:00
• c340c9d4d8 1688 work flow edmondlang 2024-07-23 22:58:36 +08:00
• 2a04ef5bd2 Merge branch 'dillon/63.2-sorry-voucher' into development Dillon Ngo 2024-07-23 19:12:40 +08:00
• 0d60226c44 Sorry Voucher with new features enhancement requested by KS Dillon Ngo 2024-07-23 19:11:36 +08:00
• 56fddcea36 fixed link redirection, touch up the interface and added updated order verify Aqqil Azman 2024-07-23 17:53:18 +08:00
• 1392595385 implemented a for loop that lists all order references for login_successful Aqqil Azman 2024-07-23 16:58:44 +08:00
• 28a775e926 update 1688 admin workflow edmondlang 2024-07-23 15:53:53 +08:00
• d728266572 Merge branch 'admin-1688-work-flow-aqqill' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into admin-1688-work-flow-aqqill Aqqil Azman 2024-07-23 15:16:42 +08:00
• f46568c8d9 added back button Aqqil Azman 2024-07-23 15:16:38 +08:00
• 2c568dd179 code review for 1688 login_successful node edmondlang 2024-07-23 15:09:39 +08:00