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

• e21b5dd8a5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-17 12:42:14 +08:00
• 6800f7b2d9 add Exports Invoice Transactions log edmondlang 2023-07-17 12:26:46 +08:00
• 748101f401 add district module district-setting JiaSheng 2023-07-14 12:55:06 +08:00
• dec7612b29 create delete district route and update district setting with postcode JiaSheng 2023-07-12 19:55:08 +08:00
• 4e21cd9d21 update address routes edmondlang 2023-07-12 18:23:10 +08:00
• 2c7d647f41 update district settings edmondlang 2023-07-12 18:21:29 +08:00
• 2ac2d0bc11 jiasheng: update district setting to follow other tab design JiaSheng 2023-07-12 17:13:49 +08:00
• 7994206bd9 jiasheng - district setting JiaSheng 2023-07-11 21:30:31 +08:00
• b2edef699b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-10 21:59:26 +08:00
• 46ae50b569 fix invoice decimals bug edmondlang 2023-07-10 21:59:08 +08:00
• 74cf3acd3e update accounting mapping edmondlang 2023-07-10 20:59:01 +08:00
• 20905a4996 update export invoice function for accounts mapping edmondlang 2023-07-09 22:08:08 +08:00
• 7bba082bd5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-09 22:06:23 +08:00
• b1f5ab492c update export invoice function for accounts mapping edmondlang 2023-07-09 22:06:06 +08:00
• 96a4e35091 fix the sessional segment for new customers Omair Saleh 2023-07-07 14:45:43 +08:00
• 487efac69c Merge branches 'development' and 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-07 01:19:32 +08:00
• 1dab99cc49 accounting mapping - export invoice edmondlang 2023-07-07 01:18:58 +08:00
• 0fd6fa0c3f accounting mapping - export invoice edmondlang 2023-07-06 01:16:05 +08:00
• 4a1a627009 Merge branch 'dillon/accounting-bank-mapping' into 'master' omair saleh 2023-07-05 06:10:35 +00:00
• 724714479f fix internal bank transfer and other payment types error Omair Saleh 2023-07-05 14:09:19 +08:00
• 782c073e3d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-05 12:21:09 +08:00
• 600ac923a0 remove company name warming text edmondlang 2023-07-05 12:20:53 +08:00
• ebad8e74d2 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-04 13:24:33 +08:00
• f7446937a8 update UploadPurchaseOrderLogic fix compnay that not using auto PO edmondlang 2023-07-04 13:24:06 +08:00
• f4159cfc00 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-03 18:43:59 +08:00
• b1eb0a81be open customer purchase order edmondlang 2023-07-03 18:43:36 +08:00
• 4c62c75164 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-03 10:20:13 +08:00
• c6da7e972c fix generate invoice edmondlang 2023-07-03 10:19:34 +08:00
• b1b3f54ce0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-07-03 10:07:50 +08:00
• be3111400c fix generate invoice edmondlang 2023-07-03 10:06:09 +08:00
• 54bede52b5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-30 20:26:01 +08:00
• b8cfbba0ad temporary show statement transactions only for admin edmondlang 2023-06-30 20:25:41 +08:00
• cc74a5e460 Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-30 15:35:10 +08:00
• 076f3eb40b update invoice amount edmondlang 2023-06-30 15:34:38 +08:00
• aea17da762 Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-30 15:30:45 +08:00
• e88ea52e1e update invoice amount edmondlang 2023-06-30 15:30:19 +08:00
• 3f5fd98945 Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-30 15:22:09 +08:00
• 4c53457a13 update invoice amount edmondlang 2023-06-30 15:21:41 +08:00
• 738394c143 update list all customer transactions with the button edmondlang 2023-06-30 14:21:47 +08:00
• 2bc21a7649 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-29 22:12:40 +08:00
• a90c79396b update list all customer transactions edmondlang 2023-06-29 22:00:26 +08:00
• ed0bcb34c4 list all customer transactions edmondlang 2023-06-29 21:24:21 +08:00
• 240a15378e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-27 18:36:55 +08:00
• 4d71abd8be Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 edmondlang 2023-06-27 18:33:11 +08:00
• 4972004044 update voucher error message dillon/voucherify-35 edmondlang 2023-06-27 18:11:19 +08:00
• be09c5aa5b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35 edmondlang 2023-06-27 18:08:47 +08:00
• 357d030adf Merge branch 'dillon/voucherify-35' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-27 16:47:50 +08:00
• f005c65afc update apply voucher design edmondlang 2023-06-27 16:46:42 +08:00
• f509b2e0a2 Merge remote-tracking branch 'origin/master' Omair Saleh 2023-06-23 14:44:20 +08:00
• a74cda1ad7 include ref column to payment export for autocount Omair Saleh 2023-06-23 14:43:46 +08:00
• 46795e76b5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-23 11:50:30 +08:00
• 3065857295 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into register-honey-trap register-honey-trap edmondlang 2023-06-23 11:47:55 +08:00
• 32b9bfab1c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35 edmondlang 2023-06-22 23:09:50 +08:00
• 285f8cae92 Merge branch 'list-transfer-with-filters' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-22 18:06:01 +08:00
• c7aa8e2a29 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into list-transfer-with-filters list-transfer-with-filters edmondlang 2023-06-22 18:05:38 +08:00
• 155bc23f7d list transfer with filters edmondlang 2023-06-22 18:05:24 +08:00
• 4ef3ed67e8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-22 12:29:03 +08:00
• 1e7657d1c1 add bill_no for top up history edmondlang 2023-06-22 12:27:19 +08:00
• a3b0e2c33d add bill_no for payment history edmondlang 2023-06-22 12:22:24 +08:00
• 771c23000c Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-21 17:51:38 +08:00
• d4901ff7b7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping edmondlang 2023-06-21 17:48:37 +08:00
• 7bec962e26 code clean up and fixes before push to production Omair Saleh 2023-06-21 17:03:38 +08:00
• 04a9bb486c code clean up and fixes before push to production Omair Saleh 2023-06-21 16:46:25 +08:00
• ee4e916b3d Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2023-06-21 15:19:43 +08:00
• 1b6bf18a4d update send payment proof email send-email-payment-proof edmondlang 2023-06-21 15:17:30 +08:00
• 40ae5b7706 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into list-transfer-with-filters edmondlang 2023-06-21 15:01:34 +08:00
• 9f2c41d75f list transfer with filters edmondlang 2023-06-21 15:01:19 +08:00
• b79ad4daa8 Merge branch 'dillon/39-crm-changes' into dillon/development dillon/development Dillon 2023-06-19 06:49:43 +08:00
• 7e64e126d1 Comment logs Dillon 2023-06-19 06:49:28 +08:00
• 94e5ce760f Merge branch 'dillon/39-crm-changes' into dillon/development Dillon 2023-06-19 06:45:09 +08:00
• d7776d90df Debug duplicated task created Dillon 2023-06-19 06:44:59 +08:00
• e5454b83d0 Merge branch 'dillon/39-crm-changes' into dillon/development Dillon 2023-06-19 06:29:20 +08:00
• 2091553d7b Debug duplicated task created Dillon 2023-06-19 06:28:25 +08:00
• 569be00753 Merge branch 'dillon/39-crm-changes' into dillon/development Dillon 2023-06-19 06:02:01 +08:00
• f6ae86bcab Enhancement to allow multiple tasks of the same name (with invoice id as distinguish marker) to be created at CRM as a result of multiple payments allowed per order Dillon 2023-06-19 06:00:56 +08:00
• 4c169ab8d8 Quick fix where invoice not get created when user make payment crm-changes Dillon 2023-06-17 17:11:28 +08:00
• 71c1bb7c30 Fix bug where invoice not get created Dillon 2023-06-17 17:06:03 +08:00
• e8f8cfe36e Quick Test Dillon 2023-06-17 07:40:27 +08:00
• d6361867ac Quick test Dillon 2023-06-17 06:40:47 +08:00
• def9682df3 Merge branch 'crm-changes' into dillon/development Dillon 2023-06-17 04:30:03 +08:00
• 019bc9ce53 revert changes to CreateBookingPaymentLogic.php Omair Saleh 2023-06-16 13:07:00 +08:00
• efbd9db691 remove the word passport edmondlang 2023-06-15 15:36:30 +08:00
• 2146cf4dca remove the word passport edmondlang 2023-06-15 15:31:50 +08:00
• ac510c51a8 Merge branch 'crm-changes' into 'master' omair saleh 2023-06-14 22:37:22 +00:00
• 93c24b197d automatically complete tasks Omair Saleh 2023-06-15 06:20:47 +08:00
• e093a4d43c automatically complete tasks Omair Saleh 2023-06-15 06:19:26 +08:00
• d6516fda53 automatically complete tasks Omair Saleh 2023-06-15 06:16:54 +08:00
• 1a08dd1659 automatically complete tasks Omair Saleh 2023-06-15 06:16:02 +08:00
• 3b9cc6a3b9 automatically complete tasks Omair Saleh 2023-06-15 06:15:44 +08:00
• 85a7a09e32 automatically complete tasks Omair Saleh 2023-06-15 06:11:27 +08:00
• ef1b63870f automatically complete tasks Omair Saleh 2023-06-15 06:08:27 +08:00
• 9e40be83f0 automatically complete tasks Omair Saleh 2023-06-15 06:07:34 +08:00
• c0dcdfd942 automatically complete tasks Omair Saleh 2023-06-15 06:07:13 +08:00
• 1b43e4d1e3 automatically complete tasks Omair Saleh 2023-06-15 06:02:53 +08:00
• ebca79aee2 automatically complete tasks Omair Saleh 2023-06-15 05:55:22 +08:00
• 3d1402a4fb automatically complete tasks Omair Saleh 2023-06-15 05:52:14 +08:00
• c99cfa14c5 automatically complete tasks Omair Saleh 2023-06-15 05:45:06 +08:00
• 4e3a82969d automatically complete tasks Omair Saleh 2023-06-15 05:20:23 +08:00
• 09f20ca34c automatically complete tasks Omair Saleh 2023-06-15 04:37:21 +08:00
• 9d99665669 automatically complete tasks Omair Saleh 2023-06-15 04:29:38 +08:00