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

• b63cea4c09 update purchase order amount and status upon refund approval JiaSheng 2024-03-12 12:03:49 +08:00
• e5304672e3 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-11 22:19:27 +08:00
• 3cd2e24461 add export refunded transactions button JiaSheng 2024-03-11 22:18:10 +08:00
• a1bbc69ec5 -update payment amount under payment history section on booking page -export approved refund payment JiaSheng 2024-03-11 22:13:01 +08:00
• b3f97c0ed8 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard JiaSheng 2024-03-11 21:09:43 +08:00
• be65829dd5 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-03-11 14:05:58 +08:00
• 8914de90cd Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-11 10:49:32 +08:00
• 626bec90d2 update export pending order so that partial refund booking show correct amount fix-export-pending-order JiaSheng 2024-03-11 01:14:40 +08:00
• f42f26e6c3 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-11 01:01:07 +08:00
• 2d34b157f5 update refund section to have 2 tabs, where each tab categorized by full and partial refund JiaSheng 2024-03-11 01:00:38 +08:00
• 180a267951 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-08 17:05:45 +08:00
• cc8a12c7b0 Merge remote-tracking branch 'origin/master' Omair Saleh 2024-03-08 03:08:38 +08:00
• 6d8cce464c don't paginate the pending currency order page Omair Saleh 2024-03-08 03:08:21 +08:00
• 45bb47e5aa Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-07 17:21:41 +08:00
• 4d501c8b7c update log info JiaSheng 2024-03-07 17:21:18 +08:00
• 875fb79574 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-07 17:16:22 +08:00
• b0e3467fbe export pending order should not export order with refund in progress JiaSheng 2024-03-07 15:41:21 +08:00
• 7030041246 fix payment history display transfer status Omair Saleh 2024-03-07 11:46:46 +08:00
• 32224f6803 fix payment history display transfer status Omair Saleh 2024-03-07 11:43:19 +08:00
• df7f9531e8 fix payment history display transfer status Omair Saleh 2024-03-07 11:38:03 +08:00
• 73819e967e open partial refund, categorize refunds section in dashboard JiaSheng 2024-03-06 20:56:24 +08:00
• e7ef63c511 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard JiaSheng 2024-03-06 15:16:50 +08:00
• 2d5bbac3b1 update ExpiredBookingCommand logging - add timestamp edmondlang 2024-03-02 00:32:55 +08:00
• 85cd73f577 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into uncomment-booking-expired-command uncomment-booking-expired-command edmondlang 2024-03-02 00:25:55 +08:00
• 8b22b49937 remove testing code edmondlang 2024-03-02 00:25:00 +08:00
• 42a399999a uncomment and log to specific file for booking expired command JiaSheng 2024-03-01 23:28:14 +08:00
• b2dd34106c debug payment not showing issue edmondlang 2024-03-01 22:51:56 +08:00
• dfc2ddd09b debug payment not showing issue edmondlang 2024-03-01 22:49:14 +08:00
• 5cf55453fd show-booking-expired for debug payment not showing edmondlang 2024-03-01 21:57:06 +08:00
• efb909555e debug payment not showing issue edmondlang 2024-03-01 14:28:52 +08:00
• ca2f41e95c fix bug for payment transaction not found after status update to refunded JiaSheng 2024-03-01 08:16:54 +08:00
• 5c10539824 resolve supplier refund amount to follow white form rate JiaSheng 2024-02-28 20:53:20 +08:00
• 5fd2f6ef7f -complete supplier bill group when oustanding is 0 -create refund and supplier refund if the request refund order is in white form JiaSheng 2024-02-28 01:34:39 +08:00
• 8d84c970e2 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard JiaSheng 2024-02-27 22:03:04 +08:00
• f9f7cf74b6 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard JiaSheng 2024-02-27 21:50:47 +08:00
• f84b04c26c update logging and indentation edmondlang 2024-02-27 01:08:16 +08:00
• 28c0aeff77 dont show payment on homepage if it is in refund process edmondlang 2024-02-26 00:38:25 +08:00
• 12bf3b214d Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-02-25 20:43:35 +08:00
• 767d6c84fe update to bill refund for 1688 supplier JiaSheng 2024-02-25 20:43:01 +08:00
• b67257b42f Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development Sai0224 2024-02-24 12:16:33 +08:00
• 25de31ea2e supplier bill payment refund module Sai0224 2024-02-24 12:15:26 +08:00
• ec0ebe3812 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard Sai0224 2024-02-21 21:14:51 +08:00
• df17a8497d comment partial refund function edmondlang 2024-02-21 00:33:08 +08:00
• 9aa75630ff update code for refund booking edmondlang 2024-02-21 00:20:45 +08:00
• 9e3c34eb73 change payment status when it has been fully refunded edmondlang 2024-02-20 22:41:28 +08:00
• db296a511f test ga4 edmondlang 2024-02-20 11:16:38 +08:00
• 86cc8bbf9d test ga4 edmondlang 2024-02-20 11:07:35 +08:00
• b7bc14b98f Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-02-19 01:10:43 +08:00
• 48247abbd4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking edmondlang 2024-02-19 01:00:51 +08:00
• 609b71f549 code upfate for refund booking edmondlang 2024-02-19 00:57:42 +08:00
• f083434390 update refund ui and logic edmondlang 2024-02-16 14:59:11 +08:00
• 39d78d2d42 Merge branch 'revert-304379b1' into 'master' Dillon Ngo 2024-02-11 10:30:08 +00:00
• f8230990f4 Revert "Merge branch 'revert-b9668bb6' into 'master'" revert-304379b1 Dillon Ngo 2024-02-11 10:28:05 +00:00
• 304379b147 Merge branch 'revert-b9668bb6' into 'master' Dillon Ngo 2024-02-11 09:54:00 +00:00
• ea4795e5c8 Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'" revert-b9668bb6 Dillon Ngo 2024-02-11 09:53:09 +00:00
• d5305b71f8 Merge branch 'revert-6637d057' into 'development' Dillon Ngo 2024-02-11 09:48:42 +00:00
• 83448e25df Revert "Merge branch 'revert-c28544c6' into 'development'" revert-6637d057 Dillon Ngo 2024-02-11 09:47:30 +00:00
• 6637d05702 Merge branch 'revert-c28544c6' into 'development' Dillon Ngo 2024-02-11 09:42:22 +00:00
• 240cda76a5 Revert "Merge branch 'dillon/51.2-test-revert-merge-request' into 'development'" revert-c28544c6 Dillon Ngo 2024-02-11 09:41:41 +00:00
• c28544c67e Merge branch 'dillon/51.2-test-revert-merge-request' into 'development' Dillon Ngo 2024-02-11 09:38:26 +00:00
• 92f8b19b3e Test revert merge request dillon/51.2-test-revert-merge-request Dillon Ngo 2024-02-11 17:34:46 +08:00
• 1c9290c9e5 Merge branch 'dillon/51-vue-polling-experimental-2' into dillon/51.2-test-revert-merge-request Dillon Ngo 2024-02-11 17:33:45 +08:00
• b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master' Dillon Ngo 2024-02-11 09:16:08 +00:00
• dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development Dillon Ngo 2024-02-11 16:15:06 +08:00
• 7151caa9b8 Proof of concept - Vue Polling a workaround for AWS API Gateway limitation dillon/51-vue-polling-experimental-2 Dillon Ngo 2024-02-11 16:11:42 +08:00
• ddcad4969e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking edmondlang 2024-02-06 12:02:06 +08:00
• 17785cd08f Merge branch 'dillon/41-voucherify-phase-2b' into 'master' Dillon Ngo 2024-01-25 14:00:54 +00:00
• d59f19ce5d update JiaSheng 2024-01-25 17:27:14 +08:00
• 94596baf13 1688 integration JiaSheng 2024-01-25 16:52:06 +08:00
• 8f20c7d021 update create booking payment with wallet logic JiaSheng 2024-01-19 21:45:07 +08:00
• 42becd0cf5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-01-15 23:47:57 +08:00
• 402a2e03bc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking JiaSheng 2024-01-15 23:44:05 +08:00
• c8cabee97b update JiaSheng 2024-01-15 23:41:12 +08:00
• ef43e1616d update JiaSheng 2024-01-14 12:20:28 +08:00
• e5a96e179c add refund transaction under booking payment history, update on admin currency order dashboard to show the correct amount after refunded JiaSheng 2024-01-13 13:27:24 +08:00
• 0e332c18d0 fix bug on development edmondlang 2024-01-11 14:46:07 +08:00
• aa57a79ab7 fix ExportsInvoiceTransactions - $row is inside an array edmondlang 2024-01-11 11:22:46 +08:00
• b5958a95fb Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-01-11 10:56:18 +08:00
• f56ee08a53 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking JiaSheng 2024-01-10 21:15:37 +08:00
• 836e5f86cc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking JiaSheng 2024-01-10 21:14:44 +08:00
• 82f8eac478 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2024-01-10 15:34:48 +08:00
• e5dc9c4e1b fix the invoice date for IZYIM when export invoice to autocount Steve Ng 2024-01-09 09:08:44 +08:00
• 1e16872933 fix the invoice date for IZYIM when export invoice to autocount steve/account-mapping Steve Ng 2024-01-09 09:08:44 +08:00
• 8a05620edf update JiaSheng 2024-01-08 22:41:59 +08:00
• a28c695aab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking JiaSheng 2024-01-08 21:54:23 +08:00
• 79bc1dff91 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-01-08 18:28:08 +08:00
• 435927ba19 update code fix po fix-po edmondlang 2024-01-08 18:07:04 +08:00
• 9a39976ed0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-po edmondlang 2024-01-08 17:49:06 +08:00
• 77b93d2c9b fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review Steve Ng 2024-01-05 12:06:08 +08:00
• 24d246d721 fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review Steve Ng 2024-01-05 12:06:08 +08:00
• a9e368e387 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into steve/currency-setting steve/currency-setting Steve Ng 2024-01-03 15:03:12 +08:00
• b2dd059fa4 update logging for GuzzleShippingPortal edmondlang 2024-01-03 10:12:06 +08:00
• 02a37caf5a change posting date to invoice date for shipping portal when export invoice to autocount Steve Ng 2024-01-03 09:08:54 +08:00
• 74c6ca7330 change posting date to invoice date for shipping portal when export invoice to autocount Steve Ng 2024-01-03 09:08:54 +08:00
• d79be5f24e Laravel Vapor - attempt to fix a frontend error Uncaught (in promise) null dillon/34-jenkins-vapor Dillon Ngo 2024-01-03 01:53:06 +08:00
• cf5a22b40b Laravel Vapor - attempt to fix a frontend error Uncaught (in promise) null Dillon Ngo 2024-01-03 01:20:16 +08:00
• 5eb471e33f Laravel Vapor - attempt to fix a frontend error Uncaught (in promise) null Dillon Ngo 2024-01-03 00:58:33 +08:00
• c179b40a8c Laravel Vapor - attempt to fix a frontend error Uncaught (in promise) null Dillon Ngo 2024-01-03 00:57:41 +08:00
• 330ce8f7e3 Laravel Vapor - attempt to fix a missing asset (Error 403) Dillon Ngo 2024-01-03 00:43:28 +08:00
• 69df147bb5 Laravel Vapor - attempt to fix a missing asset (Error 403) Dillon Ngo 2024-01-03 00:29:43 +08:00