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

• a93b8091b2 Laravel Vapor - debug reading from S3 storage Dillon Ngo 2024-04-26 15:27:06 +08:00
• 2575af53c2 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-04-26 14:43:37 +08:00
• 931a0f6bf5 Laravel Vapor - debug reading from S3 storage Dillon Ngo 2024-04-26 14:43:22 +08:00
• 085fa300bd Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-04-26 13:57:56 +08:00
• 590b9bccc3 Laravel Vapor - testing production S3 storage on development environment Dillon Ngo 2024-04-26 13:57:43 +08:00
• f63351b715 Merge branch 'remark-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-25 16:50:48 +08:00
• 20cb00ed24 update add remark on white form transactions remark-module edmondlang 2024-04-25 16:48:39 +08:00
• 32d8b26451 feat: added date and time for remarks Dodowingster 2024-04-25 15:52:38 +08:00
• 29507f5120 update remark on transactions edmondlang 2024-04-25 14:50:59 +08:00
• 30172a6d7a refactor: proper remark database commit Dodowingster 2024-04-25 14:20:31 +08:00
• 7fb4ae724c refactor: adding remarks Dodowingster 2024-04-25 13:40:23 +08:00
• a9414712f5 feat: added remark.php Dodowingster 2024-04-25 13:40:04 +08:00
• 3383f6b138 initial commit Dodowingster 2024-04-25 13:39:40 +08:00
• 9879b16f2a feat: remarks and add remarks Dodowingster 2024-04-25 10:22:08 +08:00
• 631282eaf5 add remarks table migration edmondlang 2024-04-24 18:09:22 +08:00
• 83238a93c4 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-04-24 17:28:12 +08:00
• 9c4ed9aba2 Laravel Vapor - Rewrite code to use S3 bucket Dillon Ngo 2024-04-24 17:26:50 +08:00
• 332a12008c initial commit Dodowingster 2024-04-24 15:18:28 +08:00
• 547dd37405 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-22 18:26:10 +08:00
• a8c13e9425 comment DB::commit() to fix the database seeder edmondlang 2024-04-22 18:25:48 +08:00
• 94ea735211 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-16 22:52:14 +08:00
• 69e9328e74 fix bug cant approve the refund because booking amount cant be updated, error - Booking Amount cannot be less than xxxxx edmondlang 2024-04-16 22:34:41 +08:00
• 29bf3f4295 Merge branch 'fix-invoice-not-tally-with-voucherify' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-09 00:20:45 +08:00
• aeb0be11bf remove - in the invoice discount section, amount is already in negative fix-invoice-not-tally-with-voucherify edmondlang 2024-04-09 00:20:19 +08:00
• 4770a5be33 Merge branch 'fix-invoice-not-tally-with-voucherify' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-09 00:05:13 +08:00
• 02d28f8fba fix invoice amount not tally when voucher is apply for booking JiaSheng 2024-04-08 21:17:37 +08:00
• 53a3c4c859 Merge branch 'dillon/57-second-voucher-first-milestone' into development Dillon Ngo 2024-04-02 21:28:48 +08:00
• 83bff8c9ad Minor checking fix for UI dillon/57-second-voucher-first-milestone Dillon Ngo 2024-04-02 21:28:33 +08:00
• e25f330d3c Merge branch 'dillon/57-second-voucher-first-milestone' into development Dillon Ngo 2024-04-02 21:09:22 +08:00
• c6208e5b04 Change place to process second voucher eligibilty check Dillon Ngo 2024-04-02 21:09:09 +08:00
• 7a3e7d2c62 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development Dillon Ngo 2024-04-02 20:26:30 +08:00
• 5da8d5b43c Merge branch 'dillon/57-second-voucher-first-milestone' into development Dillon Ngo 2024-04-02 20:26:11 +08:00
• 19ef720bc5 Small fix on UX when applying voucher Dillon Ngo 2024-04-02 20:25:57 +08:00
• c9d04a485a Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-02 15:26:37 +08:00
• d69b55d586 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-04-02 15:26:23 +08:00
• a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard edmondlang 2024-04-02 11:53:43 +08:00
• d1bcda8029 Merge branch 'dillon/57-second-voucher-first-milestone' into development Dillon Ngo 2024-04-01 14:04:41 +08:00
• eb30d41941 Second voucher (first milestone) for user upon reaching 2 completed bookings Dillon Ngo 2024-04-01 13:56:25 +08:00
• dc61f23fa8 include pending verification status to expirying payment function Omair Saleh 2024-04-01 12:59:30 +08:00
• b7505e4501 Merge branch '1688-integration' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-31 22:21:40 +08:00
• 9c08805d32 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-integration 1688-integration JiaSheng 2024-03-31 22:21:01 +08:00
• bb1cb6d44e tidy up whiteform report Omair Saleh 2024-03-27 10:11:02 +08:00
• b9765fbcf7 tidy up whiteform report Omair Saleh 2024-03-27 10:03:26 +08:00
• eb85793798 tidy up whiteform report Omair Saleh 2024-03-27 10:02:25 +08:00
• baa8551b66 tidy up whiteform report Omair Saleh 2024-03-27 09:54:58 +08:00
• 9a6e41ff3b tidy up whiteform report Omair Saleh 2024-03-27 09:47:42 +08:00
• 937610272c tidy up whiteform report Omair Saleh 2024-03-27 09:42:24 +08:00
• d104e64036 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-03-27 01:11:44 +08:00
• 3af3c95032 show white form transactions in date range edmondlang 2024-03-27 01:09:55 +08:00
• 9f0c64d5a3 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-03-26 03:51:42 +08:00
• 1786ae63f3 Laravel Vapor - Created new resource files for Vue Polling Component Dillon Ngo 2024-03-26 03:50:06 +08:00
• 5edf52eb5f Vue Polling - Revert back to original code, created new resource files for vue polling component, see next commit Dillon Ngo 2024-03-26 03:25:24 +08:00
• 2825eee224 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-25 15:07:11 +08:00
• 3deba3468a -Approve refund - only super admin -If invoice generated - only super admin can request refund JiaSheng 2024-03-25 15:06:46 +08:00
• 5f8f3f04ae Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-25 00:48:54 +08:00
• c95c274db7 update JiaSheng 2024-03-25 00:47:52 +08:00
• 330103bc79 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-03-24 20:15:58 +08:00
• bd7fd92cf0 Laravel Vapor - Delete comments Dillon Ngo 2024-03-24 20:14:38 +08:00
• 9f94c2e184 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-03-24 19:46:01 +08:00
• 7fc11cc7e7 Laravel Vapor - Added comments for debugging code Dillon Ngo 2024-03-24 19:44:17 +08:00
• 855f0b70b3 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-03-24 19:24:20 +08:00
• 102e0a6fa6 Test run schedule task - NewUserRegistrationExpireCheckV2CommandJob Dillon Ngo 2024-03-24 19:01:06 +08:00
• 97c85d5aac Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-03-24 18:26:45 +08:00
• 454b1ff1a9 To test run new command Dillon Ngo 2024-03-24 18:26:09 +08:00
• a200f7083b Laravel Vapor - Version 2 of Commands for 3 files + Resolved 3 TODOs Dillon Ngo 2024-03-24 18:20:24 +08:00
• 4ec90b68da Fix a problem when using vue polling method at /dashboard page > currency orders tab > changing ddl does not get list updated Dillon Ngo 2024-03-22 16:43:17 +08:00
• df18422ed5 Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development Dillon Ngo 2024-03-22 14:25:16 +08:00
• 93b44d816f Merge branch 'master' into dillon/34.1-jenkins-vapor Dillon Ngo 2024-03-22 14:05:47 +08:00
• da47b92b7c Setup priority queue with AWS SQS (Sync from Shipping Portal) Dillon Ngo 2024-03-22 13:53:56 +08:00
• 156c464514 Fix a problem with Jenkinsfile, sync code from Shipping Portal Dillon Ngo 2024-03-21 17:50:03 +08:00
• 55818dc8fa Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-19 00:23:33 +08:00
• 04b8dfb0dd -fix issue where cannot approve PO when we have refunded transaction JiaSheng 2024-03-19 00:23:09 +08:00
• 31b58dcc8c Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-18 22:32:36 +08:00
• daa422d41a -auto update booking fix amount once refund approve JiaSheng 2024-03-18 22:13:05 +08:00
• 8ac29fff76 Merge branch 'dillon/51.4-explore-multiple-queues' into 'master' Dillon Ngo 2024-03-18 12:10:50 +00:00
• 04689864f3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into 'master' Dillon Ngo 2024-03-18 12:01:17 +00:00
• aeed8db87b Merge branch 'dillon/51.4-explore-multiple-queues' into development Dillon Ngo 2024-03-18 13:30:09 +08:00
• 15482469a6 Vue Polling - update info log location for PerfexCRM, standardization exercise dillon/51.4-explore-multiple-queues Dillon Ngo 2024-03-18 13:29:51 +08:00
• 91ffc2614c Merge branch 'dillon/51.4-explore-multiple-queues' into development Dillon Ngo 2024-03-18 13:25:40 +08:00
• 1ca7a25aff Vue Polling - update info log location for PerfexCRM, standardization exercise Dillon Ngo 2024-03-18 13:25:24 +08:00
• 605220eacb Merge branch 'dillon/51.4-explore-multiple-queues' into development Dillon Ngo 2024-03-18 13:10:57 +08:00
• 29d17c4f1f Vue Polling - update info log location for PerfexCRM Dillon Ngo 2024-03-18 13:09:12 +08:00
• 064fba660b Merge branch 'dillon/51.4-explore-multiple-queues' into development Dillon Ngo 2024-03-18 12:58:31 +08:00
• 122888f39a Vue Polling - update info log location when job is not found Dillon Ngo 2024-03-18 12:58:17 +08:00
• 7ba34965e3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development Dillon Ngo 2024-03-18 12:22:31 +08:00
• 01bbb1e21a Amendment on welcome voocher email requested by kexin dillon/53-voucherify-email-reminder-to-user Dillon Ngo 2024-03-17 16:06:47 +08:00
• da044eb82b Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-03-17 15:05:26 +08:00
• eb7c91f1f4 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-03-17 15:05:03 +08:00
• 0a12bca442 check if have refund in progress edmondlang 2024-03-17 15:03:46 +08:00
• 212bd40d28 Merge branch 'dillon/51.4-explore-multiple-queues' into development Dillon Ngo 2024-03-16 13:27:43 +08:00
• a45507a2cf Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-16 09:47:45 +08:00
• c498aec61d -fix purchase order section state issue when refund request is approved on booking page -fix supplier bill group dashboard payment issue JiaSheng 2024-03-16 09:44:56 +08:00
• 10151634a7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard edmondlang 2024-03-15 17:13:58 +08:00
• 7b8e3a1c2b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging staging edmondlang 2024-03-15 17:13:13 +08:00
• ed969913cc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development edmondlang 2024-03-15 17:11:44 +08:00
• 27ca11f0c2 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-15 10:34:50 +08:00
• 81c81e3b48 -show remark and categorized in export refund booking -make refund function available for internal only, not for customer JiaSheng 2024-03-15 10:34:21 +08:00
• ffd338e287 Vue Polling - Second high priority queue through database Dillon Ngo 2024-03-14 16:29:26 +08:00
• 36cde82a19 Send welcome email with voucher to user upon successful verification of customer email adddress Dillon Ngo 2024-03-14 15:52:20 +08:00
• 62065416b4 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development JiaSheng 2024-03-12 12:04:17 +08:00